make all shinies obtainable

Author: Toneblock

items/code.lua

@@ -1275,6 +1275,7 @@ local rework = {
 		end
 		tag.ability.rework_key = jkr.config.center.key
 		tag.ability.rework_edition = G.P_CENTER_POOLS.Edition[found_index].key
+		tag.ability.shiny = cry_rollshinybool()
 		add_tag(tag)
 		--SMODS.Tags.tag_cry_rework.apply(tag, {type = "store_joker_create"})
 		G.E_MANAGER:add_event(Event({

items/m.lua

@@ -1024,7 +1024,9 @@ local smallestm = {
 		if context.cardarea == G.jokers and context.before then
 			--This isn't retrigger joker compatible for some reason
 			if context.scoring_name == card.ability.extra.type then
-				add_tag(Tag("tag_cry_double_m"))
+				local tag = Tag("tag_cry_double_m")
+				tag.ability.shiny = cry_rollshinybool()
+				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)
 				card_eval_status_text(context.blueprint_card or card, "extra", nil, nil, nil, {

items/misc_joker.lua

@@ -541,19 +541,21 @@ local pickle = {
 	calculate = function(self, card, context)
 		if context.skip_blind then
 			for i = 1, math.min(20, card.ability.extra.tags) do
-				local tag = Tag(get_next_tag_key("cry_pickle"))
-				if tag.name == "Orbital Tag" then
-					local _poker_hands = {}
-					for k, v in pairs(G.GAME.hands) do
-						if v.visible then
-							_poker_hands[#_poker_hands + 1] = k
-						end
-					end
-					tag.ability.orbital_hand = pseudorandom_element(_poker_hands, pseudoseed("cry_pickle_orbital"))
-				end
-				if tag.name == "Boss Tag" then
+				local tag_key = get_next_tag_key("cry_pickle")
+				if tag_key == "tag_boss" then
 					i = i - 1 --skip these, as they can cause bugs with pack opening from other tags
 				else
+					local tag = Tag(tag_key)
+					if tag.name == "Orbital Tag" then
+						local _poker_hands = {}
+						for k, v in pairs(G.GAME.hands) do
+							if v.visible then
+								_poker_hands[#_poker_hands + 1] = k
+							end
+						end
+						tag.ability.orbital_hand = pseudorandom_element(_poker_hands, pseudoseed("cry_pickle_orbital"))
+					end
+					tag.ability.shiny = cry_rollshinybool()
 					add_tag(tag)
 				end
 			end
@@ -580,7 +582,7 @@ local pickle = {
 					nil,
 					nil,
 					{
-						message = "-"..localize({ type = "variable", key = "a_tag" .. (card.ability.extra.tags > 1 and "s" or ""), vars = { card.ability.extra.tags } })[1],
+						message = "-"..localize({ type = "variable", key = "a_tag" .. (card.ability.extra.tags_mod > 1 and "s" or ""), vars = { card.ability.extra.tags_mod } })[1],
 						colour = G.C.FILTER,
 					}
 				)
@@ -6560,10 +6562,13 @@ local pity_prize = {
 	end,
 	calculate = function(self, card, context)
 		if context.skipping_booster then
-			local tag
+			local tag_key
 			repeat
-				tag = Tag(get_next_tag_key("cry_pity_prize"))
-			until tag.name ~= "Boss Tag" and tag.name ~= "Gambler's Tag" and tag.name ~= "Empowered Tag" --I saw pickle not generating boss tags because it apparently causes issues, so I did the same here
+				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
+			-- this is my first time seeing repeat... wtf
+			local tag = Tag(tag_key)
+			tag.ability.shiny = cry_rollshinybool()
 			if tag.name == "Orbital Tag" then
 				local _poker_hands = {}
 				for k, v in pairs(G.GAME.hands) do

items/tag.lua

@@ -193,27 +193,35 @@ local gambler = {
 	order = 13,
 	atlas = "tag_cry",
 	pos = { x = 2, y = 0 },
-	config = { type = "immediate", odds = 4 },
+	config = { type = "new_blind_choice", odds = 4 },
 	min_ante = 2,
 	key = "gambler",
 	loc_vars = function(self, info_queue)
 		info_queue[#info_queue + 1] = G.P_CENTERS.tag_cry_empowered
 		return { vars = { G.GAME.probabilities.normal or 1, self.config.odds } }
 	end,
 	apply = function(self, tag, context)
-		if context.type == "immediate" then
+		if context.type == "new_blind_choice" then
 			if pseudorandom("cry_gambler_tag") < G.GAME.probabilities.normal / tag.config.odds then
 				local lock = tag.ID
             			G.CONTROLLER.locks[lock] = true
 				tag:yep('+', G.C.SECONDARY_SET.Spectral,function() 
-                    			local tag = Tag("tag_cry_empowered")
-					add_tag(tag)
+                    			local emp = Tag("tag_cry_empowered")
+					if tag.ability.shiny then	-- good fucking luck
+						emp.ability.shiny = cry_rollshinybool()
+					end
+					add_tag(emp)
+					emp:apply_to_run({type = 'new_blind_choice'})
                     			G.CONTROLLER.locks[lock] = nil
                     			return true
                 		end)
 			else
 				tag:nope()
+				for i = 1, #G.GAME.tags do
+					if G.GAME.tags[i]:apply_to_run({type = 'new_blind_choice'}) then break end
+				end
 			end
+
                 	tag.triggered = true
                 	return true
 		end
@@ -225,7 +233,7 @@ local bundle = {
 	order = 16,
 	atlas = "tag_cry",
 	pos = { x = 0, y = 0 },
-	config = { type = "immediate" },
+	config = { type = "new_blind_choice" },
 	key = "bundle",
 	min_ante = 2,
 	loc_vars = function(self, info_queue)
@@ -236,14 +244,19 @@ local bundle = {
 		return { vars = {} }
 	end,
 	apply = function(self, tag, context)
-		if context.type == "immediate" then
+		if context.type == "new_blind_choice" then
 			local lock = tag.ID
 			G.CONTROLLER.locks[lock] = true
 			tag:yep("+", G.C.ATTENTION, function()
-				add_tag(Tag("tag_standard"))
-				add_tag(Tag("tag_charm"))
-				add_tag(Tag("tag_meteor"))
-				add_tag(Tag("tag_buffoon"))
+				local tags = {'standard', 'charm', 'meteor', 'buffoon'}
+				for i, v in ipairs(tags) do
+					local _tag = Tag("tag_"..v)
+					_tag.ability.shiny = cry_rollshinybool()
+					add_tag(_tag)
+					if i == 1 then
+						_tag:apply_to_run({type = 'new_blind_choice'})
+					end
+				end
 				G.CONTROLLER.locks[lock] = nil
 				return true
 			end)

lib/misc.lua

@@ -399,7 +399,6 @@ function set_profile_progress()
 			if Cryptid.shinytagdata[k] == nil then
 				Cryptid.shinytagdata.init = true
 				Cryptid.shinytagdata[k] = false
-				print(k)
 			end
 		end
 	end

lib/modifiers.lua

@@ -686,7 +686,6 @@ 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
-			print("rolling")
 			G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] = cry_rollshiny()
 		end
 		self.ability.shiny = G.GAME.cry_shiny_choices[G.GAME.round_resets.ante][self.ability.blind_type] == 'shiny' and true
@@ -711,7 +710,6 @@ function cry_shinytag_tally()
 			ret = ret + 1
 		end
 	end
-	print(ret)
 	return ret
 end
 

lovely/cat.toml

@@ -216,7 +216,6 @@ 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
-		print("true")
 		return 'shiny'
 	end
 	return 'normal'
@@ -334,11 +333,6 @@ position = "after"
 payload = '''
 local cryptidsave = STR_UNPACK(get_compressed(G.SETTINGS.profile..'/'..'cryptidsave.jkr') or 'return {}')
 
-for k, v in pairs(cryptidsave) do
-	print('loaded CRYPTIDSAVE')
-	print(k)
-end
-
 if cryptidsave and cryptidsave.shinytags then
 	Cryptid.shinytagdata = copy_table(cryptidsave.shinytags)
 else