Remove not needed event from emitSchemeEvent.

Signed-off-by: Neloreck <Neloreck@gmail.com>
xray-forge · Aug 11, 2024 · bf5c4df · bf5c4df
1 parent f8a636d
commit bf5c4df
Show file tree

Hide file tree

Showing 23 changed files with 78 additions and 165 deletions.
diff --git a/src/engine/core/ai/camp/CampManager.test.ts b/src/engine/core/ai/camp/CampManager.test.ts
@@ -136,12 +136,7 @@ describe("CampManager", () => {
 
     manager.registerObject(firstParticipant.id());
 
-    expect(emitSchemeEvent).toHaveBeenCalledWith(
-      firstParticipant,
-      firstState[EScheme.ANIMPOINT],
-      ESchemeEvent.UPDATE,
-      -1
-    );
+    expect(emitSchemeEvent).toHaveBeenCalledWith(firstState[EScheme.ANIMPOINT], ESchemeEvent.UPDATE, -1);
     expect(manager.objects).toEqualLuaTables({
       [firstParticipant.id()]: {
         state: "idle",
@@ -173,12 +168,7 @@ describe("CampManager", () => {
         idle: EObjectCampRole.LISTENER,
       },
     });
-    expect(emitSchemeEvent).toHaveBeenCalledWith(
-      firstParticipant,
-      firstState[EScheme.ANIMPOINT],
-      ESchemeEvent.UPDATE,
-      -1
-    );
+    expect(emitSchemeEvent).toHaveBeenCalledWith(firstState[EScheme.ANIMPOINT], ESchemeEvent.UPDATE, -1);
     expect(firstState.camp).toBe(object.id());
     expect(secondState.camp).toBe(object.id());
     expect(manager.storyManager.registerObject).toHaveBeenCalledWith(secondParticipant.id());

diff --git a/src/engine/core/ai/camp/CampManager.ts b/src/engine/core/ai/camp/CampManager.ts
@@ -136,7 +136,7 @@ export class CampManager {
 
         if (state) {
           // Emit scheme logic update.
-          emitSchemeEvent(state.object, state[state.activeScheme as EScheme] as IBaseSchemeState, ESchemeEvent.UPDATE);
+          emitSchemeEvent(state[state.activeScheme as EScheme] as IBaseSchemeState, ESchemeEvent.UPDATE);
         }
 
         const meetManager: Optional<MeetManager> = (state?.[EScheme.MEET] as ISchemeMeetState)
@@ -279,7 +279,7 @@ export class CampManager {
 
     this.storyManager.registerObject(objectId);
 
-    emitSchemeEvent(state.object, state[state.activeScheme!]!, ESchemeEvent.UPDATE, -1);
+    emitSchemeEvent(state[state.activeScheme!]!, ESchemeEvent.UPDATE, -1);
   }
 
   /**

diff --git a/src/engine/core/animation/animations/animpoint.ts b/src/engine/core/animation/animations/animpoint.ts
@@ -4,7 +4,7 @@ import { EStalkerState } from "@/engine/core/animation/types/state_types";
 import { createSequence } from "@/engine/core/utils/animation";
 import { food } from "@/engine/lib/constants/items/food";
 import { misc } from "@/engine/lib/constants/items/misc";
-import { GameObject, TName } from "@/engine/lib/types";
+import { TName } from "@/engine/lib/types";
 
 /**
  * List of animpoint animations.

diff --git a/src/engine/core/binders/creature/MonsterBinder.test.ts b/src/engine/core/binders/creature/MonsterBinder.test.ts
@@ -165,7 +165,6 @@ describe("MonsterBinder", () => {
     expect(manager.stop).toHaveBeenCalledWith(object.id());
     expect(emitSchemeEvent).toHaveBeenCalledTimes(1);
     expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
       state[state.activeScheme] as IBaseSchemeState,
       ESchemeEvent.SWITCH_OFFLINE,
       object
@@ -290,7 +289,6 @@ describe("MonsterBinder", () => {
     expect(object.set_tip_text).toHaveBeenCalledWith("");
     expect(trySwitchToAnotherSection).toHaveBeenCalledWith(object, state[state.activeScheme] as IBaseSchemeState);
     expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
       state[state.activeScheme] as IBaseSchemeState,
       ESchemeEvent.UPDATE,
       100
@@ -397,14 +395,7 @@ describe("MonsterBinder", () => {
     binder.onWaypoint(object, 1, 5);
 
     expect(emitSchemeEvent).toHaveBeenCalledTimes(1);
-    expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
-      binder.state[EScheme.PATROL],
-      ESchemeEvent.WAYPOINT,
-      object,
-      1,
-      5
-    );
+    expect(emitSchemeEvent).toHaveBeenCalledWith(binder.state[EScheme.PATROL], ESchemeEvent.WAYPOINT, object, 1, 5);
   });
 
   it("should handle death event", () => {
@@ -440,8 +431,8 @@ describe("MonsterBinder", () => {
     expect(binder.resetCallbacks).toHaveBeenCalledTimes(1);
 
     expect(emitSchemeEvent).toHaveBeenCalledTimes(2);
-    expect(emitSchemeEvent).toHaveBeenCalledWith(object, state[EScheme.MOB_DEATH], ESchemeEvent.DEATH, object, killer);
-    expect(emitSchemeEvent).toHaveBeenCalledWith(object, state[state.activeScheme], ESchemeEvent.DEATH, object, killer);
+    expect(emitSchemeEvent).toHaveBeenCalledWith(state[EScheme.MOB_DEATH], ESchemeEvent.DEATH, object, killer);
+    expect(emitSchemeEvent).toHaveBeenCalledWith(state[state.activeScheme], ESchemeEvent.DEATH, object, killer);
 
     expect(manager.emitEvent).toHaveBeenCalledTimes(1);
     expect(manager.emitEvent).toHaveBeenCalledWith(EGameEvent.MONSTER_DEATH, object, killer);
@@ -490,7 +481,6 @@ describe("MonsterBinder", () => {
 
     expect(emitSchemeEvent).toHaveBeenCalledTimes(1);
     expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
       binder.state[EScheme.HIT],
       ESchemeEvent.HIT,
       object,

diff --git a/src/engine/core/binders/creature/MonsterBinder.ts b/src/engine/core/binders/creature/MonsterBinder.ts
@@ -108,7 +108,7 @@ export class MonsterBinder extends object_binder {
     registry.actorCombat.delete(objectId);
 
     if (state.activeScheme) {
-      emitSchemeEvent(object, state[state.activeScheme] as IBaseSchemeState, ESchemeEvent.SWITCH_OFFLINE, object);
+      emitSchemeEvent(state[state.activeScheme] as IBaseSchemeState, ESchemeEvent.SWITCH_OFFLINE, object);
     }
 
     const onOfflineConditionList: Optional<TConditionList> = state.overrides?.onOffline as Optional<TConditionList>;
@@ -171,7 +171,7 @@ export class MonsterBinder extends object_binder {
     }
 
     if (state.activeScheme) {
-      emitSchemeEvent(object, state[state.activeScheme] as IBaseSchemeState, ESchemeEvent.UPDATE, delta);
+      emitSchemeEvent(state[state.activeScheme] as IBaseSchemeState, ESchemeEvent.UPDATE, delta);
     }
   }
 
@@ -225,7 +225,6 @@ export class MonsterBinder extends object_binder {
   public onWaypoint(object: GameObject, actionType: number, index: TIndex): void {
     if (this.state.activeScheme) {
       emitSchemeEvent(
-        this.object,
         this.state[this.state.activeScheme] as IBaseSchemeState,
         ESchemeEvent.WAYPOINT,
         object,
@@ -251,11 +250,11 @@ export class MonsterBinder extends object_binder {
     this.onHit(object, 1, ZERO_VECTOR, killer, -1);
 
     if (state[EScheme.MOB_DEATH]) {
-      emitSchemeEvent(object, state[EScheme.MOB_DEATH], ESchemeEvent.DEATH, object, killer);
+      emitSchemeEvent(state[EScheme.MOB_DEATH], ESchemeEvent.DEATH, object, killer);
     }
 
     if (state.activeScheme) {
-      emitSchemeEvent(object, state[state.activeScheme] as IBaseSchemeState, ESchemeEvent.DEATH, object, killer);
+      emitSchemeEvent(state[state.activeScheme] as IBaseSchemeState, ESchemeEvent.DEATH, object, killer);
     }
 
     const hitObject: Hit = new hit();
@@ -294,7 +293,7 @@ export class MonsterBinder extends object_binder {
     boneIndex: TLabel | TIndex
   ): void {
     if (this.state[EScheme.HIT]) {
-      emitSchemeEvent(this.object, this.state.hit, ESchemeEvent.HIT, object, amount, direction, who, boneIndex);
+      emitSchemeEvent(this.state.hit, ESchemeEvent.HIT, object, amount, direction, who, boneIndex);
     }
 
     EventsManager.emitEvent(EGameEvent.MONSTER_HIT, object, amount, direction, who, boneIndex);

diff --git a/src/engine/core/binders/creature/StalkerBinder.test.ts b/src/engine/core/binders/creature/StalkerBinder.test.ts
@@ -224,7 +224,6 @@ describe("StalkerBinder", () => {
 
     expect(emitSchemeEvent).toHaveBeenCalledTimes(4);
     expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
       state[EScheme.ANIMPOINT],
       ESchemeEvent.HIT,
       object,
@@ -234,7 +233,6 @@ describe("StalkerBinder", () => {
       10
     );
     expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
       state[EScheme.COMBAT_IGNORE],
       ESchemeEvent.HIT,
       object,
@@ -244,7 +242,6 @@ describe("StalkerBinder", () => {
       10
     );
     expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
       state[EScheme.COMBAT],
       ESchemeEvent.HIT,
       object,
@@ -254,7 +251,6 @@ describe("StalkerBinder", () => {
       10
     );
     expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
       state[EScheme.HIT],
       ESchemeEvent.HIT,
       object,

diff --git a/src/engine/core/binders/creature/StalkerBinder.ts b/src/engine/core/binders/creature/StalkerBinder.ts
@@ -179,11 +179,11 @@ export class StalkerBinder extends object_binder {
     registry.actorCombat.delete(objectId);
 
     if (state.activeScheme) {
-      emitSchemeEvent(object, state[state.activeScheme]!, ESchemeEvent.SWITCH_OFFLINE, object);
+      emitSchemeEvent(state[state.activeScheme]!, ESchemeEvent.SWITCH_OFFLINE, object);
     }
 
     if (state[EScheme.REACH_TASK]) {
-      emitSchemeEvent(object, state[EScheme.REACH_TASK], ESchemeEvent.SWITCH_OFFLINE, object);
+      emitSchemeEvent(state[EScheme.REACH_TASK], ESchemeEvent.SWITCH_OFFLINE, object);
     }
 
     // Call logics on offline.
@@ -429,15 +429,15 @@ export class StalkerBinder extends object_binder {
     this.updateLightState(object);
 
     if (state[EScheme.REACH_TASK]) {
-      emitSchemeEvent(object, state[EScheme.REACH_TASK], ESchemeEvent.DEATH, victim, who);
+      emitSchemeEvent(state[EScheme.REACH_TASK], ESchemeEvent.DEATH, victim, who);
     }
 
     if (state[EScheme.DEATH]) {
-      emitSchemeEvent(this.object, state[EScheme.DEATH], ESchemeEvent.DEATH, victim, who);
+      emitSchemeEvent(state[EScheme.DEATH], ESchemeEvent.DEATH, victim, who);
     }
 
     if (state.activeScheme) {
-      emitSchemeEvent(object, state[state.activeScheme]!, ESchemeEvent.DEATH, victim, who);
+      emitSchemeEvent(state[state.activeScheme]!, ESchemeEvent.DEATH, victim, who);
     }
 
     EventsManager.emitEvent(EGameEvent.STALKER_DEATH, object, who);
@@ -470,7 +470,7 @@ export class StalkerBinder extends object_binder {
       activateMeetWithObject(object);
 
       if (this.state.activeScheme) {
-        emitSchemeEvent(this.object, this.state[this.state.activeScheme]!, ESchemeEvent.USE, object, who);
+        emitSchemeEvent(this.state[this.state.activeScheme]!, ESchemeEvent.USE, object, who);
       }
     }
   }
@@ -480,7 +480,7 @@ export class StalkerBinder extends object_binder {
    */
   public onPatrolExtrapolate(pointIndex: TIndex): boolean {
     if (this.state.activeScheme) {
-      emitSchemeEvent(this.object, this.state[this.state.activeScheme]!, ESchemeEvent.EXTRAPOLATE, pointIndex);
+      emitSchemeEvent(this.state[this.state.activeScheme]!, ESchemeEvent.EXTRAPOLATE, pointIndex);
       (this.state.patrolManager as StalkerPatrolManager).onExtrapolate(this.object, pointIndex);
     }
 
@@ -511,28 +511,19 @@ export class StalkerBinder extends object_binder {
     }
 
     if (state.activeScheme) {
-      emitSchemeEvent(object, state[state.activeScheme!]!, ESchemeEvent.HIT, object, amount, direction, who, boneIndex);
+      emitSchemeEvent(state[state.activeScheme!]!, ESchemeEvent.HIT, object, amount, direction, who, boneIndex);
     }
 
     if (state[EScheme.COMBAT_IGNORE]) {
-      emitSchemeEvent(
-        object,
-        state[EScheme.COMBAT_IGNORE],
-        ESchemeEvent.HIT,
-        object,
-        amount,
-        direction,
-        who,
-        boneIndex
-      );
+      emitSchemeEvent(state[EScheme.COMBAT_IGNORE], ESchemeEvent.HIT, object, amount, direction, who, boneIndex);
     }
 
     if (state[EScheme.COMBAT]) {
-      emitSchemeEvent(object, state[EScheme.COMBAT], ESchemeEvent.HIT, object, amount, direction, who, boneIndex);
+      emitSchemeEvent(state[EScheme.COMBAT], ESchemeEvent.HIT, object, amount, direction, who, boneIndex);
     }
 
     if (state[EScheme.HIT]) {
-      emitSchemeEvent(object, state[EScheme.HIT], ESchemeEvent.HIT, object, amount, direction, who, boneIndex);
+      emitSchemeEvent(state[EScheme.HIT], ESchemeEvent.HIT, object, amount, direction, who, boneIndex);
     }
 
     if (boneIndex !== 15 && amount > object.health * 100) {

diff --git a/src/engine/core/binders/helicopter/HelicopterBinder.test.ts b/src/engine/core/binders/helicopter/HelicopterBinder.test.ts
@@ -164,7 +164,7 @@ describe("HelicopterBinder", () => {
     expect(binder.helicopterFireManager.onHit).toHaveBeenCalledTimes(1);
 
     expect(emitSchemeEvent).toHaveBeenCalledTimes(1);
-    expect(emitSchemeEvent).toHaveBeenCalledWith(object, schemeState, ESchemeEvent.HIT, object, 0.5, null, enemy, null);
+    expect(emitSchemeEvent).toHaveBeenCalledWith(schemeState, ESchemeEvent.HIT, object, 0.5, null, enemy, null);
   });
 
   it("should correctly handle waypoint events", () => {
@@ -180,6 +180,6 @@ describe("HelicopterBinder", () => {
     binder.onWaypoint(10, ZERO_VECTOR, 4);
 
     expect(emitSchemeEvent).toHaveBeenCalledTimes(1);
-    expect(emitSchemeEvent).toHaveBeenCalledWith(object, schemeState, ESchemeEvent.WAYPOINT, object, null, 4);
+    expect(emitSchemeEvent).toHaveBeenCalledWith(schemeState, ESchemeEvent.WAYPOINT, object, null, 4);
   });
 });
diff --git a/src/engine/core/binders/helicopter/HelicopterBinder.ts b/src/engine/core/binders/helicopter/HelicopterBinder.ts
@@ -81,7 +81,7 @@ export class HelicopterBinder extends object_binder {
     }
 
     if (this.state.activeScheme) {
-      emitSchemeEvent(this.object, this.state[this.state.activeScheme]!, ESchemeEvent.UPDATE, delta);
+      emitSchemeEvent(this.state[this.state.activeScheme]!, ESchemeEvent.UPDATE, delta);
     }
 
     // Check helicopter health and state.
@@ -161,7 +161,7 @@ export class HelicopterBinder extends object_binder {
     this.helicopterFireManager.onHit();
 
     if (this.state.hit && (enemyClassId === clsid.actor || enemyClassId === clsid.script_stalker)) {
-      emitSchemeEvent(this.object, this.state.hit, ESchemeEvent.HIT, this.object, power, null, enemy, null);
+      emitSchemeEvent(this.state.hit, ESchemeEvent.HIT, this.object, power, null, enemy, null);
     }
   }
 
@@ -172,14 +172,7 @@ export class HelicopterBinder extends object_binder {
    */
   public onWaypoint(distance: TDistance, position: Vector, index: TIndex): void {
     if (this.state.activeScheme) {
-      emitSchemeEvent(
-        this.object,
-        this.state[this.state.activeScheme]!,
-        ESchemeEvent.WAYPOINT,
-        this.object,
-        null,
-        index
-      );
+      emitSchemeEvent(this.state[this.state.activeScheme]!, ESchemeEvent.WAYPOINT, this.object, null, index);
     }
   }
 }
diff --git a/src/engine/core/binders/physic/PhysicObjectBinder.test.ts b/src/engine/core/binders/physic/PhysicObjectBinder.test.ts
@@ -105,12 +105,7 @@ describe("PhysicObjectBinder", () => {
     expect(soundManager.stop).toHaveBeenCalledWith(binder.object.id());
     expect(level.map_remove_object_spot).toHaveBeenCalledWith(binder.object.id(), "ui_pda2_actor_box_location");
 
-    expect(emitSchemeEvent).toHaveBeenCalledWith(
-      binder.object,
-      state[EScheme.ANIMPOINT],
-      ESchemeEvent.SWITCH_OFFLINE,
-      binder.object
-    );
+    expect(emitSchemeEvent).toHaveBeenCalledWith(state[EScheme.ANIMPOINT], ESchemeEvent.SWITCH_OFFLINE, binder.object);
     expect(hasInfoPortion("test_info_pb")).toBe(true);
   });
 
@@ -138,7 +133,7 @@ describe("PhysicObjectBinder", () => {
 
     expect(binder.isInitialized).toBe(true);
     expect(initializeObjectSchemeLogic).toHaveBeenCalledWith(object, binder.state, false, ESchemeType.OBJECT);
-    expect(emitSchemeEvent).toHaveBeenCalledWith(object, binder.state[EScheme.ANIMPOINT], ESchemeEvent.UPDATE, 150);
+    expect(emitSchemeEvent).toHaveBeenCalledWith(binder.state[EScheme.ANIMPOINT], ESchemeEvent.UPDATE, 150);
     expect(getManager(SoundManager).update).toHaveBeenCalledWith(object.id());
   });
 
@@ -219,13 +214,7 @@ describe("PhysicObjectBinder", () => {
 
     binder.onUse(object, who);
 
-    expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
-      binder.state[EScheme.ANIMPOINT],
-      ESchemeEvent.USE,
-      object,
-      who
-    );
+    expect(emitSchemeEvent).toHaveBeenCalledWith(binder.state[EScheme.ANIMPOINT], ESchemeEvent.USE, object, who);
   });
 
   it("should handle hit events", () => {
@@ -242,7 +231,6 @@ describe("PhysicObjectBinder", () => {
     binder.onHit(object, 0.5, ZERO_VECTOR, who, 10);
 
     expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
       binder.state[EScheme.HIT],
       ESchemeEvent.HIT,
       object,
@@ -252,7 +240,6 @@ describe("PhysicObjectBinder", () => {
       10
     );
     expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
       binder.state[binder.state.activeScheme],
       ESchemeEvent.HIT,
       object,
@@ -287,7 +274,6 @@ describe("PhysicObjectBinder", () => {
     binder.onDeath(object, killer);
 
     expect(emitSchemeEvent).toHaveBeenCalledWith(
-      object,
       binder.state[binder.state.activeScheme],
       ESchemeEvent.DEATH,
       object,