core stuff

Author: lord-ruby

items/code.lua

@@ -1221,9 +1221,7 @@ local rework = {
 		return #cards == 1
 			and not cards[1].ability.eternal
 			and cards[1].ability.name
-				~= ("cry-meteor" or "cry-exoplanet" or "cry-stardust" or "cry_cursed" or ("Diet Cola" or Card.get_gameset(
-					card
-				) == "madness"))
+				~= ("cry-meteor" or "cry-exoplanet" or "cry-stardust" or "cry_cursed" or "Diet Cola")
 	end,
 	use = function(self, card, area, copier)
 		local cards = Cryptid.get_highlighted_cards({ G.jokers }, card, 1, 1, function(card)
@@ -2125,7 +2123,6 @@ local hook = {
 	gameset_config = {
 		modest = { disabled = true },
 		mainline = { disabled = false },
-		madness = { disabled = false },
 		experimental = { disabled = false },
 	},
 	dependencies = {
@@ -4851,7 +4848,7 @@ local copypaste = {
 				) 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
-			key = Cryptid.gameset_loc(self, { madness = "madness", exp_modest = "modest" }),
+			key = Cryptid.gameset_loc(self, { exp_modest = "modest" }),
 		}
 	end,
 	atlas = "atlasepic",
@@ -4913,9 +4910,7 @@ local copypaste = {
 						nil,
 						{ message = localize("k_copied_ex") }
 					)
-					if Card.get_gameset(card) ~= "madness" then
-						card.ability.extra.ckt = true
-					end
+					card.ability.extra.ckt = true
 				end
 			end
 		elseif

items/deck.lua

@@ -668,9 +668,6 @@ local antimatter = {
 			"set_cry_deck",
 		},
 	},
-	loc_vars = function(self, info_queue, center)
-		return { key = Cryptid.gameset_loc(self, { mainline = "balanced", modest = "balanced" }) }
-	end,
 	name = "cry-Antimatter",
 	order = 76,
 	key = "antimatter",
@@ -687,17 +684,17 @@ local antimatter = {
 	pos = { x = 2, y = 0 },
 	calculate = function(self, back, context)
 		if context.context ~= "final_scoring_step" then
-			Cryptid.antimatter_trigger(self, context, Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness")
+			Cryptid.antimatter_trigger(self, context, false)
 		else
 			return Cryptid.antimatter_trigger_final_scoring(
 				self,
 				context,
-				Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness"
+				false
 			)
 		end
 	end,
 	apply = function(self)
-		Cryptid.antimatter_apply(Cryptid.gameset(G.P_CENTERS.b_cry_antimatter) == "madness")
+		Cryptid.antimatter_apply(false)
 	end,
 	atlas = "atlasdeck",
 	init = function(self)

items/epic.lua

@@ -2,7 +2,6 @@
 gameset_config = {
         modest = {extra = {chips = 1}, center = {rarity = 1, blueprint_compat = false, immutable = true, no_dbl = false}},
 		mainline = {center = {rarity = 2, blueprint_compat = true, immutable = true, no_dbl = true}},
-        madness = {extra = {chips = 100}, center = {rarity = 3}},
 		cryptid_in_2025 = {extra = {chips = 1e308}, center = {rarity = "cry_exotic"}},
  },
 -- Card.get_gameset(card) ~= "modest"
@@ -1780,18 +1779,14 @@ local altgoogol = {
 			copies = 1,
 		},
 		mainline = { copies = 2 },
-		madness = {
-			center = { blueprint_compat = true },
-			copies = 2,
-		},
 	},
 	loc_vars = function(self, info_queue, center)
 		return { key = Cryptid.gameset_loc(self, { modest = "balanced" }), vars = { center.ability.copies } }
 	end,
 	calculate = function(self, card, context)
 		local gameset = Card.get_gameset(card)
 		if
-			(context.selling_self and not context.retrigger_joker and (gameset == "madness" or not context.blueprint))
+			(context.selling_self and not context.retrigger_joker and not context.blueprint)
 			or context.forcetrigger
 		then
 			local jokers = {}
@@ -2370,8 +2365,7 @@ local demicolon = {
 	object_type = "Joker",
 	gameset_config = {
 		modest = { disabled = true },
-		mainline = { disabled = true },
-		madness = { disabled = false },
+		mainline = { disabled = false },
 		experimental = { disabled = false },
 	},
 	dependencies = {

items/misc_joker.lua

@@ -8596,7 +8596,7 @@ local astral_bottle = {
 		},
 	},
 	name = "cry-astral_bottle",
-	extra_gamesets = { "exp_modest", "exp_mainline", "exp_madness" },
+	extra_gamesets = { "exp_modest", "exp_mainline"},
 	key = "astral_bottle",
 	eternal_compat = false,
 	pos = { x = 7, y = 0 },
@@ -8610,23 +8610,11 @@ local astral_bottle = {
 		if not center.edition or (center.edition and not center.edition.cry_astral) then
 			info_queue[#info_queue + 1] = G.P_CENTERS.e_cry_astral
 		end
-		return {
-			key = Cryptid.gameset_loc(
-				self,
-				{ exp_modest = "mainline", exp_mainline = "mainline", exp_madness = "madness" }
-			),
-		}
 	end,
 	calculate = function(self, card, context)
 		if (context.selling_self and not context.retrigger_joker and not context.blueprint) or context.forcetrigger then
 			local g = Cryptid.gameset(card)
 			local effect = { { astral = true, perishable = true } }
-			if g == "exp_modest" or g == "exp_mainline" then
-				effect = { { astral = true }, { perishable = true } }
-			end
-			if g == "exp_madness" then
-				effect = { { astral = true } }
-			end
 			local jokers = {}
 			for i = 1, #G.jokers.cards do
 				if G.jokers.cards[i] ~= card and not G.jokers.cards[i].debuff and not G.jokers.cards[i].edition then

items/sleeve.lua

@@ -531,8 +531,6 @@ if CardSleeves then
 			then
 				self.config.cry_spooky = true
 			end
-
-			return { key = Cryptid.gameset_loc(self, { mainline = "balanced", modest = "balanced" }) }
 		end,
 		calculate = function(self, sleeve, context)
 			if context.create_card and context.card then

lib/content.lua

@@ -592,37 +592,21 @@ SMODS.Sound({
 	volume = 0.7,
 	sync = {
 		cry_music_modest = true,
-		cry_music_madness = true,
 	},
 	pitch = 1,
 	select_music_track = function()
 		return G.STAGE == G.STAGES.MAIN_MENU
-			and (G.PROFILES[G.SETTINGS.profile].cry_gameset and G.PROFILES[G.SETTINGS.profile].cry_gameset == "mainline" or G.selectedGameset and G.selectedGameset ~= "modest" and G.selectedGameset ~= "madness")
-			and Cryptid_config.Cryptid.alt_bg_music
-	end,
-})
-SMODS.Sound({
-	key = "music_madness",
-	path = "music_madness.ogg",
-	volume = 0.7,
-	sync = {
-		cry_music_modest = true,
-		cry_music_mainline = true,
-	},
-	pitch = 1,
-	select_music_track = function()
-		return G.STAGE == G.STAGES.MAIN_MENU
-			and (G.PROFILES[G.SETTINGS.profile].cry_gameset and G.PROFILES[G.SETTINGS.profile].cry_gameset == "madness" or G.selectedGameset == "madness")
+			and (G.PROFILES[G.SETTINGS.profile].cry_gameset and G.PROFILES[G.SETTINGS.profile].cry_gameset == "mainline" or G.selectedGameset and G.selectedGameset ~= "modest")
 			and Cryptid_config.Cryptid.alt_bg_music
 	end,
 })
+
 SMODS.Sound({
 	key = "music_modest",
 	path = "music_modest.ogg",
 	volume = 0.7,
 	sync = {
 		cry_music_mainline = true,
-		cry_music_madness = true,
 	},
 	pitch = 1,
 	select_music_track = function()

lib/gameset.lua

@@ -27,6 +27,9 @@ function Game:update(dt)
 	gu(self, dt)
 	if not G.PROFILES[G.SETTINGS.profile].cry_intro_complete then
 		G.FUNCS.cry_intro_controller()
+		if G.OVERLAY_TUTORIAL then
+			G.E_MANAGER:update(dt, true)
+		end
 	end
 end
 
@@ -176,12 +179,6 @@ G.FUNCS.cry_intro_part = function(_part)
 			{ shader = "dissolve", shadow_height = 0.05 },
 			{ shader = "dissolve" },
 		})
-		local madnessSprite = Sprite(0, 0, 1, 1, G.ASSET_ATLAS["cry_gameset"], { x = 2, y = 0 })
-		madnessSprite:define_draw_steps({
-			{ shader = "dissolve", shadow_height = 0.05 },
-			{ shader = "dissolve" },
-		})
-		--TODO: localize
 		G.modestBtn = create_UIBox_character_button_with_sprite({
 			sprite = modestSprite,
 			button = localize("cry_gameset_modest"),
@@ -198,34 +195,16 @@ G.FUNCS.cry_intro_part = function(_part)
 			colour = G.C.RED,
 			maxw = 3,
 		})
-		G.madnessBtn = create_UIBox_character_button_with_sprite({
-			sprite = madnessSprite,
-			button = localize("cry_gameset_madness"),
-			id = "madness",
-			func = "cry_madness",
-			colour = G.C.CRY_EXOTIC,
-			maxw = 3,
-		})
 		local gamesetUI = create_UIBox_generic_options({
 			infotip = false,
 			contents = {
 				G.modestBtn,
 				G.mainlineBtn,
-				G.madnessBtn,
 			},
 			back_label = "Confirm",
 			back_colour = G.C.BLUE,
 			back_func = "cry_gameset_confirm",
 		})
-		G.E_MANAGER:add_event(Event({
-			trigger = "after",
-			blocking = false,
-			blockable = false,
-			func = function()
-				G.madnessBtn.config.colour = G.C.CRY_EXOTIC
-				return true
-			end,
-		}))
 		gamesetUI.nodes[2] = nil
 		gamesetUI.config.colour = G.C.CLEAR
 		G.gamesetUI = UIBox({
@@ -255,11 +234,10 @@ G.FUNCS.cry_intro_part = function(_part)
 			no_button = true,
 		})
 	end
-	if _part == "modest" or _part == "mainline" or _part == "madness" then
+	if _part == "modest" or _part == "mainline" then
 		local desc_length = { --number of times Jolly Joker speaks for each gameset
 			modest = 2,
 			mainline = 3,
-			madness = 3,
 		}
 		G.E_MANAGER:clear_queue("tutorial")
 		if G.OVERLAY_TUTORIAL.content then
@@ -294,24 +272,15 @@ end
 G.FUNCS.cry_modest = function(e)
 	G.modestBtn.config.colour = G.C.CRY_SELECTED
 	G.mainlineBtn.config.colour = G.C.RED
-	G.madnessBtn.config.colour = G.C.CRY_EXOTIC
 	G.FUNCS.cry_intro_part("modest")
 	G.selectedGameset = "modest"
 end
 G.FUNCS.cry_mainline = function(e)
 	G.modestBtn.config.colour = G.C.GREEN
 	G.mainlineBtn.config.colour = G.C.CRY_SELECTED
-	G.madnessBtn.config.colour = G.C.CRY_EXOTIC
 	G.FUNCS.cry_intro_part("mainline")
 	G.selectedGameset = "mainline"
 end
-G.FUNCS.cry_madness = function(e)
-	G.modestBtn.config.colour = G.C.GREEN
-	G.mainlineBtn.config.colour = G.C.RED
-	G.madnessBtn.config.colour = G.C.CRY_SELECTED
-	G.FUNCS.cry_intro_part("madness")
-	G.selectedGameset = "madness"
-end
 G.FUNCS.cry_gameset_confirm = function(e)
 	if G.selectedGameset then
 		G.PROFILES[G.SETTINGS.profile].cry_intro_complete = true
@@ -327,35 +296,6 @@ G.FUNCS.cry_gameset_confirm = function(e)
 		end
 		G.OVERLAY_TUTORIAL:remove()
 		G.OVERLAY_TUTORIAL = nil
-		if G.selectedGameset == "madness" then
-			--Unlock All by default in madness
-			G.PROFILES[G.SETTINGS.profile].all_unlocked = true
-			for k, v in pairs(G.P_CENTERS) do
-				if not v.demo and not v.wip then
-					v.alerted = true
-					v.discovered = true
-					v.unlocked = true
-				end
-			end
-			for k, v in pairs(G.P_BLINDS) do
-				if not v.demo and not v.wip then
-					v.alerted = true
-					v.discovered = true
-					v.unlocked = true
-				end
-			end
-			for k, v in pairs(G.P_TAGS) do
-				if not v.demo and not v.wip then
-					v.alerted = true
-					v.discovered = true
-					v.unlocked = true
-				end
-			end
-			set_profile_progress()
-			set_discover_tallies()
-			G:save_progress()
-			G.FILE_HANDLER.force = true
-		end
 	end
 end
 
@@ -402,6 +342,7 @@ function Cryptid.intro_info(args)
 					args.highlight[#args.highlight + 1] = G.OVERLAY_TUTORIAL.Jimbo
 					if args.text_key then
 						G.OVERLAY_TUTORIAL.Jimbo:add_speech_bubble(args.text_key, align, args.loc_vars)
+						--G.OVERLAY_TUTORIAL.Jimbo.children.speech_bubble.states.visible = true
 					end
 					G.OVERLAY_TUTORIAL.Jimbo:set_alignment(attach)
 					if args.hard_set then
@@ -455,6 +396,7 @@ function Cryptid.intro_info(args)
 										end
 										return true
 									end
+									return true
 								end,
 							}),
 							"tutorial"
@@ -530,7 +472,7 @@ function Cryptid.gameset_sprite(scale, profile, force_gameset)
 		scale,
 		scale,
 		G.ASSET_ATLAS["cry_gameset"],
-		{ x = (gameset == "modified" and 3 or gameset == "madness" and 2 or gameset == "modest" and 0 or 1), y = 0 }
+		{ x = (gameset == "modified" and 3 or gameset == "modest" and 0 or 1), y = 0 }
 	)
 	sprite:define_draw_steps({
 		{ shader = "dissolve", shadow_height = 0.09 },
@@ -696,7 +638,7 @@ function Cryptid.gameset_config_UI(center)
 		},
 	}
 
-	local gamesets = { "disabled", "modest", "mainline", "madness" }
+	local gamesets = { "disabled", "modest", "mainline" }
 	if center.extra_gamesets then
 		for i = 1, #center.extra_gamesets do
 			gamesets[#gamesets + 1] = center.extra_gamesets[i]
@@ -823,9 +765,7 @@ function get_type_colour(center, card)
 		if center.force_gameset == "modest" then
 			color = G.C.GREEN
 		elseif center.force_gameset == "mainline" then
-			color = G.C.RED
-		elseif center.force_gameset == "madness" then
-			color = G.C.CRY_EXOTIC
+			color = G.C.PURPLE
 		elseif center.force_gameset ~= "disabled" then
 			color = G.C.CRY_ASCENDANT
 		end

lib/overrides.lua

@@ -754,8 +754,7 @@ function SMODS.create_mod_badges(obj, badges)
 		badges[#badges + 1] = create_badge(
 			card_type,
 			set == "modest" and G.C.GREEN
-				or set == "mainline" and G.C.RED
-				or set == "madness" and G.C.CRY_EXOTIC
+				or set == "mainline" and G.C.PURPLE
 				or G.C.CRY_ASCENDANT
 		)
 	end