TheCore Lite: ResearchEnhancedShockwaves unbound fix for new season

KurtMage · Aug 21, 2019 · b38f9b3 · b38f9b3
1 parent ede1534
commit b38f9b3
Show file tree

Hide file tree

Showing 17 changed files with 65 additions and 46 deletions.
diff --git a/Defaults.ini b/Defaults.ini
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=D
 ResearchDurableMaterials/StarportTechReactor=D
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=E
 ResearchExtendedThermalLance/Colossus=E

diff --git a/Defaults.log b/Defaults.log
@@ -26,6 +26,7 @@ Start Check defaults (log file: Defaults.log)
 [WARN]: no default AttackChampions
 [WARN]: no default AutoTurret/Raven_BlackOps
 [WARN]: no default Baneling/Zergling2
+[WARN]: no default BanelingNestStetmann/Drone
 [WARN]: no default BanelingStetmann/ZerglingStetmann
 [WARN]: no default BanelingStetmannMovementSpeed/BanelingStetmann
 [WARN]: no default Banshee_BlackOpsAirstrike/Banshee_BlackOps
@@ -133,6 +134,7 @@ Start Check defaults (log file: Defaults.log)
 [WARN]: no default EnrageQueen/Queen
 [WARN]: no default EntropicBlast/ZeratulXelNagaConstructCyan
 [WARN]: no default EvadeObserver/Observer
+[WARN]: no default EvolutionChamberStetmann/Drone
 [WARN]: no default EvolveAdrenalineBoost/EvolutionChamber
 [WARN]: no default EvolveBurrowCharge/Hatchery
 [WARN]: no default EvolveDiggingClaws/LurkerDenMP
@@ -149,6 +151,7 @@ Start Check defaults (log file: Defaults.log)
 [WARN]: no default ExplodeStetmann/BanelingStetmann
 [WARN]: no default ExplodeStetmann/BanelingStetmannBurrowed
 [WARN]: no default ExplodeVolatileInfested/SIVolatileInfested
+[WARN]: no default ExtractorStetmann/Drone
 [WARN]: no default FASTOverloadStetmann/PowerTowerStetmann
 [WARN]: no default Feedback/AnAleemController
 [WARN]: no default Feedback/Khiradun
@@ -207,6 +210,7 @@ Start Check defaults (log file: Defaults.log)
 [WARN]: no default HHYamatoShots/HHBattlecruiser
 [WARN]: no default Hallucination/Sentry2
 [WARN]: no default Hallucination2/Voranor
+[WARN]: no default HatcheryStetmann/Drone
 [WARN]: no default Heal/Medivac2
 [WARN]: no default HellbatJumpJetAssault/HellionBlackOps
 [WARN]: no default HellfireThrusters/StarportTechLab
@@ -216,6 +220,7 @@ Start Check defaults (log file: Defaults.log)
 [WARN]: no default HighTemplarTaldarim
 [WARN]: no default HiveStetmann/LairStetmann
 [WARN]: no default Hydralisk/LarvaStetmann
+[WARN]: no default HydraliskDenStetmann/Drone
 [WARN]: no default HydraliskStetmann/LarvaStetmann
 [WARN]: no default HydraliskStetmannMissilePowerOff/HydraliskStetmann
 [WARN]: no default HydraliskStetmannMissilePowerOn
@@ -231,6 +236,7 @@ Start Check defaults (log file: Defaults.log)
 [WARN]: no default ImmortalOverload/ZeratulImmortal
 [WARN]: no default ImmortalZeratul/ZeratulRoboticsFacility
 [WARN]: no default IncineratorNozzles/DevilDog
+[WARN]: no default InfestationPitStetmann/Drone
 [WARN]: no default InfestedTerrans/Infestor2
 [WARN]: no default InfestorStetmannBonusRavager/InfestationPitStetmann
 [WARN]: no default InfestorStetmannEggLaunch/InfestorStetmann
@@ -514,8 +520,12 @@ Start Check defaults (log file: Defaults.log)
 [WARN]: no default Snipe/NovaStoneHeroic
 [WARN]: no default Snipe_BlackOps/Ghost_BlackOps
 [WARN]: no default SpawnBanelings/K5Kerrigan
+[WARN]: no default SpawningPoolStetmann/Drone
+[WARN]: no default SpineCrawlerStetmann/Drone
 [WARN]: no default SpineCrawlerUproot/SpineCrawlerUprooted
 [WARN]: no default SpineCrawlerUprootStetmann/SpineCrawlerStetmann
+[WARN]: no default SpireStetmann/Drone
+[WARN]: no default SporeCrawlerStetmann/Drone
 [WARN]: no default SporeCrawlerUproot/SporeCrawlerUprooted
 [WARN]: no default SporeCrawlerUprootStetmann/SporeCrawlerStetmann
 [WARN]: no default StalkerHallucination/Nexus
