implemented player actions

Author: LPEdwin

src/game/game-server.ts

@@ -1,5 +1,5 @@
 import { Peer, type DataConnection } from 'peerjs';
-import type { PlayerAction } from "./player";
+import type { PlayerAction } from "./player-action";
 import { getRole } from "../device";
 
 type Events = {
@@ -32,9 +32,6 @@ export class GameServer {
         return () => this.listeners[k]!.delete(fn);
     }
 
-
-
-
     static async host(): Promise<GameServer> {
         const host = new Peer(this.id);
         const game = new GameServer();

src/game/player-action.ts

@@ -0,0 +1,30 @@
+import { Vector3 } from "three";
+
+export type Vec3 = [number, number, number]
+
+export const toVec3 = (v: { x: number; y: number; z: number }): Vec3 => [v.x, v.y, v.z];
+export const fromVec3 = (v: Vec3) => new Vector3(v[0], v[1], v[2]);
+
+
+export interface PlayerAction<K extends keyof Actions = keyof Actions> {
+    type: K;
+    payload: Actions[K];
+}
+
+export type Actions = {
+    ability: never,
+    attack: never,
+    move: { target: Vec3 },
+    none: never
+}
+
+export function createAction<K extends keyof Actions>(
+    type: K,
+    ...payload: Actions[K] extends never ? [] : [payload: Actions[K]]
+) {
+    return (payload.length
+        ? { type, payload: payload[0] }
+        : { type }) as Actions[K] extends never // explicitly define return type
+        ? { type: K }
+        : { type: K, payload: Actions[K] };
+}

src/game/player.ts

@@ -1,18 +1,4 @@
-import { Vector3 } from "three";
-
-export type Vec3 = [number, number, number]
-
-export const toVec3 = (v: { x: number; y: number; z: number }): Vec3 => [v.x, v.y, v.z];
-export const fromVec3 = (v: Vec3) => new Vector3(v[0], v[1], v[2]);
-
 export interface Player {
     id?: number;
     name?: string;
-}
-
-export type ActionType = 'Ability' | 'Attack' | 'Move' | 'None';
-
-export interface PlayerAction {
-    type: ActionType;
-    targetPosition?: Vec3;
 }

src/main.ts

@@ -7,7 +7,7 @@ import { RenderPass } from "three/examples/jsm/postprocessing/RenderPass.js";
 import { UnrealBloomPass } from "three/examples/jsm/postprocessing/UnrealBloomPass.js";
 import { getRole, isMobile } from "./device";
 import { GameServer } from "./game/game-server";
-import { fromVec3, toVec3, type PlayerAction, type Vec3 } from "./game/player";
+import { createAction, fromVec3, toVec3, type PlayerAction } from "./game/player-action";
 
 // Required for Github Pages deployment
 THREE.DefaultLoadingManager.setURLModifier((url) => {
@@ -207,7 +207,8 @@ async function init() {
             currentTarget = picked.getWorldPosition(new THREE.Vector3());
             currentTarget.x += 0.4;
             currentTarget.y = scar.position.y;
-            playAction({ type: 'Move', targetPosition: toVec3(currentTarget) });
+            const move = createAction('move', { target: toVec3(currentTarget) })
+            playAction(move);
             if (currentPick) {
                 // restore material
                 currentPick.material = currentMaterial!;
@@ -311,7 +312,7 @@ async function init() {
 
     function playActionLocal(action: PlayerAction) {
         switch (action.type) {
-            case 'Move': currentTarget = mapXZFrom(fromVec3(action.targetPosition!), scar.position);
+            case 'move': currentTarget = mapXZFrom(fromVec3(action.payload.target), scar.position);
         }
     }