From 96d2cd0c5750fa2f8e57c782c7081154e1efb080 Mon Sep 17 00:00:00 2001 From: Jeremy Penner Date: Mon, 17 Feb 2020 20:43:11 -0500 Subject: [PATCH] Add Rexx, various cleanup --- end.jim | Bin 60 -> 60 bytes entity.jim | Bin 1983 -> 1775 bytes entity.jor | 54 +++++++++++++++++++-------------------------------- footer.jim | Bin 1700 -> 1700 bytes game.jim | Bin 3546 -> 3568 bytes game.jor | 5 +++-- jiles.jim | Bin 1575 -> 1575 bytes jiles.jor | 2 +- job.jim | Bin 1149 -> 1149 bytes lev00002.jor | 2 +- lev00003.jim | Bin 1005 -> 1173 bytes lev00003.jor | 31 ++++++++++++++++++----------- lev00003.map | Bin 264 -> 264 bytes map.jim | Bin 925 -> 926 bytes map.jor | 1 + ntiles.gfx | Bin 8192 -> 8192 bytes sprite.gfx | Bin 10240 -> 10240 bytes state.jim | Bin 387 -> 277 bytes state.jor | 14 ++++--------- tiles.gfx | Bin 8192 -> 8192 bytes 20 files changed, 50 insertions(+), 59 deletions(-) diff --git a/end.jim b/end.jim index f5f1d3ba9f9110ce9cff0c9cc835b3ff78571bfe..e31b8c2ec64aa046c688a6ba0d65147812cbe73d 100755 GIT binary patch literal 60 zcmXqFczkUFqL-Ukz~HX$!phFz!phBHB0t^nu!0LK8<58X K>7l2|CtWr3@<*g4z_klg$H zp5OE5eg0gAK#TqL_+a{%wzWh#L1FZb@mwD6_qJMVi8hob#ztO25#U;)or$^ABPUQ6 z;L}70%BROeM1&n~{^H04>LvJ*^RuJAOyDlpPUK!jErt7usBqq{mduP(ELm`=Crb(Z zE_oz;x>S^-0#jxqL=G#uW~qKv?(T-MB~C_f^@YXXO|e zrIPJf6{qN2;2xV~i?Yu#nf6;=#VcPf7|bx|C>WVHSO7VxW3T zi3h4oZLV5$SPAc7m|ij@y7VQbBh;EUYCO^)lk|%6y?ip>Ah+ax!g%bNrynRy(!|u? zQlf&Ndd4qZgNRBm@yL_->(URESfDlBgIR>W0>hyyW zR>ZV*YaZ=((cdJEs~))?$ zO&mvn6+DgNNr3n9G>#_`JUqRQCkd{p6vlJevDZ){u&K5KwqvhKm(?X{lK!kVG5c1F zMR4&JYaIQPqXLBJRgT7!j0=diS}xt-n40tv0rK>4aAuyqz-UuV1 z$u@Zwdv;sh<`c2SC*pw2R_fzq49fPrrSH|c5pdbSJxF?(Bb%T+eTaE@XwQ1w1J6jy zID(4AwtbxpCtP|vNnyHbl-VF}Q~%@A$2823p*0+)SVueUj7Hj0NhOiiR9PR;2M!+S z={~GQfGq*;roUJs+>?%Jilj(`*yVAJuQVIUVgbD$>fWYVx~dI#yL6D8(Og;%7+41W zF7g>0oWX9uyu7D%Ldmvg>vMXTW&^j14KEAhAt}@6k>~IQ^a5T>MAQ#|Q^Rqwrj1Im z90YF=mH@ye+HVsR8>ghO$aD*(Mt7b@QcdzLdLBrz6n8Y1;%|6I^ir;uoZ|nwnR&!b zE^t%hZrD9`(9uw;9TulbMrC#hPW5eQt;JLn7H90Lsn?2*kHNdC&Jc5qipkJb4L(W5 z0`$C5;^qS>Dhlu!W4~=&uym|($QHk2Y>xhyEs1wiZLnz83*5n~M*e1U#j5kzHFVe& z?@S|9wH6lqz*J60d4nBGpR%X$`mFA8DB}=i=|Q+6eTg+(NS}tw5r%7lFg`{2NSaivVzC=7%m4q^C3K^WpE!A@|3Fob=O_&o1jTKhpla_{?l ze(&>p{=Jtypv9hUX{NslT~Cw}ZE*1IlZOZ1geP49*ApSy9z8X12=@V)PegEkYOsX_ z;ckK>a$w*j+9mi-@UsWKJ%gWw_2khv(8}SrL^N>Lt`rLy$10j|r8CPJ{3SJ5>*?|* zNFifJ@O;W6pF&TUZiYa~S$@B^vNT&v>P) zvnQBSgT)of?2;1m&3$NA(dj&!K}HYSd(i&5(&0<$Sih=cU`SM_Z3bt;Zp)k?k z5N|3Cb}O9YF*VBr@DP36Z>R3pu_1>eSw1Z-@nYEJzbKbrzhl?(V|et-#AC(fJ?acX zR(>3jn*!ObUWENd-a+680lcPu2rsWT@m4s?snLH2vmAt0gHg;U)Bv2uaRive)j?bZ z-~z4&aTSD*adiS$5?og~3?9uMK8`yEpQ$0hcC1$EygDrn@gLPWjK0|<1sAipEYRNt z8h{phO`uJI0;0{P%Wnv5W0E*jiyYtPugTLQs$s!1-T>5517HUA4kW2<*VG)J6zm#e zClI?KkTu>YV&~Vf&L%I5{TC{hGT8zHR&khu5RhV#5Z@3Dw{7X(^vu@HT^pZ&Zd*?(sU*^x zD!;IO$BX(deb+WE40I{*u6h?O2#=&*O_3C-AG@B@#1*FzweqO8sbiUE`K-3D!{z<# zUCrgT&%m;Xcaz6h5DdzQynLcP+0#6K}d^irx7 z9qWJHSnJ#z^WD^h8_MH8I@+5G!PIckD34FWTipvHG^J9ip z@qqTHq%CN}rf|8Sbwtxh8nY`^|5Rrp-3C)7qcZ7fO8sfnq`m%MO(wmP4#U*@rco}7 zle1de>2$n>tmB5-EE1U*vpwp9_Ur{ZJW{a=qrPnKrzAUU8-7i8&XX+dbqd&vC484i zg<4*uKC49@kYA%{nI$j7zMqLuHfzF54QtaL|05k0tile 4 >> swap 4 >> swap ; userword : tile>world 4 << swap 4 << swap ; userword @@ -79,16 +80,12 @@ var entity-defstate : frame ( s n e w ) b, b, b, b, ; array frames -( 0: car ) 3 1 0 2 frame -( 1: gord stand ) 5 7 9 11 frame -( 2: gord walk ) 6 8 10 12 frame -( 3: mary stand ) 17 20 22 24 frame -( 4: mary walk ) 19 21 23 25 frame -( 5: car lights ) 29 27 26 28 frame -( 6: jeanne stand ) 30 32 34 36 frame -( 7: jeanne walk ) 31 33 35 37 frame -( 8: boat w/ pete ) 42 41 40 39 frame -( 9: duck ) 44 45 44 45 frame +( 0: gord stand ) 5 7 9 11 frame +( 1: gord walk ) 6 8 10 12 frame +( 2: jaye stand ) 30 32 34 36 frame +( 3: jaye walk ) 31 33 35 37 frame +( 4: duck ) 44 45 44 45 frame +( 5: rexx stand ) 15 16 17 18 frame : sprindex ( dir frame ) 2 << frames + + b@ ; : defstatic ( frame -- ) create b, does> b@ sprindex ; @@ -107,26 +104,15 @@ array frames -1 defsingle {blank} 0 defsingle {gord-sit} -5 defstatic {car-lit} -1 defstatic {gord-stand} -1 2 2 5 defanim {gord-walk} -13 defsingle {pete-table} -14 defsingle {chair} -15 defsingle {pete-bed} -16 defsingle {horse} -3 defstatic {mary} -3 4 2 5 defanim {mary-walk} -6 defstatic {jeanne} -6 7 2 5 defanim {jeanne-walk} -18 defsingle {phone} -38 defsingle {fridge} -43 defsingle {boat} -8 defstatic {boat-pete} -9 defstatic {duck} -46 defsingle {aliem} +0 defstatic {gord-stand} +0 1 2 5 defanim {gord-walk} +2 defstatic {jaye-stand} +2 3 2 5 defanim {jaye-walk} +4 defstatic {duck} 13 14 2 5 defmulti {neut} +5 defstatic {rexx} : sprite-bob ( x y sprindex -- x y sprindex ) - dup 13 >= over 14 <= and if + dup 13 >= over 18 <= and if >rot 2dup + ticks + 40 % 20 < if 1 + then Pb?ow82!yddQw{1$yEy=B2 zGX`FD7Anj#aL9^?Y~A)&wjvgU%~G%rql!;s?oEX~6;uQrgVpoho3!)E!2NE{?|kRq z@0@e{p*#ApyNjQs5njs< z9(x1+N&u{;8A)Rq5(2PJs-e+LW`v|B_>NS^CI-16zz=BwMl(A7XK+6qf;R_;G9xDk zNk(|UJ&v9j=Qo4!H%Zx{(ZLClLVzNIUYEk~3`yB~xCk5;gZ!o+uNiu|vK}xB10n-s zc!X#96lBFPWDi2Nzyz62WU|>46An~o`Nl@!9kt^)L4z(kH%V9)bCU2ec3i(a2NA&nyj}g~DN?9FEENi7lR~ zf#c-S#a=lK)sj75uT_(qx@xSKu3nKf`Pr@(sZY=mV2#W-S%DI{B(JfT7!jP#+4{c7Yo+GlJY7J^nIkSZ}mJ)C}o>c9v}L+(?vrO0`+N; zZptZTQhr-;aYp$F2z`z&?nHE~DA!{yzOO`phR3d2Q&t(ijCV&rQ$kSmA+HbDNX|bY zf1|`8Z_kyT12euF0GE|b;`|?FnJw2x>D9P_zbHFwOX2lyQ>ZD6n>9wYVWX>8iMMqn z!Ol^4UR3?|zTUz;891OWv$Z())voT4A5dE$ZCOPH^$KN(nafmEzPi zr-onH@-78H7S7SNX>wC2R%c7*!hT9O<(x`$ug>EQ^(CS@NKYHAif0J@iO_9zfDo~c z#wf8#*~L%Q2$aqD_Py{#j)dOo{34N4Z}GX;d_r{G+gn#eHbt5KS|@h%UZ1~GA5fz2Xfbt#nCowH@fD4? z*Q}Vd=zN~rS~qY5b-bV*ZFRB667;c4vU{PFkYK+jTy!)RC|h$5WZN%j%>ZzPfEjba z@_+~k@HGKbcBS9}0w8>^VW4c=W&ZVPtjeDn-xO~f_&$W;Htj>)J3G8HMW>7Z0@#75 A^Z)<= literal 1700 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 literal 3546 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 UkD=@jI9}D_{2J~&3OhRc5A}@=D*ylh diff --git a/game.jor b/game.jor index fa31139..d77043c 100755 --- a/game.jor +++ b/game.jor @@ -37,7 +37,7 @@ var player.prevdir : {jaye} isjaye? player.state MOVING f@ and - if {jeanne-walk} else {jeanne} then ; + if {jaye-walk} else {jaye-stand} then ; : player.canmove? ( x y -- ) player.state NOCLIP f@ not if @@ -116,7 +116,7 @@ var q-level : player-tick ^SPACE key-pressed player.state HASNEUT f@ and if player.state ISNEUT fnot! - isneut? if night else day then + isneut? if prog-view else human-view then then 0 ^LEFT key-down if drop 1 W player entity.dir ! then ^RIGHT key-down if drop 1 E player entity.dir ! then @@ -289,6 +289,7 @@ does> @ objects ! ; and sets the listener of the entity on the stack to the new func ) : chain-listener ( entity xp -- ) swap dup @ , ! ; immediate +: cancel-ev ( ev -- EVNOP ) drop EVNOP ; :noname reset-level diff --git a/jiles.jim b/jiles.jim index 5759fd824bddb1fc4d4fbf2f2704e691e6b8fe21..33f429e1b5c1f7277df09928a302d2f96398faf3 100755 GIT binary patch literal 1575 zcmc&!?{8CO6h7;H-)&H`6`{S@t#OmgM5OHA``%k?V$28?#2=%A5^M~*taqc>wasmz zqftT?5`~a7@#EYV{V=~E@dv^ZG-*hj8TbvqNX!z6#Q4SVV_VcjJm=hQ!N0&Jz4v*Z z_nhaR_q^v`3pNM;+;lS0(|*o4X|zLrw3sh?5Q}ufIi%hS4Z&q22<4KOtGKyB)}6!< zfU8Cqc9r8rDPl2F=C=FmryTx?$MlEz# z$n&Bmnj$RT(K7NIvmw&*irEw~5iozi!ap)Q;R%296nw+T=wGkDVT8p8GGNx_oVgCN z-bgiG8p*qrip!e@NXhl!`)1MgaqB!jAtm zwTKs6MGRUSV4`@W?2ZHUr*Np!L*WEb>gtTX@&twpN#4S>1kCsaU2QykW*Q zYf8|+E`PT={q@OXv~VW!50_b&YgMq7n45I-{#oeiIV_&K_JV2(T|K4y=dc-L$Hyke za(TBfGO^NUzY!-?RlcqKL)wNxSlzs$+4GlY)fa>PMn=wH*e9w`L5p%L>;g&`)Pu@A zD)XvT^eWy+uEJq;xkq)uVM>b^^VxVMH~JP2@wNZRGzKi+Q~@}cfqUVt@E5@Y2;(4a zg!>Ra0wIF0AlwK&1a~6rhsOx+MYsV>f;$jygQp4ZM>q((YzYU`?Ai95x9d6nm_g?AE$S>_nI6_K&&a7$A zF{6z4TN%l=3C>vKoQX_{22b&AttR~ZMa-Wu({kBv2;ZZ_nPX**(+~%Gro$PjJ1Kep z{&jPl*#NROxNf%DwB|T;>g2JG`LoQ)L1*qdRr#8;Z~Ok;!@K%mTE3xbVp z_4k}vo&5T6v^5ygt|9|;-@&UNI`mT1?3fs4KI7Evupmur3Yc-$E^^F9p` zk>u8&^}G5{k+Z#Zd3^QYc%Dv&?x1l-zMGKx5WhALW24CCCHyu3Y|-hkQgXP(md!;x yHfViypG-)93h=e_i}(%;v!c1+l8Ry00HOs(J6TT$Q}V1$dOG-PWHCZtxPJkq-G=x8 literal 1575 zcmc&!-)kII6h6t^lccURN!#6t?S^g%L8xxiy>n+aA~dNEX`?i*c5T8wRO9X>-MZNw zX18t5u`q7Y9q8l<2iRWA^(Aa?0nyM z&pG$I=bjk}eUW=TtLX!6w^QGw+MtxLlqv!A#ya6P(O`>q!M#)js(w(cdBt+Uo23wd z4!IiwZz}Mr=aOa5D|iJh$7TDL4A;6`Y=HsUD;j8#?g!p$MX#>o;D7ylRY$ej6UcaMyUt2iVZD6EH}5KPvS z{$$Ck)jWM@02jLeMhKUz%XaE-!#RplC$s5ZmykaS1wRNC!2CHs}2 z7EBgvI;??jsoij%(~^}^Az3TtU)4jr%ibyT7-%_Rx5C*R+>JgCX@(O7lkgP7(*zH~ zDTY~s`(T3M2*E>;XZQlay-;TOG{GY<$M6in0eI6!IGdS%(I++v?}W@P6MG((?RJ`I zf36zjwTF-FhnkMHTkg7xm*BFoL<7XnFQ~&0?CbHb<2n4x-bh7-uRhl7fi38Ee8m}8 zni+#FGdg3$S%@u(MLosq#=HpgrL&P*lNnUbq6llaj*zU3kTP*#Ihw<)7QV zE5ur$+d5|RTHx@lbB$5WU)P)~WHrC;)bU;C^zk#JVeo3$X=!8Y#Aefn-XjYjQQw^wQ?;NOItC zVwZxD$s&h{lY>Jh!9j$$*ukzYin!T9I*N*j-}f$QZ)o5icmMBu@BO~-`)7enXMU$h zW}EJ(AEhUVVRe*yjdjI#jHY8&$n(UN_BBV#cW})rkkKX20o}@l&!={0L2?8ijgWTl_QUl#F?E6a7wXB+T7s5G4Ncd3F zqaN+kid161c#o!dpW;nPnwKAdcEr07eFKj-k!K&_>i~{@$tUqPaq7Bjca)8~5uQ6j z0(vOPJbgND)wZ;sX`fw#^XfI*F)d}I(G>m^1KraePWkL+YAyLC z?TLc0djWOE7h+3Vo;}rk*3rg@Fgb3+;la*1*`trO0EV98GZK2{wKgbiqiLD~e2{v& zYp(0VaV+XG#{&A`0PJgtE$ZEfqlPYufr>8rti_3GZM&u`t^t@IDmKH>J-RYBbp5=* z%Coi}jx(pniPP+$n-NYFk8X}S`4E`;bV^LO#J=hw6*d#!c0}V(oW7hq03NKaC;n@_ wW4}Kcka{{J!aQ(WQQy^lcBG#T6{S^kszOHSXB>m!d_QP-8Llz0O0fFuKV3{KZU6uP literal 1149 zcmZvbL1@!Z7{}k1_vq%>)@@cMGMMN}{v{y)Vs{!vc9U|L=S6{l4$}H${r+qv?fo zlQQ0$A1AuGDL-zMWXslDwoxW;;#Wo(pCEd@E_6#?Ypie74coxT3?Cv(_iyJ5nZjK% zbAgcgKqzGL%Xt(CKKD4qyoeM82zkh3B9zS(GG|0xIIo06wKCa``!vf2$TjJ2Y*zBv zYuE}*W!=^x=F%7ZJx@@N?ZKwLei;Hno&kBE$4L!zTeqIbEypx#<|7Da86m+-Nte2` zN6S)?-Bh}CmG`K)DM53wXP_mO9f*E`*B#HXVffmIWB)*R!c$9*wJBHXdT{Ol@#&$I z02EEf(gVZ+Kpl=?{sv5!<^k?N z*#a=1rUu3DDCh?S_2~{^yzFB*<_So$vw_{~D9dAc$*0wR7Y~(*0L3vK3wT42HdEB? z__30gzQPRNDju6sCxgtkUbCajZC1k6FmXX0Ck+$*bz-An06y&~SH}vfON;Csthv}? zLX0}lb8J^V;wzAmg#n9dchwu*V-+~BUbAe&lq-!E`V$9wpguqEu{+Zb5*N9P1&QwY z)E-L>x@wO7R6X`d9VKXTu}xS4cFx6I`d#&5=&O8I5}x@NmR4yQ27>of&vwmIEgVNv z%W_db4;&!+T4YUaC*r8kMYli|E}GUxh+#Gz!@+9+<~laxqvq13(a`l(#LBTfEf}W< zyX@AcaI=8J;)R=|PM%A5!5Awz-6Fe`4ydr1z_*2sKXv+IVjp-!bzS_gbx-{Mqfh!- qV+73ux4qK7X&y_a&jpIyuGv+T1@td2g28;LCax9hAg&Uu9{Uf-OD#tL diff --git a/lev00002.jor b/lev00002.jor index 0c1f1db..8b166f4 100755 --- a/lev00002.jor +++ b/lev00002.jor @@ -13,7 +13,7 @@ objects: O 2 6 door d9 4 2 door d10 -end.jor 7 0 exitdoor dx +lev00003.jor 7 0 exitdoor dx ' dx 6 0 scanner sx defer c10 ' c10 5 1 computer cx diff --git a/lev00003.jim b/lev00003.jim index a7e8a9b2c6ac9b816c10e3a728957190f01f1cb2..3be38adebbdc941e846a226a2da93733df02dc9c 100755 GIT binary patch literal 1173 zcmYjQO>7%g5PprlM50A82ZDM?7%5Z{;JQwz#DOTu*8A|TvO90HKed8ZP}g2!H;y;5 z*Kq(*Nn>;rm4(SnM0{`Oh;z`&QJK_wU z#R5)z&R}AJOj+nfHH}^j7wyFIN4Vk&hPaJQ z%!&7jG&8+qGg1~e#1?*tpWt;$Y3>p5{ixn5$sRdh;2pe0K%arnMj0*vxA89ifZt+X zRFhtlpu_xEuX33y;#UfK@gDOJ^RJ)F382~!aZ-HHX*agwo;WCM;oq}eFtjN#oZZ)+ z;*{7VmGkXx+Dn>)M$CeOcpv3|oV}iVUO&pssh9G8?kM-JHs=}IDKV#J^7q~tYOyjy zM@Miy=}WB0$dG}o1kw<_*Z#rmVcwT&88W8s`<5T*#0ATbJh>iP-iXe$pNM9?GiF-; zST=}UTk5_9D&i_+?Q7*@_4}0eNYz^P6w+2)DwPQ3SkATj&`-AGq#HxK%OIq2Z@b;C zcUH!nS@+o0f3*nuyv$zSCa~&B8CY2Li)C~(weNita*)9cGnp$%=QkmjdXOmZ&4uUSFGj4nyjLW40L zNoEMw%|UAgRIA7{>(TJ~P>=es`!Gl zWbbPSg*)=8Gt^eRgTez`Ej*^5D(q{9c6Y@+J=89Hop`rQpEpa}^&L^YU}%%V&`yhs VuiVmqrq}B^I-Q}@Jv!}c{{n<^MwpMaMN zM5p&+Ju#;a#a);P+Tu{WgWpmO2hc7|1$&7uKK3>Omljlc0Df^UZYgA`RLGhnYukqH zWX+p8G3B za~pM+RO(zL9k*4h)XUYylb&}YSHmV2)otB$nDiyhy*@KBM|IsX%$%L@)A=z3eB_md z$+LbYspvfw;x~9E?mJslh_l4@v6}$yK?{l diff --git a/lev00003.jor b/lev00003.jor index ec89ddb..ef6e3a3 100755 --- a/lev00003.jor +++ b/lev00003.jor @@ -3,10 +3,18 @@ objects: O 9 9 door d1 +7 5 door d2 ' d1 7 7 switch b1 -' unconnected 5 7 computer c1 +' d2 0 3 switch b2 + +defer c2 ' c2 5 7 computer c1 +' c1 8 3 computer _c2 ' _c2 ' c2 redefine + +end.jor 0 4 exitdoor dx +' dx 0 5 scanner sx 6 7 N ' {gord-sit} defentity Gord +5 2 S ' {rexx} defentity Rexx : flicker c1 EVTOG entity>do 15 sleep ; @@ -18,38 +26,39 @@ c1 :noname flicker flicker flicker flicker neut say" > HUMAN ASSISTANCE IS\REQUIRED" neut say" > IF HUMAN IS PRESENT\PLEASE RESPOND" - day + human-view flicker flicker flicker flicker gord say" What the..." gord say" Is someone in the terminal?" gord say" > HUMAN IS PRESENT" - night + prog-view neut say" > GREETINGS, HUMAN" neut say" > THIS IS NEUT v0.71.4rc12" neut say" > PLEASE STATE NAME AND\STATUS" - day + human-view gord say" > THIS IS GORD" gord say" v1, I guess." gord say" > LEG IS PINNED UNDER DESK\UNABLE TO MOVE" - night + prog-view neut say" > CAN YOU REACH THE SWITCH\BEHIND YOU?" - day + human-view gord say" Huh? Oh, there is a\switch there on the wall." gord say" Never thought about what\it connected to." - b1 EVACT entity>do 15 sleep + 5 sleep b1 EVACT entity>do 15 sleep gord say" > I TURNED IT ON" - night + prog-view neut say" > MY PROGRAMMER THANKS\YOU, GORD" neut say" > WE WILL ASSIST YOU SOON" - day + human-view gord say" > AWAITING YOUR HELP, NEUT" - night + prog-view + cancel-ev then chain-listener ; :noname reset-level O - :| Gord yield done |; ' entities redefine + :| Gord yield Rexx yield done |; ' entities redefine s" lev00003.map" load-map 7 11 tile>world pjaye entity.pos! diff --git a/lev00003.map b/lev00003.map index 35b9a542df286959d89162f51c5d5fe85763fbf8..3fbba415d4de756682baa19ee15d1c03fb24a3b7 100755 GIT binary patch delta 73 wcmeBR>R_5+XfMvp#0&$x3=G^5HWLd>jERAf6DkH1VrF7s5P@(wCl<^A0JiT0nE(I) delta 73 kcmeBR>R_5+XwS^d#0&$x3=B{XLX3%l5sMgH-Nb?!0In7UTL1t6 diff --git a/map.jim b/map.jim index b2645e178121df7d16150da47f29dda8285d8363..010b830ac6e59b7a9850639c26540b8f05fb5dde 100755 GIT binary patch literal 926 zcmYjPO-vI(6rSzAS<26-CFx=!jYXruIJ+e#Mq)w~0tYJ+K!{3B$cAoVb!!P*AQUcZ z!U4H79<5$X^hO$QB%B(q8c)i_iw5J#n-}86_ogklo6NrV=9}+*^S!;sF185*~hI`<|%!>?GwTw}fZ1(n@USyCV7j9rg? zmx)-9Ou*aj{q7n5$f8qEQQ9kwbgsKPrD@`T;S3b|b1 z78^f72^%p+?I-Lqw!UxEByGD@3l_Xw6Ls0%gukL!uVSNkBTkEqm^CXfU{kG6AF$IZ z|0S9giZWsux%cdv!jLB?5nb~C>*=W~_=23O8}i$ZqZ(qTb(|kz-m7w2n-=V&ZnA*h zei`y%POVnvPjZDAb#R- delta 662 zcmX|6F=$gk7`~VL&m=X6?T{C-34O#`Gvw|))GjWP*h-Vs(xGC>LrQ61Z1BYtlTrwk z@`es=m&7-QI*3)e7>f=aT!M>>RCI7~krHrmDOgZM@b1OP!ExVr-}nFD_t?MV*Dj&+ zr+=L_j0QeRK2P?cYSFeTmTfImQA|bXsG*&^a+0K|R9>lAtK|pw;&Qoyw)(eKs$L&* zNIwg9|D;jyafSt(WR3fg;WP`N+o{Q1Dm^)leuNcd3Sw&f*33V`hiul^yRiO{`O(eP z>`ca!spzSYmFAZV_Wa#zVq}))m=4=a!#W&dhrDJX5p&@l6B=u=SQV1vWEdiYJK;R} z$;OC+5;*RmQ(Phqj}e4M2VSz+z;QALPoi(5d6MALb(Q5tSQ-LsKl)jaH@GZddK;y* z37ce-Oa&bB$*n4veG}Z>QwBr3-rNJ2Ci~p|ps4GIyagt0!z@35Hq_2clUKYB@1ZUx ztf>xJ;~*=oimWBI4i5R!C6+v5mpbG-??dH6p<-2KFG1HprryALqUm+9DXwdx{2v}v zDoe#ePj$jK;5W@Aa7%3Jcp!nZ)TDE26GFP=3>?z49{xsqjC`4NMGW84+nz?lO_99g zzVJmRKI$#7=`+B7lga>Z^bVK*-Fuq66FA{vdG{JW5;0|Cc>>HK!@5iHMdhnIibs4w a!@Yxt;zgqcHJDS|pyBj?XU6C{rRy)VKec%P diff --git a/map.jor b/map.jor index b966f89..f9d2917 100755 --- a/map.jor +++ b/map.jor @@ -32,6 +32,7 @@ array tileflags ( scanner-off ) NEUTABLE b, ( scanner-on ) NEUTABLE b, ( cracked-wall ) 0 b, +( rexx-pod ) NEUTABLE b, here tileflags - 1 - const MAXTILE diff --git a/ntiles.gfx b/ntiles.gfx index 9af306ba7788a4c68973c44ae0499b08f567c159..9bc9ffe9948d89227437641fe58a7487ae3d51d5 100755 GIT binary patch delta 201 zcmZp0XmHrT#%;v_1?&&lA3&K54U7l~6T_6BsHiYGftw}9feECBv4Q;o^8w}q><<_l zfLsO#rUT3m*nh}(2%Zo=A$eu z|8cO{fe9pbfcXLYL`IREKmR}ce*lCB{~!Jj0tfyx{A2jT@I(GXJxKV#pMxI`K4^Z> de6aa&Gd6jk#)JQxp^$+7iHxF~MR{He0|3bMa?1b! diff --git a/sprite.gfx b/sprite.gfx index d9ff815e8bf9bf026296992003318d11ce982823..941746019760fdde5c18f6530f6dd98187d9003d 100755 GIT binary patch delta 675 zcmbtQF-in66ip0EWDBRZG2TFA4-oJK+gUEycz`V|EE3q(1z~$vu$Wrr0F&+4^#&#u zV`1SADD2>5X3S3(MMf9FJbv+c|Nr;$WMB3#ZziNWO^)#1wrCnwMEU(|loN#|0J+z> zj&fEs4MM;#SAfy1O0zhNU(TM7v-mrI@V1$6?=M&WzHnlO<`Ka1S^ygN-UoSPC|C&w zVcpR?ejADefUmNKlwm1BOpyUFxw;e8-jJg^w5p z_`{C_pM3j3s)GPRk_E*JR&$pkp9g&|SxAu9#EvRr>4He2T+N9EPzW0mpmkXRP8a2E xsa@Sc2LoUHx!ugS_sc5mBUE6oM~Xu$EO*sg_Zq!j=F delta 1190 zcmb_bK~CH-6ip^b8Ff%CB!pTPI9;{7S#}vXL0Pcqj=705aDV~j0HAi!1Iz)EibdIF ziCEcHT7tyFZq>>oO@#TjCyCn*BNok9EGPfJpO^Qall^4> zugcP`-cIDcw^^m|42h5hEXac-J?KU2g0Oh>!ZX)&*N^%{(lD2vb-;;Y%$D41OSc}%8hJGtg#d*OgtT5HF{QTtu#OiJvN9X6GJ;HV0E>77MZ^u*8H-a(K!QLqh;Dv^MpjLr6O(gN6N}(7 z3_x>1GL8mZj2Wf5iFvwZnW^PKP35dr1|^v}sl|HfX%!6X#4L0+>H7l}Mgxr~D9TSq Os9S81hpx~Rs1N`?>Pj#G literal 387 zcmXqFQ0D$Aan!J!vDm=CfQQk`)zQz-RoBtaJt&glizov_u>lvOvqz}2x30UtpDR#^ zk)Z>q4kF~{@8jbi4isc!m>ug}5@KigXTZvkmXnxX%pfbqAZW+| z;gsa3F?0!3vAD2uFjz248!9l*2D2TQU04|zX0yCtZe*1+WQQnDQv|BjHdNtjWc4;= zWdxb#02c8Eio_eTGZv?ofCPbJ5Z&R1jjV-+oQ%misfk5!83v%aAel}>X2z7nN}%d; t*4>6BnK`M&dg*Bu4C}-=bblF42dY>Mv?VVyJ);Dy=7C`zx}sX3A^jNFC*R$Db@jn!{tqDd9|-Wvvp;}91`GfZ|0Dlr szJ-jXjQt<`KkN_8-wQ03vrv?EnA( delta 127 zcmZp0XmHrj#66K&DCf`r5C0zk;lclh|AWAR{|x^a{xJNI|4