@@ -636,6 +646,7 @@ Start Check defaults (log file: Defaults.log)
 [WARN]: no default TychusWarhoundTurretHaywireMissiles/TychusWarhoundAutoTurret
 [WARN]: no default TychusWarhoundTurretUpgrade/TychusMercCompound
 [WARN]: no default Ultralisk/LarvaStetmann
+[WARN]: no default UltraliskCavernStetmann/Drone
 [WARN]: no default UltraliskStetmann/LarvaStetmann
 [WARN]: no default UltraliskStetmannBurrowCharge/UltraliskStetmann
 [WARN]: no default UltraliskStetmannRespawn/UltraliskCavernStetmann
@@ -691,17 +702,7 @@ Start Check defaults (log file: Defaults.log)
 [WARN]: no default Zergling/LarvaStetmann
 [WARN]: no default ZerglingStetmann/LarvaStetmann
 [WARN]: no default ZerglingStetmannRespawn/SpawningPoolStetmann
-[WARN]: no default BanelingNestStetmann/Drone
-[WARN]: no default EvolutionChamberStetmann/Drone
-[WARN]: no default ExtractorStetmann/Drone
-[WARN]: no default HatcheryStetmann/Drone
-[WARN]: no default HydraliskDenStetmann/Drone
-[WARN]: no default InfestationPitStetmann/Drone
-[WARN]: no default SpawningPoolStetmann/Drone
-[WARN]: no default SpineCrawlerStetmann/Drone
-[WARN]: no default SpireStetmann/Drone
-[WARN]: no default SporeCrawlerStetmann/Drone
-[WARN]: no default UltraliskCavernStetmann/Drone
+[WARN]: no default ResearchEnhancedShockwaves/GhostAcademy
 ----------------------------
-Finished (Check defaults) - WARNs: 701 ERRORs: 0 
+Finished (Check defaults) - WARNs: 702 ERRORs: 0 
 ============================
diff --git a/FrenchAzerty/TheCore Lite.SC2Hotkeys b/FrenchAzerty/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=V
 ResearchDurableMaterials/StarportTechReactor=V
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=E
 ResearchExtendedThermalLance/Colossus=C

diff --git a/German/TheCore Lite.SC2Hotkeys b/German/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=V
 ResearchDurableMaterials/StarportTechReactor=V
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=E
 ResearchExtendedThermalLance/Colossus=C

diff --git a/Latin/TheCore Lite.SC2Hotkeys b/Latin/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=V
 ResearchDurableMaterials/StarportTechReactor=V
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=E
 ResearchExtendedThermalLance/Colossus=C

diff --git a/MissingConflict.log b/MissingConflict.log
@@ -46,6 +46,9 @@ in seed TheCore Lite, keys =F
 [ERROR]: AutoTurret/Raven_BlackOps not related to a conflict
 in seed TheCore Lite, keys =Space,4
 
+[ERROR]: BanelingNestStetmann/Drone not related to a conflict
+in seed TheCore Lite, keys =T
+
 [ERROR]: BanelingStetmann/ZerglingStetmann not related to a conflict
 in seed TheCore Lite, keys =F
 
@@ -316,6 +319,9 @@ in seed TheCore Lite, keys =Space
 [ERROR]: EvadeObserver/Observer not related to a conflict
 in seed TheCore Lite, keys =
 
+[ERROR]: EvolutionChamberStetmann/Drone not related to a conflict
+in seed TheCore Lite, keys =4
+
 [ERROR]: EvolveAdrenalineBoost/EvolutionChamber not related to a conflict
 in seed TheCore Lite, keys =T
 
@@ -370,6 +376,9 @@ in seed TheCore Lite, keys =E
 [ERROR]: ExplodeVolatileInfested/SIVolatileInfested not related to a conflict
 in seed TheCore Lite, keys =E
 
+[ERROR]: ExtractorStetmann/Drone not related to a conflict
+in seed TheCore Lite, keys =F
+
 [ERROR]: FASTOverloadStetmann/PowerTowerStetmann not related to a conflict
 in seed TheCore Lite, keys =Space
 
@@ -517,6 +526,9 @@ in seed TheCore Lite, keys =F
 [ERROR]: HHYamatoShots/HHBattlecruiser not related to a conflict
 in seed TheCore Lite, keys =Space
 
+[ERROR]: HatcheryStetmann/Drone not related to a conflict
+in seed TheCore Lite, keys =E
+
 [ERROR]: HellbatJumpJetAssault/HellionBlackOps not related to a conflict
 in seed TheCore Lite, keys =E
 
