Skip to content

Commit 2ca8b44

Browse files
authored
fix tilt on sticker decks
1 parent 0985501 commit 2ca8b44

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

assets/1x/atlasdeck.png

16.9 KB
Loading

assets/2x/atlasdeck.png

75.7 KB
Loading

items/code.lua

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,6 +1070,8 @@ local rigged = {
10701070
prefix_config = { key = false },
10711071
badge_colour = HEX("14b341"),
10721072
draw = function(self, card) --don't draw shine
1073+
local notilt = nil
1074+
if card.area and card.area.config.type == 'deck' then notilt = true end
10731075
if not G.shared_stickers["cry_rigged2"] then
10741076
G.shared_stickers["cry_rigged2"] =
10751077
Sprite(0, 0, G.CARD_W, G.CARD_H, G.ASSET_ATLAS["cry_sticker"], { x = 5, y = 1 })
@@ -1078,15 +1080,15 @@ local rigged = {
10781080
G.shared_stickers[self.key].role.draw_major = card
10791081
G.shared_stickers["cry_rigged2"].role.draw_major = card
10801082

1081-
G.shared_stickers[self.key]:draw_shader("dissolve", nil, nil, nil, card.children.center)
1083+
G.shared_stickers[self.key]:draw_shader("dissolve", nil, nil, notilt, card.children.center)
10821084

10831085
card.hover_tilt = card.hover_tilt / 2 -- call it spaghetti, but it's what hologram does so...
1084-
G.shared_stickers["cry_rigged2"]:draw_shader("dissolve", nil, nil, nil, card.children.center)
1086+
G.shared_stickers["cry_rigged2"]:draw_shader("dissolve", nil, nil, notilt, card.children.center)
10851087
G.shared_stickers["cry_rigged2"]:draw_shader(
10861088
"hologram",
10871089
nil,
10881090
card.ARGS.send_to_shader,
1089-
nil,
1091+
notilt,
10901092
card.children.center
10911093
) -- this doesn't really do much tbh, but the slight effect is nice
10921094
card.hover_tilt = card.hover_tilt * 2
@@ -2844,7 +2846,6 @@ local rework = {
28442846
end
28452847
tag.ability.rework_key = jkr.config.center.key
28462848
tag.ability.rework_edition = G.P_CENTER_POOLS.Edition[found_index].key
2847-
tag.ability.shiny = cry_rollshinybool()
28482849
add_tag(tag)
28492850
--SMODS.Tags.tag_cry_rework.apply(tag, {type = "store_joker_create"})
28502851
G.E_MANAGER:add_event(Event({

items/enhanced.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Cryptid.edeck_sprites = {
5252
rental = { atlas = "cry_atlasenhanced", pos = { x = 1, y = 3 } },
5353
pinned = { atlas = "cry_atlasenhanced", pos = { x = 0, y = 5 } },
5454
banana = { atlas = "cry_atlasenhanced", pos = { x = 5, y = 4 } },
55+
cry_rigged = { atlas = "cry_atlasenhanced", pos = { x = 3, y = 6 } },
5556
},
5657
suit = {
5758
order = 4,

items/misc.lua

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1943,20 +1943,22 @@ local absolute = {
19431943
should_apply = false,
19441944
no_sticker_sheet = true,
19451945
draw = function(self, card, layer)
1946+
local notilt = nil
1947+
if card.area and card.area.config.type == 'deck' then notilt = true end
19461948
G.shared_stickers["cry_absolute"].role.draw_major = card
1947-
G.shared_stickers["cry_absolute"]:draw_shader("dissolve", nil, nil, nil, card.children.center)
1949+
G.shared_stickers["cry_absolute"]:draw_shader("dissolve", nil, nil, notilt, card.children.center)
19481950
G.shared_stickers["cry_absolute"]:draw_shader(
19491951
"polychrome",
19501952
nil,
19511953
card.ARGS.send_to_shader,
1952-
nil,
1954+
notilt,
19531955
card.children.center
19541956
)
19551957
G.shared_stickers["cry_absolute"]:draw_shader(
19561958
"voucher",
19571959
nil,
19581960
card.ARGS.send_to_shader,
1959-
nil,
1961+
notilt,
19601962
card.children.center
19611963
)
19621964
end,

0 commit comments

Comments
 (0)