Address all unnecessary update_hand_text calls (#1111)

Author: HuyTheKiller

lovely/scoring_calculation.toml

@@ -241,6 +241,33 @@ payload = '''
 ]]
 '''
 
+# Remove update_hand_text duplicates
+[[patches]]
+[patches.pattern]
+target = 'card.lua'
+match_indent = true
+position = 'at'
+pattern = '''
+update_hand_text({sound = 'button', volume = 0.7, pitch = 0.8, delay = 0.3}, {handname=localize(self.ability.consumeable.hand_type, 'poker_hands'),chips = G.GAME.hands[self.ability.consumeable.hand_type].chips, mult = G.GAME.hands[self.ability.consumeable.hand_type].mult, level=G.GAME.hands[self.ability.consumeable.hand_type].level})
+level_up_hand(used_tarot, self.ability.consumeable.hand_type)
+update_hand_text({sound = 'button', volume = 0.7, pitch = 1.1, delay = 0}, {mult = 0, chips = 0, handname = '', level = ''})
+'''
+payload = '''
+level_up_hand(used_tarot, self.ability.consumeable.hand_type)
+'''
+[[patches]]
+[patches.pattern]
+target = 'card.lua'
+match_indent = true
+position = 'at'
+pattern = '''
+update_hand_text({sound = 'button', volume = 0.7, pitch = 0.8, delay = 0.3}, {handname=localize(text, 'poker_hands'),chips = G.GAME.hands[text].chips, mult = G.GAME.hands[text].mult, level=G.GAME.hands[text].level})
+level_up_hand(context.blueprint_card or self, text, nil, 1)
+update_hand_text({sound = 'button', volume = 0.7, pitch = 1.1, delay = 0}, {mult = 0, chips = 0, handname = '', level = ''})
+'''
+payload = '''
+level_up_hand(context.blueprint_card or self, text, nil, 1)
+'''
 
 # Face down hands
 [[patches]]

lsp_def/utils.lua

@@ -243,7 +243,9 @@ SMODS.displaying_scoring = nil
 ---@param instant boolean
 ---@param amount? number
 -- Like level_up_hand(), but takes care of calling update_hand_text().
--- Tries to avoid calling update_hand_text() if unnecessary.
+-- Tries to avoid calling update_hand_text() if unnecessary.\
+-- Smart effect is already handled inside `SMODS.upgrade_poker_hands`.
+-- Downgrading this to plain wrapper for backwards compat.
 function SMODS.smart_level_up_hand(card, hand, instant, amount) end
 
 ---@param _type CardAreaTypes|string

src/utils.lua

@@ -1217,22 +1217,7 @@ SMODS.smart_level_up_hand = function(card, hand, instant, amount)
     -- Level ups in context.before on another hand AND any level up during scoring
     --     -> restore the current chips/mult
     -- Level ups outside anything -> always update to empty chips/mult
-    local vals_after_level
-    if SMODS.displaying_scoring and not (SMODS.displayed_hand == hand) then
-        vals_after_level = copy_table(G.GAME.current_round.current_hand)
-        local text,disp_text,_,_,_ = G.FUNCS.get_poker_hand_info(G.play.cards)
-        vals_after_level.handname = disp_text or ''
-        vals_after_level.level = (G.GAME.hands[text] or {}).level or ''
-        vals_after_level.chips = number_format(hand_chips) or 0
-        vals_after_level.mult = number_format(mult) or 0
-    end
-    if not (instant or SMODS.displayed_hand == hand) then
-        update_hand_text({sound = 'button', volume = 0.7, pitch = 0.8, delay = 0.3}, {handname=localize(hand, 'poker_hands'),chips = G.GAME.hands[hand].chips, mult = G.GAME.hands[hand].mult, level=G.GAME.hands[hand].level})
-    end
     level_up_hand(card, hand, instant, (type(amount) == 'number' or type(amount) == 'table') and amount or 1)
-    if not (instant or SMODS.displayed_hand == hand) then
-        update_hand_text({sound = 'button', volume = 0.7, pitch = 1.1, delay = 0}, vals_after_level or {mult = 0, chips = 0, handname = '', level = ''})
-    end
 end
 
 -- This function handles the calculation of each effect returned to evaluate play.
@@ -3271,6 +3256,7 @@ function SMODS.upgrade_poker_hands(args)
     -- args.parameters
     -- args.func
     -- args.level_up
+    -- args.instant
     -- args.from
 
     local function get_keys(t)
@@ -3316,10 +3302,10 @@ function SMODS.upgrade_poker_hands(args)
                 update_hand_text({nopulse = nil, delay = 0}, {[name] = p.current})
             end
         end
-        for _, parameter in ipairs(args.parameters) do
+        for i, parameter in ipairs(args.parameters) do
             G.GAME.hands[hand][parameter] = args.func(G.GAME.hands[hand][parameter], hand, parameter)
             if not instant then
-                G.E_MANAGER:add_event(Event({trigger = 'after', delay = 0.9, func = function()
+                G.E_MANAGER:add_event(Event({trigger = 'after', delay = i == 1 and 0.2 or 0.9, func = function()
                     play_sound('tarot1')
                     if args.from then args.from:juice_up(0.8, 0.5) end
                     G.TAROT_INTERRUPT_PULSE = true