diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 43ddf6b8..52337169 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ CHANGELOG ============ +1.3.0 - November 16, 2018 +------------------------- +* Added support for protocol 70154 (StarCraft 4.7.0) +* Added support for Zeratul +* Updated CircleCI build for Python 3.7 +* Fixed a bug with printing TrackerEvent + 1.2.0 - October 7, 2018 ----------------------- * Added support for Tychus diff --git a/sc2reader/data/LotV/70154_abilities.csv b/sc2reader/data/LotV/70154_abilities.csv new file mode 100644 index 00000000..d4d9cc44 --- /dev/null +++ b/sc2reader/data/LotV/70154_abilities.csv @@ -0,0 +1,408 @@ +39,Taunt +40,stop +42,move +45,attack +60,SprayTerran +61,SprayZerg +62,SprayProtoss +63,SalvageShared +65,GhostHoldFire +66,GhostWeaponsFree +68,Explode +69,FleetBeaconResearch +70,FungalGrowth +71,GuardianShield +72,MULERepair +73,ZerglingTrain +74,NexusTrainMothership +75,Feedback +76,MassRecall +78,HallucinationArchon +79,HallucinationColossus +80,HallucinationHighTemplar +81,HallucinationImmortal +82,HallucinationPhoenix +83,HallucinationProbe +84,HallucinationStalker +85,HallucinationVoidRay +86,HallucinationWarpPrism +87,HallucinationZealot +88,MULEGather +90,CalldownMULE +91,GravitonBeam +95,SpawnChangeling +102,Rally +103,ProgressRally +104,RallyCommand +105,RallyNexus +106,RallyHatchery +107,RoachWarrenResearch +109,InfestedTerrans +110,NeuralParasite +111,SpawnLarva +112,StimpackMarauder +113,SupplyDrop +117,UltraliskCavernResearch +119,SCVHarvest +120,ProbeHarvest +122,que1 +123,que5 +124,que5CancelToSelection +126,que5Addon +127,BuildInProgress +128,Repair +129,TerranBuild +131,Stimpack +132,GhostCloak +134,MedivacHeal +135,SiegeMode +136,Unsiege +137,BansheeCloak +138,MedivacTransport +139,ScannerSweep +140,Yamato +141,AssaultMode +142,FighterMode +143,BunkerTransport +144,CommandCenterTransport +145,CommandCenterLiftOff +146,CommandCenterLand +147,BarracksFlyingBuild +148,BarracksLiftOff +149,FactoryBuild +150,FactoryLiftOff +151,StarportBuild +152,StarportLiftOff +153,FactoryLand +154,StarportLand +155,OrbitalCommandTrain +156,BarracksLand +157,SupplyDepotLower +158,SupplyDepotRaise +159,BarracksTrain +160,FactoryTrain +161,StarportTrain +162,EngineeringBayResearch +164,GhostAcademyTrain +165,BarracksTechLabResearch +166,FactoryTechLabResearch +167,StarportTechLabResearch +168,GhostAcademyResearch +169,ArmoryResearch +170,ProtossBuild +171,WarpPrismTransport +172,GatewayTrain +173,StargateTrain +174,RoboticsFacilityTrain +175,NexusTrain +176,PsiStorm +177,HangarQueue5 +179,CarrierTrain +180,ForgeResearch +181,RoboticsBayResearch +182,TemplarArchiveResearch +183,ZergBuild +184,DroneHarvest +185,EvolutionChamberResearch +186,UpgradeToLair +187,UpgradeToHive +188,UpgradeToGreaterSpire +189,HiveResearch +190,SpawningPoolResearch +191,HydraliskDenResearch +192,SpireResearch +193,LarvaTrain +194,MorphToBroodLord +195,BurrowBanelingDown +196,BurrowBanelingUp +197,BurrowDroneDown +198,BurrowDroneUp +199,BurrowHydraliskDown +200,BurrowHydraliskUp +201,BurrowRoachDown +202,BurrowRoachUp +203,BurrowZerglingDown +204,BurrowZerglingUp +205,BurrowInfestorTerranDown +206,BurrowInfestorTerranUp +207,RedstoneLavaCritterBurrow +208,RedstoneLavaCritterInjuredBurrow +209,RedstoneLavaCritterUnburrow +210,RedstoneLavaCritterInjuredUnburrow +214,WarpGateTrain +215,BurrowQueenDown +216,BurrowQueenUp +217,NydusCanalTransport +218,Blink +219,BurrowInfestorDown +220,BurrowInfestorUp +221,MorphToOverseer +222,UpgradeToPlanetaryFortress +223,InfestationPitResearch +224,BanelingNestResearch +225,BurrowUltraliskDown +226,BurrowUltraliskUp +227,UpgradeToOrbital +228,UpgradeToWarpGate +229,MorphBackToGateway +230,OrbitalLiftOff +231,OrbitalCommandLand +232,ForceField +233,PhasingMode +234,TransportMode +235,FusionCoreResearch +236,CyberneticsCoreResearch +237,TwilightCouncilResearch +238,TacNukeStrike +241,EMP +243,HiveTrain +245,Transfusion +254,AttackRedirect +255,StimpackRedirect +256,StimpackMarauderRedirect +258,StopRedirect +259,GenerateCreep +260,QueenBuild +261,SpineCrawlerUproot +262,SporeCrawlerUproot +263,SpineCrawlerRoot +264,SporeCrawlerRoot +265,CreepTumorBurrowedBuild +266,BuildAutoTurret +267,ArchonWarp +268,NydusNetworkBuild +270,Charge +274,Contaminate +277,que5Passive +278,que5PassiveCancelToSelection +302,ThorNormalMode +307,DigesterCreepSpray +311,MorphToMothership +336,XelNagaHealingShrine +345,MothershipCoreMassRecall +347,MorphToHellion +357,MorphToHellionTank +365,MorphToSwarmHostBurrowedMP +366,MorphToSwarmHostMP +368,attackProtossBuilding +370,stopProtossBuilding +371,BlindingCloud +373,Yoink +376,ViperConsumeStructure +379,TestZerg +380,VolatileBurstBuilding +387,WidowMineBurrow +388,WidowMineUnburrow +389,WidowMineAttack +390,TornadoMissile +394,BurrowLurkerMPDown +395,BurrowLurkerMPUp +397,HallucinationOracle +398,MedivacSpeedBoost +399,ExtendingBridgeNEWide8Out +400,ExtendingBridgeNEWide8 +401,ExtendingBridgeNWWide8Out +402,ExtendingBridgeNWWide8 +403,ExtendingBridgeNEWide10Out +404,ExtendingBridgeNEWide10 +405,ExtendingBridgeNWWide10Out +406,ExtendingBridgeNWWide10 +407,ExtendingBridgeNEWide12Out +408,ExtendingBridgeNEWide12 +409,ExtendingBridgeNWWide12Out +410,ExtendingBridgeNWWide12 +412,CritterFlee +413,OracleRevelation +421,MothershipCorePurifyNexus +422,XelNaga_Caverns_DoorE +423,XelNaga_Caverns_DoorEOpened +424,XelNaga_Caverns_DoorN +425,XelNaga_Caverns_DoorNE +426,XelNaga_Caverns_DoorNEOpened +427,XelNaga_Caverns_DoorNOpened +428,XelNaga_Caverns_DoorNW +429,XelNaga_Caverns_DoorNWOpened +430,XelNaga_Caverns_DoorS +431,XelNaga_Caverns_DoorSE +432,XelNaga_Caverns_DoorSEOpened +433,XelNaga_Caverns_DoorSOpened +434,XelNaga_Caverns_DoorSW +435,XelNaga_Caverns_DoorSWOpened +436,XelNaga_Caverns_DoorW +437,XelNaga_Caverns_DoorWOpened +438,XelNaga_Caverns_Floating_BridgeNE8Out +439,XelNaga_Caverns_Floating_BridgeNE8 +440,XelNaga_Caverns_Floating_BridgeNW8Out +441,XelNaga_Caverns_Floating_BridgeNW8 +442,XelNaga_Caverns_Floating_BridgeNE10Out +443,XelNaga_Caverns_Floating_BridgeNE10 +444,XelNaga_Caverns_Floating_BridgeNW10Out +445,XelNaga_Caverns_Floating_BridgeNW10 +446,XelNaga_Caverns_Floating_BridgeNE12Out +447,XelNaga_Caverns_Floating_BridgeNE12 +448,XelNaga_Caverns_Floating_BridgeNW12Out +449,XelNaga_Caverns_Floating_BridgeNW12 +450,XelNaga_Caverns_Floating_BridgeH8Out +451,XelNaga_Caverns_Floating_BridgeH8 +452,XelNaga_Caverns_Floating_BridgeV8Out +453,XelNaga_Caverns_Floating_BridgeV8 +454,XelNaga_Caverns_Floating_BridgeH10Out +455,XelNaga_Caverns_Floating_BridgeH10 +456,XelNaga_Caverns_Floating_BridgeV10Out +457,XelNaga_Caverns_Floating_BridgeV10 +458,XelNaga_Caverns_Floating_BridgeH12Out +459,XelNaga_Caverns_Floating_BridgeH12 +460,XelNaga_Caverns_Floating_BridgeV12Out +461,XelNaga_Caverns_Floating_BridgeV12 +462,TemporalField +486,SnowRefinery_Terran_ExtendingBridgeNEShort8Out +487,SnowRefinery_Terran_ExtendingBridgeNEShort8 +488,SnowRefinery_Terran_ExtendingBridgeNWShort8Out +489,SnowRefinery_Terran_ExtendingBridgeNWShort8 +511,CausticSpray +514,MorphToRavager +515,MorphToLurker +518,RavagerCorrosiveBile +519,BurrowRavagerDown +520,BurrowRavagerUp +522,PurificationNovaTargeted +524,LockOn +526,LockOnCancel +528,Hyperjump +530,ThorAPMode +533,NydusWormTransport +534,OracleWeapon +540,LocustMPFlyingSwoop +541,HallucinationDisruptor +542,HallucinationAdept +543,VoidRaySwarmDamageBoost +544,SeekerDummyChannel +545,AiurLightBridgeNE8Out +546,AiurLightBridgeNE8 +547,AiurLightBridgeNE10Out +548,AiurLightBridgeNE10 +549,AiurLightBridgeNE12Out +550,AiurLightBridgeNE12 +551,AiurLightBridgeNW8Out +552,AiurLightBridgeNW8 +553,AiurLightBridgeNW10Out +554,AiurLightBridgeNW10 +555,AiurLightBridgeNW12Out +556,AiurLightBridgeNW12 +569,ShakurasLightBridgeNE8Out +570,ShakurasLightBridgeNE8 +571,ShakurasLightBridgeNE10Out +572,ShakurasLightBridgeNE10 +573,ShakurasLightBridgeNE12Out +574,ShakurasLightBridgeNE12 +575,ShakurasLightBridgeNW8Out +576,ShakurasLightBridgeNW8 +577,ShakurasLightBridgeNW10Out +578,ShakurasLightBridgeNW10 +579,ShakurasLightBridgeNW12Out +580,ShakurasLightBridgeNW12 +581,VoidMPImmortalReviveRebuild +583,ArbiterMPStasisField +584,ArbiterMPRecall +585,CorsairMPDisruptionWeb +586,MorphToGuardianMP +587,MorphToDevourerMP +588,DefilerMPConsume +589,DefilerMPDarkSwarm +590,DefilerMPPlague +591,DefilerMPBurrow +592,DefilerMPUnburrow +593,QueenMPEnsnare +594,QueenMPSpawnBroodlings +595,QueenMPInfestCommandCenter +599,OracleBuild +603,ParasiticBomb +604,AdeptPhaseShift +607,LurkerHoldFire +608,LurkerRemoveHoldFire +611,LiberatorAGTarget +612,LiberatorAATarget +614,AiurLightBridgeAbandonedNE8Out +615,AiurLightBridgeAbandonedNE8 +616,AiurLightBridgeAbandonedNE10Out +617,AiurLightBridgeAbandonedNE10 +618,AiurLightBridgeAbandonedNE12Out +619,AiurLightBridgeAbandonedNE12 +620,AiurLightBridgeAbandonedNW8Out +621,AiurLightBridgeAbandonedNW8 +622,AiurLightBridgeAbandonedNW10Out +623,AiurLightBridgeAbandonedNW10 +624,AiurLightBridgeAbandonedNW12Out +625,AiurLightBridgeAbandonedNW12 +626,KD8Charge +629,AdeptPhaseShiftCancel +630,AdeptShadePhaseShiftCancel +631,SlaynElementalGrab +633,PortCity_Bridge_UnitNE8Out +634,PortCity_Bridge_UnitNE8 +635,PortCity_Bridge_UnitSE8Out +636,PortCity_Bridge_UnitSE8 +637,PortCity_Bridge_UnitNW8Out +638,PortCity_Bridge_UnitNW8 +639,PortCity_Bridge_UnitSW8Out +640,PortCity_Bridge_UnitSW8 +641,PortCity_Bridge_UnitNE10Out +642,PortCity_Bridge_UnitNE10 +643,PortCity_Bridge_UnitSE10Out +644,PortCity_Bridge_UnitSE10 +645,PortCity_Bridge_UnitNW10Out +646,PortCity_Bridge_UnitNW10 +647,PortCity_Bridge_UnitSW10Out +648,PortCity_Bridge_UnitSW10 +649,PortCity_Bridge_UnitNE12Out +650,PortCity_Bridge_UnitNE12 +651,PortCity_Bridge_UnitSE12Out +652,PortCity_Bridge_UnitSE12 +653,PortCity_Bridge_UnitNW12Out +654,PortCity_Bridge_UnitNW12 +655,PortCity_Bridge_UnitSW12Out +656,PortCity_Bridge_UnitSW12 +657,PortCity_Bridge_UnitN8Out +658,PortCity_Bridge_UnitN8 +659,PortCity_Bridge_UnitS8Out +660,PortCity_Bridge_UnitS8 +661,PortCity_Bridge_UnitE8Out +662,PortCity_Bridge_UnitE8 +663,PortCity_Bridge_UnitW8Out +664,PortCity_Bridge_UnitW8 +665,PortCity_Bridge_UnitN10Out +666,PortCity_Bridge_UnitN10 +667,PortCity_Bridge_UnitS10Out +668,PortCity_Bridge_UnitS10 +669,PortCity_Bridge_UnitE10Out +670,PortCity_Bridge_UnitE10 +671,PortCity_Bridge_UnitW10Out +672,PortCity_Bridge_UnitW10 +673,PortCity_Bridge_UnitN12Out +674,PortCity_Bridge_UnitN12 +675,PortCity_Bridge_UnitS12Out +676,PortCity_Bridge_UnitS12 +677,PortCity_Bridge_UnitE12Out +678,PortCity_Bridge_UnitE12 +679,PortCity_Bridge_UnitW12Out +680,PortCity_Bridge_UnitW12 +683,DarkTemplarBlink +687,OverlordSingleTransport +688,SpawnLocustsTargeted +689,ViperParasiticBombRelay +690,ParasiticBombRelayDodge +691,VoidRaySwarmDamageBoostCancel +693,MorphToTransportOverlord +696,ChannelSnipe +699,DarkShrineResearch +700,LurkerDenMPResearch +701,ObserverSiegeMorphtoObserver +702,ObserverMorphtoObserverSiege +703,OverseerMorphtoOverseerSiegeMode +704,OverseerSiegeModeMorphtoOverseer +705,RavenScramblerMissile +707,RavenRepairDroneHeal +708,RavenShredderMissile +709,ChronoBoostEnergyCost +710,NexusMassRecall +714,ShieldBatteryRechargeChanneled diff --git a/sc2reader/data/LotV/70154_units.csv b/sc2reader/data/LotV/70154_units.csv new file mode 100644 index 00000000..9d5982e7 --- /dev/null +++ b/sc2reader/data/LotV/70154_units.csv @@ -0,0 +1,996 @@ +3,System_Snapshot_Dummy +21,Ball +22,StereoscopicOptionsUnit +23,Colossus +24,TechLab +25,Reactor +27,InfestorTerran +28,BanelingCocoon +29,Baneling +30,Mothership +31,PointDefenseDrone +32,Changeling +33,ChangelingZealot +34,ChangelingMarineShield +35,ChangelingMarine +36,ChangelingZerglingWings +37,ChangelingZergling +39,CommandCenter +40,SupplyDepot +41,Refinery +42,Barracks +43,EngineeringBay +44,MissileTurret +45,Bunker +46,SensorTower +47,GhostAcademy +48,Factory +49,Starport +51,Armory +52,FusionCore +53,AutoTurret +54,SiegeTankSieged +55,SiegeTank +56,VikingAssault +57,VikingFighter +58,CommandCenterFlying +59,BarracksTechLab +60,BarracksReactor +61,FactoryTechLab +62,FactoryReactor +63,StarportTechLab +64,StarportReactor +65,FactoryFlying +66,StarportFlying +67,SCV +68,BarracksFlying +69,SupplyDepotLowered +70,Marine +71,Reaper +72,Ghost +73,Marauder +74,Thor +75,Hellion +76,Medivac +77,Banshee +78,Raven +79,Battlecruiser +80,Nuke +81,Nexus +82,Pylon +83,Assimilator +84,Gateway +85,Forge +86,FleetBeacon +87,TwilightCouncil +88,PhotonCannon +89,Stargate +90,TemplarArchive +91,DarkShrine +92,RoboticsBay +93,RoboticsFacility +94,CyberneticsCore +95,Zealot +96,Stalker +97,HighTemplar +98,DarkTemplar +99,Sentry +100,Phoenix +101,Carrier +102,VoidRay +103,WarpPrism +104,Observer +105,Immortal +106,Probe +107,Interceptor +108,Hatchery +109,CreepTumor +110,Extractor +111,SpawningPool +112,EvolutionChamber +113,HydraliskDen +114,Spire +115,UltraliskCavern +116,InfestationPit +117,NydusNetwork +118,BanelingNest +119,RoachWarren +120,SpineCrawler +121,SporeCrawler +122,Lair +123,Hive +124,GreaterSpire +125,Egg +126,Drone +127,Zergling +128,Overlord +129,Hydralisk +130,Mutalisk +131,Ultralisk +132,Roach +133,Infestor +134,Corruptor +135,BroodLordCocoon +136,BroodLord +137,BanelingBurrowed +138,DroneBurrowed +139,HydraliskBurrowed +140,RoachBurrowed +141,ZerglingBurrowed +142,InfestorTerranBurrowed +143,RedstoneLavaCritterBurrowed +144,RedstoneLavaCritterInjuredBurrowed +145,RedstoneLavaCritter +146,RedstoneLavaCritterInjured +147,QueenBurrowed +148,Queen +149,InfestorBurrowed +150,OverlordCocoon +151,Overseer +152,PlanetaryFortress +153,UltraliskBurrowed +154,OrbitalCommand +155,WarpGate +156,OrbitalCommandFlying +157,ForceField +158,WarpPrismPhasing +159,CreepTumorBurrowed +160,CreepTumorQueen +161,SpineCrawlerUprooted +162,SporeCrawlerUprooted +163,Archon +164,NydusCanal +165,BroodlingEscort +166,GhostAlternate +167,GhostNova +168,RichMineralField +169,RichMineralField750 +170,Ursadon +172,XelNagaTower +176,InfestedTerransEgg +177,Larva +178,OverseerSiegeMode +179,ReaperPlaceholder +180,MarineACGluescreenDummy +181,FirebatACGluescreenDummy +182,MedicACGluescreenDummy +183,MarauderACGluescreenDummy +184,VultureACGluescreenDummy +185,SiegeTankACGluescreenDummy +186,VikingACGluescreenDummy +187,BansheeACGluescreenDummy +188,BattlecruiserACGluescreenDummy +189,OrbitalCommandACGluescreenDummy +190,BunkerACGluescreenDummy +191,BunkerUpgradedACGluescreenDummy +192,MissileTurretACGluescreenDummy +193,HellbatACGluescreenDummy +194,GoliathACGluescreenDummy +195,CycloneACGluescreenDummy +196,WraithACGluescreenDummy +197,ScienceVesselACGluescreenDummy +198,HerculesACGluescreenDummy +199,ThorACGluescreenDummy +200,PerditionTurretACGluescreenDummy +201,FlamingBettyACGluescreenDummy +202,DevastationTurretACGluescreenDummy +203,BlasterBillyACGluescreenDummy +204,SpinningDizzyACGluescreenDummy +205,ZerglingKerriganACGluescreenDummy +206,RaptorACGluescreenDummy +207,QueenCoopACGluescreenDummy +208,HydraliskACGluescreenDummy +209,HydraliskLurkerACGluescreenDummy +210,MutaliskBroodlordACGluescreenDummy +211,BroodLordACGluescreenDummy +212,UltraliskACGluescreenDummy +213,TorrasqueACGluescreenDummy +214,OverseerACGluescreenDummy +215,LurkerACGluescreenDummy +216,SpineCrawlerACGluescreenDummy +217,SporeCrawlerACGluescreenDummy +218,NydusNetworkACGluescreenDummy +219,OmegaNetworkACGluescreenDummy +220,ZerglingZagaraACGluescreenDummy +221,SwarmlingACGluescreenDummy +222,QueenZagaraACGluescreenDummy +223,BanelingACGluescreenDummy +224,SplitterlingACGluescreenDummy +225,AberrationACGluescreenDummy +226,ScourgeACGluescreenDummy +227,CorruptorACGluescreenDummy +228,OverseerZagaraACGluescreenDummy +229,BileLauncherACGluescreenDummy +230,SwarmQueenACGluescreenDummy +231,RoachACGluescreenDummy +232,RoachVileACGluescreenDummy +233,RavagerACGluescreenDummy +234,SwarmHostACGluescreenDummy +235,MutaliskACGluescreenDummy +236,GuardianACGluescreenDummy +237,DevourerACGluescreenDummy +238,ViperACGluescreenDummy +239,BrutaliskACGluescreenDummy +240,LeviathanACGluescreenDummy +241,ZealotACGluescreenDummy +242,ZealotAiurACGluescreenDummy +243,DragoonACGluescreenDummy +244,HighTemplarACGluescreenDummy +245,ArchonACGluescreenDummy +246,ImmortalACGluescreenDummy +247,ObserverACGluescreenDummy +248,PhoenixAiurACGluescreenDummy +249,ReaverACGluescreenDummy +250,TempestACGluescreenDummy +251,PhotonCannonACGluescreenDummy +252,ZealotVorazunACGluescreenDummy +253,ZealotShakurasACGluescreenDummy +254,StalkerShakurasACGluescreenDummy +255,DarkTemplarShakurasACGluescreenDummy +256,CorsairACGluescreenDummy +257,VoidRayACGluescreenDummy +258,VoidRayShakurasACGluescreenDummy +259,OracleACGluescreenDummy +260,DarkArchonACGluescreenDummy +261,DarkPylonACGluescreenDummy +262,ZealotPurifierACGluescreenDummy +263,SentryPurifierACGluescreenDummy +264,ImmortalKaraxACGluescreenDummy +265,ColossusACGluescreenDummy +266,ColossusPurifierACGluescreenDummy +267,PhoenixPurifierACGluescreenDummy +268,CarrierACGluescreenDummy +269,CarrierAiurACGluescreenDummy +270,KhaydarinMonolithACGluescreenDummy +271,ShieldBatteryACGluescreenDummy +272,EliteMarineACGluescreenDummy +273,MarauderCommandoACGluescreenDummy +274,SpecOpsGhostACGluescreenDummy +275,HellbatRangerACGluescreenDummy +276,StrikeGoliathACGluescreenDummy +277,HeavySiegeTankACGluescreenDummy +278,RaidLiberatorACGluescreenDummy +279,RavenTypeIIACGluescreenDummy +280,CovertBansheeACGluescreenDummy +281,RailgunTurretACGluescreenDummy +282,BlackOpsMissileTurretACGluescreenDummy +283,SupplicantACGluescreenDummy +284,StalkerTaldarimACGluescreenDummy +285,SentryTaldarimACGluescreenDummy +286,HighTemplarTaldarimACGluescreenDummy +287,ImmortalTaldarimACGluescreenDummy +288,ColossusTaldarimACGluescreenDummy +289,WarpPrismTaldarimACGluescreenDummy +290,PhotonCannonTaldarimACGluescreenDummy +291,StukovInfestedCivilianACGluescreenDummy +292,StukovInfestedMarineACGluescreenDummy +293,StukovInfestedSiegeTankACGluescreenDummy +294,StukovInfestedDiamondbackACGluescreenDummy +295,StukovInfestedBansheeACGluescreenDummy +296,SILiberatorACGluescreenDummy +297,StukovInfestedBunkerACGluescreenDummy +298,StukovInfestedMissileTurretACGluescreenDummy +299,StukovBroodQueenACGluescreenDummy +300,ZealotFenixACGluescreenDummy +301,SentryFenixACGluescreenDummy +302,AdeptFenixACGluescreenDummy +303,ImmortalFenixACGluescreenDummy +304,ColossusFenixACGluescreenDummy +305,DisruptorACGluescreenDummy +306,ObserverFenixACGluescreenDummy +307,ScoutACGluescreenDummy +308,CarrierFenixACGluescreenDummy +309,PhotonCannonFenixACGluescreenDummy +310,PrimalZerglingACGluescreenDummy +311,RavasaurACGluescreenDummy +312,PrimalRoachACGluescreenDummy +313,FireRoachACGluescreenDummy +314,PrimalGuardianACGluescreenDummy +315,PrimalHydraliskACGluescreenDummy +316,PrimalMutaliskACGluescreenDummy +317,PrimalImpalerACGluescreenDummy +318,PrimalSwarmHostACGluescreenDummy +319,CreeperHostACGluescreenDummy +320,PrimalUltraliskACGluescreenDummy +321,TyrannozorACGluescreenDummy +322,PrimalWurmACGluescreenDummy +323,HHReaperACGluescreenDummy +324,HHWidowMineACGluescreenDummy +325,HHHellionTankACGluescreenDummy +326,HHWraithACGluescreenDummy +327,HHVikingACGluescreenDummy +328,HHBattlecruiserACGluescreenDummy +329,HHRavenACGluescreenDummy +330,HHBomberPlatformACGluescreenDummy +331,HHMercStarportACGluescreenDummy +332,HHMissileTurretACGluescreenDummy +333,TychusReaperACGluescreenDummy +334,TychusFirebatACGluescreenDummy +335,TychusSpectreACGluescreenDummy +336,TychusMedicACGluescreenDummy +337,TychusMarauderACGluescreenDummy +338,TychusWarhoundACGluescreenDummy +339,TychusHERCACGluescreenDummy +340,TychusGhostACGluescreenDummy +341,TychusSCVAutoTurretACGluescreenDummy +342,ZeratulStalkerACGluescreenDummy +343,ZeratulSentryACGluescreenDummy +344,ZeratulDarkTemplarACGluescreenDummy +345,ZeratulImmortalACGluescreenDummy +346,ZeratulObserverACGluescreenDummy +347,ZeratulDisruptorACGluescreenDummy +348,ZeratulWarpPrismACGluescreenDummy +349,ZeratulPhotonCannonACGluescreenDummy +351,RenegadeLongboltMissileWeapon +352,NeedleSpinesWeapon +353,CorruptionWeapon +354,InfestedTerransWeapon +355,NeuralParasiteWeapon +356,PointDefenseDroneReleaseWeapon +357,HunterSeekerWeapon +358,MULE +360,ThorAAWeapon +361,PunisherGrenadesLMWeapon +362,VikingFighterWeapon +363,ATALaserBatteryLMWeapon +364,ATSLaserBatteryLMWeapon +365,LongboltMissileWeapon +366,D8ChargeWeapon +367,YamatoWeapon +368,IonCannonsWeapon +369,AcidSalivaWeapon +370,SpineCrawlerWeapon +371,SporeCrawlerWeapon +372,GlaiveWurmWeapon +373,GlaiveWurmM2Weapon +374,GlaiveWurmM3Weapon +375,StalkerWeapon +376,EMP2Weapon +377,BacklashRocketsLMWeapon +378,PhotonCannonWeapon +379,ParasiteSporeWeapon +381,Broodling +382,BroodLordBWeapon +385,AutoTurretReleaseWeapon +386,LarvaReleaseMissile +387,AcidSpinesWeapon +388,FrenzyWeapon +389,ContaminateWeapon +401,BeaconArmy +402,BeaconDefend +403,BeaconAttack +404,BeaconHarass +405,BeaconIdle +406,BeaconAuto +407,BeaconDetect +408,BeaconScout +409,BeaconClaim +410,BeaconExpand +411,BeaconRally +412,BeaconCustom1 +413,BeaconCustom2 +414,BeaconCustom3 +415,BeaconCustom4 +420,LiberatorAG +421,LurkerMP +422,OverlordTransport +425,HellionTank +426,Cyclone +427,WidowMine +428,Liberator +429,Adept +430,Disruptor +431,Oracle +432,Tempest +433,Ravager +434,SwarmHostMP +435,Viper +436,HighTemplarSkinPreview +437,MothershipCore +438,Viking +446,RenegadeMissileTurret +447,Rocks2x2NonConjoined +448,FungalGrowthMissile +449,NeuralParasiteTentacleMissile +450,Beacon_Protoss +451,Beacon_ProtossSmall +452,Beacon_Terran +453,Beacon_TerranSmall +454,Beacon_Zerg +455,Beacon_ZergSmall +456,Lyote +457,CarrionBird +458,KarakMale +459,KarakFemale +460,UrsadakFemaleExotic +461,UrsadakMale +462,UrsadakFemale +463,UrsadakCalf +464,UrsadakMaleExotic +465,UtilityBot +466,CommentatorBot1 +467,CommentatorBot2 +468,CommentatorBot3 +469,CommentatorBot4 +470,Scantipede +471,Dog +472,Sheep +473,Cow +474,InfestedTerransEggPlacement +475,InfestorTerransWeapon +476,MineralField +477,MineralField750 +478,VespeneGeyser +479,SpacePlatformGeyser +480,RichVespeneGeyser +481,DestructibleSearchlight +482,DestructibleBullhornLights +483,DestructibleStreetlight +484,DestructibleSpacePlatformSign +485,DestructibleStoreFrontCityProps +486,DestructibleBillboardTall +487,DestructibleBillboardScrollingText +488,DestructibleSpacePlatformBarrier +489,DestructibleSignsDirectional +490,DestructibleSignsConstruction +491,DestructibleSignsFunny +492,DestructibleSignsIcons +493,DestructibleSignsWarning +494,DestructibleGarage +495,DestructibleGarageLarge +496,DestructibleTrafficSignal +497,TrafficSignal +498,BraxisAlphaDestructible1x1 +499,BraxisAlphaDestructible2x2 +500,DestructibleDebris4x4 +501,DestructibleDebris6x6 +502,DestructibleRock2x4Vertical +503,DestructibleRock2x4Horizontal +504,DestructibleRock2x6Vertical +505,DestructibleRock2x6Horizontal +506,DestructibleRock4x4 +507,DestructibleRock6x6 +508,DestructibleRampDiagonalHugeULBR +509,DestructibleRampDiagonalHugeBLUR +510,DestructibleRampVerticalHuge +511,DestructibleRampHorizontalHuge +512,DestructibleDebrisRampDiagonalHugeULBR +513,DestructibleDebrisRampDiagonalHugeBLUR +514,WarpPrismSkinPreview +515,SiegeTankSkinPreview +516,ThorAP +517,ThorAALance +518,LiberatorSkinPreview +519,OverlordGenerateCreepKeybind +520,MengskStatueAlone +521,MengskStatue +522,WolfStatue +523,GlobeStatue +524,Weapon +525,GlaiveWurmBounceWeapon +526,BroodLordWeapon +527,BroodLordAWeapon +528,CreepBlocker1x1 +529,PermanentCreepBlocker1x1 +530,PathingBlocker1x1 +531,PathingBlocker2x2 +532,AutoTestAttackTargetGround +533,AutoTestAttackTargetAir +534,AutoTestAttacker +535,HelperEmitterSelectionArrow +536,MultiKillObject +537,ShapeGolfball +538,ShapeCone +539,ShapeCube +540,ShapeCylinder +541,ShapeDodecahedron +542,ShapeIcosahedron +543,ShapeOctahedron +544,ShapePyramid +545,ShapeRoundedCube +546,ShapeSphere +547,ShapeTetrahedron +548,ShapeThickTorus +549,ShapeThinTorus +550,ShapeTorus +551,Shape4PointStar +552,Shape5PointStar +553,Shape6PointStar +554,Shape8PointStar +555,ShapeArrowPointer +556,ShapeBowl +557,ShapeBox +558,ShapeCapsule +559,ShapeCrescentMoon +560,ShapeDecahedron +561,ShapeDiamond +562,ShapeFootball +563,ShapeGemstone +564,ShapeHeart +565,ShapeJack +566,ShapePlusSign +567,ShapeShamrock +568,ShapeSpade +569,ShapeTube +570,ShapeEgg +571,ShapeYenSign +572,ShapeX +573,ShapeWatermelon +574,ShapeWonSign +575,ShapeTennisball +576,ShapeStrawberry +577,ShapeSmileyFace +578,ShapeSoccerball +579,ShapeRainbow +580,ShapeSadFace +581,ShapePoundSign +582,ShapePear +583,ShapePineapple +584,ShapeOrange +585,ShapePeanut +586,ShapeO +587,ShapeLemon +588,ShapeMoneyBag +589,ShapeHorseshoe +590,ShapeHockeyStick +591,ShapeHockeyPuck +592,ShapeHand +593,ShapeGolfClub +594,ShapeGrape +595,ShapeEuroSign +596,ShapeDollarSign +597,ShapeBasketball +598,ShapeCarrot +599,ShapeCherry +600,ShapeBaseball +601,ShapeBaseballBat +602,ShapeBanana +603,ShapeApple +604,ShapeCashLarge +605,ShapeCashMedium +606,ShapeCashSmall +607,ShapeFootballColored +608,ShapeLemonSmall +609,ShapeOrangeSmall +610,ShapeTreasureChestOpen +611,ShapeTreasureChestClosed +612,ShapeWatermelonSmall +613,UnbuildableRocksDestructible +614,UnbuildableBricksDestructible +615,UnbuildablePlatesDestructible +616,Debris2x2NonConjoined +617,EnemyPathingBlocker1x1 +618,EnemyPathingBlocker2x2 +619,EnemyPathingBlocker4x4 +620,EnemyPathingBlocker8x8 +621,EnemyPathingBlocker16x16 +622,ScopeTest +623,SentryACGluescreenDummy +624,StukovInfestedTrooperACGluescreenDummy +640,CollapsibleTerranTowerDebris +641,DebrisRampLeft +642,DebrisRampRight +646,LocustMP +647,CollapsibleRockTowerDebris +648,NydusCanalAttacker +649,NydusCanalCreeper +650,SwarmHostBurrowedMP +651,WarHound +652,WidowMineBurrowed +653,LurkerMPEgg +654,LurkerMPBurrowed +655,LurkerDenMP +656,ExtendingBridgeNEWide8Out +657,ExtendingBridgeNEWide8 +658,ExtendingBridgeNWWide8Out +659,ExtendingBridgeNWWide8 +660,ExtendingBridgeNEWide10Out +661,ExtendingBridgeNEWide10 +662,ExtendingBridgeNWWide10Out +663,ExtendingBridgeNWWide10 +664,ExtendingBridgeNEWide12Out +665,ExtendingBridgeNEWide12 +666,ExtendingBridgeNWWide12Out +667,ExtendingBridgeNWWide12 +669,CollapsibleRockTowerDebrisRampRight +670,CollapsibleRockTowerDebrisRampLeft +671,XelNaga_Caverns_DoorE +672,XelNaga_Caverns_DoorEOpened +673,XelNaga_Caverns_DoorN +674,XelNaga_Caverns_DoorNE +675,XelNaga_Caverns_DoorNEOpened +676,XelNaga_Caverns_DoorNOpened +677,XelNaga_Caverns_DoorNW +678,XelNaga_Caverns_DoorNWOpened +679,XelNaga_Caverns_DoorS +680,XelNaga_Caverns_DoorSE +681,XelNaga_Caverns_DoorSEOpened +682,XelNaga_Caverns_DoorSOpened +683,XelNaga_Caverns_DoorSW +684,XelNaga_Caverns_DoorSWOpened +685,XelNaga_Caverns_DoorW +686,XelNaga_Caverns_DoorWOpened +687,XelNaga_Caverns_Floating_BridgeNE8Out +688,XelNaga_Caverns_Floating_BridgeNE8 +689,XelNaga_Caverns_Floating_BridgeNW8Out +690,XelNaga_Caverns_Floating_BridgeNW8 +691,XelNaga_Caverns_Floating_BridgeNE10Out +692,XelNaga_Caverns_Floating_BridgeNE10 +693,XelNaga_Caverns_Floating_BridgeNW10Out +694,XelNaga_Caverns_Floating_BridgeNW10 +695,XelNaga_Caverns_Floating_BridgeNE12Out +696,XelNaga_Caverns_Floating_BridgeNE12 +697,XelNaga_Caverns_Floating_BridgeNW12Out +698,XelNaga_Caverns_Floating_BridgeNW12 +699,XelNaga_Caverns_Floating_BridgeH8Out +700,XelNaga_Caverns_Floating_BridgeH8 +701,XelNaga_Caverns_Floating_BridgeV8Out +702,XelNaga_Caverns_Floating_BridgeV8 +703,XelNaga_Caverns_Floating_BridgeH10Out +704,XelNaga_Caverns_Floating_BridgeH10 +705,XelNaga_Caverns_Floating_BridgeV10Out +706,XelNaga_Caverns_Floating_BridgeV10 +707,XelNaga_Caverns_Floating_BridgeH12Out +708,XelNaga_Caverns_Floating_BridgeH12 +709,XelNaga_Caverns_Floating_BridgeV12Out +710,XelNaga_Caverns_Floating_BridgeV12 +713,CollapsibleTerranTowerPushUnitRampLeft +714,CollapsibleTerranTowerPushUnitRampRight +717,CollapsibleRockTowerPushUnit +718,CollapsibleTerranTowerPushUnit +719,CollapsibleRockTowerPushUnitRampRight +720,CollapsibleRockTowerPushUnitRampLeft +721,DigesterCreepSprayTargetUnit +722,DigesterCreepSprayUnit +723,NydusCanalAttackerWeapon +724,ViperConsumeStructureWeapon +727,ResourceBlocker +728,TempestWeapon +729,YoinkMissile +733,YoinkVikingAirMissile +735,YoinkVikingGroundMissile +737,YoinkSiegeTankMissile +739,WarHoundWeapon +741,EyeStalkWeapon +744,WidowMineWeapon +745,WidowMineAirWeapon +746,MothershipCoreWeaponWeapon +747,TornadoMissileWeapon +748,TornadoMissileDummyWeapon +749,TalonsMissileWeapon +750,CreepTumorMissile +751,LocustMPEggAMissileWeapon +752,LocustMPEggBMissileWeapon +753,LocustMPWeapon +755,RepulsorCannonWeapon +759,CollapsibleRockTowerDiagonal +760,CollapsibleTerranTowerDiagonal +761,CollapsibleTerranTowerRampLeft +762,CollapsibleTerranTowerRampRight +763,Ice2x2NonConjoined +764,IceProtossCrates +765,ProtossCrates +766,TowerMine +767,PickupPalletGas +768,PickupPalletMinerals +769,PickupScrapSalvage1x1 +770,PickupScrapSalvage2x2 +771,PickupScrapSalvage3x3 +772,RoughTerrain +773,UnbuildableBricksSmallUnit +774,UnbuildablePlatesSmallUnit +775,UnbuildablePlatesUnit +776,UnbuildableRocksSmallUnit +777,XelNagaHealingShrine +778,InvisibleTargetDummy +779,ProtossVespeneGeyser +780,CollapsibleRockTower +781,CollapsibleTerranTower +782,ThornLizard +783,CleaningBot +784,DestructibleRock6x6Weak +785,ProtossSnakeSegmentDemo +786,PhysicsCapsule +787,PhysicsCube +788,PhysicsCylinder +789,PhysicsKnot +790,PhysicsL +791,PhysicsPrimitives +792,PhysicsSphere +793,PhysicsStar +794,CreepBlocker4x4 +795,DestructibleCityDebris2x4Vertical +796,DestructibleCityDebris2x4Horizontal +797,DestructibleCityDebris2x6Vertical +798,DestructibleCityDebris2x6Horizontal +799,DestructibleCityDebris4x4 +800,DestructibleCityDebris6x6 +801,DestructibleCityDebrisHugeDiagonalBLUR +802,DestructibleCityDebrisHugeDiagonalULBR +803,TestZerg +804,PathingBlockerRadius1 +805,DestructibleRockEx12x4Vertical +806,DestructibleRockEx12x4Horizontal +807,DestructibleRockEx12x6Vertical +808,DestructibleRockEx12x6Horizontal +809,DestructibleRockEx14x4 +810,DestructibleRockEx16x6 +811,DestructibleRockEx1DiagonalHugeULBR +812,DestructibleRockEx1DiagonalHugeBLUR +813,DestructibleRockEx1VerticalHuge +814,DestructibleRockEx1HorizontalHuge +815,DestructibleIce2x4Vertical +816,DestructibleIce2x4Horizontal +817,DestructibleIce2x6Vertical +818,DestructibleIce2x6Horizontal +819,DestructibleIce4x4 +820,DestructibleIce6x6 +821,DestructibleIceDiagonalHugeULBR +822,DestructibleIceDiagonalHugeBLUR +823,DestructibleIceVerticalHuge +824,DestructibleIceHorizontalHuge +825,DesertPlanetSearchlight +826,DesertPlanetStreetlight +827,UnbuildableBricksUnit +828,UnbuildableRocksUnit +829,ZerusDestructibleArch +830,Artosilope +831,Anteplott +832,LabBot +833,Crabeetle +834,CollapsibleRockTowerRampRight +835,CollapsibleRockTowerRampLeft +836,LabMineralField +837,LabMineralField750 +852,SnowRefinery_Terran_ExtendingBridgeNEShort8Out +853,SnowRefinery_Terran_ExtendingBridgeNEShort8 +854,SnowRefinery_Terran_ExtendingBridgeNWShort8Out +855,SnowRefinery_Terran_ExtendingBridgeNWShort8 +860,Tarsonis_DoorN +861,Tarsonis_DoorNLowered +862,Tarsonis_DoorNE +863,Tarsonis_DoorNELowered +864,Tarsonis_DoorE +865,Tarsonis_DoorELowered +866,Tarsonis_DoorNW +867,Tarsonis_DoorNWLowered +868,CompoundMansion_DoorN +869,CompoundMansion_DoorNLowered +870,CompoundMansion_DoorNE +871,CompoundMansion_DoorNELowered +872,CompoundMansion_DoorE +873,CompoundMansion_DoorELowered +874,CompoundMansion_DoorNW +875,CompoundMansion_DoorNWLowered +876,RavagerCocoon +877,RavagerBurrowed +879,LocustMPFlying +880,AiurLightBridgeNE8Out +881,AiurLightBridgeNE8 +882,AiurLightBridgeNE10Out +883,AiurLightBridgeNE10 +884,AiurLightBridgeNE12Out +885,AiurLightBridgeNE12 +886,AiurLightBridgeNW8Out +887,AiurLightBridgeNW8 +888,AiurLightBridgeNW10Out +889,AiurLightBridgeNW10 +890,AiurLightBridgeNW12Out +891,AiurLightBridgeNW12 +892,AiurTempleBridgeNE8Out +894,AiurTempleBridgeNE10Out +896,AiurTempleBridgeNE12Out +898,AiurTempleBridgeNW8Out +900,AiurTempleBridgeNW10Out +902,AiurTempleBridgeNW12Out +904,ShakurasLightBridgeNE8Out +905,ShakurasLightBridgeNE8 +906,ShakurasLightBridgeNE10Out +907,ShakurasLightBridgeNE10 +908,ShakurasLightBridgeNE12Out +909,ShakurasLightBridgeNE12 +910,ShakurasLightBridgeNW8Out +911,ShakurasLightBridgeNW8 +912,ShakurasLightBridgeNW10Out +913,ShakurasLightBridgeNW10 +914,ShakurasLightBridgeNW12Out +915,ShakurasLightBridgeNW12 +916,VoidMPImmortalReviveCorpse +917,GuardianCocoonMP +918,GuardianMP +919,DevourerCocoonMP +920,DevourerMP +921,DefilerMPBurrowed +922,DefilerMP +923,OracleStasisTrap +924,DisruptorPhased +925,AiurLightBridgeAbandonedNE8Out +926,AiurLightBridgeAbandonedNE8 +927,AiurLightBridgeAbandonedNE10Out +928,AiurLightBridgeAbandonedNE10 +929,AiurLightBridgeAbandonedNE12Out +930,AiurLightBridgeAbandonedNE12 +931,AiurLightBridgeAbandonedNW8Out +932,AiurLightBridgeAbandonedNW8 +933,AiurLightBridgeAbandonedNW10Out +934,AiurLightBridgeAbandonedNW10 +935,AiurLightBridgeAbandonedNW12Out +936,AiurLightBridgeAbandonedNW12 +937,CollapsiblePurifierTowerDebris +938,PortCity_Bridge_UnitNE8Out +939,PortCity_Bridge_UnitNE8 +940,PortCity_Bridge_UnitSE8Out +941,PortCity_Bridge_UnitSE8 +942,PortCity_Bridge_UnitNW8Out +943,PortCity_Bridge_UnitNW8 +944,PortCity_Bridge_UnitSW8Out +945,PortCity_Bridge_UnitSW8 +946,PortCity_Bridge_UnitNE10Out +947,PortCity_Bridge_UnitNE10 +948,PortCity_Bridge_UnitSE10Out +949,PortCity_Bridge_UnitSE10 +950,PortCity_Bridge_UnitNW10Out +951,PortCity_Bridge_UnitNW10 +952,PortCity_Bridge_UnitSW10Out +953,PortCity_Bridge_UnitSW10 +954,PortCity_Bridge_UnitNE12Out +955,PortCity_Bridge_UnitNE12 +956,PortCity_Bridge_UnitSE12Out +957,PortCity_Bridge_UnitSE12 +958,PortCity_Bridge_UnitNW12Out +959,PortCity_Bridge_UnitNW12 +960,PortCity_Bridge_UnitSW12Out +961,PortCity_Bridge_UnitSW12 +962,PortCity_Bridge_UnitN8Out +963,PortCity_Bridge_UnitN8 +964,PortCity_Bridge_UnitS8Out +965,PortCity_Bridge_UnitS8 +966,PortCity_Bridge_UnitE8Out +967,PortCity_Bridge_UnitE8 +968,PortCity_Bridge_UnitW8Out +969,PortCity_Bridge_UnitW8 +970,PortCity_Bridge_UnitN10Out +971,PortCity_Bridge_UnitN10 +972,PortCity_Bridge_UnitS10Out +973,PortCity_Bridge_UnitS10 +974,PortCity_Bridge_UnitE10Out +975,PortCity_Bridge_UnitE10 +976,PortCity_Bridge_UnitW10Out +977,PortCity_Bridge_UnitW10 +978,PortCity_Bridge_UnitN12Out +979,PortCity_Bridge_UnitN12 +980,PortCity_Bridge_UnitS12Out +981,PortCity_Bridge_UnitS12 +982,PortCity_Bridge_UnitE12Out +983,PortCity_Bridge_UnitE12 +984,PortCity_Bridge_UnitW12Out +985,PortCity_Bridge_UnitW12 +986,PurifierRichMineralField +987,PurifierRichMineralField750 +1002,CollapsiblePurifierTowerPushUnit +1004,LocustMPPrecursor +1005,ReleaseInterceptorsBeacon +1006,AdeptPhaseShift +1007,RavagerCorrosiveBileMissile +1008,HydraliskImpaleMissile +1009,CycloneMissileLargeAir +1010,CycloneMissile +1011,CycloneMissileLarge +1012,OracleWeapon +1013,TempestWeaponGround +1014,RavagerWeaponMissile +1015,ScoutMPAirWeaponLeft +1016,ScoutMPAirWeaponRight +1017,ArbiterMPWeaponMissile +1018,GuardianMPWeapon +1019,DevourerMPWeaponMissile +1020,DefilerMPDarkSwarmWeapon +1021,QueenMPEnsnareMissile +1022,QueenMPSpawnBroodlingsMissile +1023,LightningBombWeapon +1024,HERCPlacement +1025,GrappleWeapon +1028,CausticSprayMissile +1029,ParasiticBombMissile +1030,ParasiticBombDummy +1031,AdeptWeapon +1032,AdeptUpgradeWeapon +1033,LiberatorMissile +1034,LiberatorDamageMissile +1035,LiberatorAGMissile +1036,KD8Charge +1037,KD8ChargeWeapon +1039,SlaynElementalGrabWeapon +1040,SlaynElementalGrabAirUnit +1041,SlaynElementalGrabGroundUnit +1042,SlaynElementalWeapon +1047,DestructibleExpeditionGate6x6 +1048,DestructibleZergInfestation3x3 +1049,HERC +1050,Moopy +1051,Replicant +1052,SeekerMissile +1053,AiurTempleBridgeDestructibleNE8Out +1054,AiurTempleBridgeDestructibleNE10Out +1055,AiurTempleBridgeDestructibleNE12Out +1056,AiurTempleBridgeDestructibleNW8Out +1057,AiurTempleBridgeDestructibleNW10Out +1058,AiurTempleBridgeDestructibleNW12Out +1059,AiurTempleBridgeDestructibleSW8Out +1060,AiurTempleBridgeDestructibleSW10Out +1061,AiurTempleBridgeDestructibleSW12Out +1062,AiurTempleBridgeDestructibleSE8Out +1063,AiurTempleBridgeDestructibleSE10Out +1064,AiurTempleBridgeDestructibleSE12Out +1066,FlyoverUnit +1067,CorsairMP +1068,ScoutMP +1070,ArbiterMP +1071,ScourgeMP +1072,DefilerMPPlagueWeapon +1073,QueenMP +1074,XelNagaDestructibleRampBlocker6S +1075,XelNagaDestructibleRampBlocker6SE +1076,XelNagaDestructibleRampBlocker6E +1077,XelNagaDestructibleRampBlocker6NE +1078,XelNagaDestructibleRampBlocker6N +1079,XelNagaDestructibleRampBlocker6NW +1080,XelNagaDestructibleRampBlocker6W +1081,XelNagaDestructibleRampBlocker6SW +1082,XelNagaDestructibleRampBlocker8S +1083,XelNagaDestructibleRampBlocker8SE +1084,XelNagaDestructibleRampBlocker8E +1085,XelNagaDestructibleRampBlocker8NE +1086,XelNagaDestructibleRampBlocker8N +1087,XelNagaDestructibleRampBlocker8NW +1088,XelNagaDestructibleRampBlocker8W +1089,XelNagaDestructibleRampBlocker8SW +1090,XelNagaDestructibleBlocker6S +1091,XelNagaDestructibleBlocker6SE +1092,XelNagaDestructibleBlocker6E +1093,XelNagaDestructibleBlocker6NE +1094,XelNagaDestructibleBlocker6N +1095,XelNagaDestructibleBlocker6NW +1096,XelNagaDestructibleBlocker6W +1097,XelNagaDestructibleBlocker6SW +1098,XelNagaDestructibleBlocker8S +1099,XelNagaDestructibleBlocker8SE +1100,XelNagaDestructibleBlocker8E +1101,XelNagaDestructibleBlocker8NE +1102,XelNagaDestructibleBlocker8N +1103,XelNagaDestructibleBlocker8NW +1104,XelNagaDestructibleBlocker8W +1105,XelNagaDestructibleBlocker8SW +1106,ReptileCrate +1107,SlaynSwarmHostSpawnFlyer +1108,SlaynElemental +1109,PurifierVespeneGeyser +1110,ShakurasVespeneGeyser +1111,CollapsiblePurifierTowerDiagonal +1112,CreepOnlyBlocker4x4 +1113,BattleStationMineralField +1114,BattleStationMineralField750 +1115,PurifierMineralField +1116,PurifierMineralField750 +1117,Beacon_Nova +1118,Beacon_NovaSmall +1119,Ursula +1120,Elsecaro_Colonist_Hut +1121,SnowGlazeStarterMP +1122,ShieldBattery +1123,TransportOverlordCocoon +1124,PylonOvercharged +1125,ObserverSiegeMode +1126,RavenRepairDrone +1128,ParasiticBombRelayDummy +1129,BypassArmorDrone +1130,AdeptPiercingWeapon +1131,HighTemplarWeaponMissile +1132,CycloneMissileLargeAirAlternative +1133,RavenScramblerMissile +1134,RavenRepairDroneReleaseWeapon +1135,RavenShredderMissileWeapon +1136,InfestedAcidSpinesWeapon +1137,InfestorEnsnareAttackMissile +1138,SNARE_PLACEHOLDER +1141,CorrosiveParasiteWeapon diff --git a/sc2reader/data/__init__.py b/sc2reader/data/__init__.py index 0e25cfa8..7a3d4ecb 100755 --- a/sc2reader/data/__init__.py +++ b/sc2reader/data/__init__.py @@ -411,7 +411,7 @@ def load_build(expansion, version): # Load LotV Data lotv_builds = dict() -for version in ('base', '44401', '47185', '48258', '53644', '54724', '59587'): +for version in ('base', '44401', '47185', '48258', '53644', '54724', '59587', '70154'): lotv_builds[version] = load_build('LotV', version) datapacks = builds = {'WoL': wol_builds, 'HotS': hots_builds, 'LotV': lotv_builds} diff --git a/sc2reader/data/ability_lookup.csv b/sc2reader/data/ability_lookup.csv index fa4ed3aa..09b69177 100755 --- a/sc2reader/data/ability_lookup.csv +++ b/sc2reader/data/ability_lookup.csv @@ -160,7 +160,7 @@ HallucinationZealot,HallucinateZealot,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, HangarQueue5,CancelLast,CancelSlot,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, HerdInteract,Herd,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, HoldFire,Stop,HoldFire,Cheer,Dance,,,,,,,,,,,,,,,,,,,,,,,,,,,, -HydraliskDenResearch,,ResearchEvolveMuscularAugments,EvolveGroovedSpines,EvolveMuscularAugments,,,,,,,,,,,,,,,,,,,,,,,,,,,CancelHydraliskDenResearch, +HydraliskDenResearch,ResearchEvolveGroovedSpines,ResearchEvolveMuscularAugments,EvolveGroovedSpines,EvolveMuscularAugments,,,,,,,,,,,,,,,,,,,,,,,,,,,CancelHydraliskDenResearch, InfestationPitResearch,,,EvolvePathogenGlands,EvolveNeuralParasite,EvolveEnduringLocusts,,,,,,,,,,,,,,,,,,,,,,,,,,CancelInfestationPitResearch, InfestedTerrans,SpawnInfestedTerran,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, InfestedTerransLayEgg,SpawnInfestedTerran,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, @@ -858,3 +858,6 @@ ChronoBoostEnergyCost,ChronoBoostEnergyCost ObserverMorphtoObserverSiege,ObserverMorphtoObserverSiege RavenRepairDroneHeal,RavenRepairDroneHeal NexusMassRecall,NexusMassRecall +OverlordSingleTransport,Load,,UnloadAt +ParasiticBombRelayDodge,ParasiticBombRelayDodge +ViperParasiticBombRelay,ViperParasiticBombRelay diff --git a/sc2reader/data/attributes.json b/sc2reader/data/attributes.json index 751f8dc8..773be8c3 100644 --- a/sc2reader/data/attributes.json +++ b/sc2reader/data/attributes.json @@ -714,7 +714,8 @@ "Swan": "Swann", "Tych": "Tychus", "Vora": "Vorazun", - "Zaga": "Zagara" + "Zaga": "Zagara", + "Zera": "Zeratul" } ], "3014": [ diff --git a/sc2reader/data/unit_lookup.csv b/sc2reader/data/unit_lookup.csv index 519c782a..7327ef0d 100755 --- a/sc2reader/data/unit_lookup.csv +++ b/sc2reader/data/unit_lookup.csv @@ -999,3 +999,24 @@ TyrannozorACGluescreenDummy,TyrannozorACGluescreenDummy InfestorEnsnareAttackMissile,InfestorEnsnareAttackMissile HHMissileTurretACGluescreenDummy,HHMissileTurretACGluescreenDummy WarpPrismSkinPreview,WarpPrismSkinPreview +ZeratulWarpPrismACGluescreenDummy,ZeratulWarpPrismACGluescreenDummy +TychusMedicACGluescreenDummy,TychusMedicACGluescreenDummy +ParasiticBombRelayDummy,ParasiticBombRelayDummy +ZeratulDisruptorACGluescreenDummy,ZeratulDisruptorACGluescreenDummy +ZeratulImmortalACGluescreenDummy,ZeratulImmortalACGluescreenDummy +TychusHERCACGluescreenDummy,TychusHERCACGluescreenDummy +RenegadeMissileTurret,RenegadeMissileTurret +ZeratulDarkTemplarACGluescreenDummy,ZeratulDarkTemplarACGluescreenDummy +TychusFirebatACGluescreenDummy,TychusFirebatACGluescreenDummy +ZeratulObserverACGluescreenDummy,ZeratulObserverACGluescreenDummy +ZeratulSentryACGluescreenDummy,ZeratulSentryACGluescreenDummy +TychusGhostACGluescreenDummy,TychusGhostACGluescreenDummy +TychusWarhoundACGluescreenDummy,TychusWarhoundACGluescreenDummy +TychusMarauderACGluescreenDummy,TychusMarauderACGluescreenDummy +RenegadeLongboltMissileWeapon,RenegadeLongboltMissileWeapon +TychusSpectreACGluescreenDummy,TychusSpectreACGluescreenDummy +TychusSCVAutoTurretACGluescreenDummy,TychusSCVAutoTurretACGluescreenDummy +ZeratulStalkerACGluescreenDummy,ZeratulStalkerACGluescreenDummy +ZeratulPhotonCannonACGluescreenDummy,ZeratulPhotonCannonACGluescreenDummy +Viking,Viking +TychusReaperACGluescreenDummy,TychusReaperACGluescreenDummy diff --git a/sc2reader/readers.py b/sc2reader/readers.py index 1428186e..54bf3f54 100644 --- a/sc2reader/readers.py +++ b/sc2reader/readers.py @@ -118,7 +118,7 @@ def __call__(self, data, replay): working_set_slot_id=data.read_uint8() if replay.base_build >= 24764 and data.read_bool() else None, rewards=[data.read_uint32() for i in range(data.read_bits(17 if replay.base_build >= 34784 else 6 if replay.base_build >= 24764 else 5))], toon_handle=data.read_aligned_string(data.read_bits(7)) if replay.base_build >= 17266 else None, - licenses=[data.read_uint32() for i in range(data.read_bits(9))] if replay.base_build >= 19132 else [], + licenses=[data.read_uint32() for i in range(data.read_bits(13 if replay.base_build >= 70154 else 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, diff --git a/sc2reader/resources.py b/sc2reader/resources.py index 9bc76da2..8d165670 100644 --- a/sc2reader/resources.py +++ b/sc2reader/resources.py @@ -601,16 +601,17 @@ def register_default_datapacks(self): self.register_datapack(datapacks['WoL']['24944'], lambda r: r.expansion == 'WoL' and 24944 <= r.build) self.register_datapack(datapacks['HotS']['base'], lambda r: r.expansion == 'HotS' and r.build < 23925) self.register_datapack(datapacks['HotS']['23925'], lambda r: r.expansion == 'HotS' and 23925 <= r.build < 24247) - self.register_datapack(datapacks['HotS']['24247'], lambda r: r.expansion == 'HotS' and 24247 <= r.build <= 24764) + self.register_datapack(datapacks['HotS']['24247'], lambda r: r.expansion == 'HotS' and 24247 <= r.build < 24764) self.register_datapack(datapacks['HotS']['24764'], lambda r: r.expansion == 'HotS' and 24764 <= r.build < 38215) self.register_datapack(datapacks['HotS']['38215'], lambda r: r.expansion == 'HotS' and 38215 <= r.build) self.register_datapack(datapacks['LotV']['base'], lambda r: r.expansion == 'LotV' and 34784 <= r.build) - self.register_datapack(datapacks['LotV']['44401'], lambda r: r.expansion == 'LotV' and 44401 <= r.build) - self.register_datapack(datapacks['LotV']['47185'], lambda r: r.expansion == 'LotV' and 47185 <= r.build) - self.register_datapack(datapacks['LotV']['48258'], lambda r: r.expansion == 'LotV' and 48258 <= r.build) - self.register_datapack(datapacks['LotV']['53644'], lambda r: r.expansion == 'LotV' and 53644 <= r.build) - self.register_datapack(datapacks['LotV']['54724'], lambda r: r.expansion == 'LotV' and 54724 <= r.build) - self.register_datapack(datapacks['LotV']['59587'], lambda r: r.expansion == 'LotV' and 59587 <= r.build) + self.register_datapack(datapacks['LotV']['44401'], lambda r: r.expansion == 'LotV' and 44401 <= r.build < 47185) + self.register_datapack(datapacks['LotV']['47185'], lambda r: r.expansion == 'LotV' and 47185 <= r.build < 48258) + self.register_datapack(datapacks['LotV']['48258'], lambda r: r.expansion == 'LotV' and 48258 <= r.build < 53644) + self.register_datapack(datapacks['LotV']['53644'], lambda r: r.expansion == 'LotV' and 53644 <= r.build < 54724) + self.register_datapack(datapacks['LotV']['54724'], lambda r: r.expansion == 'LotV' and 54724 <= r.build < 59587) + self.register_datapack(datapacks['LotV']['59587'], lambda r: r.expansion == 'LotV' and 59587 <= r.build < 70154) + self.register_datapack(datapacks['LotV']['70154'], lambda r: r.expansion == 'LotV' and 70154 <= r.build) # Internal Methods diff --git a/setup.py b/setup.py index c14bc2a2..c06d6fce 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( license="MIT", name="sc2reader", - version='1.2.0', + version='1.3.0', keywords=["starcraft 2", "sc2", "replay", "parser"], description="Utility for parsing Starcraft II replay files", long_description=open("README.rst").read()+"\n\n"+open("CHANGELOG.rst").read(), diff --git a/test_replays/4.7.0.70154/1.SC2Replay b/test_replays/4.7.0.70154/1.SC2Replay new file mode 100644 index 00000000..3633b09e Binary files /dev/null and b/test_replays/4.7.0.70154/1.SC2Replay differ diff --git a/test_replays/test_all.py b/test_replays/test_all.py index 1667fe1a..b779e7cf 100644 --- a/test_replays/test_all.py +++ b/test_replays/test_all.py @@ -596,6 +596,13 @@ def test_event_print(self): sys.stdout = sys.__stdout__ capturedOutput.close() + def test_70154(self): + for replayfilename in [ + "test_replays/4.7.0.70154/1.SC2Replay", + ]: + factory = sc2reader.factories.SC2Factory() + replay = factory.load_replay(replayfilename) + class TestGameEngine(unittest.TestCase): class TestEvent(object):