fix enhancement tarot forcetrigger

Author: lord-ruby

items/code.lua

@@ -2609,7 +2609,6 @@ local assemble = {
 				trigger = "after",
 				func = function()
 					local text = G.FUNCS.get_poker_hand_info(G.play.cards)
-					print(text)
 					upgrade_hand = G.GAME.hands[text]
 						or (G.PROFILES[G.SETTINGS.profile].cry_none and G.GAME.hands["cry_None"])
 					upgrade_hand.mult = upgrade_hand.mult + #G.jokers.cards

items/misc.lua

@@ -80,9 +80,6 @@ local eclipse = {
 		return { vars = { card and card.ability.max_highlighted or self.config.max_highlighted } }
 	end,
 	demicoloncompat = true,
-	force_use = function(self, card, area)
-		card:use_consumeable(area)
-	end,
 }
 -- Light (Enhancement)
 -- When triggered with 5 other cards, gain 0.2 Xmult
@@ -174,9 +171,6 @@ local seraph = {
 		return { vars = { card and card.ability.max_highlighted or self.config.max_highlighted } }
 	end,
 	demicoloncompat = true,
-	force_use = function(self, card, area)
-		card:use_consumeable(area)
-	end,
 }
 -- Abstract (Enhancement)
 -- Has its own rank/suit
@@ -309,9 +303,6 @@ local instability = {
 		return { vars = { card and card.ability.max_highlighted or self.config.max_highlighted } }
 	end,
 	demicoloncompat = true,
-	force_use = function(self, card, area)
-		card:use_consumeable(area)
-	end,
 }
 
 -- Blessing

lib/forcetrigger.lua

@@ -937,17 +937,19 @@ function Cryptid.forcetrigger(card, context)
 	elseif card.ability.consumeable and Cryptid.forcetriggerConsumableCheck(card) then
 		G.cry_force_use = true
 		if
-			(card.ability.consumeable.max_highlighted or card.ability.name == "Aura")
-			and not card.config.center.original_mod
+			(card.ability.consumeable.max_highlighted
+			or card.ability.name == "Aura") and not card.config.center.bulk_use
 		then --Cards that require cards in hand to be selected
 			local _cards = {}
 			local targets = {}
 
 			--Get all cards that we can target
 			for k, v in ipairs(G.hand.cards) do
 				if
-					not ((card.ability.name == "Aura") and (v.edition or v.will_be_editioned))
-					and not v.will_be_destroyed
+					not (
+						(card.ability.name == "Aura")
+						and (v.edition or v.will_be_editioned)
+					) and not v.will_be_destroyed
 				then
 					_cards[#_cards + 1] = v
 				end
@@ -1002,9 +1004,7 @@ function Cryptid.forcetrigger(card, context)
 			local ggpn = G.GAME.probabilities.normal
 			G.GAME.probabilities.normal = 1e9
 
-			if not card.config.center.force_use then
-				card:use_consumeable()
-			else
+			if not card.config.center.force_use then card:use_consumeable() else
 				card.config.center:force_use(card, card.area)
 			end
 

lib/misc.lua

@@ -969,7 +969,7 @@ function Cryptid.get_highlighted_cards(areas, ignore, min, max, blacklist, seed)
 		for i, v in pairs(cards) do
 			v.f_use_order = i
 		end
-		pseudoshuffle(cards, pseudoseed("forccehighlight" or seed))
+		pseudoshuffle(cards, pseudoseed("forcehighlight" or seed))
 		local actual = {}
 		for i = 1, max do
 			if cards[i] and not cards[i].checked and actual ~= ignore then

lovely/misc.toml

@@ -683,22 +683,4 @@ payload = '''
 local safe_seal = type(other.ability.seal) == "table" and other.ability.seal or {}
 for k, v in pairs(safe_seal) do
 '''
-match_indent = true
-
-
-[[patches]]
-[patches.pattern]
-target = "card.lua"
-pattern = '''
-    for i=1, #G.hand.highlighted do
-        G.E_MANAGER:add_event(Event({trigger = 'after',delay = 0.1,func = function() G.hand.highlighted[i]:set_ability(G.P_CENTERS[self.ability.consumeable.mod_conv]);return true end }))
-    end 
-'''
-position = "at"
-payload = '''
-	local cards = Cryptid.get_highlighted_cards({G.hand}, self, 1, self.ability.max_highlighted)
-    for i=1, #cards do
-        G.E_MANAGER:add_event(Event({trigger = 'after',delay = 0.1,func = function() cards[i]:set_ability(G.P_CENTERS[self.ability.consumeable.mod_conv]);return true end }))
-    end 
-'''
 match_indent = true