Swap Necromancer lovely patch to hook

Author: Jevonnissocoolman

items/test.lua

@@ -119,7 +119,7 @@ local test3 = {
 		},
 	},
 	loc_vars = function(self, info_queue, card)
-		local a, b, c, d, e = Cryptid.enhanced_deck_info()
+		local a, b, c, d, e = 1, 2, 3, 4, 5
 		return { vars = { a, b, c, d, e } }
 	end,
 	cry_credits = {
@@ -190,4 +190,84 @@ local test4 = {
 		end
 	end,
 }
-return { items = { test, test2, test3, test4 }, disabled = true }
+local kidnap2 = {
+	object_type = "Joker",
+	name = "cry-kidnap2",
+	key = "kidnap2",
+	pos = { x = 1, y = 2 },
+	config = {
+		extra = 1,
+	},
+	rarity = 1,
+	cost = 4,
+	loc_txt = {
+		name = "asd",
+		text = {
+			"Earn {C:money}$#1#{} at end of round",
+			"per unique {C:attention}Type Mult{} or",
+			"{C:attention}Type Chips{} Joker sold this run",
+			"{C:inactive}(Currently {C:money}$#2#{C:inactive})",
+		},
+	},
+	blueprint_compat = false,
+	loc_vars = function(self, info_queue, center)
+		local value = 0
+		if G.GAME and G.GAME.jokers_sold then
+			for _, v in ipairs(G.GAME.jokers_sold) do
+				if
+					G.P_CENTERS[v].effect == "Type Mult"
+					or G.P_CENTERS[v].effect == "Cry Type Mult"
+					or G.P_CENTERS[v].effect == "Cry Type Chips"
+					or G.P_CENTERS[v].effect == "Boost Kidnapping"
+					or (
+						G.P_CENTERS[v].name == "Sly Joker"
+						or G.P_CENTERS[v].name == "Wily Joker"
+						or G.P_CENTERS[v].name == "Clever Joker"
+						or G.P_CENTERS[v].name == "Devious Joker"
+						or G.P_CENTERS[v].name == "Crafty Joker"
+					)
+				then
+					value = value + 1
+				end
+			end
+		end
+		return { vars = { center.ability.extra, center.ability.extra * value } }
+	end,
+	atlas = "atlasone",
+	calc_dollar_bonus = function(self, card)
+		local value = 0
+		for _, v in ipairs(G.GAME.jokers_sold) do
+			if
+				G.P_CENTERS[v].effect == "Type Mult"
+				or G.P_CENTERS[v].effect == "Cry Type Mult"
+				or G.P_CENTERS[v].effect == "Cry Type Chips"
+				or G.P_CENTERS[v].effect == "Boost Kidnapping"
+				or (
+					G.P_CENTERS[v].name == "Sly Joker"
+					or G.P_CENTERS[v].name == "Wily Joker"
+					or G.P_CENTERS[v].name == "Clever Joker"
+					or G.P_CENTERS[v].name == "Devious Joker"
+					or G.P_CENTERS[v].name == "Crafty Joker"
+				)
+			then
+				value = value + 1
+			end
+		end
+		if value == 0 then
+			return
+		end
+		return card.ability.extra * value
+	end,
+	cry_credits = {
+		idea = {
+			"Jevonn",
+		},
+		art = {
+			"Jevonn",
+		},
+		code = {
+			"Jevonn",
+		},
+	},
+}
+return { items = { test, test2, test3, test4, kidnap2 }, disabled = true }

lib/overrides.lua

@@ -176,6 +176,7 @@ function Game:init_game_object()
 	g.monstermult = 1
 	-- Create G.GAME.events when starting a run, so there's no errors
 	g.events = {}
+	g.jokers_sold = {}
 	return g
 end
 
@@ -474,6 +475,38 @@ function Card:set_cost()
 		self.sell_cost_label = 0
 	end
 end
+local sell_card_stuff = Card.sell_card
+function Card:sell_card()
+	if self.config.center.set == "Joker" then
+		if self.config.center.key ~= "j_cry_necromancer" then
+			local contained = false
+			for _, v in ipairs(G.GAME.jokers_sold) do
+				if v == self.config.center.key then
+					contained = true
+					break
+				end
+			end
+			if not contained then
+				table.insert(G.GAME.jokers_sold, self.config.center.key)
+			end
+		end
+		-- Add Jolly Joker to the pool if card was treated as Jolly Joker
+		if self:is_jolly() then
+			local contained = false
+			for _, v in ipairs(G.GAME.jokers_sold) do
+				if v == "j_jolly" then
+					contained = true
+					break
+				end
+			end
+			if not contained then
+				table.insert(G.GAME.jokers_sold, "j_jolly")
+			end
+		end
+	end
+	--G.P_CENTERS.j_jolly
+	sell_card_stuff(self)
+end
 
 -- Modify to display badges for credits and some gameset badges
 -- todo: make this optional

lovely/misc_joker.toml

@@ -20,23 +20,3 @@ position = "at"
 payload = "ret.playing_card = ret.playing_card or {}"
 match_indent = true
 
-# Necromancer - Joker Sell list
-[[patches]]
-[patches.pattern]
-target = "card.lua"
-pattern = 'local eval, post = eval_card(self, {selling_self = true})'
-position = "before"
-payload = '''
-if self.config.center.set == "Joker" and self.config.center.key ~= "j_cry_necromancer" then
-	if G.GAME.jokers_sold then
-		local contained = false
-		for i = 1, #G.GAME.jokers_sold do
-			if self.config.center.key == G.GAME.jokers_sold[i] then contained = true end
-		end
-		if not contained then table.insert(G.GAME.jokers_sold, self.config.center.key) end
-	else
-		G.GAME.jokers_sold = {self.config.center.key}
-	end
-end
-'''
-match_indent = true