Merge branch 'upstream' into patch-1

Author: cclauss

sc2reader/data/LotV/77379_abilities.csv

@@ -479,6 +479,7 @@ def load_build(expansion, version):
     "59587",
     "70154",
     "76114",
+    "77379",
 ):
     lotv_builds[version] = load_build("LotV", version)
 

sc2reader/data/LotV/77379_units.csv

@@ -137,7 +137,7 @@ ForceField,ForceField,CancelForceField,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 ForgeResearch,UpgradeGroundWeapons1,UpgradeGroundWeapons2,UpgradeGroundWeapons3,UpgradeGroundArmor1,UpgradeGroundArmor2,UpgradeGroundArmor3,UpgradeShields1,UpgradeShields2,UpgradesShields3,,,,,,,,,,,,,,,,,,,,,,CancelForgeResearch,
 Frenzy,Frenzy,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 FungalGrowth,FungalGrowth,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-FusionCoreResearch,ResearchWeaponRefit,ResearchBehemothReactor,,,,,,,,,,,,,,,,,,,,,,,,,,,,,CancelFusionCoreResearch,
+FusionCoreResearch,ResearchWeaponRefit,ResearchBehemothReactor,ResearchMedivacIncreaseSpeedBoost,,,,,,,,,,,,,,,,,,,,,,,,,,,,CancelFusionCoreResearch,
 GatewayTrain,TrainZealot,TrainStalker,,TrainHighTemplar,TrainDarkTemplar,TrainSentry,TrainAdept,,,,,,,,,,,,,,,,,,,,,,,,CancelGatewayTrain,
 GenerateCreep,GenerateCreep,StopGenerateCreep,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 GhostAcademyResearch,ResearchPersonalCloaking,ResearchMoebiusReactor,ResearchEnhancedShockwaves,,,,,,,,,,,,,,,,,,,,,,,,,,,,CancelGhostAcademyResearch,
@@ -161,7 +161,7 @@ HangarQueue5,CancelLast,CancelSlot,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 HerdInteract,Herd,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 HoldFire,Stop,HoldFire,Cheer,Dance,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 HydraliskDenResearch,ResearchEvolveGroovedSpines,ResearchEvolveMuscularAugments,EvolveGroovedSpines,EvolveMuscularAugments,,,,,,,,,,,,,,,,,,,,,,,,,,,CancelHydraliskDenResearch,
-InfestationPitResearch,,,EvolvePathogenGlands,EvolveNeuralParasite,EvolveEnduringLocusts,,,,,,,,,,,,,,,,,,,,,,,,,,CancelInfestationPitResearch,
+InfestationPitResearch,,,EvolvePathogenGlands,EvolveNeuralParasite,EvolveEnduringLocusts,ResearchMicrobialShroud,,,,,,,,,,,,,,,,,,,,,,,,,CancelInfestationPitResearch,
 InfestedTerrans,SpawnInfestedTerran,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 InfestedTerransLayEgg,SpawnInfestedTerran,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 InvulnerabilityShield,InvulnerabilityShield,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
@@ -864,3 +864,4 @@ ViperParasiticBombRelay,ViperParasiticBombRelay
 BattlecruiserStop,Stop
 BattlecruiserAttack,BattlecruiserAttack
 BattlecruiserMove,Move,Patrol,HoldPos
+AmorphousArmorcloud,AmorphousArmorcloud

sc2reader/data/__init__.py

@@ -708,6 +708,7 @@
         "Horn": "Horner",
         "Kara": "Karax",
         "Kerr": "Kerrigan",
+        "Meng": "Mengsk",
         "Nova": "Nova",
         "Rayn": "Raynor",
         "Stet": "Stetmann",

sc2reader/data/ability_lookup.csv

@@ -1047,3 +1047,18 @@ CollapsibleRockTowerPushUnitRampLeftGreen,CollapsibleRockTowerPushUnitRampLeftGr
 CollapsibleRockTowerPushUnitRampRightGreen,CollapsibleRockTowerPushUnitRampRightGreen
 CollapsibleRockTowerRampLeftGreen,CollapsibleRockTowerRampLeftGreen
 CollapsibleRockTowerRampRightGreen,CollapsibleRockTowerRampRightGreen
