Skip to content

Adding support for the 36442 base build #187

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

Open
StoicLoofah wants to merge 20 commits into
base: lotv
Choose a base branch
from
Open

Adding support for the 36442 base build #187

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
040f1b9
fixing a typo achon -> archon
StoicLoofah Jun 25, 2015
32811c2
adding support for the 36442 LotV beta replay build
StoicLoofah Jul 21, 2015
d17501b
adding a missing condition from review
StoicLoofah Jul 26, 2015
7f230fd
add LotV-related tests
dsjoerg Sep 16, 2015
e1969db
LotV abilities and units thanks to @mischanix
dsjoerg Sep 16, 2015
97f2302
Merge pull request #1 from dsjoerg/lotv
StoicLoofah Sep 16, 2015
d5bf21a
handle 3.0 replays, work in progress.
dsjoerg Oct 7, 2015
7d5fb91
Merge pull request #2 from dsjoerg/lotv
StoicLoofah Oct 8, 2015
3841578
safety check that came up with some replay
StoicLoofah Oct 28, 2015
013b6b1
handle 38749. test passes now.
dsjoerg Oct 28, 2015
d57990e
correctly handle 38749. test passes now
dsjoerg Oct 30, 2015
e39b9ef
using a default value if starting_rally is missing
StoicLoofah Nov 9, 2015
279beb3
handle weird update_types in create_control_group_event. failing rep…
dsjoerg Nov 13, 2015
ccc2d39
handle 38996
dsjoerg Nov 13, 2015
5cc0e76
fixing reference
StoicLoofah Nov 17, 2015
71e842f
handle 3.1.0. add test replays to prove it.
dsjoerg Dec 16, 2015
6b62049
updating sc2attributes for 3.1.0
StoicLoofah Jan 16, 2016
88f6a6d
adding new reader for SC2 3.2
StoicLoofah Apr 9, 2016
72e0102
protocol 42932 update
StoicLoofah May 27, 2016
58b93bb
fix for 3.7 from ggtracker/sc2reader ae41bda
StoicLoofah Nov 1, 2016
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
2 changes: 1 addition & 1 deletion sc2reader/objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def __init__(self, sid, slot_data):
self.toon_id = int(parts[3])

#: A index to the user that is the leader of the archon team
self.achon_leader_id = slot_data['tandem_leader_user_id']
self.archon_leader_id = slot_data['tandem_leader_user_id']

#: A list of :class:`Event` objects representing all the game events
#: generated by the person over the course of the game
Expand Down
17 changes: 17 additions & 0 deletions sc2reader/readers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,12 @@ def __call__(self, data, replay):
licenses=[data.read_uint32() for i in range(data.read_bits(9))] if replay.base_build >= 19132 else [],
tandem_leader_user_id=data.read_bits(4) if replay.base_build >= 34784 and data.read_bool() else None,
commander=data.read_aligned_bytes(data.read_bits(9)) if replay.base_build >= 34784 else None,
commander_level=data.read_uint32() if replay.base_build >= 36442 else None,
) for i in range(data.read_bits(5))],
random_seed=data.read_uint32(),
host_user_id=data.read_bits(4) if data.read_bool() else None,
is_single_player=data.read_bool(),
picked_map_tag=data.read_uint8() if replay.base_build >= 36442 else None,
game_duration=data.read_uint32(),
default_difficulty=data.read_bits(6),
default_ai_build=data.read_bits(7) if replay.base_build >= 24764 else None,
Expand Down Expand Up @@ -1707,6 +1709,21 @@ def game_user_leave_event(self, data):
)


class GameEventsReader_36442(GameEventsReader_34784):

def control_group_update_event(self, data):
return dict(
control_group_index=data.read_bits(4),
control_group_update=data.read_bits(3),
remove_mask={ # Choice
0: lambda: ('None', None),
1: lambda: ('Mask', self.read_selection_bitmask(data, data.read_bits(9))),
2: lambda: ('OneIndices', [data.read_bits(9) for i in range(data.read_bits(9))]),
3: lambda: ('ZeroIndices', [data.read_bits(9) for i in range(data.read_bits(9))]),
}[data.read_bits(2)](),
)


class TrackerEventsReader(object):

def __init__(self):
Expand Down
1 change: 1 addition & 0 deletions sc2reader/resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,7 @@ def register_default_readers(self):
self.register_reader('replay.game.events', readers.GameEventsReader_26490(), lambda r: 26490 <= r.base_build < 27950)
self.register_reader('replay.game.events', readers.GameEventsReader_27950(), lambda r: 27950 <= r.base_build < 34784)
self.register_reader('replay.game.events', readers.GameEventsReader_34784(), lambda r: 34784 <= r.base_build)
Copy link
Copy Markdown
Owner

@GraylinKim GraylinKim Jul 26, 2015

Choose a reason for hiding this comment

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

You need to put an upper bound on this condition now. Same as the ones before it.

self.register_reader('replay.game.events', readers.GameEventsReader_36442(), lambda r: 36442 <= 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