Fix keep_on_use in booster packs

lovely/booster.toml

@@ -127,21 +127,27 @@ position = "at"
 payload = "if G.STATE == G.STATES.SELECTING_HAND or G.STATE == G.STATES.TAROT_PACK or G.STATE == G.STATES.SPECTRAL_PACK or G.STATE == G.STATES.PLANET_PACK or G.STATE == G.STATES.SMODS_BOOSTER_OPENED then"
 match_indent = true
 
-# G.FUNC.use_card()
+# G.FUNCS.use_card()
 [[patches]]
 [patches.pattern]
 target = "functions/button_callbacks.lua"
 pattern = "if G.STATE == G.STATES.TAROT_PACK or G.STATE == G.STATES.PLANET_PACK or G.STATE == G.STATES.SPECTRAL_PACK then"
 position = "at"
-payload = "if G.STATE == G.STATES.TAROT_PACK or G.STATE == G.STATES.PLANET_PACK or G.STATE == G.STATES.SPECTRAL_PACK or G.STATE == G.STATES.SMODS_BOOSTER_OPENED and not nc then"
+payload = """
+if nc then
+    area:remove_from_highlighted(card)
+    play_sound('cardSlide2', nil, 0.3)
+    dont_dissolve = true
+end
+if (G.STATE == G.STATES.TAROT_PACK or G.STATE == G.STATES.PLANET_PACK or G.STATE == G.STATES.SPECTRAL_PACK or G.STATE == G.STATES.SMODS_BOOSTER_OPENED) then"""
 match_indent = true
 
 # G.FUNC.use_card()
 [[patches]]
 [patches.pattern]
 target = "functions/button_callbacks.lua"
-pattern = 'elseif G.GAME.pack_choices and G.GAME.pack_choices > 1 then'
-position = 'after'
+pattern = 'if area == G.consumeables then'
+position = 'before'
 match_indent = true
 payload = '''
 if nc and area == G.pack_cards then G.pack_cards:remove_card(card); G.consumeables:emplace(card) end'''

lovely/center.toml

@@ -410,19 +410,15 @@ if card.ability.consumeable then
         nc = obj:keep_on_use(card)
     end
 end
-if not nc and card.area then card.area:remove_card(card) end'''
+if card.area and (not nc or card.area == G.pack_cards) then card.area:remove_card(card) end'''
 
 [[patches]]
 [patches.pattern]
 target = 'functions/button_callbacks.lua'
 pattern = "else draw_card(G.hand, G.play, 1, 'up', true, card, nil, mute) end"
 match_indent = true
-position = 'before'
-payload = '''
-elseif nc then
-    area:remove_from_highlighted(card)
-    play_sound('cardSlide2', nil, 0.3)
-    dont_dissolve = true'''
+position = 'at'
+payload = '''elseif not nc then draw_card(G.hand, G.play, 1, 'up', true, card, nil, mute) end'''
 
 # Card:set_sprites()
 [[patches]]

version.lua

@@ -1 +1 @@
-return "1.0.0~ALPHA-1312c-STEAMODDED"
+return "1.0.0~ALPHA-1312d-STEAMODDED"