Skip to content

Commit a9b5342

Browse files
committed
Fix the datapacks for all builds.
The sc2replay-csharp problem associates builds differently than I had first thought which caused me to map some builds to the wrong datapack. This commit fixes this for all builds back to 1.0.
1 parent 0fc2f6d commit a9b5342

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

sc2reader/data/__init__.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,9 @@ class Unit(object):
247247
def __init__(self, unit_id):
248248
self.id = unit_id
249249

250+
def __str__(self):
251+
return "{} [{:X}]".format(self.name, self.id)
252+
250253
class Ability(object):
251254
pass
252255

@@ -329,9 +332,10 @@ def create_build(build):
329332

330333
return data
331334

332-
333-
build16117 = create_build(16117)
334-
build17811 = create_build(17811)
335-
build18701 = create_build(18701)
336-
build21029 = create_build(21029)
335+
# His build numbers don't map at ALL to the first effective
336+
# build number so do the correct range mapping down here.
337+
build16117 = create_build(16939)
338+
build17326 = create_build(17811)
339+
build18092 = create_build(18701)
340+
build19458 = create_build(21029)
337341
build22612 = create_build(22612)

sc2reader/resources.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,10 +517,10 @@ def register_default_readers(self):
517517

518518
def register_default_datapacks(self):
519519
"""Registers factory default datapacks."""
520-
self.register_datapack(data.build16117, lambda r: 16117 <= r.build < 17811)
521-
self.register_datapack(data.build17811, lambda r: 17811 <= r.build < 18701)
522-
self.register_datapack(data.build18701, lambda r: 18701 <= r.build < 21029)
523-
self.register_datapack(data.build21029, lambda r: 21029 <= r.build < 22612)
520+
self.register_datapack(data.build16117, lambda r: 16117 <= r.build < 17326)
521+
self.register_datapack(data.build17326, lambda r: 17326 <= r.build < 18092)
522+
self.register_datapack(data.build18092, lambda r: 18092 <= r.build < 19458)
523+
self.register_datapack(data.build19458, lambda r: 19458 <= r.build < 22612)
524524
self.register_datapack(data.build22612, lambda r: 22612 <= r.build)
525525

526526

0 commit comments

Comments
 (0)