Merge branch 'SpectralPack:main' into main

Author: crazybot27

assets/1x/atlasnotjokers.png

@@ -486,6 +486,16 @@ function Game:start_run(args)
 	if G.GAME.modifiers.cry_no_consumables then
 		G.GAME.joker_rate = 1e300
 	end
+	for i, v in pairs(G.handlist) do
+		if v == "cry_Declare0" then
+			d0 = true
+		end
+	end
+	if not d0 then
+		table.insert(G.handlist, 1, "cry_Declare0")
+		table.insert(G.handlist, 1, "cry_Declare1")
+		table.insert(G.handlist, 1, "cry_Declare2")
+	end
 end
 local challenges = {
 	sticker_sheet,

items/challenge.lua

@@ -2820,6 +2820,258 @@ local run = {
 		self:use(card, area)
 	end,
 }
+
+-- ://Declare
+-- Create a new Poker hand from selected cards
+local declare = {
+	cry_credits = {
+		idea = {
+			"Ronnec",
+		},
+		art = {
+			"lord.ruby",
+		},
+		code = {
+			"lord.ruby",
+		},
+	},
+	dependencies = {
+		items = {
+			"set_cry_code",
+		},
+	},
+	object_type = "Consumable",
+	set = "Code",
+	name = "cry-Declare",
+	key = "declare",
+	pos = { x = 6, y = 4 },
+	cost = 4,
+	atlas = "atlasnotjokers",
+	order = 420.5,
+	loc_vars = function(self, q, card)
+		return {
+			vars = {
+				localize(
+					({
+						"Straight",
+						"Flush",
+						"Full House",
+						"Full House",
+					})[(G.GAME.DECLARE_USED or 0) + 1],
+					"poker_hands"
+				),
+				number_format(-G.GAME.DECLARE_USED),
+			},
+		}
+	end,
+	can_use = function(self, card)
+		return (G.GAME.DECLARE_USED or 0) < 3
+	end,
+	use = function(self, card, area, copier)
+		G.GAME.USING_CODE = true
+		G.GAME.USING_DECLARE = true
+		G.ENTERED_CARD = ""
+		G.CHOOSE_CARD = UIBox({
+			definition = create_UIBox_declare(card),
+			config = {
+				align = "cm",
+				offset = { x = 0, y = 10 },
+				major = G.ROOM_ATTACH,
+				bond = "Weak",
+				instance_type = "POPUP",
+			},
+		})
+		G.CHOOSE_CARD.alignment.offset.y = 0
+		G.ROOM.jiggle = G.ROOM.jiggle + 1
+		G.CHOOSE_CARD:align_to_major()
+	end,
+	init = function()
+		function create_UIBox_declare(card)
+			G.E_MANAGER:add_event(Event({
+				blockable = false,
+				func = function()
+					G.REFRESH_ALERTS = true
+					return true
+				end,
+			}))
+			local t = create_UIBox_generic_options({
+				no_back = true,
+				colour = HEX("04200c"),
+				outline_colour = G.C.SECONDARY_SET.Code,
+				contents = {
+					{
+						n = G.UIT.R,
+						nodes = {
+							create_text_input({
+								colour = G.C.SET.Code,
+								hooked_colour = darken(copy_table(G.C.SET.Code), 0.3),
+								w = 4.5,
+								h = 1,
+								max_length = 100,
+								extended_corpus = true,
+								prompt_text = localize("cry_code_enter_hand"),
+								ref_table = G,
+								ref_value = "ENTERED_CARD",
+								keyboard_offset = 1,
+							}),
+						},
+					},
+					{
+						n = G.UIT.R,
+						config = { align = "cm" },
+						nodes = {
+							UIBox_button({
+								colour = G.C.SET.Code,
+								button = "declare_apply",
+								label = { localize("cry_code_with_suits") },
+								minw = 4.5,
+								focus_args = { snap_to = true },
+							}),
+						},
+					},
+					{
+						n = G.UIT.R,
+						config = { align = "cm" },
+						nodes = {
+							UIBox_button({
+								colour = G.C.SET.Code,
+								button = "declare_apply_suitless",
+								label = { localize("cry_code_without_suits") },
+								minw = 4.5,
+								focus_args = { snap_to = true },
+							}),
+						},
+					},
+					{
+						n = G.UIT.R,
+						config = { align = "cm" },
+						nodes = {
+							UIBox_button({
+								colour = G.C.RED,
+								button = "declare_cancel",
+								label = { localize("cry_code_cancel") },
+								minw = 4.5,
+								focus_args = { snap_to = true },
+							}),
+						},
+					},
+				},
+			})
+			return t
+		end
+		G.FUNCS.declare_cancel = function()
+			if G.CHOOSE_CARD then
+				G.CHOOSE_CARD:remove()
+			end
+			G.GAME.USING_CODE = false
+			G.GAME.USING_DECLARE = false
+		end
+		G.FUNCS.declare_apply = function()
+			G.GAME.hands["cry_Declare" .. tostring(G.GAME.DECLARE_USED or 0)] =
+				Cryptid.create_declare_hand(G.hand.highlighted, G.ENTERED_CARD)
+			G.GAME.DECLARE_USED = (G.GAME.DECLARE_USED or 0) + 1
+			G.FUNCS.declare_cancel()
+		end
+		G.FUNCS.declare_apply_suitless = function()
+			G.GAME.hands["cry_Declare" .. tostring(G.GAME.DECLARE_USED or 0)] =
+				Cryptid.create_declare_hand(G.hand.highlighted, G.ENTERED_CARD, true)
+			G.GAME.DECLARE_USED = (G.GAME.DECLARE_USED or 0) + 1
+			G.FUNCS.declare_cancel()
+		end
+		Cryptid.create_declare_hand = function(cards, name, suitless)
+			if G.ENTERED_CARD == "" then
+				G.ENTERED_CARD = "cry_Declare" .. tostring(G.GAME.DECLARE_USED or 0)
+			end
+			local complexity = #cards
+			local ranks = {}
+			local suits = {}
+			for i, v in pairs(cards) do
+				if not ranks[v:get_id()] then
+					ranks[v:get_id()] = true
+					complexity = complexity + 0.85
+				end
+				if not suitless then
+					if (SMODS.has_no_suit(v) and not suits["suitless"]) or not suits[v.base.suit] then
+						suits[SMODS.has_no_suit(v) and "suitless" or v.base.suit] = true
+						complexity = complexity + 0.45
+					end
+				end
+			end
+			if #cards > 5 then
+				complexity = complexity * 1.25 ^ (#cards - 5)
+			end
+			complexity = complexity * 0.75
+			local mult = complexity
+			local chips = complexity * 8.45 --arbitrary just shake it up a little
+			local l_mult = complexity * 0.1
+			local l_chips = complexity
+			local declare_cards = {}
+			for i, v in pairs(cards) do
+				local card = {
+					rank = v:get_id() > 0 and v:get_id() or "rankless",
+					suit = not suitless and (SMODS.has_no_suit(v) and "suitless" or v.base.suit),
+				}
+				declare_cards[#declare_cards + 1] = card
+			end
+			for i, v in pairs(G.GAME.hands) do
+				v.order = (v.order or 0) + 1
+			end
+			local desc = localize("cry_Declare" .. tostring(G.GAME.DECLARE_USED or 0), "poker_hand_descriptions")
+			desc[#desc + 1] = localize("cry_code_suitless")
+			return {
+				order = 1,
+				l_mult = l_mult,
+				l_chips = l_chips,
+				mult = mult,
+				chips = chips,
+				example = Cryptid.create_declare_example(cards, suitless),
+				visible = true,
+				played = 0,
+				_saved_d_v = true,
+				played_this_round = 0,
+				s_mult = mult,
+				s_chips = chips,
+				from_declare = true,
+				declare_cards = declare_cards,
+				declare_name = G.ENTERED_CARD,
+				level = 1,
+				index = G.GAME.DECLARE_USED or 0,
+				desc_text = suitless and desc or nil,
+			}
+		end
+		local localize_ref = localize
+		function localize(first, second, ...)
+			if second == "poker_hands" then
+				if G and G.GAME and G.GAME.hands[first] and G.GAME.hands[first].declare_name then
+					return G.GAME.hands[first].declare_name
+				end
+			end
+			if second == "poker_hand_descriptions" then
+				if G and G.GAME and G.GAME.hands[first] and G.GAME.hands[first].desc_text then
+					return G.GAME.hands[first].desc_text
+				end
+			end
+			return localize_ref(first, second, ...)
+		end
+		local is_visibleref = SMODS.is_poker_hand_visible
+		function SMODS.is_poker_hand_visible(handname)
+			if not SMODS.PokerHands[handname] then
+				return G.GAME.hands[handname].visible
+			end
+			return is_visibleref(handname)
+		end
+		function Cryptid.create_declare_example(cards, suitless)
+			local c = {}
+			for i, v in pairs(cards) do
+				local key = SMODS.Suits[v.base.suit].card_key .. "_" .. SMODS.Ranks[v.base.value].card_key
+				local enhancement = (SMODS.has_no_suit(v) and "m_stone") or (suitless and "m_wild") or nil
+				c[#c + 1] = { key, true, enhancement = enhancement }
+			end
+			return c
+		end
+	end,
+}
+
 -- ://Class
 -- Change a selected card's enhancement to one of your choosing (or nil)
 
@@ -4719,6 +4971,7 @@ local code_cards = {
 	cryfunction,
 	function_sticker,
 	run,
+	declare,
 	class,
 	global,
 	global_sticker,

items/code.lua

@@ -134,24 +134,37 @@ function G.FUNCS.get_poker_hand_info(_cards)
 		["cry_Clusterfuck"] = 8,
 		["cry_UltPair"] = 8,
 		["cry_WholeDeck"] = 52,
+		["cry_Declare0"] = G.GAME.hands.cry_Declare0
+			and G.GAME.hands.cry_Declare0.declare_cards
+			and #G.GAME.hands.cry_Declare0.declare_cards,
+		["cry_Declare1"] = G.GAME.hands.cry_Declare1
+			and G.GAME.hands.cry_Declare1.declare_cards
+			and #G.GAME.hands.cry_Declare1.declare_cards,
+		["cry_Declare2"] = G.GAME.hands.cry_Declare2
+			and G.GAME.hands.cry_Declare2.declare_cards
+			and #G.GAME.hands.cry_Declare2.declare_cards,
 	}
-	-- Change mult and chips colors if hand is ascended
-	if hand_table[text] and next(scoring_hand) and #scoring_hand > hand_table[text] and not hidden then
-		ease_colour(G.C.UI_CHIPS, copy_table(G.C.GOLD), 0.3)
-		ease_colour(G.C.UI_MULT, copy_table(G.C.GOLD), 0.3)
-	else
-		ease_colour(G.C.UI_CHIPS, G.C.BLUE, 0.3)
-		ease_colour(G.C.UI_MULT, G.C.RED, 0.3)
-	end
 	-- this is where all the logic for asc hands is. currently it's very simple but if you want more complex logic, here's the place to do it
 	if hand_table[text] and Cryptid.enabled("set_cry_poker_hand_stuff") == true then
 		G.GAME.current_round.current_hand.cry_asc_num = G.GAME.used_vouchers.v_cry_hyperspacetether
 				and #_cards - hand_table[text]
 			or #scoring_hand - hand_table[text]
+
+		if G.GAME.hands[text] and G.GAME.hands[text].declare_cards then
+			G.GAME.current_round.current_hand.cry_asc_num = G.GAME.current_round.current_hand.cry_asc_num
+				+ (Cryptid.declare_hand_ascended_counter(_cards, G.GAME.hands[text]) - #scoring_hand)
+		end
 	else
 		G.GAME.current_round.current_hand.cry_asc_num = 0
 	end
-
+	-- Change mult and chips colors if hand is ascended
+	if G.GAME.current_round.current_hand.cry_asc_num > 0 and not hidden then
+		ease_colour(G.C.UI_CHIPS, copy_table(G.C.GOLD), 0.3)
+		ease_colour(G.C.UI_MULT, copy_table(G.C.GOLD), 0.3)
+	else
+		ease_colour(G.C.UI_CHIPS, G.C.BLUE, 0.3)
+		ease_colour(G.C.UI_MULT, G.C.RED, 0.3)
+	end
 	G.GAME.current_round.current_hand.cry_asc_num = math.max(0, G.GAME.current_round.current_hand.cry_asc_num)
 	if G.GAME.cry_exploit_override then
 		G.GAME.current_round.current_hand.cry_asc_num = G.GAME.current_round.current_hand.cry_asc_num + 1

lib/ascended.lua

@@ -1392,3 +1392,38 @@ create_UIBox_your_collection_seals_pointer = function()
 		end,
 	})
 end
+
+function Cryptid.declare_hand_ascended_counter(hand, declarehand)
+	local total = 0
+	for i, v in pairs(declarehand.declare_cards or {}) do
+		local how_many_fit = 0
+		local suit
+		local rank
+		for i2, v2 in pairs(hand) do
+			if not v2.marked then
+				if SMODS.has_no_rank(v2) and v.rank == "rankless" or v2:get_id() == v.rank then
+					rank = true
+				end
+				if v2:is_suit(v.suit) or (v.suit == "suitless" and SMODS.has_no_suit(v2)) or not v.suit then
+					suit = true
+				end
+				if not (suit and rank) then
+					suit = false
+					rank = false
+				end
+				if suit and rank then
+					how_many_fit = how_many_fit + 1
+					v2.marked = true
+				end
+			end
+		end
+		if not rank or not suit then
+			how_many_fit = 0
+		end
+		total = total + how_many_fit
+	end
+	for i2, v2 in pairs(hand) do
+		v2.marked = nil
+	end
+	return total
+end