improvement: extract playerid from extra player list, overwrite name

PBug90 · Feb 18, 2020 · 2efe873 · 2efe873
1 parent 46b4228
commit 2efe873
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/W3GReplay.ts b/src/W3GReplay.ts
@@ -11,7 +11,8 @@ import {
     CommandDataBlock,
     ParserOutput,
     PlayerChatMessageBlock,
-    Platform
+    Platform,
+    ExtraPlayerListEntry
 } from './types'
 import { sortPlayers } from './sort'
 
@@ -91,18 +92,23 @@ class W3GReplay extends ReplayParser {
         return this.finalize()
     }
 
-    handleMetaData (metaData: GameMetaDataDecoded) {
+    handleMetaData (metaData: GameMetaDataDecoded): void {
         this.slots = metaData.playerSlotRecords
         this.playerList = [metaData.player, ...metaData.playerList]
         this.meta = metaData
         const tempPlayers: {[key: string]: GameMetaDataDecoded['player'] } = {}
         this.teams = []
         this.players = {}
-
         this.playerList.forEach((player: GameMetaDataDecoded['player']): void => {
             tempPlayers[player.playerId] = player
         })
 
+        if (metaData.extraPlayerList) {
+            metaData.extraPlayerList.forEach((extraPlayer: ExtraPlayerListEntry) => {
+                tempPlayers[extraPlayer.playerId].playerName = extraPlayer.name
+            })
+        }
+
         this.slots.forEach((slot: SlotRecord) => {
             if (slot.slotStatus > 1) {
                 this.teams[slot.teamId] = this.teams[slot.teamId] || []
@@ -115,7 +121,7 @@ class W3GReplay extends ReplayParser {
         })
     }
 
-    processGameDataBlock (block: GameDataBlock) {
+    processGameDataBlock (block: GameDataBlock): void {
         switch (block.type) {
             case 31:
             case 30:
@@ -143,7 +149,7 @@ class W3GReplay extends ReplayParser {
         })
     }
 
-    processCommandDataBlock (block: CommandDataBlock) {
+    processCommandDataBlock (block: CommandDataBlock): void {
         const currentPlayer = this.players[block.playerId]
         currentPlayer.currentTimePlayed = this.totalTimeTracker
         currentPlayer._lastActionWasDeselect = false
@@ -156,7 +162,7 @@ class W3GReplay extends ReplayParser {
         }
     }
 
-    handleActionBlock (action: ActionBlock, currentPlayer: Player) {
+    handleActionBlock (action: ActionBlock, currentPlayer: Player): void {
         this.playerActionTracker[currentPlayer.id] = this.playerActionTracker[currentPlayer.id] || []
         this.playerActionTracker[currentPlayer.id].push(action)
 

diff --git a/src/parsers/header.ts b/src/parsers/header.ts
@@ -177,7 +177,10 @@ const GameMetaDataReforged = (buildNo: number) => new Parser()
     .array('extraPlayerList', {
         type: new Parser()
             .int8('preVars1')
-            .buffer('pre', { length: 4 })
+            .int8('pre1')
+            .int8('pre2')
+            .int8('playerId')
+            .int8('pre4')
             .int8('nameLength')
             .string('name', { length: 'nameLength' })
             .skip(1)

diff --git a/src/types.ts b/src/types.ts
@@ -23,6 +23,12 @@ export interface SlotRecord {
     handicapFlag: number;
 }
 
+export interface ExtraPlayerListEntry{
+    nameLength: number;
+    name: string;
+    playerId: number;
+}
+
 export interface GameMetaDataDecoded {
     player: {
         hasRecord?: number;
@@ -65,6 +71,7 @@ export interface GameMetaDataDecoded {
     mapChecksum: string;
     mapName: string;
     creator: string;
+    extraPlayerList?: ExtraPlayerListEntry[];
 }
 
 export interface ActionBlock{