Merge branch 'main' into draw

Author: Aurelius7309

lovely/better_calc.toml

@@ -1127,7 +1127,18 @@ match_indent = true
 payload = '''
 SMODS.calculate_context({buying_card = true, card = c1})
 '''
-
+# context.starting_shop
+[[patches]]
+[patches.pattern]
+target = 'game.lua'
+pattern = '''
+G.CONTROLLER:snap_to({node = G.shop:get_UIE_by_ID('next_round_button')})
+'''
+position = 'before'
+match_indent = true
+payload = '''
+if not nosave_shop then SMODS.calculate_context({starting_shop = true}) end
+'''
 # context.ending_shop
 [[patches]]
 [patches.pattern]

lovely/blind.toml

@@ -4,6 +4,43 @@ dump_lua = true
 priority = -10
 
 ### Blind API
+## elseif-ify some if chains
+[[patches]]
+[patches.regex]
+target = 'blind.lua'
+pattern = "end\n(?<indent>[\t ]*)if self.name == ['\"](?<ability>.*?)['\"]"
+position = 'at'
+payload = "elseif self.name == '$ability'"
+
+# revert the change for The Pillar
+[[patches]]
+[patches.regex]
+target = 'blind.lua'
+pattern = "(?<indent>[\t ]*)elseif self.name == 'The Pillar' and card.ability.played_this_ante then"
+position = 'at'
+line_prepend = '$indent'
+payload = '''end
+if self.name == 'The Pillar' and card.ability.played_this_ante then'''
+
+# revert the change for The Eye in debuff_hand
+[[patches]]
+[patches.regex]
+target = 'blind.lua'
+pattern = "(?<indent>[\t ]*)elseif self.name == 'The Eye' then"
+position = 'at'
+line_prepend = '$indent'
+payload = '''end
+if self.name == 'The Eye' then'''
+
+# revert the change for The Arm in debuff_hand
+[[patches]]
+[patches.regex]
+target = 'blind.lua'
+pattern = "(?<indent>[\t ]*)elseif self.name == 'The Arm' then"
+position = 'at'
+line_prepend = '$indent'
+payload = '''end
+if self.name == 'The Arm' then'''
 
 ## Set debuffed_by_blind, use it for Matador behavior
 ## Blind:debuff_card()
@@ -52,16 +89,17 @@ self.children.animatedSprite.atlas = G.ANIMATION_ATLAS[obj.atlas] or G.ANIMATION
 [[patches]]
 [patches.pattern]
 target = 'blind.lua'
-pattern = '--add new debuffs'
-position = 'before'
-match_indent = true
+pattern = "if self.name == 'The Eye' and not reset then"
+position = 'at'
 payload = '''
-if not reset then
-    local obj = self.config.blind
-    if obj.set_blind and type(obj.set_blind) == 'function' then
-        obj:set_blind()
-    end
-end'''
+if blind then
+    self.in_blind = true
+end
+local obj = self.config.blind
+if obj.set_blind and type(obj.set_blind) == 'function' then
+    obj:set_blind()
+elseif self.name == 'The Eye' and not reset then'''
+match_indent = true
 
 # Blind:disable()
 [[patches]]
@@ -99,7 +137,7 @@ match_indent = true
 payload = '''
 local obj = self.config.blind
 if not self.disabled and obj.recalc_debuff and type(obj.recalc_debuff) == 'function' then
-    if obj:recalc_debuff(card, from_blind) then 
+    if obj:recalc_debuff(card, from_blind) then
         card:set_debuff(true)
         if card.debuff then card.debuffed_by_blind = true end
     else
@@ -108,7 +146,7 @@ if not self.disabled and obj.recalc_debuff and type(obj.recalc_debuff) == 'funct
     return
 elseif not self.disabled and obj.debuff_card and type(obj.debuff_card) == 'function' then
     sendWarnMessage(("Blind object %s has debuff_card function, recalc_debuff is preferred"):format(obj.key), obj.set)
-    if obj:debuff_card(card, from_blind) then 
+    if obj:debuff_card(card, from_blind) then
         card:set_debuff(true)
         if card.debuff then card.debuffed_by_blind = true end
     else
