Merge branch 'MathIsFun0:main' into main

Author: HuyTheKiller

Cryptid.lua

@@ -226,6 +226,7 @@ local cryptidConfigTab = function()
 	config = { n = G.UIT.R, config = { align = "tm", padding = 0 }, nodes = { left_settings, right_settings } }
 	cry_nodes[#cry_nodes + 1] = config
 	cry_nodes[#cry_nodes + 1] = UIBox_button({
+		colour = G.C.CRY_GREENGRADIENT,
 		button = "your_collection_content_sets",
 		label = { localize("b_content_sets") },
 		count = modsCollectionTally(G.P_CENTER_POOLS["Content Set"]),
@@ -237,18 +238,31 @@ local cryptidConfigTab = function()
 	--Add warning notifications later for family mode
 	cry_nodes[#cry_nodes + 1] = create_toggle({
 		label = localize("cry_family"),
-		active_colour = G.C.MONEY,
+		active_colour = HEX("40c76d"),
 		ref_table = Cryptid_config,
 		ref_value = "family_mode",
 		callback = reload_cryptid_localization,
 	})
 	cry_nodes[#cry_nodes + 1] = create_toggle({
 		label = localize("cry_experimental"),
-		active_colour = G.C.MONEY,
+		active_colour = HEX("1f8505"),
 		ref_table = Cryptid_config,
 		ref_value = "experimental",
 	})
+	cry_nodes[#cry_nodes + 1] = create_toggle({
+		label = localize("cry_feat_https module"),
+		active_colour = HEX("b1c78d"),
+		ref_table = Cryptid_config,
+		ref_value = "HTTPS",
+	})
+	cry_nodes[#cry_nodes + 1] = create_toggle({
+		label = localize("cry_feat_menu"),
+		active_colour = HEX("1c5c23"),
+		ref_table = Cryptid_config,
+		ref_value = "menu",
+	})
 	cry_nodes[#cry_nodes + 1] = UIBox_button({
+		colour = G.C.CRY_ALTGREENGRADIENT,
 		button = "reset_gameset_config",
 		label = { localize("b_reset_gameset_" .. (G.PROFILES[G.SETTINGS.profile].cry_gameset or "mainline")) },
 		minw = 5,
@@ -292,26 +306,31 @@ local cryptidTabs = function()
 				}
 				settings = { n = G.UIT.C, config = { align = "tl", padding = 0.05 }, nodes = {} }
 				settings.nodes[#settings.nodes + 1] = create_toggle({
+					active_colour = G.C.CRY_JOLLY,
 					label = localize("cry_mus_jimball"),
 					ref_table = Cryptid_config.Cryptid,
 					ref_value = "jimball_music",
 				})
 				settings.nodes[#settings.nodes + 1] = create_toggle({
+					active_colour = G.C.CRY_JOLLY,
 					label = localize("cry_mus_code"),
 					ref_table = Cryptid_config.Cryptid,
 					ref_value = "code_music",
 				})
 				settings.nodes[#settings.nodes + 1] = create_toggle({
+					active_colour = G.C.CRY_JOLLY,
 					label = localize("cry_mus_exotic"),
 					ref_table = Cryptid_config.Cryptid,
 					ref_value = "exotic_music",
 				})
 				settings.nodes[#settings.nodes + 1] = create_toggle({
+					active_colour = G.C.CRY_JOLLY,
 					label = localize("cry_mus_high_score"),
 					ref_table = Cryptid_config.Cryptid,
 					ref_value = "big_music",
 				})
 				settings.nodes[#settings.nodes + 1] = create_toggle({
+					active_colour = G.C.CRY_JOLLY,
 					label = localize("cry_mus_alt_bg"),
 					ref_table = Cryptid_config.Cryptid,
 					ref_value = "alt_bg_music",

assets/1x/atlasexotic.png

@@ -8,4 +8,6 @@ return {
 	},
 	["family_mode"] = false,
 	["experimental"] = false,
+	["HTTPS"] = false,
+	["menu"] = false,
 }

assets/1x/sticker_cry.png