@@ -535,6 +547,9 @@ in seed TheCore Lite, keys =F
 [ERROR]: Hydralisk/LarvaStetmann not related to a conflict
 in seed TheCore Lite, keys =C
 
+[ERROR]: HydraliskDenStetmann/Drone not related to a conflict
+in seed TheCore Lite, keys =C
+
 [ERROR]: HydraliskStetmann/LarvaStetmann not related to a conflict
 in seed TheCore Lite, keys =C
 
@@ -574,6 +589,9 @@ in seed TheCore Lite, keys =Space
 [ERROR]: ImmortalZeratul/ZeratulRoboticsFacility not related to a conflict
 in seed TheCore Lite, keys =D
 
+[ERROR]: InfestationPitStetmann/Drone not related to a conflict
+in seed TheCore Lite, keys =F
+
 [ERROR]: InfestorStetmannBonusRavager/InfestationPitStetmann not related to a conflict
 in seed TheCore Lite, keys =F
 
@@ -1357,12 +1375,24 @@ in seed TheCore Lite, keys =R,C
 [ERROR]: Snipe_BlackOps/Ghost_BlackOps not related to a conflict
 in seed TheCore Lite, keys =R,C
 
+[ERROR]: SpawningPoolStetmann/Drone not related to a conflict
+in seed TheCore Lite, keys =D
+
+[ERROR]: SpineCrawlerStetmann/Drone not related to a conflict
+in seed TheCore Lite, keys =C
+
 [ERROR]: SpineCrawlerUproot/SpineCrawlerUprooted not related to a conflict
 in seed TheCore Lite, keys =Space,4
 
 [ERROR]: SpineCrawlerUprootStetmann/SpineCrawlerStetmann not related to a conflict
 in seed TheCore Lite, keys =Space,4
 
+[ERROR]: SpireStetmann/Drone not related to a conflict
+in seed TheCore Lite, keys =R
+
+[ERROR]: SporeCrawlerStetmann/Drone not related to a conflict
+in seed TheCore Lite, keys =Space
+
 [ERROR]: SporeCrawlerUproot/SporeCrawlerUprooted not related to a conflict
 in seed TheCore Lite, keys =Space,4
 
@@ -1642,6 +1672,9 @@ in seed TheCore Lite, keys =N
 [ERROR]: Ultralisk/LarvaStetmann not related to a conflict
 in seed TheCore Lite, keys =G
 
+[ERROR]: UltraliskCavernStetmann/Drone not related to a conflict
+in seed TheCore Lite, keys =G
+
 [ERROR]: UltraliskStetmann/LarvaStetmann not related to a conflict
 in seed TheCore Lite, keys =G
 
@@ -1789,39 +1822,9 @@ in seed TheCore Lite, keys =D
 [ERROR]: ZerglingStetmannRespawn/SpawningPoolStetmann not related to a conflict
 in seed TheCore Lite, keys =G
 
-[ERROR]: BanelingNestStetmann/Drone not related to a conflict
-in seed TheCore Lite, keys =T
-
-[ERROR]: EvolutionChamberStetmann/Drone not related to a conflict
-in seed TheCore Lite, keys =4
-
-[ERROR]: ExtractorStetmann/Drone not related to a conflict
-in seed TheCore Lite, keys =F
-
-[ERROR]: HatcheryStetmann/Drone not related to a conflict
-in seed TheCore Lite, keys =E
-
-[ERROR]: HydraliskDenStetmann/Drone not related to a conflict
-in seed TheCore Lite, keys =C
-
-[ERROR]: InfestationPitStetmann/Drone not related to a conflict
-in seed TheCore Lite, keys =F
-
-[ERROR]: SpawningPoolStetmann/Drone not related to a conflict
-in seed TheCore Lite, keys =D
-
-[ERROR]: SpineCrawlerStetmann/Drone not related to a conflict
-in seed TheCore Lite, keys =C
-
-[ERROR]: SpireStetmann/Drone not related to a conflict
-in seed TheCore Lite, keys =R
-
-[ERROR]: SporeCrawlerStetmann/Drone not related to a conflict
+[ERROR]: ResearchEnhancedShockwaves/GhostAcademy not related to a conflict
 in seed TheCore Lite, keys =Space
 
-[ERROR]: UltraliskCavernStetmann/Drone not related to a conflict
-in seed TheCore Lite, keys =G
-
 [WARN]: 330mmBarrageCannons/Thor not related to a conflict
 but is inherited
 in seed TheCore Lite, keys =C
@@ -2471,5 +2474,5 @@ but is inherited
 in seed TheCore Lite, keys =T
 
 ----------------------------
-Finished (commands with no attached conflict) - ERRORs: 607 WARNs: 144 
+Finished (commands with no attached conflict) - ERRORs: 608 WARNs: 144 
 ============================
