Fix Curate and Conveyor Deck

Conveyor Deck now doesn't let you move Jokers around

Curate and Edition Decks cause Edition Tags to Nope!

Author: MathIsFun0

items/tag.lua

@@ -519,6 +519,7 @@ local glitched_tag = {
 	apply = function(self, tag, context)
 		if context.type == "store_joker_modify" then
 			local _applied = nil
+			if cry_forced_edition() then tag:nope() end
 			if not context.card.edition and not context.card.temp_edition and context.card.ability.set == "Joker" then
 				local lock = tag.ID
 				G.CONTROLLER.locks[lock] = true
@@ -571,6 +572,7 @@ local oversat_tag = {
 	apply = function(self, tag, context)
 		if context.type == "store_joker_modify" then
 			local _applied = nil
+			if cry_forced_edition() then tag:nope() end
 			if not context.card.edition and not context.card.temp_edition and context.card.ability.set == "Joker" then
 				local lock = tag.ID
 				G.CONTROLLER.locks[lock] = true
@@ -623,6 +625,7 @@ local mosaic_tag = {
 	apply = function(self, tag, context)
 		if context.type == "store_joker_modify" then
 			local _applied = nil
+			if cry_forced_edition() then tag:nope() end
 			if not context.card.edition and not context.card.temp_edition and context.card.ability.set == "Joker" then
 				local lock = tag.ID
 				G.CONTROLLER.locks[lock] = true
@@ -675,6 +678,7 @@ local gold_tag = {
 	apply = function(self, tag, context)
 		if context.type == "store_joker_modify" then
 			local _applied = nil
+			if cry_forced_edition() then tag:nope() end
 			if not context.card.edition and not context.card.temp_edition and context.card.ability.set == "Joker" then
 				local lock = tag.ID
 				G.CONTROLLER.locks[lock] = true
@@ -727,6 +731,7 @@ local glass_tag = {
 	apply = function(self, tag, context)
 		if context.type == "store_joker_modify" then
 			local _applied = nil
+			if cry_forced_edition() then tag:nope() end
 			if not context.card.edition and not context.card.temp_edition and context.card.ability.set == "Joker" then
 				local lock = tag.ID
 				G.CONTROLLER.locks[lock] = true
@@ -779,6 +784,7 @@ local blur_tag = {
 	apply = function(self, tag, context)
 		if context.type == "store_joker_modify" then
 			local _applied = nil
+			if cry_forced_edition() then tag:nope() end
 			if not context.card.edition and not context.card.temp_edition and context.card.ability.set == "Joker" then
 				local lock = tag.ID
 				G.CONTROLLER.locks[lock] = true
@@ -832,6 +838,7 @@ local astral_tag = {
 	apply = function(self, tag, context)
 		if context.type == "store_joker_modify" then
 			local _applied = nil
+			if cry_forced_edition() then tag:nope() end
 			if not context.card.edition and not context.card.temp_edition and context.card.ability.set == "Joker" then
 				local lock = tag.ID
 				G.CONTROLLER.locks[lock] = true
@@ -884,6 +891,7 @@ local m_tag = {
 	apply = function(self, tag, context)
 		if context.type == "store_joker_modify" then
 			local _applied = nil
+			if cry_forced_edition() then tag:nope() end
 			if not context.card.edition and not context.card.temp_edition and context.card.ability.set == "Joker" then
 				local lock = tag.ID
 				G.CONTROLLER.locks[lock] = true

lib/misc.lua

@@ -708,3 +708,9 @@ function reload_cryptid_localization()
 	SMODS.handle_loc_file(Cryptid.path)
 	return init_localization()
 end
+
+-- Checks if all jokers in shop will have editions (via Curate, Edition Decks, etc.)
+-- Will cause edition tags to Nope!
+function cry_forced_edition()
+	return G.GAME.modifiers.cry_force_edition or G.GAME.used_vouchers.v_cry_curate
+end

lovely/Voucher.toml

@@ -29,9 +29,6 @@ self.shop_cry_bonusvoucher = cardTable.shop_cry_bonusvoucher
 '''
 match_indent = true
 
-
-
-
 # get rid of this dumb hackfix in :redeem()
 # also track vouchers redeemed
 [[patches]]

lovely/conveyor.toml

@@ -3,13 +3,13 @@ version = "1.0.0"
 dump_lua = true
 priority = -1
 
-# Don't sort cards
+# Conveyor Deck - Don't sort cards
 [[patches]]
 [patches.pattern]
 target = "cardarea.lua"
-pattern = "table.sort(self.cards, function (a, b) return a.T.x + a.T.w/2 - 100*(a.pinned and a.sort_id or 0) < b.T.x + b.T.w/2 - 100*(b.pinned and b.sort_id or 0) end)"
+pattern = "table.sort(self.cards, function (a, b) return a.T.x + a.T.w/2 - 100*((a.pinned and not a.ignore_pinned) and a.sort_id or 0) < b.T.x + b.T.w/2 - 100*((b.pinned and not b.ignore_pinned) and b.sort_id or 0) end)"
 position = "at"
-payload = "if not G.GAME.modifiers.cry_conveyor then table.sort(self.cards, function (a, b) return a.T.x + a.T.w/2 - 100*(a.pinned and a.sort_id or 0) < b.T.x + b.T.w/2 - 100*(b.pinned and b.sort_id or 0) end) end"
+payload = "if not G.GAME.modifiers.cry_conveyor then table.sort(self.cards, function (a, b) return a.T.x + a.T.w/2 - 100*((a.pinned and not a.ignore_pinned) and a.sort_id or 0) < b.T.x + b.T.w/2 - 100*((b.pinned and not b.ignore_pinned) and b.sort_id or 0) end) end"
 match_indent = true
 
 # Start of round effects

lovely/misc.toml

@@ -482,3 +482,13 @@ payload = '''
 	G.cry_edeck_select = nil
 '''
 match_indent = true
+# Make vanilla edition tags Nope! if all jokers in shop have editions
+[[patches]]
+[patches.pattern]
+target = "tag.lua"
+pattern = "local _applied = nil"
+position = "after"
+payload = '''
+if cry_forced_edition() then self:nope() end
+'''
+match_indent = true

lovely/stake.toml

@@ -165,17 +165,15 @@ position = "at"
 payload = "for i = 1, G.GAME.modifiers.cry_no_boosters and 0 or G.GAME.modifiers.cry_booster_packs or 2 do"
 match_indent = true
 
-
 # Quartz Stake - pinned effect applies in every type of slot
 [[patches]]
 [patches.pattern]
 target = "cardarea.lua"
 pattern = "table.sort(self.cards, function (a, b) return a.T.x + a.T.w/2 < b.T.x + b.T.w/2 end)"
 position = "at"
-payload = "table.sort(self.cards, function (a, b) return a.T.x + a.T.w/2 - 100*(a.pinned and a.sort_id or 0) < b.T.x + b.T.w/2 - 100*(b.pinned and b.sort_id or 0) end)"
+payload = "table.sort(self.cards, function (a, b) return a.T.x + a.T.w/2 - 100*((a.pinned and not a.ignore_pinned) and a.sort_id or 0) < b.T.x + b.T.w/2 - 100*((b.pinned and not b.ignore_pinned) and b.sort_id or 0) end)"
 match_indent = true
 
-
 # Quartz Stake - render pinned sticker
 [[patches]]
 [patches.pattern]