diff options
| -rw-r--r-- | macroknight.tiled-session | 28 | ||||
| -rw-r--r-- | src/macroknight/game.hy | 32 |
2 files changed, 30 insertions, 30 deletions
diff --git a/macroknight.tiled-session b/macroknight.tiled-session index a41709f..1ff0a68 100644 --- a/macroknight.tiled-session +++ b/macroknight.tiled-session @@ -3,7 +3,7 @@ "height": 4300, "width": 2 }, - "activeFile": "assets/level-3.tmx", + "activeFile": "assets/level-2.tmx", "expandedProjectPaths": [ ".", "assets" @@ -16,21 +16,21 @@ "scale": 3, "selectedLayer": 0, "viewCenter": { - "x": 491.8333333333333, - "y": 329.83333333333337 + "x": 441.5, + "y": 363.5 } }, "assets/level-1.tmx": { "scale": 4, "selectedLayer": 0, "viewCenter": { - "x": 553.625, - "y": 290.375 + "x": 319.875, + "y": 240 } }, "assets/level-2.tmx": { "scale": 2.1404687499999997, - "selectedLayer": 0, + "selectedLayer": 1, "viewCenter": { "x": 320.25695306226737, "y": 240.3679100664282 @@ -40,16 +40,16 @@ "expandedObjectLayers": [ 2 ], - "scale": 2, - "selectedLayer": 0, + "scale": 16, + "selectedLayer": 1, "viewCenter": { - "x": 340.75, - "y": 76.25 + "x": 594.96875, + "y": 180.90625 } }, "assets/monochrome_transparent.tsx": { "scaleInDock": 2, - "scaleInEditor": 2 + "scaleInEditor": 4 }, "assets/tileset_colored.tsx": { "scaleInDock": 1 @@ -64,13 +64,15 @@ "assets/level-0.tmx", "assets/monochrome_transparent.tsx", "assets/level-1.tmx", - "assets/level-3.tmx" + "assets/level-3.tmx", + "assets/level-2.tmx" ], "project": "macroknight.tiled-project", "recentFiles": [ "assets/level-0.tmx", "assets/monochrome_transparent.tsx", "assets/level-1.tmx", - "assets/level-3.tmx" + "assets/level-3.tmx", + "assets/level-2.tmx" ] } 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) |