Merge branch 'main' into shinytags

Author: Toneblock

assets/1x/atlasepic.png

@@ -9,5 +9,5 @@ return {
 	["family_mode"] = false,
 	["experimental"] = false,
 	["HTTPS"] = false,
-	["menu"] = false,
+	["menu"] = true,
 }

assets/2x/atlasepic.png

@@ -3102,6 +3102,7 @@ local ctrl_v = {
 					card:add_to_deck()
 					table.insert(G.playing_cards, card)
 					G.hand:emplace(card)
+					playing_card_joker_effects({ card })
 					return true
 				end,
 			}))

config.lua

@@ -16,6 +16,13 @@ local very_fair = {
 	end,
 	init = function(self)
 		very_fair_quip = {}
+		local avts = SMODS.add_voucher_to_shop
+		function SMODS.add_voucher_to_shop(...)
+			if G.GAME.modifiers.cry_no_vouchers then
+				return
+			end
+			return avts(...)
+		end
 	end,
 }
 local equilibrium = {

items/code.lua

@@ -262,25 +262,7 @@ local sync_catalyst = {
 			"Math",
 		},
 	},
-	unlocked = false,
-	check_for_unlock = function(self, args)
-		if safe_get(G, "jokers") and safe_get(G.GAME, "round_resets", "ante") and G.GAME.round_resets.ante < 9 then
-			local rarities = {}
-			for i = 1, #G.jokers.cards do
-				local card = G.jokers.cards[i]
-				rarities[card.config.center.rarity .. "_rarity"] = true
-			end
-			if rarities["3_rarity"] and rarities["4_rarity"] and rarities["cry_epic_rarity"] then
-				unlock_card(self)
-			end
-		end
-		if args.type == "cry_lock_all" then
-			lock_card(self)
-		end
-		if args.type == "cry_unlock_all" then
-			unlock_card(self)
-		end
-	end,
+	unlocked = true,
 }
 
 -- Negative Joker
@@ -410,7 +392,7 @@ local error_joker = {
 	atlas = "atlasepic",
 	loc_vars = function(self, info_queue, center)
 		if safe_get(G.GAME, "pseudorandom") and G.STAGE == G.STAGES.RUN then
-			cry_error_msgs[#cry_error_msgs].string = "%%" .. predict_card_for_shop()
+			cry_error_msgs[#cry_error_msgs].string = "%%" .. (pcall(predict_card_for_shop) or "J6")
 		else
 			cry_error_msgs[#cry_error_msgs].string = "%%J6"
 		end
@@ -1881,6 +1863,44 @@ local spectrogram = {
 		},
 	},
 }
+local jtron = {
+	object_type = "Joker",
+	name = "cry-jtron",
+	key = "jtron",
+	config = { extra = { bonus = 1, current = 0 } },
+	rarity = "cry_epic",
+	cost = 14,
+	order = 64,
+	blueprint_compat = true,
+	atlas = "atlasepic",
+	pos = { x = 2, y = 5 },
+	loc_vars = function(self, info_queue, center)
+		info_queue[#info_queue + 1] = G.P_CENTERS.j_joker
+		center.ability.extra.current = 1 + center.ability.extra.bonus * #SMODS.find_card("j_joker")
+		return { vars = { center.ability.extra.bonus, center.ability.extra.current } }
+	end,
+	calculate = function(self, card, context)
+		card.ability.extra.current = 1 + card.ability.extra.bonus * #SMODS.find_card("j_joker")
+		if context.cardarea == G.jokers and context.joker_main then
+			return {
+				message = localize({
+					type = "variable",
+					key = "a_powmult",
+					vars = {
+						number_format(card.ability.extra.current),
+					},
+				}),
+				Emult_mod = card.ability.extra.current,
+				colour = G.C.DARK_EDITION,
+			}
+		end
+	end,
+	cry_credits = {
+		idea = { "AlexZGreat" },
+		art = { "Darren_the_frog" },
+		code = { "candycanearter" },
+	},
+}
 return {
 	name = "Epic Jokers",
 	items = {
@@ -1907,5 +1927,6 @@ return {
 		soccer,
 		fleshpanopticon,
 		spectrogram,
+		jtron,
 	},
 }

items/deck.lua

@@ -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",

items/epic.lua

@@ -368,7 +368,7 @@ local mneon = {
 		if context.end_of_round and not context.blueprint and not context.individual and not context.repetition then
 			local jollycount = 0
 			for i = 1, #G.jokers.cards do
-				if G.jokers.cards[i]:is_jolly() or safe_get(G.jokers.cards[i], "pools", "M") then
+				if G.jokers.cards[i]:is_jolly() or safe_get(G.jokers.cards[i].config.center, "pools", "M") then
 					jollycount = jollycount + 1
 				end
 			end
@@ -1220,7 +1220,7 @@ local mprime = {
 		elseif context.other_joker then
 			if
 				context.other_joker
-				and (context.other_joker:is_jolly() or safe_get(context.other_joker, "pools", "M"))
+				and (context.other_joker:is_jolly() or safe_get(context.other_joker.config.center, "pools", "M"))
 			then
 				if not Talisman.config_file.disable_anims then
 					G.E_MANAGER:add_event(Event({
@@ -1286,7 +1286,7 @@ local macabre = {
 							v ~= card
 							and not v:is_jolly()
 							and v.config.center.key ~= "j_cry_mprime"
-							and not (v.ability.eternal or v.getting_sliced or safe_get(v, "pools", "M"))
+							and not (v.ability.eternal or v.getting_sliced or safe_get(v.config.center, "pools", "M"))
 						then
 							destroyed_jokers[#destroyed_jokers + 1] = v
 						end