Skip to content

build 64469 support #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2018
Merged

build 64469 support #54

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6905b19
build 64469 support
Apr 27, 2018
1873e6d
test and comment for build 64469
Apr 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions sc2reader/readers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1877,6 +1877,47 @@ def trigger_ping_event(self, data):
option=data.read_uint32() - 2147483648,
)

class GameEventsReader_64469(GameEventsReader_38749):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should inherit from GameEventsReader_38996


def command_event(self, data):
return dict(
flags=data.read_bits(26),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you leave a comment right here indicating that this is the only change?

ability=dict(
ability_link=data.read_uint16(),
ability_command_index=data.read_bits(5),
ability_command_data=data.read_uint8() if data.read_bool() else None,
) if data.read_bool() else None,
data={ # Choice
0: lambda: ('None', None),
1: lambda: ('TargetPoint', dict(
point=dict(
x=data.read_bits(20),
y=data.read_bits(20),
z=data.read_uint32() - 2147483648,
)
)),
2: lambda: ('TargetUnit', dict(
flags=data.read_uint16(),
timer=data.read_uint8(),
unit_tag=data.read_uint32(),
unit_link=data.read_uint16(),
control_player_id=data.read_bits(4) if data.read_bool() else None,
upkeep_player_id=data.read_bits(4) if data.read_bool() else None,
point=dict(
x=data.read_bits(20),
y=data.read_bits(20),
z=data.read_uint32() - 2147483648,
),
)),
3: lambda: ('Data', dict(
data=data.read_uint32()
)),
}[data.read_bits(2)](),
sequence=data.read_uint32() + 1,
other_unit_tag=data.read_uint32() if data.read_bool() else None,
unit_group=data.read_uint32() if data.read_bool() else None,
)

class TrackerEventsReader(object):

def __init__(self):
Expand Down
3 changes: 2 additions & 1 deletion sc2reader/resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,8 @@ def register_default_readers(self):
self.register_reader('replay.game.events', readers.GameEventsReader_36442(), lambda r: 36442 <= r.base_build < 38215)
self.register_reader('replay.game.events', readers.GameEventsReader_38215(), lambda r: 38215 <= r.base_build < 38749)
self.register_reader('replay.game.events', readers.GameEventsReader_38749(), lambda r: 38749 <= r.base_build < 38996)
self.register_reader('replay.game.events', readers.GameEventsReader_38996(), lambda r: 38996 <= r.base_build)
self.register_reader('replay.game.events', readers.GameEventsReader_38996(), lambda r: 38996 <= r.base_build < 64469)
self.register_reader('replay.game.events', readers.GameEventsReader_64469(), lambda r: 64469 <= r.base_build)
self.register_reader('replay.game.events', readers.GameEventsReader_HotSBeta(), lambda r: r.versions[1] == 2 and r.build < 24247)

def register_default_datapacks(self):
Expand Down