+TrooperMengskACGluescreenDummy,TrooperMengskACGluescreenDummy
+MedivacMengskACGluescreenDummy,MedivacMengskACGluescreenDummy
+BlimpMengskACGluescreenDummy,BlimpMengskACGluescreenDummy
+MarauderMengskACGluescreenDummy,MarauderMengskACGluescreenDummy
+GhostMengskACGluescreenDummy,GhostMengskACGluescreenDummy
+SiegeTankMengskACGluescreenDummy,SiegeTankMengskACGluescreenDummy
+ThorMengskACGluescreenDummy,ThorMengskACGluescreenDummy
+VikingMengskACGluescreenDummy,VikingMengskACGluescreenDummy
+BattlecruiserMengskACGluescreenDummy,BattlecruiserMengskACGluescreenDummy
+BunkerDepotMengskACGluescreenDummy,BunkerDepotMengskACGluescreenDummy
+MissileTurretMengskACGluescreenDummy,MissileTurretMengskACGluescreenDummy
+ArtilleryMengskACGluescreenDummy,ArtilleryMengskACGluescreenDummy
+AccelerationZoneSmall,AccelerationZoneSmall
+AccelerationZoneMedium,AccelerationZoneMedium
+AccelerationZoneLarge,AccelerationZoneLarge

sc2reader/data/attributes.json

@@ -210,7 +210,13 @@ def __call__(self, data, replay):
                         licenses=[
                             data.read_uint32()
                             for i in range(
-                                data.read_bits(13 if replay.base_build >= 70154 else 9)
+                                data.read_bits(
+                                    16
+                                    if replay.base_build >= 77379
+                                    else 13
+                                    if replay.base_build >= 70154
+                                    else 9
+                                )
                             )
                         ]
                         if replay.base_build >= 19132
@@ -250,6 +256,20 @@ def __call__(self, data, replay):
                         ]
                         if replay.base_build >= 47185
                         else None,
+                        brutal_plus_difficulty=data.read_uint32()
+                        if replay.base_build >= 77379
+                        else None,
+                        retry_mutation_indexes=[
+                            data.read_uint32() for i in range(data.read_bits(3))
+                        ]
+                        if replay.base_build >= 77379
+                        else None,
+                        ac_enemy_race=data.read_uint32()
+                        if replay.base_build >= 77379
+                        else None,
+                        ac_enemy_wave_type=data.read_uint32()
+                        if replay.base_build >= 77379
+                        else None,
                     )
                     for i in range(data.read_bits(5))
                 ],

sc2reader/data/unit_lookup.csv

@@ -861,7 +861,11 @@ def register_default_datapacks(self):
         )
         self.register_datapack(
             datapacks["LotV"]["76114"],
-            lambda r: r.expansion == "LotV" and 76114 <= r.build,
+            lambda r: r.expansion == "LotV" and 76114 <= r.build < 77379,
+        )
+        self.register_datapack(
+            datapacks["LotV"]["77379"],
+            lambda r: r.expansion == "LotV" and 77379 <= r.build,
         )
 
     # Internal Methods

sc2reader/readers.py

@@ -701,6 +701,13 @@ def test_75689(self):
             replay = factory.load_replay(replayfilename)
             self.assertEqual(replay.players[0].trophy_id, 13)
 
+    def test_77379(self):
+        replay = sc2reader.load_replay(
+            "test_replays/4.11.0.77379/Oblivion Express.SC2Replay"
+        )
+        self.assertEqual(replay.players[0].commander, "Mengsk")
+        self.assertEqual(replay.players[1].commander, "Stetmann")
+
     def test_anonymous_replay(self):
         replayfilename = "test_replays/4.1.2.60604/1.SC2Replay"
         factory = sc2reader.factories.SC2Factory()