Compare commits
2 commits
75c102c298
...
9813b53ddd
| Author | SHA1 | Date | |
|---|---|---|---|
| 9813b53ddd | |||
|
|
87b0e5534b |
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 13 KiB |
BIN
assets/1x/backExtra.png
Normal file
|
After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 8.6 KiB |
BIN
assets/2x/backExtra.png
Normal file
|
After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 4.7 KiB |
|
|
@ -3,7 +3,7 @@
|
|||
"id": "Roland",
|
||||
"name": "Roland",
|
||||
"prefix": "Roland",
|
||||
"version": "2.9.60",
|
||||
"version": "2.9.62",
|
||||
"badge_colour": "8BE9FD",
|
||||
"display_name": "Roland",
|
||||
"main_file": "src/main.lua",
|
||||
|
|
|
|||
49
src/back.lua
|
|
@ -8,7 +8,7 @@ end
|
|||
local back = (function()
|
||||
local x = 0
|
||||
|
||||
---@param tbl SMODS.Back|{attributes?: Attributes[], is_alt: (fun(self: self): boolean), alt_apply?: fun(self: SMODS.Back|table, back: Back|table), alt_calculate?: fun(self: SMODS.Back|table, back: Back|table, context: CalcContext|table): table?, boolean?}
|
||||
---@param tbl SMODS.Back|{attributes?: Attributes[], pronouns: string, is_alt: (fun(self: self): boolean), alt_apply?: fun(self: SMODS.Back|table, back: Back|table), alt_calculate?: fun(self: SMODS.Back|table, back: Back|table, context: CalcContext|table): table?, boolean?}
|
||||
return function(tbl)
|
||||
local key = tbl.key
|
||||
local apply = tbl.apply
|
||||
|
|
@ -32,6 +32,7 @@ local back = (function()
|
|||
key = key,
|
||||
pos = tbl.pos,
|
||||
atlas = "sleeve",
|
||||
pronouns = tbl.pronouns,
|
||||
config = tbl.config and f(tbl.config):table() or nil,
|
||||
loc_vars = function(self, ...)
|
||||
local ret = tbl.loc_vars and tbl.loc_vars(self, ...) or {}
|
||||
|
|
@ -53,13 +54,20 @@ local back = (function()
|
|||
end
|
||||
end)()
|
||||
|
||||
SMODS.Atlas {
|
||||
local back_atlas = SMODS.Atlas {
|
||||
key = "back",
|
||||
path = "back.png",
|
||||
px = 71,
|
||||
py = 95,
|
||||
}
|
||||
|
||||
local extra_atlas = SMODS.Atlas {
|
||||
key = "back_extra",
|
||||
path = "backExtra.png",
|
||||
px = 71,
|
||||
py = 95,
|
||||
}
|
||||
|
||||
local _ = CardSleeves and SMODS.Atlas {
|
||||
key = "sleeve",
|
||||
path = "sleeve.png",
|
||||
|
|
@ -125,7 +133,7 @@ back {
|
|||
calculate = f.noop,
|
||||
}
|
||||
|
||||
back {
|
||||
local b_dropship = back {
|
||||
key = "dropship",
|
||||
pronouns = "he_him",
|
||||
attributes = {"passive", "generation"},
|
||||
|
|
@ -144,6 +152,41 @@ back {
|
|||
calculate = f.noop,
|
||||
}
|
||||
|
||||
local dropship_tape
|
||||
|
||||
q(function()
|
||||
dropship_tape = SMODS.create_sprite(0, 0, G.CARD_W, G.CARD_H, extra_atlas, {x = 0, y = 0})
|
||||
end)
|
||||
|
||||
SMODS.DrawStep {
|
||||
key = "dropship_tape",
|
||||
order = 5,
|
||||
func = function(self)
|
||||
if self.children.back.atlas ~= back_atlas or self.children.back.sprite_pos.x ~= b_dropship.pos.x then
|
||||
return
|
||||
end
|
||||
|
||||
dropship_tape.role.draw_major = self
|
||||
local deck = self.area.config.type == "deck"
|
||||
local sticker_offset = self.sticker_offset or {}
|
||||
|
||||
-- Don't draw dissolve since it's baked into the sprite already. Also, I had to boost its alpha for the
|
||||
-- shine to look correct, so drawing this would look *awful*.
|
||||
-- dropship_tape:draw_shader("dissolve", nil, nil, deck, self.children.center, self.sticker_rotation, sticker_offset.x, sticker_offset.y)
|
||||
dropship_tape:draw_shader(
|
||||
"voucher",
|
||||
nil,
|
||||
self.ARGS.send_to_shader,
|
||||
deck,
|
||||
self.children.center,
|
||||
self.sticker_rotation,
|
||||
sticker_offset.x,
|
||||
sticker_offset.y
|
||||
)
|
||||
end,
|
||||
conditions = {vortex = false, facing = "back"},
|
||||
}
|
||||
|
||||
local swapper = {Spectral = "Tarot", Tarot = "Spectral"}
|
||||
local orig_create_card = create_card
|
||||
|
||||
|
|
|
|||