easy tweaks to things that make things

Author: lord-ruby

items/code.lua

@@ -4720,7 +4720,7 @@ local encoded = {
 	end,
 }
 -- Code Joker
--- Creates a Negative Code card when starting blind
+-- Creates a Code card when starting blind
 local CodeJoker = {
 	dependencies = {
 		items = {
@@ -4732,10 +4732,6 @@ local CodeJoker = {
 	name = "cry-CodeJoker",
 	key = "CodeJoker",
 	pos = { x = 2, y = 4 },
-	loc_vars = function(self, info_queue, center)
-		info_queue[#info_queue + 1] = { key = "e_negative_consumable", set = "Edition", config = { extra = 1 } }
-		return { key = Cryptid.gameset_loc(self, { exp_modest = "modest" }) }
-	end,
 	extra_gamesets = { "exp_modest" },
 	rarity = "cry_epic",
 	cost = 11,
@@ -4747,24 +4743,19 @@ local CodeJoker = {
 		if
 			context.setting_blind
 			and not (context.blueprint_card or self).getting_sliced
-			and (G.GAME.blind:get_type() == "Boss" or Cryptid.gameset(card) ~= "exp_modest")
 		then
-			play_sound("timpani")
-			local card = create_card("Code", G.consumeables, nil, nil, nil, nil)
-			card:set_edition({
-				negative = true,
-			})
-			card:add_to_deck()
-			G.consumeables:emplace(card)
-			card:juice_up(0.3, 0.5)
-			return nil, true
+			if #G.consumeables.cards + G.GAME.consumeable_buffer < G.consumeables.config.card_limit then
+				play_sound("timpani")
+				local card = create_card("Code", G.consumeables, nil, nil, nil, nil)
+				card:add_to_deck()
+				G.consumeables:emplace(card)
+				card:juice_up(0.3, 0.5)
+				return nil, true
+			end
 		end
 		if context.forcetrigger then
 			play_sound("timpani")
 			local card = create_card("Code", G.consumeables, nil, nil, nil, nil)
-			card:set_edition({
-				negative = true,
-			})
 			card:add_to_deck()
 			G.consumeables:emplace(card)
 			card:juice_up(0.3, 0.5)
@@ -4822,7 +4813,6 @@ local copypaste = {
 	order = 302,
 	config = {
 		extra = {
-			odds = 2,
 			ckt = nil,
 		},
 	}, -- what is a ckt
@@ -4832,13 +4822,8 @@ local copypaste = {
 	loc_vars = function(self, info_queue, card)
 		return {
 			vars = {
-				card and cry_prob(
-					math.min(card.ability.extra.odds / 2, card.ability.cry_prob or 1),
-					card.ability.extra.odds,
-					card.ability.cry_rigged
-				) or 1,
-				card and card.ability.extra.odds or 2,
-			}, -- this effectively prevents a copypaste from ever initially misprinting at above 50% odds. still allows rigging/oops
+				card.ability.extra.ckt and localize("cry_inactive") or localize("cry_active")
+			},
 			key = Cryptid.gameset_loc(self, { exp_modest = "modest" }),
 		}
 	end,
@@ -4874,35 +4859,26 @@ local copypaste = {
 			and not context.consumeable.beginning_end
 			and not card.ability.extra.ckt
 			and Cryptid.gameset(card) ~= "exp_modest"
+			and not card.ability.used
 		then
 			if #G.consumeables.cards + G.GAME.consumeable_buffer < G.consumeables.config.card_limit then
-				if
-					pseudorandom("cry_copypaste_joker")
-					< cry_prob(
-							math.min(card.ability.extra.odds / 2, card.ability.cry_prob),
-							card.ability.extra.odds,
-							card.ability.cry_rigged
-						)
-						/ card.ability.extra.odds
-				then
-					G.E_MANAGER:add_event(Event({
-						func = function()
-							local cards = copy_card(context.consumeable)
-							cards:add_to_deck()
-							G.consumeables:emplace(cards)
-							return true
-						end,
-					}))
-					card_eval_status_text(
-						context.blueprint_cards or card,
-						"extra",
-						nil,
-						nil,
-						nil,
-						{ message = localize("k_copied_ex") }
-					)
-					card.ability.extra.ckt = true
-				end
+				G.E_MANAGER:add_event(Event({
+					func = function()
+						local cards = copy_card(context.consumeable)
+						cards:add_to_deck()
+						G.consumeables:emplace(cards)
+						return true
+					end,
+				}))
+				card_eval_status_text(
+					context.blueprint_cards or card,
+					"extra",
+					nil,
+					nil,
+					nil,
+					{ message = localize("k_copied_ex") }
+				)
+				card.ability.extra.ckt = true
 			end
 		elseif
 			context.end_of_round

items/epic.lua

@@ -867,20 +867,16 @@ local M = {
 	demicoloncompat = true,
 	loc_vars = function(self, info_queue, center)
 		info_queue[#info_queue + 1] = G.P_CENTERS.j_jolly
-		if not center.edition or (center.edition and not center.edition.negative) then
-			info_queue[#info_queue + 1] = G.P_CENTERS.e_negative
-		end
 	end,
 	atlas = "atlasepic",
 	calculate = function(self, card, context)
 		if (context.setting_blind and not (context.blueprint_card or self).getting_sliced) or context.forcetrigger then
-			local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
-			card:set_edition({
-				negative = true,
-			})
-			card:add_to_deck()
-			G.jokers:emplace(card)
-			return nil, true
+			if #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit then
+				local card = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
+				card:add_to_deck()
+				G.jokers:emplace(card)
+				return nil, true
+			end
 		end
 	end,
 	pools = { ["M"] = true },
@@ -1946,11 +1942,10 @@ local fleshpanopticon = {
 	name = "cry-fleshpanopticon",
 	key = "fleshpanopticon",
 	pos = { x = 0, y = 5 },
-	config = { extra = { boss_size = 20 } },
+	config = { extra = { boss_size = 10 } },
 	dependencies = {
 		items = {
 			"set_cry_epic",
-			"c_cry_gateway",
 		},
 	},
 	immutable = true,
@@ -1959,7 +1954,7 @@ local fleshpanopticon = {
 	order = 146,
 	atlas = "atlasepic",
 	loc_vars = function(self, info_queue, center)
-		info_queue[#info_queue + 1] = { set = "Spectral", key = "c_cry_gateway" }
+		info_queue[#info_queue + 1] = { set = "Spectral", key = "c_cry_soul" }
 		if not center.edition or (center.edition and not center.edition.negative) then
 			info_queue[#info_queue + 1] = G.P_CENTERS.e_negative
 		end
@@ -2008,7 +2003,7 @@ local fleshpanopticon = {
 						nil,
 						nil,
 						nil,
-						Cryptid.enabled("c_cry_gateway") and "c_cry_gateway" or "c_soul",
+						"c_soul",
 						"sup"
 					)
 					card:set_edition({ negative = true }, true)

items/m.lua

@@ -846,13 +846,15 @@ local scrabble = {
 				< cry_prob(card.ability.cry_prob, card.ability.extra.odds, card.ability.cry_rigged)
 					/ card.ability.extra.odds
 			then
-				check = true
-				local card = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "scrabbletile")
-				if Cryptid.enabled("e_cry_m") == true then
-					card:set_edition({ cry_m = true })
+				if #G.jokers.cards + G.GAME.joker_buffer < G.jokers.config.card_limit then
+					check = true
+					local card = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "scrabbletile")
+					if Cryptid.enabled("e_cry_m") == true then
+						card:set_edition({ cry_m = true })
+					end
+					card:add_to_deck()
+					G.jokers:emplace(card)
 				end
-				card:add_to_deck()
-				G.jokers:emplace(card)
 			end
 			if check then
 				card_eval_status_text(
@@ -940,16 +942,20 @@ local sacrifice = {
 				if to_big(card.ability.extra.unc) < to_big(1) then
 					card.ability.extra.unc = 1
 				end
-				for i = 1, math.min(card.ability.immutable.max_spawns, card.ability.extra.jollies) do
-					local jolly = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
-					jolly:add_to_deck()
-					G.jokers:emplace(jolly)
-				end
 				for i = 1, math.min(card.ability.immutable.max_spawns, card.ability.extra.unc) do
-					local unc = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "sacrifice")
-					unc:add_to_deck()
-					G.jokers:emplace(unc)
-					unc:start_materialize()
+					if G.GAME.joker_buffer + #G.jokers.cards < G.jokers.config.card_limit then
+						local unc = create_card("Joker", G.jokers, nil, 0.9, nil, nil, nil, "sacrifice")
+						unc:add_to_deck()
+						G.jokers:emplace(unc)
+						unc:start_materialize()
+					end
+				end
+				for i = 1, math.min(card.ability.immutable.max_spawns, card.ability.extra.jollies) do
+					if G.GAME.joker_buffer + #G.jokers.cards < G.jokers.config.card_limit then
+						local jolly = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_jolly")
+						jolly:add_to_deck()
+						G.jokers:emplace(jolly)
+					end
 				end
 				card_eval_status_text(
 					context.blueprint_card or card,
@@ -1159,7 +1165,7 @@ local doodlem = {
 	config = {
 		extra = {
 			add = 1,
-			init = 2,
+			init = 1,
 		},
 		immutable = { max_jollies = 25 },
 	},

items/misc_joker.lua

@@ -9324,70 +9324,84 @@ local pity_prize = {
 	name = "cry-Pity-Prize",
 	key = "pity_prize",
 	pos = { x = 5, y = 5 },
-	config = {},
+	config = {
+		extra = {
+			active = true
+		}
+	},
 	rarity = 1,
 	cost = 2,
 	atlas = "atlastwo",
 	order = 129,
 	blueprint_compat = true,
 	demicoloncompat = true,
 	loc_vars = function(self, info_queue, center)
-		return { key = Cryptid.gameset_loc(self, { modest = "modest" }), vars = {} }
+		return { key = Cryptid.gameset_loc(self, { modest = "modest" }), vars = {
+			center.ability.extra.active and localize("cry_active") or localize("cry_inactive")
+		} }
 	end,
 	calculate = function(self, card, context)
+		if context.after then
+			card.ability.extra.active = true
+		end
 		if context.skipping_booster or context.forcetrigger then
-			local tag_key
-			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
-			-- this is my first time seeing repeat... wtf
-			local tag = Tag(tag_key)
-			tag.ability.shiny = Cryptid.is_shiny()
-			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
+			if card.ability.extra.active or context.forcetrigger then
+				if not context.forcetrigger then
+					card.ability.extra.active = false
+				end
+				local tag_key
+				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
+				-- this is my first time seeing repeat... wtf
+				local tag = Tag(tag_key)
+				tag.ability.shiny = Cryptid.is_shiny()
+				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_pity_prize"))
 				end
-				tag.ability.orbital_hand = pseudorandom_element(_poker_hands, pseudoseed("cry_pity_prize"))
-			end
-			add_tag(tag)
-			if
-				Card.get_gameset(card) == "modest"
-				and ((not context.blueprint and not context.retrigger_joker) or context.forcetrigger)
-			then
-				G.E_MANAGER:add_event(Event({
-					func = function()
-						play_sound("tarot1")
-						card.T.r = -0.2
-						card:juice_up(0.3, 0.4)
-						card.states.drag.is = true
-						card.children.center.pinch.x = true
-						G.E_MANAGER:add_event(Event({
-							trigger = "after",
-							delay = 0.3,
-							blockable = false,
-							func = function()
-								G.jokers:remove_card(card)
-								card:remove()
-								card = nil
-								return true
-							end,
-						}))
-						return true
-					end,
-				}))
-				card_eval_status_text(
-					card,
-					"extra",
-					nil,
-					nil,
-					nil,
-					{ message = localize("k_extinct_ex"), colour = G.C.FILTER }
-				)
+				add_tag(tag)
+				if
+					Card.get_gameset(card) == "modest"
+					and ((not context.blueprint and not context.retrigger_joker) or context.forcetrigger)
+				then
+					G.E_MANAGER:add_event(Event({
+						func = function()
+							play_sound("tarot1")
+							card.T.r = -0.2
+							card:juice_up(0.3, 0.4)
+							card.states.drag.is = true
+							card.children.center.pinch.x = true
+							G.E_MANAGER:add_event(Event({
+								trigger = "after",
+								delay = 0.3,
+								blockable = false,
+								func = function()
+									G.jokers:remove_card(card)
+									card:remove()
+									card = nil
+									return true
+								end,
+							}))
+							return true
+						end,
+					}))
+					card_eval_status_text(
+						card,
+						"extra",
+						nil,
+						nil,
+						nil,
+						{ message = localize("k_extinct_ex"), colour = G.C.FILTER }
+					)
+				end
+				return nil, true
 			end
-			return nil, true
 		end
 	end,
 	cry_credits = {
@@ -9798,8 +9812,8 @@ local huntingseason = { -- If played hand contains three cards, destroy the midd
 	pos = { x = 4, y = 5 },
 	order = 134,
 	immutable = true,
-	rarity = 2,
-	cost = 7,
+	rarity = 3,
+	cost = 8,
 	blueprint_compat = false,
 	atlas = "atlasone",
 	calculate = function(self, card, context)