refactor: Fix joker config in get gamestate, add consumables, and add types

Author: stirby

src/lua/types.lua

@@ -80,7 +80,8 @@
 ---@field state any Current game state enum value
 ---@field game? GGame Game information (null if not in game)
 ---@field hand? GHand Hand information (null if not available)
----@field jokers GJokersCards[] Array of joker cards
+---@field jokers GJokers Jokers area object (with sub-field `cards`)
+---@field consumeables GConsumeables Consumables area object (typo intentional to match API)
 
 -- Game state (G.GAME)
 ---@class GGame
@@ -206,16 +207,37 @@
 ---@field suit string Card suit
 ---@field value string Card value
 
+---@class GCardAreaConfig
+---@field card_count number Number of cards currently present in the area
+---@field card_limit number Maximum cards allowed in the area
+
+---@class GJokers
+---@field config GCardAreaConfig Config for jokers card area
+---@field cards GJokersCard[] Array of joker card objects
+
+-- Keeping typo "consumeables" for compatibility with the runtime table name
+---@class GConsumeables
+---@field config GCardAreaConfig Configuration for the consumables slot
+
 -- Joker card (G.jokers.cards[])
----@class GJokersCards
+---@class GJokersCard
 ---@field label string Display label of the joker
----@field config GJokersCardsConfig Joker configuration
+---@field cost number Purchase cost of the joker
+---@field config GJokersCardConfig Joker card configuration
 
 -- Joker card configuration (G.jokers.cards[].config)
----@class GJokersCardsConfig
+---@class GJokersCardConfig
 ---@field center table Center configuration for joker
----@field card_count number Number of cards in joker area
----@field card_limit number Maximum number of cards in joker area
+
+-- Consumable card (G.consumeables.cards[])
+---@class GConsumablesCard
+---@field label string Display label of the consumable
+---@field cost number Purchase cost of the consumable
+---@field config GConsumablesCardConfig Consumable configuration
+
+-- Consumable card configuration (G.consumeables.cards[].config)
+---@class GConsumablesCardConfig
+---@field center table Center configuration for consumable
 
 -- =============================================================================
 -- Utility Module (implemented in utils.lua)
@@ -264,3 +286,8 @@
 ---@field dt number Tells the game that every update is dt seconds long
 ---@field max_fps integer? Maximum frames per second
 ---@field vsync_enabled boolean Whether vertical sync is enabled
+
+-- =============================================================================
+-- New composite area types (match utils.lua)
+-- =============================================================================
+

src/lua/utils.lua

@@ -307,6 +307,15 @@ function utils.get_game_state()
     }
   end
 
+  -- Keeping typo for consistency
+  local consumeables = {}
+  if G.consumeables and G.consumeables.config then
+    consumeables.config = {
+      card_count = G.consumeables.config.card_count, -- int (default 0), -- number of consumable cards in the shop
+      card_limit = G.consumeables.config.card_limit, -- int (default 2), -- max number of consumable cards in the shop
+    }
+  end
+
   local hand = nil
   if G.hand then
     local cards = {}
@@ -370,8 +379,8 @@ function utils.get_game_state()
   }
   if G.jokers then
 
-    jokers.card_limit = G.jokers.card_limit
-    jokers.card_count = G.jokers.card_count
+    jokers.config.card_limit = G.jokers.config.card_limit
+    jokers.config.card_count = G.jokers.config.card_count
     if G.jokers.cards then
       for i, card in pairs(G.jokers.cards) do
         jokers.cards[i] = {
@@ -495,6 +504,7 @@ function utils.get_game_state()
     shop_jokers = shop_jokers, -- NOTE: This contains all cards in the shop, not only jokers.
     shop_vouchers = shop_vouchers,
     shop_booster = shop_booster,
+    consumeables = consumeables,
   }
 end