From e7a89b9040cbbad5ff66b5a72984ca521807aa16 Mon Sep 17 00:00:00 2001
From: Jeremy Penner <jeremy@sporktania.com>
Date: Fri, 11 Dec 2020 21:20:43 -0500
Subject: [PATCH] level 4 polish

---
 game/level4.fnl | 9 +++++++++
 game/map4.json  | 2 +-
 todo.txt        | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/game/level4.fnl b/game/level4.fnl
index 3d904b4..dad3f31 100644
--- a/game/level4.fnl
+++ b/game/level4.fnl
@@ -6,4 +6,13 @@
 (vm:word :term-dual-link
   :lit :term-exit :entity-itile (itile :termon) := (vm:if [:lit :term-exit] [:lit :term-scan]))
 
+(vm:var :gord-sat vm.false)
+(vm:word :tutorial-chair ; ev --
+  ev.touch := (vm:when
+    :get-responder :get :handle-special-move :drop
+    (vm:if-and [[:gord-sat :get :not] [:gord-sitting :get]]
+      [vm.true :gord-sat :set
+       (say :gord "PHEW, IT FEELS GOOD TO" "REST MY LEG FOR A BIT.")
+       (say :gord "IF YOU NEED ME TO DO SOMETHING" "FROM MY CHAIR, YOU CAN PRESS" "THE Z KEY.")])))
+
 level
diff --git a/game/map4.json b/game/map4.json
index ce266df..9887b65 100644
--- a/game/map4.json
+++ b/game/map4.json
@@ -1 +1 @@
-{"neut":{"y":5,"x":20},"jaye":{"y":4,"x":19},"gord-following":true,"map":"61616161616161616261616161616161616161616143C0C0C082E082C0C0636163C0C083C0C0436161C0C0C0C0C0C2C0C0C0C0C1C0C0C0C0C0C0C06161C0C0C0C0C0C0C0C0C0C0C1C0C0C0C0C0C0C2616103C0C0A3C0C0C003C0C06163C0C0C0C082A261616161616161C1616161812261618161616161616143C0C0C0C0C0C04361C0C0C0C0C0C0C0C0636181C0C0C0C0C0C0C0C081C0C0C0C0C0C0C0C0C06122C0C0C0C0C0E2C0C0C1A2E2C0C0C0C0C0C0C08161E082828282E0C02361A2C0C0C0C0C0C003236161026161610222616102616161610261616102612121214121212121212121212121412121212121","objects":[{"x":7,"func":"term","y":11,"linkword":"term-dual-link","name":""},{"link":1,"y":3,"func":"term","name":"term-exit","linkword":"","x":2},{"link":1,"y":3,"func":"term","name":"term-scan","linkword":"","x":7},{"link":2,"y":10,"func":"switch","name":"","linkword":"","x":12},{"link":3,"y":9,"func":"switch","name":"","linkword":"","x":12},{"x":11,"func":"door","y":7,"linkword":"","name":""},{"link":6,"y":7,"func":"scan","name":"","linkword":"","x":12},{"x":15,"func":"door","y":7,"linkword":"","name":""},{"link":8,"y":7,"func":"switch","name":"","linkword":"","x":7},{"x":10,"func":"door","y":5,"linkword":"","name":""},{"link":6,"y":4,"func":"switch","name":"","linkword":"","x":10},{"x":16,"func":"rexx","y":11,"linkword":"","name":""},{"link":10,"y":2,"func":"scan","name":"","linkword":"","x":7},{"link":15,"y":4,"func":"scan","name":"","linkword":"","x":1},{"x":1,"func":"door","y":5,"linkword":"","name":""},{"x":5,"func":"rexx","y":8,"linkword":"","name":""}]}
\ No newline at end of file
+{"neut":{"y":5,"x":20},"jaye":{"y":4,"x":19},"gord-following":true,"map":"61616161616161616261616161616161616161616143C0C0C082E082C0C0636163C0C083C0C0436161C0C0C0C0C0C2C0C0C0C0C1C0C0C0C0C0C0C06161C0C0C0C0C0C0C0C0C0C0C1C0C0C0C0C0C0C2616103C0C0A3C0C0C003C0C06163C0C0C0C082A261616161616161C1616161812261618161616161616143C0C0C0C0C0C04361C0C0C0C0C0C0C0C0636181C0C0C0C0C0C0C0C081C0C0C0C0C0C0C0C0C06122C0C0C0C0C0E2C0C0C1A2E2C0C0C0C0C0C0C08161E082828282E0C02361A2C0C0C0C0C0C003236161026161610222616102616161610261616102612121214121212121212121212121412121212121","objects":[{"x":7,"func":"term","y":11,"linkword":"term-dual-link","name":""},{"link":1,"y":3,"func":"term","name":"term-exit","linkword":"","x":2},{"link":1,"y":3,"func":"term","name":"term-scan","linkword":"","x":7},{"link":2,"y":10,"func":"switch","name":"","linkword":"","x":12},{"link":3,"y":9,"func":"switch","name":"","linkword":"","x":12},{"x":11,"func":"door","y":7,"linkword":"","name":""},{"link":6,"y":7,"func":"scan","name":"","linkword":"","x":12},{"x":15,"func":"door","y":7,"linkword":"","name":""},{"link":8,"y":7,"func":"switch","name":"","linkword":"","x":7},{"x":10,"func":"door","y":5,"linkword":"","name":""},{"link":6,"y":4,"func":"switch","name":"","linkword":"","x":10},{"x":16,"func":"rexx","y":11,"linkword":"","name":""},{"link":10,"y":2,"func":"scan","name":"","linkword":"","x":7},{"link":15,"y":4,"func":"scan","name":"","linkword":"","x":1},{"x":1,"func":"door","y":5,"linkword":"","name":""},{"x":5,"func":"rexx","y":8,"linkword":"","name":""},{"x":7,"func":"tutorial-chair","linkword":"","name":"","y":10}]}
\ No newline at end of file
diff --git a/todo.txt b/todo.txt
index 0c82fbe..6433b8d 100644
--- a/todo.txt
+++ b/todo.txt
@@ -2,6 +2,7 @@ Game:
 * clipping on screen edges
 * Neut tileset
 * level loading
+* Rexx can run over Jaye and vice versa
 
 tooling ideas:
 * REPLy buffer (Polywell?)