fix(video): first kill camera not focusing on correct player with 5EPlay demos

akiver · akiver · commit 24f3b70e7d3a · 2025-08-26T23:41:35.000+02:00
ref #1123
diff --git a/src/node/counter-strike/json-actions-file/__snapshots__/generate-player-highlights-json-file.test.ts.snap b/src/node/counter-strike/json-actions-file/__snapshots__/generate-player-highlights-json-file.test.ts.snap
@@ -16,40 +16,40 @@ exports[`Generate player's highlights JSON file > CS2 1`] = `
         "cmd": "demo_gototick 872",
         "tick": 64
       },
-      {
-        "cmd": "spec_player 4",
-        "tick": 872
-      },
       {
         "cmd": "spec_mode 1",
         "tick": 872
       },
       {
         "cmd": "spec_player 4",
-        "tick": 1200
+        "tick": 872
       },
       {
         "cmd": "spec_mode 1",
         "tick": 1200
       },
       {
         "cmd": "spec_player 4",
-        "tick": 1700
+        "tick": 1200
       },
       {
         "cmd": "spec_mode 1",
         "tick": 1700
       },
+      {
+        "cmd": "spec_player 4",
+        "tick": 1700
+      },
       {
         "cmd": "demo_gototick 4872",
         "tick": 2256
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 4872
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 4872
       },
       {
diff --git a/src/node/counter-strike/json-actions-file/__snapshots__/generate-player-lowlights-json-file.test.ts.snap b/src/node/counter-strike/json-actions-file/__snapshots__/generate-player-lowlights-json-file.test.ts.snap
@@ -24,40 +24,40 @@ exports[`Generate player's lowlights JSON file > CS2 1`] = `
         "cmd": "demo_gototick 872",
         "tick": 64
       },
-      {
-        "cmd": "spec_player 4",
-        "tick": 872
-      },
       {
         "cmd": "spec_mode 1",
         "tick": 872
       },
       {
         "cmd": "spec_player 4",
-        "tick": 1200
+        "tick": 872
       },
       {
         "cmd": "spec_mode 1",
         "tick": 1200
       },
       {
         "cmd": "spec_player 4",
-        "tick": 1700
+        "tick": 1200
       },
       {
         "cmd": "spec_mode 1",
         "tick": 1700
       },
