From f16962f7f950bf27b6fdaae5a882b5b71c84c9b9 Mon Sep 17 00:00:00 2001
From: Jeremy Penner <jeremy@sporktania.com>
Date: Mon, 11 Mar 2019 21:57:22 -0400
Subject: [PATCH] DSL for level-based player touch event handling

---
 defs.jim     | Bin 1628 -> 1699 bytes
 defs.jor     |  13 +++++++++++++
 entity.jim   | Bin 909 -> 909 bytes
 footer.jim   | Bin 1073 -> 1075 bytes
 footer.jor   |   8 ++++----
 game.jim     | Bin 1754 -> 1868 bytes
 game.jor     |  25 ++++++++++++++++---------
 game.prj     | Bin 5316 -> 5316 bytes
 input.jim    | Bin 372 -> 372 bytes
 map.jim      | Bin 749 -> 749 bytes
 pete.jim     | Bin 241 -> 225 bytes
 pete.jor     |  16 +++++++---------
 petehous.jim | Bin 107 -> 392 bytes
 petehous.jor |  18 +++++++++++++-----
 repl.jim     | Bin 0 -> 331 bytes
 timer.jim    | Bin 438 -> 438 bytes
 16 files changed, 53 insertions(+), 27 deletions(-)
 create mode 100755 repl.jim

