aboutsummaryrefslogtreecommitdiff
path: root/src/macroknight
diff options
context:
space:
mode:
authorGene Pasquet <gene@pacerevenue.com>2025-05-12 16:20:03 +0200
committerGene Pasquet <gene@pacerevenue.com>2025-05-12 16:20:03 +0200
commitfea26fa451ed2bd8c21c99d589228328540811ca (patch)
tree12651eaa1c7c8ce0fc69d78088c0e408c8e9da8b /src/macroknight
parent62d14fae5f04233baa525b764a7d0ff20b262f5d (diff)
Working collisions
Diffstat (limited to 'src/macroknight')
-rw-r--r--src/macroknight/game.hy7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/macroknight/game.hy b/src/macroknight/game.hy
index c910416..ed9be1d 100644
--- a/src/macroknight/game.hy
+++ b/src/macroknight/game.hy
@@ -8,7 +8,7 @@
(setv TILE_SCALING 1)
-(setv TILE_SIZE 32)
+(setv TILE_SIZE (* TILE_SCALING 16))
(setv GRAVITY 5)
(defclass TileSet []
@@ -43,7 +43,7 @@
(let [collision (.clip entity.rect ent.rect)]
(print f"{entity.id} == {ent.id}")
(.move entity
- (* -1 collision.width)
+ 0
(* -1 collision.height))))))
;; Define entities here
@@ -72,7 +72,7 @@
(setv self.id 1)
(setv self.surf (pygame.Surface #(TILE_SIZE TILE_SIZE)))
(.blit self.surf tile #(0 0))
- (setv self.rect (.get_rect self.surf)))
+ (setv self.rect (.get_rect self.surf :left (* 5 TILE_SIZE))))
(defn move [self dx dy]
(.move_ip self.rect dx dy)))
@@ -105,6 +105,7 @@
(for [inp ongoing_inputs]
(match inp
+ pygame.K_ESCAPE (setv running False)
pygame.K_w (.move player 0 (* -1 player.JUMP_IMPULSE))
pygame.K_a (.move player (* -1 player.SPEED) 0)
pygame.K_s (.move player 0 1)