Skip to content

Commit 49d1893

Browse files
committed
gameset stuff
1 parent 04f806b commit 49d1893

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

content_sets.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ function Cryptid.gameset_config_UI(center)
206206
},
207207
},
208208
}
209-
if center.set == "Content Set" then
209+
if center.set == "Content Set" and not (SMODS.Mods["Cryptid"] or {}).can_load then
210210
G.viewedContentSet = center
211211
args.back2 = true
212212
args.back2_func = "your_collection_current_set"

lovely.toml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,27 @@ match_indent = true
5353
target = "functions/common_events.lua"
5454
pattern = "local info_queue = {}"
5555
position = "after"
56-
payload = '''if not (SMODS.Mods["Cryptid"] or {}).can_load and _c.cry_disabled or (_c.force_gameset and _c.force_gameset == 'disabled') then
57-
if _c.cry_disabled then
58-
if _c.cry_disabled.type == "card_dependency" then
59-
local name = Cryptid.get_center(_c.cry_disabled.key) and localize{type = 'name_text', set = Cryptid.get_center(_c.cry_disabled.key).set, key = _c.cry_disabled.key} or _c.cry_disabled.key
60-
info_queue[#info_queue+1] = {key = 'disabled_card_dependency', set = 'Other', specific_vars = {name}}
61-
elseif _c.cry_disabled.type == "mod_dependency" then
62-
local name = Cryptid.cross_mod_names[_c.cry_disabled.key] or _c.cry_disabled.key
63-
info_queue[#info_queue+1] = {key = 'disabled_mod_dependency', set = 'Other', specific_vars = {name}}
64-
elseif _c.cry_disabled.type == "mod_conflict" then
65-
local name = SMODS.Mods[_c.cry_disabled.key].name
66-
info_queue[#info_queue+1] = {key = 'disabled_mod_conflict', set = 'Other', specific_vars = {name}}
67-
else
68-
if not (_c.force_gameset and _c.force_gameset ~= 'disabled') then
69-
info_queue[#info_queue+1] = {key = 'disabled', set = 'Other'}
56+
payload = '''
57+
if not (SMODS.Mods["Cryptid"] or {}).can_load then
58+
if _c.cry_disabled or (_c.force_gameset and _c.force_gameset == 'disabled') then
59+
if _c.cry_disabled then
60+
if _c.cry_disabled.type == "card_dependency" then
61+
local name = Cryptid.get_center(_c.cry_disabled.key) and localize{type = 'name_text', set = Cryptid.get_center(_c.cry_disabled.key).set, key = _c.cry_disabled.key} or _c.cry_disabled.key
62+
info_queue[#info_queue+1] = {key = 'disabled_card_dependency', set = 'Other', specific_vars = {name}}
63+
elseif _c.cry_disabled.type == "mod_dependency" then
64+
local name = Cryptid.cross_mod_names[_c.cry_disabled.key] or _c.cry_disabled.key
65+
info_queue[#info_queue+1] = {key = 'disabled_mod_dependency', set = 'Other', specific_vars = {name}}
66+
elseif _c.cry_disabled.type == "mod_conflict" then
67+
local name = SMODS.Mods[_c.cry_disabled.key].name
68+
info_queue[#info_queue+1] = {key = 'disabled_mod_conflict', set = 'Other', specific_vars = {name}}
69+
else
70+
if not (_c.force_gameset and _c.force_gameset ~= 'disabled') then
71+
info_queue[#info_queue+1] = {key = 'disabled', set = 'Other'}
72+
end
7073
end
74+
else
75+
info_queue[#info_queue+1] = {key = 'disabled', set = 'Other'}
7176
end
72-
else
73-
info_queue[#info_queue+1] = {key = 'disabled', set = 'Other'}
7477
end
7578
end'''
7679
match_indent = true

0 commit comments

Comments
 (0)