Skip to content

Commit 665de5e

Browse files
committed
reset gameset config, experimental mode
1 parent 5b9ab96 commit 665de5e

File tree

7 files changed

+51
-8
lines changed

7 files changed

+51
-8
lines changed

Cryptid.lua

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,25 @@ local cryptidConfigTab = function()
234234
scale = 0.6,
235235
id = "your_collection_jokers",
236236
})
237-
--Add warning UI later for family mode
237+
--Add warning notifications later for family mode
238238
cry_nodes[#cry_nodes + 1] = create_toggle({
239239
label = localize("cry_family"),
240240
active_colour = G.C.MONEY,
241241
ref_table = Cryptid_config,
242242
ref_value = "family_mode",
243243
callback = reload_cryptid_localization,
244244
})
245+
cry_nodes[#cry_nodes + 1] = create_toggle({
246+
label = localize("cry_experimental"),
247+
active_colour = G.C.MONEY,
248+
ref_table = Cryptid_config,
249+
ref_value = "experimental",
250+
})
251+
cry_nodes[#cry_nodes + 1] = UIBox_button({
252+
button = "reset_gameset_config",
253+
label = { localize("b_reset_gameset_"..(G.PROFILES[G.SETTINGS.profile].cry_gameset or 'mainline')) },
254+
minw = 5,
255+
})
245256
return {
246257
n = G.UIT.ROOT,
247258
config = {

config.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ return {
77
["alt_bg_music"] = true,
88
},
99
["family_mode"] = false,
10+
["experimental"] = false,
1011
}

items/misc.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,6 @@ local gold_edition = {
12031203
and context.consumeable == card
12041204
)
12051205
then
1206-
print(context)
12071206
return { p_dollars = self.config.dollars } -- updated value
12081207
end
12091208
end,

lib/gameset.lua

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,17 @@ function cry_get_gameset(card, center)
575575
end
576576
end
577577
local gameset = G.PROFILES[G.SETTINGS.profile].cry_gameset or "mainline"
578+
if Cryptid_config.experimental and center.extra_gamesets then
579+
for i = 1, #center.extra_gamesets do
580+
if center.extra_gamesets[i] == "experimental_"..gameset then
581+
gameset = "experimental_"..gameset
582+
break
583+
elseif center.extra_gamesets[i] == "experimental" then
584+
gameset = "experimental"
585+
break
586+
end
587+
end
588+
end
578589
if
579590
G.PROFILES[G.SETTINGS.profile].cry_gameset_overrides
580591
and G.PROFILES[G.SETTINGS.profile].cry_gameset_overrides[center.key]
@@ -847,6 +858,12 @@ function Card:cry_set_gameset(center, gameset)
847858
G:save_progress()
848859
end
849860

861+
function G.FUNCS.reset_gameset_config()
862+
G.PROFILES[G.SETTINGS.profile].cry_gameset_overrides = nil
863+
cry_update_obj_registry()
864+
G:save_progress()
865+
end
866+
850867
function cry_card_enabled(key, iter)
851868
if not iter then
852869
iter = 0

lib/overrides.lua

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ function Card:set_cost()
458458
end
459459
end
460460

461-
-- Modify to display badges for credits
461+
-- Modify to display badges for credits and some gameset badges
462462
-- todo: make this optional
463463
local smcmb = SMODS.create_mod_badges
464464
function SMODS.create_mod_badges(obj, badges)
@@ -605,6 +605,17 @@ function SMODS.create_mod_badges(obj, badges)
605605
}
606606
end
607607
end
608+
if safe_get(G,"ACTIVE_MOD_UI","id") == "Cryptid" and obj and not obj.force_gameset then
609+
local set = cry_get_gameset(obj)
610+
if set == "disabled" or obj.set == "Content Set" then
611+
return
612+
end
613+
local card_type = localize('cry_gameset_'..cry_get_gameset(obj))
614+
if card_type == "ERROR" then
615+
card_type = localize('cry_gameset_custom')
616+
end
617+
badges[#badges + 1] = create_badge(card_type, set == "modest" and G.C.GREEN or set == "mainline" and G.C.RED or set == "madness" and G.C.CRY_EXOTIC or G.C.CRY_ASCENDANT)
618+
end
608619
end
609620

610621
-- This is short enough that I'm fine overriding it

localization/en-us.lua

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4240,6 +4240,7 @@ return {
42404240
cry_mus_high_score = "High Score (Final Boss [For Your Computer] by AlexZGreat)",
42414241
cry_mus_alt_bg = "Background Music (by MathIsFun_)",
42424242
cry_family = "Family Friendly Mode",
4243+
cry_experimental = "Experimental Mode",
42434244

42444245
k_cry_program_pack = "Program Pack",
42454246
k_cry_meme_pack = "Meme Pack",
@@ -4343,8 +4344,16 @@ return {
43434344
cry_gameset_mainline = "Mainline",
43444345
cry_gameset_madness = "Madness",
43454346
cry_gameset_custom = "Modified",
4347+
cry_gameset_experimental = "Experimental",
4348+
cry_gameset_experimental_modest = "Experimental (Modest)",
4349+
cry_gameset_experimental_mainline = "Experimental (Mainline)",
4350+
cry_gameset_experimental_madness = "Experimental (Madness)",
43464351

43474352
cry_view_set_contents = "View Items in Set",
4353+
4354+
b_reset_gameset_modest = "Reset Gameset Config (Modest)",
4355+
b_reset_gameset_mainline = "Reset Gameset Config (Mainline)",
4356+
b_reset_gameset_madness = "Reset Gameset Config (Madness)",
43484357
},
43494358
labels = {
43504359
food_jokers = "Food Jokers",

lovely/lib_gameset.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,6 @@ Cryptid.shared_gamesets[gameset_key].role.draw_major = self
186186
Cryptid.shared_gamesets[gameset_key]:draw_shader('dissolve', nil, nil, nil, self.children.center)
187187
Cryptid.shared_gamesets[gameset_key]:draw_shader('voucher', nil, self.ARGS.send_to_shader, nil, self.children.center)
188188
end
189-
if self.gameset_select and Card.get_gameset(cry_get_center(self.config.center.key), cry_get_center(self.config.center.key)) == gameset_key then
190-
Cryptid.shared_gamesets.selected.role.draw_major = self
191-
Cryptid.shared_gamesets.selected:draw_shader('dissolve', nil, nil, nil, self.children.center)
192-
Cryptid.shared_gamesets.selected:draw_shader('voucher', nil, self.ARGS.send_to_shader, nil, self.children.center)
193-
end
194189
'''
195190
match_indent = true
196191

0 commit comments

Comments
 (0)