fix lovely patches, slow and steady (SpectralPack#698)

Author: crazybot27

lib/forcetrigger.lua

@@ -897,10 +897,16 @@ function Cryptid.forcetrigger(card, context)
 			end
 		end
 		if card.ability.name == "Perkeo" then
-			if G.consumeables.cards[1] then
+			local eligibleJokers = {}
+			for i = 1, #G.consumeables.cards do
+				if G.consumeables.cards[i].ability.consumeable then
+					eligibleJokers[#eligibleJokers + 1] = G.consumeables.cards[i]
+				end
+			end
+			if #eligibleJokers > 0 then
 				G.E_MANAGER:add_event(Event({
 					func = function()
-						local card = copy_card(pseudorandom_element(G.consumeables.cards, pseudoseed("perkeo")), nil)
+						local card = copy_card(pseudorandom_element(eligibleJokers, pseudoseed('perkeo')), nil)
 						card:set_edition({ negative = true }, true)
 						card:add_to_deck()
 						G.consumeables:emplace(card)

lovely/lib_misc.toml

@@ -42,15 +42,6 @@ end
 '''
 match_indent = true
 
-# Patch related crash
-[[patches]]
-[patches.pattern]
-target = "card.lua"
-pattern = "if not initial then G.GAME.blind:debuff_card(self) end"
-position = "at"
-payload = "if not initial and G.GAME and G.GAME.blind then G.GAME.blind:debuff_card(self) end"
-match_indent = true
-
 # Draw midground layer
 [[patches]]
 [patches.pattern]

lovely/misc.toml

@@ -58,6 +58,16 @@ if to_big(self.ability.x_mult) > to_big(1) then
 '''
 match_indent = true
 
+[[patches]]
+[patches.pattern]
+target = "card.lua"
+pattern = "if self.ability.x_mult - self.ability.extra <= 1 then"
+position = "at"
+payload = '''
+if to_big(self.ability.x_mult) - to_big(self.ability.extra) <= to_big(1) then 
+'''
+match_indent = true
+
 [[patches]]
 [patches.pattern]
 target = "card.lua"

lovely/none.toml

@@ -121,14 +121,14 @@ end
 '''
 position = "at"
 payload = '''
-    if self.ability.consumeable.max_highlighted then
-        if G.GAME.hands["cry_None"].visible then
-            Cryptid.reset_to_none()
-                    
-        else
-            update_hand_text({delay = 0}, {mult = 0, chips = 0, handname = '', level = ''})
-        end
+if self.ability.consumeable.max_highlighted then
+    if G.GAME.hands["cry_None"].visible then
+        Cryptid.reset_to_none()
+                
+    else
+        update_hand_text({delay = 0}, {mult = 0, chips = 0, handname = '', level = ''})
     end
+end
 '''
 match_indent = true
 

lovely/sticker.toml

@@ -121,7 +121,7 @@ match_indent = true
 [[patches]]
 [patches.pattern]
 target = "card.lua"
-pattern = "if self.ability.queue_negative_removal then"
+pattern = "if self.joker_added_to_deck_but_debuffed then"
 position = "before"
 payload = '''
 if self.ability.consumeable and self.pinned and (G.GAME.cry_pinned_consumeables > 0) then