Fix The Joke

Author: Jevonnissocoolman

lib/overrides.lua

@@ -2197,3 +2197,15 @@ G.FUNCS.unlock_all = function(e)
 	unlock_allref(e)
 	G.PROFILES[G.SETTINGS.profile].cry_none = (Cryptid.enabled("set_cry_poker_hand_stuff") == true)
 end
+
+-- Calc ante gain for The Joke (Scuffed)
+local smods_calc = SMODS.calculate_context
+function SMODS.calculate_context(context, return_table, no_resolve)
+	local aaa = smods_calc(context, return_table, no_resolve)
+	if context.modify_ante and context.ante_end then
+		if G.GAME.blind then
+			aaa.modify = G.GAME.blind:cry_calc_ante_gain() - 1
+		end
+	end
+	return aaa
+end

lovely/blind.toml

@@ -3,32 +3,6 @@ version = "1.0.0"
 dump_lua = true
 priority = -1
 
-# The Tax effect
-[[patches]]
-[patches.pattern]
-target = "functions/state_events.lua"
-pattern = "func = (function()  update_hand_text({delay = 0, immediate = true}, {mult = 0, chips = 0, chip_total = math.floor(hand_chips*mult), level = '', handname = ''});play_sound('button', 0.9, 0.6);return true end)"
-position = "at"
-payload = "func = (function()  update_hand_text({delay = 0, immediate = true}, {mult = 0, chips = 0, chip_total = G.GAME.blind.cry_cap_score and G.GAME.blind:cry_cap_score(math.floor(hand_chips*mult)) or math.floor(hand_chips*mult), level = '', handname = ''});play_sound('button', 0.9, 0.6);return true end)"
-match_indent = true
-
-[[patches]]
-[patches.pattern]
-target = "functions/state_events.lua"
-pattern = "ease_to = G.GAME.chips + math.floor(hand_chips*mult),"
-position = "at"
-payload = "ease_to = G.GAME.chips + (G.GAME.blind.cry_cap_score and G.GAME.blind:cry_cap_score(math.floor(hand_chips*mult)) or math.floor(hand_chips*mult)),"
-match_indent = true
-
-# Bunco (Magenta Dagger) and Cryptid (The Tax) compat
-[[patches]]
-[patches.pattern]
-target = 'functions/state_events.lua'
-pattern = "ease_to = G.GAME.chips + math.floor(hand_chips * mult) * (e and e.antiscore and -1 or 1),"
-position = 'at'
-match_indent = true
-payload = '''ease_to = G.GAME.chips + (G.GAME.blind.cry_cap_score and G.GAME.blind:cry_cap_score(math.floor(hand_chips*mult)) or math.floor(hand_chips*mult)) * (e and e.antiscore and -1 or 1),'''
-
 # Fix a crash related to undebuffing Jokers at end of round
 [[patches]]
 [patches.pattern]

lovely/stake.toml

@@ -287,13 +287,14 @@ match_indent = true
 # Sapphire Stake - ante tax
 # The Joke boss effect
 # Save game state for Revert
-[[patches]]
-[patches.pattern]
-target = "functions/state_events.lua"
-pattern = "delay(0.4); ease_ante(1); delay(0.4); check_for_unlock({type = 'ante_up', ante = G.GAME.round_resets.ante + 1})"
-position = "at"
-payload = "delay(0.4); ease_ante(G.GAME.blind and G.GAME.blind:cry_calc_ante_gain() or 1); Cryptid.apply_ante_tax(); delay(0.4); check_for_unlock({type = 'ante_up', ante = G.GAME.round_resets.ante + 1})"
-match_indent = true
+# this needs to be redone at a later point
+# [[patches]]
+#[patches.pattern]
+#target = "functions/state_events.lua"
+#pattern = "delay(0.4); ease_ante(1); delay(0.4); check_for_unlock({type = 'ante_up', ante = G.GAME.round_resets.ante + 1})"
+#position = "at"
+#payload = "delay(0.4); ease_ante(G.GAME.blind and G.GAME.blind:cry_calc_ante_gain() or 1); Cryptid.apply_ante_tax(); delay(0.4); check_for_unlock({type = 'ante_up', ante = G.GAME.round_resets.ante + 1})"
+#match_indent = true
 
 
 # Emerald Stake - Permanently flipped cards