From e30b2a81b48f5e86474aa2c38d7034d63c0b7c4e Mon Sep 17 00:00:00 2001 From: Gene Pasquet Date: Sun, 18 May 2025 09:18:07 +0100 Subject: Enemies sort of working --- src/macroknight/game.hy | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/macroknight/game.hy') diff --git a/src/macroknight/game.hy b/src/macroknight/game.hy index 95cb8b1..7709f41 100644 --- a/src/macroknight/game.hy +++ b/src/macroknight/game.hy @@ -49,7 +49,8 @@ tile-y)) "Enemy1" (.append entities (Enemy (len entities) - (get tileset.tiles 128) + [(get tileset.tiles 128) + (get tileset.tiles 129)] TILE_SIZE tile-x tile-y))))) @@ -157,15 +158,14 @@ (for [entity entities] (apply-collisions entity entities))) - (.animate player (pygame.time.get_ticks)) - (.flush player) - ;; Apply systems - (for [entity entities] - (apply-gravity entity entities) - (run-enemies entity entities) - (apply-collisions entity entities)) - + (let [ticks (pygame.time.get_ticks)] + (for [entity entities] + (run-enemies entity entities) + (when (hasattr entity "animate") (.animate entity ticks)) + (apply-gravity entity entities) + (apply-collisions entity entities))) + (except [GoalHit] (setv level-id (+ level-id 1)) (setv running False) -- cgit v1.2.3