Skip to content

Commit 1bf2a46

Browse files
committed
help, my clock don't work
1 parent 8923879 commit 1bf2a46

File tree

4 files changed

+49
-11
lines changed

4 files changed

+49
-11
lines changed

items/code.lua

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3903,6 +3903,7 @@ local pointer = {
39033903
G.FUNCS.pointer_apply()
39043904
end
39053905
local aliases = {
3906+
-- Vanilla Jokers
39063907
jimbo = "joker",
39073908
["gary mccready"] = "joker",
39083909
greedy = "greedy joker",
@@ -3956,6 +3957,7 @@ local pointer = {
39563957
driverslicense = "driver's license",
39573958
burnt = "burnt joker",
39583959
caino = "canio",
3960+
-- Cryptid Jokers
39593961
house = "happy house",
39603962
queensgambit = "queen's gambit",
39613963
weefib = "weebonacci",
@@ -4000,14 +4002,45 @@ local pointer = {
40004002
oldgoogleplaycard = "nostalgic googol play card",
40014003
localthunk = "supercell",
40024004
["1fa"] = "one for all",
4003-
crust = "crustulum",
4004-
deathstar = "stella mortis",
40054005
["jolly?"] = "jolly joker?",
40064006
scrabble = "scrabble tile",
4007-
["13"] = "tredecim",
4007+
oldcandy = "nostalgic candy",
4008+
jimbo9000 = "jimbo-tron 9000",
4009+
jimbotron9000 = "jimbo-tron 9000",
4010+
magnet = "fridge magnet",
4011+
weeb = "weebonacci",
4012+
potofgreed = "pot of jokes",
4013+
flipside = "on the flip side",
4014+
bonkers = "bonkers joker",
4015+
fuckedup = "fucked-up joker",
4016+
foolhardy = "foolhardy joker",
4017+
adroit = "adroit joker",
4018+
penetrating = "penetrating joker",
4019+
treacherous = "treacherous joker",
4020+
stronghold = "the stronghold",
4021+
thefuck = "the fuck!?",
4022+
["tf!?"] = "the fuck!?",
4023+
wtf = "the fuck!?",
4024+
clash = "the clash",
4025+
astral = "astral in a bottle",
4026+
smoothie = "tropical smoothie",
4027+
chocodie = "chocolate die",
4028+
chocodice = "chocolate die",
4029+
chocolatedice = "chocolate die",
4030+
cookie = "clicked cookie",
4031+
lebronjames = "lebaron james",
4032+
lebron = "lebaron james",
4033+
lebaron = "lebaron james",
4034+
hunting = "hunting season",
4035+
clockwork = "clockwork joker",
4036+
monopoly = "monopoly money",
4037+
notebook = "the motebook",
4038+
motebook = "the motebook",
4039+
--Vouchers
40084040
["overstock+"] = "overstock plus",
40094041
directorscut = "director's cut",
40104042
["3rs"] = "the 3 rs",
4043+
-- Vanilla Tarots
40114044
fool = "the fool",
40124045
magician = "the magician",
40134046
priestess = "the high priestess",
@@ -4026,10 +4059,13 @@ local pointer = {
40264059
moon = "the moon",
40274060
sun = "the sun",
40284061
world = "the world",
4062+
-- Cryptid Tarots
40294063
automaton = "the automaton",
40304064
eclipse = "c_cry_eclipse",
4065+
-- Planets
40314066
x = "planet x",
40324067
X = "planet x",
4068+
-- Code Cards
40334069
pointer = "pointer://",
40344070
payload = "://payload",
40354071
reboot = "://reboot",
@@ -4055,12 +4091,14 @@ local pointer = {
40554091
ctrlv = "://ctrl+v",
40564092
["ctrl+v"] = "://ctrl+v",
40574093
["ctrl v"] = "://ctrl+v",
4094+
hook = "hook://",
40584095
instantiate = "://INSTANTIATE",
40594096
inst = "://INSTANTIATE",
40604097
spaghetti = "://spaghetti",
4098+
-- Tags
40614099
topuptag = "top-up tag",
40624100
gamblerstag = "gambler's tag",
4063-
hook = "hook://",
4101+
-- Blinds
40644102
ox = "the ox",
40654103
wall = "the wall",
40664104
wheel = "the wheel",

items/epic.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2024,11 +2024,11 @@ local clockwork = { -- Steel Support: The Joker
20242024
return { xmult = card.ability.extra.steelenhc }
20252025
end
20262026
end,
2027-
add_to_deck = function(self, card, from_debuff)
2028-
math.floor(pseudorandom("Clockwork1") * 1 + 0.5)
2029-
math.floor(pseudorandom("Clockwork2") * 2 + 0.5)
2030-
math.floor(pseudorandom("Clockwork3") * 4 + 0.5)
2031-
math.floor(pseudorandom("Clockwork4") * 6 + 0.5)
2027+
set_ability = function(self, card, initial, delay_sprites)
2028+
card.ability.counters.c1 = math.floor(pseudorandom("Clockwork1") * 1 + 0.5)
2029+
card.ability.counters.c2 = math.floor(pseudorandom("Clockwork2") * 2 + 0.5)
2030+
card.ability.counters.c3 = math.floor(pseudorandom("Clockwork3") * 4 + 0.5)
2031+
card.ability.counters.c4 = math.floor(pseudorandom("Clockwork4") * 6 + 0.5)
20322032
end,
20332033
cry_credits = {
20342034
idea = {

items/m.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1443,7 +1443,7 @@ local longboi = {
14431443
}
14441444
end
14451445
end,
1446-
set_ability = function(self, card, from_debuff)
1446+
set_ability = function(self, card, initial, delay_sprites)
14471447
card.ability.extra.monster = G.GAME and G.GAME.monstermult or 1
14481448
if card.ability.extra.monster >= 1234567654321 then
14491449
card.children.center:set_sprite_pos({ x = 7, y = 5 })

localization/en-us.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,7 @@ return {
11551155
"Retrigger all Steel Cards every {C:attention}2{} {C:inactive}(#1#){} hands.",
11561156
"This joker gains {C:mult}#6#x Mult{} {C:inactive}(#5#){} every {C:attention}3{} {C:inactive}(#2#){} hands,",
11571157
"Turn the first played card Steel every {C:attention}5{} {C:inactive}(#3#){} hands,",
1158-
"Steel cards give {C:mult}+X#8# Mult {C:inactive}(X#7#){} every {C:attention}7{} {c:inactive}(#4#){} hands",
1158+
"Steel cards give {C:mult}+X#8# Mult {C:inactive}(X#7#){} every {C:attention}7{} {C:inactive}(#4#){} hands",
11591159
},
11601160
},
11611161
j_cry_CodeJoker = {

0 commit comments

Comments
 (0)