Merge pull request #289 from Balatro-Multiplayer/toneblock-fixes

Oracle fixes

Author: stephenkirk

lovely/decks.toml

@@ -0,0 +1,39 @@
+[manifest]
+version = "1.0.0"
+dump_lua = true
+priority = 2147483600
+
+# max
+[[patches]]
+[patches.pattern]
+target = 'functions/common_events.lua'
+pattern = '''G.GAME.dollars = G.GAME.dollars + mod'''
+position = 'before'
+payload = '''
+if G.GAME.modifiers.oracle_max then
+	mod = oracle_apply_dollar_cap(mod, G.GAME.dollars, G.GAME.modifiers.oracle_max)
+	if oracle_should_show_max(mod, G.GAME.dollars, G.GAME.modifiers.oracle_max) then
+		text = "MAX"
+		col = G.C.RED
+	end
+end
+'''
+match_indent = true
+times = 1
+
+# show max alert
+# janky since we check the text instead of a condition but hey easily fixed
+[[patches]]
+[patches.pattern]
+target = 'functions/common_events.lua'
+pattern = '''        attention_text({
+          text = text..tostring(math.abs(mod)),'''
+position = 'before'
+payload = '''
+if text == "MAX" then
+	oracle_show_max_alert(dollar_UI)
+	return
+end
+'''
+match_indent = true
+times = 1

objects/decks/AA_oracle.lua

@@ -1,3 +1,24 @@
+function oracle_apply_dollar_cap(mod, current_dollars, max_dollars)
+	return math.min(max_dollars - current_dollars, mod)
+end
+
+function oracle_should_show_max(mod, current_dollars, max_dollars)
+	return mod == 0 and current_dollars >= max_dollars
+end
+
+function oracle_show_max_alert(dollar_UI)
+	attention_text({
+		text = "MAX",
+		scale = 0.8,
+		hold = 0.7,
+		cover = dollar_UI.parent,
+		cover_colour = G.C.RED,
+		align = "cm",
+	})
+	play_sound("timpani", 0.9, 0.7)
+	play_sound("timpani", 1.2, 0.7)
+end
+
 SMODS.Back({
 	key = "oracle",
 	config = { vouchers = { "v_clearance_sale" }, consumables = { "c_medium" } },
@@ -8,44 +29,3 @@ SMODS.Back({
 	end,
 	mp_credits = { art = { "aura!", "Ganpan140" }, code = { "Toneblock" } },
 })
-
--- billionth create card hook ever
-local ease_dollars_ref = ease_dollars
-function ease_dollars(mod, instant)
-	if G.GAME.modifiers.oracle_max then
-		local lmod = (G.GAME.dollar_buffer or 0) > 0 and mod or 0 -- this whole thing is really uncomfortable but seems to work
-		local dollars = G.GAME.dollars + ((G.GAME.dollar_buffer or 0) - lmod)
-		if mod >= 0 and dollars >= G.GAME.modifiers.oracle_max then -- recreate the function for max anim
-			local function _mod()
-				local dollar_UI = G.HUD:get_UIE_by_ID("dollar_text_UI")
-				dollar_UI.config.object:update()
-				G.HUD:recalculate()
-				attention_text({
-					text = "MAX",
-					scale = 0.8,
-					hold = 0.7,
-					cover = dollar_UI.parent,
-					cover_colour = G.C.RED,
-					align = "cm",
-				})
-				play_sound("timpani", 0.9, 0.7) -- timpani spam makes good sfx
-				play_sound("timpani", 1.2, 0.7)
-			end
-			if instant then
-				_mod()
-			else
-				G.E_MANAGER:add_event(Event({
-					trigger = "immediate",
-					func = function()
-						_mod()
-						return true
-					end,
-				}))
-			end
-			return
-		else
-			mod = math.min(mod, G.GAME.modifiers.oracle_max - dollars)
-		end
-	end
-	return ease_dollars_ref(mod, instant)
-end