Skip to content

Commit fabbf37

Browse files
Reduce Jank
1 parent 7463619 commit fabbf37

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

items/blind.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@ local joke = {
423423
boss = {
424424
min = 1,
425425
max = 10,
426-
yes_orb = true,
427426
},
428427
atlas = "blinds",
429428
order = 15,
@@ -448,14 +447,15 @@ local joke = {
448447
collection_loc_vars = function(self)
449448
return { vars = { "8", localize("cry_joke_placeholder") } }
450449
end,
451-
cry_calc_ante_gain = function(self)
452-
if to_big(G.GAME.chips) > to_big(G.GAME.blind.chips) * 2 then
453-
if G.GAME.round_resets.ante == 1 then
454-
G.GAME.cry_ach_conditions.the_jokes_on_you_triggered = true
450+
calculate = function(self, blind, context)
451+
if context.modify_ante and context.ante_end and not blind.disabled then
452+
if to_big(G.GAME.chips) > to_big(G.GAME.blind.chips) * 2 then
453+
if G.GAME.round_resets.ante == 1 then
454+
G.GAME.cry_ach_conditions.the_jokes_on_you_triggered = true
455+
end
456+
return { modify = G.GAME.win_ante - G.GAME.round_resets.ante % G.GAME.win_ante }
455457
end
456-
return G.GAME.win_ante - G.GAME.round_resets.ante % G.GAME.win_ante
457458
end
458-
return 1
459459
end,
460460
}
461461
local hammer = {

lib/overrides.lua

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2205,18 +2205,6 @@ G.FUNCS.unlock_all = function(e)
22052205
G.PROFILES[G.SETTINGS.profile].cry_none = (Cryptid.enabled("set_cry_poker_hand_stuff") == true)
22062206
end
22072207

2208-
-- Calc ante gain for The Joke (Scuffed)
2209-
local smods_calc = SMODS.calculate_context
2210-
function SMODS.calculate_context(context, return_table, no_resolve)
2211-
local aaa = smods_calc(context, return_table, no_resolve)
2212-
if context.modify_ante and context.ante_end then
2213-
if G.GAME.blind and G.GAME.blind:cry_calc_ante_gain() ~= 1 then
2214-
aaa.modify = G.GAME.blind:cry_calc_ante_gain()
2215-
end
2216-
end
2217-
return aaa
2218-
end
2219-
22202208
local scie = SMODS.calculate_individual_effect
22212209
function SMODS.calculate_individual_effect(effect, scored_card, key, amount, from_edition, ...)
22222210
local ret = scie(effect, scored_card, key, amount, from_edition, ...)

0 commit comments

Comments
 (0)