From 30b114ebedc0c22458685b3235fe8c97aaa9bce6 Mon Sep 17 00:00:00 2001 From: Jeremy Penner Date: Sun, 2 Feb 2020 18:30:22 -0500 Subject: [PATCH] Final GGJ build with DEV flag disabled & alternate tileset for Neut --- footer.jor | 3 ++- game.jor | 12 ++++++------ gameboot.jor | 2 ++ lev00001.jor | 2 +- ntiles.gfx | Bin 8192 -> 8192 bytes 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/footer.jor b/footer.jor index ff54cff..c8bd8bb 100755 --- a/footer.jor +++ b/footer.jor @@ -29,7 +29,8 @@ WHITE text-color ! var textx var texty -( 100 ) 2 const textspeed +: textspeed DEV if 100 else 2 then ; + var textleft : textleftsay 6 textleft ! ; : textleftchoice 8 textleft ! ; diff --git a/game.jor b/game.jor index 6a59cb9..f265e2e 100755 --- a/game.jor +++ b/game.jor @@ -118,8 +118,10 @@ var q-level : queue-level q-level ! ; userword : player-tick - ^SPACE key-pressed player.state HASNEUT f@ and - if player.state ISNEUT fnot! then + ^SPACE key-pressed player.state HASNEUT f@ and if + player.state ISNEUT fnot! + isneut? if night else day 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 ^UP key-down if drop 1 N player entity.dir ! then @@ -140,7 +142,7 @@ var q-level party each EVTICK entity>do more pneut EVTICK entity>do - tick-mapedit jiles + DEV if tick-mapedit jiles then tick-debounce q-level @ dup if 0 q-level ! @@ -157,8 +159,6 @@ var q-level r@ entity.dir @ sprite sprite-bob draw-sprite ; -var showmouse -1 showmouse ! var glitchlevel var quaking @@ -181,7 +181,7 @@ var _dorubber party each draw-entity more player.state HASNEUT f@ if pneut draw-entity then - showmouse @ if + DEV if mouseworldpos 4 draw-sprite then glitchlevel @ glitch diff --git a/gameboot.jor b/gameboot.jor index 38b6302..b0e2d1d 100755 --- a/gameboot.jor +++ b/gameboot.jor @@ -1,6 +1,8 @@ : blah ' seremit task-emit ! ; blah +0 const DEV + s" game.log" open seekend fdeactivate const LOGFILE : emit-log ' fputc LOGFILE withfp ; : atexit LOGFILE factivate close ; diff --git a/lev00001.jor b/lev00001.jor index 9dd430b..98e4377 100755 --- a/lev00001.jor +++ b/lev00001.jor @@ -67,6 +67,6 @@ sexit :noname 14 9 tile>world pjaye entity.pos! c1 entity>pos pneut entity.pos! - ' intro sched + DEV not if ' intro sched then ; ' onload redefine diff --git a/ntiles.gfx b/ntiles.gfx index 9cce95a6718cef8309fe234ab58934a3ba606f29..9af306ba7788a4c68973c44ae0499b08f567c159 100755 GIT binary patch delta 1754 zcmah}Pfyf96rX7eUCGMSWL=PiOhb%E!^v=fOq+$k(VG_u#DfPz{0637%LlOb1AtsT zdLyi~yPv@`4JYD-9t)No-)pyafx5hxbf)ur|9sqe$mF@=S^j2e)tdbM%a^If+ zw-3H(?U!BIlWSq`ta~Oxc}rYcX{aI;s==;4-zr}!*rmR028UX+b$Ww_#S?cZL6`13 ziM~8-Xv@=yPDso`PVUHLJY^|cnVoO0%;GNLu?WTO0F(S(O14R5peL7?SipGw7`9Zb z852}ErmFn!69~R(W?<5$kqOO2Emxqv*G`zxFd7N7l$1A&l)E(6O%0%r_w0T9#Uqzm ziVF!{-=3R-jRKp+g`xA=uG66df!+hGSaq7i@7m*3LUreQ=Q>mgfo`_;2&oRn&7gu@ zLe9I}aGO!}Rr^`niWjivQ|r#Q(3 zAyU5i1z#{U;q+(k>g@F9&q41Kyx`gQ-_nM@PEO#`OcZ0<@0@R9o6k4$-p72&|MrHF(qm)ckwa*0oWjkL{=YRFhiSr1E7PXk|>LSaqPrAAt}%vj(+zgA0U0!X*sMg!mjtUTrk6_FuJIq-G}PzEU(VcuGNg8vUXvrmuMlfTOH>vsSE delta 1500 zcmb7EK}Z`x6rI@wlT_ozgSHpzCIyQYYKs>yCR?h|b8+z4Exp*2DfDK{PHO2vN_9!^ z(wt<4dhlRrqzT2NpckRHM5Q1el7Q3{lHKY5S(7%2+V*{R=fC-HXa3Ir3|G0TW`u3o zmdI6d6nTu@7T!j(*tK&o=Dj{wHphQBSz*GPS;swWesu+r@Ft%z=PpyAu z^NZ#_J6U7wW9kVrPuP#t+Wxd@CSQ0B*++b;FZ+CZ_WP^=7(qp~0fZE5AOy&neMZR0 zn>+j($1Ny8h(HZO0D&wrXAZ}>L3@X)qAG-~+qw|=1$S{zR!(@1BN#F?RVftGX~qf#+|TivITTVoK0Y{* zq`|?yzK)JiXlCYrc{1VG3`J3vmU0cOuWMQ>hsqn;BOey9i`*n#MsUQ?+`1vUt;A9Y^IW&eki-17?! CP{;xR