Merge remote-tracking branch 'origin/master'

cromo · Oct 4, 2021 · d989b86 · d989b86
2 parents 933dbbd + 04e7001
commit d989b86
Show file tree

Hide file tree

Showing 20 changed files with 212 additions and 26 deletions.
diff --git a/res/player-ascending.png b/res/player-ascending.png
diff --git a/res/player-crouch1.png b/res/player-crouch1.png
diff --git a/res/player-crouch2.png b/res/player-crouch2.png
diff --git a/res/player-descending.png b/res/player-descending.png
diff --git a/res/player-jump1.png b/res/player-jump1.png
diff --git a/res/sfx/swoosh.wav b/res/sfx/swoosh.wav
diff --git a/src/audio.ts b/src/audio.ts
@@ -74,6 +74,7 @@ export function initAudio(): void {
   };
   availableSfx["warning"] = { source: audio.newSource("res/sfx/warning.wav", "static") };
   availableSfx["gainpip"] = { source: audio.newSource("res/sfx/pip_get.wav", "static"), volume: 0.5 };
+  availableSfx["swoosh"] = { source: audio.newSource("res/sfx/swoosh.wav", "static"), volume: 1.0 };
 
   availableBgm["level"] = {
     sources: {

diff --git a/src/levels/bigCentralGlitch.ts b/src/levels/bigCentralGlitch.ts
@@ -1,5 +1,9 @@
 import { LevelAnnotationFlag, LevelDefinition } from "../models";
-import { glitchy, teach } from "./terminalTalk";
+import { angry, glitchy, onTagHit, step, teach, tease } from "./terminalTalk";
+
+enum Tags {
+  Face = "face",
+}
 
 export const bigCentralGlitch: LevelDefinition = {
   layout: [
@@ -19,21 +23,26 @@ export const bigCentralGlitch: LevelDefinition = {
     "|#KK . . . . . . . . .~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ . . . .|# . . . . .|#",
     "|#-#-#-#-#-#-#-#-#-#|#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~KKKKKKKKKKKKKKKKKKKK|#",
     "|# . . . . . . . . .|#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-#-#-#-#-#-#-#-#-#-#|#",
-    "|# . . . . . . . . .|#~~~~~~~~~~~~~~~~~~~~~~~~~~~~ T . . . . . . . . . . . . .|#",
-    "|# . . . . . . . . .|#~~~~~~~~~~~~~~~~~~~~~~~~~~~~ . . . . . . . . . . . . . .|#",
-    "|# . . . . . . . . . . . . . .|#|#|# . . . .111111 . . . . . . . . . . . . . .|#",
+    "|# . . . . . . . . .|#~~~~~~~~~~~~~~~~~~~~~~~~~~~~ T f f f f . . . . . . . . .|#",
+    "|# . . . . . . . . .|#~~~~~~~~~~~~~~~~~~~~~~~~~~~~ f f f f f . . . . . . . . .|#",
+    "|# . . . . . . . . . . . . . .|#|#|# . . . .111111 f f f f f . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . .|#|#|# . . . .111111 . . . . . . . . . . . . . .|#",
     "|#SS . . . . . . . . . . . . .|#|#|# . . . .111111 . . . . . . . . . . . . . .|#",
     "*#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#*#",
   ],
   annotations: [
+    {
+      symbol: "f",
+      customTags: [Tags.Face],
+    },
     {
       symbol: "T",
       flags: [LevelAnnotationFlag.terminal],
       terminal: {
-        trackTags: [],
-        onOverloadDeath: [teach("Too unstable."), glitchy("Too much of a good thing?")],
-        conversations: [],
+        trackTags: [Tags.Face],
+        onTelesplatDeath: [tease("Telesplat 2000(TM)")],
+        onKillPlaneDeath: [teach("Be prepared!")],
+        conversations: [{ name: "face", steps: [step(onTagHit(Tags.Face), angry("Hey, hey, watch the face!"))] }],
       },
     },
   ],

diff --git a/src/levels/columns1Level.ts b/src/levels/columns1Level.ts
@@ -1,9 +1,9 @@
-import { LevelDefinition } from "../models";
+import { LevelAnnotationFlag, LevelDefinition } from "../models";
 
 export const columns1Level: LevelDefinition = {
   layout: [
     "*#-#-#-#-#-#-#-#-#-#-#*#-#-#-#-#-#*#?K?K?K?K*#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#*#",
-    "|# . . . . . . . . . . . . . . . .|#?K?K?K?K|# . . . . . . . . . . . . . . . .|#",
+    "|# . . . . . . . . . . . . T . . .|#?K?K?K?K|# . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . .|#?K?K?K?K|# . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . .|#?K?K?K?K|# . . . . . . . . . . . . . . . .|#",
     "*#-#-#-# ! ! ! !-#-#-#*#|#-#1111-#|#?K?K?K?K|#-#1111-#|#*#-#-#-#~~~~~~~~-#-#-#*#",
@@ -25,5 +25,17 @@ export const columns1Level: LevelDefinition = {
     "|#*# ! ! ! ! ! ! ! !*#|#|# ! ! ! ! ! ! ! ! ! ! ! ! ! !|#|# . . . . . . . . . .|#",
     "*#-#-#-#-#-#-#-#-#-#-#*#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#*#KKKKKKKKKKKKKKKKKKKK*#",
   ],
-  annotations: [],
+  annotations: [
+    {
+      symbol: "T", // terminal top left
+      physicalMode: "empty",
+      glitchMode: "empty",
+      flags: [LevelAnnotationFlag.terminal],
+      terminal: {
+        conversations: [],
+        trackTags: [],
+        onSpawn: [],
+      },
+    },
+  ],
 };
diff --git a/src/levels/credits.ts b/src/levels/credits.ts
@@ -0,0 +1,52 @@
+import { LevelAnnotationFlag, LevelDefinition } from "../models";
+import { glitchy, serious, teach } from "./terminalTalk";
+
+export const creditsLevel: LevelDefinition = {
+  layout: [
+    "*#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#*#",
+    "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
+    "|# . . . . . . .*# . . . . .*# . . . . . . . . . . . . . . . . . . . . . . . .|#",
+    "|# . . . . . . .~~ . . . . .~~ . . . . . . . . . . . . . . . . . . . . . . . .|#",
+    "|# . . . . . . .~~ . . . . .~~ . . . . . . . . . . . . . . . . . . . . . . . .|#",
+    "|# . . . . . . .~~ . . . . .~~ . . . . . . . . . . . . . . . . . . . . . . . .|#",
+    "|# . . . . . . .~~~~~~~~~~~~~~ . . . . . . . . . . . . . . . . . . . . . . . .|#",
+    "|# . . .*# . . . . . .~~ . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
+    "|# . . .*# . . . . . .~~ . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
+    "|# . . .-#-#-#-#-#-#-#-#-#-#-#-#-#-#~~~~~~-#-#-#-#-#-#*# . . . . ! ! ! ! ! ! !|#",
+    "|# . . . . . . . . . . . . T . . . . . . . . . . . . .|# . . . . ! ! ! ! ! ! !|#",
+    "|# . . . . . . . . . . . . . . . . . . . . . . . . . .|# . . . . ! ! ! ! ! ! !|#",
+    "|# . . . . . . . . . . . . . . . . . . . . . . . . . .*#*#*#*# . ! ! ! ! ! ! !|#",
+    "|# _ _ _ _ _ _ _ _ _ _ _ . . . . . . . . . . . . . . .|# . . . . ! ! ! ! ! ! !|#",
+    "|# _ _ _ _ _ _ _ _ _ _ _ . . . . . . . . . . . . . . .|# . . . . ! ! ! ! ! ! !|#",
+    "|# _ _ _ _ _ _ _ _ _ _*# . . . . . . . . . . . . . . .*#*#*#*#*# ! ! ! ! ! ! !|#",
+    "|# _ _ _ _ _ _ _~~~~ _ _ . . . . . . . . . . . . . . . . . . . . ! ! ! ! ! ! !|#",
+    "|# _ _ _ _ _~~~~ _ _ _ _ .SS . . . . . . . . . . . . . . . . . . ! ! ! ! ! ! !|#",
+    "|# _ _ _~~~~ _ _ _ _ _ _*#*#*# . . .*#*#*# . . . . .*#*#*#^^^^^^*#*#*# ! ! ! !|#",
+    "|# _~~~~ _ _ _ _ _~~ _ _*#*#KK . . . .11 . . . . . .~~ . . . . . ! ! ! ! ! ! !|#",
+    "|# _ _ _ _ _ _ _ _ _ _ _*#*#KK . . . .11 . . . . . .~~ . . . . . ! ! ! ! ! ! !|#",
+    "*#-#-#-#-#-#-#-#-#-#KKKK-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#*#",
+  ],
+  annotations: [
+    {
+      symbol: "T", // terminal top left
+      physicalMode: "empty",
+      glitchMode: "empty",
+      flags: [LevelAnnotationFlag.terminal],
+      terminal: {
+        conversations: [],
+        trackTags: [],
+        generalMessages: [
+          //
+          teach("Congratulations!"),
+          teach("Thanks for playing Heat Death"),
+          serious("Created by:"),
+          glitchy("cromo - engine & graphics lead"),
+          glitchy("zach - terminal & level lead"),
+          glitchy("zeta0134 - engine & audio lead"),
+          serious("For Ludum Dare 49 Game Jam"),
+          teach("The End"),
+        ],
+      },
+    },
+  ],
+};
diff --git a/src/levels/deadPitFull2Level.ts b/src/levels/deadPitFull2Level.ts
@@ -1,4 +1,5 @@
 import { LevelAnnotationFlag, LevelDefinition } from "../models";
+import { glitchy, serious, teach } from "./terminalTalk";
 
 export const deadPitFull2Level: LevelDefinition = {
   layout: [
@@ -7,7 +8,7 @@ export const deadPitFull2Level: LevelDefinition = {
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
-    "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
+    "|# . . . . . . . . . . T . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
@@ -29,5 +30,20 @@ export const deadPitFull2Level: LevelDefinition = {
     // { symbol: ".", zoneMode: "hot" },
     { symbol: "S", flags: [LevelAnnotationFlag.spawn_player], zoneMode: "hot" },
     // { symbol: "^", physicalMode: "semisolid", zoneMode: "hot" },
+
+    {
+      symbol: "T", // terminal top left
+      physicalMode: "empty",
+      glitchMode: "empty",
+      flags: [LevelAnnotationFlag.terminal],
+      terminal: {
+        conversations: [],
+        trackTags: [],
+        onSpawn: [
+          //
+          teach("Think you can make it across?"),
+        ],
+      },
+    },
   ],
 };
diff --git a/src/levels/hotPitFull1Level.ts b/src/levels/hotPitFull1Level.ts
@@ -1,4 +1,5 @@
 import { LevelAnnotationFlag, LevelDefinition } from "../models";
+import { serious } from "./terminalTalk";
 
 export const hotPitFull1Level: LevelDefinition = {
   layout: [
@@ -16,7 +17,7 @@ export const hotPitFull1Level: LevelDefinition = {
     "|# . . . ! . . . . .|#|#|# . . . . . . !|# ! . . . . .KK . . . . . . . . . . .|#",
     "|# . . .SS . . . . . .|# . . . . . . . !|#|# . . . . .KK . . . . . . . . . . .|#",
     "|# . . .|# . . . . . . . . . . . . . .|#|#|# . . . . . . . . . . . . . . . . .|#",
-    "|# . . .|# . . . . . . . . . . . . . .~~~~~~ . . . . . . . . . . . . . . . . .|#",
+    "|# . . .|# T . . . . . . . . . . . . .~~~~~~ . . . . . . . . . . . . . . . . .|#",
     "|# . . .|# . . . . . . . . . . . . . .~~~~~~ . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . .|#|# . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . .|# . . . . _ _ _ . . . . . . . . . . .|#",
@@ -29,5 +30,16 @@ export const hotPitFull1Level: LevelDefinition = {
     // { symbol: ".", zoneMode: "hot" },
     { symbol: "S", flags: [LevelAnnotationFlag.spawn_player], zoneMode: "hot" },
     // { symbol: "^", physicalMode: "semisolid", zoneMode: "hot" },
+    {
+      symbol: "T", // terminal top left
+      physicalMode: "empty",
+      glitchMode: "empty",
+      flags: [LevelAnnotationFlag.terminal],
+      terminal: {
+        conversations: [],
+        trackTags: [],
+        onSpawn: [serious("It's getting hot in here...")],
+      },
+    },
   ],
 };
diff --git a/src/levels/hotPitFull3Level.ts b/src/levels/hotPitFull3Level.ts
@@ -1,4 +1,5 @@
 import { LevelAnnotationFlag, LevelDefinition } from "../models";
+import { teach } from "./terminalTalk";
 
 export const hotPitFull3Level: LevelDefinition = {
   layout: [
@@ -13,7 +14,7 @@ export const hotPitFull3Level: LevelDefinition = {
     "|#-#-#|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#-#-#|#",
     "|# . . . . . . . _ _ _ _ . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . .-#-#-#-#KK . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
-    "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
+    "|# . T . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . _ _ _ _ . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . .KK-#-#-#-# . . . . .|#",
     "|# . . . . . . . . . . . . _ _ _ _ _ _ _ _ _ _ _ . . . . . . . . . . . . . . .|#",
@@ -31,5 +32,16 @@ export const hotPitFull3Level: LevelDefinition = {
       flags: [LevelAnnotationFlag.spawn_player],
       zoneMode: "dead",
     },
+    {
+      symbol: "T", // terminal top left
+      physicalMode: "empty",
+      glitchMode: "empty",
+      flags: [LevelAnnotationFlag.terminal],
+      terminal: {
+        conversations: [],
+        trackTags: [],
+        onSpawn: [teach("Up and over")],
+      },
+    },
   ],
 };
diff --git a/src/levels/invertedTower1Level.ts b/src/levels/invertedTower1Level.ts
@@ -1,4 +1,5 @@
-import { LevelDefinition } from "../models";
+import { LevelAnnotationFlag, LevelDefinition } from "../models";
+import { serious, teach } from "./terminalTalk";
 
 export const invertedTower1Level: LevelDefinition = {
   layout: [
@@ -13,7 +14,7 @@ export const invertedTower1Level: LevelDefinition = {
     "|# . . . . . . . . . . . . . . . . . . .|# . . . . . ! ! ! ! . . . . . . . . .|#",
     "*# . . . . . . . . . .-#-#-#-#-#-#-#-#-#|#-#-#-#-#-#-#-#-#-# . . . . . . . . .*#",
     "|# . . . . . . . . . . . . ! ! ! ! ! ! !|# ! ! ! ! ! ! ! . . . . . . . . . . .|#",
-    "|# . . . . . . . . . . . . ! ! ! ! ! ! !|# ! ! ! ! ! ! ! . . . . . . . . . . .|#",
+    "|# . T . . . . . . . . . . ! ! ! ! ! ! !|# ! ! ! ! ! ! ! . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . ! ! ! ! ! ! !|# ! ! ! ! ! ! ! . . . . . . . . . . .|#",
     "*# . . . . . . . . . . . . ! ! !-#-#-#-#-#-#-#-#-# ! ! ! . . . . . . . . . . .*#",
     "|# . . . . . . . . . . . . ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! . . . . . . . . . . .|#",
@@ -25,5 +26,17 @@ export const invertedTower1Level: LevelDefinition = {
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|#?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K|#",
   ],
-  annotations: [],
+  annotations: [
+    {
+      symbol: "T", // terminal top left
+      physicalMode: "empty",
+      glitchMode: "empty",
+      flags: [LevelAnnotationFlag.terminal],
+      terminal: {
+        conversations: [],
+        trackTags: [],
+        onSpawn: [serious("Think you can make it?"), teach("You can do it!")],
+      },
+    },
+  ],
 };
diff --git a/src/levels/invertedTower2Level.ts b/src/levels/invertedTower2Level.ts
@@ -1,4 +1,4 @@
-import { LevelDefinition } from "../models";
+import { LevelAnnotationFlag, LevelDefinition } from "../models";
 
 export const invertedTower2Level: LevelDefinition = {
   layout: [
@@ -15,7 +15,7 @@ export const invertedTower2Level: LevelDefinition = {
     "|# . . . . . . . . . . . . . . . . .~~~~~~~~~~ ! ! . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . .|#~~~~~~|# ! ! . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . .|#~~~~~~|# ! ! . . . . . . . . . . . . . .|#",
-    "*# . . . . . . . . . . . . . . . . . .~~~~~~*#-#-# . . . . . . . . . . . . . .*#",
+    "*# . T . . . . . . . . . . . . . . . .~~~~~~*#-#-# . . . . . . . . . . . . . .*#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
@@ -25,5 +25,17 @@ export const invertedTower2Level: LevelDefinition = {
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|#?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K?K|#",
   ],
-  annotations: [],
+  annotations: [
+    {
+      symbol: "T", // terminal top left
+      physicalMode: "empty",
+      glitchMode: "empty",
+      flags: [LevelAnnotationFlag.terminal],
+      terminal: {
+        conversations: [],
+        trackTags: [],
+        onSpawn: [],
+      },
+    },
+  ],
 };
diff --git a/src/levels/outerGlitchMazeLevel.ts b/src/levels/outerGlitchMazeLevel.ts
@@ -1,4 +1,5 @@
-import { LevelDefinition } from "../models";
+import { LevelAnnotationFlag, LevelDefinition } from "../models";
+import { serious } from "./terminalTalk";
 
 export const outerGlitchMazeLevel: LevelDefinition = {
   layout: [
@@ -18,12 +19,24 @@ export const outerGlitchMazeLevel: LevelDefinition = {
     "|# . . .*#*#*#~~~~~~*#*#*#*#*#*#*#*#*#-#-#*#*#*#*#*#*#*#*#*#111111*#*#*# . . .|#",
     "|# . . .*#*#*#~~~~~~*#*#*#*#*#*#*#*#*#~~~~*#*#*#*#*#*#*#*#*#~~~~~~*#*#*# . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
-    "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
+    "|# . . . . . . . . . . . . T . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . ! ! . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|#-#-#*#*#-#-#-#-#-# . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|# . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .|#",
     "|#KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK|#",
   ],
-  annotations: [],
+  annotations: [
+    {
+      symbol: "T", // terminal top left
+      physicalMode: "empty",
+      glitchMode: "empty",
+      flags: [LevelAnnotationFlag.terminal],
+      terminal: {
+        conversations: [],
+        trackTags: [],
+        onSpawn: [serious("What to do here?")],
+      },
+    },
+  ],
 };
diff --git a/src/main.ts b/src/main.ts
@@ -8,6 +8,7 @@ import { getCurrentLevel } from "./levels";
 import { bigCentralGlitch } from "./levels/bigCentralGlitch";
 import { blankCorridorLevel } from "./levels/blankCorridorLevel";
 import { columns1Level } from "./levels/columns1Level";
+import { creditsLevel } from "./levels/credits";
 import { deadPitFull2Level } from "./levels/deadPitFull2Level";
 import { debugLevel } from "./levels/debugLevel";
 import { diagonalDash } from "./levels/diagonalDash";
@@ -44,6 +45,7 @@ if (os.getenv("LOCAL_LUA_DEBUGGER_VSCODE") === "1") {
 // Dev level sequence
 // Feel free to alter this list for testing/debugging
 const LEVEL_SEQUENCE = [
+  creditsLevel,
   bigCentralGlitch,
   // hotPitFull3Level,
   suddenlyFallingLevel,
@@ -108,6 +110,7 @@ const LEVEL_SEQUENCE = [
   hotPitFull1Level,
   level3,
   suddenlyFallingLevel,
+  creditsLevel,
 ];
 //*/
 

diff --git a/src/models.ts b/src/models.ts
@@ -201,6 +201,7 @@ export interface DoubleJumpPrep {
 
 export interface Ascending {
   type: "ASCENDING";
+  ticksSpentAscending: number;
 }
 
 export interface Descending {