revert some changes

Author: lord-ruby

Cryptid.lua

@@ -238,6 +238,7 @@ function SMODS.injectItems(...)
 	Cryptid.inject_pointer_aliases()
 
 	--this has to be here because the colors dont exist earlier then this
+	Cryptid.circus_rarities = Cryptid.circus_rarities or {}
 	Cryptid.circus_rarities["rare"] = { rarity = 3, base_mult = 2, order = 1, colour = G.C.RARITY.Rare }
 	Cryptid.circus_rarities["epic"] = { rarity = "cry_epic", base_mult = 3, order = 2, colour = G.C.RARITY.cry_epic }
 	Cryptid.circus_rarities["legendary"] = { rarity = 4, base_mult = 4, order = 3, colour = G.C.RARITY.Legendary }

items/epic.lua

@@ -1940,7 +1940,7 @@ local fleshpanopticon = {
 	name = "cry-fleshpanopticon",
 	key = "fleshpanopticon",
 	pos = { x = 0, y = 5 },
-	config = { extra = { boss_size = 10 } },
+	config = { extra = { boss_size = 20 } },
 	dependencies = {
 		items = {
 			"set_cry_epic",
@@ -1952,7 +1952,7 @@ local fleshpanopticon = {
 	order = 146,
 	atlas = "atlasepic",
 	loc_vars = function(self, info_queue, center)
-		info_queue[#info_queue + 1] = { set = "Spectral", key = "c_soul" }
+		info_queue[#info_queue + 1] = { set = "Spectral", key = "c_cry_gateway" }
 		if not center.edition or (center.edition and not center.edition.negative) then
 			info_queue[#info_queue + 1] = G.P_CENTERS.e_negative
 		end
@@ -1994,7 +1994,7 @@ local fleshpanopticon = {
 				trigger = "before",
 				delay = 0.0,
 				func = function()
-					local card = create_card(nil, G.consumeables, nil, nil, nil, nil, "c_soul", "sup")
+					local card = create_card(nil, G.consumeables, nil, nil, nil, nil, Cryptid.enabled("c_cry_gateway") and "c_cry_gateway" or "c_soul", "sup")
 					card:set_edition({ negative = true }, true)
 					card:add_to_deck()
 					G.consumeables:emplace(card)

items/misc_joker.lua

@@ -571,7 +571,7 @@ local whip = {
 	pos = { x = 5, y = 3 },
 	config = {
 		extra = {
-			Xmult_mod = 0.2,
+			Xmult_mod = 0.25,
 			x_mult = 1,
 		},
 	},
@@ -1912,7 +1912,7 @@ local waluigi = {
 	key = "waluigi",
 	pos = { x = 0, y = 3 },
 	soul_pos = { x = 1, y = 3 },
-	config = { extra = { Xmult = 1.4 } },
+	config = { extra = { Xmult = 1.5 } },
 	loc_vars = function(self, info_queue, center)
 		return { vars = { number_format(center.ability.extra.Xmult) } }
 	end,
@@ -3151,7 +3151,7 @@ local mondrian = {
 	pos = { x = 5, y = 3 },
 	config = {
 		extra = {
-			extra = 0.15,
+			extra = 0.25,
 			x_mult = 1,
 		},
 	},
@@ -7459,7 +7459,7 @@ local coin = {
 	pos = { x = 0, y = 2 },
 	config = {
 		extra = { money = 1 },
-		immutable = { money_mod = 5 },
+		immutable = { money_mod = 10 },
 	},
 	rarity = 1,
 	order = 53,
@@ -8610,7 +8610,7 @@ local kidnap = {
 	order = 23,
 	pos = { x = 1, y = 2 },
 	config = {
-		extra = { money = 2 },
+		extra = { money = 3 },
 	},
 	gameset_config = {
 		modest = {

items/spooky.lua

@@ -28,7 +28,13 @@ local cotton_candy = {
 					end
 				end
 			end
-			pseudorandom_element(jokers, pseudoseed("cry_cotton_candy")):set_edition({ negative = true })
+			pseudoshuffle(jokers, pseudoseed("cry_cotton_candy"))
+			if jokers[1] then
+				jokers[1]:set_edition({ negative = true })
+				if jokers[2] then
+					jokers[2]:set_edition({ negative = true })
+				end
+			end
 		end
 	end,
 }

items/voucher.lua

@@ -774,7 +774,7 @@ local moneybean = { -- Seed Money T3; Raise the cap on interest earned in each r
 		},
 	},
 	key = "moneybean",
-	config = { extra = 75 },
+	config = { extra = 100 },
 	atlas = "atlasvoucher",
 	order = 32668,
 	pos = { x = 5, y = 1 },

lib/misc.lua

@@ -1017,7 +1017,7 @@ function Cryptid.get_circus_description()
 	local desc = {}
 	local ind = 1
 	local extra_rarities = {}
-	for i, v in pairs(Cryptid.circus_rarities) do
+	for i, v in pairs(Cryptid.circus_rarities or {}) do
 		if not v.hidden then
 			extra_rarities[#extra_rarities + 1] = v
 		end
@@ -1573,4 +1573,4 @@ function end_round()
 			end
 		end
 	end
-end
+end

localization/en-us.lua

@@ -1441,7 +1441,7 @@ return {
 				name = "Cotton Candy",
 				text = {
 					"When sold, apply {C:dark_edition}Negative{}",
-					"to a {C:attention}random{} Joker",
+					"to two {C:attention}random{} Jokers",
 				},
 			},
 			j_cry_crustulum = {
@@ -2644,7 +2644,7 @@ return {
 					"{C:red}X#1#{} {C:attention}Boss Blind{} size",
 					"When {C:attention}Boss Blind{} is defeated,",
 					"{C:red}self destructs{}, and creates",
-					"a {C:dark_edition}Negative{} {C:spectral}Soul{} card",
+					"a {C:dark_edition}Negative{} {C:spectral}Gateway{} card",
 					'{C:inactive,s:0.8}"This prison... to hold... me?"',
 				},
 			},