Skip to content

Commit 15e476e

Browse files
Merge branch 'SpectralPack:main' into patch-1
2 parents 656bc60 + 59f9edb commit 15e476e

File tree

17 files changed

+53
-53
lines changed

17 files changed

+53
-53
lines changed

Cryptid.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if not Cryptid then
88
end
99
local mod_path = "" .. SMODS.current_mod.path -- this path changes when each mod is loaded, but the local variable will retain Cryptid's path
1010
Cryptid.path = mod_path
11-
Cryptid_config = SMODS.current_mod.config
11+
Cryptid_config = SMODS.current_mod.config or {} --is this nil check needed? idk but i saw crash reports related to this
1212

1313
-- Lovely Patch Target, toggles being able to change gameset config. Here for mod support
1414
Cryptid_config.gameset_toggle = true

assets/1x/atlasepic.png

18.9 KB
Loading

assets/1x/atlasexotic.png

-14.7 KB
Loading

assets/1x/atlasone.png

2.29 KB
Loading

assets/1x/atlastwo.png

1.23 KB
Loading

assets/2x/atlasepic.png

20.8 KB
Loading

assets/2x/atlasexotic.png

-3.11 KB
Loading

assets/2x/atlasone.png

7.07 KB
Loading

assets/2x/atlastwo.png

1.64 KB
Loading

items/code.lua

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2907,21 +2907,22 @@ local cryfunction = {
29072907
local function_sticker = {
29082908
dependencies = {
29092909
items = {
2910+
"set_cry_code",
29102911
"c_cry_cryfunction",
29112912
},
29122913
},
29132914
object_type = "Sticker",
29142915
atlas = "sticker",
29152916
pos = { x = 3, y = 5 },
29162917
config = {},
2917-
key = "cry_function_sticker_desc",
2918+
key = "cry_function_sticker",
29182919
no_sticker_sheet = true,
29192920
prefix_config = { key = false },
29202921
badge_colour = HEX("14b341"),
29212922
order = 607,
29222923
draw = function(self, card) --don't draw shine
2923-
G.shared_stickers[self.key].role.draw_major = card
2924-
G.shared_stickers[self.key]:draw_shader("dissolve", nil, nil, nil, card.children.center)
2924+
G.shared_stickers["cry_function_sticker"].role.draw_major = card
2925+
G.shared_stickers["cry_function_sticker"]:draw_shader("dissolve", nil, nil, nil, card.children.center)
29252926
end,
29262927
-- loc_vars = function(self, info_queue, card)
29272928
-- info_queue[#info_queue + 1] = {
@@ -2952,6 +2953,8 @@ local function_sticker = {
29522953
return "None"
29532954
end
29542955
return {
2956+
key = "cry_function_sticker",
2957+
set = "Other",
29552958
vars = {
29562959
lclze(1),
29572960
lclze(2),

0 commit comments

Comments
 (0)