diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/macroknight/game.hy | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/macroknight/game.hy b/src/macroknight/game.hy index 8675f81..125768a 100644 --- a/src/macroknight/game.hy +++ b/src/macroknight/game.hy @@ -39,8 +39,6 @@ (load_pygame "assets/level-2.tmx") (load_pygame "assets/level-3.tmx")]) (setv level-id 0) -(setv game-won False) -(setv game-lost False) (defn abs-to-tile-index [abs-id] (int (floor (/ abs-id TILE_SIZE)))) @@ -86,7 +84,7 @@ TILE_SIZE tile-x tile-y))))) - + (setv player-pos (let [player-objects (lfor ent (get level.layers 1) :if (= ent.type "Player") ent)] (if (any player-objects) @@ -94,9 +92,10 @@ #((abs-to-tile-index player-object.x) (abs-to-tile-index player-object.y))) #(5 5)))) - (setv player (Player 1 [(get tileset.tiles 28) - (get tileset.tiles 29)] TILE_SIZE #* player-pos)) + (setv player (Player (len entities) [(get tileset.tiles 28) + (get tileset.tiles 29)] TILE_SIZE #* player-pos)) (.append entities player) + (setv macro-input-mode False) (setv macro-wait-time 0) (setv macro-commands [None None None]) @@ -202,8 +201,17 @@ (setv level-id (+ level-id 1)) (setv running False) (when (>= level-id (len levels)) - (setv game-running False) - (setv game-won True))) + (setv level-id 0) + (.fill screen "#000000") + + (render-text screen + tileset + "YOU WIN" + 15 + 14) + + (pygame.display.flip) + (pygame.time.wait 1000))) (except [PlayerKilled] (setv running False))) @@ -221,16 +229,6 @@ (.tick clock 60))) -(when game-won - (.fill screen "#000000") - - (render-text screen - tileset - "YOU WIN" - 10 - 10) - (pygame.display.flip) - (pygame.time.wait 1000)) (pygame.quit) |