Skip to content

Commit 71a605a

Browse files
committed
declare related fixes
1 parent 1724898 commit 71a605a

File tree

3 files changed

+59
-5
lines changed

3 files changed

+59
-5
lines changed

items/code.lua

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3017,8 +3017,6 @@ local declare = {
30173017
for i, v in pairs(G.GAME.hands) do
30183018
v.order = (v.order or 0) + 1
30193019
end
3020-
local desc = localize("cry_Declare" .. tostring(G.GAME.DECLARE_USED or 0), "poker_hand_descriptions")
3021-
desc[#desc + 1] = localize("cry_code_suitless")
30223020
return {
30233021
order = 1,
30243022
l_mult = l_mult,
@@ -3037,7 +3035,7 @@ local declare = {
30373035
declare_name = G.ENTERED_CARD,
30383036
level = 1,
30393037
index = G.GAME.DECLARE_USED or 0,
3040-
desc_text = suitless and desc or nil,
3038+
suitless = suitless
30413039
}
30423040
end
30433041
local localize_ref = localize
@@ -3048,8 +3046,8 @@ local declare = {
30483046
end
30493047
end
30503048
if second == "poker_hand_descriptions" then
3051-
if G and G.GAME and G.GAME.hands[first] and G.GAME.hands[first].desc_text then
3052-
return G.GAME.hands[first].desc_text
3049+
if G and G.GAME and G.GAME.hands[first] and G.GAME.hands[first].suitless then
3050+
return localize_ref(first.."_suitless", second, ...)
30533051
end
30543052
end
30553053
return localize_ref(first, second, ...)

lib/content.lua

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,58 @@ SMODS.PokerHand({
286286
end,
287287
})
288288

289+
SMODS.PokerHand({
290+
key = "Declare0",
291+
visible = false,
292+
chips = 0,
293+
mult = 0,
294+
l_chips = 0,
295+
l_mult = 0,
296+
example = {
297+
},
298+
atlas = "poker_hands",
299+
pos = { x = 0, y = 0 },
300+
above_hand = "cry_UltPair",
301+
order_offset = 1000,
302+
evaluate = function(parts, hand)
303+
304+
end,
305+
})
306+
SMODS.PokerHand({
307+
key = "Declare1",
308+
visible = false,
309+
chips = 0,
310+
mult = 0,
311+
l_chips = 0,
312+
l_mult = 0,
313+
example = {
314+
},
315+
atlas = "poker_hands",
316+
pos = { x = 0, y = 0 },
317+
above_hand = "cry_UltPair",
318+
order_offset = 1001,
319+
evaluate = function(parts, hand)
320+
321+
end,
322+
})
323+
SMODS.PokerHand({
324+
key = "Declare2",
325+
visible = false,
326+
chips = 0,
327+
mult = 0,
328+
l_chips = 0,
329+
l_mult = 0,
330+
example = {
331+
},
332+
atlas = "poker_hands",
333+
pos = { x = 0, y = 0 },
334+
above_hand = "cry_UltPair",
335+
order_offset = 1002,
336+
evaluate = function(parts, hand)
337+
338+
end,
339+
})
340+
289341
SMODS.Rarity({
290342
key = "exotic",
291343
loc_txt = {},

localization/en-us.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4885,6 +4885,10 @@ return {
48854885
["cry_Declare0"] = { "Always counts as a Straight" },
48864886
["cry_Declare1"] = { "Always counts as a Flush" },
48874887
["cry_Declare2"] = { "Always counts as a Full House" },
4888+
4889+
["cry_Declare0_suitless"] = { "Always counts as a Straight","Hand does not need specific suits" },
4890+
["cry_Declare1_suitless"] = { "Always counts as a Flush","Hand does not need specific suits" },
4891+
["cry_Declare2_suitless"] = { "Always counts as a Full House","Hand does not need specific suits" },
48884892
},
48894893
achievement_names = {
48904894
ach_cry_ace_in_crash = "Pocket ACE",

0 commit comments

Comments
 (0)