Allow getaway from most weapons

Half-Shot · Dec 31, 2024 · 28efac5 · 28efac5
1 parent 9d31bd2
commit 28efac5
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 10 deletions.
diff --git a/src/entities/phys/mine.ts b/src/entities/phys/mine.ts
@@ -84,7 +84,7 @@ export class Mine extends TimedExplosive {
 
     sprite.position = body.body.translation();
     super(sprite, body, world, parent, {
-      explosionRadius: new MetersValue(4),
+      explosionRadius: new MetersValue(3.5),
       explodeOnContact: false,
       timerSecs: 5,
       autostartTimer: false,

diff --git a/src/entities/playable/worm.ts b/src/entities/playable/worm.ts
@@ -489,11 +489,6 @@ export class Worm extends PlayableEntity {
     this.perRoundState.shotsTaken++;
     // TODO: Need a middle state for while the world is still active.
     this.cameraLockPriority = CameraLockPriority.NoLock;
-    if (this.weapon.getawayTime) {
-      this.state.transition(InnerWormState.Getaway);
-    } else {
-      this.state.transition(InnerWormState.InactiveWaiting);
-    }
     this.fireWeaponDuration = 0;
     this.onFireWeapon(this, this.currentWeapon, {
       duration,
@@ -503,7 +498,11 @@ export class Worm extends PlayableEntity {
     }).then((fireResult) => {
       if (maxShots === this.perRoundState.shotsTaken) {
         this.turnEndedReason = EndTurnReason.FiredWeapon;
-        this.state.transition(InnerWormState.Inactive);
+        if (this.weapon.allowGetaway) {
+          this.state.transition(InnerWormState.Getaway);
+        } else {
+          this.state.transition(InnerWormState.InactiveWaiting);
+        }
       } else {
         this.state.transition(InnerWormState.Idle);
       }

diff --git a/src/index.css b/src/index.css
@@ -14,6 +14,16 @@
   -webkit-text-size-adjust: 100%;
 }
 
+@media (prefers-color-scheme: dark) {
+  :root {
+    --text: #bdbdbd;
+    --bg: #2e2e2e;
+    --highlight: #b96724;
+    --links: #df8b1c;
+    --subheading: #adadad;
+  }
+}
+
 a {
   font-weight: 500;
   color: #646cff;

diff --git a/src/main.tsx b/src/main.tsx
@@ -1,5 +1,8 @@
 import { render } from "preact";
 import "./index.css";
 import { App } from "./components/app";
+import { loadAssets } from "./assets";
+
+void loadAssets();
 
 render(<App />, document.getElementById("app") as HTMLElement);
diff --git a/src/weapons/bazooka.ts b/src/weapons/bazooka.ts
@@ -20,6 +20,7 @@ export const WeaponBazooka: IWeaponDefiniton = {
   icon,
   maxDuration: 80,
   timerAdjustable: false,
+  allowGetaway: true,
   showTargetGuide: true,
   loadAssets(assets: AssetPack) {
     fireSound = assets.sounds.bazookafire;

diff --git a/src/weapons/firework.ts b/src/weapons/firework.ts
@@ -19,6 +19,7 @@ const WeaponFireworkLauncher: IWeaponDefiniton = {
   code: IWeaponCode.FireworkLauncher,
   icon,
   maxDuration: 80,
+  allowGetaway: true,
   timerAdjustable: false,
   showTargetGuide: true,
   loadAssets(assets: AssetPack) {

diff --git a/src/weapons/grenade.ts b/src/weapons/grenade.ts
@@ -15,6 +15,7 @@ export const WeaponGrenade: IWeaponDefiniton = {
   icon,
   code: IWeaponCode.Grenade,
   maxDuration: 50,
+  allowGetaway: true,
   timerAdjustable: true,
   showTargetGuide: true,
   loadAssets(assets) {

diff --git a/src/weapons/homingMissile.ts b/src/weapons/homingMissile.ts
@@ -19,6 +19,7 @@ const WeaponHomingMissile: IWeaponDefiniton = {
   code: IWeaponCode.HomingMissile,
   icon,
   maxDuration: 80,
+  allowGetaway: true,
   timerAdjustable: false,
   showTargetGuide: true,
   showTargetPicker: true,

diff --git a/src/weapons/mine.ts b/src/weapons/mine.ts
@@ -9,7 +9,7 @@ export const WeaponMine: IWeaponDefiniton = {
   name: "Mine",
   icon,
   code: IWeaponCode.Mine,
-  getawayTime: 350,
+  allowGetaway: true,
   loadAssets(assets) {
     this.sprite = {
       texture: assets.textures.mine,
@@ -18,6 +18,7 @@ export const WeaponMine: IWeaponDefiniton = {
     };
   },
   fireFn(parent: Container, world: GameWorld, worm: Worm) {
-    return Mine.create(parent, world, worm.itemPlacementPosition, 3000);
+    // Getaway time + some time
+    return Mine.create(parent, world, worm.itemPlacementPosition, 7000);
   },
 };
diff --git a/src/weapons/shotgun.ts b/src/weapons/shotgun.ts
@@ -25,6 +25,7 @@ const WeaponShotgun: IWeaponDefiniton = {
   timerAdjustable: false,
   showTargetGuide: true,
   shots: 2,
+  allowGetaway: true,
   loadAssets(assets: AssetPack) {
     fireSound = assets.sounds.shotgun;
     this.sprite = {

diff --git a/src/weapons/weapon.ts b/src/weapons/weapon.ts
@@ -86,7 +86,7 @@ export interface IWeaponDefiniton {
   /**
    * Should the worm be given getaway time?
    */
-  getawayTime?: number;
+  allowGetaway?: boolean;
 
   sprite?: {
     texture: Texture;