bugfixes

Fixed:
://ALTTAB not being affected by Kitty Printer
Some Jokers displaying as blueprint-incompatible incorrectly (LeBaron James, Pity Prize)

Refactored shiny tag utility functions

Author: MathIsFun0

items/code.lua

@@ -3543,6 +3543,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" })
+		end
 		return { vars = { ret } }
 	end,
 	can_use = function(self, card)
@@ -3558,7 +3561,9 @@ local alttab = {
 				play_sound("tarot1")
 				local tag = nil
 				local type = G.GAME.blind:get_type()
-				if type == "Boss" then
+				if next(SMODS.find_card('j_cry_kittyprinter')) then
+					tag = Tag("tag_cry_cat")
+				elseif type == "Boss" then
 					tag = Tag(get_next_tag_key())
 				else
 					tag = Tag(G.GAME.round_resets.blind_tags[type])
@@ -4097,6 +4102,7 @@ local pointer = {
 			instantiate = "://INSTANTIATE",
 			inst = "://INSTANTIATE",
 			spaghetti = "://spaghetti",
+			alttab = "://alttab",
 			-- Tags
 			topuptag = "top-up tag",
 			gamblerstag = "gambler's tag",

items/m.lua

@@ -1061,7 +1061,7 @@ local smallestm = {
 			--This isn't retrigger joker compatible for some reason
 			if context.scoring_name == card.ability.extra.type then
 				local tag = Tag("tag_cry_double_m")
-				tag.ability.shiny = cry_rollshinybool()
+				tag.ability.shiny = Cryptid.is_shiny()
 				add_tag(tag)
 				play_sound("generic1", 0.9 + math.random() * 0.1, 0.8)
 				play_sound("holo1", 1.2 + math.random() * 0.1, 0.4)

items/misc_joker.lua

@@ -629,7 +629,7 @@ local pickle = {
 						end
 						tag.ability.orbital_hand = pseudorandom_element(_poker_hands, pseudoseed("cry_pickle_orbital"))
 					end
-					tag.ability.shiny = cry_rollshinybool()
+					tag.ability.shiny = Cryptid.is_shiny()
 					add_tag(tag)
 				end
 			end
@@ -7307,7 +7307,7 @@ local tax_fraud = {
 		},
 	},
 }
---TODO update desc
+
 local pity_prize = {
 	object_type = "Joker",
 	dependencies = {
@@ -7317,6 +7317,7 @@ local pity_prize = {
 	},
 	name = "cry-Pity-Prize",
 	key = "pity_prize",
+	blueprint_compat = true,
 	pos = { x = 5, y = 5 },
 	config = {},
 	rarity = 1,
@@ -7334,7 +7335,7 @@ local 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
 			-- this is my first time seeing repeat... wtf
 			local tag = Tag(tag_key)
-			tag.ability.shiny = cry_rollshinybool()
+			tag.ability.shiny = Cryptid.is_shiny()
 			if tag.name == "Orbital Tag" then
 				local _poker_hands = {}
 				for k, v in pairs(G.GAME.hands) do
@@ -7672,6 +7673,7 @@ local lebaron_james = {
 	key = "lebaron_james",
 	pos = { x = 2, y = 5 },
 	config = { extra = { h_mod = 1 } },
+	blueprint_compat = true,
 	rarity = 3,
 	cost = 6,
 	atlas = "atlasone",

items/tag.lua

@@ -332,7 +332,7 @@ local gambler = {
 				tag:yep("+", G.C.SECONDARY_SET.Spectral, function()
 					local emp = Tag("tag_cry_empowered")
 					if tag.ability.shiny then -- good fucking luck
-						emp.ability.shiny = cry_rollshinybool()
+						emp.ability.shiny = Cryptid.is_shiny()
 					end
 					add_tag(emp)
 					tag.triggered = true
@@ -396,7 +396,7 @@ local bundle = {
 				local tags = { "standard", "charm", "meteor", "buffoon" }
 				for i, v in ipairs(tags) do
 					local _tag = Tag("tag_" .. v)
-					_tag.ability.shiny = cry_rollshinybool()
+					_tag.ability.shiny = Cryptid.is_shiny()
 					add_tag(_tag)
 					if i == 1 then
 						tag.triggered = true

lib/misc.lua

@@ -738,3 +738,19 @@ function Controller:key_press_update(key, dt)
 		G.CHOOSE_CARD:align_to_major()
 	end
 end
+
+function Cryptid.roll_shiny()
+	local prob = 1
+	if next(SMODS.find_card('j_lucky_cat')) then prob = 3 end
+	if pseudorandom("cry_shiny") < prob / 4096 then
+		return 'shiny'
+	end
+	return 'normal'
+end
+
+function Cryptid.is_shiny()
+	if Cryptid.roll_shiny() == 'shiny' then 
+		return true
+	end
+	return false
+end

lib/modifiers.lua

@@ -783,7 +783,7 @@ function Tag:set_ability()
 		G.GAME.cry_shiny_choices[G.GAME.round_resets.ante] = G.GAME.cry_shiny_choices[G.GAME.round_resets.ante] or {}
 
 		if not G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] then
-			G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] = cry_rollshiny()
+			G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] = Cryptid.roll_shiny()
 		end
 		self.ability.shiny = G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] == "shiny"
 			and true

lovely/cat.toml

@@ -205,31 +205,6 @@ local tag_sprite = Sprite(0,0,_size*1,_size*1,tagatlas, (self.hide_ability) and
 '''
 match_indent = true
 
-# define function
-[[patches]]
-[patches.pattern]
-target = "functions/misc_functions.lua"
-pattern = "function save_run()"
-position = "before"
-payload = '''
-function cry_rollshiny()
-	local prob = 1
-	if next(SMODS.find_card('j_lucky_cat')) then prob = 3 end
-	if pseudorandom("cry_shiny") < prob / 4096 then
-		return 'shiny'
-	end
-	return 'normal'
-end
-
-function cry_rollshinybool()
-	if cry_rollshiny() == 'shiny' then 
-		return true
-	end
-	return false
-end
-'''
-match_indent = true
-
 # collection
 # nice pattern match?
 [[patches]]