@@ -136,7 +136,7 @@ local universum = {
 	end,
 	cry_credits = {
 		idea = { "Ein13" },
-		art = { "Ein13/hydrogenperoxiide" },
+		art = { "Ein13", "hydrogenperoxiide" },
 	},
 	init = function(self)
 		--Universum Patches
@@ -1169,7 +1169,7 @@ local energia = {
 	end,
 	cry_credits = {
 		idea = { "jenwalter666" },
-		art = { "Kailen" },
+		art = { "unexian" },
 		code = { "Math" },
 	},
 }
@@ -1446,12 +1446,7 @@ local formidiulosus = {
 				G.jokers:emplace(card)
 			end
 		end
-		if
-			context.cardarea == G.jokers
-			and (to_big(card.ability.extra.Emult) > to_big(1))
-			and not context.before
-			and not context.after
-		then
+		if context.cardarea == G.jokers and (to_big(card.ability.extra.Emult) > to_big(1)) and context.joker_main then
 			return {
 				message = localize({
 					type = "variable",
@@ -1493,7 +1488,7 @@ local items = {
 	--verisimile, WHY IS THIS AN EXOTIC????????????????????
 	--rescribere, [NEEDS REFACTOR]
 	duplicare,
-	--formidiulosus
+	formidiulosus,
 }
 return {
 	name = "Exotic Jokers",

assets/2x/atlasexotic.png

@@ -262,7 +262,7 @@ local potofjokes = {
 	end,
 	calculate = function(self, card, context)
 		if context.end_of_round and not context.individual and not context.repetition and not context.blueprint then
-			G.hand:change_size(math.min(1000 - card.ability.extra.h_size, card.ability.extra.h_mod))
+			G.hand:change_size(math.min(math.max(0, 1000 - card.ability.extra.h_size), card.ability.extra.h_mod))
 			card.ability.extra.h_size = card.ability.extra.h_size + card.ability.extra.h_mod
 			return {
 				message = localize({ type = "variable", key = "a_handsize", vars = { card.ability.extra.h_mod } }),
@@ -795,7 +795,7 @@ local triplet_rhythm = {
 		if context.joker_main and context.scoring_hand then
 			local threes = 0
 			for i = 1, #context.scoring_hand do
-				if context.scoring_hand[i]:get_id() then
+				if context.scoring_hand[i]:get_id() == 3 then
 					threes = threes + 1
 				end
 			end
@@ -1194,14 +1194,14 @@ local seal_the_deal = {
 	end,
 	set_ability = function(self, card, initial, delay_sprites)
 		local sealtable = { "blue", "red", "purple" }
-		if Cryptid.enabled["Misc."] then
+		if cry_card_enabled("cry_azure") then
 			sealtable[#sealtable + 1] = "azure"
 		end
-		if Cryptid.enabled["Code Cards"] then
+		if cry_card_enabled("cry_green") then
 			sealtable[#sealtable + 1] = "green"
 		end
 		card.ability.extra = pseudorandom_element(sealtable, pseudoseed("abc"))
-		if G.P_CENTERS["j_cry_seal_the_deal"].discovered then
+		if self.discovered then
 			--Gold (ULTRA RARE!!!!!!!!)
 			if pseudorandom("xyz") <= 0.000001 and not (card.area and card.area.config.collection) then
 				card.children.center:set_sprite_pos({ x = 6, y = 4 })
@@ -1498,7 +1498,7 @@ local fspinner = {
 		return { vars = { center.ability.extra.chips, center.ability.extra.chip_mod } }
 	end,
 	rarity = 1,
-	cost = 6,
+	cost = 5,
 	order = 77,
 	blueprint_compat = true,
 	perishable_compat = false,
@@ -1757,9 +1757,9 @@ local gardenfork = {
 	calculate = function(self, card, context)
 		if context.cardarea == G.jokers and context.before and not context.blueprint then
 			for i = 1, #context.full_hand do
-				if context.other_card:get_id() == 14 then
+				if context.scoring_hand[i]:get_id() == 14 then
 					for j = 1, #context.full_hand do
-						if context.other_card:get_id() == 7 then -- :( ekshpenshive
+						if context.scoring_hand[j]:get_id() == 7 then -- :( ekshpenshive
 							ease_dollars(card.ability.extra.money)
 							return { message = "$" .. card.ability.extra.money, colour = G.C.MONEY }
 						end
@@ -6983,7 +6983,7 @@ local cookie = {
 	cost = 4,
 	atlas = "atlastwo",
 	order = 133,
-	config = { extra = { chips = 150, chip_mod = 1 } },
+	config = { extra = { chips = 200, chip_mod = 1 } },
 	blueprint_compat = true,
 	eternal_compat = false,
 	perishable_compat = false,

assets/2x/sticker_cry.png

@@ -183,17 +183,48 @@ end
 
 -- simple plural s function for localisation
 function cry_pls(str, vars)
-	if string.sub(str, 1, 1) == "p" or string.sub(str, 1, 1) == "s" or string.sub(str, 1, 1) == "y" then
-		num = vars[tonumber(string.sub(str, 2, -1))]
-		if num then
-			if math.abs(to_big(num) - 1) > to_big(0.001) then
-				return string.sub(str, 1, 1) == "y" and "ies" or "s"
+	local inside = str:match("<(.-)>") -- finds args
+	local _table = {}
+	if inside then
+		for v in inside:gmatch("[^,]+") do -- adds args to array
+			table.insert(_table, v)
+		end
+	end
+	if not vars then
+		num = 1 -- Hopefully prevents a crash if no level data
+	else
+		local num = vars[tonumber(string.match(str, ">(%d+)"))] -- gets the number outside angle brackets, and its corresponding variable
+	end
+	local plural = _table[1] -- default
+	local checks = { [1] = "=" }
+	if #_table > 1 then
+		for i = 2, #_table do
+			local isnum = tonumber(_table[i])
+			if isnum then
+				checks[isnum] = ">" .. (_table[i + 1] or "")
+				i = i + 1
+			elseif i == 2 then
+				checks[1] = "=" .. _table[i]
 			else
-				return string.sub(str, 1, 1) == "y" and "y" or ""
+				print("Unexpected string: " .. _table[i])
+			end
+		end
+	end
+	local function fch(str, c)
+		return string.sub(str, 1, 1) == c -- gets first char and returns boolean
+	end
+	for k, v in pairs(checks) do
+		if fch(v, "=") then
+			if math.abs(to_big(num) - k) < to_big(0.001) then
+				return string.sub(v, 2, -1)
+			end
+		elseif fch(v, ">") then
+			if to_big(num) >= to_big(k - 0.001) then
+				return string.sub(v, 2, -1)
 			end
 		end
 	end
-	return false -- idk it doesn't really matter
+	return plural
 end
 
 -- generate a random edition (e.g. Antimatter Deck)
@@ -348,7 +379,7 @@ end
 
 --Changes main menu colors and stuff
 --has to be modified with new enabling system
-if true then --Cryptid.enabled["Menu"] then
+if Cryptid_config.menu then
 	local oldfunc = Game.main_menu
 	Game.main_menu = function(change_context)
 		local ret = oldfunc(change_context)

config.lua

@@ -229,6 +229,8 @@ G.C.CRY_BLOSSOM = { 0, 0, 0, 0 }
 G.C.CRY_AZURE = { 0, 0, 0, 0 }
 G.C.CRY_ASCENDANT = { 0, 0, 0, 0 }
 G.C.CRY_JOLLY = { 0, 0, 0, 0 }
+G.C.CRY_GREENGRADIENT = { 0, 0, 0, 0 }
+G.C.CRY_ALTGREENGRADIENT = { 0, 0, 0, 0 }
 Cryptid.C = {
 	EXOTIC = { HEX("708b91"), HEX("1e9eba") },
 	TWILIGHT = { HEX("0800ff"), HEX("aa00ff") },
@@ -241,8 +243,9 @@ Cryptid.C = {
 	ASCENDANT = { HEX("2e00f5"), HEX("e5001d") },
 	JOLLY = { HEX("6ec1f5"), HEX("456b84") },
 	SELECTED = { HEX("e38039"), HEX("ccdd1b") },
+	GREENGRADIENT = { HEX("51e099"), HEX("1e523a") },
+	ALTGREENGRADIENT = { HEX("6bb565"), HEX("bd28bf") },
 }
-
 cry_pointer_dt = 0
 cry_jimball_dt = 0
 cry_glowing_dt = 0