Fixes #1077

Author: Eremel

lovely/card_limit.toml

@@ -254,22 +254,21 @@ position = "at"
 payload = """local hand_space = e
 local cards_to_draw = {}
 local space_taken = 0
-    local limit = G.hand.config.card_limit - #G.hand.cards - (SMODS.cards_to_draw or 0)
-    local unfixed = not G.hand.config.fixed_limit
-    local n = 0
-    while n < #G.deck.cards do
-        local card = G.deck.cards[#G.deck.cards-n]
-        local mod = unfixed and (card.ability.card_limit - card.ability.extra_slots_used) or 0
-        if limit - 1 + mod < 0 then
-        else    
-            limit = limit - 1 + mod
-            table.insert(cards_to_draw, card)
-            space_taken = space_taken + (1 - mod)
-            if limit <= 0 then break end
-        end
-        n = n + 1
+local limit = G.hand.config.card_limit - #G.hand.cards - (SMODS.cards_to_draw or 0)
+local unfixed = not G.hand.config.fixed_limit
+local n = 0
+while n < #G.deck.cards and limit > 0 do
+    local card = G.deck.cards[#G.deck.cards-n]
+    local mod = unfixed and (card.ability.card_limit - card.ability.extra_slots_used) or 0
+    if limit - 1 + mod < 0 then
+    else    
+        limit = limit - 1 + mod
+        table.insert(cards_to_draw, card)
+        space_taken = space_taken + (1 - mod)
     end
-    hand_space = #cards_to_draw
+    n = n + 1
+end
+hand_space = #cards_to_draw
 """
 match_indent = true
 

src/utils.lua

@@ -3186,9 +3186,9 @@ function CardArea:handle_card_limit()
     if SMODS.should_handle_limit(self) then
         self.config.card_limits.old_slots = self.config.card_limits.total_slots or 0
         self.config.card_limits.extra_slots = self:count_property('card_limit')
-        self.config.card_limits.total_slots = self:count_property('card_limit') + (self.config.card_limits.base or 0) + (self.config.card_limits.mod or 0)
+        self.config.card_limits.total_slots = self.config.card_limits.extra_slots + (self.config.card_limits.base or 0) + (self.config.card_limits.mod or 0)
         self.config.card_limits.extra_slots_used = self:count_property('extra_slots_used')
-        self.config.card_count = #self.cards + self:count_property('extra_slots_used')
+        self.config.card_count = #self.cards + self.config.card_limits.extra_slots_used
 
         if G.hand and self == G.hand and self.config.card_count + (SMODS.cards_to_draw or 0) < self.config.card_limits.total_slots then
             if G.STATE == G.STATES.DRAW_TO_HAND and not SMODS.blind_modifies_draw(G.GAME.blind.config.blind.key) and not SMODS.draw_queued then