diff --git a/Nordic/TheCore Lite.SC2Hotkeys b/Nordic/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=V
 ResearchDurableMaterials/StarportTechReactor=V
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=E
 ResearchExtendedThermalLance/Colossus=C

diff --git a/Portuguese-Portugal/TheCore Lite.SC2Hotkeys b/Portuguese-Portugal/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=V
 ResearchDurableMaterials/StarportTechReactor=V
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=E
 ResearchExtendedThermalLance/Colossus=C

diff --git a/QGMLWB/TheCore Lite.SC2Hotkeys b/QGMLWB/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=F
 ResearchDurableMaterials/StarportTechReactor=F
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=M
 ResearchExtendedThermalLance/Colossus=C

diff --git a/QGMLWY/TheCore Lite.SC2Hotkeys b/QGMLWY/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=V
 ResearchDurableMaterials/StarportTechReactor=V
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=M
 ResearchExtendedThermalLance/Colossus=C

diff --git a/SuggestInheritance.log b/SuggestInheritance.log
@@ -1985,6 +1985,7 @@ Start suggest inherit (log file: SuggestInheritance.log)
 	ResearchBattlecruiserEnergyUpgrade/FusionReactor default: B
 	ResearchDehakaUltraliskCrashingCharge/DehakaDakrunStructure default: 
 	ResearchDrakkenLaserDrillBFG/DrakkenLaserDrillCoop default: D
+	ResearchEnhancedShockwaves/GhostAcademy default: 
 	ResearchGhostEnergyUpgrade/GhostAcademy default: M
 	ResearchGraviticBooster/Observatory default: 
 	ResearchGraviticBooster/RoboticsBay default: B

diff --git a/Swiss/TheCore Lite.SC2Hotkeys b/Swiss/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=V
 ResearchDurableMaterials/StarportTechReactor=V
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=E
 ResearchExtendedThermalLance/Colossus=C

diff --git a/TheCore Lite.SC2Hotkeys b/TheCore Lite.SC2Hotkeys
@@ -1437,6 +1437,7 @@ ResearchDurableMaterials/StarportTechLab=V
 ResearchDurableMaterials/StarportTechReactor=V
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=E
 ResearchExtendedThermalLance/Colossus=C
@@ -1780,17 +1781,17 @@ SpiderMine/Vulture=E,F
 SpiderMineReplenish/MercVulture=R
 SpiderMineReplenish/Vulture=R
 SpineCrawler/Drone=C
-SpineCrawlerStetmann/Drone=C
 SpineCrawlerRoot/SpineCrawlerUprooted=R
+SpineCrawlerStetmann/Drone=C
 SpineCrawlerUproot/SpineCrawler=Space,4
 SpineCrawlerUproot/SpineCrawlerUprooted=Space,4
 SpineCrawlerUprootStetmann/SpineCrawlerStetmann=Space,4
 Spire/Drone=R
 SpireStetmann/Drone=R
 SporeColony/CreepColony=R
 SporeCrawler/Drone=Space
-SporeCrawlerStetmann/Drone=Space
 SporeCrawlerRoot/SporeCrawlerUprooted=R
+SporeCrawlerStetmann/Drone=Space
 SporeCrawlerUproot/SporeCrawler=Space,4
 SporeCrawlerUproot/SporeCrawlerUprooted=Space,4
 SporeCrawlerUprootStetmann/SporeCrawlerStetmann=Space,4

diff --git a/UKQwerty/TheCore Lite.SC2Hotkeys b/UKQwerty/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=V
 ResearchDurableMaterials/StarportTechReactor=V
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=E
 ResearchExtendedThermalLance/Colossus=C

diff --git a/USColemak/TheCore Lite.SC2Hotkeys b/USColemak/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=V
 ResearchDurableMaterials/StarportTechReactor=V
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=F
 ResearchExtendedThermalLance/Colossus=C

diff --git a/USDvorak/TheCore Lite.SC2Hotkeys b/USDvorak/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=K
 ResearchDurableMaterials/StarportTechReactor=K
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=Period
 ResearchExtendedThermalLance/Colossus=J

diff --git a/USQwerty/TheCore Lite.SC2Hotkeys b/USQwerty/TheCore Lite.SC2Hotkeys
@@ -1509,6 +1509,7 @@ ResearchDurableMaterials/StarportTechLab=V
 ResearchDurableMaterials/StarportTechReactor=V
 ResearchEMP/StarportTechLab=
 ResearchEngineeredExplosives/BarracksTechLab=
+ResearchEnhancedShockwaves/GhostAcademy=Space
 ResearchEvadeObserver/Observatory=
 ResearchExplosiveShrapnelShells/StarportTechLab=E
 ResearchExtendedThermalLance/Colossus=C