feat: allow single player games to be parsed successfully

PBug90 · Oct 20, 2018 · c626119 · c626119
1 parent 8cc7f53
commit c626119
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/lib/W3GReplay.js b/lib/W3GReplay.js
@@ -71,7 +71,7 @@ W3GReplay.prototype.createPlayerList = function () {
       this.teams[slot.teamId] = this.teams[slot.teamId] || []
       this.teams[slot.teamId].push(slot.playerId)
       this.players[slot.playerId] =
-        new Player(slot.playerId, tempPlayers[slot.playerId].playerName, slot.teamId, slot.color, slot.raceFlag)
+        new Player(slot.playerId, tempPlayers[slot.playerId] ? tempPlayers[slot.playerId].playerName : 'Computer', slot.teamId, slot.color, slot.raceFlag)
     }
   })
 }

diff --git a/parsers/header.js b/parsers/header.js
@@ -48,7 +48,6 @@ const PlayerRecordLadder = new Parser()
   .int32le('raceFlags', { formatter: raceFlagFormatter })
 
 const PlayerRecord = new Parser()
-  .int8('recordId')
   .int8('playerId')
   .string('playerName', {zeroTerminated: true})
   .uint8('addDataFlag')
@@ -76,18 +75,32 @@ const PlayerSlotRecord = new Parser()
 
 const GameMetaData = new Parser()
   .skip(4)
+  .skip(1)
   .nest('player', {type: PlayerRecord})
   .string('gameName', {zeroTerminated: true})
   .skip(1)
   .string('encodedString', {zeroTerminated: true, encoding: 'hex'})
   .int32le('playerCount')
   .string('gameType', {length: 4, encoding: 'hex'})
   .string('languageId', {length: 4, encoding: 'hex'})
-  .array('playerList', {type: PlayerRecordInList,
+  .array('playerList', {
+    type: new Parser()
+      .int8('hasRecord')
+      .choice(null, {tag: 'hasRecord',
+        choices: {
+          0: new Parser(),
+          22: PlayerRecordInList
+        },
+        defaultChoice: new Parser()
+      }),
     readUntil: function (item, buffer) {
-      return buffer.readInt8() !== 22
-    }})
-  .string('gameStartRecord', {length: 1, encoding: 'hex'})
+      return (buffer.readInt8() !== 22 && buffer.readInt8() !== 25) || item.hasRecord === 25
+    },
+    formatter: (input) => {
+      input.splice(-1, 1)
+      return input
+    }
+  })
   .int16('dataByteCount')
   .int8('slotRecordCount')
   .array('playerSlotRecords', {type: PlayerSlotRecord, length: 'slotRecordCount'})