Merge branch 'logan'

src/assets.ts

@@ -67,6 +67,7 @@ const SPRITE_PATHS = [
   "cactus-burn1.png",
   "cactus-burn2.png",
   "cactus1.png",
+  "spider.png",
   "cloud.png",
   "ground.png",
   "gun.png",
@@ -115,6 +116,7 @@ const loadAssets = async () =>
       bang: new ToneAudioBuffer().load("audio/bang.mp3"),
       car: new ToneAudioBuffer().load("audio/car.mp3"),
       win: new ToneAudioBuffer().load("audio/win.mp3"),
+      spider: new ToneAudioBuffer().load("audio/Stinger.wav"),
     }),
   });
 

src/constants.ts

@@ -9,4 +9,4 @@ export const SCORE_MULTIPLIER = 0.01; // Modifies rate score increases relative
 
 export const DINO_X_POS = 0;
 
-export const DEBUG = false;
+export const DEBUG = true;

src/entities/Spider.ts

@@ -0,0 +1,39 @@
+import { state } from "../state";
+import { Entity } from "./Entity";
+import { DINO_X_POS, GROUND_LEVEL } from "../constants";
+import { sprites } from "../assets";
+import { Player } from "tone";
+import { playSound } from "../audio";
+
+const SURPRISE_JUMP_VEL = 2000;
+
+const animations = {
+  default: [sprites["spider.png"]],
+};
+
+export class Spider extends Entity {
+  private sound?: Player;
+
+  constructor(x = 0, y = GROUND_LEVEL - 300) {
+    super(animations, "default");
+    this.x = x;
+    this.y = y;
+  }
+
+  update(dt: number) {
+    this.x -= state.runSpeed * dt;
+
+    if (this.x < DINO_X_POS - 100) {
+      return;
+    }
+
+    if (this.x < DINO_X_POS + 60) {
+      this.dy = -SURPRISE_JUMP_VEL * dt;
+      this.y = Math.min(this.y + this.dy, GROUND_LEVEL);
+    } else if (this.x < DINO_X_POS + 240) {
+      this.dy = SURPRISE_JUMP_VEL * dt;
+      this.y = Math.min(this.y + this.dy, GROUND_LEVEL);
+      this.sound ??= playSound("spider");
+    }
+  }
+}

src/level.ts

@@ -7,6 +7,7 @@ import { Tornado } from "./entities/Tornado";
 import { UFO } from "./entities/UFO";
 import { Goal } from "./entities/Goal";
 import { SurpriseCactus } from "./entities/SurpriseCactus";
+import { Spider } from "./entities/Spider";
 
 export const generateLevel = (): Entity[] => {
   let x = 0;
@@ -16,7 +17,7 @@ export const generateLevel = (): Entity[] => {
   };
 
   if (DEBUG) {
-    return [new SurpriseCactus(i(1000))];
+    return [new Spider(i(1000))];
     // return [new SurpriseCactus(i(1000))],
   }