Merge pull request #479 from DigitalDetective47/main

Add support for Next Ante Preview 3.0.0

Author: MathIsFun0

Cryptid.json

@@ -15,6 +15,7 @@
 		"Steamodded (>=1.0.0~BETA-0314c)"
 	],
 	"conflicts": [
-		"Saturn"
+		"Saturn",
+		"AntePreview (>= 2.0.0~0c16a) (<<3.0.0)"
 	]
 }

assets/1x/hands.png

@@ -258,6 +258,19 @@ local tax = {
 	loc_vars = function(self, info_queue, card)
 		return { vars = { 0.4 * get_blind_amount(G.GAME.round_resets.ante) * 2 * G.GAME.starting_params.ante_scaling } } -- no bignum?
 	end,
+	preview_ui = function(self)
+		local value = self:loc_vars().vars[1]
+		return {
+			n = G.UIT.C,
+			nodes = { {
+				n = G.UIT.R,
+				nodes = {
+					{ n = G.UIT.O, config = { object = get_stake_sprite(G.GAME.stake, 0.25) } },
+					{ n = G.UIT.T, config = { text = number_format(value), colour = G.C.RED, scale = score_number_scale(0.5, value) } }
+				}
+			} }
+		}
+	end,
 	collection_loc_vars = function(self)
 		return { vars = { localize("cry_tax_placeholder") } }
 	end,
@@ -394,6 +407,10 @@ local joke = {
 			},
 		}
 	end,
+	preview_ui = function(self)
+		local value = self:loc_vars().vars[2]
+		return { n = G.UIT.T, config = { text = number_format(value), colour = G.C.ORANGE, scale = score_number_scale(0.5, value) } }
+	end,
 	collection_loc_vars = function(self)
 		return { vars = { "8", localize("cry_joke_placeholder") } }
 	end,

assets/2x/hands.png

@@ -443,6 +443,25 @@ local memory = {
 			or localize("k_none")
 		return { vars = { self.config.num, loc_tag } }
 	end,
+	preview_ui = function(self, tag)
+		if G.GAME.cry_last_tag_used then
+			local last_tag = Tag(G.GAME.cry_last_tag_used, true)
+			last_tag.ability.orbital_hand = G.GAME.cry_memory_orbital
+			local tag_sprite
+			_, tag_sprite = last_tag:generate_UI(0.4)
+			return {
+				n = G.UIT.C,
+				nodes = { {
+					n = G.UIT.R,
+					nodes = {
+						{ n = G.UIT.T, config = { text = ">", colour = G.C.WHITE, scale = 0.4 } },
+						{ n = G.UIT.O, config = { object = tag_sprite } },
+						G.P_TAGS[G.GAME.cry_last_tag_used].preview_ui and G.P_TAGS[G.GAME.cry_last_tag_used]:preview_ui(last_tag)
+					}
+				} }
+			}
+		end
+	end,
 	apply = function(self, tag, context)
 		if context.type == "immediate" and G.GAME.cry_last_tag_used then
 			local lock = tag.ID

items/blind.lua

@@ -1,5 +1,12 @@
 -- content.lua - adds SMODS objects for content that should always be loaded
 
+SMODS.Atlas({
+	key = "poker_hands",
+	path = "hands.png",
+	px = 53,
+	py = 13,
+})
+
 SMODS.PokerHand({
 	key = "Bulwark",
 	visible = false,
@@ -14,6 +21,8 @@ SMODS.PokerHand({
 		{ "S_A", true, "m_stone" },
 		{ "S_A", true, "m_stone" },
 	},
+	atlas = "poker_hands",
+	pos = { x = 0, y = 0 },
 	evaluate = function(parts, hand)
 		if Cryptid.enabled("set_cry_poker_hand_stuff") ~= true or Cryptid.enabled("c_cry_asteroidbelt") ~= true then
 			return {}
@@ -65,6 +74,8 @@ SMODS.PokerHand({
 		{ "S_6", true },
 		{ "C_5", true },
 	},
+	atlas = "poker_hands",
+	pos = { x = 0, y = 1 },
 	evaluate = function(parts, hand)
 		local other_hands = next(parts._flush) or next(parts._straight) or next(parts._all_pairs)
 		if next(parts.cry_cfpart) then
@@ -92,6 +103,8 @@ SMODS.PokerHand({
 		{ "H_7", true },
 		{ "H_7", true },
 	},
+	atlas = "poker_hands",
+	pos = { x = 0, y = 2 },
 	evaluate = function(parts, hand)
 		if Cryptid.enabled("set_cry_poker_hand_stuff") ~= true or Cryptid.enabled("c_cry_marsmoons") ~= true then
 			return
@@ -354,7 +367,7 @@ SMODS.Atlas({
 	py = 95,
 	inject = function(self)
 		local file_path = type(self.path) == "table"
-				and (self.path[G.SETTINGS.language] or self.path["default"] or self.path["en-us"])
+			and (self.path[G.SETTINGS.language] or self.path["default"] or self.path["en-us"])
 			or self.path
 		if file_path == "DEFAULT" then
 			return
@@ -505,7 +518,8 @@ SMODS.Sound({
 	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
+			(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,
 })
@@ -520,7 +534,8 @@ SMODS.Sound({
 	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 == "madness" or G.selectedGameset == "madness")
 			and Cryptid_config.Cryptid.alt_bg_music
 	end,
 })
@@ -534,8 +549,9 @@ SMODS.Sound({
 	},
 	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 == "modest" or G.selectedGameset == "modest")
+	return G.STAGE == G.STAGES.MAIN_MENU
+			and
+			(G.PROFILES[G.SETTINGS.profile].cry_gameset and G.PROFILES[G.SETTINGS.profile].cry_gameset == "modest" or G.selectedGameset == "modest")
 			and Cryptid_config.Cryptid.alt_bg_music
 	end,
 })

items/tag.lua

@@ -117,6 +117,10 @@ if (SMODS.Mods["AntePreview"] or {}).can_load then
 			big = get_new_boss()
 		end
 		local predictions = predict_hook()
+		if next(SMODS.find_card("j_cry_kittyprinter")) then
+			predictions.Small.tag = "tag_cry_cat"
+			predictions.Big.tag = "tag_cry_cat"
+		end
 		if G.GAME.modifiers.cry_no_tags then
 			for _, pred in pairs(predictions) do
 				pred.tag = nil