+      {
+        "cmd": "spec_player 4",
+        "tick": 1700
+      },
       {
         "cmd": "demo_gototick 4872",
         "tick": 2256
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 4872
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 4872
       },
       {
diff --git a/src/node/counter-strike/json-actions-file/__snapshots__/generate-player-rounds-json-file.test.ts.snap b/src/node/counter-strike/json-actions-file/__snapshots__/generate-player-rounds-json-file.test.ts.snap
@@ -25,47 +25,47 @@ exports[`Generate player's rounds JSON file > CS2 1`] = `
         "tick": 64
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 64
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 64
       },
       {
         "cmd": "demo_gototick 10752",
         "tick": 5864
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 5864
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 5864
       },
       {
         "cmd": "demo_gototick 16152",
         "tick": 13184
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 13184
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 13184
       },
       {
         "cmd": "demo_gototick 21352",
         "tick": 18984
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 18984
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 18984
       },
       {
diff --git a/src/node/counter-strike/json-actions-file/json-actions-file-generator.ts b/src/node/counter-strike/json-actions-file/json-actions-file-generator.ts
@@ -51,16 +51,17 @@ export class JSONActionsFileGenerator {
         tick: actionTick,
       });
     } else {
-      this.actions.push({
-        cmd: `spec_player ${playerId}`,
-        tick: actionTick,
-      });
       // The camera may be stuck in free mode with some demos (probably related to a server configuration)
       // Force the first person camera mode so the camera will properly focus on the player.
+      // ! It's important to set spec_mode before spec_player otherwise the spec_player command may not work.
       this.actions.push({
         cmd: 'spec_mode 1',
         tick: actionTick,
       });
+      this.actions.push({
+        cmd: `spec_player ${playerId}`,
+        tick: actionTick,
+      });
     }
 
     return this;
diff --git a/src/node/counter-strike/json-actions-file/output/cs2-player-highlights.dem.json b/src/node/counter-strike/json-actions-file/output/cs2-player-highlights.dem.json
@@ -13,40 +13,40 @@
         "cmd": "demo_gototick 872",
         "tick": 64
       },
-      {
-        "cmd": "spec_player 4",
-        "tick": 872
-      },
       {
         "cmd": "spec_mode 1",
         "tick": 872
       },
       {
         "cmd": "spec_player 4",
-        "tick": 1200
+        "tick": 872
       },
       {
         "cmd": "spec_mode 1",
         "tick": 1200
       },
       {
         "cmd": "spec_player 4",
-        "tick": 1700
+        "tick": 1200
       },
       {
         "cmd": "spec_mode 1",
         "tick": 1700
       },
+      {
+        "cmd": "spec_player 4",
+        "tick": 1700
+      },
       {
         "cmd": "demo_gototick 4872",
         "tick": 2256
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 4872
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 4872
       },
       {
diff --git a/src/node/counter-strike/json-actions-file/output/cs2-player-lowlights.dem.json b/src/node/counter-strike/json-actions-file/output/cs2-player-lowlights.dem.json
@@ -21,40 +21,40 @@
         "cmd": "demo_gototick 872",
         "tick": 64
       },
-      {
-        "cmd": "spec_player 4",
-        "tick": 872
-      },
       {
         "cmd": "spec_mode 1",
         "tick": 872
       },
       {
         "cmd": "spec_player 4",
-        "tick": 1200
+        "tick": 872
       },
       {
         "cmd": "spec_mode 1",
         "tick": 1200
       },
       {
         "cmd": "spec_player 4",
-        "tick": 1700
+        "tick": 1200
       },
       {
         "cmd": "spec_mode 1",
         "tick": 1700
       },
+      {
+        "cmd": "spec_player 4",
+        "tick": 1700
+      },
       {
         "cmd": "demo_gototick 4872",
         "tick": 2256
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 4872
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 4872
       },
       {
diff --git a/src/node/counter-strike/json-actions-file/output/cs2-player-rounds.dem.json b/src/node/counter-strike/json-actions-file/output/cs2-player-rounds.dem.json
@@ -22,47 +22,47 @@
         "tick": 64
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 64
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 64
       },
       {
         "cmd": "demo_gototick 10752",
         "tick": 5864
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 5864
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 5864
       },
       {
         "cmd": "demo_gototick 16152",
         "tick": 13184
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 13184
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 13184
       },
       {
         "cmd": "demo_gototick 21352",
         "tick": 18984
       },
       {
-        "cmd": "spec_player 4",
+        "cmd": "spec_mode 1",
         "tick": 18984
       },
       {
-        "cmd": "spec_mode 1",
+        "cmd": "spec_player 4",
         "tick": 18984
       },
       {

Original file line number	Diff line number	Diff line change
@@ -16,40 +16,40 @@ exports[`Generate player's highlights JSON file > CS2 1`] = `
`16`	`16`	`"cmd": "demo_gototick 872",`
`17`	`17`	`"tick": 64`
`18`	`18`	`},`
`19`		`- {`
`20`		`- "cmd": "spec_player 4",`
`21`		`- "tick": 872`
`22`		`- },`
`23`	`19`	`{`
`24`	`20`	`"cmd": "spec_mode 1",`
`25`	`21`	`"tick": 872`
`26`	`22`	`},`
`27`	`23`	`{`
`28`	`24`	`"cmd": "spec_player 4",`
`29`		`- "tick": 1200`
	`25`	`+ "tick": 872`
`30`	`26`	`},`
`31`	`27`	`{`
`32`	`28`	`"cmd": "spec_mode 1",`
`33`	`29`	`"tick": 1200`
`34`	`30`	`},`
`35`	`31`	`{`
`36`	`32`	`"cmd": "spec_player 4",`
`37`		`- "tick": 1700`
	`33`	`+ "tick": 1200`
`38`	`34`	`},`
`39`	`35`	`{`
`40`	`36`	`"cmd": "spec_mode 1",`
`41`	`37`	`"tick": 1700`
`42`	`38`	`},`
	`39`	`+ {`
	`40`	`+ "cmd": "spec_player 4",`
	`41`	`+ "tick": 1700`
	`42`	`+ },`
`43`	`43`	`{`
`44`	`44`	`"cmd": "demo_gototick 4872",`
`45`	`45`	`"tick": 2256`
`46`	`46`	`},`
`47`	`47`	`{`
`48`		`- "cmd": "spec_player 4",`
	`48`	`+ "cmd": "spec_mode 1",`
`49`	`49`	`"tick": 4872`
`50`	`50`	`},`
`51`	`51`	`{`
`52`		`- "cmd": "spec_mode 1",`
	`52`	`+ "cmd": "spec_player 4",`
`53`	`53`	`"tick": 4872`
`54`	`54`	`},`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
@@ -24,40 +24,40 @@ exports[`Generate player's lowlights JSON file > CS2 1`] = `
`24`	`24`	`"cmd": "demo_gototick 872",`
`25`	`25`	`"tick": 64`
`26`	`26`	`},`
`27`		`- {`
`28`		`- "cmd": "spec_player 4",`
`29`		`- "tick": 872`
`30`		`- },`
`31`	`27`	`{`
`32`	`28`	`"cmd": "spec_mode 1",`
`33`	`29`	`"tick": 872`
`34`	`30`	`},`
`35`	`31`	`{`
`36`	`32`	`"cmd": "spec_player 4",`
`37`		`- "tick": 1200`
	`33`	`+ "tick": 872`
`38`	`34`	`},`
`39`	`35`	`{`
`40`	`36`	`"cmd": "spec_mode 1",`
`41`	`37`	`"tick": 1200`
`42`	`38`	`},`
`43`	`39`	`{`
`44`	`40`	`"cmd": "spec_player 4",`
`45`		`- "tick": 1700`
	`41`	`+ "tick": 1200`
`46`	`42`	`},`
`47`	`43`	`{`
`48`	`44`	`"cmd": "spec_mode 1",`
`49`	`45`	`"tick": 1700`
`50`	`46`	`},`
	`47`	`+ {`
	`48`	`+ "cmd": "spec_player 4",`
	`49`	`+ "tick": 1700`
	`50`	`+ },`
`51`	`51`	`{`
`52`	`52`	`"cmd": "demo_gototick 4872",`
`53`	`53`	`"tick": 2256`
`54`	`54`	`},`
`55`	`55`	`{`
`56`		`- "cmd": "spec_player 4",`
	`56`	`+ "cmd": "spec_mode 1",`
`57`	`57`	`"tick": 4872`
`58`	`58`	`},`
`59`	`59`	`{`
`60`		`- "cmd": "spec_mode 1",`
	`60`	`+ "cmd": "spec_player 4",`
`61`	`61`	`"tick": 4872`
`62`	`62`	`},`
`63`	`63`	`{`
Original file line number	Diff line number	Diff line change
@@ -25,47 +25,47 @@ exports[`Generate player's rounds JSON file > CS2 1`] = `
`25`	`25`	`"tick": 64`
`26`	`26`	`},`
`27`	`27`	`{`
`28`		`- "cmd": "spec_player 4",`
	`28`	`+ "cmd": "spec_mode 1",`
`29`	`29`	`"tick": 64`
`30`	`30`	`},`
`31`	`31`	`{`
`32`		`- "cmd": "spec_mode 1",`
	`32`	`+ "cmd": "spec_player 4",`
`33`	`33`	`"tick": 64`
`34`	`34`	`},`
`35`	`35`	`{`
`36`	`36`	`"cmd": "demo_gototick 10752",`
`37`	`37`	`"tick": 5864`
`38`	`38`	`},`
`39`	`39`	`{`
`40`		`- "cmd": "spec_player 4",`
	`40`	`+ "cmd": "spec_mode 1",`
`41`	`41`	`"tick": 5864`
`42`	`42`	`},`
`43`	`43`	`{`
`44`		`- "cmd": "spec_mode 1",`
	`44`	`+ "cmd": "spec_player 4",`
`45`	`45`	`"tick": 5864`
`46`	`46`	`},`
`47`	`47`	`{`
`48`	`48`	`"cmd": "demo_gototick 16152",`
`49`	`49`	`"tick": 13184`
`50`	`50`	`},`
`51`	`51`	`{`
`52`		`- "cmd": "spec_player 4",`
	`52`	`+ "cmd": "spec_mode 1",`
`53`	`53`	`"tick": 13184`
`54`	`54`	`},`
`55`	`55`	`{`
`56`		`- "cmd": "spec_mode 1",`
	`56`	`+ "cmd": "spec_player 4",`
`57`	`57`	`"tick": 13184`
`58`	`58`	`},`
`59`	`59`	`{`
`60`	`60`	`"cmd": "demo_gototick 21352",`
`61`	`61`	`"tick": 18984`
`62`	`62`	`},`
`63`	`63`	`{`
`64`		`- "cmd": "spec_player 4",`
	`64`	`+ "cmd": "spec_mode 1",`
`65`	`65`	`"tick": 18984`
`66`	`66`	`},`
`67`	`67`	`{`
`68`		`- "cmd": "spec_mode 1",`
	`68`	`+ "cmd": "spec_player 4",`
`69`	`69`	`"tick": 18984`
`70`	`70`	`},`
`71`	`71`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,40 +13,40 @@`
`13`	`13`	`"cmd": "demo_gototick 872",`
`14`	`14`	`"tick": 64`
`15`	`15`	`},`
`16`		`- {`
`17`		`- "cmd": "spec_player 4",`
`18`		`- "tick": 872`
`19`		`- },`
`20`	`16`	`{`
`21`	`17`	`"cmd": "spec_mode 1",`
`22`	`18`	`"tick": 872`
`23`	`19`	`},`
`24`	`20`	`{`
`25`	`21`	`"cmd": "spec_player 4",`
`26`		`- "tick": 1200`
	`22`	`+ "tick": 872`
`27`	`23`	`},`
`28`	`24`	`{`
`29`	`25`	`"cmd": "spec_mode 1",`
`30`	`26`	`"tick": 1200`
`31`	`27`	`},`
`32`	`28`	`{`
`33`	`29`	`"cmd": "spec_player 4",`
`34`		`- "tick": 1700`
	`30`	`+ "tick": 1200`
`35`	`31`	`},`
`36`	`32`	`{`
`37`	`33`	`"cmd": "spec_mode 1",`
`38`	`34`	`"tick": 1700`
`39`	`35`	`},`
	`36`	`+ {`
	`37`	`+ "cmd": "spec_player 4",`
	`38`	`+ "tick": 1700`
	`39`	`+ },`
`40`	`40`	`{`
`41`	`41`	`"cmd": "demo_gototick 4872",`
`42`	`42`	`"tick": 2256`
`43`	`43`	`},`
`44`	`44`	`{`
`45`		`- "cmd": "spec_player 4",`
	`45`	`+ "cmd": "spec_mode 1",`
`46`	`46`	`"tick": 4872`
`47`	`47`	`},`
`48`	`48`	`{`
`49`		`- "cmd": "spec_mode 1",`
	`49`	`+ "cmd": "spec_player 4",`
`50`	`50`	`"tick": 4872`
`51`	`51`	`},`
`52`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,40 +21,40 @@`
`21`	`21`	`"cmd": "demo_gototick 872",`
`22`	`22`	`"tick": 64`
`23`	`23`	`},`
`24`		`- {`
`25`		`- "cmd": "spec_player 4",`
`26`		`- "tick": 872`
`27`		`- },`
`28`	`24`	`{`
`29`	`25`	`"cmd": "spec_mode 1",`
`30`	`26`	`"tick": 872`
`31`	`27`	`},`
`32`	`28`	`{`
`33`	`29`	`"cmd": "spec_player 4",`
`34`		`- "tick": 1200`
	`30`	`+ "tick": 872`
