Skip to content

Commit a8d07fb

Browse files
committed
Send resource events also seem to still be 1-indexed.
1 parent 7946a05 commit a8d07fb

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

sc2reader/readers.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,3 +551,15 @@ def player_selection_event(self, data, fstamp, pid, event_type):
551551

552552
class GameEventsReader_Beta_23925(GameEventsReader_Beta):
553553
PLAYER_JOIN_FLAGS = 32
554+
555+
class GameEventsReader_Beta_24247(GameEventsReader_Beta_23925):
556+
POFFSET = 1
557+
558+
def player_send_resource_event(self, data, fstamp, pid, event_type):
559+
target = data.read_bits(4)-1
560+
unknown = data.read_bits(4) #??
561+
minerals = data.read_bits(32)
562+
vespene = data.read_bits(32)
563+
terrazine = data.read_bits(32) #??
564+
custom = data.read_bits(32) #??
565+
return SendResourceEvent(fstamp, pid, event_type, target, minerals, vespene, terrazine, custom)

sc2reader/resources.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,9 @@ def register_default_readers(self):
562562
self.register_reader('replay.game.events', readers.GameEventsReader_19595(), lambda r: 19595 <= r.build < 22612)
563563
self.register_reader('replay.game.events', readers.GameEventsReader_22612(), lambda r: 22612 <= r.build and r.expansion=='WoL')
564564
self.register_reader('replay.game.events', readers.GameEventsReader_Beta(), lambda r: r.expansion=='HotS' and r.build < 23925)
565-
self.register_reader('replay.game.events', readers.GameEventsReader_Beta_23925(), lambda r: r.expansion=='HotS' and r.build >= 23925)
565+
self.register_reader('replay.game.events', readers.GameEventsReader_Beta_23925(), lambda r: r.expansion=='HotS' and r.build < 24247)
566+
self.register_reader('replay.game.events', readers.GameEventsReader_Beta_24247(), lambda r: r.expansion=='HotS' and r.build >= 24247)
567+
566568

567569
def register_default_datapacks(self):
568570
"""Registers factory default datapacks."""

0 commit comments

Comments
 (0)