pity prize + kitty printer fix / get_next_tag api

Author: lord-ruby

items/code.lua

@@ -4202,8 +4202,9 @@ local alttab = {
 				ret = "???"
 			end
 		end
-		if next(SMODS.find_card("j_cry_kittyprinter")) then
-			ret = localize({ type = "name_text", key = "tag_cry_cat", set = "Tag" })
+		local tag = Cryptid.get_next_tag()
+		if tag then
+			ret = localize({ type = "name_text", key = tag, set = "Tag" })
 		end
 		return { vars = { ret } }
 	end,
@@ -4220,8 +4221,9 @@ local alttab = {
 				play_sound("tarot1")
 				local tag = nil
 				local type = G.GAME.blind:get_type()
-				if next(SMODS.find_card("j_cry_kittyprinter")) then
-					tag = Tag("tag_cry_cat")
+				local tag_key = Cryptid.get_next_tag()
+				if tag_Key then
+					tag = Tag(tag_key)
 				elseif type == "Boss" then
 					tag = Tag(get_next_tag_key())
 				else
@@ -4245,8 +4247,9 @@ local alttab = {
 					play_sound("tarot1")
 					local tag = nil
 					local type = G.GAME.blind:get_type()
-					if next(SMODS.find_card("j_cry_kittyprinter")) then
-						tag = Tag("tag_cry_cat")
+					local tag_key = Cryptid.get_next_tag()
+					if tag_key then
+						tag = Tag(tag_key)
 					elseif type == "Boss" then
 						tag = Tag(get_next_tag_key())
 					else

items/misc_joker.lua

@@ -9399,6 +9399,12 @@ local pity_prize = {
 			repeat
 				tag_key = get_next_tag_key("cry_pity_prize")
 			until tag_key ~= "tag_boss" --I saw pickle not generating boss tags because it apparently causes issues, so I did the same here
+
+			local tag = Cryptid.get_next_tag()
+			if tag then
+				tag_key = tag
+			end
+
 			-- this is my first time seeing repeat... wtf
 			local tag = Tag(tag_key)
 			tag.ability.shiny = Cryptid.is_shiny()

lib/cross-mod.lua

@@ -117,9 +117,11 @@ if (SMODS.Mods["AntePreview"] or {}).can_load then
 			big = get_new_boss()
 		end
 		local predictions = predict_hook()
-		if next(SMODS.find_card("j_cry_kittyprinter")) then
-			predictions.Small.tag = "tag_cry_cat"
-			predictions.Big.tag = "tag_cry_cat"
+		local s = Cryptid.get_next_tag("Small")
+		local b = Cryptid.get_next_tag("Big")
+		if s or b then
+			predictions.Small.tag = s or predictions.Small.tag
+			predictions.Big.tag = b or predictions.Big.tag
 		end
 		if G.GAME.modifiers.cry_no_tags then
 			for _, pred in pairs(predictions) do

lib/misc.lua

@@ -1451,3 +1451,9 @@ function Cryptid.declare_hand_ascended_counter(hand, declarehand)
 	end
 	return total
 end
+
+function Cryptid.get_next_tag(override)
+	if next(SMODS.find_card("j_cry_kittyprinter")) then
+		return "tag_cry_cat"
+	end
+end

lovely/misc.toml

@@ -257,7 +257,7 @@ target = "functions/button_callbacks.lua"
 pattern = '''add_tag(_tag.config.ref_table)'''
 position = "at"
 payload = '''
-add_tag( next(SMODS.find_card('j_cry_kittyprinter')) and Tag('tag_cry_cat') or _tag.config.ref_table, true)
+add_tag(Cryptid.get_next_tag or _tag.config.ref_table, true)
 '''
 match_indent = true
 
@@ -436,8 +436,9 @@ target = "functions/UI_definitions.lua"
 pattern = "local _tag = Tag(G.GAME.round_resets.blind_tags[blind_choice], nil, blind_choice)"
 position = "after"
 payload = '''
-if next(SMODS.find_card('j_cry_kittyprinter')) then
-	_tag = Tag('tag_cry_cat', nil, blind_choice)
+local tag = Cryptid.get_next_tag()
+if tag then
+	_tag = Tag(tag, nil, blind_choice)
 end
 '''
 match_indent = true