reuse some logic across all enhanced decks

Author: MathIsFun0

items/enhanced.lua

@@ -13,22 +13,13 @@ local e_deck = {
 	order = 17,
 	pos = { x = 5, y = 2 },
 	loc_vars = function(self, info_queue, center)
-		local aaa
-		-- Won't update to the correct value if it's switched while in a game and then viewing the new value while in that same game
-		-- Oh well
-		if G.GAME.modifiers.cry_force_edition and not G.GAME.viewed_back then 
-			aaa = G.GAME.modifiers.cry_force_edition
-		elseif self.config.cry_force_edition then
-			aaa = self.config.cry_force_edition
-		else
-			aaa = cry_get_enchanced_deck_info()
-		end
+		local aaa = cry_get_enchanced_deck_info(self)
 		return { vars = { localize{type = "name_text", set = "Edition", key = "e_" .. aaa} } }
 	end,
 	edeck_type = "edition",
 	config = {},
 	apply = function(self)
-		local aaa = cry_get_enchanced_deck_info()
+		local aaa = cry_get_enchanced_deck_info(self)
 		G.GAME.modifiers.cry_force_edition = aaa
 		--Ban Edition tags (They will never redeem)
 		for k, v in pairs(G.P_TAGS) do
@@ -46,6 +37,7 @@ local e_deck = {
 		}))
 	end
 }
