Skip to content

Commit 2664072

Browse files
Merge branch 'main' into patch-1
2 parents b20e626 + b8723cd commit 2664072

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+11700
-4425
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
.vscode/*
33
.luarc.json
44
.lovelyignore
5+
.idea/*
6+
*.diff

Cryptid.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
"priority": 114,
1010
"badge_colour": "708b91",
1111
"badge_text_colour": "FFFFFF",
12-
"version": "0.5.7",
12+
"version": "0.5.10~dev3",
1313
"dependencies": [
1414
"Talisman (>=2.2.0a)",
15-
"Steamodded (>=1.0.0~BETA-0525b)"
15+
"Steamodded (>=1.0.0~BETA-0614a)"
1616
],
1717
"conflicts": [
1818
"Saturn",
1919
"AntePreview (>= 2.0.0~0c16a) (<<3.0.0)",
2020
"Cartomancer (<= 4.11)"
21+
],
22+
"provides": [
23+
"Cryptlib"
2124
]
2225
}

Cryptid.lua

Lines changed: 66 additions & 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
@@ -187,6 +187,71 @@ function SMODS.injectItems(...)
187187
end
188188
end
189189
end
190+
G.P_CENTERS.j_stencil.immutable = true
191+
G.P_CENTERS.j_four_fingers.immutable = true
192+
G.P_CENTERS.j_mime.immutable = true
193+
G.P_CENTERS.j_ceremonial.immutable = true
194+
G.P_CENTERS.j_marble.immutable = true
195+
G.P_CENTERS.j_dusk.immutable = true
196+
G.P_CENTERS.j_raised_fist.immutable = true
197+
G.P_CENTERS.j_chaos.immutable = true
198+
G.P_CENTERS.j_hack.immutable = true
199+
G.P_CENTERS.j_pareidolia.immutable = true
200+
G.P_CENTERS.j_supernova.immutable = true
201+
G.P_CENTERS.j_space.immutable = true
202+
G.P_CENTERS.j_dna.immutable = true
203+
G.P_CENTERS.j_splash.immutable = true
204+
G.P_CENTERS.j_sixth_sense.immutable = true
205+
G.P_CENTERS.j_superposition.immutable = true
206+
G.P_CENTERS.j_seance.immutable = true
207+
G.P_CENTERS.j_riff_raff.immutable = true
208+
G.P_CENTERS.j_shortcut.immutable = true
209+
G.P_CENTERS.j_midas_mask.immutable = true
210+
G.P_CENTERS.j_luchador.immutable = true
211+
G.P_CENTERS.j_fortune_teller.immutable = true
212+
G.P_CENTERS.j_diet_cola.immutable = true
213+
G.P_CENTERS.j_mr_bones.immutable = true
214+
G.P_CENTERS.j_sock_and_buskin.immutable = true
215+
G.P_CENTERS.j_swashbuckler.immutable = true
216+
G.P_CENTERS.j_certificate.immutable = true
217+
G.P_CENTERS.j_smeared.immutable = true
218+
G.P_CENTERS.j_ring_master.immutable = true
219+
G.P_CENTERS.j_blueprint.immutable = true
220+
G.P_CENTERS.j_oops.immutable = true
221+
G.P_CENTERS.j_invisible.immutable = true
222+
G.P_CENTERS.j_brainstorm.immutable = true
223+
G.P_CENTERS.j_shoot_the_moon.immutable = true
224+
G.P_CENTERS.j_cartomancer.immutable = true
225+
G.P_CENTERS.j_astronomer.immutable = true
226+
G.P_CENTERS.j_burnt.immutable = true
227+
G.P_CENTERS.j_chicot.immutable = true
228+
G.P_CENTERS.j_perkeo.immutable = true
229+
G.P_CENTERS.j_hanging_chad.misprintize_caps = { extra = 40 }
230+
G.P_CENTERS.c_high_priestess.misprintize_caps = { planets = 100 }
231+
G.P_CENTERS.c_emperor.misprintize_caps = { tarots = 100 }
232+
G.P_CENTERS.c_familiar.misprintize_caps = { extra = 100 }
233+
G.P_CENTERS.c_grim.misprintize_caps = { extra = 100 }
234+
G.P_CENTERS.c_incantation.misprintize_caps = { extra = 100 }
235+
G.P_CENTERS.c_immolate.misprintize_caps = { destroy = 1e300 }
236+
G.P_CENTERS.c_cryptid.misprintize_caps = { extra = 100, max_highlighted = 100 }
237+
G.P_CENTERS.c_immolate.misprintize_caps = { destroy = 1e300 }
238+
Cryptid.inject_pointer_aliases()
239+
240+
--this has to be here because the colors dont exist earlier then this
241+
Cryptid.circus_rarities["rare"] = { rarity = 3, base_mult = 2, order = 1, colour = G.C.RARITY.Rare }
242+
Cryptid.circus_rarities["epic"] = { rarity = "cry_epic", base_mult = 3, order = 2, colour = G.C.RARITY.cry_epic }
243+
Cryptid.circus_rarities["legendary"] = { rarity = 4, base_mult = 4, order = 3, colour = G.C.RARITY.Legendary }
244+
Cryptid.circus_rarities["exotic"] =
245+
{ rarity = "cry_exotic", base_mult = 20, order = 4, colour = G.C.RARITY.cry_exotic }
246+
247+
Cryptid.reload_localization()
248+
end
249+
250+
local old_repitions = SMODS.calculate_repetitions
251+
SMODS.calculate_repetitions = function(card, context, reps)
252+
local reps = old_repitions(card, context, reps)
253+
reps = reps or { 1 }
254+
return reps
190255
end
191256

192257
local cryptidConfigTab = function()

assets/1x/atlasSleeves.png

5.72 KB
Loading

assets/1x/atlasepic.png

27.9 KB
Loading

assets/1x/atlasexotic.png

-473 Bytes
Loading

assets/1x/atlasnotjokers.png

3.59 KB
Loading

assets/1x/atlasone.png

14 KB
Loading

assets/1x/atlasspooky.png

-2.04 KB
Loading

assets/1x/atlastwo.png

10.9 KB
Loading

0 commit comments

Comments
 (0)