diff --git a/boot.jim b/boot.jim index 434879e..31a7d66 100755 Binary files a/boot.jim and b/boot.jim differ diff --git a/cheat.jim b/cheat.jim index 57ca716..5e5b772 100755 Binary files a/cheat.jim and b/cheat.jim differ diff --git a/cheat.jor b/cheat.jor index 1cd6785..5489e37 100755 --- a/cheat.jor +++ b/cheat.jor @@ -12,6 +12,7 @@ 0 r@ ! then rdrop ; +' noclip cheat NTSPISPOPD :noname :| disk :| s" I don't wanna cheat" ' noop yield @@ -22,7 +23,15 @@ s" Jump to level 5" :| hide-footer 5 queue-level |; yield s" Jump to level 6" :| hide-footer 6 queue-level |; yield done |; choose - |; sched ; cheat NTCHEAT + |; sched ; cheat NTXYZZY + +:noname :| + neut-chuck @ not dup neut-chuck ! if + neut say" Chuck Mode enabled!\* W H I N N Y *" + else + neut say" Chuck Mode disabled.\Beep boop." + then +|; sched ; cheat NTCHUCK array letterkeys 30 b, 48 b, 46 b, 32 b, 18 b, 33 b, 34 b, 35 b, 23 b, 36 b, 37 b, 38 b, 50 b, @@ -31,4 +40,10 @@ array letterkeys : letter-typed 0 0 26 for letterkeys i + b@ key-released if drop i 65 + then next ; -:noname letter-typed dup if NTCHEAT else drop then ; ' cheat-tick redefine +:noname + :| letter-typed dup if + dup NTSPISPOPD + dup NTCHUCK + dup NTXYZZY + then drop |; ' cheat-tick redefine +; ' onload redefine diff --git a/debug.jim b/debug.jim index fc1194d..ffb22d4 100755 Binary files a/debug.jim and b/debug.jim differ diff --git a/defs.jim b/defs.jim index f2b2256..7bd675a 100755 Binary files a/defs.jim and b/defs.jim differ diff --git a/defs.jor b/defs.jor index ed8658c..52817c4 100755 --- a/defs.jor +++ b/defs.jor @@ -128,8 +128,9 @@ : tasks.s tasks links each - dup .wordin s" : " type + dup dup . .wordin s" : " type dup task-sp @ over task-stack ( task stackLim stack ) + 2dup . . s" : " type begin 2dup > while dup @ . cell + repeat cr drop drop more ; userword diff --git a/end.jim b/end.jim index 67d52eb..2cbcaa1 100755 Binary files a/end.jim and b/end.jim differ diff --git a/entity.jim b/entity.jim index 32c07e2..5c7e5c3 100755 Binary files a/entity.jim and b/entity.jim differ diff --git a/entity.jor b/entity.jor index 7d2c598..a17aab6 100755 --- a/entity.jor +++ b/entity.jor @@ -96,6 +96,8 @@ array frames create b, dup b, 0 for b, next does> ( dir a -- ) swap drop lookup-frame ; +var neut-chuck + -1 defsingle {blank} 0 defsingle {gord-floor} 1 defsingle {gord-sit} @@ -104,11 +106,13 @@ array frames 2 defstatic {jaye-stand} 2 3 2 5 defanim {jaye-walk} 4 defstatic {duck} -13 14 2 5 defmulti {neut} +13 14 2 5 defmulti {neut-real} 19 20 2 5 defmulti {libb} 5 defstatic {rexx} +21 defsingle {chuck} +: {neut} neut-chuck @ if {chuck} else {neut-real} then ; : sprite-bob ( x y sprindex -- x y sprindex ) - dup 13 >= over 20 <= and if + dup 13 >= over 21 <= and if >rot 2dup + ticks + 40 % 20 < if 1 + then dup @ text-color ! cell + @ draw-portrait ; -0 LGREEN character neut userword +0 LGREEN character neut-char +2 BROWN character chuck-char 1 YELLOW character rexx userword 3 LBLUE character jaye userword 5 CYAN character gord userword @@ -119,6 +120,7 @@ var cchoose 4 LGREEN character term userword 8 RED character libb userword 9 BLUE character disk userword +: neut neut-chuck @ if chuck-char else neut-char then ; userword : noone WHITE text-color ! s" " dup dup dup 8 portraity 16 portraity 24 portraity 32 portraity ; userword diff --git a/game.jim b/game.jim index d2a0264..9ed16e1 100755 Binary files a/game.jim and b/game.jim differ diff --git a/game.jor b/game.jor index 2e98d1d..606b528 100755 --- a/game.jor +++ b/game.jor @@ -293,6 +293,7 @@ var quaking Jaye draw-entity player.state HASNEUT f@ if Neut draw-entity then Libb entity-present? if Libb draw-entity then + visible-objects@ if visible-objects@ links each dup obj-entity draw-entity more then diff --git a/input.jim b/input.jim index cb0a60a..5ba46fa 100755 Binary files a/input.jim and b/input.jim differ diff --git a/jiles.jim b/jiles.jim index 1ccf54c..4f55c54 100755 Binary files a/jiles.jim and b/jiles.jim differ diff --git a/job.jim b/job.jim index ffd89e0..951b084 100755 Binary files a/job.jim and b/job.jim differ diff --git a/jopl.jim b/jopl.jim deleted file mode 100755 index bf43818..0000000 Binary files a/jopl.jim and /dev/null differ diff --git a/lev00001.jim b/lev00001.jim index 79a3331..e12de0b 100755 Binary files a/lev00001.jim and b/lev00001.jim differ diff --git a/lev00002.jim b/lev00002.jim index 05d53d4..fe00b98 100755 Binary files a/lev00002.jim and b/lev00002.jim differ diff --git a/lev00003.jim b/lev00003.jim index fa7ce74..b9a5069 100755 Binary files a/lev00003.jim and b/lev00003.jim differ diff --git a/lev00004.jim b/lev00004.jim index fa4c90c..1c1f142 100755 Binary files a/lev00004.jim and b/lev00004.jim differ diff --git a/lev00005.jim b/lev00005.jim index 2da9ccf..febb767 100755 Binary files a/lev00005.jim and b/lev00005.jim differ diff --git a/lev00006.jim b/lev00006.jim index a0af44d..916f28e 100755 Binary files a/lev00006.jim and b/lev00006.jim differ diff --git a/level.jim b/level.jim index cac1dbb..69d14e5 100755 Binary files a/level.jim and b/level.jim differ diff --git a/map.jim b/map.jim index 9d79897..514d1c9 100755 Binary files a/map.jim and b/map.jim differ diff --git a/neuttowr.exe b/neuttowr.exe index 6371cd3..86937a3 100755 Binary files a/neuttowr.exe and b/neuttowr.exe differ diff --git a/neuttowr.prj b/neuttowr.prj index 740aac2..c74451e 100755 Binary files a/neuttowr.prj and b/neuttowr.prj differ diff --git a/portrait.gfx b/portrait.gfx index 4f94c7f..8d49db9 100755 Binary files a/portrait.gfx and b/portrait.gfx differ diff --git a/sound.jim b/sound.jim index 8f97265..478a7c5 100755 Binary files a/sound.jim and b/sound.jim differ diff --git a/sprite.gfx b/sprite.gfx index 611e27b..5a488d6 100755 Binary files a/sprite.gfx and b/sprite.gfx differ diff --git a/state.jim b/state.jim index 40d3b27..6d66270 100755 Binary files a/state.jim and b/state.jim differ diff --git a/testbed.c b/testbed.c index 2bacf8b..2bac812 100755 --- a/testbed.c +++ b/testbed.c @@ -807,6 +807,7 @@ void f_paintbuf() { void f_setedittarget() { editTarget = TOP().i; + DROP(1); } void f_getedittarget() { diff --git a/timer.jim b/timer.jim index de642c4..ecb46fd 100755 Binary files a/timer.jim and b/timer.jim differ diff --git a/title.jim b/title.jim index bc6dd01..090b7ac 100755 Binary files a/title.jim and b/title.jim differ