+-- I set up some WIP tables for sprites here, will finish later
 local et_deck = {
 	object_type = "Back",
 	name = "cry-Enhancement Deck",
@@ -54,19 +46,15 @@ local et_deck = {
 	pos = { x = 5, y = 2},
 	edeck_type = "enhancement",
 	config = {},
+	sprites = {
+		default = { atlas = "centers", pos = { x = 5, y = 2 } },
+	},
 	loc_vars = function(self, info_queue, center)
-		local aaa,bbb
-		if G.GAME.modifiers.cry_force_enhancement and not G.GAME.viewed_back then 
-			bbb = G.GAME.modifiers.cry_force_enhancement
-		elseif self.config.cry_force_enhancement then
-			bbb = self.config.cry_force_enhancement
-		else
-			aaa,bbb = cry_get_enchanced_deck_info()
-		end
+		local _, bbb = cry_get_enchanced_deck_info(self)
 		return { vars = { localize{type = "name_text", set = "Enhanced", key = bbb} } }
 	end,
 	apply = function(self)
-		local aaa,bbb = cry_get_enchanced_deck_info()
+		local aaa,bbb = cry_get_enchanced_deck_info(self)
 		G.GAME.modifiers.cry_force_enhancement = bbb
 		G.E_MANAGER:add_event(Event({
 			func = function()
@@ -77,6 +65,10 @@ local et_deck = {
 			end,
 		}))
 	end,
+	draw = function(self, card)
+		-- Ensure atlas is up to date
+
+	end
 }
 local sk_deck = {
 	object_type = "Back",
@@ -87,19 +79,12 @@ local sk_deck = {
 	edeck_type = "sticker",
 	config = {},
 	loc_vars = function(self, info_queue, center)
-		local aaa,bbb,ccc
-		if G.GAME.modifiers.cry_force_sticker and not G.GAME.viewed_back then 
-			ccc = G.GAME.modifiers.cry_force_sticker
-		elseif self.config.cry_force_sticker then
-			ccc = self.config.cry_force_sticker
-		else
-			aaa,bbb,ccc = cry_get_enchanced_deck_info()
-		end
+		local _, _, ccc = cry_get_enchanced_deck_info(self)
 		if ccc == "pinned" then ccc = "pinned_left" end
 		return { vars = { localize{type = "name_text", set = "Other", key = ccc} } }
 	end,
 	apply = function(self)
-		local aaa,bbb,ccc = cry_get_enchanced_deck_info()
+		local aaa,bbb,ccc = cry_get_enchanced_deck_info(self)
 		G.GAME.modifiers.cry_force_sticker = ccc
 		G.E_MANAGER:add_event(Event({
 			func = function()
@@ -129,18 +114,11 @@ local st_deck = {
 	pos = { x = 5, y = 2},
 	edeck_type = "suit",
 	loc_vars = function(self, info_queue, center)
-		local aaa,bbb,ccc,ddd
-		if G.GAME.modifiers.cry_force_suit and not G.GAME.viewed_back then 
-			ddd = G.GAME.modifiers.cry_force_suit
-		elseif self.config.cry_force_suit then
-			ddd = self.config.cry_force_suit
-		else
-			aaa,bbb,ccc,ddd = cry_get_enchanced_deck_info()
-		end
+		local _, _, _, ddd = cry_get_enchanced_deck_info(self)
 		return { vars = { localize(ddd, 'suits_plural') } }
 	end,
 	apply = function(self)
-		local aaa,bbb,ccc,ddd = cry_get_enchanced_deck_info()
+		local aaa,bbb,ccc,ddd = cry_get_enchanced_deck_info(self)
 		if ddd == "Spades" then
 			G.GAME.bosses_used["bl_goad"] = 1e308
 		elseif ddd == "Hearts" then
@@ -170,18 +148,11 @@ local sl_deck = {
 	config = {},
 	edeck_type = "seal",
 	loc_vars = function(self, info_queue, center)
-		local aaa,bbb,ccc,ddd,eee
-		if G.GAME.modifiers.cry_force_seal and not G.GAME.viewed_back then 
-			eee = G.GAME.modifiers.cry_force_seal
-		elseif self.config.cry_force_seal then
-			eee = self.config.cry_force_seal
-		else
-			aaa,bbb,ccc,ddd,eee = cry_get_enchanced_deck_info()
-		end
+		local _, _, _, _, eee = cry_get_enchanced_deck_info(self)
 		return { vars = { localize{type = "name_text", set = "Other", key = eee:lower().."_seal"} } }
 	end,
 	apply = function(self)
-		local aaa,bbb,ccc,ddd,eee = cry_get_enchanced_deck_info()
+		local aaa,bbb,ccc,ddd,eee = cry_get_enchanced_deck_info(self)
 		G.GAME.modifiers.cry_force_seal = eee
 		G.E_MANAGER:add_event(Event({
 			func = function()

lib/misc.lua

@@ -515,7 +515,7 @@ function Blind:cry_calc_ante_gain()
 	end
 	return 1
 end
-function cry_get_enchanced_deck_info()
+function cry_get_enchanced_deck_info(deck)
 	--only accounts for vanilla stuff at the moment (WIP)
 	local edition, enhancement, sticker, suit, seal =
 	("e_"..safe_get(G.PROFILES, G.SETTINGS.profile, "cry_edeck_edition")) or "e_foil", 
@@ -529,7 +529,21 @@ function cry_get_enchanced_deck_info()
 	sticker = safe_get(SMODS.Stickers,sticker) and sticker or "eternal"
 	suit = safe_get(SMODS.Suits,suit) and suit or "Spades"
 	seal = safe_get(G.P_SEALS,seal) and seal or "Gold"
-	return edition, enhancement, sticker, suit, seal
+	local ret = {
+		edition = edition,
+		enhancement = enhancement,
+		sticker = sticker,
+		suit = suit,
+		seal = seal
+	}
+	for k, _ in pairs(ret) do
+		if G.GAME.modifiers["cry_force_"..k] and not G.GAME.viewed_back then
+			ret[k] = G.GAME.modifiers["cry_force_"..k]
+		elseif safe_get(deck,"config","cry_force_"..k) then
+			ret[k] = deck.config["cry_force_"..k]
+		end
+	end
+	return ret.edition, ret.enhancement, ret.sticker, ret.suit, ret.seal
 end
 function Cryptid.post_process(center)
 	if center.pools and center.pools.M then

lovely/enhanced.toml

@@ -41,7 +41,7 @@ if currentBack.effect.config.cry_antimatter or currentBack.effect.config.cry_for
 end
 --todo override for current run
 if currentBack.effect.center.edeck_type then
-    local edition, enhancement, sticker, suit, seal = cry_get_enchanced_deck_info()
+    local edition, enhancement, sticker, suit, seal = cry_get_enchanced_deck_info(currentBack)
     if currentBack.effect.center.edeck_type == 'edition' then
         self.children.back:draw_shader(edition, nil, self.ARGS.send_to_shader, true)
         if edition == 'negative' then