chase mechanism fix

keshav2010 · Mar 2, 2024 · 948a0b4 · 948a0b4
1 parent c071879
commit 948a0b4
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 21 deletions.
diff --git a/.env-example b/.env-example
@@ -1,4 +1,6 @@
 TICKRATE=24
-COUNTDOWN=5
+COUNTDOWN=5000
+COUNTDOWN_SPAWN_SELECTION=10000
+COUNTDOWN_DEFAULT=15000
 MAX_SESSION_PER_WORKER=10
-MINIMUM_PLAYERS_PER_SESSION=2
+MINIMUM_PLAYERS_PER_SESSION=1
diff --git a/gameserver/commands/OnSoldierAttackCommand.ts b/gameserver/commands/OnSoldierAttackCommand.ts
@@ -3,9 +3,36 @@ import { Command } from "@colyseus/command";
 import { SessionRoom } from "../SessionRoom";
 import { Client } from "colyseus";
 import { CommandPayload } from "./CommandPayloadType";
+import { SoldierState } from "../schema/SoldierState";
 export class OnSoldierAttackCommand extends Command<
   SessionRoom,
   CommandPayload
 > {
-  execute({ client, message, gameManager }: CommandPayload) {}
+  execute({
+    client,
+    message,
+    gameManager,
+  }: CommandPayload<{
+    soldiers: string[];
+    targetPlayerId: string;
+    targetSoldierId: string;
+  }>) {
+    console.log("Soldier Attack Requested ", message);
+    const attacker = this.state.getPlayer(client.id);
+    const victim = this.state.getPlayer(message.targetPlayerId);
+    if (!attacker || !victim) {
+      return;
+    }
+    const targetSoldier = victim.getSoldier(message.targetSoldierId);
+    if (!targetSoldier) {
+      return;
+    }
+
+    const attackerUnits = attacker
+      .getAllSoldiers()
+      .filter((soldier) => message.soldiers.includes(soldier.id));
+    attackerUnits.forEach((unit: SoldierState) => {
+      unit.attackUnit(targetSoldier, gameManager!);
+    });
+  }
 }
diff --git a/gameserver/stateMachines/soldier-state-machine/SoldierStateBehaviour.ts b/gameserver/stateMachines/soldier-state-machine/SoldierStateBehaviour.ts
@@ -15,7 +15,6 @@ export default {
     soldier: SoldierState;
   }) => {
     if (!soldier.hasReachedDestination()) {
-      console.log("soldier not at destination, moving..");
       soldier.stateMachine.controller.send("Move");
       return;
     }
@@ -129,13 +128,7 @@ export default {
 
     //if attacked soldier unit dead, update server-state and schedule update for client.
     if (attackTarget.health === 0) {
-      let isRemoved = stateManager.removeSoldier(attackTarget);
-      if (!isRemoved)
-        console.log(
-          `Soldier ID#${
-            attackTarget?.getSceneItem().id
-          } is probably already removed.`
-        );
+      stateManager.removeSoldier(attackTarget);
       soldier.setAttackTarget(attackTarget);
       soldier.stateMachine.controller.send("TargetKilled");
     }
@@ -229,30 +222,37 @@ export default {
       if (!soldierAttackTarget) {
         soldier.stateMachine.controller.send("TargetLost");
         return;
-      }
+      } 
 
-      let seperationForce = soldier.getSeperationVector(stateManager);
-      let steerForce = soldier.getSteerVector(
+      const seperationForce = soldier.getSeperationVector(stateManager);
+      const steerForce = soldier.getSteerVector(
         soldierAttackTarget.getSceneItem().pos
       );
       soldier.applyForce(seperationForce, delta);
       soldier.applyForce(steerForce, delta);
 
-      soldier.setTargetPosition(soldierAttackTarget.getSceneItem().pos);
+      soldier.targetPositionX = soldierAttackTarget.getSceneItem().pos.x;
+      soldier.targetPositionY = soldierAttackTarget.getSceneItem().pos.y;
+
+      soldier.expectedPositionX = soldierAttackTarget.getSceneItem().pos.x;
+      soldier.expectedPositionY = soldierAttackTarget.getSceneItem().pos.y;
 
-      let distToTarget = new SAT.Vector()
+      const distToTarget = new SAT.Vector()
         .copy(soldierAttackTarget.getSceneItem().pos)
         .sub(soldier.getSceneItem().pos)
         .len();
       if (distToTarget <= SoldierConstants.DESIRED_DIST_FROM_TARGET) {
         soldier.stateMachine.controller.send("TargetInRange");
       }
     } catch (err) {
-      console.log(err);
+      console.error(err);
       if (soldierAttackTarget) {
-        soldier.setTargetPosition(soldierAttackTarget.getSceneItem().pos);
-        soldier.setExpectedPosition(soldierAttackTarget.getSceneItem().pos);
-      }
+        soldier.targetPositionX = soldierAttackTarget.getSceneItem().pos.x;
+        soldier.targetPositionY = soldierAttackTarget.getSceneItem().pos.y;
+
+        soldier.expectedPositionX = soldierAttackTarget.getSceneItem().pos.x;
+        soldier.expectedPositionY = soldierAttackTarget.getSceneItem().pos.y;
+        }
       soldier.setAttackTarget(null);
     }
   },

diff --git a/public/scenes/GameScene.ts b/public/scenes/GameScene.ts
@@ -236,7 +236,7 @@ export class GameScene extends BaseScene {
             networkManager.sendEventToServer(
               PacketType.ByClient.SOLDIER_ATTACK_REQUESTED,
               {
-                soldiers: selectedSoldiersForAttack.map((v) => v.id).join(","),
+                soldiers: selectedSoldiersForAttack.map((v) => v.id),
                 targetPlayerId: targetSoldier.playerId,
                 targetSoldierId: targetSoldier.id,
               }