Skip to content

Commit dd7b02d

Browse files
Minor change to internal none flags
minor change to none flags internally to attempt to fix instances where madness didn't automatically unlock none
1 parent 83fe3d8 commit dd7b02d

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Cryptid.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ function SMODS.injectItems(...)
181181
end
182182
end
183183
if G.PROFILES[G.SETTINGS.profile].all_unlocked then
184+
G.PROFILES[G.SETTINGS.profile].cry_none2 = true
184185
G.PROFILES[G.SETTINGS.profile].cry_none = (Cryptid.enabled("set_cry_poker_hand_stuff") == true)
185186
end
186187
G.P_CENTERS.j_stencil.immutable = true

lib/gameset.lua

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,8 @@ G.FUNCS.cry_gameset_confirm = function(e)
330330
if G.selectedGameset == "madness" then
331331
--Unlock All by default in madness
332332
G.PROFILES[G.SETTINGS.profile].all_unlocked = true
333+
G.PROFILES[G.SETTINGS.profile].cry_none2 = true
334+
G.PROFILES[G.SETTINGS.profile].cry_none = (Cryptid.enabled("set_cry_poker_hand_stuff") == true)
333335
for k, v in pairs(G.P_CENTERS) do
334336
if not v.demo and not v.wip then
335337
v.alerted = true
@@ -1129,17 +1131,14 @@ function Cryptid.update_obj_registry(m, force_enable)
11291131
G.PROFILES,
11301132
G.SETTINGS.profile,
11311133
"cry_none2"
1132-
) or nil
1133-
G.PROFILES[G.SETTINGS.profile].cry_none2 = nil
1134+
) and true or nil
11341135
end
11351136
end
11361137
else
11371138
if not v.cry_disabled then
11381139
v:_disable(en)
11391140
if v.key == "set_cry_poker_hand_stuff" and G.PROFILES[G.SETTINGS.profile].cry_none then
11401141
--Remove the none flag if poker hands are disabled because leaving it on can leave to softlocks
1141-
G.PROFILES[G.SETTINGS.profile].cry_none2 =
1142-
Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "cry_none")
11431142
G.PROFILES[G.SETTINGS.profile].cry_none = nil
11441143
end
11451144
end

lib/overrides.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,6 +1839,7 @@ function end_round()
18391839
Cryptid.enabled("set_cry_poker_hand_stuff") == true
18401840
and not Cryptid.safe_get(G.PROFILES, G.SETTINGS.profile, "cry_none")
18411841
then
1842+
G.PROFILES[G.SETTINGS.profile].cry_none2 = true
18421843
G.PROFILES[G.SETTINGS.profile].cry_none = true
18431844
end
18441845
if not Cryptid.enabled("set_cry_poker_hand_stuff") then
@@ -1975,6 +1976,7 @@ G.FUNCS.play_cards_from_highlighted = function(e)
19751976
-- None Stuff
19761977
if G.GAME.stamp_mod and not G.PROFILES[G.SETTINGS.profile].cry_none and #G.hand.highlighted == 1 then
19771978
G.PROFILES[G.SETTINGS.profile].cry_none = true
1979+
G.PROFILES[G.SETTINGS.profile].cry_none2 = true
19781980
print("nonelock stuff here")
19791981
G.GAME.hands["cry_None"].visible = true
19801982
end
@@ -2204,6 +2206,7 @@ end
22042206
local unlock_allref = G.FUNCS.unlock_all
22052207
G.FUNCS.unlock_all = function(e)
22062208
unlock_allref(e)
2209+
G.PROFILES[G.SETTINGS.profile].cry_none2 = true
22072210
G.PROFILES[G.SETTINGS.profile].cry_none = (Cryptid.enabled("set_cry_poker_hand_stuff") == true)
22082211
end
22092212

0 commit comments

Comments
 (0)