feat: added intro sequence, fixed norman's sprite, placed him in various places
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/pr/woodpecker Pipeline failed

This commit is contained in:
Zoltan Timar
2026-03-12 18:10:50 +01:00
parent c897cdcbd5
commit b349ded281
14 changed files with 211 additions and 80 deletions

View File

@@ -2,6 +2,32 @@
local _sprites = {}
local _active_sprites = {}
local function draw_sprite_instance(sprite_data, params)
local colorkey = params.colorkey or sprite_data.colorkey or 0
local scale = params.scale or sprite_data.scale or 1
local flip_x = params.flip_x or sprite_data.flip_x or 0
local flip_y = params.flip_y or sprite_data.flip_y or 0
local rot = params.rot or sprite_data.rot or 0
if sprite_data.sprites then
for i = 1, #sprite_data.sprites do
local sub_sprite = sprite_data.sprites[i]
spr(
sub_sprite.s,
params.x + (sub_sprite.x_offset or 0),
params.y + (sub_sprite.y_offset or 0),
sub_sprite.colorkey or colorkey,
sub_sprite.scale or scale,
sub_sprite.flip_x or flip_x,
sub_sprite.flip_y or flip_y,
sub_sprite.rot or rot
)
end
else
spr(sprite_data.s, params.x, params.y, colorkey, scale, flip_x, flip_y, rot)
end
end
--- Registers a sprite definition.
--- @within Sprite
--- @param sprite_data table A table containing the sprite definition.
@@ -59,6 +85,34 @@ function Sprite.hide(id)
_active_sprites[id] = nil
end
--- Draws a sprite immediately without scheduling it.
--- @within Sprite
--- @param id string The unique identifier of the sprite.<br/>
--- @param x number The x-coordinate.<br/>
--- @param y number The y-coordinate.<br/>
--- @param[opt] colorkey number The color index for transparency.<br/>
--- @param[opt] scale number The scaling factor.<br/>
--- @param[opt] flip_x number Set to 1 to flip horizontally.<br/>
--- @param[opt] flip_y number Set to 1 to flip vertically.<br/>
--- @param[opt] rot number The rotation in degrees.<br/>
function Sprite.draw_at(id, x, y, colorkey, scale, flip_x, flip_y, rot)
local sprite_data = _sprites[id]
if not sprite_data then
trace("Error: Attempted to draw non-registered sprite with id: " .. id)
return
end
draw_sprite_instance(sprite_data, {
x = x,
y = y,
colorkey = colorkey,
scale = scale,
flip_x = flip_x,
flip_y = flip_y,
rot = rot,
})
end
--- Draws all scheduled sprites.
--- @within Sprite
function Sprite.draw()
@@ -68,29 +122,8 @@ function Sprite.draw()
trace("Error: Sprite id " .. id .. " in _active_sprites is not registered.")
_active_sprites[id] = nil
end
local colorkey = params.colorkey or sprite_data.colorkey or 0
local scale = params.scale or sprite_data.scale or 1
local flip_x = params.flip_x or sprite_data.flip_x or 0
local flip_y = params.flip_y or sprite_data.flip_y or 0
local rot = params.rot or sprite_data.rot or 0
if sprite_data.sprites then
for i = 1, #sprite_data.sprites do
local sub_sprite = sprite_data.sprites[i]
spr(
sub_sprite.s,
params.x + (sub_sprite.x_offset or 0),
params.y + (sub_sprite.y_offset or 0),
sub_sprite.colorkey or colorkey,
sub_sprite.scale or scale,
sub_sprite.flip_x or flip_x,
sub_sprite.flip_y or flip_y,
sub_sprite.rot or rot
)
end
else
spr(sprite_data.s, params.x, params.y, colorkey, scale, flip_x, flip_y, rot)
if sprite_data then
draw_sprite_instance(sprite_data, params)
end
end
end

View File

@@ -1,17 +1,23 @@
Sprite.register({
id = "norman",
sprites = {
-- Body (sprite index 0)
{ s = 0, x_offset = 0, y_offset = 0 },
-- Head (sprite index 1)
{ s = 1, x_offset = 0, y_offset = -8 },
-- Left Arm (sprite index 2)
{ s = 2, x_offset = -4, y_offset = 4 },
-- Right Arm (sprite index 3, flipped)
{ s = 3, x_offset = 4, y_offset = 4, flip_x = 1 }, -- Flipped arm
-- Left Leg (sprite index 4)
{ s = 4, x_offset = -2, y_offset = 8 },
-- Right Leg (sprite index 5, flipped)
{ s = 5, x_offset = 2, y_offset = 8, flip_x = 1 } -- Flipped leg
{ s = 272, x_offset = -4, y_offset = -4 },
{ s = 273, x_offset = 4, y_offset = -4 },
{ s = 288, x_offset = -4, y_offset = 4 },
{ s = 289, x_offset = 4, y_offset = 4 },
{ s = 304, x_offset = -4, y_offset = 12 },
{ s = 305, x_offset = 4, y_offset = 12 }
}
})
Sprite.register({
id = "sleeping_norman",
sprites = {
{ s = 272, x_offset = 12, y_offset = -4, flip_y = 1 },
{ s = 273, x_offset = 12, y_offset = 4, flip_y = 1 },
{ s = 288, x_offset = 4, y_offset = -4, flip_y = 1 },
{ s = 289, x_offset = 4, y_offset = 4, flip_y = 1 },
{ s = 304, x_offset = -4, y_offset = -4, flip_y = 1 },
{ s = 305, x_offset = -4, y_offset = 4, flip_y = 1 }
}
})