Skip to content

Commit 3bc730b

Browse files
Cluster + Bulwark = ???
1 parent 7df8d96 commit 3bc730b

File tree

3 files changed

+37
-0
lines changed

3 files changed

+37
-0
lines changed

items/test.lua

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ local test3 = {
108108
pos = { x = 2, y = 1 },
109109
rarity = 1,
110110
cost = 2,
111+
blueprint_compat = true,
111112
discovered = true,
112113
atlas = "atlastwo",
113114
loc_txt = {
@@ -140,6 +141,33 @@ local test3 = {
140141
"Four of a Kind",
141142
"Straight Flush",
142143
}, true)
144+
elseif context.pre_discard and not context.hook then
145+
local text, loc_disp_text, poker_hands, scoring_hand, disp_text =
146+
G.FUNCS.get_poker_hand_info(G.hand.highlighted)
147+
if disp_text == "cry-Cluster Bulwark" then
148+
card_eval_status_text(
149+
context.blueprint_card or card,
150+
"extra",
151+
nil,
152+
nil,
153+
nil,
154+
{ message = localize("k_upgrade_ex") }
155+
)
156+
update_hand_text(
157+
{ sound = "button", volume = 0.7, pitch = 0.8, delay = 0.3 },
158+
{
159+
handname = localize(text, "poker_hands"),
160+
chips = G.GAME.hands[text].chips,
161+
mult = G.GAME.hands[text].mult,
162+
level = G.GAME.hands[text].level,
163+
}
164+
)
165+
level_up_hand(context.blueprint_card or card, text, nil, 6)
166+
update_hand_text(
167+
{ sound = "button", volume = 0.7, pitch = 1.1, delay = 0 },
168+
{ mult = 0, chips = 0, handname = "", level = "" }
169+
)
170+
end
143171
end
144172
end,
145173
}

lib/ascended.lua

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ end
1212
local pokerhandinforef = G.FUNCS.get_poker_hand_info
1313
function G.FUNCS.get_poker_hand_info(_cards)
1414
local text, loc_disp_text, poker_hands, scoring_hand, disp_text = pokerhandinforef(_cards)
15+
-- Display text if played hand contains a Cluster and a Bulwark
16+
-- Not Ascended hand related but this hooks in the same spot so i'm lumping it here anyways muahahahahahaha
17+
if text == "cry_Clusterfuck" then
18+
if next(poker_hands["cry_Bulwark"]) then
19+
disp_text = "cry-Cluster Bulwark"
20+
loc_disp_text = localize(disp_text, "poker_hands")
21+
end
22+
end
1523
if G.SETTINGS.language == "en-us" then
1624
if #scoring_hand > 5 and (text == "Flush Five" or text == "Five of a Kind") then
1725
local rank_array = {}

localization/en-us.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4345,6 +4345,7 @@ return {
43454345
["cry_Clusterfuck"] = Cryptid_config.family_mode and "Cluster" or "Clusterfuck",
43464346
["cry_UltPair"] = "Ultimate Pair",
43474347
["cry_WholeDeck"] = Cryptid_config.family_mode and "The Entire Deck" or "The Entire Fucking Deck",
4348+
["cry-Cluster Bulwark"] = "Clusterwark",
43484349
},
43494350
poker_hand_descriptions = {
43504351
["cry_Bulwark"] = {

0 commit comments

Comments
 (0)