From 631c8050edf6d3eb8e0f91aefa98f540339b0273 Mon Sep 17 00:00:00 2001
From: Jeremy Penner <jeremy@sporktania.com>
Date: Sun, 18 Apr 2021 11:26:39 -0400
Subject: [PATCH] Some more objects, fix stack overflow

---
 8Bitsy.dsk          | Bin 143360 -> 143360 bytes
 game/content.fnl    |   3 +++
 game/map1.json      |   2 +-
 game/player.fnl     |   4 +---
 game/portraits.json |   2 +-
 game/tiles.json     |   2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/8Bitsy.dsk b/8Bitsy.dsk
index a28f5d124ca3bab74a0f0ebe3d2c786d03730311..4b8f8c73839df89a02f62522a3068f558c1d97ce 100644
GIT binary patch
delta 1614
zcmaJ>Z%h+s7{BBCkK?W$4mMbDzT=CSIB>H|>OO3=N=sR<J$fyQ)2vKQbRw9D%UqO}
zj%uykQaOy%WU;}zv>mW&-9$MLwoe`(%w;LeFB-GOWiHWmiqS+Jd+%D%FY`(6p5O0%
zp7+V!?|I)Rc*_vHWyt6-RG-yj6Iz`K!4aOyUNu~94&-E6&gHz`TrMXEp+!TXP&69F
z@n|%paA>*MP=9}-e@Kl(o{l8rXV1oyQ8oC|{Ro1@W0C$)FOK67s|F~8MjsA`6>^oY
z_JFOj%}#(i!bAehL_RIMYb&4wrFUNpDD-(saR>9diToW=0t$M#h)U6gwFF$V6FgdS
zV2}-zG|+q>`*ww3qir4ZMN+gKBGgK6S|t7^TRZ5f8upf;Em^ef35rhf&o+F9N_@}8
zFVGLOe{bx<%6ZB}B8?`pwR~y$Cc@dxWV<$_sKvSU*h!A<-L-b_lclwzr&m3gtJt%z
zJ)NiW{EmkG^4Oa0k2busvTf7-ZTseKU05}Lc)X?Vv3zRETJ1bfUHBuY&1SYR==%s#
zq0v+@s!Yj9GKe5`0My~AV#kjihkRggu*Od@)aNxuJqGi>P9$nDtwy_~#=M7bHC6K2
zR(kN`ctB}Q!DjmU`ojGS40cb2{fZ@ukJ8#$OwK)=ftFL^g(Nj|MtwhjrQ`8<GNSNk
zGM!Er4#`YJwIfFgK8l7;lpjPJhdZ=q&=PcTrvY69JMbtV%FE)00grg)=W$B6G7!1u
z5!08dgd4w&%dbsGsJT&A#M4)XE^$8b3V(_7idFs*k9dt0$5>IGhTiPdiE(5A7Y53N
z0YdPPj*HUM{C-K7w@Vrsa~?Y{&F2kLHm^yMW`8sI<Oi@Tn?ksaBDZUj3v^C$yC=D>
z$rQ?UPo@CZF7A-#Ws3V$Oa-|OVoJ-kiOzS&%wYMynMcl(8Bm@$+r!OHjQuq+eW(Z2
zj*QJt9O}t*g6*>)m`EY{N?3cn7`{2$Cbq<01<OV<42*@ZgC9o#cM8mX=ltbYu=jrI
z47dGsYCgcR-g>0P$9jRq1>BzX4wuE#4j4CFZEs>$0him`>~Pru%QUTXSe&4_$<tJi
zz`J3fP2>&tTI)Hhg6=FLj9FN#R*{`>B1G!Tus_9wJ0Jwr1TYiHCGga`f^?vRxkw&i
z3gj7Sf;ZqGvxPW_3*X?vpHT-UKLEGWJ2J2A#sv-+V#ca_WrA$DM+h>Onm7BU)iFYP
zFJ_c1F^y!8Y0RaF|Bi0ul3@&P%iNfz9+T=uzY!Pe%Y=H^pyB0TvEpcz;CKtx39usP
zG3u>u1X=CY=y$4~z%Hx43^T!#zuJu#Ia&0^qIayIfd#CycojV=p$cYI1v{YzTu@Ov
z)Y9f)n-RMQnvzxv(^_GgiQMX5Z#@^V!ffvf7S>TUUy$49^07WBx5euAd4c19dsJ*h
z@1p$CMU+_hn3t8;73#yQP{~(zet^b#U#Cy2-Yx$7P7A8%|LJ@q(C9d7QHRnb{O+k2
zNn?u|kw`@OISXx~Qnu^xpCGwSHPDaX2t^UZ*g%((lI;Yg&bDImW*9w6948OZL8u9W
wY=$`($zHlR|4ig%s+8ntSj$*P%u<J&N=dAIsxUdX4R@i#el*nmZ8!SUe=+Gzp#T5?

delta 1586
zcmYjR4@?tR9KO4@axHhzGL=)NJDHgyk*TpHl|clNLfKKlBA}UCQAYubI?b|}&6bTK
zQ;(n*<D4@#)gs3@IfewvjyE0C^_oo2#4*igCR^Mz!Fg&XCTiTf!u}+ed*APU@B6*q
zefQqae+&2D!o_JiG`TN9_myGVQpAY3lKP_fP%)<~pUa`xOPp(CDHV$`2+{8g)Ch~u
zpWEB2Jcna{(>ed))$=yru@@2a>x7l0byo6OqM>LKePA>c{g2SX|CUS<WwWj1Z-_={
z=&yf~5&dWGG@L6UU>#cyyL?zW!!@~<EWBplS2#g@N|f3U5E@#YbcDQYZy^Rq#a_V-
zkfRXCcbJzy#$9ryhbl1C(T7$(MbRMlyy`u4jN4tk2QBHlU)`v)xRR_Sl4m8$Eh(0D
z1hdH5*Z4My=4X^$*^5Ts&uTWU+3!E}PJ(kJ-}3wA!u07|vKZU&@kDlE-@=VKn_c}k
zuN}4hF)Pr%|4RPKpH4qa*%SEW>C2{r%lgFiWhfWi7(8nE5cP0)<CD-PgD>=q)_*DH
zg?ntbYrEJe2#dEpovaLagpGl4E&C$~d)VuMe$gYQ@d~{Ih|}qb9x*xW>8SmF2q+2T
z5kM)ZyDb9PA;1(2LSY!N9YClA8G6OQC$sfHC;%oN@s<J^7t@4#z@7%7ksvB3D?Thp
zww(e8&j9{Bvjgyi8|q3*_-{l5Q`E^{fOB;ApfCV3a*QZD0GRSY81p0K0GNz~D!7eJ
z(Q7jPl6WP&RGmZjoD3o3sgjyFOi4yR-FxzmqQXh|P;UMOYX_9O-Kr@?pWF@tOGA2k
z&q=r+J*QiImEJl^r+&sGf%(kxYjjP&XrZm$BGKH?T-WSv+166u(&*;VN#7pxS2auS
z$Bptv0b4z3msbYtS|DN<ck@Z&)w5C1Ed%;#k9bM*?gH)aKD!olSA!PO*WBZ_g=_Cc
zKp-dVxi<s?xrQ7{E$pZbds?ysZwArc>{d&*YVFP5n$vYCI||3#L)ldOuUh#yrKSlU
z5GWJsK%ktSJxYa-*S!b~hChez2>i%&{u#8N9R&Ocv<p@Ve@#Ryu|xY?^j1MHI(Y09
zilK*Vad@hq_*%_R<O)@%nXk{R04hyZ0=7~+4!Fdputte4?o!9(`RY13zdeunmbdYV
z?#M3@H7#=uP#?;Ag~+S|3dy5v4dC@;6=17C<ZdKG2NS@tq+}{b1<WzC?JYppceU#m
zJH(Y|AujfHDdXxaZI3LClQixPF(b}FDuj*Wl8O(TB!!A8kGhQ#gvY8uYs~x@uA$tp
zZf4t=AacwkMbGQh1ei&Aq~3+OLWqD%a<Y2U<i({<C|ipSnG`&F=ax=+pc?+fCFN&6
z$!EKll#t>?5X9+NP)g_11^E>S>?Si9D~UUot>|4*M8MX=7X;kAGq4FldKN+3h|Xkq
zX-ju8^PB^u!#RnclMCSG&vmXRiiH~BKubLJ>~{bf69qh`U9pSW*|`BZHWvt+0Gk5@
zA0;^!sXGM}%Sf)nSQPW7N^)KoZx%Onr%G+9Qml2cF+xcvD2X}I$uDB#a2Ua2%7owo
za-y0g&s3MlxSA>Wu};d1Vw3V$+Wc5t+k~BH!k8PHHV!AXl$$R6B51s!{~@Ag!Gkb^
zo6)eG%WE)k8yXm{v4Q4d4X>dn_n={}4{;vIkGHe0SHKSHhzBx>Xf|0HtC_c7hbF<`
zwmF@dfPEN6kfe0RNRHW$n&XXdYVj(_9w3g8+nHU^T?APL*9?$5nW<)JC5OyL($B<m
djhgor8cChyy1j_|c=fv>FZ$8;j_v4$zX3Dlm+$}p

diff --git a/game/content.fnl b/game/content.fnl
index 8f66f33..6423d69 100644
--- a/game/content.fnl
+++ b/game/content.fnl
@@ -3,4 +3,7 @@
 
 (deflevel "game/map1.json" :map1)
 (vm:word :cat (say :cat "I'M A CAT"))
+(vm:word :fish (say :angryfish "I'M AN ANGRY FISH" "GRRRR"))
+(vm:word :pot (say :player "IT'S A POT.") (say :player "NOTHING UNUSUAL ABOUT IT.") (say :player "JUST AN ORDINARY POT."))
+(vm:word :suspiciouspot (say :player "IT'S A POT.") (say :player "NOTHING UNUSUAL ABOUT IT.") (say :player "JUST AN ORDINARY POT.") (say :player "YEP, NOTHING SPECIAL HERE."))
 
diff --git a/game/map1.json b/game/map1.json
index 816fdd3..d49e10c 100644
--- a/game/map1.json
+++ b/game/map1.json
@@ -1 +1 @@
-{"loadword":"","map":"000000000000000000000000000000000000000000606060606060606060606060606060606060000060000000000000000000000000000000006000006000000000000000000000000000000000600000600000000000000000000000004000000060000060000000000000000000000000000000006000006000000000000000000000000000000000600000600000000000000000000000000000000060000060000000000000000000000000000000006000006000000000000000000000000000000000600000606060606060606060606060606060606060000000000000000000000000000000000000000000","player":{"y":4,"x":5},"tickword":"","moveword":"","objects":[{"x":15,"linkentity":"","func":"cat","linkword":"","name":"","y":8}]}
\ No newline at end of file
+{"loadword":"","map":"000000000000000000000000000000000000000000606060606060606060606060606060606060000060000000000000000000000000000000006000006000000000000000000000000000000000600000600000A00000000000000000004000000060000060000000000000000000000000000000006000006000000000000000000000000000000000600000600000000000000000000000000000000060000060000000000000000080808080800000006000006000000000000000000000000000000000600000606060606060606060606060606060606060000000000000000000000000000000000000000000","player":{"y":4,"x":5},"tickword":"","moveword":"","objects":[{"x":15,"linkentity":"","func":"cat","y":8,"name":"","linkword":""},{"x":5,"linkentity":"","func":"fish","name":"","linkword":"","y":8},{"x":13,"linkentity":"","func":"pot","name":"","linkword":"","y":4},{"x":12,"linkentity":"","func":"suspiciouspot","linkword":"","name":"","y":4},{"x":11,"linkentity":"","func":"pot","linkword":"","name":"","y":4},{"x":14,"linkentity":"","func":"pot","linkword":"","name":"","y":4},{"x":15,"linkentity":"","func":"pot","linkword":"","name":"","y":4}]}
\ No newline at end of file
diff --git a/game/player.fnl b/game/player.fnl
index 2c9cad4..2513560 100644
--- a/game/player.fnl
+++ b/game/player.fnl
@@ -70,9 +70,7 @@
 (vm:word :player-key ; key --
   (vm:ifchain
     [:movement-dir :dup]
-    [:player-yx :get :swap ; oldyx dir
-     :try-move-player
-     :dup :player-yx :get := (vm:if [:drop] [:load-next-level])]
+    [:try-move-player :load-next-level]
     [:drop]))
 
 (vm:word :full-redraw :drawmap :player-redraw)
diff --git a/game/portraits.json b/game/portraits.json
index 2ef53c2..d4df77a 100644
--- a/game/portraits.json
+++ b/game/portraits.json
@@ -1 +1 @@
-[{"gfx":"000000000000000000000000000000000000007C7C7E7E7E7E7E7E7E7E7E7E7E00000000707F7F7F7F7F7F7F7F7F7F7F7E7E7E7E7F7F7F7F7F7F7F7F7F7F7F7F0000000F0F1F1F1F1F1F1F1F1F1F1F1F000000000000000000000000000000001F1F1F1F7F7F7F7F7F7F7F7F7F7F7F7F00000000077F7F7F7F7F7F7F7F7F7F7F","label":"","flags":[]},{"gfx":"00000000004040606060707070707070000000000000010103037F7F7F7F7F7F707060604000000000000000000000007F7F7F7F7F7F7800004040406060606000000000001018383C3C7F7F7F7F7F7F000000000000000000000000000000007F7F7F3F0F67717C7F7F7F7F7F7F7F7F00007C7E7F7F7F7F7F7F7F7F7F7F7F7F","label":"pcat","flags":[]}]
\ No newline at end of file
+[{"gfx":"000000000000000000000000000000000000007C7C7E7E7E7E7E7E7E7E7E7E7E00000000707F7F7F7F7F7F7F7F7F7F7F7E7E7E7E7F7F7F7F7F7F7F7F7F7F7F7F0000000F0F1F1F1F1F1F1F1F1F1F1F1F000000000000000000000000000000001F1F1F1F7F7F7F7F7F7F7F7F7F7F7F7F00000000077F7F7F7F7F7F7F7F7F7F7F","label":"pplayer","flags":[]},{"gfx":"00000000004040606060707070707070000000000000010103037F7F7F7F7F7F707060604000000000000000000000007F7F7F7F7F7F7800004040406060606000000000001018383C3C7F7F7F7F7F7F000000000000000000000000000000007F7F7F3F0F67717C7F7F7F7F7F7F7F7F00007C7E7F7F7F7F7F7F7F7F7F7F7F7F","label":"pcat","flags":[]},{"gfx":"80808080808080808080D5818181858480808080808080808080AA80808080808484848484A4848484A48484848494D0809090D0D4F5D5D5D5D5D480808080AA80808080808080808080D5808080808080808080808080808080AAA0A0A0A888808080808AA8AAAAAA828080808080D588888888888889898888888888888A82","label":"pangryfish","flags":[]}]
\ No newline at end of file
diff --git a/game/tiles.json b/game/tiles.json
index 6c314a7..9708932 100644
--- a/game/tiles.json
+++ b/game/tiles.json
@@ -1 +1 @@
-[{"gfx":"8080808080808080808080808080808080808080808080808080808080808080","word":"","label":"","flags":{"walkable":true}},{"gfx":"8080C0C0C0C0E0F0F8FCE6E6E0B0B0B0808183838383878F9FBFE7E7868C8C8C","word":"","label":"player-frame1","flags":[]},{"gfx":"8080808084CCFCFCFCFCFCF8F0B0B0B080808080E1E1E1F1B99F9F8F8F8C8C8C","word":"","label":"","flags":[]},{"gfx":"D5D5D5858585A5A5A5A5858585D5D5D5AAAAAAA8A8A8A9A9A9A9A8A8A8AAAAAA","word":"","label":"","flags":[]},{"gfx":"8080808080808080808080808080808080808080808080808080808080808080","word":"","label":"","flags":[]}]
\ No newline at end of file
+[{"gfx":"8080808080808080808080808080808080808080808080808080808080808080","word":"","label":"","flags":{"walkable":true}},{"gfx":"8080C0C0C0C0E0F0F8FCE6E6E0B0B0B0808183838383878F9FBFE7E7868C8C8C","word":"","label":"player-frame1","flags":[]},{"gfx":"8080808084CCFCFCFCFCFCF8F0B0B0B080808080E1E1E1F1B99F9F8F8F8C8C8C","word":"","label":"","flags":[]},{"gfx":"D5D5D5858585A5A5A5A5858585D5D5D5AAAAAAA8A8A8A9A9A9A9A8A8A8AAAAAA","word":"","label":"","flags":[]},{"gfx":"8080D4D0D0D0D4D45454D4D4D4D0808080808A8282828A8A8A0A0A8A8A828080","word":"pot","label":"","flags":[]},{"gfx":"8080808080D490948484A48494D080808080808080AA88A8A0A5A5A0A88A8080","word":"","label":"","flags":[]},{"gfx":"8080D4D0D0D0D4D45454D4D4D4D0808080808A8282828A8A8A0A0A8A8A828080","word":"","label":"","flags":[]},{"gfx":"000000A0908884827E0A0A0A0000000000000000201008040785858500000000","word":"","label":"","flags":[]},{"gfx":"000014040414500000000000A888A8800000282020280A010101010195919580","word":"","label":"","flags":[]},{"gfx":"00008C92921C60105010781C0E070300000098A4A41C030504050F1C38706000","word":"","label":"","flags":[]}]
\ No newline at end of file