Skip to content

Commit be8cf30

Browse files
committed
Merge remote branch 'origin/master'
2 parents ac5d29e + 34732d0 commit be8cf30

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

sc2reader/eventparsers.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,12 @@ def load(self, event, bytes):
403403
bytes.skip(4)
404404
return event
405405

406+
class UnknownEventParser_020E(object):
407+
def load(self, event, bytes):
408+
event.name = 'unknown020E'
409+
bytes.skip(4)
410+
return event
411+
406412
#####################################################
407413
# Unknown Event Type 04 Parsers
408414
#####################################################
@@ -459,4 +465,4 @@ class UnknownEventParser_0589(object):
459465
def load(self, event, bytes):
460466
event.name = 'unknown0589'
461467
bytes.skip(4)
462-
return event
468+
return event

sc2reader/parsers.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ class EventParser(object):
231231
(ResourceTransferEventParser(), lambda e: e.code & 0x0F == 0xF and e.code >> 4 <= 0x9 ),],
232232
0x02: [
233233
(UnknownEventParser_0206(), lambda e: e.code == 0x06 ),
234-
(UnknownEventParser_0207(), lambda e: e.code == 0x07 ),],
234+
(UnknownEventParser_0207(), lambda e: e.code == 0x07 ),
235+
(UnknownEventParser_020E(), lambda e: e.code == 0x0E ),],
235236
0x03: [
236237
(CameraMovementEventParser_87(), lambda e: e.code == 0x87 ),
237238
(CameraMovementEventParser_08(), lambda e: e.code == 0x08 ),
@@ -255,7 +256,6 @@ def load(self, replay, filecontents):
255256
#Save the start so we can trace for debug purposes
256257
start = bytes.cursor
257258

258-
259259
#First section is always a timestamp marking the elapsed time
260260
#since the last eventObjectlisted
261261
time_diff = bytes.get_timestamp()
@@ -280,6 +280,7 @@ def load(self, replay, filecontents):
280280
end = bytes.cursor
281281
bytes.stream.seek(start)
282282
event.bytes = bytes.get_bytes(end-start)
283+
283284
except TypeError as e:
284285
raise #ParseError(e.message, replay, event, bytes)
285286

@@ -307,7 +308,8 @@ class EventParser_16561(EventParser):
307308
(ResourceTransferEventParser_16561(), lambda e: e.code & 0x0F == 0xF and e.code >> 4 <= 0x8 ),],
308309
0x02: [
309310
(UnknownEventParser_0206(), lambda e: e.code == 0x06 ),
310-
(UnknownEventParser_0207(), lambda e: e.code == 0x07 ),],
311+
(UnknownEventParser_0207(), lambda e: e.code == 0x07 ),
312+
(UnknownEventParser_020E(), lambda e: e.code == 0x0E ),],
311313
0x03: [
312314
(CameraMovementEventParser_87(), lambda e: e.code == 0x87 ),
313315
(CameraMovementEventParser_08(), lambda e: e.code == 0x08 ),
@@ -347,7 +349,8 @@ class EventParser_17326(EventParser):
347349
(ResourceTransferEventParser_16561(), lambda e: e.code & 0x0F == 0xF and e.code >> 4 <= 0x9 ),],
348350
0x02: [
349351
(UnknownEventParser_0206(), lambda e: e.code == 0x06 ),
350-
(UnknownEventParser_0207(), lambda e: e.code == 0x07 ),],
352+
(UnknownEventParser_0207(), lambda e: e.code == 0x07 ),
353+
(UnknownEventParser_020E(), lambda e: e.code == 0x0E ),],
351354
0x03: [
352355
(CameraMovementEventParser_87(), lambda e: e.code == 0x87 ),
353356
(CameraMovementEventParser_08(), lambda e: e.code == 0x08 ),
@@ -359,4 +362,4 @@ class EventParser_17326(EventParser):
359362
(UnknownEventParser_04XC(), lambda e: e.code & 0x0F == 0x0C ),],
360363
0x05: [
361364
(UnknownEventParser_0589(), lambda e: e.code == 0x89 ),],
362-
}
365+
}

0 commit comments

Comments
 (0)