Merge branch 'main' into shinytags

Author: Jevonnissocoolman

Cryptid.lua

@@ -6,7 +6,7 @@
 --- MOD_DESCRIPTION: Adds unbalanced ideas to Balatro.
 --- BADGE_COLOUR: 708b91
 --- DEPENDENCIES: [Talisman>=2.0.9, Steamodded>=1.0.0~ALPHA-1312c]
---- VERSION: 0.5.4~dev23
+--- VERSION: 0.5.4
 --- PRIORITY: 2147483647
 
 ----------------------------------------------
@@ -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/c_cry_code.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" },
 	},
 }
@@ -1493,7 +1493,7 @@ local items = {
 	--verisimile, WHY IS THIS AN EXOTIC????????????????????
 	--rescribere, [NEEDS REFACTOR]
 	duplicare,
-	--formidiulosus
+	formidiulosus,
 }
 return {
 	name = "Exotic Jokers",

assets/1x/sticker_cry.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 } }),
@@ -387,7 +387,7 @@ local wee_fib = {
 	calculate = function(self, card, context)
 		if context.cardarea == G.play and context.individual and not context.blueprint then
 			local rank = context.other_card:get_id()
-			if rank == "Ace" or rank == "2" or rank == "3" or rank == "5" or rank == "8" then
+			if rank == 14 or rank == 2 or rank == 3 or rank == 5 or rank == 8 then
 				card.ability.extra.mult = card.ability.extra.mult + card.ability.extra.mult_mod
 
 				return {
@@ -797,7 +797,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
@@ -1500,7 +1500,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,
@@ -1759,9 +1759,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
@@ -7016,8 +7016,8 @@ local cookie = {
 	rarity = 1,
 	cost = 4,
 	atlas = "atlastwo",
-	order = 129,
-	config = { extra = { chips = 150, chip_mod = 1 } },
+	order = 133,
+	config = { extra = { chips = 200, chip_mod = 1 } },
 	blueprint_compat = true,
 	eternal_compat = false,
 	perishable_compat = false,