Merge 99b6001 into 807f161

project-slippi · Aug 5, 2021 · 7c690e4 · 7c690e4
2 parents 807f161 + 99b6001
commit 7c690e4
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/slp/facingDirection.slp b/slp/facingDirection.slp
diff --git a/slp/techTest.slp b/slp/techTest.slp
diff --git a/slp/techTester.slp b/slp/techTester.slp
diff --git a/src/stats/actions.ts b/src/stats/actions.ts
@@ -44,8 +44,9 @@ export class ActionsComputer implements StatComputer<ActionCountsType[]> {
           down: 0,
         },
         groundTechCount: {
-          backward: 0,
-          forward: 0,
+          // tech away/in are in reference to the opponents position and not the stage
+          away: 0,
+          in: 0,
           neutral: 0,
           fail: 0,
         },
@@ -137,6 +138,7 @@ function didStartLedgegrab(currentAnimation: State, previousAnimation: State): b
 
 function handleActionCompute(state: PlayerActionState, indices: PlayerIndexedType, frame: FrameEntryType): void {
   const playerFrame = frame.players[indices.playerIndex]!.post;
+  const opponentFrame = frame.players[indices.opponentIndex]!.post;
   const incrementCount = (field: string, condition: boolean): void => {
     if (!condition) {
       return;
@@ -183,9 +185,21 @@ function handleActionCompute(state: PlayerActionState, indices: PlayerIndexedTyp
   if (newAnimation) {
     const didMissTech = didMissGroundTech(currentAnimation);
     incrementCount("groundTechCount.fail", didMissTech);
-    incrementCount("groundTechCount.forward", currentAnimation === State.FORWARD_TECH);
+    let opponentDir = 1;
+    let facingOpponent = false;
+
+    if (playerFrame.positionX! > opponentFrame.positionX!) {
+      opponentDir = -1;
+    }
+    if (playerFrame.facingDirection == opponentDir) {
+      facingOpponent = true;
+    }
+
+    incrementCount("groundTechCount.in", currentAnimation === State.FORWARD_TECH && facingOpponent);
+    incrementCount("groundTechCount.in", currentAnimation === State.BACKWARD_TECH && !facingOpponent);
     incrementCount("groundTechCount.neutral", currentAnimation === State.NEUTRAL_TECH);
-    incrementCount("groundTechCount.backward", currentAnimation === State.BACKWARD_TECH);
+    incrementCount("groundTechCount.away", currentAnimation === State.BACKWARD_TECH && facingOpponent);
+    incrementCount("groundTechCount.away", currentAnimation === State.FORWARD_TECH && !facingOpponent);
 
     incrementCount("wallTechCount.success", currentAnimation === State.WALL_TECH);
     incrementCount("wallTechCount.fail", currentAnimation === State.MISSED_WALL_TECH);

diff --git a/src/stats/common.ts b/src/stats/common.ts
@@ -84,8 +84,9 @@ export interface ActionCountsType {
     down: number;
   };
   groundTechCount: {
-    backward: number;
-    forward: number;
+    // tech away/in are in reference to the opponents position and not the stage
+    away: number;
+    in: number;
     neutral: number;
     fail: number;
   };

diff --git a/test/stats.spec.ts b/test/stats.spec.ts
@@ -133,9 +133,13 @@ describe("when calculating stats", () => {
   });
 
   it("should count techs only a single time", () => {
-    const game = new SlippiGame("slp/techTest.slp");
+    const game = new SlippiGame("slp/techTester.slp");
+    const game2 = new SlippiGame("slp/facingDirection.slp");
     const stats = game.getStats();
-    expect(stats?.actionCounts[1].groundTechCount).toEqual({ backward: 2, forward: 1, neutral: 8, fail: 4 });
+    const stats2 = game2.getStats();
+    expect(stats?.actionCounts[0].groundTechCount).toEqual({ in: 4, away: 4, neutral: 4, fail: 4 });
+    // 3 of these tech aways are not facing the opponent
+    expect(stats2?.actionCounts[1].groundTechCount).toEqual({ in: 1, away: 4, neutral: 4, fail: 11 });
     expect(stats?.actionCounts[1].wallTechCount).toEqual({ success: 0, fail: 0 });
   });
 });