@@ -141,7 +179,8 @@ payload = '''
 local obj = self.config.blind
 if obj.drawn_to_hand and type(obj.drawn_to_hand) == 'function' then
     obj:drawn_to_hand()
-end'''
+end
+'''
 
 # Blind:debuff_hand()
 [[patches]]

lovely/booster.toml

@@ -7,17 +7,37 @@ priority = -10
 
 # Card:open
 [[patches]]
-[patches.regex]
+[patches.pattern]
 target = "card.lua"
-pattern = '''(?<indent>[\t ]*)if self\.ability\.name:find\('Arcana'\) then \n[\s\S]{12}G\.STATE'''
-position = "before"
-payload = '''
+pattern = '''
+if self.ability.name:find('Arcana') then 
+            G.STATE = G.STATES.TAROT_PACK
+            G.GAME.pack_size = self.ability.extra
+        elseif self.ability.name:find('Celestial') then
+            G.STATE = G.STATES.PLANET_PACK
+            G.GAME.pack_size = self.ability.extra
+        elseif self.ability.name:find('Spectral') then
+            G.STATE = G.STATES.SPECTRAL_PACK
+            G.GAME.pack_size = self.ability.extra
+        elseif self.ability.name:find('Standard') then
+            G.STATE = G.STATES.STANDARD_PACK
+            G.GAME.pack_size = self.ability.extra
+        elseif self.ability.name:find('Buffoon') then
+            G.STATE = G.STATES.BUFFOON_PACK
+            G.GAME.pack_size = self.ability.extra
+        end
+
+        G.GAME.pack_choices = self.config.center.config.choose or 1'''
+match_indent = true
+position = "at"
+payload = """
 booster_obj = self.config.center
 if booster_obj and SMODS.Centers[booster_obj.key] then
     G.STATE = G.STATES.SMODS_BOOSTER_OPENED
     SMODS.OPENED_BOOSTER = self
-end'''
-line_prepend = '$indent'
+end
+G.GAME.pack_choices = self.ability.choose or self.config.center.config.choose or 1
+"""
 
 # Card:open
 [[patches]]

lovely/fixes.toml

@@ -35,7 +35,7 @@ pattern = "if G.SAVED_GAME ~= nil then G.SAVED_GAME = STR_UNPACK(G.SAVED_GAME) e
 position = 'after'
 match_indent = true
 payload = """
-if G.SAVED_GAME == nil then 
+if G.SAVED_GAME == nil then
     e.config.colour = G.C.UI.BACKGROUND_INACTIVE
     e.config.button = nil
     return _can_continue
@@ -168,7 +168,7 @@ if self.added_to_deck and old_center and not self.debuff then
     self:remove_from_deck()
     self.added_to_deck = true
 end
-if type(center) == 'string' then 
+if type(center) == 'string' then
     assert(G.P_CENTERS[center])
     center = G.P_CENTERS[center]
 end
@@ -351,7 +351,7 @@ payload = ""
 #
 
 ## create_UIBox_HUD
-[[patches]] 
+[[patches]]
 [patches.regex]
 target = "functions/UI_definitions.lua"
 pattern = '''
@@ -364,7 +364,7 @@ payload = '''
                             end,'''
 
 ## DynaText:update_text
-[[patches]] 
+[[patches]]
 [patches.pattern]
 target = "engine/text.lua"
 pattern = 'self.config.H = 0'
@@ -401,18 +401,6 @@ pattern = 'if G\.GAME\.blind then'
 position = "at"
 payload = "if G.GAME.blind and G.GAME.blind.in_blind then"
 
-# Blind:set_blind
-[[patches]]
-[patches.pattern]
-target = "blind.lua"
-match_indent = true
-pattern = "if not reset then"
-position = "after"
-payload = '''
-    if blind then
-        self.in_blind = true
-    end'''
-
 # end_round()
 [[patches]]
 [patches.pattern]
@@ -575,6 +563,19 @@ pattern = '''and \(G\.hand\.cards\[1\] or \(G\.hand\.config\.card_limit <= 0\)\)
 position = "at"
 payload = ''' '''
 
+# Fix prng calls on collection advancing seeds
+# Keep vanilla behaviour for to-do list
+[[patches]]
+[patches.pattern]
+target = "functions/misc_functions.lua"
+pattern = "if key == 'seed' then return math.random() end"
+position = "after"
+payload = """
+if G.SETTINGS.paused and key ~= 'to_do' then return math.random() end
+"""
+overwrite = true
+match_indent = true
+
 # Fixes Steam API not loading on unix
 [[patches]]
 [patches.pattern]
@@ -584,7 +585,7 @@ position = 'after'
 pattern = '--To control when steam communication happens, make sure to send updates to steam as little as possible'
 payload = '''local cwd = NFS.getWorkingDirectory()
 NFS.setWorkingDirectory(love.filesystem.getSourceBaseDirectory())
-''' 
+'''
 
 [[patches]]
 [patches.pattern]
@@ -593,7 +594,7 @@ match_indent = true
 position = 'before'
 pattern = '--Set up the render window and the stage for the splash screen, then enter the gameloop with :update'
 payload = '''NFS.setWorkingDirectory(cwd)
-''' 
+'''
 
 [[patches]]
 [patches.pattern]