Skip to content

Commit cb46367

Browse files
lord-rubylord-ruby
committed
fixes & icon
1 parent 67d1823 commit cb46367

File tree

5 files changed

+79
-72
lines changed

5 files changed

+79
-72
lines changed

‎Cryptlib.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"display_name": "cryl",
55
"author": ["The Cryptid discord"],
66
"description": "A library mod for all the functions that Cryptid has to offer",
7-
"prefix": "cry",
7+
"prefix": "cryl",
88
"main_file": "main.lua",
99
"priority": 0,
1010
"badge_colour": "708b91",
1111
"badge_text_colour": "FFFFFF",
12-
"version": "0.0.1",
12+
"version": "1.0.7",
1313
"dependencies": [
1414
],
1515
"conflicts": [

‎assets/1x/crylib_icon.png‎

446 Bytes
Loading

‎assets/2x/crylib_icon.png‎

859 Bytes
Loading

‎main.lua‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ Cryptid_config = {
22
gameset_toggle = true
33
}
44

5+
SMODS.Atlas {
6+
key = "modicon",
7+
path = "crylib_icon.png",
8+
px = 34,
9+
py = 34,
10+
}:register()
11+
512
local files = {
613
"talisman",
714
"manipulate",

‎utilities.lua‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -456,80 +456,80 @@ function Cryptid.with_deck_effects(card, func)
456456
end
457457
end
458458

459-
local set_spritesref = Card.set_sprites
460-
function Card:set_sprites(_center, _front)
461-
set_spritesref(self, _center, _front)
462-
if _center and _center.soul_pos and _center.soul_pos.extra then
463-
self.children.floating_sprite2 = Sprite(
464-
self.T.x,
465-
self.T.y,
466-
self.T.w,
467-
self.T.h,
468-
G.ASSET_ATLAS[_center.atlas or _center.set],
469-
_center.soul_pos.extra
470-
)
471-
self.children.floating_sprite2.role.draw_major = self
472-
self.children.floating_sprite2.states.hover.can = false
473-
self.children.floating_sprite2.states.click.can = false
459+
if not (SMODS.Mods["Cryptid"] or {}).can_load then
460+
local set_spritesref = Card.set_sprites
461+
function Card:set_sprites(_center, _front)
462+
set_spritesref(self, _center, _front)
463+
if _center and _center.soul_pos and _center.soul_pos.extra then
464+
self.children.floating_sprite2 = Sprite(
465+
self.T.x,
466+
self.T.y,
467+
self.T.w,
468+
self.T.h,
469+
G.ASSET_ATLAS[_center.atlas or _center.set],
470+
_center.soul_pos.extra
471+
)
472+
self.children.floating_sprite2.role.draw_major = self
473+
self.children.floating_sprite2.states.hover.can = false
474+
self.children.floating_sprite2.states.click.can = false
475+
end
474476
end
475-
end
476-
477-
478-
SMODS.DrawStep({
479-
key = "floating_sprite2",
480-
order = 59,
481-
func = function(self)
482-
if
483-
self.config.center.soul_pos
484-
and self.config.center.soul_pos.extra
485-
and (self.config.center.discovered or self.bypass_discovery_center)
486-
then
487-
local scale_mod = 0.07 -- + 0.02*math.cos(1.8*G.TIMERS.REAL) + 0.00*math.cos((G.TIMERS.REAL - math.floor(G.TIMERS.REAL))*math.pi*14)*(1 - (G.TIMERS.REAL - math.floor(G.TIMERS.REAL)))^3
488-
local rotate_mod = 0 --0.05*math.cos(1.219*G.TIMERS.REAL) + 0.00*math.cos((G.TIMERS.REAL)*math.pi*5)*(1 - (G.TIMERS.REAL - math.floor(G.TIMERS.REAL)))^2
489-
if self.children.floating_sprite2 then
490-
self.children.floating_sprite2:draw_shader(
491-
"dissolve",
492-
0,
493-
nil,
494-
nil,
495-
self.children.center,
496-
scale_mod,
497-
rotate_mod,
498-
nil,
499-
0.1 --[[ + 0.03*math.cos(1.8*G.TIMERS.REAL)--]],
500-
nil,
501-
0.6
502-
)
503-
self.children.floating_sprite2:draw_shader(
504-
"dissolve",
505-
nil,
506-
nil,
507-
nil,
508-
self.children.center,
509-
scale_mod,
510-
rotate_mod
511-
)
512-
else
513-
local center = self.config.center
514-
if _center and _center.soul_pos and _center.soul_pos.extra then
515-
self.children.floating_sprite2 = Sprite(
516-
self.T.x,
517-
self.T.y,
518-
self.T.w,
519-
self.T.h,
520-
G.ASSET_ATLAS[_center.atlas or _center.set],
521-
_center.soul_pos.extra
477+
SMODS.DrawStep({
478+
key = "floating_sprite2",
479+
order = 59,
480+
func = function(self)
481+
if
482+
self.config.center.soul_pos
483+
and self.config.center.soul_pos.extra
484+
and (self.config.center.discovered or self.bypass_discovery_center)
485+
then
486+
local scale_mod = 0.07 -- + 0.02*math.cos(1.8*G.TIMERS.REAL) + 0.00*math.cos((G.TIMERS.REAL - math.floor(G.TIMERS.REAL))*math.pi*14)*(1 - (G.TIMERS.REAL - math.floor(G.TIMERS.REAL)))^3
487+
local rotate_mod = 0 --0.05*math.cos(1.219*G.TIMERS.REAL) + 0.00*math.cos((G.TIMERS.REAL)*math.pi*5)*(1 - (G.TIMERS.REAL - math.floor(G.TIMERS.REAL)))^2
488+
if self.children.floating_sprite2 then
489+
self.children.floating_sprite2:draw_shader(
490+
"dissolve",
491+
0,
492+
nil,
493+
nil,
494+
self.children.center,
495+
scale_mod,
496+
rotate_mod,
497+
nil,
498+
0.1 --[[ + 0.03*math.cos(1.8*G.TIMERS.REAL)--]],
499+
nil,
500+
0.6
522501
)
523-
self.children.floating_sprite2.role.draw_major = self
524-
self.children.floating_sprite2.states.hover.can = false
525-
self.children.floating_sprite2.states.click.can = false
502+
self.children.floating_sprite2:draw_shader(
503+
"dissolve",
504+
nil,
505+
nil,
506+
nil,
507+
self.children.center,
508+
scale_mod,
509+
rotate_mod
510+
)
511+
else
512+
local center = self.config.center
513+
if _center and _center.soul_pos and _center.soul_pos.extra then
514+
self.children.floating_sprite2 = Sprite(
515+
self.T.x,
516+
self.T.y,
517+
self.T.w,
518+
self.T.h,
519+
G.ASSET_ATLAS[_center.atlas or _center.set],
520+
_center.soul_pos.extra
521+
)
522+
self.children.floating_sprite2.role.draw_major = self
523+
self.children.floating_sprite2.states.hover.can = false
524+
self.children.floating_sprite2.states.click.can = false
525+
end
526526
end
527527
end
528-
end
529-
end,
530-
conditions = { vortex = false, facing = "front" },
531-
})
532-
SMODS.draw_ignore_keys.floating_sprite2 = true
528+
end,
529+
conditions = { vortex = false, facing = "front" },
530+
})
531+
SMODS.draw_ignore_keys.floating_sprite2 = true
532+
end
533533

534534
local inj = SMODS.injectItems
535535
function SMODS.injectItems(...)

0 commit comments

Comments
 (0)