diff --git a/entity.jim b/entity.jim index 47cf9bd..56d59b3 100755 Binary files a/entity.jim and b/entity.jim differ diff --git a/entity.jor b/entity.jor index 998a2af..1a2bd7d 100755 --- a/entity.jor +++ b/entity.jor @@ -43,6 +43,7 @@ array frames : sprindex ( dir frame ) 2 << frames + + b@ ; : defstatic ( frame -- ) create b, does> b@ sprindex ; +: defsingle ( sprindex -- ) create b, does> swap drop b@ ; : defanim ( frame... framecount ticks-per-frame -- ) create b, dup b, 0 for b, next does> ( dir a -- ) @@ -53,3 +54,7 @@ array frames 0 defstatic {car} 1 defstatic {pete-stand} 1 2 2 5 defanim {pete-walk} +13 defsingle {pete-table} +14 defsingle {chair} +15 defsingle {pete-bed} +16 defsingle {horse} diff --git a/footer.jim b/footer.jim index c908f9a..5c726f9 100755 Binary files a/footer.jim and b/footer.jim differ diff --git a/game.jim b/game.jim index 3a6b8b0..4f7254a 100755 Binary files a/game.jim and b/game.jim differ diff --git a/map.jim b/map.jim index 461060d..d649db1 100755 Binary files a/map.jim and b/map.jim differ diff --git a/pete.jim b/pete.jim index 9545ee1..760c238 100755 Binary files a/pete.jim and b/pete.jim differ diff --git a/petehous.jim b/petehous.jim index 320c43b..858ee6f 100755 Binary files a/petehous.jim and b/petehous.jim differ diff --git a/petehous.jor b/petehous.jor index 8cc1bf6..3e97074 100755 --- a/petehous.jor +++ b/petehous.jor @@ -1,7 +1,17 @@ ( P E T E ' S H O U S E ) +16 5 N ' {pete-table} defentity table +15 5 N ' {chair} defentity chair +7 6 N ' {pete-bed} defentity bed + +table :touch pete say" Yesterday's breakfast is still\on the table." + say" Maybe the day before's too." ;entity +chair :touch pete say" I've had my morning coffee\already." ;entity +bed :touch pete say" I'm not tired yet." ;entity + :noname reset-level + :| player yield table yield chair yield bed yield 0 |; ' entities redefine :| touch-begin 16 10 2= dup if player move-entity 12 8 pete.jor queue-level diff --git a/road.jim b/road.jim index d79a256..d87ecbc 100755 Binary files a/road.jim and b/road.jim differ diff --git a/road.jor b/road.jor index 32f0722..2b9da3c 100755 --- a/road.jor +++ b/road.jor @@ -1,9 +1,11 @@ ( O V E R W O R L D ) +24 4 N ' {horse} defentity chuck + :noname reset-level 1 player.state DRIVING f! - + :| player yield chuck yield 0 |; ' entities redefine :| touch-begin E leaving? dup if pete say" It's 100 miles to the next town." then diff --git a/sprite.tif b/sprite.tif index 06864af..187d571 100755 Binary files a/sprite.tif and b/sprite.tif differ diff --git a/timer.jim b/timer.jim index 8986c67..71eb984 100755 Binary files a/timer.jim and b/timer.jim differ