From d4dca89ef99854cd6ac366bf489b8b91d4268a8e Mon Sep 17 00:00:00 2001 From: Jeremy Penner Date: Mon, 1 Jul 2019 12:31:00 -0400 Subject: [PATCH] jeanne sprite --- entity.jor | 4 ++++ game.exe | Bin 96197 -> 96193 bytes game.jor | 17 ++++++++++++----- game.prj | Bin 5522 -> 5667 bytes sprite.tif | Bin 7918 -> 7918 bytes 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/entity.jor b/entity.jor index c8a65cb..661608a 100755 --- a/entity.jor +++ b/entity.jor @@ -68,6 +68,8 @@ array frames ( 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 : sprindex ( dir frame ) 2 << frames + + b@ ; : defstatic ( frame -- ) create b, does> b@ sprindex ; @@ -89,4 +91,6 @@ array frames 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} diff --git a/game.exe b/game.exe index 2aeb0e09a21790acdb05983b5901a432451be45e..bfea3472c1da4cfc63b7687fab6385fb202278ea 100755 GIT binary patch delta 4275 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 biBPPybl< + player.state MOVING f@ not if cell + then @ execute ; + +' {mary} ' {mary-walk} :playerwalk {pmary} +' {pete-stand} ' {pete-walk} :playerwalk {ppete} +' {jeanne} ' {jeanne-walk} :playerwalk {pjeanne} + : {player} player.driving? if {car-drive} - else player.state MOVING f@ if - player.state ISMARY f@ if {mary-walk} else {pete-walk} then - else - player.state ISMARY f@ if {mary} else {pete-stand} then - then then ; + else player.state ISMARY f@ if {pmary} else {ppete} then + then ; : player.canmove? ( x y -- ) player.state NOCLIP f@ not if @@ -159,11 +163,14 @@ var glitchlevel draw-footer ; 16 18 W ' {horse} defentity p_chuck +16 18 W ' {pjeanne} defentity p_jeanne + :noname reset-level MODE-MOVE @ ' tick redefine ' full-draw ' draw redefine :| player yield + ISMARY player.state f@ if p_jeanne yield then CHUCK-FOLLOW flag@ if p_chuck yield then done |; ' party redefine diff --git a/game.prj b/game.prj index c1eb8a656fdfa50e74f335195c2476c91e5cf3ca..54d2cbd1f77a96669e4dd553acb2e8fb9b8289f5 100755 GIT binary patch delta 259 zcmbQFy;x_1IvcZ8(!=m%=dsIub9s=9b!JhaEs|V(+cL<%)N|{ z7(|(BnN~7JGCpMd!sN-6z;KlDBZDeq0?>2;24x1T4LAMR85B5T#5lkt3z(F32UDyJ z7nel(2{MSSZt|03kXd5k$HdT(Gu4lu;Y;aMKQ4yPv!?hdGV~SJ`-w69sNLcx$}j~e wE5hJdQt$WwzprbM!sH7gVq%UyKK{;n9t{6MmW8+mhd8;q=s9oh6y#(909V3IBme*a delta 130 zcmZ3iGf8`cIvexvbvHL_vF+kyWnlOTWWMCLXH4W_(Pv;_n8kdC=>zj)<`$--%*&Yn z|4(I}$fUs3$6U<(m+Alin@mrb8kzSqy=PKk-o)e!l#gV#VKM~Lo=jm(;>=vke;EG% iZ()4HD8YDwA%HQNX$Rx~|0awH3{w~qHcJU{vH$=%IxXY? diff --git a/sprite.tif b/sprite.tif index 8e0646485e5f3073142a93135c3928dde86f910b..3eac9014bd03dc1660554b27b30a18584baf7bf0 100755 GIT binary patch delta 1045 zcmcIjL2AP=5cH)G$RRJv+mxejItvQ=K`HbDxdu$~f}m3m4Mo0MMfOJ8SvlAc2$%|^ z@vbD#Xm%a;VgLEFQ)5Rw!VTD-=a@#s)-gtFXP6`=`;L9u0L=ou#NK0FW<@InL?KQh zke&%JLOd6shytYi1voJ-F^SZFaUk=r6|l;I!e0g4