diff --git a/ConflictChecks.py b/ConflictChecks.py index faeefefa..171b1271 100644 --- a/ConflictChecks.py +++ b/ConflictChecks.py @@ -42,7 +42,8 @@ 'alliedcommanders/Drone (card index 0) 0': ['Move', 'Stop', 'MoveHoldPosition', 'MovePatrol', 'Attack', 'GatherProt', 'ReturnCargo', 'ZergBuild/Drone', 'ZergBuildAdvanced/Drone', 'MutatorWorkerSleep/Drone', 'Cancel'], 'alliedcommanders/Drone (card index 0) 1': ['Move', 'Stop', 'MoveHoldPosition', 'MovePatrol', 'Attack', 'GatherProt', 'ReturnCargo', 'ZergBuild/Drone', 'ZergBuildAdvanced/Drone', 'MutatorWorkerSleep/Drone', 'BurrowDown'], 'alliedcommanders/Drone (card index 1) 0': ['Hatchery/Drone', 'Extractor/Drone', 'SpawningPool/Drone', 'EvolutionChamber/Drone', 'BanelingNest/Drone', 'SpineCrawler/Drone', 'SporeCrawler/Drone', 'ZagaraBileLauncher/Drone', 'Cancel'], - 'alliedcommanders/Drone (card index 1) 1': ['Hatchery/Drone', 'Extractor/Drone', 'SpawningPool/Drone', 'EvolutionChamber/Drone', 'RoachWarren/Drone', 'SpineCrawler/Drone', 'SporeCrawler/Drone', 'ZagaraBileLauncher/Drone', 'Cancel'], + 'alliedcommanders/Drone (card index 1) 1': ['Hatchery/Drone', 'Extractor/Drone', 'SpawningPool/Drone', 'EvolutionChamber/Drone', 'SpineCrawler/Drone', 'SporeCrawler/Drone', 'ZagaraBileLauncher/Drone', 'Cancel'], +# 'alliedcommanders/Drone (card index 1) 1': ['Hatchery/Drone', 'Extractor/Drone', 'SpawningPool/Drone', 'EvolutionChamber/Drone', 'RoachWarren/Drone', 'SpineCrawler/Drone', 'SporeCrawler/Drone', 'ZagaraBileLauncher/Drone', 'Cancel'], 'alliedcommanders/Drone (card index 2)': ['HydraliskDen/Drone', 'InfestationPit/Drone', 'Spire/Drone', 'NydusNetwork/Drone', 'UltraliskCavern/Drone', 'ScourgeNest/Drone', 'Cancel'], 'alliedcommanders/DroneOperator': ['Move', 'Stop', 'MoveHoldPosition', 'MovePatrol', 'Attack', 'VespeneDrone/DroneOperator'], 'alliedcommanders/EngineeringBay 0': ['TerranInfantryWeaponsLevel1/EngineeringBay', 'TerranInfantryArmorLevel1/EngineeringBay', 'ResearchNeosteelFrame/EngineeringBay', 'UpgradeBuildingArmorLevel1/EngineeringBay', 'SelectBuilder', 'ResearchFireSuppressionSystems/EngineeringBay', 'ResearchImprovedTurretAttackSpeed/EngineeringBay', 'Halt', 'Cancel'], @@ -1259,7 +1260,8 @@ 'Coop/Zerg/Structures/Ultralisk Cavern (Kerrigan Commander)' : ['EvolveChitinousPlating/UltraliskCavern', 'EvolveBurrowCharge/UltraliskCavern', 'EvolveTissueAssimilation/UltraliskCavern', 'Cancel'], 'Coop/Zerg/Units/Corruptor' : ['Move', 'Stop', 'MoveHoldPosition', 'MovePatrol', 'Attack', 'CorruptionAbility/Corruptor', 'BroodLord/Corruptor', 'Cancel'], 'Coop/Zerg/Units/Drone/Advanced Structures (Zagara+Kerrigan Commander)' : ['HydraliskDen/Drone', 'InfestationPit/Drone', 'Spire/Drone', 'NydusNetwork/Drone', 'UltraliskCavern/Drone', 'ScourgeNest/Drone', 'Cancel'], - 'Coop/Zerg/Units/Drone/Basic Structures (Zagara+Kerrigan Commander)' : ['Hatchery/Drone', 'Extractor/Drone', 'SpawningPool/Drone', 'EvolutionChamber/Drone', 'BanelingNest/Drone', 'RoachWarren/Drone', 'SpineCrawler/Drone', 'SporeCrawler/Drone', 'ZagaraBileLauncher/Drone', 'Cancel'], + 'Coop/Zerg/Units/Drone/Basic Structures (Zagara+Kerrigan Commander)' : ['Hatchery/Drone', 'Extractor/Drone', 'SpawningPool/Drone', 'EvolutionChamber/Drone', 'BanelingNest/Drone', 'SpineCrawler/Drone', 'SporeCrawler/Drone', 'ZagaraBileLauncher/Drone', 'Cancel'], +# 'Coop/Zerg/Units/Drone/Basic Structures (Zagara+Kerrigan Commander)' : ['Hatchery/Drone', 'Extractor/Drone', 'SpawningPool/Drone', 'EvolutionChamber/Drone', 'BanelingNest/Drone', 'RoachWarren/Drone', 'SpineCrawler/Drone', 'SporeCrawler/Drone', 'ZagaraBileLauncher/Drone', 'Cancel'], 'Coop/Zerg/Units/Hydralisk' : ['Move', 'Stop', 'MoveHoldPosition', 'MovePatrol', 'Attack', 'HydraliskFrenzy/Hydralisk', 'BurrowDown'], 'Coop/Zerg/Units/Larva/General' : ['Drone/Larva', 'Overlord/Larva', 'Zergling/Larva', 'Aberration/Larva', 'Roach/Larva', 'Hydralisk/Larva', 'Infestor/Larva', 'Ultralisk/Larva', 'SwarmHostMP/Larva', 'Mutalisk/Larva', 'Brutalisk/Larva', 'Cancel'], 'Coop/Zerg/Units/Larva/Swarm Queen Egg' : ['SwarmQueenZergling/SwarmQueenEgg', 'SwarmQueenRoach/SwarmQueenEgg', 'SwarmQueenHydralisk/SwarmQueenEgg', 'Cancel'], diff --git a/Defaults.ini b/Defaults.ini index cbf595ff..a0252c08 100644 --- a/Defaults.ini +++ b/Defaults.ini @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=E MissilePods/Loki=E MissilePods/MengskBC=E MissilePods/SkyTank=E +MissileTurret/HHSCV= MissileTurret/KelMorianWorker=T MissileTurret/SCV=T MohandarOmnislash/VorazunChampion=E diff --git a/Defaults.log b/Defaults.log index aeb3de6c..3a6a127d 100644 --- a/Defaults.log +++ b/Defaults.log @@ -231,6 +231,7 @@ Start Check defaults (log file: Defaults.log) [WARN]: no default MedicHeal/Medivac_BlackOps [WARN]: no default MedivacSpeedBoost/Medivac_BlackOps [WARN]: no default MeliakBlinkBTN/Meliak +[WARN]: no default MissileTurret/HHSCV [WARN]: no default MorphMorphalisk/BroodMother [WARN]: no default MorphMorphalisk/Queen2 [WARN]: no default MorphToHellbatBlackOps/HellionBlackOps @@ -605,5 +606,5 @@ Start Check defaults (log file: Defaults.log) [WARN]: no default ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan [ERROR]: no default SIRoot/SIFactory ---------------------------- -Finished (Check defaults) - WARNs: 602 ERRORs: 1 +Finished (Check defaults) - WARNs: 603 ERRORs: 1 ============================ \ No newline at end of file diff --git a/FrenchAzerty/TheCore Lite.SC2Hotkeys b/FrenchAzerty/TheCore Lite.SC2Hotkeys index d5b53120..77a63531 100644 --- a/FrenchAzerty/TheCore Lite.SC2Hotkeys +++ b/FrenchAzerty/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=G Battlecruiser/VoidRift=C Battlecruiser/VoidRiftUnselectable=C -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=E,Space BioMechanicalHeal/HealingDrone=R BioPlasmidDischarge/Leviathan=E,Space BioStasis/Leviathan=C @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=E FungalGrowth/InfestorBurrowed=E FusionCore/HHSCV=G FusionCore/SCV=G -GasCanisterGather/Probe=C +GasCanisterGather/Probe=4 Gateway/Harvester=C Gateway/Probe=C GatherProt=Y @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=R MissilePods/Loki=R MissilePods/MengskBC=R MissilePods/SkyTank=R +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=E @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=C ProphecyVision/ZeratulCoop=C ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=D -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,C +ProtossBuild/Probe=Space,C ProtossBuild/VoidRift=E ProtossBuild/VoidRiftUnselectable=E ProtossBuildAdvanced/Harvester=E @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=C Scan/OrbitalCommand=C Scourge/Larva=6 -ScourgeNest/Drone=E +ScourgeNest/Drone=T Scout/Stargate=T SelectBuilder=4 SelfRepair/Thor=F @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=R SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=C +Spray=4 SquadSight/Monitor=F Stalker=R StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=E TemporalField/MothershipCore=E -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,C +TerranBuild/HHSCV=Space,C +TerranBuild/KelMorianWorker=Space,C +TerranBuild/SCV=Space,C +TerranBuild/SISCV=Space,C +TerranBuild/TychusSCV=Space,C TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=E @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=E YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=E,Space -ZagaraBileLauncher/Drone=G +ZagaraBileLauncher/Drone=R ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=E @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=V ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=C ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=E -ZergBuild/Drone=Space +ZergBuild/Drone=Space,C ZergBuild/VoidRift=C ZergBuild/VoidRiftUnselectable=C ZergBuildAdvanced/Drone=E diff --git a/German/TheCore Lite.SC2Hotkeys b/German/TheCore Lite.SC2Hotkeys index 4a734b85..5a218cbd 100644 --- a/German/TheCore Lite.SC2Hotkeys +++ b/German/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=G Battlecruiser/VoidRift=C Battlecruiser/VoidRiftUnselectable=C -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=E,Space BioMechanicalHeal/HealingDrone=R BioPlasmidDischarge/Leviathan=E,Space BioStasis/Leviathan=C @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=E FungalGrowth/InfestorBurrowed=E FusionCore/HHSCV=G FusionCore/SCV=G -GasCanisterGather/Probe=C +GasCanisterGather/Probe=4 Gateway/Harvester=C Gateway/Probe=C GatherProt=Z @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=R MissilePods/Loki=R MissilePods/MengskBC=R MissilePods/SkyTank=R +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=E @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=C ProphecyVision/ZeratulCoop=C ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=D -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,C +ProtossBuild/Probe=Space,C ProtossBuild/VoidRift=E ProtossBuild/VoidRiftUnselectable=E ProtossBuildAdvanced/Harvester=E @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=C Scan/OrbitalCommand=C Scourge/Larva=6 -ScourgeNest/Drone=E +ScourgeNest/Drone=T Scout/Stargate=T SelectBuilder=4 SelfRepair/Thor=F @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=R SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=C +Spray=4 SquadSight/Monitor=F Stalker=R StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=E TemporalField/MothershipCore=E -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,C +TerranBuild/HHSCV=Space,C +TerranBuild/KelMorianWorker=Space,C +TerranBuild/SCV=Space,C +TerranBuild/SISCV=Space,C +TerranBuild/TychusSCV=Space,C TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=E @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=E YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=E,Space -ZagaraBileLauncher/Drone=G +ZagaraBileLauncher/Drone=R ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=E @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=V ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=C ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=E -ZergBuild/Drone=Space +ZergBuild/Drone=Space,C ZergBuild/VoidRift=C ZergBuild/VoidRiftUnselectable=C ZergBuildAdvanced/Drone=E diff --git a/Latin/TheCore Lite.SC2Hotkeys b/Latin/TheCore Lite.SC2Hotkeys index c9216b33..24056aa4 100644 --- a/Latin/TheCore Lite.SC2Hotkeys +++ b/Latin/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=G Battlecruiser/VoidRift=C Battlecruiser/VoidRiftUnselectable=C -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=E,Space BioMechanicalHeal/HealingDrone=R BioPlasmidDischarge/Leviathan=E,Space BioStasis/Leviathan=C @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=E FungalGrowth/InfestorBurrowed=E FusionCore/HHSCV=G FusionCore/SCV=G -GasCanisterGather/Probe=C +GasCanisterGather/Probe=4 Gateway/Harvester=C Gateway/Probe=C GatherProt=Y @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=R MissilePods/Loki=R MissilePods/MengskBC=R MissilePods/SkyTank=R +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=E @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=C ProphecyVision/ZeratulCoop=C ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=D -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,C +ProtossBuild/Probe=Space,C ProtossBuild/VoidRift=E ProtossBuild/VoidRiftUnselectable=E ProtossBuildAdvanced/Harvester=E @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=C Scan/OrbitalCommand=C Scourge/Larva=6 -ScourgeNest/Drone=E +ScourgeNest/Drone=T Scout/Stargate=T SelectBuilder=4 SelfRepair/Thor=F @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=R SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=C +Spray=4 SquadSight/Monitor=F Stalker=R StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=E TemporalField/MothershipCore=E -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,C +TerranBuild/HHSCV=Space,C +TerranBuild/KelMorianWorker=Space,C +TerranBuild/SCV=Space,C +TerranBuild/SISCV=Space,C +TerranBuild/TychusSCV=Space,C TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=E @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=E YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=E,Space -ZagaraBileLauncher/Drone=G +ZagaraBileLauncher/Drone=R ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=E @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=V ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=C ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=E -ZergBuild/Drone=Space +ZergBuild/Drone=Space,C ZergBuild/VoidRift=C ZergBuild/VoidRiftUnselectable=C ZergBuildAdvanced/Drone=E diff --git a/MissingConflict.log b/MissingConflict.log index 704ae1f7..d8d61f93 100644 --- a/MissingConflict.log +++ b/MissingConflict.log @@ -559,6 +559,9 @@ in seed TheCore Lite, keys =F [ERROR]: MedivacSpeedBoost/Medivac_BlackOps not related to a conflict in seed TheCore Lite, keys =Space +[ERROR]: MissileTurret/HHSCV not related to a conflict +in seed TheCore Lite, keys =Space + [ERROR]: MorphToHellbatBlackOps/HellionBlackOps not related to a conflict in seed TheCore Lite, keys =Space @@ -1148,7 +1151,7 @@ in seed TheCore Lite, keys =Space,4 in seed TheCore Lite, keys =Space,4 [ERROR]: Spray not related to a conflict -in seed TheCore Lite, keys =C +in seed TheCore Lite, keys =4 [ERROR]: StalkerZeratul/ZeratulGateway not related to a conflict in seed TheCore Lite, keys =R @@ -1181,16 +1184,16 @@ in seed TheCore Lite, keys =D in seed TheCore Lite, keys =E,Space [ERROR]: TerranBuild not related to a conflict -in seed TheCore Lite, keys =Space +in seed TheCore Lite, keys =Space,C [ERROR]: TerranBuild/HHSCV not related to a conflict -in seed TheCore Lite, keys =Space +in seed TheCore Lite, keys =Space,C [ERROR]: TerranBuild/SISCV not related to a conflict -in seed TheCore Lite, keys =Space +in seed TheCore Lite, keys =Space,C [ERROR]: TerranBuild/TychusSCV not related to a conflict -in seed TheCore Lite, keys =Space +in seed TheCore Lite, keys =Space,C [ERROR]: TerranBuildAdvanced not related to a conflict in seed TheCore Lite, keys =E @@ -1905,7 +1908,7 @@ in seed TheCore Lite, keys =4 [WARN]: ProtossBuild/Harvester not related to a conflict but is inherited -in seed TheCore Lite, keys =Space +in seed TheCore Lite, keys =Space,C [WARN]: ProtossBuildAdvanced/Harvester not related to a conflict but is inherited @@ -2177,5 +2180,5 @@ but is inherited in seed TheCore Lite, keys =T ---------------------------- -Finished (commands with no attached conflict) - ERRORs: 509 WARNs: 144 +Finished (commands with no attached conflict) - ERRORs: 510 WARNs: 144 ============================ \ No newline at end of file diff --git a/Nordic/TheCore Lite.SC2Hotkeys b/Nordic/TheCore Lite.SC2Hotkeys index 42c4c714..1976584e 100644 --- a/Nordic/TheCore Lite.SC2Hotkeys +++ b/Nordic/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=G Battlecruiser/VoidRift=C Battlecruiser/VoidRiftUnselectable=C -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=E,Space BioMechanicalHeal/HealingDrone=R BioPlasmidDischarge/Leviathan=E,Space BioStasis/Leviathan=C @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=E FungalGrowth/InfestorBurrowed=E FusionCore/HHSCV=G FusionCore/SCV=G -GasCanisterGather/Probe=C +GasCanisterGather/Probe=4 Gateway/Harvester=C Gateway/Probe=C GatherProt=Y @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=R MissilePods/Loki=R MissilePods/MengskBC=R MissilePods/SkyTank=R +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=E @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=C ProphecyVision/ZeratulCoop=C ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=D -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,C +ProtossBuild/Probe=Space,C ProtossBuild/VoidRift=E ProtossBuild/VoidRiftUnselectable=E ProtossBuildAdvanced/Harvester=E @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=C Scan/OrbitalCommand=C Scourge/Larva=6 -ScourgeNest/Drone=E +ScourgeNest/Drone=T Scout/Stargate=T SelectBuilder=4 SelfRepair/Thor=F @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=R SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=C +Spray=4 SquadSight/Monitor=F Stalker=R StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=E TemporalField/MothershipCore=E -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,C +TerranBuild/HHSCV=Space,C +TerranBuild/KelMorianWorker=Space,C +TerranBuild/SCV=Space,C +TerranBuild/SISCV=Space,C +TerranBuild/TychusSCV=Space,C TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=E @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=E YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=E,Space -ZagaraBileLauncher/Drone=G +ZagaraBileLauncher/Drone=R ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=E @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=V ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=C ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=E -ZergBuild/Drone=Space +ZergBuild/Drone=Space,C ZergBuild/VoidRift=C ZergBuild/VoidRiftUnselectable=C ZergBuildAdvanced/Drone=E diff --git a/Portuguese-Portugal/TheCore Lite.SC2Hotkeys b/Portuguese-Portugal/TheCore Lite.SC2Hotkeys index fedef16f..f4429d30 100644 --- a/Portuguese-Portugal/TheCore Lite.SC2Hotkeys +++ b/Portuguese-Portugal/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=G Battlecruiser/VoidRift=C Battlecruiser/VoidRiftUnselectable=C -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=E,Space BioMechanicalHeal/HealingDrone=R BioPlasmidDischarge/Leviathan=E,Space BioStasis/Leviathan=C @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=E FungalGrowth/InfestorBurrowed=E FusionCore/HHSCV=G FusionCore/SCV=G -GasCanisterGather/Probe=C +GasCanisterGather/Probe=4 Gateway/Harvester=C Gateway/Probe=C GatherProt=Y @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=R MissilePods/Loki=R MissilePods/MengskBC=R MissilePods/SkyTank=R +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=E @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=C ProphecyVision/ZeratulCoop=C ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=D -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,C +ProtossBuild/Probe=Space,C ProtossBuild/VoidRift=E ProtossBuild/VoidRiftUnselectable=E ProtossBuildAdvanced/Harvester=E @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=C Scan/OrbitalCommand=C Scourge/Larva=6 -ScourgeNest/Drone=E +ScourgeNest/Drone=T Scout/Stargate=T SelectBuilder=4 SelfRepair/Thor=F @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=R SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=C +Spray=4 SquadSight/Monitor=F Stalker=R StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=E TemporalField/MothershipCore=E -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,C +TerranBuild/HHSCV=Space,C +TerranBuild/KelMorianWorker=Space,C +TerranBuild/SCV=Space,C +TerranBuild/SISCV=Space,C +TerranBuild/TychusSCV=Space,C TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=E @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=E YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=E,Space -ZagaraBileLauncher/Drone=G +ZagaraBileLauncher/Drone=R ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=E @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=V ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=C ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=E -ZergBuild/Drone=Space +ZergBuild/Drone=Space,C ZergBuild/VoidRift=C ZergBuild/VoidRiftUnselectable=C ZergBuildAdvanced/Drone=E diff --git a/QGMLWB/TheCore Lite.SC2Hotkeys b/QGMLWB/TheCore Lite.SC2Hotkeys index 05f7a9b9..be0c88d4 100644 --- a/QGMLWB/TheCore Lite.SC2Hotkeys +++ b/QGMLWB/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=R Battlecruiser/VoidRift=C Battlecruiser/VoidRiftUnselectable=C -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=M,Space BioMechanicalHeal/HealingDrone=L BioPlasmidDischarge/Leviathan=M,Space BioStasis/Leviathan=C @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=M FungalGrowth/InfestorBurrowed=M FusionCore/HHSCV=R FusionCore/SCV=R -GasCanisterGather/Probe=C +GasCanisterGather/Probe=4 Gateway/Harvester=C Gateway/Probe=C GatherProt=B @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=L MissilePods/Loki=L MissilePods/MengskBC=L MissilePods/SkyTank=L +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=M @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=C ProphecyVision/ZeratulCoop=C ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=T -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,C +ProtossBuild/Probe=Space,C ProtossBuild/VoidRift=M ProtossBuild/VoidRiftUnselectable=M ProtossBuildAdvanced/Harvester=M @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=C Scan/OrbitalCommand=C Scourge/Larva=6 -ScourgeNest/Drone=M +ScourgeNest/Drone=W Scout/Stargate=W SelectBuilder=4 SelfRepair/Thor=N @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=L SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=C +Spray=4 SquadSight/Monitor=N Stalker=L StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=M TemporalField/MothershipCore=M -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,C +TerranBuild/HHSCV=Space,C +TerranBuild/KelMorianWorker=Space,C +TerranBuild/SCV=Space,C +TerranBuild/SISCV=Space,C +TerranBuild/TychusSCV=Space,C TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=M @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=M YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=M,Space -ZagaraBileLauncher/Drone=R +ZagaraBileLauncher/Drone=L ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=M ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=M ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=M @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=F ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=C ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=M -ZergBuild/Drone=Space +ZergBuild/Drone=Space,C ZergBuild/VoidRift=C ZergBuild/VoidRiftUnselectable=C ZergBuildAdvanced/Drone=M diff --git a/QGMLWY/TheCore Lite.SC2Hotkeys b/QGMLWY/TheCore Lite.SC2Hotkeys index b46c4545..6dbe9367 100644 --- a/QGMLWY/TheCore Lite.SC2Hotkeys +++ b/QGMLWY/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=R Battlecruiser/VoidRift=C Battlecruiser/VoidRiftUnselectable=C -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=M,Space BioMechanicalHeal/HealingDrone=L BioPlasmidDischarge/Leviathan=M,Space BioStasis/Leviathan=C @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=M FungalGrowth/InfestorBurrowed=M FusionCore/HHSCV=R FusionCore/SCV=R -GasCanisterGather/Probe=C +GasCanisterGather/Probe=4 Gateway/Harvester=C Gateway/Probe=C GatherProt=Y @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=L MissilePods/Loki=L MissilePods/MengskBC=L MissilePods/SkyTank=L +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=M @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=C ProphecyVision/ZeratulCoop=C ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=T -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,C +ProtossBuild/Probe=Space,C ProtossBuild/VoidRift=M ProtossBuild/VoidRiftUnselectable=M ProtossBuildAdvanced/Harvester=M @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=C Scan/OrbitalCommand=C Scourge/Larva=6 -ScourgeNest/Drone=M +ScourgeNest/Drone=W Scout/Stargate=W SelectBuilder=4 SelfRepair/Thor=N @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=L SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=C +Spray=4 SquadSight/Monitor=N Stalker=L StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=M TemporalField/MothershipCore=M -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,C +TerranBuild/HHSCV=Space,C +TerranBuild/KelMorianWorker=Space,C +TerranBuild/SCV=Space,C +TerranBuild/SISCV=Space,C +TerranBuild/TychusSCV=Space,C TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=M @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=M YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=M,Space -ZagaraBileLauncher/Drone=R +ZagaraBileLauncher/Drone=L ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=M ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=M ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=M @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=V ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=C ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=M -ZergBuild/Drone=Space +ZergBuild/Drone=Space,C ZergBuild/VoidRift=C ZergBuild/VoidRiftUnselectable=C ZergBuildAdvanced/Drone=M diff --git a/StableRegression.log b/StableRegression.log index aa49422a..954d94f7 100644 --- a/StableRegression.log +++ b/StableRegression.log @@ -47,8 +47,10 @@ Start Regression against referenced seeds (log file: StableRegression.log) [WARN]: 'Space,4' used in place of 'Space' for command 'SpineCrawlerUproot/SpineCrawler', in seed 'TheCore Lite' [WARN]: 'Space,4' used in place of 'Space' for command 'SporeCrawlerUproot/SporeCrawler', in seed 'TheCore Lite' [WARN]: '5' used in place of 'Y' for command 'SwarmHostMP/Larva', in seed 'TheCore Lite' +[WARN]: 'Space,C' used in place of 'Space' for command 'TerranBuild/SCV', in seed 'TheCore Lite' [WARN]: 'E,R' used in place of 'E,C' for command 'TimeWarp/Nexus', in seed 'TheCore Lite' +[WARN]: 'Space,C' used in place of 'Space' for command 'ZergBuild/Drone', in seed 'TheCore Lite' [INFO]: seed 'TheCore Lite' got regression check against 'stable/TheCore Lite.SC2Hotkeys' ---------------------------- -Finished (Regression against referenced seeds) - ERRORs: 13 WARNs: 34 INFOs: 1 +Finished (Regression against referenced seeds) - ERRORs: 13 WARNs: 36 INFOs: 1 ============================ \ No newline at end of file diff --git a/SuggestInheritance.log b/SuggestInheritance.log index 74e7b072..f29a2546 100644 --- a/SuggestInheritance.log +++ b/SuggestInheritance.log @@ -87,6 +87,7 @@ Start suggest inherit (log file: SuggestInheritance.log) EvolveTunnelingClaws/RoachWarren default: T Forge/Harvester default: copyof: Forge/Probe default: F Forge/Probe default: F + GasCanisterGather/Probe default: Period GenerateCreep/Overlord default: G GenerateCreep/OverlordTransport default: HHMercCompound/HHSCV default: @@ -149,6 +150,7 @@ Start suggest inherit (log file: SuggestInheritance.log) SS_LeviathanTentacleAttackR2NoDelay/SS_Plane default: Z SelectBuilder default: Q SpectreNukeCalldown/Spectre default: N copyof: NukeCalldown/Ghost default: N + Spray default: Y StopGenerateCreep default: C StopGenerateCreep/Overlord default: C copyof: StopGenerateCreep default: C SwarmQueenRaptor/HugeSwarmQueen default: W copyof: SwarmQueenZergling/SwarmQueen default: W, T @@ -349,7 +351,6 @@ Start suggest inherit (log file: SuggestInheritance.log) FleetwideJump/HHVikingAssault default: FleetwideJump/HHVikingFighter default: FleetwideJump/HHWraith default: - GasCanisterGather/Probe default: Period Gateway/Harvester default: copyof: Gateway/Probe default: G Gateway/Probe default: G GravitonCatapult/Carrier default: G @@ -483,7 +484,6 @@ Start suggest inherit (log file: SuggestInheritance.log) SpawnCorruptor/SpacePlatformVentsUnit default: R, C SpectreDomination/Spectre default: D SpineCrawler/Drone default: C - Spray default: Y StartColonistVehicle/ColonistVehicleUnit default: S StartColonistVehicle/ColonistVehicleUnit01 default: S StukovBossBlast/InfestedStukov default: B @@ -599,8 +599,17 @@ Start suggest inherit (log file: SuggestInheritance.log) NovaWeaponImprovedCanisterRifleSnipe default: NovaWeaponImprovedCanisterRifleSnipe/NovaCoop default: NovaWeaponImprovedCanisterRifleSnipe/NovaReviveBeacon default: + ProtossBuild/Harvester default: copyof: ProtossBuild/Probe default: B + ProtossBuild/Probe default: B PsionicBolt/Telios default: copyof: Feedback/HighTemplar default: F TargetLock/Monitor default: T + TerranBuild default: + TerranBuild/HHSCV default: + TerranBuild/KelMorianWorker default: B + TerranBuild/SCV default: B + TerranBuild/SISCV default: + TerranBuild/TychusSCV default: + ZergBuild/Drone default: B [INFO]: TheCore Lite: D AmonCrystalDematerialize/AmonCrystalEpilogue03 default: D @@ -913,7 +922,6 @@ Start suggest inherit (log file: SuggestInheritance.log) SIOverlord/SICommandCenter default: SIQueenFungalGrowth/SIQueen default: SS_LeviathanTentacleAttackR1/SS_Plane default: S - ScourgeNest/Drone default: C SentryTaldarimForceField/Monitor default: F Separatist/Barracks default: S ShadowBlade/PrologueZeratul default: E @@ -1029,6 +1037,7 @@ Start suggest inherit (log file: SuggestInheritance.log) [INFO]: TheCore Lite: E,Space ArbiterMPStasisField/ArbiterMP default: F Banshee_BlackOpsAirstrike/Banshee_BlackOps default: + BileLauncherBombardment/BileLauncherZagara default: A BioPlasmidDischarge/Leviathan default: B CausticSpray/Corruptor default: C CorsairMPDisruptionWeb/CorsairMP default: D @@ -1417,7 +1426,6 @@ Start suggest inherit (log file: SuggestInheritance.log) Ultralisk/Larva default: U UltraliskCavern/Drone default: U VoidTendrilDeathGripAutoCast/VoidTendrilDeathGripCrystal default: G - ZagaraBileLauncher/Drone default: N [INFO]: TheCore Lite: H AdeptHallucination/Sentry default: H @@ -1680,6 +1688,7 @@ Start suggest inherit (log file: SuggestInheritance.log) WidowMineUnburrow/HHWidowMine default: WidowMineUnburrow/WidowMine default: D XelNagaConstructSmash/XelNagaConstruct default: R + ZagaraBileLauncher/Drone default: N ZeratulSummonVoidSeeker/ZeratulCoop default: ZeratulWarpPrismSelectVoidRift default: @@ -1696,7 +1705,6 @@ Start suggest inherit (log file: SuggestInheritance.log) ArchAngelCoopBombardment/ArchAngelCoopAssault default: B ArmorpiercingMode default: E Battlecruiser/SJMercStarport default: B - BileLauncherBombardment/BileLauncherZagara default: A Blink/PitAlarak default: B Blink/ShadowOfTheVoidStalker default: B copyof: Blink/Stalker default: B Blink/Stalker default: B @@ -1828,6 +1836,7 @@ Start suggest inherit (log file: SuggestInheritance.log) MedivacSpeedBoost/Medivac_BlackOps default: MeliakBlinkBTN/Meliak default: copyof: Blink/Stalker default: B MicroBot/Factory default: M + MissileTurret/HHSCV default: MissileTurret/KelMorianWorker default: T MissileTurret/SCV default: T MorphMorphalisk/BroodMother default: copyof: MorphMorphalisk/Queen default: V @@ -1869,8 +1878,6 @@ Start suggest inherit (log file: SuggestInheritance.log) Probe/KhaydarinNexus default: Probe/Nexus default: E ProtossAirArmorLevel1/CyberneticsCore default: A - ProtossBuild/Harvester default: copyof: ProtossBuild/Probe default: B - ProtossBuild/Probe default: B ProtossGroundArmorLevel1/Forge default: A PurificationNova/Disruptor default: V PurificationNova/DisruptorPhased default: V @@ -1950,12 +1957,6 @@ Start suggest inherit (log file: SuggestInheritance.log) Taunt/Ball default: T TemplarArchive/Harvester default: copyof: TemplarArchive/Probe default: T TemplarArchive/Probe default: T - TerranBuild default: - TerranBuild/HHSCV default: - TerranBuild/KelMorianWorker default: B - TerranBuild/SCV default: B - TerranBuild/SISCV default: - TerranBuild/TychusSCV default: TerranBuild/VoidRift default: B TerranBuild/VoidRiftUnselectable default: B TerranInfantryArmorLevel1/EngineeringBay default: A @@ -2028,7 +2029,6 @@ Start suggest inherit (log file: SuggestInheritance.log) ZeratulStructureBarrier/ZeratulPhotonCannon default: ZeratulWarpPrismAutoUnloadOn/ZeratulWarpPrismPhasing default: ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct default: - ZergBuild/Drone default: B Zergling/VoidRift default: Z Zergling/VoidThrasherWalker default: Z zergflyerarmor1 default: C @@ -2061,6 +2061,7 @@ Start suggest inherit (log file: SuggestInheritance.log) ResearchMedic/ScienceFacility default: C ResearchMultiLockWeaponsSystem/FactoryTechLab default: L ResearchMultiLockWeaponsSystem/FactoryTechReactor default: L + ScourgeNest/Drone default: C Scout/Stargate default: T SensorTower/SCV default: N ShieldBattery/Probe default: B diff --git a/Swiss/TheCore Lite.SC2Hotkeys b/Swiss/TheCore Lite.SC2Hotkeys index b3617008..21cafdbc 100644 --- a/Swiss/TheCore Lite.SC2Hotkeys +++ b/Swiss/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=G Battlecruiser/VoidRift=C Battlecruiser/VoidRiftUnselectable=C -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=E,Space BioMechanicalHeal/HealingDrone=R BioPlasmidDischarge/Leviathan=E,Space BioStasis/Leviathan=C @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=E FungalGrowth/InfestorBurrowed=E FusionCore/HHSCV=G FusionCore/SCV=G -GasCanisterGather/Probe=C +GasCanisterGather/Probe=4 Gateway/Harvester=C Gateway/Probe=C GatherProt=Z @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=R MissilePods/Loki=R MissilePods/MengskBC=R MissilePods/SkyTank=R +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=E @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=C ProphecyVision/ZeratulCoop=C ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=D -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,C +ProtossBuild/Probe=Space,C ProtossBuild/VoidRift=E ProtossBuild/VoidRiftUnselectable=E ProtossBuildAdvanced/Harvester=E @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=C Scan/OrbitalCommand=C Scourge/Larva=6 -ScourgeNest/Drone=E +ScourgeNest/Drone=T Scout/Stargate=T SelectBuilder=4 SelfRepair/Thor=F @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=R SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=C +Spray=4 SquadSight/Monitor=F Stalker=R StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=E TemporalField/MothershipCore=E -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,C +TerranBuild/HHSCV=Space,C +TerranBuild/KelMorianWorker=Space,C +TerranBuild/SCV=Space,C +TerranBuild/SISCV=Space,C +TerranBuild/TychusSCV=Space,C TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=E @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=E YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=E,Space -ZagaraBileLauncher/Drone=G +ZagaraBileLauncher/Drone=R ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=E @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=V ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=C ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=E -ZergBuild/Drone=Space +ZergBuild/Drone=Space,C ZergBuild/VoidRift=C ZergBuild/VoidRiftUnselectable=C ZergBuildAdvanced/Drone=E diff --git a/UKQwerty/TheCore Lite.SC2Hotkeys b/UKQwerty/TheCore Lite.SC2Hotkeys index 81b0c5dd..4c03cf27 100644 --- a/UKQwerty/TheCore Lite.SC2Hotkeys +++ b/UKQwerty/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=G Battlecruiser/VoidRift=C Battlecruiser/VoidRiftUnselectable=C -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=E,Space BioMechanicalHeal/HealingDrone=R BioPlasmidDischarge/Leviathan=E,Space BioStasis/Leviathan=C @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=E FungalGrowth/InfestorBurrowed=E FusionCore/HHSCV=G FusionCore/SCV=G -GasCanisterGather/Probe=C +GasCanisterGather/Probe=4 Gateway/Harvester=C Gateway/Probe=C GatherProt=Y @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=R MissilePods/Loki=R MissilePods/MengskBC=R MissilePods/SkyTank=R +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=E @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=C ProphecyVision/ZeratulCoop=C ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=D -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,C +ProtossBuild/Probe=Space,C ProtossBuild/VoidRift=E ProtossBuild/VoidRiftUnselectable=E ProtossBuildAdvanced/Harvester=E @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=C Scan/OrbitalCommand=C Scourge/Larva=6 -ScourgeNest/Drone=E +ScourgeNest/Drone=T Scout/Stargate=T SelectBuilder=4 SelfRepair/Thor=F @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=R SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=C +Spray=4 SquadSight/Monitor=F Stalker=R StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=E TemporalField/MothershipCore=E -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,C +TerranBuild/HHSCV=Space,C +TerranBuild/KelMorianWorker=Space,C +TerranBuild/SCV=Space,C +TerranBuild/SISCV=Space,C +TerranBuild/TychusSCV=Space,C TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=E @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=E YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=E,Space -ZagaraBileLauncher/Drone=G +ZagaraBileLauncher/Drone=R ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=E @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=V ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=C ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=E -ZergBuild/Drone=Space +ZergBuild/Drone=Space,C ZergBuild/VoidRift=C ZergBuild/VoidRiftUnselectable=C ZergBuildAdvanced/Drone=E diff --git a/USColemak/TheCore Lite.SC2Hotkeys b/USColemak/TheCore Lite.SC2Hotkeys index 436874fa..7dbb3a89 100644 --- a/USColemak/TheCore Lite.SC2Hotkeys +++ b/USColemak/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=D Battlecruiser/VoidRift=C Battlecruiser/VoidRiftUnselectable=C -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=F,Space BioMechanicalHeal/HealingDrone=P BioPlasmidDischarge/Leviathan=F,Space BioStasis/Leviathan=C @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=F FungalGrowth/InfestorBurrowed=F FusionCore/HHSCV=D FusionCore/SCV=D -GasCanisterGather/Probe=C +GasCanisterGather/Probe=4 Gateway/Harvester=C Gateway/Probe=C GatherProt=J @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=P MissilePods/Loki=P MissilePods/MengskBC=P MissilePods/SkyTank=P +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=F @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=C ProphecyVision/ZeratulCoop=C ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=S -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,C +ProtossBuild/Probe=Space,C ProtossBuild/VoidRift=F ProtossBuild/VoidRiftUnselectable=F ProtossBuildAdvanced/Harvester=F @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=C Scan/OrbitalCommand=C Scourge/Larva=6 -ScourgeNest/Drone=F +ScourgeNest/Drone=G Scout/Stargate=G SelectBuilder=4 SelfRepair/Thor=T @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=P SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=C +Spray=4 SquadSight/Monitor=T Stalker=P StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=F TemporalField/MothershipCore=F -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,C +TerranBuild/HHSCV=Space,C +TerranBuild/KelMorianWorker=Space,C +TerranBuild/SCV=Space,C +TerranBuild/SISCV=Space,C +TerranBuild/TychusSCV=Space,C TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=F @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=F YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=F,Space -ZagaraBileLauncher/Drone=D +ZagaraBileLauncher/Drone=P ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=F ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=F ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=F @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=V ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=C ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=F -ZergBuild/Drone=Space +ZergBuild/Drone=Space,C ZergBuild/VoidRift=C ZergBuild/VoidRiftUnselectable=C ZergBuildAdvanced/Drone=F diff --git a/USDvorak/TheCore Lite.SC2Hotkeys b/USDvorak/TheCore Lite.SC2Hotkeys index 52966b5f..52a9ebb8 100644 --- a/USDvorak/TheCore Lite.SC2Hotkeys +++ b/USDvorak/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=I Battlecruiser/VoidRift=J Battlecruiser/VoidRiftUnselectable=J -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=Period,Space BioMechanicalHeal/HealingDrone=P BioPlasmidDischarge/Leviathan=Period,Space BioStasis/Leviathan=J @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=Period FungalGrowth/InfestorBurrowed=Period FusionCore/HHSCV=I FusionCore/SCV=I -GasCanisterGather/Probe=J +GasCanisterGather/Probe=4 Gateway/Harvester=J Gateway/Probe=J GatherProt=F @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=P MissilePods/Loki=P MissilePods/MengskBC=P MissilePods/SkyTank=P +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=Period @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=J ProphecyVision/ZeratulCoop=J ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=E -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,J +ProtossBuild/Probe=Space,J ProtossBuild/VoidRift=Period ProtossBuild/VoidRiftUnselectable=Period ProtossBuildAdvanced/Harvester=Period @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=J Scan/OrbitalCommand=J Scourge/Larva=6 -ScourgeNest/Drone=Period +ScourgeNest/Drone=Y Scout/Stargate=Y SelectBuilder=4 SelfRepair/Thor=U @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=P SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=J +Spray=4 SquadSight/Monitor=U Stalker=P StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=Period TemporalField/MothershipCore=Period -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,J +TerranBuild/HHSCV=Space,J +TerranBuild/KelMorianWorker=Space,J +TerranBuild/SCV=Space,J +TerranBuild/SISCV=Space,J +TerranBuild/TychusSCV=Space,J TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=Period @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=Period YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=Period,Space -ZagaraBileLauncher/Drone=I +ZagaraBileLauncher/Drone=P ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=Period ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=Period ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=Period @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=K ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=J ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=Period -ZergBuild/Drone=Space +ZergBuild/Drone=Space,J ZergBuild/VoidRift=J ZergBuild/VoidRiftUnselectable=J ZergBuildAdvanced/Drone=Period diff --git a/USQwerty/TheCore Lite.SC2Hotkeys b/USQwerty/TheCore Lite.SC2Hotkeys index 5d4a14cb..7889585f 100644 --- a/USQwerty/TheCore Lite.SC2Hotkeys +++ b/USQwerty/TheCore Lite.SC2Hotkeys @@ -274,7 +274,7 @@ Battlecruiser/SJMercStarport=Space Battlecruiser/Starport=G Battlecruiser/VoidRift=C Battlecruiser/VoidRiftUnselectable=C -BileLauncherBombardment/BileLauncherZagara=Space +BileLauncherBombardment/BileLauncherZagara=E,Space BioMechanicalHeal/HealingDrone=R BioPlasmidDischarge/Leviathan=E,Space BioStasis/Leviathan=C @@ -702,7 +702,7 @@ FungalGrowth/Infestor2=E FungalGrowth/InfestorBurrowed=E FusionCore/HHSCV=G FusionCore/SCV=G -GasCanisterGather/Probe=C +GasCanisterGather/Probe=4 Gateway/Harvester=C Gateway/Probe=C GatherProt=Y @@ -1065,6 +1065,7 @@ MissilePods/DukesRevenge=R MissilePods/Loki=R MissilePods/MengskBC=R MissilePods/SkyTank=R +MissileTurret/HHSCV=Space MissileTurret/KelMorianWorker=Space MissileTurret/SCV=Space MohandarOmnislash/VorazunChampion=E @@ -1286,8 +1287,8 @@ PrologueVoidArmor/ZeratulVoidAiur01=C ProphecyVision/ZeratulCoop=C ProtossAirArmorLevel1/CyberneticsCore=Space ProtossAirWeaponsLevel1/CyberneticsCore=D -ProtossBuild/Harvester=Space -ProtossBuild/Probe=Space +ProtossBuild/Harvester=Space,C +ProtossBuild/Probe=Space,C ProtossBuild/VoidRift=E ProtossBuild/VoidRiftUnselectable=E ProtossBuildAdvanced/Harvester=E @@ -1712,7 +1713,7 @@ SapStructure/Baneling=Space Scan/CommandCenter=C Scan/OrbitalCommand=C Scourge/Larva=6 -ScourgeNest/Drone=E +ScourgeNest/Drone=T Scout/Stargate=T SelectBuilder=4 SelfRepair/Thor=F @@ -1782,7 +1783,7 @@ SporeCrawler/Drone=Space SporeCrawlerRoot/SporeCrawlerUprooted=R SporeCrawlerUproot/SporeCrawler=Space,4 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4 -Spray=C +Spray=4 SquadSight/Monitor=F Stalker=R StalkerBlinkMultiple/Stalker=Space @@ -1916,12 +1917,12 @@ TemplarArchive/Harvester=Space TemplarArchive/Probe=Space TemporalField/Mothership=E TemporalField/MothershipCore=E -TerranBuild=Space -TerranBuild/HHSCV=Space -TerranBuild/KelMorianWorker=Space -TerranBuild/SCV=Space -TerranBuild/SISCV=Space -TerranBuild/TychusSCV=Space +TerranBuild=Space,C +TerranBuild/HHSCV=Space,C +TerranBuild/KelMorianWorker=Space,C +TerranBuild/SCV=Space,C +TerranBuild/SISCV=Space,C +TerranBuild/TychusSCV=Space,C TerranBuild/VoidRift=Space TerranBuild/VoidRiftUnselectable=Space TerranBuildAdvanced=E @@ -2235,7 +2236,7 @@ YagdraFirebreath/Yagdra=E YagdraTunnel/AbathurLavaWorm=Space YagdraTunnel/Yagdra=Space YamatoGun=E,Space -ZagaraBileLauncher/Drone=G +ZagaraBileLauncher/Drone=R ZagaraVoidCoopBanelingBarrage/ZagaraReviveCocoon=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoop=E ZagaraVoidCoopBanelingBarrage/ZagaraVoidCoopBurrowed=E @@ -2276,7 +2277,7 @@ ZeratulWarpinDisruptor/ZeratulRoboticsFacility=V ZeratulXelNagaConstructDevolve/ZeratulXelNagaConstruct=Space ZeratulXelNagaConstructPsiBlast/ZeratulXelNagaConstructCyan=C ZeratulXelNagaConstructPsiStorm/ZeratulXelNagaConstructCyan=E -ZergBuild/Drone=Space +ZergBuild/Drone=Space,C ZergBuild/VoidRift=C ZergBuild/VoidRiftUnselectable=C ZergBuildAdvanced/Drone=E