diff --git a/defs.jim b/defs.jim
index 58c6fd0adbc874fbff74dfec341cef7865efa6b9..11043815e5416608687a17e5d228f3280ac830b2 100755
GIT binary patch
literal 1699
zcmZ8hO=uit82)zVo!#y3%<Rl6ONvIjjR;GVNLxcBAsa&lQN#$L1wkm2-B~gwyAx+8
zP0}WcKdn-%Vv7F=#h-&9r6&(wCI@@kLnKS|5J?Y$6%ShLL7}7Zd1rQ;;vv~@p7(kG
zp7;H}`!kotGx-mb*Rx+`lcMQY-34E$MnE5vOWSft*8wj&{!DEi@EK)@9OXvhj8dR7
zP9go9B~kWV_UWg73aM8maiqGy>?~yg3<5YB14A^dK28s+Wx(TrAMV0k!%2$GWh#Pl
zLY2gkF$5Yy<WaeZl%w(rYFbtk;zi&A?e2bp?==u>#fT`VE%(zF1xWI)+@h=a{Xo3{
zXKv<GCO!&c5wr^cTB;&y4cBMqVRchA<uBEcepHjfUYd92Y``a^Ey`*orA3-{BN5U~
zH7y=^Z1ULTQ<G1NH}6)BoR$(J4Yy&{nVymE1$hm`1KKNMWChS#nxT*$0kAR(AV6~^
z<w`oFCp1M^o@Xrs-AwEzt|giHoR$<7&$fIH$nbZ70}_Ibo~DYL({P$Iw<&$n`%-Ue
zN8%RW*3OEmYd6bq%}4=}I0Vb-bU>F-M4XwcyR4<fA>UoJylNBFEFG1%=r1jxgxHZ<
z^iOp9SqkZU?Nw28J#YdVLfL<$Pzinm%!>aXluJqi;n^0_uJ*EUA}(7)8qi-84SOlx
zsq!6eKcSlY;8uvRsfawLD`MHP=c)*B5*j@ZXWOdG;Io@G0nttauDc$K6Oga(#o@l*
z(NpMu8tTo$?&~ZYy4BB$E*21H3+NkohV(6R&N+=)7QxrsvLF*e{Hlkvqn{H^+w!9P
zaiVVLW~XN^o|}lv|67+u-Dx1uu*zzV<%(zzqs{@hmLmKZ@Z%kPB9{@B8M`t&?>Y@u
zXjR*rSV`%VO3E1ixYqNzOIiro+j2n?#ItV8hj9u>issvvpTw-?&Y9Qr*<4Z}s_k(-
zt6HD5fKUOoqd;ve%GbGlqH0&%dS}l!6Q5(#2Ow!e46D2}ECw&kLDXC_1l5pmi}o8m
zxcx2aH3~$^TiAwpWB$w)&@K1-LrxKkZoF50(l0uD9f$vd)C0b+w`c;sAsseS(8ZaX
zc3GQlD<~bfZ#8EJ9DYUClUz$kFLcpnjK+Cm+v`R;_V8{SC9H95{LIM2#-?vocq!JC
zELGRMZe+W@9s7pyQ77j$<Q(KyqN#R!dB}|CTQa$$0yGk03hTt3X=VXq!t71Li!qL`
zkZyG<Zw~U3jdc`RGX<s0n^ZMN4u~E_&_$yyXKACeJm+9;%cStETQqOJlwxr?#Z(k@
z!pvaLt%~oQir<MWts2{y*aq(M#pv`qPFHZ^8s0PC5O<LG_KaVKFHBwyev?AFYC=kH
zd7x=G_!`=nTO0GgE6?e<(-!T|Z_BKHNWYo;#G>W+|7VZp>&X@kfEUs|dBQb{g58QL
hAJ3<RXIE_J6yM<U$v6eyIxljY&T~pm)gL|D{{eX?s9XR5

literal 1628
zcmZ8hZ)h8J7=Cm2UXmtvm%AddAf2`qCAKTLS_>`h1{DP@7M$$U=*W`mdbG`zBwZU@
zCjJ?evWXPLqWDDy`e6(|?ECeLB1A!&)i0Ha{m`nPrub);!}`2;$vPw?`Q7tA@89SB
z-Q%fS)Ykr5{2+ZZ9j8jQ=q*-Bw|xGXJ>FFVJ^;MrR%fOc0Iz6+>}vO7D_WMva0>X}
zG}Bnw6Q4fr<A6JLrc=d5VW&9_pdY|M1Pt<!{t`c>j{!an__-F`GF;%uJjPw1oYNIL
zHHtukh&-ZpA?1j=ikfPAjIIFp`RM2qJa2$F-4zmv8)_f#u#Y4ksCE7l|C{=CI7>61
z3h@kxU7%eDP}k$+EHAio4#0ED4*#j=v^xK---`wOgPx=(Uzi-9oS1x-u05h#|L6%C
zE_tQ=ywFoh+{kGgAf}ABX?PXTMpB@Fy8*0@0PxX9PWvJm@PMIFzFf}NfNsZ*Vn4=(
z_@WV~LfOezC7{6H0rr_ljOPuVrrnZTnR!6zQ9e{U6L%G9re<8FqUTh`;F?l=X6l9I
zjik@(C?d)%)omI{>aBW9`Es!WYMKYs9sbGiIYxJtIv<3meI?*6;~kpz%Ha4sh_Zi6
zpc4H1P(^;b)tnYXc(Dcii}4n@Ay=#cKWe^9C1*L>p0S7AzC|@B;Fb-svmyCuQ=^*e
z%oP#f0%r6&oSl4O29K?*F$}E;c-||^aD1LJkK;&RD`o=yU&QogVV^Q(Z0Od!N-fN1
z$>#G7cm{k6Ip^HctPEkwY^cOG264v>_-j+8dA9_7NSERKWp<(3fcFH?FNgRza5EF(
zhh~ZjGfrW4!E;N}@Fn9|fSlH&<g`(ICG~h_-3TznhMHA~MY@LiEKWWvp<E61Wk{zs
z&$4yxnK&V;Q<i!z89mA(Liv0x4Ag+`UZ#zTPQjaRuI+a01{QZeBZ3a;vIEka=--W+
z_cFxONVvn>nGRgrI)9(ZGHdTa+-L!A;#occzn{@)$&1#cN7**T%e06Wl@9Qy%sL-}
z8}P501m@z-UG!u&tyWOFm7r?AGJDdM>%SG3S^|Eig;pXo${X3vSjotv{J^MSD<k81
zD-{_l)qFuT-iphpTIQOSZuvItYt~22oSVqmFRg^CwtD%wsqda89c3{iqO;fz>Fg^j
z3z?w3#drbS$5X(!o0V7kWoJg46M4lZ-m-q@PJ8$X>d=TMtcIHAwPx_sFgH}zMC&@|
z>^BoKTuGtZ67&#V6}^0+>RyhneVU)QcA?lBuI5B|`Wz=0C!tT;YxEHLc+cdbPua2>
z@`?%gij7g0YbPsCNp95%=+=P#-ymt!X`Q$2T~($Z@Mm@#E#=+n|Ji@o^YJ?GgBS1}
po2eP>c3Am+J3(cq;JBCNLaxW76mp4r+r{m%c1bBi?F-+w{{f%Un}+}Z

diff --git a/defs.jor b/defs.jor
index 16fedce..0c3491c 100755
--- a/defs.jor
+++ b/defs.jor
@@ -15,6 +15,7 @@
   <rot if r< | else r< ~ & then ( v newval )
   swap ! ;
 : f@ ( v flag -- ) swap @ & ;
+: fnot! 2dup f@ not f! ;
 
 : expile state if , else execute then ;
 
@@ -53,6 +54,18 @@
 
 : links begin yield @ dup not until ;
 
+( usage:
+  : search-xy { x y -- b r: coroutine } begin 2dup search >rot drop drop ;
+  : test-xy { x y -- b }
+    search-xy 1 2 2= yield 3 4 2= yield drop drop 999 yield ;
+  test-xy will return 1 if x y is 1 2 or 3 4, otherwise it returns 999.
+  Note that it must always end with a yield, as search has no way to tell
+  the difference between an early termination and a final non-zero result.
+)
+: search
+  ' yield , ' dup , ' not , [ ' while , ] ' drop , [ ' repeat , ]
+  ' rdrop , ; immediate
+
 : min ( x y -- x|y ) 2dup > if swap then drop ;
 : max ( x y -- x|y ) 2dup < if swap then drop ;
 
diff --git a/entity.jim b/entity.jim
index 92d2958dfb2aed42849e9b5bd86b2ae841182b6b..47cf9bdcab1afebae961a7cf77601e385c300773 100755
GIT binary patch
literal 909
zcmYLHPiWIn82^%dS-N&XVIz5OA|v9Zy6rF+46C`!GDXqD{Bu&MP0Hf7cC>L*>rO-6
zLGYqSK`*<Gfg+xI^iXz?A~MDb;s$~YJ&5!0bbc>MCn3rAe!uVU?|TF3KfP!Bm$VJ*
zoz(^TYgf*XUw|il02`JekC(5GpQEz^U#&DORH`$c8wN8z^c-#=!m8$A=P&R#xk%ED
z{1TUy#6|uE9<jT@^Gkj?48nWlQ8F87VOE#V30r;zx^@a;hvB<Pl9NVT6?p4EA!8e;
zK}^)`bSJ_Ksu86o)HB;mD7Q9O4MN%ZQOefRekcN0shzl#>s5$xFviyp61sDh8WDgM
zyG0W$(^ue*o$1sg+97@rGvu+UEz>Iy*`b6VqG4-cfy%xiO^>rqoL3q0=P7QCwX~0T
zlR3C$H1RfTpaNrTQyVm;ut3V(Pc<;7W%U<^z|-szoC+&<ic=K&)4Iq6K41?C3X0Q&
zY)8mb_84*p0&f|yz^_$G7o~Pkw)l!Ea6MY|d$RJ;ia(Hbi7XX1$(kffgB@l7X?h^T
zI?GYRz1*Vq_V;B@L2Z7D&}@V%5Tl<X><pJD>D$D7Vk;E$o#{}j7G~u>M)dd*IKjJO
zv_^WVplG_$o#{%Ydv5R)$o-W)KfV(xtY}lbt+v%&nr5Cy*GeiK6e;7PIifdkjlVPn
z?rKY1;B!uM_@zQQm`!*<=>srI{ZHUAn(7-LCCsJM7qf{inr4!w+>5dRdCBF-dJg4u
zdL8_wI{24#RSA{2tn-%ZP%jp$i?H3d#$lkp2kLWv=nqkEWiLjR;r>j5E)-^_CAi0R
HRaO202om;h

literal 909
zcmX|9O>5Lp6un7qn(0gjMaxSbA`;ywT7_aaRt8EbR>UgQ4{$e3Qk#Cv3^UQHMG(Xa
zr3)#pgcbx5H(~{KC-VcUt15`nE>v(;unX%Zc04c13?a#V=iGbVz306H*>`*Y$@|8l
zsEH05x^n64;5l08CR!AhT3)z3IE=MMPeqnyDzz!E5C&5|b?t62(<{T})<5FcNKs@V
z&P!9Crzz?m@h8zqo<HW7!yvqkjEngO3qE41=Z8?=i2sTVB?-rGr6NbI4L#z0cAHSO
z4K^qtPTJX4g%{LfN>8ctc0Q#F^=d5$Rp<Mmwr2d+A|AIpTdY?B<8p$}wFL{+N*x68
zVS5b|4B#8_vYl(~2igUHjC08NW(?qs_`SU=<$Ew}JuG6|xA1hmUFTJL{F|uTg5GDg
z9hcXwRX*f2Sfedyh`chE;LM#&gZqsm=8_fhAA62Yg_Rqnag@FkrW0|W^8ip#ngp^G
zBg4)^>TesoZY2i4(IFR0yR2Hg=4f;^KInUhhT<chM>K*+r^kp!5gD}XSOiboHq1Hw
zX!wI8&|b5tG$XY6C`P}>s749;B*wNe5&>y8S9vFmHPpOtOd6{dr`37%n#ltt*^!`i
z_@$F(m{w=5Ba`hCGDGV8%ATLx37v4E<c7YXZ(^DgGQL*I>7WF~>-k=@!4q;mAMvJf
zT1Gq~F^4}^EC<smPpoo?`q2LwK8UHF$v$8OtUl&fc|i&u#gr?t3L#4!j@r+K=GQ$g
zZ|g4az*ilp!qq-iY0_+|Si4I<yC)=lkzF)f^+Uf0y_LNL)qcrbip~_LCKb3MO<mXi
E1D!eay#N3J

diff --git a/footer.jim b/footer.jim
index 7e2204429f342fdb339bb8d22798842ea4459ebb..c908f9a1f31f2873c9a5e6383849680ca44491b8 100755
GIT binary patch
literal 1075
zcmah|OK1~O6g|z{B-5m|ewu=G-kY`*YsG@Uf*^=dV_J=EiArhdCMF|^woRF&wq5AT
zq7+vZT!=`7E?g*rqPUU4r9@Yu8-;>ea8Xonr7#8Wo5a?gS<N};-FweHFV76E?=aiC
zNjFwnbzI8li<aFphZoI&ZiJDsQ!_nP77be?Mn#M4aA~LE$MHn;#2MV?a|aD#bRou|
z4pElk$yjWFkq-kbofwHKpkd6=kc^$=Z$i!p;%qb?8#o_j?8mg~m>e8dCj*#gl!zyz
zBaDK$!{}rU>3FEL+PHc=H3I5nbzTUsl~@}X#yg%q)IXqHHsFJyBe6NM5ns7<B$h}F
z4zs=mzqoX`um8MSqX|I~LeZKn_N4RUd7I;CLPP{nD5i?jg*lGGp&;66FLjEFwwEK>
zy`k>&)DR8{mriZ4`#rYVW5+hw10E|q))szm<g6F|ts1Ic#a&VFX@x1v%CJEnmP7!P
z<I1AfB7jBlQFADSl33MTdMR||Ceuov<pYcC(xE!6_&^TrLPA?6pHwAf(q#+15ue%Z
zve3{q*2VqD5R!klO>;d6v|S$2+Nm#iM4RX8V_sF6E=te^=9X!Q8HGO!HLav_@zOcW
z>9okI|6*>!QfUI28Z*fbs}sIypk=x*J7m>qnI3RQm##`3h4K7MZC6_sT0!4<;F`4M
zLhCc}-RBU{%NFC*!TcxLOE=_EMqe7s^p=~PqlrM7o_p;|(vS4Gm9lv)b$Q!FC&%!U
z_Lyz|`9Y<S6j^cID{<)G&_8nMKV%q%Z2q4I<Ip~+ONkhdT3tGAhLO!>tj!0djBo0f
zS+BjonN&_)?5KG&($wP8f~ld9QvbW(a@2ex@0l(wnKu;I!Q@-rp~vQWgG;Z>dZe={
zJH=P8HoVr@?eF$Gv}TqXUAAA*)V3nH;;U$t?Jm7H2~$?l!fNxH=>xFN#6-%T^9Voc
Ru%(Uj%1)=RcuW93`~h&W4qpHO

literal 1073
zcmah|Pe>GT6#m?K`^Q~3(^QC=-%NT)BsVOO4uZ7lvWlCQe^|EcFzimP`DbN!P3_b{
zFCkqz6m$s>oeQc<hs{HfEqQ1$2vHD>E*aD%h=F>)*-g7OFfiZu{oZ@udvAV*|K+id
zMk}qU4^$tnXEJ#!8(PGR24GDMAeA-eLuD2<M>o`xvQcl-2i1)Wv2f1-R`}dkl^Bgh
z7*ydGOVQy-WRQ^yUX9R`2uq-#QByD+>E&-ii{{0}a5OSF8fNUqX^k@u55?t454st}
zqQl_?BQIi%dMn6>D^jbJt43P$$dl!Ie%z8`rC<QdT>Vo2pmbS-`<f52!;(Qf=FmhW
z78{DQegw}rG~U-gD%+^VYt4_mwU7@bGgFx?kE0eFY&n-V^K-dH9z}t?Xr^}B)=J7}
z9?9;3+To~v>}xjtK48x{Y=gr#ioco8I;`%nr-a)nx!?>xTtVek42fz-%gtI=iVeDO
zO?WUfB`sFW42UhIKz<~|o?=r*_%Jb(l==c67!V~EtFYq&73d^l$|k)MGNeca(L}d}
zP4|R?*6~)(K902mhe?hGf!0Nr(oB8cE@hcxe>yQmI<AApnA;?;-b511N(p|;llfl%
zh%>*hxX({aTXL3ws+aqjVSnWc`wD22M)Xgj?6XK?oYAI`?n7=WGhgYnO>b90`&@8U
zZ_|6!N%759AfS^iMyZAQhk7S<>D`Rp2a9xvlZ?=`r${%QbaCB{<dkJ*xh=W6ciOhL
zrTm~>{ltGB$SDLwvp6SYh}{3-$hUapPxJtC>C8XZr9d5!E7?#@)ut*Vfb>MlI=oKO
z_@Um+dgcDjn-g-ab;kL|w~aQ14Fx$<{&i3FIwPfDHf*|TEJ?0~$#q|WlE#-B-nvnZ
zWZKM{ym;B+jbNL*&0U~X<8IJq`z1wM7v3FLNm=2acF7>jT6qh54XcI=z;h<1&FrE>
TxKV{S2G1)!mz;DM4_x>II06xX

diff --git a/footer.jor b/footer.jor
index 06666b0..ebdc885 100755
--- a/footer.jor
+++ b/footer.jor
@@ -33,16 +33,16 @@ var textx
 var texty
 2 const textspeed
 
-: nltext 7 textx ! 10 texty +! ;
+: nltext 6 textx ! 10 texty +! ;
 : inctextx
   textx @ 1 + dup 38 <= if textx !
-  else drop nltext then ;
+  else drop nltext inctextx then ;
 
 key \ const '\'
 : statusc
   dup dup '\' = swap '\n' = or if drop nltext
   else dup '\r' = if drop
-  else textx @ texty @ <rot text-color @ textc inctextx then then ;
+  else inctextx textx @ texty @ <rot text-color @ textc then then ;
 
 var texttimer
 : textnextc ( s -- s )
@@ -59,7 +59,7 @@ var texttimer
   WHITE text-color !
   s"                                 " dup dup status0 status1 status2
   text-color !
-  7 textx !
+  6 textx !
   10 texty ! ;
 
 : show-footer 48 10 footer-y move-to ;
diff --git a/game.jim b/game.jim
index 805e31b65c77d8e069a972991885d7db8b440a31..9100a5bace1c99b8123fe7819e15f1ee0d400491 100755
GIT binary patch
literal 1868
zcmdT_-%lJ>6u!H2DzH0+Wm$F!5X*Mv&JW7?V2hZxp;~DWOQ8`&V|Z|32Uxq^X?JIV
zl{Ben8`2olhsM;G#-uUP2NSjFgT738QRAjYAgd1;lvHa>)evlIjHB_~nb`&Y1n1%2
zd%k<_Ip==ooI8ixX9Zh5S``tN_STRSgFVNz6N4ki$j!(TYDDmm=b!8wMr1B333Vi$
z%9(mbn=rE4%f?ua@F5FEgm>$0c)MXVd_Y*?EchkTAK37{vS)8aD#8nb4gWNd9p8xX
zrcf*Hfc}TV;{r#X89Ykfh|CHDVl~k-X39+IIno;16L?Xqae;!CFdec8k@!iGKnXq(
zJE4p31tYe?^}+&<Rk8DY2|f}#APU_e@k8)wZ4qvWLtx_knixeq3O1Y)d2%M5DCpTo
za%RHRF*}4TiVu09<M|sDF_(P<y%?E~{3KS9o@e_!*-!3cq;sx~a~RjMNa!;97O2`>
zgig9FZir0YPlp}(NV5$<>&jk}+0=9@GkK(P(uS_B-SI@`v@xx--Q%<bGxYnmA{6LX
zZSlAb&(TVlHzU`Sdg>>a$t`k@2FgSwbBw7@=!NUZ$=^*bL){)j2it78LW6{P&>XG{
zs7*Xw#_Ml1jx5DdzX*R&wlZRIupmT!_XlBxTk~50qyye-v0<@n$)y4<S>Pk=_V4ox
zbctF(JjsTjw3`@tQ!^&CF(aQzvf}UJnZ{Ebv(M%WoW!4O=zxBl_n~xwLuRCElGYPt
z!U(K49pXxGRbrt<y@N&gS|V`U+4&H6w&V94^b3h;pKM^`K91=#iLGrgq;f%MrjZ|?
zaw=e13KB=s#`MWl#);OfB~XvfgK`v#@Ru}%RpvVLk-L5ye#TgxGkTJxuLO_D7WhdK
z4&v-1HnhmQ%L>|QBkLr&1f!nTOE?qMIxJuETxaxIx9$gIb(e*8tnRX5tg@X>ILWp^
z*|z<ve32Y-@4<&I%a?pMyd#In_>?|=N^=wCU6T*}DHWV%T9fZbS7R*30okm*BeAj1
z8B?^LQ&74g*AX*Yz^JisD(POJ*Xfrsqoi4Bk!*NSapcz44o6!?SuHc8t;#l|+pCf8
zSC~;lS)w)^S9o$Zujloome!~Bw9~I=m7oiH7$2HfRxy{Xm>G+#Mj|R(tv7xUF2QFC
zs|g>u-Gnj6R=Eua{mw(b_0Sau-Sp6P5B=9ct5w&+Jr8y52b2-<=`ed%E@DJedOB@r
zGe$O@#Qd{o;Vy4OlUjofm((5d5O*K2Vf9DkoIOoFX!%V1^Tul!=M=`QsLbYEbY5BE
zSWBLF?(vpV-B^Tq)V1MJHAs@##LQL;vxeV#3f<=KhQ*i_w&8X3Kao$THFgC3FHojw
z!Bs5U1<IaI3r2DML)eY%SM`d@;#xyr3vI03t+2mAZMETJ^qbXlx>;d;6CQ477R_3>
nb}g6``vaSB0MT+E+Q|GJsXxH7!?$n!*DSb&H+z8pI~)E3qHNc0

literal 1754
zcmdT_-)mcC82*y;ZZ7G`(x&N2tJ0>)`4!f)ZrD;#XsE7~YG&D{4n`@Y$?2LIlbM{f
zjUrB=wS@`05OGDlkb+dVd1KwhF3wbjN^W!^;4FHv3k8*_yHW65_`c_yr0t(zE^@y2
z`F=dl_q^|W&TEOm_*mlG{k7O?%*T#T9UIq<Pdzuzw!+J5t%;l-n|ub5A>qeZkmYk_
zLoaA^#gcZeI9q0Xy9t5#Oos(0JG(-^#p;|1AB0o>KRrkL?zEyB1mhNb*2(t#0`c+q
zt@s}3e;E7`<Jgl^kF$&6!T3J$0MiRb&dBLy_HcWjzeDsnKvhc{wponHe6Pr$0q4bG
z7~v;Cjnugb7{mXY!Ueto^Wp#qFbXn%3N{Yb;GB30X7Kr_C?GC?1u>Cl=kw{RUOHSh
z(uR)NVQfj<?}9e-n;2p)C!d}`Wghmf_y9Y0a?*{x>|<2=vUA2OsB2BUF5X7&AH=&o
zHTYdz6F;=$U&X+K6#vs>!3{CkWX+ax3%SDCWNW7d_jYD8>B0-e1)XNSQUeZ4Z%1oz
zL|Tr1AGLs&S~9o7+sfCXmtA5v*^uOK8kH@RQ^PO;)9A^k-Ht<}u0wzIS@4w9#)v_)
zy{_VF=B_1QH>7@asUO$Z;3J7fYNQ`bXlM7lZBXZa@|pl_0MZXxu+%)su>wyr!NchG
zn|xAQl}uo6WWg6wfE6o-R-Dsji<Lr_ihqQs6;E(<K0TK?nfG-LKnkCSFk0r&8R-Da
z>*=Op4A#3J;~Fp}lQhBISc5lY1}pZ=S)AF8Z`kOoGOhM?(*Gfj)>A}d3uL)j5Sme}
zWajM(Sd&96Gp}c!*PP3_QzZI`U4Y-oSB1AC4wr}3AfO0Xkn3^-esL8z=m^gc`*#l(
z#l-p)x-{)0(=2#j4l<)u)$G)?3{6UBq%FAvZ~TaITe2XiG-Wy2+as$1vnYZtPt+@l
zLtU~7D5e@}!0RsYic37K>>}P(6KAB9Lc~{;RU}?jc=lpNujpAVuP^9%yKAl~Z4T&S
zSOCg4I!Yx)x1&s*P-(Q@H5Y0Cr#j+Rx|7m$WSiTx(H<AQ<f0dCbkIfDUG%z*j=SiF
zi#q4Wm4N68QFDKZistovzNjr0OZhAonbVvd96dLA3!YVdSpHevHX7%9?QC9F-@|Ou
zi((BKl>Q4{r%~@!)UK;^_K;vIb&eY3mVKYP@_D!hU*TE{7S%SEEu|NC8j9L)=f&i-
z;wZcnSqfS34f4-b@_CK6Ab(P#l_tEye)c9MdXbqhjpNH9N7>QD9hG#&69Oco)O<^!
z8=<?{et#oxNiXY0%l-S1NzjQi2g!2_bI>cM{P&@XXtOH_U6)gS%F>C%&R52SeF+mj
J!LN@6{{f)+r4#@F

diff --git a/game.jor b/game.jor
index 857b9a2..b3c38e3 100755
--- a/game.jor
+++ b/game.jor
@@ -70,19 +70,26 @@ defer player
 
 defer player-touch ( x y -- b )
 
+: touch-begin begin 2dup search >rot drop drop 1 - ;
+: touched? if 2 else 1 then ;
+: touched-more? if 2 else 0 then ;
+: touch-next ' touched-more? , ' yield , ; immediate
+: touch-last ' touched? , ' yield , ; immediate
+: ;touch [ ' touch-last , ' [ , ] ; immediate
+
 : check-player-touch ( x y -- b )
-  2dup entity-at dup if EVTOUCH entity>do drop drop 1 else drop
-  2dup player-touch if drop drop 1 else
-  2dup out-of-bounds if drop drop 1 else
-  player.canmove? if 0 else 1 then then then then ;
+  touch-begin entity-at dup if EVTOUCH entity>do 1 then
+  touch-next player-touch
+  touch-next out-of-bounds
+  touch-next player.canmove? not ;touch
 
 : try-move-player
   player entity-dst check-player-touch not if move-player then ;
 
-: check-entity-touch ( x y -- b )
-  2dup entity-at if drop drop 1 else
-  2dup out-of-bounds if 1 else
-  WALKABLE mapflag? if 0 else 1 then then then ;
+: check-entity-touch
+  touch-begin entity-at
+  touch-next out-of-bounds
+  touch-next WALKABLE mapflag? ;touch
 
 : try-move-entity ( e -- )
   dup entity-dst check-entity-touch not if move-entity then ;
@@ -100,7 +107,7 @@ player :tick
 
 ( S T U F F )
 : hello-world
-  player.state DRIVING f@ not player.state DRIVING f! ;
+  player.state DRIVING fnot! ;
 
 : mode-move
   entities each EVTICK entity>do more
diff --git a/game.prj b/game.prj
index ff5b3aedf2f23cf47e04247ea310029b7a965cb8..18d73f5b57ce93edbd5cbd0cbc3038cfb4e4be0e 100755
GIT binary patch
delta 26
icmX@2c|>!=3&F`kB4V5W31&009G{Wpw>eihoDl$(cnT)~

delta 27
dcmX@2c|>!=3qh9uK(P6ZU@aqrl`9<12msw`4?O??

diff --git a/input.jim b/input.jim
index 4a26a3ed62851f1b8586a58a6a7b57d03953b993..b0a17ebec20d74b72cc4a5a38c9357d778fb013d 100755
GIT binary patch
literal 372
zcmXw#Jxjwt9LAp{XVp@{+U6!jGB|cpP(g%JqZRuS+ElklUv8*<iD+UGx;Qv#Hy0Nd
z-NnH{5c&Z+iZ}?}>?d%NO8sBK?fKpF!rd(fe<LsaNOAR_D1&3>6S$5laP<H|#x`?=
z^Jwc6a1wSdMYMn`U4^qjav8T$ZjxNVgHHW;$|hLDqwMFcc)}!H$E&WvDOjYF=*g{=
zxh;cx_>jTe?oLu-8eh`f${u8hEPU%zXcenotR~J8ngzR?3v2Jp;Eh0!g*j(Krt$#%
zil}=<3ao|>$+oz`x@<Hu*g);8U8bO~_Lxnl19ixjco4@Y;;iI*p4-H86xio8@T%on
ztRhOT-z*E7x`+t=sSR0`_S4xy-jq*QaQTn&UsT-iX*68_R8-tnbKL4s=blfZT&F=%
S8Q=Pehc$x<{-$-bHu-;(k6pt6

literal 372
zcmXw#O-lkn9L67aCreSvbmmlsoxFIe=!FnOw~TyaRlL-O=|aA4*lrSZ?3mCe=o@s3
zx^(cK$LLbv(N7`Re}rz&Z=M%sX2bg)?1`o;%3nhahE`1CG2}v&y9sh7O($H#4qt$g
zEa@4db)>ig<B;SQbSdK`w{gy?pU9L5_HZTp#X=&f5$?m`DvWZ0bQ%wGE2ACB;3=MD
zP(L|NOU&X~nyGvxM^wNIUqZjyuwyOr4!#wz%4$IUW<R{+9<fg@*pz)x->I8zyGnsw
z-v!wo5n)3%n?=|}87o8P!dMwGKb=mLDI0Syu6yR~rDNMx7jGe8S@>Z$YOPq^ytJHd
z&7`S=U|9UBQ?@DG$mYvMO+MX)_&>^jQIHiLbS&q_tXuu=yfvWCnOH=vO@n5Ae(R<P
Os1X(xU+O@;C;ty#1z6tz

diff --git a/map.jim b/map.jim
index 53506782b85dcbf158e86da3132f497712ec5c85..cbb112ae28a8f1a65c29ea0698bad270aeaa1288 100755
GIT binary patch
literal 749
zcmYL{!D|yy5XL9FvnGvO4c)jN``!w<SP!L?fY3;y5<^=EDn{`T)?{0jZj+ErQ`Cb9
z9y};W{{R(FqNfP<T0D5MD5&J3upR<Eh%I{QX%%O-iSA?BH{bha-tWDg$>eY2qcu>b
z#iT$u*=qWrr=~DaGJ2p$3~^c{q2qdv?|4qF1FzEn7sL^88(rIT>vqREwQ9F0r)*S>
z5U-1ISZ%KP&U&-$)eovQjGq&yMTlK7cCg0fDC53}9}jVZwjBy(!^Ax$Pzpw%g!o(}
zppsvh&leWX!-I4T-jHzaV(H3IP~a04<kTh4UiOJB76TRdiP7L^AmXr?zk0b8RY(EK
z1Q0Fz&k#UH?}=UYmk5+y^`RPKT8_cG?XB21Jcrjm2q{CHA+_FiyCd~mq?V*kd)HR@
z^iJLFki8;4t51(Tp6KH}xrH&<QC>#TMid1K;1&X$Rr~l%nwXM6?+it+DB_ih_^LiK
zduAWs$*7j-iG8&po|tb*`yu(hvJo;Mdr^~!8ftgqAy(yKs5M(R8OL{)iDnkF`t;F^
zUZgAK3zeArH=Dw_Lm}?TB(xphy*2uU63YgsG2*<%N66teR;(Q1@o^Y(76FTBkz>tb
zZxR2<94UkGZM<fgcnM9E$gN;m3GnUisQ7K7UDV2k#7%9JzD)H+bF~oflF@70^<g8i
vaZY<rBdfD%N2?ladqK7(*Yk!phT$szfs!Y9UNDN(z5D72>iZC?K^^!P;l09q

literal 749
zcmYL{%WD%+6vj_x&e$YQL&(&jySaCuabdcW5<!|0AB14LQ8DdG#$?)#otlt|sSi+G
z2nxD&;Z8)*KcLyTsIFXut|a0EW+RkRsNklX4(K`4MCUThobP`3yTALe(mmse{ZrYs
zzE}vSTFn6TYym?huZN1n2zRYCbUfb;T;HvCU~>ZCkCg%MR@d>phSPDU*PRxPNg0zy
zggG$|>&@GNyU}d>jia=a#=G2aE5d1!I_l#%8Zjq6m=RV5#`$rCiNBOkIn0Ghgx5t9
zYUTM$<#Y2F;n_q2?vQZda`oC!P~a&Aa@Ml%tOP`sNPr6bB&hN8QjEbudGTsBPRPQ0
zN+4SH&(VB&eO2tMZ$+r=tIyR4`;@og_-oD$-{t<t;;V>okJLun>yFeHu?kYBx$A4Z
zdbi<q$et0O)uj`)+yKwYElj|U(uk{ST!jkY76P1C2e>3n{3L+h(^Pp>aZg74P^;!m
zbAXQ|XVt{2I8dj=qWOTd*OK?E7$XC+7d45fq4sbrLQ@`xdb4$xaRPURXlAge?`86O
zg|?J8RATAhUjb*2MfgUhq3s6Vz0na$Oc^|k5fz)4P{KZD>=NPeau{+30V`;eqhPbQ
zf}65L%Jz64v$ly>&_s!R6~4(N1WtDpexGO;w3H#Sr}gN|RNpmEi|~w{1i$Gth8KyA
vv)VSbqRyrrZPH+yL$+nl_lGuy;gtVC9|;KXFjt}5d!UY>UJaq9=qUdJ3cta~

diff --git a/pete.jim b/pete.jim
index 1bf0905367793a5afa59c178db614b8b41db5f53..e0772b5fa0d216a3e09ab3fcf83bedcccd6117cb 100755
GIT binary patch
literal 225
zcmcbqRiV64>pH_itu`%YhUCN|hOHu7wKS!e7#bKZFz^U4u<U1HWUyww%5qf;#JZ%y
zpt_Q0rPdem4pk8eF_u3pJOZCszH9Labf}i_d8-NnResc3sa3+apM`<p4^VfyiVxQ(
zmPBnHf$wUsC2G__YHFAnSgx{IYqKeQVzJcrEKx63D9O)PNJ}gN(hB8?IoTk(B)>dQ
zk713xpE}4i9)|ra><kS&Af3_L5Sya4tF)$RXaMCwHa%7Y*;JxkkXn+emz!9?uwCg7
F3jn?HLVy4O

literal 241
zcmb2s(pP?_`JCaI=4nl4hUCN|hOHvMG#^PaF*Gn-VBis8VA;>Y$Y9NUl|@Pm#OhSp
zuCkKno#t9`d)2ezVl01HcmzJN*l6(x*sI3zF{ugyRhntN(~RTW&%(g)2dG<4#fR$?
z%Qm12bDkv<#%drnH9%EuT6^U`vD9dJmZ%pil;r0tq$L&sX@&B{oNN$Xl3$*u$B--!
zvh_5}IxTaa{VY5T`&rl-8hEa<tkQzmwMc8f=4Ex58jzi8JYp;$ckO4Hr3SM3q*g&{
PNvd9MVgW;*(jOK8axF#D

diff --git a/pete.jor b/pete.jor
index 09e6907..e81e94b 100755
--- a/pete.jor
+++ b/pete.jor
@@ -12,15 +12,13 @@ car :touch
      player.driving? not if car yield then
      0 |; ' entities redefine
 
-  ( TODO: DSL for touch events? )
- :| 2dup S leaving? player.driving? not and if
-       pete say" It's too far to walk to town."	1 else
-     2dup 12 7 2= if
-       player.driving? not if
-	 petehous.jor queue-level
-       then 1
-     else 0 then then >rot drop drop
-  |; ' player-touch redefine
+ :| touch-begin S leaving? player.driving? not and dup if
+       pete say" It's too far to walk to town."	then
+    touch-next 12 7 2= dup if
+      player.driving? not if
+	petehous.jor queue-level
+      then then
+    touch-last |; ' player-touch redefine
   s" pete.map" load-map
 ; ' onload redefine
 
diff --git a/petehous.jim b/petehous.jim
index 60bfdc78fe3b9f0170347bd9773efa2efcd7a5ca..2b12a940f908ee1be6e00efde9732eb712c03a70 100755
GIT binary patch
literal 392
zcmYk2u}T9m7{^ci5Uqz45fmK!Q0$ev(iadPpdc<fc8Qm-mtZa_mz3%vPT~`E@9yq+
z;yXAx`37BFikQ0=+A-n(`|(Sr@x$3m{IoHR!)6$l&<sl03F5=o^Mj)qKqqYewidUI
z;5iK73%>m-^sDXVDvc-Y>&Wd@TnVsTT_#&NgNx)=5T?plawsh_<kB+hsOa{4$c>I1
zj+u7o402)$$I=OOg1LSnGvQF1aW{B7S@?I?{JQq5q!;DLR6&eCA}`2V;wzwf%;qxa
zvj#ruAS?BKWN|Q33e5nuFY>gsf~@cIMs2F3Q7WX)d=BL+=l+`WuXfIp8(~I@W9A=e
pO-`7bg7A*0@JFL7w(UP?4ki4wt{O8q?hMJ1hio@z!{GgN4*#T+ct8LE

literal 107
zcmaE+sjqxmGm+t$CXYa%=6)6dhW#v@43EX^RnLllV$sp!5rBwsF*NX8Wl_`G&%y&#
z!2wmVLi4iveilZC(=1v*83u+wEc;nzsrhhyVsX|gNG(at$S*C{%S|j`$W!{m0swU2
BAMOAE

diff --git a/petehous.jor b/petehous.jor
index 8069463..c9d4880 100755
--- a/petehous.jor
+++ b/petehous.jor
@@ -3,11 +3,19 @@
 :noname
   reset-level
   16 9 tile>world player entity.pos!
-  :| 16 10 2= if
-     12 8 tile>world player entity.pos!
-     pete.jor queue-level
-     1 else 0 then
-  |; ' player-touch redefine
+  :|
+touch-begin 16 10 2= dup if
+  12 8 tile>world player entity.pos!
+  pete.jor queue-level
+then touch-next 9 4 2= dup if
+  pete say" The closet is a disaster.\I don't want to deal with that\right now."
+then touch-next 11 4 2= dup if
+  pete say" I'm already dressed."
+then touch-next 16 3 2= dup if
+  pete say" The sink's full of nasty dishes.\I'm not touching them."
+then touch-next 18 3 2= dup if
+  pete say" Should get some more beer soon."
+then touch-last |; ' player-touch redefine
 
   s" petehous.map" load-map
 ; ' onload redefine
diff --git a/repl.jim b/repl.jim
new file mode 100755
index 0000000000000000000000000000000000000000..8d373a89da3ae77e7a5342e47055ec0f083cc27d
GIT binary patch
literal 331
zcmb2=dMUJD*pabYs6mK}p|~Wms6@9YwIGLqM_@n85}~Dne^~aj%x1}Fxy}5E<${o&
zm6d{*g1<tLLWqKgf`&p?YGR&3T7FSUhNgm*l^%lxYdw365C_*Mmit2a*<kKzmMcPk
hSk^J1f+a%#h3bV-#fBcQTZn}r$Th%+p-1GU5C9N)B?SNg

literal 0
HcmV?d00001

diff --git a/timer.jim b/timer.jim
index 2a2e84abf5fff52b5c547f4b9488d0ae187bb187..8986c679906036492b0a75ee5dad1288d70c9074 100755
GIT binary patch
literal 438
zcmX|-KTiTd5XA@Xfq%Hdgya%;P0UeHp`jr*<|-2!J6fW-z~;cfK~4gdpTWY|S@;2n
zm5qg=_d1M~36)an7g!Q!@4#%c`+M)r%+BHNs<@ETOjDeRJhgg$e^@1Z@5Da0J}?mu
zV%!PB3`B<9GI5fZ;V$1bnjG{Zf7BgtumBeU3$K>OJqxEBA!hKDI>SIE&Sh3(mU=d5
z!DudW)Kk$gVp9!o!o!O&{CmyAe_p{d`zU^e#!4W`u;do2P73$s4vnI25U5DCSs~Q$
zZW%rO-i37F;mevKLoqu1a?nUVr*SMn;b7t>1zmjd^jC75{Px%nTgqTs*CJH7hQ^KD
zqW)m4jz(q=X|J;F7BB6RtaE`12zAbsc#U&ew)^=Q&$7Wi)1&bqb9CKPYPfF7yX095
O=x`!?VEjMHj2eGu)@j@T

literal 438
zcmX|-KTiTd5XA@Xfq%HdU^wG$p{EHICN^keXt5wR#KOv4U~`gi2RRAaTk-+yY_+ha
zF@_ItoyG<dD}(VntckOCV7A%)y*F=Wc4vLOc`u(cCGoqRr&iYs`iEq19NP`+1Bb#v
zjD{dgKxD`%6DN5Y?($uuB=S^?yg{eOg$20SW#QG*IAh^tDZ~u?)EW9Jan7?Ex2b1|
zJ{gTfj=C!9M{KI%PSg+y!ygtr{O1+Svlrq?Xp9At8kVNTpHd3n#2O8vj_<2TwOJul
z@opJCU2jV|sNu_+AVV=+emQ6+%V~UbVA#8HlRy_Uo_=4hlGh%3VM`fIi!4HgGc=Cm
z3I)BPIvALLNPCs-Y4OsYi8=>VK&W%g9)IIVmhB)PBalt*nI4UEnWO8jQvF5K0?e!h
OTye#VH2%kAMvXs5C2a}-