schobers/tins2023
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Added falling (& jumping) animation for lion.

Browse Source 
Added some grass tiles.
This commit is contained in:
Sander Schobers 2023-06-05 01:31:14 +02:00
parent ced8a1994f
commit 61d024b56d
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/character_lion_48.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
src/assets/images/tiles_grass_32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

2
src/game/game.zig
View File

@ -20,6 +20,7 @@ pub const Game = struct {
health: i64 = 4, health: i64 = 4,
playerPosition: engine.PointF, playerPosition: engine.PointF,
playerFallingAnimation: Animation,
playerIdleAnimation: Animation, playerIdleAnimation: Animation,
playerWalkingAnimation: Animation, playerWalkingAnimation: Animation,
playerDirection: Direction, playerDirection: Direction,
@ -37,6 +38,7 @@ pub const Game = struct {
return Game{ return Game{
.level = level, .level = level,
.playerPosition = playerPosition, .playerPosition = playerPosition,
.playerFallingAnimation = Animation.initPartialLoop(renderer.sprites.get("character_lion_48").?, 0.2, 8, 12),
.playerIdleAnimation = Animation.initPartialLoop(renderer.sprites.get("character_lion_48").?, 0.25, 0, 4), .playerIdleAnimation = Animation.initPartialLoop(renderer.sprites.get("character_lion_48").?, 0.25, 0, 4),
.playerWalkingAnimation = Animation.initPartialLoop(renderer.sprites.get("character_lion_48").?, 0.125, 4, 8), .playerWalkingAnimation = Animation.initPartialLoop(renderer.sprites.get("character_lion_48").?, 0.125, 4, 8),
.playerDirection = Direction.Right, .playerDirection = Direction.Right,

18
src/game_scene.zig
View File

@ -51,11 +51,17 @@ pub const GameScene = struct {
} }
// self.game.playerVelocity.y = std.math.min(maxFallVelocity, self.game.playerVelocity.y + self.game.playerAcceleration.y * dt); // self.game.playerVelocity.y = std.math.min(maxFallVelocity, self.game.playerVelocity.y + self.game.playerAcceleration.y * dt);
if (self.game.playerVelocity.x != 0 and self.game.playerVelocity.y == 0) { if (self.game.playerVelocity.y != 0) {
self.game.playerFallingAnimation.tick(t);
self.game.playerIdleAnimation.reset();
self.game.playerWalkingAnimation.reset();
} else if (self.game.playerVelocity.x != 0 and self.game.playerVelocity.y == 0) {
self.game.playerWalkingAnimation.tick(t); self.game.playerWalkingAnimation.tick(t);
self.game.playerFallingAnimation.tick(t);
self.game.playerIdleAnimation.reset(); self.game.playerIdleAnimation.reset();
} else if (self.game.playerVelocity.x == 0) { } else if (self.game.playerVelocity.x == 0) {
self.game.playerIdleAnimation.tick(t); self.game.playerIdleAnimation.tick(t);
self.game.playerFallingAnimation.tick(t);
self.game.playerWalkingAnimation.reset(); self.game.playerWalkingAnimation.reset();
} }
self.game.movePlayer(dt); self.game.movePlayer(dt);
@ -101,10 +107,14 @@ pub const GameScene = struct {
1 => { 1 => {
if (ordinals.right) offset = 0; if (ordinals.right) offset = 0;
if (ordinals.left) offset = 3; if (ordinals.left) offset = 3;
if (ordinals.top) offset = 15;
if (ordinals.bottom) offset = 14;
}, },
2 => { 2 => {
if (ordinals.right and ordinals.left) offset = 1 + self.game.randomTileOffset(x, y, 2); if (ordinals.right and ordinals.left) offset = 1 + self.game.randomTileOffset(x, y, 2);
if (ordinals.top and ordinals.bottom) offset = 12; if (ordinals.top and ordinals.bottom) offset = 12;
if (ordinals.top and ordinals.left) offset = 9;
if (ordinals.top and ordinals.right) offset = 8;
if (ordinals.right and ordinals.bottom) offset = 4; if (ordinals.right and ordinals.bottom) offset = 4;
if (ordinals.left and ordinals.bottom) offset = 5; if (ordinals.left and ordinals.bottom) offset = 5;
}, },
@ -131,8 +141,10 @@ pub const GameScene = struct {
} }
} }
const playerDirectionFrameOffset: usize = if (self.game.playerDirection == game.Game.Direction.Left) 0 else 8; const playerDirectionFrameOffset: usize = if (self.game.playerDirection == game.Game.Direction.Left) 0 else 12;
if (self.game.playerVelocity.x != 0 and self.game.playerVelocity.y == 0) { if (self.game.playerVelocity.y != 0) {
self.game.drawSpriteFrameP("character_lion_48", self.game.playerFallingAnimation.current + playerDirectionFrameOffset, self.game.playerPosition.add(engine.PointF.init(-0.25, -0.25)));
} else if (self.game.playerVelocity.x != 0 and self.game.playerVelocity.y == 0) {
self.game.drawSpriteFrameP("character_lion_48", self.game.playerWalkingAnimation.current + playerDirectionFrameOffset, self.game.playerPosition.add(engine.PointF.init(-0.25, -0.25))); self.game.drawSpriteFrameP("character_lion_48", self.game.playerWalkingAnimation.current + playerDirectionFrameOffset, self.game.playerPosition.add(engine.PointF.init(-0.25, -0.25)));
} else { } else {
self.game.drawSpriteFrameP("character_lion_48", self.game.playerIdleAnimation.current + playerDirectionFrameOffset, self.game.playerPosition.add(engine.PointF.init(-0.25, -0.25))); self.game.drawSpriteFrameP("character_lion_48", self.game.playerIdleAnimation.current + playerDirectionFrameOffset, self.game.playerPosition.add(engine.PointF.init(-0.25, -0.25)));