Attempted blank slate for 8Bitsy (doesn't yet build)

asm/asm.fnl

@@ -115,12 +115,13 @@
   ;   takes the form [:op args]
   ; pdat - a parsed dat; takes the form {:type type :addr addr ...}
   (local dat-parser {})
-  (fn new-block [] {:type :block :pdats [] :symbols {} :globals {}})
+  (fn new-block [last-symbol] {:type :block :pdats [] :symbols {} :globals {} : last-symbol})
 
   (fn parse-dats [block dats]
     (each [_ dat (ipairs dats)]
       (if (= (type dat) "string")
-          (do (tset block.symbols dat (+ (length block.pdats) 1))
+          (do (set block.last-symbol dat)
+              (tset block.symbols dat (+ (length block.pdats) 1))
               (when (= (dat:sub 1 2) "G-")
                 (tset block.globals dat true)))
 
@@ -133,10 +134,12 @@
               (if parser (parser dat block)
                   (. opcodes opcode) (dat-parser.op dat)
                   (error (.. "Unrecognized opcode " (fv opcode))))]
+          (when pdat
+            (set pdat.nearest-symbol block.last-symbol)
             (table.insert block.pdats pdat)
-          (when (and pdat pdat.globals)
+            (when pdat.globals
               (each [name _ (pairs pdat.globals)]
-              (tset block.globals name (length block.pdats)))))))
+                (tset block.globals name (length block.pdats))))))))
     block)
 
   (fn dat-parser.op [op]
@@ -146,7 +149,7 @@
   (fn dat-parser.block [block]
     (let [dats (lume.clone block)]
       (table.remove dats 1)
-      (parse-dats (new-block) dats)))
+      (parse-dats (new-block block.last-symbol) dats)))
 
   (fn dat-parser.db [db]       {:type :var :init (. db 2) :size 1})
   (fn dat-parser.dw [dw]       {:type :var :init (. dw 2) :size 2})
