From e941fae7458cccdb28dba2ecc54f420fc41b14cf Mon Sep 17 00:00:00 2001
From: Jeremy Penner <jeremy@sporktania.com>
Date: Sun, 24 Jan 2021 11:32:49 -0500
Subject: [PATCH] Random debris generation

---
 NeutTower.dsk   | Bin 143360 -> 143360 bytes
 game/boop.fnl   |   5 +----
 game/defs.fnl   |  20 ++++++++++++++++----
 game/init.fnl   |   2 +-
 game/level5.fnl |   9 +++++++--
 game/map6.json  |   2 +-
 game/tiles.fnl  |   8 +++++---
 7 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/NeutTower.dsk b/NeutTower.dsk
index fee182453dc651b006a8fbf0f574b6496e5d0e87..32bbc2cbf663426aee13b4579470f6c8d679cd9e 100644
GIT binary patch
delta 1416
zcmY*ZZERCj7(Tb%Sj)~Sw__+H*-|WHZ5C^t*Rc3!{aC5X8n(5a1Z6^p#4Lt10e;-u
zRkrzoMogr=>z#>lX46d|#IH+Ia3g|$h>6ApXH~i`Q#A5R+c4AUgzI@v8Lju`o^zk`
zzUREp`<(Zj(G|n!is2K{z$IkKaGblW{$Y5yT^BK{jqaP<JbrAk;dx#lw-GWG@qPH$
z|6!3rscikH0?IcAc6JhES;9`UALDRWIN)=Hyg{FDkEH=y+VPo90tuVlW`QK05(sh$
z<h0pI5vrn}K_G8a^fV3}kvsQ?lLOI_Yz`lvy!)JrJD!i6+3;!fo5R1ZoqwZkA^6>R
zLx?}uaQ=hqTJDEN=SPlheN%1yo&5`w4_<RWHu2@)+ynIs<IfCPzM^z&Smv9^DJ&3<
zk`+h?N}FWfP6QI<k*SIJF#;!ne9l*-okysS8Skl5U^0C6?4trVC$}XZub<<$4sofm
z00P~5=xPXEQ-_mhIc{EV9^c8$tAX*OwK~0`UU~25s!c3{3qjCV`utetbiK)$+nhmN
zoq3DX)tS{-KYZ88t;p6Nb2g%(xfsxe7O_^-kYr>*u6NtXg>EBB6T7_ir|3u_4yhp&
zG^I!(-Wo6BcJ}wJM<Ap7-*F4X8SkS1PsGEXs~$Ew0Hb^9=snE5jxj6{O>2$A>V>%S
zBuI1r=?_}mdqR7CLxV?rL1bZ1^A35#jg}F6Jky;b_IN%}#53L^1}^qEl8V4gT*sHX
z0oNHy)(aGY2e5x1xxJ8+Ky(Q5qb$&D4Bj%|uVawK_pvZ-e~%rY+;4eiV<#a(SgUj_
zFvq`{qiMM8SYFCD45{Cu3n7h3%+WU372bE)>I?Sv1drN|4Mvh#$D!%i8fBj%(=lMF
z(ZUf3VM@PL!R)RC%(k$AR>lliX__CW$t0bbky5O`$$H59P0{TITbfMEiLA96@RWQh
zyNjn4%hy2JB2SMi8VV(sg3(23m8v^0fm-Y8UX&ohnrI}|bQE^{qEt?BBV|;%*G-I}
zTY?IJdDXO*(qvI8Ww$87s_XT&CSP58q?O;;C&AA1HKl&DVMRpfptxCoVmCsfSgUvV
z5psz}{b{*1*TFgD7jlgw)4x~`(L$e~w}_sJ^}1L(VJstd1b8$>NweE!ifOwnLJ!qm
zXF7$!2-z%)0^#YWM_0Vexm@H$aaII@b?C%yY67jcM<S7j#v*dfa-m8U1H06Jm%re3
zZnJ#(PscvJIg=^{K&DK}NP7Av_>*vh!A#0YuRsx|h*fD(;2`N05T{vTKBaqsR;I#O
zWcV3croZtY({@#M<+s#sH{a>?V|ojm9g`2{>l+4Jlmkkdyar3X*rMDa*;JYgD+BoD
ML_VF!bJ33f0EY0$R{#J2

delta 1379
zcmY*ZZ%kWN6u<8QY3tstcQ6wwV|G>@YQ~s(28<@7B~TZd0c|&<mW^&2B}N<BlD*fJ
z0V<0LPP0DV`?5?kHzv3xnsrG-oNgw#z?V5SVIr`sZgCit(J-tM+4G!RS)t84_x|oZ
z_nhDPb8qK$Yv*<Amx@(5tf|(0!uG_Bbz_zI4@;D~Z#-zB#5o}iGc6KwJn{z{V=_Iw
zL#Cu!re&*#0g-(8tTL?t^pfOj)y{;18WUfSH%B@Mah6Fk^|OrRm0%hK{aHfn>*zh0
z2Dof@ZY7*w2{QoIoT-JCa4`pg(pP`lwH=|tvpYA-LO^>e{`8svD{d9^E+0WE4HR_9
zuEc@(fFK05M|&R=f(c)5+bYr26Bj>8<u_J%yXw|FP;`DVxM_9ruS)l8cPDS{pX<5#
z+|1usZ-}Y63v2hSZEP9Y@b;kPnbO~;PTs5x-5%C2UFjWII9t&4aoa0A_G%*2<4x~1
zd8I`9q$mjai93BC3F7B0(f!%63PI3ZKTj4%WonwUij8ynvHo#-uHHtI)S;D)MRulQ
zJ&;2}{C1tDVkNPRRK;iCdt}-fI_j3GGqx4xPsD<rZ#{gq8CSiq`akAcdpJf<B{8&~
ziW$#)B~1`ZH1^BJ4o7UXUZ;-OtS=+=)np`e2S~}FbC6j)SdX~SnnmXTp#~B>LEJS+
zTc#qx5Wo>JqWI5IIv+)%-$jEUuSRzPy(y0oJ%k>D=5oapSNxqT-d(1cGgW*5qniRl
z#5@i8BLYg3pcJ?y<g~`d%lE{i(?C(D@hH+XNzyJ;%Cp(FjM|Kf)C#!ABJL4snWk4t
z(huR}B~|C+Pkh9{-&fo<xR<1H?fAH>0P(Nd$ap2&?svMk1zxCa-Th{*pE#WwoA5`5
z)H{&hGb-k5DZl+Hx|oK-&%-K~wO`GJxS-rCATOw$Q{1d#nep5_oJ-OnH5=ZLidL7J
zXj=PWV$-w!t-%*xb=CSC8~kl$dv}M~eQuS&k6E%~k@bo~NQ+XGcd(8SMOl?s?j@vJ
zvE_AYPfl(T)@g4{mUi$y{*=I#9f3CFh>;`UoL}N2Jh_(@95MBU_8tj0F`CPYOc{K6
z<YEn1&UNxF#ZWNAA~{&MWO;-#3-{q^sEz~z>%-yj!(Cy`axI;ILh)@#{Cn*J6UUhL
z_3iSGqij^qIwbZ{-9{VWhAr_kVW$Tw{*d7^pfiXG`$@XqIFx-l@IkWC3WGCxi}gX%
zwzDrle!vEK0~7KMA59Y*dXOzPdL?)@2HLw@28`}7J|HfK<gAkV?+5ekF5_h*N#8|R
XFkhtOdXnxpn(=DweJ6b?Eo}J@AqvYD

diff --git a/game/boop.fnl b/game/boop.fnl
index 66becbb..42b2f27 100644
--- a/game/boop.fnl
+++ b/game/boop.fnl
@@ -18,8 +18,5 @@
     [:bne :sample]]
     (vm:drop) (vm:drop))
 
-(var noisebytes "")
-(for [i 0 0x40] (set noisebytes (.. noisebytes (string.char (math.random 0 255)))))
-(vm.code:append :noise [:bytes noisebytes])
-(vm:word :snd-explode 0x40 :lit :noise :blipmem)
+(vm:word :snd-explode 0x40 :lit :randombytes :blipmem)
 
diff --git a/game/defs.fnl b/game/defs.fnl
index 4264781..e74a55a 100644
--- a/game/defs.fnl
+++ b/game/defs.fnl
@@ -116,6 +116,19 @@
     [:sta vm.TOPH :x]
     [:sta :0xc010]])
 
+; "random" numbers
+; this is used only for cosmetic purposes and short noise generation, so we can get away
+; with just including a short table of random digits rather than implementing our own
+; pseudorandom number generator
+(var randombytes "")
+(for [i 0 0x40] (set randombytes (.. randombytes (string.char (math.random 0 255)))))
+(vm.code:append :randombytes [:bytes randombytes])
+(vm:var :irandom [:db 0])
+(vm:word :rnd
+  :irandom :bget
+  :dup 1 :+ 0x3f :& :irandom :bset
+  :lit :randombytes :+ :bget)
+
 ; 20x12 means full map is 240 bytes - we have an extra 16 bytes at the end for metadata
 (fn append-map [map org label]
   (org:append
@@ -162,11 +175,10 @@
   (table.insert result :dismiss-dialog)
   result)
 
-(local itile
-  (let [tilelist (tiles.loadgfx tiles.fn-tiles)]
-    (fn [label] (tiles.find-itile tilelist label))))
+(local tilelist (tiles.loadgfx tiles.fn-tiles))
+(fn itile [label] (tiles.find-itile tilelist label))
 
 (set vm.code org.code)
 
-{: vm : prg : mapw : maph : mon : org : achar : astr : style : rot8l : deflevel : say : say-runon : itile : controlstate}
+{: vm : prg : mapw : maph : mon : org : achar : astr : style : rot8l : deflevel : say : say-runon : itile : tilelist : controlstate}
 
diff --git a/game/init.fnl b/game/init.fnl
index c64a257..ab22a9f 100644
--- a/game/init.fnl
+++ b/game/init.fnl
@@ -27,7 +27,7 @@
 
 (vm:var :tick-count)
 (vm:word :handle-key :tick :read-key :player-key :hide-footer)
-(vm:word :tick :map-specific-tick :tick-count :get 1 :+ :tick-count :set :player-redraw)
+(vm:word :tick :map-specific-tick :tick-count :get 1 :+ :tick-count :set :player-redraw :rnd :drop)
 
 (vm:var :next-level 0)
 (vm:word :load-next-level :next-level :get :dup (vm:if [:load-level 0 :next-level :set] [:drop]))
diff --git a/game/level5.fnl b/game/level5.fnl
index 10d844f..9afd062 100644
--- a/game/level5.fnl
+++ b/game/level5.fnl
@@ -1,11 +1,16 @@
-(local {: deflevel : say : itile : controlstate} (require :game.defs))
+(local {: deflevel : say : itile : controlstate : tilelist} (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/map5.json" :level5))
 (local vm level.vm)
 
-(vm:word :randomgarbage (itile :broken-table))
+(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
diff --git a/game/map6.json b/game/map6.json
index 7f89dd3..804e237 100644
--- a/game/map6.json
+++ b/game/map6.json
@@ -1 +1 @@
-{"neut":{"y":1,"x":5},"map":"210261616161616161616161812261616161E1614161C2C081C0C0C0C0C0C0C0C0C001C081C0C0622161E04384C0C0C043C0C0C043C0C0C0848201612102616161C0C061610281026161C0C0616161612161C2C0C0C0C061E2C0C0C0A261C0C0C0C0E2612161E003C0C0C061C0C0C0C08261C0C0C003E06121026161C0C0C061E08282E2E061C0C0C06161612161C2C0C0C0C06103C0C0C02361C0C0C0C0C2614161E003C0C0C0616102C1026161C0C0C003E06121026184C0C0C0C043C043C063C0C0C0846161612161E081C0C0C0C0C0C0C0C0C0C0C0C081C083612161612261816161616161616161616161616161","loadword":"","tickword":"","jaye":{"y":2,"x":6},"gord-following":true,"moveword":"","objects":[{"x":3,"link":6,"func":"c4","linkword":"linkloop","name":"","y":10},{"x":5,"link":3,"func":"keypad2","linkword":"","name":"","y":10},{"x":5,"func":"door","linkword":"","name":"","y":11},{"x":11,"func":"door","linkword":"","name":"","y":9},{"x":13,"link":17,"func":"c9","linkword":"linkloop","name":"","y":6},{"x":9,"link":5,"func":"c8","linkword":"linkloop","name":"","y":6},{"link":23,"x":11,"y":4,"name":"","linkword":"","func":"switch"},{"x":3,"link":1,"func":"c3","linkword":"linkloop","name":"","y":7},{"x":3,"link":8,"func":"c2","linkword":"linkloop","name":"","y":4},{"x":3,"link":23,"func":"c1","linkword":"linkloop","name":"","y":2},{"x":4,"func":"door","linkword":"","name":"","y":2},{"x":4,"link":11,"func":"keypad1","linkword":"","name":"","y":3},{"x":4,"link":4,"func":"scan","linkword":"","name":"","y":1},{"x":17,"func":"door","linkword":"","name":"","y":2},{"x":17,"link":14,"func":"keypad3","linkword":"","name":"","y":3},{"x":19,"func":"rexx","linkword":"","name":"","y":2},{"x":19,"link":18,"func":"c5","linkword":"linkloop","name":"","y":4},{"x":19,"link":19,"func":"c6","linkword":"linkloop","name":"","y":7},{"x":19,"link":10,"func":"c7","linkword":"linkloop","name":"firewall","y":10},{"x":19,"link":19,"func":"switch","linkword":"","name":"","y":12},{"x":17,"link":22,"func":"keypad4","linkword":"","name":"","y":10},{"x":17,"func":"door","linkword":"","name":"","y":11},{"x":15,"link":9,"func":"cx","linkword":"linkloop","name":"","y":11},{"x":14,"link":25,"func":"scan","linkword":"","name":"","y":12},{"x":13,"linkentity":"","func":"exitdoor","linkword":"endgame","name":"","y":12}]}
\ No newline at end of file
+{"neut":{"y":1,"x":5},"map":"210261616161616161616161812261616161E1614161C2C081C0C0C0C0C0C0C0C0C0E0C081C0C0622161E04384C0C0C043C0C0C043C0C0C0848201612102616161C0C061610281026161C0C0616161612161C2C0C0C0C061E2C0C0C0A261C0C0C0C0E2612161E003C0C0C061C0C0C0C08261C0C0C003E06121026161C0C0C061E08282E2E061C0C0C06161612161C2C0C0C0C06103C0C0C02361C0C0C0C0C2614161E003C0C0C0616102C1026161C0C0C003E06121026184C0C0C0C043C043C063C0C0C0846161612161E081C0C0C0C0C0C0C0C0C0C0C0C081C083612161612261816161616161616161616161616161","loadword":"","tickword":"","jaye":{"y":2,"x":6},"gord-following":true,"moveword":"","objects":[{"link":6,"y":10,"func":"c4","name":"","linkword":"linkloop","x":3},{"link":3,"y":10,"func":"keypad2","name":"","linkword":"","x":5},{"x":5,"func":"door","y":11,"linkword":"","name":""},{"x":11,"func":"door","y":9,"linkword":"","name":""},{"link":17,"y":6,"func":"c9","name":"","linkword":"linkloop","x":13},{"link":5,"y":6,"func":"c8","name":"","linkword":"linkloop","x":9},{"x":11,"func":"switch","y":4,"linkword":"","name":"","link":23},{"link":1,"y":7,"func":"c3","name":"","linkword":"linkloop","x":3},{"link":8,"y":4,"func":"c2","name":"","linkword":"linkloop","x":3},{"link":23,"y":2,"func":"c1","name":"","linkword":"linkloop","x":3},{"x":4,"func":"door","y":2,"linkword":"","name":""},{"link":11,"y":3,"func":"keypad1","name":"","linkword":"","x":4},{"link":4,"y":1,"func":"scan","name":"","linkword":"","x":4},{"x":17,"func":"door","y":2,"linkword":"","name":""},{"link":14,"y":3,"func":"keypad3","name":"","linkword":"","x":17},{"x":19,"func":"rexx","y":2,"linkword":"","name":""},{"link":18,"y":4,"func":"c5","name":"","linkword":"linkloop","x":19},{"link":19,"y":7,"func":"c6","name":"","linkword":"linkloop","x":19},{"link":10,"y":10,"func":"c7","name":"firewall","linkword":"linkloop","x":19},{"link":19,"y":12,"func":"switch","name":"","linkword":"","x":19},{"link":22,"y":10,"func":"keypad4","name":"","linkword":"","x":17},{"x":17,"func":"door","y":11,"linkword":"","name":""},{"link":9,"y":11,"func":"cx","name":"","linkword":"linkloop","x":15},{"link":25,"y":12,"func":"scan","name":"","linkword":"","x":14},{"x":13,"linkentity":"","func":"exitdoor","y":12,"linkword":"endgame","name":""}]}
\ No newline at end of file
diff --git a/game/tiles.fnl b/game/tiles.fnl
index bd7aa73..9d73a98 100644
--- a/game/tiles.fnl
+++ b/game/tiles.fnl
@@ -53,14 +53,16 @@
 (fn encode-yx [xy]
   (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)))
+
 (fn find-itile [tiles label ?itilenext]
   (local itile (or ?itilenext 1))
   (local tile (. tiles itile))
   (assert (not= tile nil) (.. "No such tile " label))
-  (if (= tile.label label)
-      (bit.bor (bit.lshift (bit.band (- itile 1) 0x07) 5) (bit.rshift (bit.band (- itile 1) 0xf8) 3))
+  (if (= tile.label label) (encode-itile itile)
     (find-itile tiles label (+ itile 1))))
 
 {: loadgfx : savegfx : appendtiles : appendgfx : flags : flag-to-bit : find-itile
- : fn-tiles : fn-portraits : fn-font : encode-yx}
+ : fn-tiles : fn-portraits : fn-font : encode-yx : encode-itile}