From 41fefa5885de3f89b1138abc2cdfe5c3053e3066 Mon Sep 17 00:00:00 2001 From: Jeremy Penner Date: Thu, 14 Mar 2019 22:18:20 -0400 Subject: [PATCH] Flesh out the town --- game.jim | Bin 1925 -> 1925 bytes map.jim | Bin 746 -> 748 bytes map.jor | 2 ++ pete.jim | Bin 297 -> 456 bytes pete.jor | 44 ++++++++++++++++++++++++++------------------ petehous.jim | Bin 372 -> 376 bytes petehous.jor | 2 +- road.jim | Bin 245 -> 484 bytes road.jor | 10 +++++++++- road.map | Bin 2504 -> 2504 bytes tiles.tif | Bin 4078 -> 4078 bytes 11 files changed, 38 insertions(+), 20 deletions(-) diff --git a/game.jim b/game.jim index 846c6cf71e8141b962204f4225a8c0553edbb35d..3a6b8b06705e7eb26428a7df6aea500c6186764b 100755 GIT binary patch literal 1925 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 VEL(@-n}3KVY~W2d@Q>1h{{Vu#>DT}O diff --git a/map.jim b/map.jim index 71c915f8b0dfcc99685db60d157faafa6e821a72..461060d515bbadbc7d76a8cf556b20e766079459 100755 GIT binary patch delta 291 zcmaFG`i7NVp6jph1*Jz5*{=&TFg#XZXYh552=VlBW#|zRW?-NAUQSnBk&~f3F(*4Q zDJRvQfk)t+f{NlF7Biq|N>OGRO!Pij)Mv64qfBVK;(iuJhG$HxMdt}!Wtj@*-D6^4 z+0Vkj;LLoLWvQYVi?AXC5E}z|TY)@~Ot`{r<_TgO#jdiPRSZ|S%)CHhqrx}lJcapU zM}cCmC$DCdWK5cTl+l>+?c|?~GTdHDAY1HMPP2qfR$vlWEKxFLG3Rk-`KxHh;?DAz z_cTj{k{C-cix`U{OT6$O7RAXCOd5<0lN*`T7*|eS!K9$Xscg!^z~UtA&T^0G8#7GT LOQ^0qg+D9+(a=$9 delta 307 zcmaFE`ihlZp6jphIi&{^*{=&eR$yoFb&Lq{^l@eA5fNlyo%m5sS5%Rcp*%4sJ25FI z)t-Sz;GBYz;vW_hplC`_W*JQMK3LRivJIn5XshCW7Dk3=Oshrb30-BG4CdWqVqn?N z!oc9ne3fOfq8N*yA_EW`19_W)JdjMd!foaWVjIP-vYb{7SGdf)Kw+c8H|9Kr`C>{w2-gechoO#s;lGRKsKfyJFg321VWk|~Qh zk2}k6MLVF#W8Tv&VM<~w!7O4diY)QMe^}%vM=@zI)=h3^Qe#{`c@>j_61y@;x0A3t T%RQ!V%rITgp}O)E{;&W5MQv2# diff --git a/map.jor b/map.jor index b92e0f5..fb8c1e4 100755 --- a/map.jor +++ b/map.jor @@ -30,6 +30,8 @@ array tileflags ( countertop ) 0 b, ( sink ) 0 b, ( house ) 0 b, +( fence ) 0 b, +( storefront ) 0 b, here tileflags - 1 - const MAXTILE diff --git a/pete.jim b/pete.jim index e2d70abbe567ca2c1d17d3cbd276d1ca20b0a717..9545ee194cdd5196481e1c336815f36d16edcaef 100755 GIT binary patch literal 456 zcmX|-ze~eF6vto9`J*M46hw=N9@?~;3z-GMQD{-|59ku?)t0uokc5V!Lvg7fPA=|( zAUFwjw3CY>v_mI1S38yBRM5L7I=wsI_w#+<_b~A{2HJCEp!GBfj!g%i7JzImPeBv9 zAS-}6C;~fDAFYs<+EvA`m-8qT(wO`niuaNfH5bFsr}dx zUF)*)o&HLmrUCWQ4GEMNWCjn>Imvn%7kiB1qUrF8eY08-)nmS8z{A=bCxXe-&_OYH z(b}5_88Ks?|L347=hQPvIKPHE2ot_1Tk7r7ha~8LkU23sArex+j6z1?ohUs1d#{E{ z;d`Wuq=&jlY8VEtl&yk^UEi$P4I`h$1!iSDp4+lad_wt)diin@|20Zxo$_tOESEVstkS@&P90pL4%PE6tI-nk1)Skai=%#~#Zm8cn|jo!nKrc7 G$LJRX7>g(V|CC~Uu>%0~-Lvmsf!&Z@hTAET!3=Iqy7`sV! xkO(_iy&yA0#~Yvy0iY-+!v>(Ksz6ggE`Fc}axtq;L25~=UT$Im!xp7KECBM+RrLS> diff --git a/pete.jor b/pete.jor index 17e92f0..b9eccba 100755 --- a/pete.jor +++ b/pete.jor @@ -3,27 +3,35 @@ 13 8 N ' {car} defentity car car :touch + player move-entity 1 player.state DRIVING f! - car entity>pos player entity.pos! ;entity :noname - :| player yield - player.driving? not if car yield then - 0 |; ' entities redefine +:| player yield + player.driving? not if car yield then + 0 |; ' entities redefine - :| touch-begin S leaving? dup - if player.driving? not - if pete say" It's too far to walk to town." - else 5 10 road.jor queue-level - then - then - touch-next 13 8 2= player.driving? and dup - if 0 player.state DRIVING f! - 12 8 tile>world player entity.pos! - then - touch-next 12 7 2= player.driving? not and dup - if 16 9 petehous.jor queue-level then - touch-last |; ' player-touch redefine - s" pete.map" load-map + :| +touch-begin S leaving? dup + if player.driving? not + if pete say" It's too far to walk to town." + else player move-entity 5 10 road.jor queue-level + then + then +touch-next 13 8 2= player.driving? and dup + if player move-entity + 0 player.state DRIVING f! + W player entity.dir ! + player move-entity + then +touch-next 12 7 2= player.driving? not and dup + if player move-entity 16 9 petehous.jor queue-level then +touch-next 30 7 2= dup + if pete say" It's... kinda swampy.\I don't wanna get wet if I\don't have to." then +touch-next 30 9 2= dup + if pete say" Feels spooky over here,\somehow." then +touch-last |; ' player-touch redefine + +s" pete.map" load-map ; ' onload redefine diff --git a/petehous.jim b/petehous.jim index 89ca4a67740ed4bd4b28a8f67d43962835811470..320c43b8e0f1394abe2f225d4b9b752e8fccb941 100755 GIT binary patch delta 100 zcmeyu^n*$8l~$?pd96IgS6Vy*PFkN>Y$pl|vx#Z9s-9Dws3yl=rp>1CiKS$scO?6A xFmvg|)mrSo!OWi%@A$Ht>wpxPPBvgP6b{iTNG(at$S*C{%S|j`*rN1@1pt<{A+7)b delta 96 zcmeyt^o2?Al~$?pd95tQS6Vy*PFkN>EGG&IGYM%=)RJQ_(q>cm#8NQPKazbhn7MG` tdM)2KS3QCkZ>E>5$8%YjP#6cVtq@XA`h~RQ0S9|nw7m_PlTwJ6-!XF?7 zL0p`~fWJTo5geU$>EI;lB}VIZ-|;^0`@P?*b2#(hJQrRatGMPQxPTtYU*)dV!R~y1_uQBW>P?at>WgZQ6P)!GkEl!|23H z;XSugxvwO6)cjfK%(Up~0J69)ON07k$Ucf9hLz!mM-S?lR%2 zfTeo`Z3qSR7=dl3S?O;P+hCP$vTrPq5@*AA_i3Y5UN;%s@J*q51lcnoufPpKOn0r2wIZsHh4^G7X1cY z!P`KB$I;3_db4h(J|{Ih0I7_#%v$=93W3Z0mZVaumh_mP^0vA82Tt%ybz`K5??|Mm MKNrvtT~B}DZ#8)PEx1WWTVLuBeLjw;;GFW>*3onq*!!T28iv~m<#Ak!bH-a_SPn;ks x36YdQlH8#!4m5e&#C>wIsz8(fu4*{hd_s7_`pM^56(?R0WM^dn0!GG(f-(~qun2+JK+FmPND{1*tr@vMN(Es``6sVr zRGK(nVDn1GUY5yzOu`ctxF?6Oi9ndblMPt8nSlmO6jYgffQ^k4WEL1q6jTNZuyVur jKzgE}5;mbQb_*_qs)>T?sCqOIW^Oj*n9exafx`>{!sa8B diff --git a/tiles.tif b/tiles.tif index eb2d365d887800b4743ce5e59a80583c38fa522a..9aa18bf655c61b69d80986194e073667b33df785 100755 GIT binary patch delta 400 zcmaDS|4x3xOV;|C|9}1j;+gY7c;?KRKf(Ct{GT&Hcs>-*1kxZ3h4X=WKp3KzeEpk^ zS$6NOfewh-oeB`DB>F(C9JrB6yqi}aP0^#20|{(n;X|G)nK|Nq~C7(&Cu zp|lo|UIbFN9*_D(KzXS8MNsQ9p)?jsQ4k1(l$0idXh|g{U@!pzh(B{Ch(A$q0w*?l e=FAD4Ky~G4U~(ao#Nv;ftQ-dz7#bQlIv4=i?aL7W delta 167 zcmaDS|4x3xOV;}T|9}1j;+bF!Az?gB8X*GGgN(`3zuA~&_wLQclMC3?Hcw&;Vcz_a U>nqD9Zf-`70}Koe4ICW|0K;U0CIA2c