Custom StatusText in update_hand_text (#1172)

Author: Gloompashcy

lovely/poker_hand_text.toml

@@ -0,0 +1,42 @@
+[manifest]
+version = "1.0.0"
+dump_lua = true
+priority = -5
+
+# statustext parameter in level_up_hand
+[[patches]]
+[patches.pattern]
+target = 'functions/common_events.lua'
+pattern = 'function level_up_hand(card, hand, instant, amount)'
+position = 'at'
+match_indent = true
+payload = 'function level_up_hand(card, hand, instant, amount, statustext)'
+
+# Allow custom StatusText values in update_hand_text
+[[patches]]
+[patches.regex]
+target = 'functions/common_events.lua'
+position = 'at'
+line_prepend = '$indent'
+pattern = '''(?<indent>[\t ]*)if vals\.StatusText[A-z0-9\n\t .~=()'\-+,<;>:{}]+config\.align\n[\t ]+\}\)\n[\t ]+end'''
+payload = '''
+if vals.StatusText then
+    local StatusText = {
+        text = delta,
+        scale = 0.8, 
+        hold = 1,
+        cover = G.hand_text_area[name].parent,
+        cover_colour = mix_colours(parameter.colour, col, 0.1),
+        emboss = 0.05,
+        align = 'cm',
+        cover_align = G.hand_text_area[name].parent.config.align
+    }
+    if type(vals.StatusText) == 'string' then StatusText.text = vals.StatusText
+    elseif type(vals.StatusText) == 'table' then
+        for k,v in pairs(vals.StatusText) do
+            if v ~= nil then StatusText[k] = v end
+        end
+    end
+    attention_text(StatusText)
+end
+'''

lovely/scoring_calculation.toml

@@ -238,7 +238,8 @@ SMODS.upgrade_poker_hands({
     end,
     level_up = amount,
     from = card,
-    instant = instant
+    instant = instant,
+    StatusText = statustext
 })
 --[[
 '''

lsp_def/utils.lua

@@ -763,9 +763,13 @@ function SMODS.is_active_blind(key, ignore_disabled) end
 ---@return boolean
 function SMODS.challenge_is_unlocked(challenge, k) end
 
----@param args table|{hands?: table, parameters?: table, level_up?: number|boolean, func?: fun(base: number, hand: string, param: string), instant?: boolean}
+---@param args table|{hands?: table, parameters?: table, level_up?: number|boolean, func?: fun(base: number, hand: string, param: string), instant?: boolean, StatusText?: boolean|string|table|fun(hand: string, parameter: string)}
 --- This functions handles upgrading poker hands in more complex ways. You can define
 --- a custom `func` to modify the values in specific ways. `hands` and `parameters` can
 --- be limited to specific ones, or default to using all of `G.GAME.hands` and `SMODS.Scoring_Parameters`.
 --- Use `level_up` to control whether the level of the hand is upgraded.
-    function SMODS.upgrade_poker_hands(args) end
+--- Use `StatusText` to control the text that appears when a parameter is upgraded, it can be:
+--- a string, which changes the displayed text, a boolean, which disables StatusText when set to `false`,
+--- a table, which defines the `attention_text` function settings, or a function that takes the key of
+--- the hand and scoring parameter being upgraded as arguments and returns a boolean, string or table
+    function SMODS.upgrade_poker_hands(args) end

src/utils.lua

@@ -1227,14 +1227,14 @@ G.FUNCS.update_suit_colours = function(suit, skin, palette_num)
     G.C.SUITS[suit] = new_colour_proto
 end
 
-SMODS.smart_level_up_hand = function(card, hand, instant, amount)
+SMODS.smart_level_up_hand = function(card, hand, instant, amount, statustext)
     -- Cases:
     -- Level ups in context.before on the played hand
     --     -> direct level_up_hand(), keep displaying
     -- 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
-    level_up_hand(card, hand, instant, (type(amount) == 'number' or type(amount) == 'table') and amount or 1)
+    level_up_hand(card, hand, instant, (type(amount) == 'number' or type(amount) == 'table') and amount or 1, statustext)
 end
 
 -- This function handles the calculation of each effect returned to evaluate play.
@@ -3295,6 +3295,7 @@ function SMODS.upgrade_poker_hands(args)
     -- args.level_up
     -- args.instant
     -- args.from
+    -- args.StatusText
 
     local function get_keys(t)
         local keys = {}
@@ -3311,7 +3312,7 @@ function SMODS.upgrade_poker_hands(args)
 
     if not args.func then
         for _, hand in ipairs(args.hands) do
-            level_up_hand(args.from, hand, instant, args.level_up or 1)
+            level_up_hand(args.from, hand, instant, args.level_up or 1, args.StatusText)
         end
         return
     end
@@ -3343,12 +3344,21 @@ function SMODS.upgrade_poker_hands(args)
             if G.GAME.hands[hand][parameter] then
                 G.GAME.hands[hand][parameter] = args.func(G.GAME.hands[hand][parameter], hand, parameter)
                 if not instant then
+                    local StatusText = true
+                    if args.StatusText ~= nil then
+                        if type(args.StatusText) == 'function' then
+                            local NewStatusText = args.StatusText(hand, parameter)
+                            if NewStatusText ~= nil then StatusText = NewStatusText end
+                        else
+                            StatusText = args.StatusText
+                        end
+                    end
                     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
                         return true end }))
-                    update_hand_text({delay = 0}, {[parameter] = G.GAME.hands[hand][parameter], StatusText = true})
+                    update_hand_text({delay = 0}, {[parameter] = G.GAME.hands[hand][parameter], StatusText = StatusText})
                 end
             end
         end