From b25bd7d41ad9f8379d633b85c364340e3281060c Mon Sep 17 00:00:00 2001
From: Jeremy Penner <jeremy@sporktania.com>
Date: Sat, 12 Dec 2020 11:55:22 -0500
Subject: [PATCH] offscreen clipping, start level 5

---
 game/init.fnl   | 16 ++++++++++++++--
 game/level5.fnl |  6 ++++++
 game/map5.json  |  1 +
 todo.txt        |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 game/level5.fnl
 create mode 100644 game/map5.json

diff --git a/game/init.fnl b/game/init.fnl
index 248526c..abe1414 100644
--- a/game/init.fnl
+++ b/game/init.fnl
@@ -91,10 +91,22 @@
         [:drop :jaye-yx :get vm.false :transition-gord-sitting 0 :gord-dir :set vm.true]
         [:drop vm.false])])]))
 
+(vm:def :yxclip? ; yx -- f
+  [:block
+    [:lda vm.TOP :x]
+    [:cmp mapw]
+    [:bcs :clipped]
+    [:lda vm.TOPH :x]
+    [:cmp maph]
+    [:bcs :clipped]
+    [:lda 0] [:sta vm.TOP :x] [:sta vm.TOPH :x] (vm:ret)
+  :clipped
+    [:lda 0xff] [:sta vm.TOP :x] [:sta vm.TOPH :x]])
+
 (vm:word :try-move-player ; dir --
   :dup :set-player-dir ; dir
   :player-yx :get :yx+ ; yxnew
-  (vm:if-or [[:dup :touch-entity] [:dup :handle-special-move] [:dup :movable-player-flag :flag-at? :not]]
+  (vm:if-or [[:dup :yxclip?] [:dup :touch-entity] [:dup :handle-special-move] [:dup :movable-player-flag :flag-at? :not]]
     [:drop :player-yx :get])
   ; always "move" so that player can visibly change direction
   ; touch-entity can modify player-yx so we have to refetch
@@ -179,7 +191,7 @@
     )
     :quit])
 
-(util.reload :game.level4)
+(util.reload :game.level5)
 
 (prg:assemble)
 
diff --git a/game/level5.fnl b/game/level5.fnl
new file mode 100644
index 0000000..b842082
--- /dev/null
+++ b/game/level5.fnl
@@ -0,0 +1,6 @@
+(local {: deflevel : say : itile} (require :game.defs))
+(local {: ev} (require :game.entity))
+(local level (deflevel "game/map5.json"))
+(local vm level.vm)
+
+level
diff --git a/game/map5.json b/game/map5.json
new file mode 100644
index 0000000..d2c145c
--- /dev/null
+++ b/game/map5.json
@@ -0,0 +1 @@
+{"neut":{"y":6,"x":20},"jaye":{"y":5,"x":19},"gord-following":true,"map":"21616161228161616161616161616161616162612102E0C0C0C0C0E0C04361C0C0C0C0C0A3C0C0612161C0C0C0C0C0C0C0C022C0C0C08282C0828261416103C0C0C0C0C0C0C081C0C0C0C0C0C0C0C2C1210203C0C0C0C0C0C04361C0C0C08282838282622161616161816161616161618161616161616161216163C0C0C0C0E0C0C06143C0C0C0C0C0C063612102C0C0C0C0C0C0C0C061C0C0C0C0C0C0C0C0814161C0C0C0C0E2C0E2836101C0C0C0C0C0C0C0C1216143C0C0C082A2A2A281C0C0C043034382E26121610261610261C16102616161026161610261612121212121214121212121212121214121212121","objects":[{"x":17,"func":"rexx","linkword":"","name":"","y":11},{"x":17,"func":"rexx","linkword":"","name":"","y":8},{"x":20,"link":13,"func":"switch","linkword":"","name":"","y":9},{"x":20,"link":16,"func":"switch","linkword":"","name":"","y":4},{"x":12,"link":9,"func":"term","linkword":"","name":"","y":4},{"x":10,"func":"rexx","linkword":"","name":"","y":4},{"x":8,"link":17,"func":"switch","linkword":"","name":"","y":2},{"x":8,"link":10,"func":"term","linkword":"","name":"","y":6},{"x":8,"link":5,"func":"term","linkword":"","name":"","y":11},{"x":3,"link":8,"func":"term","linkword":"","name":"","y":11},{"x":5,"link":12,"func":"scan","linkword":"","name":"","y":12},{"x":6,"func":"door","linkword":"","name":"","y":12},{"x":6,"func":"door","linkword":"","name":"","y":7},{"x":11,"func":"door","linkword":"","name":"","y":9},{"x":11,"link":14,"func":"scan","linkword":"","name":"","y":10},{"x":13,"func":"door","linkword":"","name":"","y":7},{"x":11,"func":"door","linkword":"","name":"","y":3}]}
\ No newline at end of file
diff --git a/todo.txt b/todo.txt
index 6433b8d..7727d47 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,8 +1,8 @@
 Game:
-* clipping on screen edges
 * Neut tileset
 * level loading
 * Rexx can run over Jaye and vice versa
+* drawing queue
 
 tooling ideas:
 * REPLy buffer (Polywell?)