From 51c5b9c6b77c1dae254f9930e4b0cc3a798137c0 Mon Sep 17 00:00:00 2001
From: Jeremy Penner <jeremy@sporktania.com>
Date: Wed, 10 Feb 2021 23:26:08 -0500
Subject: [PATCH] Implement level 1 introduction

---
 NeutTower.dsk      | Bin 143360 -> 143360 bytes
 editor/mapedit.fnl |  11 +++--------
 game/level1.fnl    |  33 ++++++++++++++++++++++++++++++++-
 game/map1.json     |   2 +-
 game/tiles.fnl     |  11 +++++++++--
 5 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/NeutTower.dsk b/NeutTower.dsk
index 16038a0e687fd58bd9068ebb5c7970f47d7d9476..127f963eaeb23addd9f4377ddbbfd96bfbc3b6f8 100644
GIT binary patch
delta 6169
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
DHSGIo

delta 6267
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
VeU>EN+AQC7`R&TSXZtj_{~yA2HwXX#

diff --git a/editor/mapedit.fnl b/editor/mapedit.fnl
index 7ba088a..aa2f64e 100644
--- a/editor/mapedit.fnl
+++ b/editor/mapedit.fnl
@@ -4,7 +4,7 @@
 (local lume (require :lib.lume))
 (local {: mouse-inside : activate : active? : checkbox : textfield : textbutton} (util.require :editor.imstate))
 (local {: tilestrip-to-sprite} (util.require :editor.tiledraw))
-(local {: encode-yx} (util.require :game.tiles))
+(local {: encode-yx : encode-itile : decode-itile} (util.require :game.tiles))
 
 (local MapEditView (GraphicsEditView:extend))
 (local sprite-scale 3)
@@ -26,10 +26,7 @@
 
 (fn update-map [map mx my itile]
   (local imap (imap-from-xy mx my))
-  (local enctile
-    (bit.bor
-      (bit.lshift (bit.band (- itile 1) 0x07) 5)
-      (bit.rshift (bit.band (- itile 1) 0xf8) 3)))
+  (local enctile (encode-itile itile))
   (..
     (map:sub 1 imap)
     (string.char enctile)
@@ -38,9 +35,7 @@
 (fn MapEditView.itile-from-xy [self mx my]
   (local imap (+ (imap-from-xy mx my) 1))
   (local enctile (string.byte (self.level.map:sub imap imap)))
-  (+ 1 (bit.bor
-    (bit.lshift (bit.band enctile 0x1f) 3)
-    (bit.rshift (bit.band enctile 0xe0) 5))))
+  (decode-itile enctile))
 
 (fn MapEditView.set-tile [self mx my itile]
   (set self.level.map (update-map self.level.map mx my itile)))
diff --git a/game/level1.fnl b/game/level1.fnl
index df38061..9f078fa 100644
--- a/game/level1.fnl
+++ b/game/level1.fnl
@@ -1,8 +1,39 @@
-(local {: deflevel : say : itile : controlstate} (require :game.defs))
+(local {: readjson} (require :lib.util))
+(local {: deflevel : say : itile : controlstate : tilelist} (require :game.defs))
 (local {: ev} (require :game.entity))
+(local {: decode-itile : encode-yx} (require :game.tiles))
 (local level (deflevel "game/map1.json" :level1))
 (local vm level.vm)
 
+(let [map (readjson "game/map1.json")
+      maptiles (map.map:fromhex)
+      furniture-yx []]
+  (for [ibyte 1 (length maptiles)]
+    (let [btile (maptiles:sub ibyte ibyte)
+          enctile (string.byte btile)
+          itile (+ (decode-itile enctile) 1)
+          mx (+ (% (- ibyte 1) 20) 1)
+          my (- 12 (math.floor (/ (- ibyte 1) 20)))]
+      (when (. tilelist itile :flags :debris)
+        (print mx my itile)
+        (table.insert furniture-yx (encode-yx {:x mx :y my})))))
+  (vm.code:append :furniture-yx)
+  (for [_ 1 10]
+    (let [ifurniture (math.random 1 (length furniture-yx))]
+      (vm.code:append [:dw (. furniture-yx ifurniture)])
+      (table.remove furniture-yx ifurniture))))
+
+(vm:word :earthquake ; --
+  :full-redraw
+  :lit :furniture-yx
+  10 (vm:for :rnd :shl4 0x7ff :& :snooze
+             :dup :get :dup :itile-at 0x20 :+ :update-itile
+             :snd-explode
+             (vm:i) 9 := (vm:when (say :jaye "WOAH!") :hide-footer)
+             2 :+) :drop
+  0x1000 :snooze
+  (say :jaye "THAT WAS AN EARTHQUAKE!"))
+
 (vm:word :firstdoor
   (vm:if-and [[:is-jaye?] [:dup ev.touch :=] [:responder-itile (itile :doorclosed) :=]] [
     (say :jaye "IT WON'T OPEN!")
diff --git a/game/map1.json b/game/map1.json
index 0cb6759..6fd524e 100644
--- a/game/map1.json
+++ b/game/map1.json
@@ -1 +1 @@
-{"loadword":"","map":"212121214121212121212121212141212121212161026161610261616102616161616102616161216143C0C0E2C0C0C0C0C0C0C081C0C0C0C0C0612161C0C0A282C0C0C0A2C0C0C061C0C0C0C0C2024161C0C0C0C0C0C0C0C0C2C0A2C1A2C0C0E082612161E2C08282C0C0C0C0A2C0C061616161616161216161616161C16181616161616143C0C0E282612161C0C0C0C0C0C0C0C0C0C0C061C0C0C0C0C0022161E08282A2C0C0C0C0E2C0C081C0C0C0C003612161E2C2C2C0C0C0C0C0C0C0C061C0C0C0C0C06141610303C063E2C0C0C0C0C0C061C0C0C023C061216161616161616161228161616161616161610221","jaye":{"y":9,"x":15},"tickword":"","moveword":"","objects":[{"x":8,"func":"door","name":"","linkword":"","y":6},{"link":3,"y":4,"func":"firstterm","name":"","linkword":"","x":2},{"link":2,"y":8,"func":"neutterm","name":"","linkword":"","x":17},{"link":8,"y":8,"func":"switch","name":"","linkword":"","x":13},{"x":9,"link":6,"func":"exitscanner","linkword":"","name":"","y":1},{"x":10,"linkentity":"level2","func":"exitdoor","y":1,"linkword":"exitlevel","name":""},{"x":6,"link":1,"func":"switch","linkword":"","name":"","y":6},{"x":13,"func":"firstdoor","linkword":"","name":"","y":10}]}
\ No newline at end of file
+{"loadword":"earthquake","map":"212121214121212121212121212141212121212161026161610261616102616161616102616161216143C0C0C2C0C0C0C0C0C0C081C0C0C0C0C0612161C0C08282C0C0C082C0C0C061C0C0C0C0C2024161C0C0C0C0C0C0C0C0C2C082C182C0C0E082612161C2C08282C0C0C0C082C0C061616161616161216161616161C16181616161616143C0C0C282612161C0C0C0C0C0C0C0C0C0C0C061C0C0C0C0C0022161E0828282C0C0C0C0C2C0C081C0C0C0C003612161C2C2C2C0C0C0C0C0C0C0C061C0C0C0C0C06141610303C043C2C0C0C0C0C0C061C0C0C003C061216161616161616161228161616161616161610221","jaye":{"y":9,"x":15},"tickword":"","moveword":"","objects":[{"x":8,"func":"door","linkword":"","name":"","y":6},{"x":2,"func":"firstterm","y":4,"name":"","linkword":"","link":3},{"x":17,"func":"neutterm","y":8,"name":"","linkword":"","link":2},{"x":13,"func":"switch","y":8,"name":"","linkword":"","link":8},{"link":6,"x":9,"y":1,"linkword":"","name":"","func":"exitscanner"},{"x":10,"linkentity":"level2","func":"exitdoor","y":1,"name":"","linkword":"exitlevel"},{"link":1,"x":6,"y":6,"linkword":"","name":"","func":"switch"},{"x":13,"func":"firstdoor","name":"","linkword":"","y":10}]}
\ No newline at end of file
diff --git a/game/tiles.fnl b/game/tiles.fnl
index 9d73a98..bb4c981 100644
--- a/game/tiles.fnl
+++ b/game/tiles.fnl
@@ -54,7 +54,14 @@
   (if xy (bit.bor (bit.lshift (- xy.y 1) 8) (- xy.x 1)) 0xffff))
 
 (fn encode-itile [itile]
-  (bit.bor (bit.lshift (bit.band (- itile 1) 0x07) 5) (bit.rshift (bit.band (- itile 1) 0xf8) 3)))
+  (bit.bor
+    (bit.lshift (bit.band (- itile 1) 0x07) 5)
+    (bit.rshift (bit.band (- itile 1) 0xf8) 3)))
+
+(fn decode-itile [enctile]
+  (+ 1 (bit.bor
+    (bit.lshift (bit.band enctile 0x1f) 3)
+    (bit.rshift (bit.band enctile 0xe0) 5))))
 
 (fn find-itile [tiles label ?itilenext]
   (local itile (or ?itilenext 1))
@@ -64,5 +71,5 @@
     (find-itile tiles label (+ itile 1))))
 
 {: loadgfx : savegfx : appendtiles : appendgfx : flags : flag-to-bit : find-itile
- : fn-tiles : fn-portraits : fn-font : encode-yx : encode-itile}
+ : fn-tiles : fn-portraits : fn-font : encode-yx : encode-itile : decode-itile}