Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added SDM_0's Stuff to cross mods #406

Merged
merged 1 commit into from
Feb 20, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions lib/gameset.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Cryptid.cross_mod_names = {
CardSleeves = "Card Sleeves",
Cryptid = "Cryptid",
jen = "Jen's Almanac",
sdm0sstuff = "SDM_0's Stuff",
}
-------------------------
---- TUTORIAL SYSTEM ----
Expand Down Expand Up @@ -334,21 +335,21 @@ G.FUNCS.cry_gameset_confirm = function(e)
--Unlock All by default in madness
G.PROFILES[G.SETTINGS.profile].all_unlocked = true
for k, v in pairs(G.P_CENTERS) do
if not v.demo and not v.wip then
if not v.demo and not v.wip then
v.alerted = true
v.discovered = true
v.unlocked = true
end
end
for k, v in pairs(G.P_BLINDS) do
if not v.demo and not v.wip then
if not v.demo and not v.wip then
v.alerted = true
v.discovered = true
v.unlocked = true
end
end
for k, v in pairs(G.P_TAGS) do
if not v.demo and not v.wip then
if not v.demo and not v.wip then
v.alerted = true
v.discovered = true
v.unlocked = true
Expand Down Expand Up @@ -714,7 +715,7 @@ function cry_gameset_config_UI(center)
key = center.key,
config = {}
}
local card = Card(G.ROOM.T.x + 0.2*G.ROOM.T.w/2,G.ROOM.T.h, G.CARD_W, G.CARD_H, G.P_CARDS.empty, fake_center)
local card = Card(G.ROOM.T.x + 0.2*G.ROOM.T.w/2,G.ROOM.T.h, G.CARD_W, G.CARD_H, G.P_CARDS.empty, fake_center)
card:start_materialize()
card.gameset_select = true
G.your_collection[1]:emplace(card)
Expand Down Expand Up @@ -756,14 +757,14 @@ end
local collection_shtuff = {
"blinds",
"jokers",

-- consumables don't work
-- idk what smods is doing with consumable collection stuff, anyone know what the buttons are doing?
"tarots",
"planets",
"spectrals",
"codes",

"vouchers",
"enhancements",
"decks",
Expand Down Expand Up @@ -1570,13 +1571,13 @@ function modsCollectionTally(pool, set)
if set then
if v.set and v.set == set then
obj_tally.of = obj_tally.of+1
if cry_get_gameset(v) ~= "disabled" then
if cry_get_gameset(v) ~= "disabled" then
obj_tally.tally = obj_tally.tally+1
end
end
else
obj_tally.of = obj_tally.of+1
if cry_get_gameset(v) ~= "disabled" then
if cry_get_gameset(v) ~= "disabled" then
obj_tally.tally = obj_tally.tally+1
end
end
Expand Down