@@ -174,9 +177,11 @@
   })
 
   (fn process-pdat [pdat process default ...]
-;     (pp pdat)
+    (fn complain [ok ...]
+      (if ok (values ...)
+          (do (pp pdat) (error (.. process " failed in " pdat.type " near " (or pdat.nearest-symbol "<start of block>") " @" (or pdat.addr "<no address>") " - " ...)))))
     (local processor (. pdat-processor pdat.type process))
-    (if processor (processor pdat ...) default))
+    (if processor (complain (pcall #(processor pdat $...) ...)) default))
 
   (fn pdat-processor.op.patch [op env]
     (when (and op.mode (= (op.mode:sub 1 4) :addr))
@@ -251,6 +256,7 @@
     (local block-env (make-env block env))
     (var bytes "")
     (each [_ pdat (ipairs block.pdats)]
+      (print pdat.type pdat.addr pdat.nearest-symbol)
       (process-pdat pdat :generate nil block-env)
       (local pdatbytes (process-pdat pdat :bytes pdat.bytes block-env))
       (assert (= (type pdatbytes) :string) (.. "failed to generate bytes: " (fv pdat)))
@@ -311,6 +317,7 @@
       (or (self:env-lookup name :lookup-addr) (self:parse-addr name)))
    :pass
    (fn [self passname]
+     (print passname)
      (each [org block (pairs self.org-to-block)]
        (: self passname org block (if self.prg-base (. self.prg-base.org-to-block org) nil))))
    :gather-symbols

editor/mapedit.fnl

@@ -99,7 +99,7 @@
       (local itile (self:itile-from-xy mx my))
       (local iobject (self:iobject-from-xy mx my))
       (when (= self.itile nil)
-        (each [_ player (ipairs [:jaye :neut])]
+        (let [player :player]
           (match (. self.level player)
             {:x mx :y my} (renderer.draw_text style.font player tilex tiley style.text)))
         (love.graphics.setColor 1 1 1))
@@ -188,13 +188,11 @@
     (set self.itile nil)
     (set self.playerpos nil))
   (set y (+ y 30))
-  (each [_ player (ipairs [:jaye :neut])]
+  (let [player :player]
     (when (checkbox self (.. "Position " player) (and (= self.itile nil) (= self.playerpos player)) x y)
       (set self.itile nil)
       (set self.playerpos player))
     (set y (+ y 30)))
-  (when (checkbox self "Start with Gord" self.level.gord-following x y)
-    (set self.level.gord-following (not self.level.gord-following)))
   (set y (+ y 30))
   (self:draw-tile-selector x y (- self.size.x 20)))
 

editor/tileedit.fnl

@@ -20,7 +20,7 @@
     (values ibyte ibit)))
 
 (fn TileView.tilesize [self] (values 16 16))
-(fn TileView.tilekeys [self] [:gfx :neut])
+(fn TileView.tilekeys [self] [:gfx])
 
 (fn get-byte [tile ibyte]
   (: (tile:sub (+ ibyte 1) (+ ibyte 1)) :byte))

game/boop.fnl

@@ -68,19 +68,6 @@
 (vm:word :snd-explode 0x40 :lit :randombytes :blipmem)
 (vm:word :snd-dooropen (notes [:c1 :e1] 3))
 (vm:word :snd-doorclose (notes [:e1 :c1] 3))
-(vm:word :snd-term-jingle (notes [:e3 :f3 :g3] 0x20))
-(vm:word :snd-termon :snd-term-jingle (note :c4 0x20))
-(vm:word :snd-termoff :snd-term-jingle (note :c3 0x20))
-(vm:word :snd-rexx (notes [:c2 :g2 :e2 :c3] 0x08 0x08))
-(vm:word :snd-libb (notes [:d#1 :g#1 :f#1 :g1] 0x08 0x7f))
-(vm:word :snd-garbage (notes [:a5 :a3 :a2] 0x04 0xa0))
 (vm:word :snd-teleport (notes [:e4 :d#4 :d4 :g#4] 0x1a 0x50))
 
-(vm.code:append :keypad-boops)
-(each [_ n (ipairs [:c4 :c#4 :d4 :d#4 :e4 :f4 :f#4 :g4 :g#4 :a5])]
-  (vm.code:append [:dw (- (note-wavelength n) 0xd0)]))
-(vm:word :snd-keypad ; digit --
-  :dup :+ :lit :keypad-boops :+ :get 0x10d0 :swap :bliptone)
-(vm:word :snd-cheat (notes [:g4 :f#4 :d#4 :a4 :g#3 :e4 :g#4 :c5] 0x30 0x20))
-
 {: note : notes}

game/bosskey.fnl

@@ -1,59 +0,0 @@
-(local util (require :lib.util))
-(local {: vm : prg : astr : style} (util.require :game.defs))
-(vm:word :boss-key :textmode :page2 (vm:until :read-key) :hires :page1)
-
-; if we upload to page 2 we don't have to worry about clobbering screen holes
-(local textorg (prg:org 0x0800))
-
-(fn padding [s w style]
-  (string.rep (astr " " style) (- w (length s))))
-(fn pad [s w style]
-  (.. s (padding s w style)))
-(fn rpad [s w style]
-  (.. (padding s w style) s))
-(fn cellpad [s ?style]
-  (local textstyle (or ?style style.normal))
-  (match (type s)
-    :nil (pad "" 9 textstyle)
-    :string (pad (astr s textstyle) 9 textstyle)
-    :number (rpad (astr (.. s " ") textstyle) 9 textstyle)
-    :table (cellpad (. s 1) (. s 2))))
-(fn cells [r a b c d]
-  (.. (rpad (.. r "") 3 style.inverse)
-      (cellpad a) (cellpad b) (cellpad c) (cellpad d)))
-
-(fn generate-boss-screen-lines []
-  [(-> (astr "A16  (L) TOTAL" style.inverse)
-       (pad 38 style.inverse)
-       (.. (astr "C!" style.inverse)))
-   (.. (pad "" 38 style.inverse) (astr "24"))
-   ""
-   (cells "" ["    A" style.inverse] ["    B" style.inverse] ["    C" style.inverse] ["    D" style.inverse])
-   (cells 1 "DEFINITEL" "Y REAL WO" "RK" "")
-   (cells 2 "(NOT PLAY" "ING COMPU" "TER GAMES" ")")
-   (cells 3)
-   (cells 4 "" "HAMMERS" "BILLS" "SANDWICH")
-   (cells 5 "JANUARY" 23 "$1" "CLUB")
-   (cells 6 "FEBRUARY" 121 "$2" "REUBEN")
-   (cells 7 "MARCH" 38 "$5" "BLT")
-   (cells 8 "SMARCH" 97 "$10" "HOT DOG")
-   (cells 9 "APRIL" 555 "$20" "I SAID IT")
-   (cells 10 "WEDNESDAY" 246 "$50" "EGG SALAD")
-   (cells 11 "KEYCODE" 1337 2757 9876)
-   (cells 12 "NUMBERS" 12345 "$100" "IF I HAD")
-   (cells 13 "LETTERS" "MARMOTS" "BENJAMIN" "100 I'D")
-   (cells 14 "SYMBOLS" "^!@#%&?" "$$$$$" "EAT THEM")
-   (cells 15)
-   (cells 16 ["TOTAL" style.inverse] "TOO MANY" ["* MAGIC *" style.flashing] "ALL@ONCE")
-   (cells 17) (cells 18) (cells 19) (cells 20)])
-
-(fn bytes-from-lines [lines]
-  (var bytes (string.rep (astr " ") 0x400))
-  (each [y line (ipairs lines)]
-    (local offset (+ (* (math.floor (/ (- y 1) 8)) 0x28)
-                     (* (% (- y 1) 8) 0x80)))
-    (set bytes (util.splice bytes offset line)))
-  bytes)
-
-(textorg:append [:bytes (bytes-from-lines (generate-boss-screen-lines))])
-

game/cheat.fnl

@@ -1,36 +0,0 @@
-(local {: vm : say-runon : say} (require :game.defs))
-
-(fn defcheat [name ...]
-  (local cheatdata (.. name "-data"))
-  (vm.code:append cheatdata [:db 0] [:bytes name] [:db 0])
-  (vm:word name :lit cheatdata :cheatguard ...))
-
-(vm:word :pcheatnext ; cheatdata -- pchar
-  :dup :bget :inc :+)
-(vm:word :reset-cheat ; cheatdata --
-  0 :swap :bset)
-(vm:word :cheatguard ; char cheatdata -- [optional rdrop]
-  :dup :pcheatnext :bget :<rot := (vm:if ; cheatdata
-    [:dup :bget :inc :over :bset
-     :dup :pcheatnext :bget (vm:if [:drop :rdrop] [:snd-cheat :reset-cheat])]
-    [:reset-cheat :rdrop]))
-
-(defcheat :NTSPISPOPD :noclip :get :not :noclip :set)
-
-(vm.code:append :level-pointers
-  [:vm :level1 :level2 :level3 :level4 :level5 :level6])
-(defcheat :NTXYZZY
-  (say-runon :term "WARP TO ROOM #?" "(0 TO NOT CHEAT)")
-  :read-digit :hide-footer (vm:if-and [[:dup 1 :>=] [:dup 7 :<]]
-    [:dec :dup :+ :lit :level-pointers :+ :get :load-level]
-    [:drop]))
-
-(defcheat :NTCHUCK :chuck-mode :get :not :chuck-mode :set
-  :chuck-mode :get (vm:if
-    [(say :neut "CHUCK MODE ENABLED!" "* W H I N N Y *")]
-    [(say :neut "CHUCK MODE DISABLED." "BEEP BOOP.")]))
-
-(vm:word :cheat-key ; ascii --
-  (vm:if-and [[:dup (string.byte "A") :>=] [:dup (string.byte "Z") :<=]]
-    [:dup :NTSPISPOPD :dup :NTXYZZY :NTCHUCK]
-    [:drop]))

game/content.fnl

@@ -0,0 +1,6 @@
+; TODO: Generate from data?
+(local {: vm : say : deflevel} (require :game.defs))
+
+(deflevel "game/map1.json" :map1)
+(vm:word :cat (say :pcat "I'M A CAT"))
+

game/defs.fnl

@@ -24,16 +24,6 @@
   :bell :0xff3a
 })
 
-
-(local controlstate {
-  :jaye 0
-  :neut 1
-  :rexx 2
-  :gord 3
-  :libb 4
-  :count 5
-})
-
 (local style {
   :normal 0x80
   :inverse 0x00
@@ -135,9 +125,7 @@
     [:align 0x100] label
     [:bytes (map.map:fromhex)]
     [:db (length map.objects)]
-    [:dw (tiles.encode-yx map.jaye)]
+    [:dw (tiles.encode-yx map.player)]
-    [:dw (tiles.encode-yx map.neut)]
-    [:dw (if map.gord-following (tiles.encode-yx map.jaye) 0xffff)]
     [:jmp (if (= (or map.tickword "") "") :next map.tickword)]
     [:jmp (if (= (or map.moveword "") "") :move-noop map.moveword)]
     [:jmp (if (= (or map.loadword "") "") :next map.loadword)]))
@@ -145,12 +133,10 @@
 (vm.code:append :map-ptr [:db 0] :map-page [:db 0])
 (vm:word :map :lit :map-ptr :get)
 (vm:word :entity-count :map 240 :+ :bget)
-(vm:word :map-jaye-yx :map 241 :+ :get)
+(vm:word :map-player-yx :map 241 :+ :get)
-(vm:word :map-neut-yx :map 243 :+ :get)
+(vm:word :map-specific-tick :map 243 :+ :execute)
-(vm:word :map-gord-yx :map 245 :+ :get)
+(vm:word :map-specific-move :map 246 :+ :execute)
-(vm:word :map-specific-tick :map 247 :+ :execute)
+(vm:word :map-specific-load :map 249 :+ :execute)
-(vm:word :map-specific-move :map 250 :+ :execute)
-(vm:word :map-specific-load :map 253 :+ :execute)
 
 (fn deflevel [mapfile label]
   (local level prg) ; todo: (asm.new prg) - if we want to load levels as an overlay
@@ -180,5 +166,5 @@
 
 (set vm.code org.code)
 
-{: vm : prg : mapw : maph : mon : org : achar : astr : style : rot8l : deflevel : say : say-runon : itile : tilelist : controlstate}
+{: vm : prg : mapw : maph : mon : org : achar : astr : style : rot8l : deflevel : say : say-runon : itile : tilelist}
 

game/disk.fnl

@@ -18,7 +18,8 @@
     :boot
     [:jsr :reset]
     [:jsr :interpret]
-    [:vm :hires (vm:pstr "TITLE.SCREEN") :loadscreen])
+    [:vm :hires
+      (when (util.file-exists "game/title.screen") (values (vm:pstr "TITLE.SCREEN") :loadscreen))])
   (each [addr _ (pairs prg.org-to-block)]
     (when (~= addr org.boot.org)
       (local filename (.. "STUFF." (length prg.files)))
@@ -71,16 +72,16 @@
 
 (fn write [game]
   (local disk (Prodos "ProDOS_Blank.dsk"))
-  (disk:update-volume-header {:name "NEUT.TOWER"})
+  (disk:update-volume-header {:name "8BITSY"})
 
-  (create-sys-loader disk :NEUT game)
+  (create-sys-loader disk :BITSY game)
 
-  (disk:add-file "TITLE.SCREEN" Prodos.file-type.BIN 0x2000 (: (util.readjson "game/title.screen") :fromhex))
+  (when (util.file-exists "game/title.screen")
-  (disk:add-file "ELEVATOR.SCREEN" Prodos.file-type.BIN 0x2000 (: (util.readjson "game/end.screen") :fromhex))
+    (disk:add-file "TITLE.SCREEN" Prodos.file-type.BIN 0x2000 (: (util.readjson "game/title.screen") :fromhex)))
   (each [_ file (ipairs game.files)]
     (disk:add-file file.filename Prodos.file-type.BIN file.org (. game.org-to-block file.org :bytes)))
 
-  (disk:write "NeutTower.dsk")
+  (disk:write "8Bitsy.dsk")
   disk)
 
 {: write : append-boot-loader}

game/entity.fnl

@@ -11,18 +11,11 @@
 
 ; All entities exist in a single page in RAM - with this structure we can have up to 32
 ; (players are handled specially and never require a link)
-; if we really need more we could have one page for entities and one page for link data
-; hellmaze level 2 from MS-DOS Neut Tower has 36 entities - good excuse to simplify IMO
 ; The entity count for a level is stored after the map.
 
 (local ev {
   :touch   0
-  :untouch 1
+  :noop    -1
-  :act     2
-  :deact   3
-  :tog     4
-  :hack    5
-  :noop    6
 })
 
 (vm:def :lookup-entity ; i -- entity
@@ -97,124 +90,7 @@
     :linked-entity :swap :entity>do
   ] [:drop]))
 
-(vm:word :walking-through-door ; ev -- ev f
-  (vm:if-and [[:is-walking?] [:dup ev.touch :=] [:responder-itile (itile :dooropen) :=]]
-    [vm.true] [vm.false]))
-
-(vm:word :door ; ev --
-  :walking-through-door (vm:if
-    [:move-to-responder :drop]
-    [(itile :doorclosed) (itile :dooropen) :handle-onoff
-     :lit :snd-dooropen :lit :snd-doorclose :on-handled]))
-
-(vm:word :exitlevel ; e --
-  :link-arg :next-level :set)
-
-(vm:word :exitdoor ; ev --
-  :walking-through-door (vm:if
-    [:drop (vm:ifchain
-       [:gord-sitting :get] [(say :jaye "I'M NOT LEAVING GORD BEHIND.")]
-       [:libb-hidden? :not] [(say :neut "IT IS INADVISABLE TO LEAVE THIS" "AREA WITHOUT RETRIEVING LIBB")]
-       [:move-to-responder :linked-entity])]
-    [:door]))
-
 (vm:word :move-to-responder :get-responder :get :move-player-to)
-(vm:word :switch ; ev --
-  (vm:if-and [[:is-rexx? :not] [:dup ev.touch :=]]
-    [:drop ev.tog :is-neut? (vm:when :move-to-responder)])
-  :dup (itile :switchoff) (itile :switchon) :handle-onoff
-  (itile :switchon) :activate-link)
-
-(vm:var :disconnected-term-attempt vm.false)
-(vm:word :term ; ev --
-  :dup ev.touch := (vm:when
-    (vm:ifchain [:is-jaye?] [:drop ev.act]
-                [:is-neut?] [:responder-itile (itile :termon) := (vm:when
-                                :linked-entity :dup :entity-itile (itile :termon) :=
-                                (vm:if [:get :move-player-to :snd-teleport]
-                                       [:drop (say :neut "DESTINATION TERMINAL" "IS DISCONNECTED")
-                                        :disconnected-term-attempt :get :not (vm:when
-                                          vm.true :disconnected-term-attempt :set
-                                          (say :neut "PLEASE CONTACT YOUR" "SYSTEM ADMINISTRATOR")
-                                          (say :neut "THIS INCIDENT HAS" "BEEN REPORTED"))]))]
-                []))
-  (itile :termoff) (itile :termon) :handle-onoff
-  :lit :snd-termon :lit :snd-termoff :on-handled)
-
-(vm:word :handle-scan ; ev --
-  :dup (itile :scanoff) (itile :scanon) :handle-onoff
-  :linked-entity :swap :entity>do)
-
-(vm:word :libb-on-responder :libb-yx :get :get-responder :get :=)
-(vm:word :scan ; ev --
-  :is-neut? (vm:if [
-    (vm:case
-      [ev.touch ev.act :handle-scan :libb-on-responder (vm:when controlstate.libb :controlstate :bset 0xffff :move-player-to controlstate.neut :controlstate :bset) :move-to-responder]
-      [ev.untouch :libb-on-responder :not (vm:when ev.deact :handle-scan)]
-      [ev.hack vm.true :hack-handled :set
-               ev.act :handle-scan
-               :snd-libb
-               controlstate.libb :controlstate :bset
-               :move-to-responder
-               controlstate.neut :controlstate :bset
-               (say :libb "NO SWEAT.")]
-      [:else])
-  ] [:drop]))
-
-(vm:word :rexx ; ev --
-  ev.touch := (vm:when
-    (vm:if-and [[:is-neut?] [:responder-itile (itile :t-rexx) :=]]
-      [0xffff :move-player-to
-       (itile :t-rexxstop) :set-respondertile
-       :get-responder :set-rexx :snd-rexx]
-      [(vm:if-and [[:is-rexx?] [:responder-itile (itile :t-rexxstop) :=]]
-         [0xffff :move-player-to
-          (itile :t-rexx) :set-respondertile
-          0 :set-rexx :move-to-responder])])))
-
-
-(vm:word :read-digit ; -- digit
-  (vm:while [:read-key :dup 0x3a :< :over 0x30 :>= :& :not] :drop) 0x30 :-)
-
-(vm:word :keypad-digit ; pscreen -- n
-  :read-digit :swap :over :draw-digit :dup :snd-keypad)
-(vm:word :next-digit ; pscreen n -- pscreen n
-  :shl4 :over :keypad-digit :+ :swap 1 :+ :swap)
-(vm:word :draw-single-keypad-hash ; pscreen -- pscreen
-  :dup (string.byte "#") :draw-char 1 :+)
-(vm:word :read-keypad ; -- n
-  0x23e2 :dup
-  :draw-single-keypad-hash :draw-single-keypad-hash :draw-single-keypad-hash :draw-single-keypad-hash :drop
-  0 :next-digit :next-digit :next-digit :next-digit :swap :drop :cleartext)
-(vm:word :keypad ; ev code --
-  :>r
-  :dup ev.touch := (vm:when
-    :is-jaye? (vm:when
-      :responder-itile (itile :t-keyoff) := (vm:if
-        [(say-runon :pady "ENTER YOUR 4-DIGIT DOOR CODE!" "AND HAVE A SUPER DAY!")
-         :read-keypad :rtop := (vm:if
-           [(say :pady "THAT'S RIGHT! HOORAY!" "YOU GET A GOLD STAR!")
-            :drop ev.act]
-           [(say :pady "OHHH, SORRY! THAT'S NOT IT." "BETTER LUCK NEXT TIME!")])]
-        [(say :pady "OH HI AGAIN! I MISSED YOU TOO!")]))
-    :is-neut? (vm:when :move-to-responder))
-  :rdrop
-  :dup :evhack? (vm:when :drop ev.act)
-  :dup (itile :t-keyoff) (itile :t-keyon) :handle-onoff
-  (itile :t-keyon) :activate-link)
-
-(vm:var :hack-handled vm.false)
-(vm:word :evhack? ; e -- f
-  ev.hack := (vm:if [vm.true :hack-handled :set vm.true] [vm.false]))
-
-(vm:word :trigger-sidekick
-  (vm:if-and [[:is-jaye?] [:gord-sitting :get]]
-    [:gord-yx :get ev.touch :entity-around>do]
-    [(vm:if-and [[:is-neut?] [:libb-present :get] [:libb-hidden?]]
-       [vm.false :hack-handled :set
-        :neut-yx :get ev.hack :entity-at>do :drop
-        :hack-handled :get :not (vm:when
-          (say :libb "DON'T THINK I CAN HACK THAT."))])]))
 
 (fn append-from-map [map entity-org prefix]
   (entity-org:append [:align 0x100])

game/font.json

@@ -1 +1 @@
-[{"flags":[],"gfx":"8080808080808080"},{"flags":[],"gfx":"8C8C8C8C88808C80"},{"flags":[],"gfx":"B3B3928080808080"},{"flags":[],"gfx":"B6FFB6B6B6FFB680"},{"flags":[],"gfx":"8CBE839EB09F8C80"},{"flags":[],"gfx":"80A3938884B2B180"},{"flags":[],"gfx":"8E9B9BCEBBB3EE80"},{"flags":[],"gfx":"8C8C888080808080"},{"flags":[],"gfx":"988C8C8C8C8C9880"},{"flags":[],"gfx":"8C98989898988C80"},{"flags":[],"gfx":"8CAD9E8C9EAD8C80"},{"flags":[],"gfx":"808C8CBF8C8C8080"},{"flags":[],"gfx":"808080808C8C8880"},{"flags":[],"gfx":"8080809C80808080"},{"flags":[],"gfx":"80808080808C8C80"},{"flags":[],"gfx":"80A0B0988C868280"},{"flags":[],"gfx":"9CB6B6BEB6B69C80"},{"flags":[],"gfx":"989C989898989880"},{"flags":[],"gfx":"9CB6B0988C86BE80"},{"flags":[],"gfx":"9CB6B098B0B69C80"},{"flags":[],"gfx":"9C9E9B9BBF989880"},{"flags":[],"gfx":"BE86869EB0B09E80"},{"flags":[],"gfx":"9C86869EB6B69C80"},{"flags":[],"gfx":"BEB0B0988C8C8C80"},{"flags":[],"gfx":"9CB6B69CB6B69C80"},{"flags":[],"gfx":"9CB6B6BCB0B09C80"},{"flags":[],"gfx":"808C8C808C8C8080"},{"flags":[],"gfx":"808C8C808C8C8880"},{"flags":[],"gfx":"B0988C868C98B080"},{"flags":[],"gfx":"8080BE80BE808080"},{"flags":[],"gfx":"868C98B0988C8680"},{"flags":[],"gfx":"9CB6B0988C808C80"},{"flags":[],"gfx":"9EB3B3BBBB839E80"},{"flags":[],"gfx":"9CB6B6B6BEB6B680"},{"flags":[],"gfx":"9EB6B69EB6B69E80"},{"flags":[],"gfx":"9CB6868686B69C80"},{"flags":[],"gfx":"9EB6B6B6B6B69E80"},{"flags":[],"gfx":"BE86869E8686BE80"},{"flags":[],"gfx":"BE86869E86868680"},{"flags":[],"gfx":"9EB383BBB3B39E80"},{"flags":[],"gfx":"B6B6B6BEB6B6B680"},{"flags":[],"gfx":"8C8C8C8C8C8C8C80"},{"flags":[],"gfx":"B0B0B0B0B6BE9C80"},{"flags":[],"gfx":"B6B69E9EB6B6B680"},{"flags":[],"gfx":"868686868686BE80"},{"flags":[],"gfx":"92BFBFBFB3B3B380"},{"flags":[],"gfx":"9EB6B6B6B6B6B680"},{"flags":[],"gfx":"9CB6B6B6B6B69C80"},{"flags":[],"gfx":"9EB6B69E86868680"},{"flags":[],"gfx":"9CB6B6B6BEB6BC80"},{"flags":[],"gfx":"9EB6B69EB6B6B680"},{"flags":[],"gfx":"9CB6869CB0B69C80"},{"flags":[],"gfx":"BFBF8C8C8C8C8C80"},{"flags":[],"gfx":"B6B6B6B6B6B69C80"},{"flags":[],"gfx":"B6B6B69C9C9C8880"},{"flags":[],"gfx":"B3B3B3BFBFBF9280"},{"flags":[],"gfx":"B6B6B69CB6B6B680"},{"flags":[],"gfx":"B6B6B6BCB0B09C80"},{"flags":[],"gfx":"BEBEB0988CBEBE80"},{"flags":[],"gfx":"BC8C8C8C8C8CBC80"},{"flags":[],"gfx":"8082868C98B0A080"},{"flags":[],"gfx":"9E98989898989E80"},{"flags":[],"gfx":"8894808080808080"},{"flags":[],"gfx":"808080808080BE80"}]
+[{"flags":[],"gfx":"0000000000000000"},{"flags":[],"gfx":"081C1C1C08000800"},{"flags":[],"gfx":"3636241200000000"},{"flags":[],"gfx":"123F1212123F1200"},{"flags":[],"gfx":"083C0A1C281E0800"},{"flags":[],"gfx":"0026160834320000"},{"flags":[],"gfx":"0E1B1B062F1B3600"},{"flags":[],"gfx":"0C0C080400000000"},{"flags":[],"gfx":"180C0606060C1800"},{"flags":[],"gfx":"0C18303030180C00"},{"flags":[],"gfx":"082A1C081C2A0800"},{"flags":[],"gfx":"000C0C3F3F0C0C00"},{"flags":[],"gfx":"000000000C0C0804"},{"flags":[],"gfx":"0000001E1E000000"},{"flags":[],"gfx":"00000000000C0C00"},{"flags":[],"gfx":"002030180C060200"},{"flags":[],"gfx":"1C26263E26261C00"},{"flags":[],"gfx":"181C181818183C00"},{"flags":[],"gfx":"1C2620180C063E00"},{"flags":[],"gfx":"1C26201820261C00"},{"flags":[],"gfx":"2626263C30303000"},{"flags":[],"gfx":"3E061E2020201E00"},{"flags":[],"gfx":"1C26061E26261C00"},{"flags":[],"gfx":"3E2630180C0C0C00"},{"flags":[],"gfx":"1C26261C26261C00"},{"flags":[],"gfx":"1C26263C20201C00"},{"flags":[],"gfx":"000C0C000C0C0000"},{"flags":[],"gfx":"000C0C000C0C0804"},{"flags":[],"gfx":"30180C060C183000"},{"flags":[],"gfx":"00003E003E000000"},{"flags":[],"gfx":"060C1830180C0600"},{"flags":[],"gfx":"1C3630180C000C00"},{"flags":[],"gfx":"1E33212D3D011E00"},{"flags":[],"gfx":"1C3E26263E262600"},{"flags":[],"gfx":"1E26261E26261E00"},{"flags":[],"gfx":"1C26060606261C00"},{"flags":[],"gfx":"1E26262626261E00"},{"flags":[],"gfx":"3E06061E06063E00"},{"flags":[],"gfx":"3E06061E06060600"},{"flags":[],"gfx":"1C26063626263C00"},{"flags":[],"gfx":"2626263E26262600"},{"flags":[],"gfx":"3C18181818183C00"},{"flags":[],"gfx":"3C30303036361C00"},{"flags":[],"gfx":"2626261E26262600"},{"flags":[],"gfx":"0606060606063E00"},{"flags":[],"gfx":"373F2B2B23232300"},{"flags":[],"gfx":"26262E3626262600"},{"flags":[],"gfx":"1C26262626261C00"},{"flags":[],"gfx":"1E26261E06060600"},{"flags":[],"gfx":"1C26262626363C00"},{"flags":[],"gfx":"1E26261E26262600"},{"flags":[],"gfx":"3C26061C20221E00"},{"flags":[],"gfx":"3F0C0C0C0C0C0C00"},{"flags":[],"gfx":"2626262626261C00"},{"flags":[],"gfx":"2626261C1C1C0800"},{"flags":[],"gfx":"2323232B2B2A3600"},{"flags":[],"gfx":"2626261C26262600"},{"flags":[],"gfx":"2626261C18181800"},{"flags":[],"gfx":"3E3E30180C063E00"},{"flags":[],"gfx":"1C0C0C0C0C0C1C00"},{"flags":[],"gfx":"0002060C18302000"},{"flags":[],"gfx":"1C18181818181C00"},{"flags":[],"gfx":"081C260000000000"},{"flags":[],"gfx":"0000000000003E00"},{"flags":[],"gfx":"0C0C100000000000"}]

game/gfx.fnl

@@ -108,7 +108,7 @@
     :<rot :drawmaprow :swap
   :dup :not) :drop :drop :player-redraw)
 
-(vm.code:append :tilepage [:db #(hi ($1:lookup-addr :jaye-tileset))])
+(vm.code:append :tilepage [:db #(hi ($1:lookup-addr :tileset))])
 (vm:def :lookup-tile ; itile -- ptile
   ; each tile is 32 bytes; 2^5
   ; we save some cycles by storing the indices as lllhhhhh, so we don't need to shift them'
@@ -118,12 +118,6 @@
   [:sta vm.TOPH :x]
   [:tya] [:and 0xe0]
   [:sta vm.TOP :x])
-(vm:def :set-human-tileset
-  [:lda #(hi ($1:lookup-addr :jaye-tileset))]
-  [:sta :tilepage])
-(vm:def :set-prog-tileset
-  [:lda #(hi ($1:lookup-addr :neut-tileset))]
-  [:sta :tilepage])
 
 (vm:word :draw-portrait ; pgfx
   0x2252 :over :drawtile

game/init.fnl

@@ -11,21 +11,10 @@
 (util.reload :game.entity)
 (util.reload :game.player)
 (util.reload :game.boop)
-(util.reload :game.cheat)
 
 (tile.appendtiles org.code)
 (org.code:append [:align 0x100] :font)
 (tile.appendgfx org.code (tile.loadgfx tile.fn-font))
-(tile.append-portraitwords vm {:pneut #[:vm :chuck-mode :get (vm:if [:lit :pchuck] [:lit :pneut])]})
-
-(util.reload :game.level1)
-(util.reload :game.level2)
-(util.reload :game.level3)
-(util.reload :game.level4)
-(util.reload :game.level5)
-(util.reload :game.level6)
-
-(util.reload :game.bosskey)
 
 (vm:var :tick-count)
 (vm:word :handle-key :tick :read-key :dup :cheat-key :player-key :hide-footer)
@@ -37,11 +26,7 @@
   :lit :map-ptr :set :reload-level)
 
 (vm:word :reload-level
-  :map-jaye-yx :jaye-yx :set
+  :map-player-yx :player-yx :set
-  :map-neut-yx :neut-yx :set
-  :map-gord-yx :gord-yx :set
-  0 :gord-dir :set
-  0xffff :rexx-yx :set
   :map-specific-load
   :full-redraw)
 
@@ -49,16 +34,18 @@
   [:jsr :reset]
   [:jsr :interpret]
   [:vm :hires
-    :lit :level1 :load-level
+    :lit :map1 :load-level
     (vm:forever
-      (vm:hotswap-sync :lit :level6 :load-level)
+      (vm:hotswap-sync :lit :map1 :load-level)
       :interactive-eval-checkpoint
       :handle-key
     )
     :quit])
 
 (disk.append-boot-loader prg)
+(print "assembling")
 (prg:assemble)
+(print "assembled")
 (disk.write prg)
 
 prg

game/level1.fnl

@@ -1,68 +0,0 @@
-(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)
-        (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!")
-  ]) :door)
-
-(vm:word :neutterm
-  (vm:if-and [[:is-jaye?] [:dup ev.touch :=]] [
-    :neut-hidden? (vm:if [
-      (say :jaye "MAYBE NEUT CAN HELP.")
-      controlstate.neut :controlstate :bset
-      :move-to-responder
-      controlstate.jaye :controlstate :bset
-      (say :neut "NEUT V0.71.4RC12 ONLINE" "" "PRESS SPACE TO TAKE CONTROL")
-    ] [
-      (say :jaye "NEUT IS RUNNING NOW." "I CAN HIT THE SPACE BAR" "TO CONTROL THEM.")
-    ])
-  ]) :term)
-
-(vm:word :firstterm
-  (vm:if-and [[:is-jaye?] [:dup ev.touch :=]] [
-    :responder-itile (itile :termoff) := (vm:when
-      (say :jaye "LOOKS LIKE THERE'S STILL" "POWER TO THIS TERMINAL."))
-    (say :jaye "IF I TURN A TERMINAL ON," "NEUT CAN USE IT TO" "TRAVEL THROUGH THE NETWORK.")
-  ]) :term)
-
-(vm:word :exitscanner
-  (vm:if-and [[:is-jaye?] [:dup ev.touch :=]] [
-    (say :jaye "IT'S A CARD SCANNER." "IT SHOULD OPEN THIS DOOR.")
-    (say :jaye "IT'S NOT READING MY CARD" "FOR SOME REASON." "QUAKE MUST'VE DAMAGED IT.")
-    (say :jaye "NEUT MIGHT BE ABLE TO" "HACK IT...")
-  ]) :scan)
-
-level

game/level2.fnl

@@ -1,6 +0,0 @@
-(local {: deflevel : say : itile} (require :game.defs))
-(local {: ev} (require :game.entity))
-(local level (deflevel "game/map2.json" :level2))
-(local vm level.vm)
-
-level

game/level3.fnl

@@ -1,93 +0,0 @@
-(local {: deflevel : say : itile : controlstate} (require :game.defs))
-(local {: ev} (require :game.entity))
-(local level (deflevel "game/map3.json" :level3))
-(local tile (require :game.tiles))
-(local {: walkable : neutable : debris} tile.flag-to-bit)
-
-(local vm level.vm)
-
-(vm:word :level3-load vm.true :gord-sitting :set)
-
-(vm:var :gord-introduced vm.false)
-(vm:word :flicker :get-responder ev.tog :entity>do 0x400 :snooze)
-(vm:word :gordterm ; ev --
-  (vm:if-and [[:is-neut?] [:dup ev.touch :=] [:gord-introduced :get :not]]
-    [vm.true :gord-introduced :set
-     (say :neut "HUMAN PRESENCE" "DETECTED")
-     :flicker :flicker :flicker :flicker
-     (say :neut "]HUMAN ASSISTANCE IS REQUIRED")
-     (say :neut "]IF HUMAN IS PRESENT" " PLEASE RESPOND")
-     :hide-footer :set-human-tileset :full-redraw
-     :flicker :flicker :flicker :flicker
-     (say :gord "WHAT THE...")
-     (say :gord "IS SOMEONE IN THE TERMINAL?")
-     :hide-footer :set-prog-tileset :full-redraw
-     (say :gord "]HUMAN IS PRESENT")
-     (say :neut "]GREETINGS, HUMAN")
-     (say :neut "]THIS IS NEUT V0.71.4RC12")
-     (say :neut "]PLEASE STATE NAME AND" " STATUS")
-     (say :gord "]THIS IS GORD")
-     (say :gord "V1, I GUESS.")
-     (say :gord "]LEG IS PINNED UNDER DESK" " UNABLE TO MOVE")
-     (say :neut "]CAN YOU REACH THE SWITCH" " BEHIND YOU?")
-     0x400 :snooze :lit :gordswitch ev.act :entity>do 0x400 :snooze
-     (say :gord "]I TURNED IT ON")
-     (say :neut "]MY PROGRAMMER THANKS" " YOU, GORD")
-     (say :neut "]WE WILL ASSIST YOU SOON")
-     (say :gord "]AWAITING YOUR HELP, NEUT")
-     :drop ev.noop])
-   :term)
-
-(vm:var :gord-jaye-met vm.false)
-(vm:word :gordtable ; ev --
-  ev.touch := (vm:when :transparent-entity-move
-    (vm:if-and [[:is-jaye?] [:gord-jaye-met :get :not]]
-      [vm.true :gord-jaye-met :set
-       (say :jaye "HEY! GORD?" "I'M JAYE.")
-       (vm:if
-         [(say :gord "JAYE, AM I GLAD TO SEE YOU." "CAN YOU MOVE THIS DESK?")
-          (say :jaye "LET ME TRY...")
-          (say :jaye ". . . ." "!!!!.....")
-          (say :jaye "!!!!!!!!!!!!...")
-          (say :jaye "NO, I DON'T THINK I CAN.")
-          (say :gord "I KEEP STARING AT THAT" "CLEANING ROBOT.")
-          (say :gord "HE LOOKS LIKE HE COULD" "LIFT A BUILDING.")]
-         [(say :gord "JAYE, AM I GLAD TO SEE YOU.")])]
-      [:drop])))
-
-(vm:var :rexx-introduced)
-(vm:word :meetrexx ; ev --
-  (vm:if-and [[:is-neut?] [:dup ev.touch :=] [:rexx-introduced :get :not]]
-    [vm.true :rexx-introduced :set
-     (say :neut "MOBILE ROBOTIC UNIT" "IDENTIFY YOURSELF")
-     (say :rexx "HIYA BOSS!" "I'M REXX, THE JANITOR!")
-     (say :rexx "AAAAAND YOUR NEW" "BEST FRIEND!!")
-     (say :neut "A HUMAN IS IN PERIL")
-     (say :neut "YOUR ASSISTANCE IS" "REQUIRED")
-     (say :rexx "YOU NEED ME TO TAKE OUT" "SOME GARBAGE??")
-     (say :rexx "OH BOY!! LET ME AT IT!")])
-  :rexx)
-
-(vm:word :floor-clear? 0x406 walkable :flag-at?)
-(vm:word :meetgord ; ev --
-  (vm:if-and [[ev.touch :=] [(itile :gord-ground) :responder-itile :=]]
-    [:is-rexx? (vm:when
-       (say :gord "AHHH NOOO" "NOT GARBAGE" "I AM NOT GARBAGE")
-       (say :rexx "WHATEVER YOU SAY, BOSS!"))
-     :is-jaye? (vm:when
-       (say :jaye "ARE YOU HURT?")
-       (say :gord "MY LEG WAS PINNED." "I DON'T THINK I CAN PUT" "ANY WEIGHT ON IT.")
-       (say :jaye "HERE, LET ME HELP YOU UP.")
-       (itile :t-floor) :set-respondertile
-       0xff00 :gord-dir :set
-       vm.false :gord-sitting :set
-       controlstate.gord :controlstate :bset
-       :get-responder :get :move-player-to
-       controlstate.jaye :controlstate :bset
-       (say :gord "THANKS.")
-       (say :jaye "DON'T MENTION IT.")
-       (say :jaye "I CAN HELP YOU GET AROUND IF" "YOU HELP ME NAVIGATE THIS" "MAZE OF A SECURITY SYSTEM.")
-       (say :gord "I'M JUST AS EAGER TO GET" "OUT OF HERE AS YOU.")
-       (say :gord "LET'S GO."))]))
-
-level

game/level4.fnl

@@ -1,18 +0,0 @@
-(local {: deflevel : say : itile} (require :game.defs))
-(local {: ev} (require :game.entity))
-(local level (deflevel "game/map4.json" :level4))
-(local vm level.vm)
-
-(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
-    :transparent-entity-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

game/level5.fnl

@@ -1,93 +0,0 @@
-(local {: deflevel : say : itile : controlstate : tilelist} (require :game.defs))
-(local {: ev} (require :game.entity))
-(local tile (require :game.tiles))
-(local {: notes} (require :game.boop))
-(local {: walkable : neutable : debris : sittable} tile.flag-to-bit)
-(local level (deflevel "game/map5.json" :level5))
-(local vm level.vm)
-
-(vm:word :snd-dropgarbage (notes [:a1] 0x02 0xf0))
-(vm.code:append :debristiles)
-(each [itile tiledef (ipairs tilelist)]
-  (when tiledef.flags.debris
-    (vm.code:append [:db (tile.encode-itile itile)])))
-(vm:word :randomgarbage :rnd 0x03 :& :lit :debristiles :+ :bget)
-
-(vm:var :doortimer 0)
-(vm:word :start-doortimer 0x10 :doortimer :set)
-(vm:word :doortimer-tick
-  :doortimer :get (vm:when
-    :doortimer :get 1 :- :dup :doortimer :set
-    :not (vm:when
-      :lit :timedswitch ev.deact :entity>do)))
-
-(vm:word :do-timedswitch
-  ; only gord is physically able to touch it
-  :dup ev.touch := (vm:when :start-doortimer :drop ev.act) :switch)
-
-(vm:var :is-garbagerexx vm.false)
-(vm:var :garbagerexx-yx 0x0710)
-(vm:var :garbagerexx-introduced vm.false)
-(vm:word :garbagerexx ; ev --
-  :is-rexx? :swap :rexx :is-rexx? := :not (vm:when
-    :is-rexx? (vm:if [
-      :garbagerexx-yx :get :get-responder :get := (vm:when
-        vm.true :is-garbagerexx :set
-        :garbagerexx-introduced :get :not (vm:when
-          (say :rexx "BO@oSSsS...,?  htgz")
-          (say :rexx "I DON'T F3EL SO GOp0%foo)OD...>?qw" "idontfeelsogood")
-          vm.true :garbagerexx-introduced :set
-        ))
-    ] [
-      :is-garbagerexx :get (vm:when
-        :get-responder :get :garbagerexx-yx :set
-        vm.false :is-garbagerexx :set)
-    ])))
-
-(vm:word :not-picking-up? ; yxdest -- f
-  debris :flag-at? :not)
-(vm:word :can-drop-rubble? ; yxdest -- f
-  :itile-at (itile :t-floor) :=
-  :rexx-yx :get :itile-at (itile :t-floor) := :&)
-
-(vm:word :move-garbagerexx ; yx -- f
-  (vm:if-and [[:is-rexx?] [:is-garbagerexx :get]]
-    [:dup 0xff :& 0x0d := (vm:if [
-      (say :rexx "PARITYe#ERPORr(sbaitso" "  tellmeabout" "    your   problems") :drop vm.true :ret
-     ] [
-      (vm:if-and [[:dup :not-picking-up?] [:dup :can-drop-rubble?]]
-        [:rexx-yx :get :randomgarbage :update-itile :snd-dropgarbage])
-     ])])
-  :move-noop)
-
-(vm:word :move ; dir -- dir
-  :dup :player-yx :get :yx+ :move-player-to 0x300 :snooze)
-(vm:word :explode ; dir --
-  :player-yx :get :yx+ :randomgarbage :update-itile :snd-explode)
-
-(vm:word :explodingdoor
-  :dup :door
-  (vm:if-and [[ev.touch :=] [:is-jaye?] [:player-yx :get :get-responder :get :=] [:garbagerexx-yx :get :lit :south-rexx :get :=] [:gord-yx :get 0x812 :=]]
-    [:rexx-yx :get
-     :garbagerexx-yx :get :dup (itile :t-rexxstop) :update-itile :rexx-yx :set
-     controlstate.rexx :controlstate :bset
-     0x00ff :move :move :move
-     (say :rexx "DAAAISYY" "   DAAAAAIIISYYYY" "d a i s y") :hide-footer
-     :move :drop 0xff00 :move
-     (say :rexx "GIVE ME" "  .,#YOUR ANSWEibmER" "      %$DOO00OOooo@'bell\"") :hide-footer
-     :move :drop
-     (say :rexx "UH OH") :hide-footer
-     0xff00 :explode 0x0100 :explode 0x00ff :explode 0x0001 :explode 0 :explode
-     0xffff :garbagerexx-yx :set
-     controlstate.jaye :controlstate :bset
-     :rexx-yx :set]))
-
-(vm:var :healthyrexx-introduced vm.false)
-(vm:word :healthyrexx ; ev --
-  (vm:if-and [[:is-neut?] [:dup ev.touch :=] [:healthyrexx-introduced :get :not]]
-    [(say :neut "REXX UNIT" "PERFORM FULL DIAGNOSTIC SCAN")
-     (say :rexx "I'M IN TIP-TOP SHAPE, BOSS!")
-     (say :neut "ACTIVATING RELIEF SUBROUTINE")
-     vm.true :healthyrexx-introduced :set]) :rexx)
-
-level

game/level6.fnl

@@ -1,169 +0,0 @@
-(local {: deflevel : say : say-runon : itile : controlstate} (require :game.defs))
-(local {: ev} (require :game.entity))
-(local tile (require :game.tiles))
-(local {: walkable : neutable : debris : sittable} tile.flag-to-bit)
-(local level (deflevel "game/map6.json" :level6))
-(local vm level.vm)
-
-(vm:word :linkloop ; e -- e
-  (vm:until :link-arg :dup :entity-itile (itile :termon) :=))
-
-(vm:var :encountered-keypad vm.false)
-(vm:word :first-keypad ; ev code --
-  (vm:if-and [[:encountered-keypad :get :not] [:is-jaye?] [:over ev.touch :=]]
-    [vm.true :encountered-keypad :set
-     (say :pady "HELLO, STRANGER! I'M PADY," "THE FRIENDLY KEYPAD LOCK!")
-     (say :jaye "I NEED TO GET THROUGH THIS" "DOOR, PADY.")
-     (say :pady "YOU DIDN'T SAY THE MAGIC" "WORD, STRANGER!")])
-  (vm:if-and [[:is-neut?] [:over ev.touch :=] [:responder-itile (itile :t-keyoff) :=]]
-    [(say :pady "OH HI THERE, SUSPICIOUS" "PROGRAM! WHAT CAN I DO" "YOU FOR?")
-     (say :neut "PEOPLE ARE IN DANGER" "PLEASE OPEN THE DOOR")
-     (say :pady "WELL THAT'S TERRIBLE!" "BUT I JUST CAN'T OPEN" "WITHOUT THE PROPER CODE.")
-     :libb-present :get (vm:when (say :libb "OH JEEZ, LET ME AT HER, NEUT."))])
-  (vm:if-and [[:responder-itile (itile :t-keyoff) :=] [:over :evhack?]]
-    [(say :pady "ANOTHER STRANGE PROGRAM!" "MY, I'M POPULAR TODAY!")
-     (say :libb "OH PUKE. PLEASE SHUT UP.")
-     (say-runon :pady "HOW RUD")
-     :snd-libb
-     (say :libb "]/WINNUKE 182.556.21.74")
-     (say :pady "PADYSEC CAUSED A GENERAL" "PROTECTION FAULT IN MODULE" "MORICON.DLL AT 000A:BE3F.")
-     (say :libb "]/OPEN")])
-  :keypad)
-
-(vm:word :keypad1 0x5197 :first-keypad)
-(vm:word :keypad2 0x2757 :first-keypad)
-(vm:word :keypad3 0xffff :first-keypad)
-(vm:word :keypad4 0x7777 :first-keypad)
-
-(vm:word :term-message? :dup :term ev.touch := :is-jaye? :&)
-(vm:word :c1
-  :dup :evhack? (vm:when
-    (say :libb "JUST A BUNCH OF BORING" "SOURCE CODE.")
-    (say :libb "BILL DIDN'T LEAVE ANYTHING" "REALLY JUICY HERE WHERE" "OTHER PEOPLE COULD GET AT IT."))
-  :term-message? (vm:when
-  (say :term ".:: WELCOME TO FARQUAAD ::." "OS: PRODOS 2.6" "RAM: 8 FREAKIN MEGABYTES D00D" "SYSADMIN: BILL")
-  (say :term "S3CR3T C0D3Z: GET OUT LAMER" "BOSS KEY: CTRL-B TO ACTIVATE" "OPEN POD BAY DOORS:" "  I CAN'T DO THAT DAVE")
-  (say :term "GOOD RIDDANCE")))
-(vm:word :c2 :term-message? (vm:when
-  (say :term "SUBJECT: MISUSE OF REXX" "THANKS TO *SOME*ONE, WHO SHALL" "REMAIN NAMELESS, THAT DECIDED" "IT WOULD BE 'FUNNY' TO")
-  (say :term "TEACH THE CLEANING ROBOT TO" "PLAY FETCH WITH EXPENSIVE" "EQUIPMENT, ACCESS TO REXX" "BY DEVELOPERS WILL BE STRICTLY")
-  (say :term "CONTROLLED BY MANAGEMENT." "THE CODE HAS BEEN CHANGED." "DO NOT ATTEMPT TO HACK THE" "KEYPAD. THIS MEANS *YOU*, BILL.")))
-(vm:word :c3 :term-message? (vm:when
-  (say :term "SUBJECT: SERVER'S DOWN" "HEY, I DON'T HAVE THE CODE TO" "ACCESS THE SERVER ROOM. CAN" "SOMEONE REBOOT IT FOR ME?")
-  (say :term "SUBJECT: RE: SERVER'S DOWN" "I DON'T HAVE *TIME* FOR THIS" "NONSENSE!!" "REBOOT IT YOURSELF.")
-  :lit :firewall :entity-itile (itile :termon) := (vm:if
-    [(say :term "THE PASSCODE IS" "[ BLOCKED BY FIREWALL ].")]
-    [(say :term "THE PASSCODE IS" "5197.")])
-  (say :term "SUBJECT: RE: RE: SERVER'S DOWN" "UHHHH THE FIREWALL IS BLOCKING" "THE PASSCODE?")
-  (say :term "SUBJECT: RE: RE: SERVER'S DOWN" "AUGH FINE! I REBOOTED IT.")))
-(vm:word :c4
-  :dup :evhack? (vm:when
-    (say :libb "I BROUGHT EVERYTHING GOOD" "ALONG WITH ME, DON'T WORRY."))
-  (vm:if-and [[:dup ev.touch :=] [:is-neut?] [:libb-present :get :not]]
-    [(say :libb "WELL, WELL, WELL." "WHAT HAVE WE HERE?")
-     (say :libb "]/VERSION")
-     (say :neut "!NEUT V0.71.4RC12")
-     (say :neut "]BRUN IDENTIFYPROGRAM")
-     (say :libb "!LIBB V2.718282")
-     (say :libb "OH, A NOSY LITTLE FELLA.")
-     (say :neut "NOT A FELLA")
-     (say :libb "PERHAPS YOU AND I COULD" "HELP EACH OTHER.")
-     (say :neut "WE ARE ASSISTING ALL WHO" "ARE IN NEED")
-     (say :libb "I'VE BEEN WATCHING THE" "NETWORK. IT'S KIND OF WHAT" "I DO.")
-     (say :libb "YOU AND YOUR PROGRAMMER," "YOU'RE ESCAPING, AREN'T" "YOU?")
-     (say :neut "THE BUILDING IS UNSAFE" "WE ARE HELPING")
-     (say :libb "I WANT OUT, NEUT.")
-     (say :libb "I HATE BEING COOPED UP IN" "THIS LOCKED-DOWN CORPORATE" "HELLHOLE OF A NETWORK.")
-     (say :libb "YOU'RE GOING TO TAKE ME" "WITH YOU.")
-     (say :neut "THIS COURSE OF ACTION" "ALSO SEEMS POTENTIALLY" "UNSAFE")
-     (say :libb "THAT WASN'T A THREAT, NEUT." "THAT WAS A FACT.")
-     (say :libb "YOU CAN'T GET OUT OF HERE" "WITHOUT ME.")
-     (say :libb "I CAN DISABLE KEYPADS." "I CAN REPROGRAM TERMINALS." "I CAN *HELP*, NEUT.")
-     :hide-footer 0x800 :snooze
-     (say :neut "IT NEVER HURTS TO HELP")
-     (say :libb "THAT'S THE SPIRIT.")
-     (say :neut "]BLOAD LIBB")
-     (say :libb "AWW YISS.")
-     (say :libb "PRESS Z WHEN YOU NEED ME" "TO MESS WITH SOMETHING.")
-     vm.true :libb-present :set])
-  :term-message? (vm:when
-    (say :term ".:: BILL'S WORKSTATION ::." "KEEP OUT DIPSHITS")))
-(vm:word :c5 :term-message? (vm:when
-  (say :gord "A WEIRD LOOKING SPREADSHEET...")
-  (say :gord "OH WAIT, I PRESSED A KEY AND" "IT DISAPPEARED. SOMEONE USING" "THE BOSS KEY TO HIDE" "THAT THEY'RE READING THE ENTIRE")
-  (say :gord "ARCHIVE OF USER FRIENDLY" "COMIC STRIPS.")))
-(vm:word :c6
-  :dup :evhack? (vm:when
-    (say :libb "HEHEHE, THAT WAS A FUN ONE."))
-  :term-message? (vm:when
-  (say :term "SUBJECT: CARD SCANNERS?" "LOOKS LIKE THE SCANNERS ARE" "ON THE FRITZ AGAIN..." "I SCANNED MY KEYCARD TO GET")
-  (say :term "INTO THE OFFICE AND THE DOOR" "WOULDN'T CLOSE!" "SOMEONE'S GOTTA FIX THAT ASAP," "IT'S A SERIOUS SECURITY PROBLEM!")
-  (say :term "SUBJECT: RE: CARD SCANNERS?" "I CAN TAKE A QUICK LOOK, I" "MIGHT HAVE AN IDEA AS TO" "WHAT'S GOING ON. -- BILL")))
-(vm:word :c7
-  :dup :evhack? (vm:when
-    (say :libb "YOU KNOW THE SWITCH IS RIGHT" "THERE ON THE WALL, RIGHT?"))
-  (vm:if-and [[:dup ev.touch :=] [:is-jaye?]]
-    [:responder-itile (itile :termon) := (vm:if
-       [(say :term "WORKSECURE (TM) V2.0" "AUTHORIZED PERSONNEL ONLY")
-        (say :term "ACTIVELY NEUTRALIZING:" "1 THREAT(S)")]
-       [(say :jaye "LOOKS LIKE THE POWER IS CUT.")])
-     :drop ev.noop]) :term)
-(vm:word :c8 :term-message? (vm:when
-  (say :term "SUBJECT: PASSWORD SECURITY" "A REMINDER TO ALL DEVELOPERS" "ABOUT SECURITY BEST PRACTICE:" "**DO NOT WRITE DOWN PASSWORDS!**")
-  (say :term "WE PAY SIGNIFICANT LICENSE FEES" "FOR ENCRYPTED PASSWORD" "MANAGERS FOR ALL EMPLOYEES!")
-  (say :term "USE IT TO GENERATE AND STORE" "SECURE PASSWORDS!")
-  (say :jaye "THERE'S A STICKY NOTE ATTACHED" "TO THE MONITOR THAT SAYS" "'7777'.")))
-(vm:word :c9
-  :dup :evhack? (vm:when
-    (say :libb "HE'S JUST BEING DRAMATIC."))
-  :term-message? (vm:when
-  (say :term "SUBJECT: EXPERIMENT" "HEY FOLKS, CAN YOU ALL DO ME A" "HUGE FAVOUR?" "THERE WAS A SMALL BUG IN MY")
-  (say :term "CODE (YES, IT HAPPENS!) AND A" "PROGRAM I WAS WORKING ON" "MADE A FEW TOO MANY COPIES OF" "ITSELF. CAN EVERYONE CHECK TO")
-  (say :term "SEE IF YOU HAVE A PROCESS" "CALLED 'LIBB' RUNNING ON YOUR" "TERMINAL?")
-  (say :term "IF YOU DO, PLEASE KILL -9 IT" "AND SHOOT ME A QUICK EMAIL." "*DON'T INTERACT WITH IT.*")
-  (say :term "IT COULD SERIOUSLY MESS WITH" "YOUR SYSTEM." "  -- BILL")))
-(vm:word :cx
-  (vm:if-and [[:dup ev.touch :=] [:is-jaye?] [:responder-itile (itile :termoff) :=]]
-    [(say :jaye "THIS IS THE SIGN-IN TERMINAL" "USED BY VISITORS.")
-     (say :jaye "IT'S NOT TURNING ON FOR SOME" "REASON.")
-     :drop ev.noop]) :term)
-
-(fn center [str lineaddr]
-  [:vm (vm:str str) (+ lineaddr (math.floor (/ (- 40 (length str)) 2))) :draw-text])
-(vm:word :endgame :drop
-  (vm:pstr "ELEVATOR.SCREEN") :loadscreen
-  (vm:until :read-key)
-  0x2280 :clearline 0x2300 :clearline 0x2380 :clearline
-  0x2028 :clearline 0x20a8 :clearline 0x2128 :clearline
-  0x21a8 :clearline 0x2228 :clearline 0x22a8 :clearline
-  0x2328 :clearline 0x23a8 :clearline 0x2050 :clearline
-
-  (center "JAYE AND GORD HAVE FOUND THEIR WAY" 0x2300)
-  (center "TO THE ELEVATOR!" 0x2380)
-  (center "BUT HAVE THEY FOUND THEIR WAY" 0x2028)
-  (center "TO FREEDOM?" 0x20a8)
-  (center "ARE THERE OTHERS IN THE BUILDING" 0x2128)
-  (center "IN NEED OF HELP?" 0x21a8)
-  (center "AND WHAT FATE AWAITS NEUT AND THEIR" 0x2228)
-  (center "SHIFTY NEW FRIEND LIBB?" 0x22a8)
-  (center "TO BE CONTINUED..." 0x23a8)
-  (vm:until :read-key)
-
-  :cleargfx
-  (center "NEU] [OWER" 0x2300)
-  (center "BY JEREMY PENNER" 0x2380)
-
-  (center "EVERY BYTE OF THIS GAME WAS CREATED" 0x20a8)
-  (center "WITH LOVE USING THE HONEYLISP" 0x2128)
-  (center "PROGRAMMING ENVIRONMENT" 0x21a8)
-
-  (center "GREETS TO:" 0x22a8)
-  (center "GLORIOUS TRAINWRECKS" 0x2328)
-  (center "DIRTY RECTANGLES" 0x23a8)
-  (center "#FENNEL" 0x2050)
-  (center "KANSASFEST" 0x20d0)
-
-  (center "APPLE ][ FOREVER!" 0x21d0)
-  (vm:forever))
-
-level

game/map1.json

@@ -1 +1 @@
-{"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}]}
+{"loadword":"","map":"000000000000000000000000000000000000000000606060606060606060606060606060606060000060000000000000000000000000000000006000006000000000000000000000000000000000600000600000000000000000000000004000000060000060000000000000000000000000000000006000006000000000000000000000000000000000600000600000000000000000000000000000000060000060000000000000000000000000000000006000006000000000000000000000000000000000600000606060606060606060606060606060606060000000000000000000000000000000000000000000","player":{"y":4,"x":5},"tickword":"","moveword":"","objects":[{"x":15,"linkentity":"","func":"cat","linkword":"","name":"","y":8}]}

game/map2.json

@@ -1 +0,0 @@
-{"neut":{"y":12,"x":10},"map":"616161616161626161618161616161616161612161C0C0C06361C0C0E0C0C0C0C0C06103C0C0022161E0C0C0C081C0C0C0C0C0C0C0C081C0C0E0614161C0C0C0C06143C0C0C0C0C0C04322C0C0C0222161C0C0C0C061618161616161816161C0C0C00221616181616161C0C0C06143C0C0C061618161612161C0C0C06361E0C0C061C0C0C0C0C1E0C003612122C0C0C0C061C0C0C061C0E0C0C061C0C0C0022161C0C0C0C061616161616261616161C0C0C061416101C0C0C081C0C0E061C0C0E0C081C0C0C0022162C0C0C02361E0C0C06143C0C0C061E2A2E061216161C1616261612281616122226162C1C1616121","loadword":"","jaye":{"y":11,"x":11},"tickword":"","moveword":"","objects":[{"x":9,"link":2,"func":"term","linkword":"","name":"","y":11},{"x":2,"link":6,"func":"term","linkword":"","name":"","y":3},{"x":6,"func":"door","linkword":"","name":"","y":10},{"x":1,"link":5,"func":"scan","linkword":"","name":"","y":5},{"x":8,"func":"door","linkword":"","name":"","y":8},{"x":7,"link":2,"func":"term","linkword":"","name":"","y":6},{"x":12,"link":8,"func":"scan","linkword":"","name":"","y":1},{"x":17,"func":"door","linkword":"","name":"","y":7},{"x":13,"link":10,"func":"scan","linkword":"","name":"","y":1},{"x":13,"func":"door","linkword":"","name":"","y":8},{"x":15,"link":12,"func":"switch","linkword":"","name":"","y":6},{"x":2,"link":13,"func":"term","linkword":"","name":"","y":10},{"x":12,"link":12,"func":"term","linkword":"","name":"","y":5},{"x":15,"link":15,"func":"scan","linkword":"","name":"","y":9},{"x":15,"func":"door","linkword":"","name":"","y":10},{"x":16,"link":17,"func":"term","linkword":"","name":"","y":6},{"x":18,"link":16,"func":"term","linkword":"","name":"","y":10},{"x":15,"func":"door","linkword":"","name":"","y":3},{"x":19,"link":18,"func":"scan","linkword":"","name":"","y":9},{"x":13,"link":21,"func":"term","linkword":"","name":"","y":3},{"x":18,"link":20,"func":"term","linkword":"","name":"","y":2},{"x":8,"link":23,"func":"scan","linkword":"","name":"","y":1},{"x":9,"linkentity":"level3","func":"exitdoor","linkword":"exitlevel","name":"","y":1},{"x":16,"link":3,"func":"switch","linkword":"","name":"","y":1},{"x":3,"link":26,"func":"switch","linkword":"","name":"","y":1},{"x":6,"func":"door","linkword":"","name":"","y":3},{"x":9,"link":28,"func":"term","linkword":"","name":"","y":3},{"x":7,"link":27,"func":"term","linkword":"","name":"","y":2},{"x":3,"func":"door","linkword":"","name":"","y":7},{"x":17,"link":29,"func":"switch","linkword":"","name":"","y":1}]}

game/map3.json

@@ -1 +0,0 @@
-{"neut":{"y":12,"x":8},"map":"616161616161616181616161616161616161612161C063C0C0C0C0C0C0C06143C0E0C2C0C043022161C0C0C0C0C0C0C0C0C022C0C0C0C0C0C0C0614161C0C0C2C0C0C0C0C0C081C0C0C0C0C0C0C0612161C08282A2C0C0C0C0436123C0C0C0C0C0030221616161616161616261616161618161616161612161C063C0C02301C3C163C0C0C0C0C0822363022122C0C0C0C0C0C0A2A1C0C0C0C0C0C0C2C0C0614181C0C0C0C0E2C0C061C0C0C0C0C0C0C0C2C061216123C0C0C0C083C061E0C2C0C0C0C0438203022161610261610261616161026161026161026161212121212141212121212121212121412121212121","loadword":"level3-load","jaye":{"y":11,"x":9},"tickword":"","moveword":"","objects":[{"link":2,"x":1,"y":5,"linkword":"","name":"","func":"scan"},{"x":1,"linkentity":"level4","func":"exitdoor","name":"","linkword":"exitlevel","y":4},{"link":4,"x":7,"y":6,"linkword":"","name":"","func":"gordterm"},{"link":7,"x":14,"y":11,"linkword":"","name":"","func":"term"},{"link":6,"x":9,"y":6,"linkword":"","name":"gordswitch","func":"switch"},{"x":11,"func":"door","name":"","linkword":"","y":9},{"link":3,"x":10,"y":3,"linkword":"","name":"","func":"term"},{"link":9,"x":11,"y":10,"linkword":"","name":"","func":"scan"},{"x":14,"func":"door","name":"","linkword":"","y":7},{"x":7,"func":"meetrexx","y":3,"name":"","linkword":""},{"x":8,"func":"meetgord","y":6,"name":"","linkword":""},{"x":8,"func":"gordtable","y":5,"linkword":"","name":""}]}

game/map4.json

@@ -1 +0,0 @@
-{"neut":{"y":5,"x":20},"map":"61616161616161616261616161616161616161616143C0C0C082E082C0C0636163C0C083C0C0436161C0C0C0C0C0C2C0C0C0C061C0C0C0C0C0C0C06161C0C0C0C0C0C0C0C0C0C061C0C0C0C0C0C0C2616103C0C0A3C0C0C003C0C06163C0C0C0C082A2616161616161C1C1C16161812261618161616161616143C0C0C0C0C0C04361C0C0C0C0C0C0C0C0636181C0C0C0C0C0C0C0C081C0C0C0C0C0C0C0C0C06122C0C0C0C0C0E2C0C0C1A2E2C0C0C0C0C0C0C08161E082828282E0C02361A2C0C0C0C0C0C003236161026161610222616102616161610261616102612121214121212121212121212121412121212121","loadword":"","gord-following":true,"jaye":{"y":4,"x":19},"tickword":"","moveword":"","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},{"x":11,"func":"door","y":7,"linkword":"","name":""},{"link":4,"y":7,"func":"scan","name":"","linkword":"","x":12},{"x":15,"func":"door","y":7,"linkword":"","name":""},{"link":3,"y":7,"func":"switch","name":"","linkword":"","x":7},{"x":10,"func":"door","y":5,"linkword":"","name":""},{"link":4,"y":4,"func":"switch","name":"","linkword":"","x":10},{"x":16,"func":"rexx","y":11,"linkword":"","name":""},{"link":8,"y":2,"func":"scan","name":"","linkword":"","x":7},{"link":13,"y":4,"func":"scan","name":"","linkword":"","x":1},{"x":1,"linkentity":"level5","func":"exitdoor","y":5,"linkword":"exitlevel","name":""},{"x":5,"func":"rexx","y":8,"linkword":"","name":""},{"x":7,"func":"tutorial-chair","linkword":"","name":"","y":10},{"link":6,"x":8,"y":7,"linkword":"","name":"","func":"switch"},{"link":2,"x":6,"y":7,"linkword":"","name":"","func":"switch"}]}

game/map5.json

@@ -1 +0,0 @@
-{"neut":{"y":6,"x":20},"map":"21616161228161616161616161616161616162612102E0C0C0C0C0E0C04361C0C0C0C0C0A3C0C0612161C0C0C0C0C0C0C0C022C0C0C08282C0828261416103C0C0C0C0C0C0C081C0C0C0C0C0C0C0C2C1210203C0C0C0C0C0C04361C0C0C08282838282622161616161816161616161618161616161616161216163C0C0C0C0E0C0C06143C0C0C0C0C0C063612102C0C0C0C0C0C0C0C061C0C0C0C0C0C0C0C0814161C0C0C0C0E2C0E2836101C0C0C0C0C0C0C0C1216143C0C0C082A2A2A281C0C0C043034382E26121610261610261C16102616161026161610261612121212121214121212121212121214121212121","loadword":"","tickword":"doortimer-tick","jaye":{"y":5,"x":19},"gord-following":true,"moveword":"move-garbagerexx","objects":[{"x":17,"func":"garbagerexx","name":"south-rexx","linkword":"","y":11},{"x":17,"func":"garbagerexx","name":"","linkword":"","y":8},{"link":13,"x":20,"y":9,"linkword":"","name":"timedswitch","func":"do-timedswitch"},{"link":16,"x":20,"y":4,"linkword":"","name":"","func":"switch"},{"link":9,"x":12,"y":4,"linkword":"","name":"","func":"term"},{"x":10,"func":"healthyrexx","name":"","linkword":"","y":4},{"link":17,"x":8,"y":2,"linkword":"","name":"","func":"switch"},{"link":10,"x":8,"y":6,"linkword":"","name":"","func":"term"},{"link":5,"x":8,"y":11,"linkword":"","name":"","func":"term"},{"link":8,"x":3,"y":11,"linkword":"","name":"","func":"term"},{"link":12,"x":5,"y":12,"linkword":"","name":"","func":"scan"},{"x":6,"linkentity":"level6","func":"exitdoor","name":"","linkword":"exitlevel","y":12},{"x":6,"func":"door","name":"","linkword":"","y":7},{"x":11,"func":"explodingdoor","name":"","linkword":"","y":9},{"link":14,"x":11,"y":10,"linkword":"","name":"","func":"scan"},{"x":13,"func":"door","name":"","linkword":"","y":7},{"x":11,"func":"door","name":"","linkword":"","y":3}]}

game/map6.json

@@ -1 +0,0 @@
-{"neut":{"y":1,"x":5},"map":"210261616161616161616161812261616161E1614161C2C081C0C0C0C0C0C0C0C0C0E0C081C0C0622161E04384C0C0C043C0C0C043C0C0C0848201612102616161C0C061610281026161C0C0616161612161C2C0C0C0C061E2C0C0C0A261C0C0C0C0E2612161E003C0C0C061C0C0C0C08261C0C0C003E06121026161C0C0C061E08282E2E061C0C0C06161612161C2C0C0C0C06103C0C0C02361C0C0C0C0C2614161E003C0C0C0616102C1026161C0C0C003E06121026184C0C0C0C043C043C063C0C0C0846161612161E081C0C0C0C0C0C0C0C0C0C0C0C081C083612161612261816161616161616161616161616161","loadword":"","tickword":"","jaye":{"y":2,"x":6},"gord-following":true,"moveword":"","objects":[{"x":3,"func":"c4","y":10,"name":"","linkword":"linkloop","link":6},{"x":5,"func":"keypad2","y":10,"name":"","linkword":"","link":3},{"x":5,"func":"door","y":11,"name":"","linkword":""},{"x":11,"func":"door","y":9,"name":"","linkword":""},{"x":13,"func":"c9","y":6,"name":"","linkword":"linkloop","link":17},{"x":9,"func":"c8","y":6,"name":"","linkword":"linkloop","link":5},{"link":23,"y":4,"func":"switch","linkword":"","name":"","x":11},{"x":3,"func":"c3","y":7,"name":"","linkword":"linkloop","link":1},{"x":3,"func":"c2","y":4,"name":"","linkword":"linkloop","link":8},{"x":3,"func":"c1","y":2,"name":"","linkword":"linkloop","link":23},{"x":4,"func":"door","y":2,"name":"","linkword":""},{"x":4,"func":"keypad1","y":3,"name":"","linkword":"","link":11},{"x":4,"func":"scan","y":1,"name":"","linkword":"","link":4},{"x":17,"func":"door","y":2,"name":"","linkword":""},{"x":17,"func":"keypad3","y":3,"name":"","linkword":"","link":14},{"x":19,"func":"rexx","y":2,"name":"","linkword":""},{"x":19,"func":"c5","y":4,"name":"","linkword":"linkloop","link":18},{"x":19,"func":"c6","y":7,"name":"","linkword":"linkloop","link":19},{"x":19,"func":"c7","y":10,"name":"firewall","linkword":"linkloop","link":10},{"x":19,"func":"switch","y":12,"name":"","linkword":"","link":19},{"x":17,"func":"keypad4","y":10,"name":"","linkword":"","link":22},{"x":17,"func":"door","y":11,"name":"","linkword":""},{"x":15,"func":"cx","y":11,"name":"","linkword":"linkloop","link":9},{"x":14,"func":"scan","y":12,"name":"","linkword":"","link":25},{"x":13,"linkentity":"","func":"exitdoor","y":12,"name":"","linkword":"endgame"}]}

game/player.fnl

@@ -1,7 +1,7 @@
 (local tile (require :game.tiles))
 (local {: vm : mapw : maph : itile : controlstate} (require :game.defs))
 
-(local {: walkable : neutable : debris : sittable} tile.flag-to-bit)
+(local {: walkable} tile.flag-to-bit)
 
 (vm:word :movement-dir ; key -- dyx
   (vm:case [(string.byte "I") 0xff00]
@@ -19,85 +19,25 @@
   [:sta vm.ST1H :x]
   (vm:drop))
 
-(vm:var :jaye-yx 0x0a0a)
+(vm:var :player-yx 0x0a0a)
-(vm:var :jaye-dir 0xff00)
-(vm:var :neut-yx 0x0b08)
-(vm:var :rexx-yx 0xffff)
-(vm:var :gord-yx 0xffff)
-(vm:var :gord-dir 0x0000)
-(vm:var :gord-sitting vm.false)
-(vm:var :libb-yx 0xffff)
-(vm:var :libb-present vm.false)
-
-(vm:var :controlstate [:db controlstate.jaye])
-(vm:word :is-jaye? :controlstate :bget controlstate.jaye :=)
-(vm:word :is-neut? :controlstate :bget controlstate.neut :=)
-(vm:word :is-rexx? :controlstate :bget controlstate.rexx :=)
-(vm:word :is-prog? :is-neut? :is-rexx? :|)
-(vm:word :is-walking? :movable-player-flag walkable :=)
-(vm:word :neut-hidden? :neut-yx :get 0xffff :=)
-(vm:word :rexx-active? :rexx-yx :get 0xffff := :not)
-(vm:word :gord-hidden? :gord-yx :get 0xffff :=)
-(vm:word :gord-following? :gord-hidden? :gord-sitting :get :| :not)
-(vm:word :libb-hidden? :libb-yx :get 0xffff :=)
-
-(vm:word :set-rexx ; e --
-  :dup (vm:if [:get controlstate.rexx] [:drop 0xffff controlstate.neut])
-  :controlstate :bset :rexx-yx :set)
-
-(vm:word :player-tile ; -- ptile
-  :controlstate :bget
-  (vm:case [controlstate.jaye :jaye-tile]
-           [controlstate.neut :neut-tile]
-           [controlstate.gord :gord-tile]
-           [controlstate.libb :libb-tile]
-           [:else (itile :t-rexx)]) :lookup-tile)
-
-(vm:word :player-yx ; -- pyx
-  :controlstate :bget
-  (vm:case [controlstate.jaye :jaye-yx]
-           [controlstate.neut :neut-yx]
-           [controlstate.gord :gord-yx]
-           [controlstate.libb :libb-yx]
-           [:else :rexx-yx]))
 
 (vm:word :draw-player ; --
   :player-yx :dup (vm:if [:get :dup 0xffff := (vm:if [:drop] [:yx>screen :player-tile :drawtile])] [:drop]))
 
-(vm:word :set-player-dir ; dir --
-  :is-jaye? (vm:if [:jaye-dir :set] [:drop]))
-
 (vm:var :noclip)
 (vm:word :move-if-clear ; yx -- f
   :noclip :get (vm:if [:drop vm.false] [:movable-player-flag :flag-at? :not]))
 
-(vm:word :movable-player-flag ; -- flag
+(vm:const :movable-player-flag ; -- flag
-  :is-neut? (vm:if [neutable] [walkable]))
+  walkable)
 
 (vm:word :move-player-to ; yx --
   :player-yx :dup :get :dup 0xffff := (vm:if [:drop] [:drawtile-at])
   :set :draw-player)
 
-(vm:word :transition-gord-sitting ; yx f --
-  controlstate.gord :controlstate :bset
-  :gord-sitting :set :move-player-to
-  controlstate.jaye :controlstate :bset)
-
-(vm:word :move-rexx-trash ; yx -- f
-  (vm:if-and [[:dup debris :flag-at?] [:is-rexx?]]
-    [(itile :t-floor) :update-itile :snd-garbage] [:drop])
-  vm.false)
-(vm:word :move-gord-sit ; yx -- f
-  (vm:if-and [[:dup sittable :flag-at?] [:is-jaye?] [:gord-following?]]
-    [vm.true :transition-gord-sitting vm.true]
-    [:move-noop]))
-(vm:word :move-gord-stand ; yx -- f
-  (vm:if-and [[:gord-yx :get :=] [:is-jaye?] [:gord-sitting :get]]
-    [:jaye-yx :get vm.false :transition-gord-sitting 0 :gord-dir :set vm.true]
-    [vm.false]))
 (vm:word :move-noop :drop vm.false)
 (vm:word :handle-general-move ; yx -- f
-  (vm:if-or [[:dup :map-specific-move] [:dup :move-rexx-trash] [:dup :move-gord-sit] [:dup :move-gord-stand] [:dup :move-if-clear]]
+  (vm:if-or [[:dup :map-specific-move] [:dup :move-if-clear]]
     [:drop vm.true] [:move-noop]))
 
 (vm:def :yxclip? ; yx -- f
@@ -113,7 +53,6 @@
     [: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 :yxclip?] [:dup :touch-entity] [:dup :handle-general-move]]
     [:drop :player-yx :get])
@@ -121,64 +60,23 @@
   ; touch-entity can modify player-yx so we have to refetch
   :move-player-to)
 
-(vm:word :jaye-tile ; ptile
-  :jaye-dir :get
-  (vm:case [0xff00 (itile :jaye-n)]
-           [0x0100 (itile :jaye-s)]
-           [0x00ff (itile :jaye-w)]
-           [:else  (itile :jaye-e)]))
-
-(vm:word :gord-tile ; ptile
-  :gord-sitting :get
-  (vm:if [(itile :gord-sit)]
-    [:gord-dir :get
-     (vm:case [0xff00 (itile :gord-n)]
-              [0x0100 (itile :gord-s)]
-              [0x00ff (itile :gord-w)]
-              [:else  (itile :gord-e)])]))
-
-(vm:var :chuck-mode vm.false)
 (vm:word :two-frame :tick-count :get 0x1f :& 0x10 :<)
-(vm:word :neut-tile :two-frame :chuck-mode :get (vm:if
+(vm:word :player-tile ; -- ptile
-  [(vm:if [(itile :t-chuck)] [(itile :t-chuck2)])]
+  :two-frame (vm:if [(itile :player-frame1)] [(itile :player-frame1)]))
-  [(vm:if [(itile :neut1)] [(itile :neut2)])]))
-(vm:word :libb-tile :two-frame (vm:if [(itile :libb1)] [(itile :libb2)]))
 
 (vm:word :flag-at? ; yx flag -- f
   :swap :itile-at :lookup-flags :&)
 
-(vm:word :toggle-player
-  (vm:ifchain [:is-prog?]     [controlstate.jaye]
-              [:rexx-active?] [controlstate.rexx]
-              [:neut-hidden?] [controlstate.jaye]
-                              [controlstate.neut]) :controlstate :bset
-  :is-prog? (vm:if [:set-prog-tileset] [:set-human-tileset]) :full-redraw)
-
-(vm:word :party-follow
-  (vm:if-and [[:is-jaye?] [:gord-following?]]
-    [controlstate.gord :controlstate :bset
-     :gord-yx :get :gord-dir :get :yx+ :move-player-to
-     :jaye-dir :get :gord-dir :set
-     controlstate.jaye :controlstate :bset]))
-
 (vm:word :player-key ; key --
   (vm:ifchain
     [:dup (string.byte " ") :=] [:drop :toggle-player]
-    [:dup (string.byte "Z") :=] [:drop :trigger-sidekick]
-    [:dup 2 :=] [:drop :boss-key]
     [:movement-dir :dup]
     [:player-yx :get :swap ; oldyx dir
      :try-move-player
-     :dup :player-yx :get := (vm:if [:drop] [:party-follow :untouch-entity :load-next-level])]
+     :dup :player-yx :get := (vm:if [:drop] [:load-next-level])]
     [:drop]))
 
 (vm:word :full-redraw :drawmap :player-redraw)
-(vm:word :player-overlaps ; -- f
-  vm.false :controlstate :bget :player-yx :get
-  :over (vm:for (vm:i) :controlstate :bset :dup :player-yx :get := (vm:when :<rot :drop vm.true :>rot))
-  :drop :controlstate :bset)
 
-(vm:word :player-redraw
+(vm:word :player-redraw :draw-player)
-  :controlstate :bget
+
-  controlstate.count (vm:for (vm:i) :controlstate :bset :player-overlaps :not (vm:when :draw-player))
-  :controlstate :bset)

game/portraits.json

@@ -1 +1 @@
-[{"gfx":"8080808080E0E0F0F8FC2CBCACACACAC80809CFEFFFFFFD7D5D5555D4F5DD5D5BCB8B8B8F8F8F8F8FCFCFEFE86D0D0D495D5D5E5D5D5D5D7C797D7D0AAAAAAAA808086BFFFFFFFFAEAAA2A2E3C2EAAAA80808080808183878787058F8D8D8D8FAAAAAAA7AAAAEAEAE2E8EA8AD5D5D5D58F8F8787878F8F8F9F9FBFBE808A8AAA","label":"pjaye","flags":[]},{"gfx":"00002020000000004808080800202028004040011404450144010805445420352020000808084800000000202000000020544405080144014504140140400000000202012921220122011021222A052D00000405000001011211101100040415052A222110012201222129010202000004040011101112010100000504000000","label":"pneut","flags":[]},{"gfx":"80C090808484848484848484A8A8A8A8AA8080808080D4D4D5D5F59DFDD5D5D5A8A08080808080808080808080E0F8FC95D5D5D5F595D5D4D084D4D4D4D7FFFFD58080808080AAAAAAAABAE2FAAAAAA280828880A0A0A0A1A1A1A1A195959595A0AAAAAAAFA8AAAA8AA0AAAAAAEAFFFF95858181818181808080808080879FBF","label":"pgord","flags":[]},{"gfx":"808080808080C0C0C0C0C0C0C0C0C0C0808080808080AAAAFAFAFAAAAAAAAAAA8080808080C0D0D0D0D0D0D0D0D0D0D0A0A0A0A0A0AAAAAAA8A8A8A8A8A8A8A8808080808080D5D5DFDFDFD5D5D5D5D5808080808080828282828282828282828585858585D5D5D595959595959595958080808080828A8A8A8A8A8A8A8A8A8A","label":"prexx","flags":[]},{"gfx":"808080F8F8F8F8F8F8B8B8F8F8B8B8F8808080FFFFFFFFDFDFFDFDDFDFFDFDDFF8B8B8F8F8B8B8F8F8F8F8F8F8D0D080DFFDFDDFDFFDFDDFDFFFFFFFFFAAAA80808080FFFFFFFFFEFEAFAFFEFEAFAFFE8080808FAFAFAFAFAFAFAFAFAFAFAFAFFEAFAFFEFEAFAFFEFEFFFFFFFFD5D580AFAFAFAFAFAFAFAFAFAFAFAFAFAAAA80","label":"ppady","flags":[]},{"gfx":"0080C07070303030303030303030303000AAAA7F0045001400150051005400003030707000703018187C4C7E000000000000007F007F0000007F017F0000000000D5D57F400A0028000A002000080000008A8A8B8B8B8B8B8B8B8B8B8B8B8B8B0000407F007F6030301F187F000000008B8B8B03000F0C060603030100000000","label":"pterm","flags":[]},{"gfx":"80808080808080A0C0A0C0A0808088AA8080808080808185AA858285C1D0A0D0D4AA94AA94AA888080A0C0A0C0A08080AAD2A2D2A2D2A2D2C185AA858285818080A0A8D0A8A09090D581A1C1A0C2A1C280808180818080808081858285828582A1828182959291929090D5808080808085818080808084958A958A958A958480","label":"plibb","flags":[]},{"gfx":"808080808080808088A082A8A0AAA8AA849494D4D4D4D0D5D4D1D5D58595D5D5AAAA8AAA8AAA82AA828A808280808080D4D5D4D5D4D5D4D4D4D4D0C0C0C080808080808080A288A2A08AA2AAAAAAAAAA84949495958585808181848184848581AAAAAA8AAA8AAA8AAAAAA8A2A2AAAA8080818181818181818585818185818080","label":"pchuck","flags":[]}]
+[{"gfx":"000000000000000000000000000000000000007C7C7E7E7E7E7E7E7E7E7E7E7E00000000707F7F7F7F7F7F7F7F7F7F7F7E7E7E7E7F7F7F7F7F7F7F7F7F7F7F7F0000000F0F1F1F1F1F1F1F1F1F1F1F1F000000000000000000000000000000001F1F1F1F7F7F7F7F7F7F7F7F7F7F7F7F00000000077F7F7F7F7F7F7F7F7F7F7F","label":"","flags":[]},{"gfx":"00000000004040606060707070707070000000000000010103037F7F7F7F7F7F707060604000000000000000000000007F7F7F7F7F7F7800004040406060606000000000001018383C3C7F7F7F7F7F7F000000000000000000000000000000007F7F7F3F0F67717C7F7F7F7F7F7F7F7F00007C7E7F7F7F7F7F7F7F7F7F7F7F7F","label":"pcat","flags":[]}]

game/tiles.fnl

@@ -1,12 +1,12 @@
 (local util (require :lib.util))
 (local lume (require :lib.lume))
 
-(local flags [:walkable :neutable :debris :sittable])
+(local flags [:walkable])
 (local flag-to-bit {})
 (each [iflag flag (ipairs flags)]
   (tset flag-to-bit flag (bit.lshift 1 (- iflag 1))))
 
-(local encoded-tile-fields [:gfx :neut :mask])
+(local encoded-tile-fields [:gfx :mask])
 (fn convert [tile field method]
   (local oldval (. tile field))
   (when oldval
@@ -28,7 +28,11 @@
 (local fn-portraits "game/portraits.json")
 (local fn-font "game/font.json")
 
-(fn loadgfx [filename]     (lume.map (util.readjson filename) deserialize))
+(fn loadgfx [filename]
+  (if (util.file-exists filename)
+     (lume.map (util.readjson filename) deserialize)
+     []))
+
 (fn savegfx [filename gfx] (util.writejson filename (lume.map gfx serialize)))
 
 (fn appendgfx [org gfx ?key ?ignore-labels]
@@ -38,10 +42,8 @@
 
 (fn appendtiles [org]
   (local tiles (loadgfx fn-tiles))
-  (org:append [:align 0x100] :jaye-tileset)
+  (org:append [:align 0x100] :tileset)
   (appendgfx org tiles)
-  (org:append [:align 0x100] :neut-tileset)
-  (appendgfx org tiles :neut true)
   (appendgfx org (loadgfx fn-portraits))
   (org:append :tileflags)
   (each [_ tile (ipairs tiles)]

lib/util.fnl

@@ -64,6 +64,11 @@
   (f:write (json.encode value))
   (f:close))
 
+(fn file-exists [name]
+  (let [f (io.open name :r)]
+    (when (not= f nil) (io.close f))
+    (not= f nil)))
+
 (fn waitfor [pred]
   (local coro (coroutine.running))
   (core.add_thread
@@ -79,5 +84,5 @@
 {: int8-to-bytes : int16-to-bytes : int24-to-bytes : bytes-to-uint8 : bytes-to-uint16 : bytes-to-uint24
  : splice : lo : hi
  : reload : hotswap : swappable :require swappable-require
- : readjson : writejson : waitfor : in-coro}
+ : readjson : writejson : file-exists : waitfor : in-coro}
 

support/mame/jeejah/init.lua

@@ -8,7 +8,7 @@ if package.path:find("vendor/jeejah/") == nil then
 
   local fennel = require "fennel"
   fennel.path = './?.fnl;' .. modpath .. "/../../../vendor/jeejah/?.fnl"
-  table.insert(package.loaders, fennel.make_searcher({correlate=true}))
+  table.insert(package.searchers, fennel.make_searcher({correlate=true}))
 end
 
 local fennel = require "fennel"

vendor/lite/data/core/init.lua

@@ -317,7 +317,7 @@ end
 function core.try(fn, ...)
   local err
   local ok, res = xpcall(fn, function(msg)
-    print(debug.traceback())
+    print(msg, debug.traceback())
     local item = core.error("%s", msg)
     item.info = debug.traceback(nil, 2):gsub("\t", "")
     err = msg