`35`	`31`	`},`
`36`	`32`	`{`
`37`	`33`	`"cmd": "spec_mode 1",`
`38`	`34`	`"tick": 1200`
`39`	`35`	`},`
`40`	`36`	`{`
`41`	`37`	`"cmd": "spec_player 4",`
`42`		`- "tick": 1700`
	`38`	`+ "tick": 1200`
`43`	`39`	`},`
`44`	`40`	`{`
`45`	`41`	`"cmd": "spec_mode 1",`
`46`	`42`	`"tick": 1700`
`47`	`43`	`},`
	`44`	`+ {`
	`45`	`+ "cmd": "spec_player 4",`
	`46`	`+ "tick": 1700`
	`47`	`+ },`
`48`	`48`	`{`
`49`	`49`	`"cmd": "demo_gototick 4872",`
`50`	`50`	`"tick": 2256`
`51`	`51`	`},`
`52`	`52`	`{`
`53`		`- "cmd": "spec_player 4",`
	`53`	`+ "cmd": "spec_mode 1",`
`54`	`54`	`"tick": 4872`
`55`	`55`	`},`
`56`	`56`	`{`
`57`		`- "cmd": "spec_mode 1",`
	`57`	`+ "cmd": "spec_player 4",`
`58`	`58`	`"tick": 4872`
`59`	`59`	`},`
`60`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,47 +22,47 @@`
`22`	`22`	`"tick": 64`
`23`	`23`	`},`
`24`	`24`	`{`
`25`		`- "cmd": "spec_player 4",`
	`25`	`+ "cmd": "spec_mode 1",`
`26`	`26`	`"tick": 64`
`27`	`27`	`},`
`28`	`28`	`{`
`29`		`- "cmd": "spec_mode 1",`
	`29`	`+ "cmd": "spec_player 4",`
`30`	`30`	`"tick": 64`
`31`	`31`	`},`
`32`	`32`	`{`
`33`	`33`	`"cmd": "demo_gototick 10752",`
`34`	`34`	`"tick": 5864`
`35`	`35`	`},`
`36`	`36`	`{`
`37`		`- "cmd": "spec_player 4",`
	`37`	`+ "cmd": "spec_mode 1",`
`38`	`38`	`"tick": 5864`
`39`	`39`	`},`
`40`	`40`	`{`
`41`		`- "cmd": "spec_mode 1",`
	`41`	`+ "cmd": "spec_player 4",`
`42`	`42`	`"tick": 5864`
`43`	`43`	`},`
`44`	`44`	`{`
`45`	`45`	`"cmd": "demo_gototick 16152",`
`46`	`46`	`"tick": 13184`
`47`	`47`	`},`
`48`	`48`	`{`
`49`		`- "cmd": "spec_player 4",`
	`49`	`+ "cmd": "spec_mode 1",`
`50`	`50`	`"tick": 13184`
`51`	`51`	`},`
`52`	`52`	`{`
`53`		`- "cmd": "spec_mode 1",`
	`53`	`+ "cmd": "spec_player 4",`
`54`	`54`	`"tick": 13184`
`55`	`55`	`},`
`56`	`56`	`{`
`57`	`57`	`"cmd": "demo_gototick 21352",`
`58`	`58`	`"tick": 18984`
`59`	`59`	`},`
`60`	`60`	`{`
`61`		`- "cmd": "spec_player 4",`
	`61`	`+ "cmd": "spec_mode 1",`
`62`	`62`	`"tick": 18984`
`63`	`63`	`},`
`64`	`64`	`{`
`65`		`- "cmd": "spec_mode 1",`
	`65`	`+ "cmd": "spec_player 4",`
`66`	`66`	`"tick": 18984`
`67`	`67`	`},`
`68`	`68`	`{`