Improve gameplay

shared/src/commands/types/actions/primary-action.ts

@@ -4,11 +4,14 @@ import { Command } from '../../command';
 
 @serializable
 export class PrimaryActionCommand extends Command {
-  public constructor(public readonly position: vec2) {
+  public constructor(
+    public readonly position: vec2,
+    public readonly charge: number = 0,
+  ) {
     super();
   }
 
   public toArray(): Array<any> {
-    return [this.position];
+    return [this.position, this.charge];
   }
 }

shared/src/commands/types/actions/secondary-action.ts

@@ -1,14 +0,0 @@
-import { vec2 } from 'gl-matrix';
-import { serializable } from '../../../serialization/serializable';
-import { Command } from '../../command';
-
-@serializable
-export class SecondaryActionCommand extends Command {
-  public constructor(public readonly position: vec2) {
-    super();
-  }
-
-  public toArray(): Array<any> {
-    return [this.position];
-  }
-}

shared/src/helper/charge.ts

@@ -0,0 +1,5 @@
+import { clamp01 } from './clamp';
+import { settings } from '../settings';
+
+export const holdDurationToCharge = (heldSeconds: number): number =>
+  clamp01(heldSeconds / settings.chargeShotFullHoldSeconds);

shared/src/main.ts

@@ -16,7 +16,6 @@ export * from './commands/command-generator';
 export * from './commands/types/actions/move-action';
 export * from './commands/types/actions/primary-action';
 export * from './commands/types/actions/set-aspect-ratio-action';
-export * from './commands/types/actions/secondary-action';
 export * from './helper/array';
 export * from './helper/last';
 export * from './helper/rgb';
@@ -24,6 +23,7 @@ export * from './helper/hsl';
 export * from './helper/rgb255';
 export * from './helper/mix-rgb';
 export * from './helper/clamp';
+export * from './helper/charge';
 export * from './helper/calculate-view-area';
 export * from './helper/circle';
 export * from './helper/rectangle';

shared/src/objects/types/character-base.ts

@@ -26,13 +26,17 @@ export class CharacterBase extends GameObject {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  public onShoot(strength: number) {}
+  public onShoot(strength: number) { }
+
+  public onHitConfirmed() { }
+
+  public onKillConfirmed(victimName?: string, streak?: number) { }
 
   public setHealth(health: number) {
     this.health = health;
   }
 
-  public onDie() {}
+  public onDie() { }
 
   public setKillCount(killCount: number) {
     this.killCount = killCount;

shared/src/objects/types/lamp-base.ts

@@ -13,6 +13,11 @@ export class LampBase extends GameObject {
     super(id);
   }
 
+  // Overridden by LampView (which lerps toward the new colour/brightness); a
+  // no-op on the wire base.
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  public setLight(color: vec3, lightness: number) {}
+
   public toArray(): Array<any> {
     const { id, center, color, lightness } = this;
     return [id, center, color, lightness];

shared/src/objects/types/planet-base.ts

@@ -4,6 +4,7 @@ import { settings } from '../../settings';
 import { serializable } from '../../serialization/serializable';
 import { GameObject } from '../game-object';
 import { Id } from '../../communication/id';
+import { CharacterTeam } from './character-base';
 
 @serializable
 export class PlanetBase extends GameObject {
@@ -25,6 +26,8 @@ export class PlanetBase extends GameObject {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   public generatedPoints(value: number) {}
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  public onFlipped(team: CharacterTeam) {}
 
   public static createPlanetVertices(
     center: vec2,