Skip to content

Commit 14aa00f

Browse files
committed
fix crash
1 parent 2976223 commit 14aa00f

File tree

5 files changed

+5
-9
lines changed

5 files changed

+5
-9
lines changed

items/code.lua

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3085,8 +3085,6 @@ local class = {
30853085
if not card.ability.cry_multiuse or to_big(card.ability.cry_multiuse) <= to_big(1) then
30863086
G.GAME.CODE_DESTROY_CARD = copy_card(card)
30873087
G.consumeables:emplace(G.GAME.CODE_DESTROY_CARD)
3088-
else
3089-
card.ability.cry_multiuse = card.ability.cry_multiuse + 1
30903088
end
30913089
G.GAME.USING_CODE = true
30923090
G.GAME.USING_CLASS = card.ability.max_highlighted
@@ -3311,8 +3309,6 @@ local variable = {
33113309
if not card.ability.cry_multiuse or to_big(card.ability.cry_multiuse) <= to_big(1) then
33123310
G.GAME.CODE_DESTROY_CARD = copy_card(card)
33133311
G.consumeables:emplace(G.GAME.CODE_DESTROY_CARD)
3314-
else
3315-
card.ability.cry_multiuse = card.ability.cry_multiuse + 1
33163312
end
33173313
G.GAME.USING_CODE = true
33183314
G.GAME.USING_VARIABLE = card.ability.max_highlighted

items/exotic.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ local crustulum = {
719719
local remove_ref = CardArea.remove_card
720720
function CardArea:remove_card(card, ...)
721721
local c = remove_ref(self, card, ...)
722-
if card and card:is_food() and self == G.jokers and not G.SETTINGS.paused then
722+
if card and card.is_food and card:is_food() and self == G.jokers and not G.SETTINGS.paused then
723723
if card.states.drag.is == true and card.children.center.pinch.x == true then
724724
SMODS.calculate_context({ food_joker_expired = true, card = self })
725725
end

items/misc.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1950,7 +1950,7 @@ local gold_edition = {
19501950
weight = 7,
19511951
extra_cost = 4,
19521952
in_shop = true,
1953-
config = { dollars = 1, active = true },
1953+
config = { dollars = 2, active = true },
19541954
loc_vars = function(self, info_queue, card)
19551955
return { vars = { card and card.edition and card.edition.dollars or self.config.dollars } }
19561956
end,

items/misc_joker.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@ local compound_interest = {
12371237
key = "compound_interest",
12381238
config = {
12391239
extra = {
1240-
percent_mod = 5,
1240+
percent_mod = 10,
12411241
percent = 20,
12421242
},
12431243
},
@@ -10480,7 +10480,7 @@ local fading_joker = { -- +1 to all listed probabilities for the highest cat tag
1048010480
"set_cry_misc_joker",
1048110481
},
1048210482
},
10483-
name = "cry-paved_joker",
10483+
name = "cry-fading_joker",
1048410484
key = "fading_joker",
1048510485
atlas = "atlasone",
1048610486
pos = { x = 2, y = 6 },

lib/content.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ SMODS.Sound({
581581
if
582582
Cryptid_config.Cryptid
583583
and Cryptid_config.Cryptid.big_music
584-
and to_big(G.GAME.round_scores["hand"].amt) > to_big(10) ^ 1000000
584+
and to_big(G.GAME.round_scores["hand"].amt or 0) > to_big(10) ^ 1000000
585585
then
586586
G.GAME.cry_music_big = true
587587
return true

0 commit comments

Comments
 (0)