TheCore Lite: push last changes (coop and basic buildings)

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'],

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

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 
 ============================

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

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

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

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 
 ============================