TheCore Lite: introduction of quick cam, move Nexus mass recall to C,…

… fix control cam
bobo38 · Nov 19, 2017 · 9c70161 · 9c70161 · bobo38 · Nov 19, 2017
1 parent a30b975
commit 9c70161
Show file tree

Hide file tree

Showing 21 changed files with 136 additions and 102 deletions.
diff --git a/Defaults.ini b/Defaults.ini
@@ -1130,6 +1130,7 @@ NeuralParasite/Infestor2=E
 NeuralParasite/InfestorBurrowed=E
 Nexus/Harvester=
 Nexus/Probe=N
+NexusMassRecall/Nexus=
 NexusShieldRecharge/Nexus=
 NovaBoombotBurrow/NovaBoombot=
 NovaDomination/NovaHero=

diff --git a/Defaults.log b/Defaults.log
@@ -225,6 +225,7 @@ Start Check defaults (log file: Defaults.log)
 [WARN]: no default MutatorWorkerSleep/SISCV
 [WARN]: no default NerveJam/ScienceVessel
 [WARN]: no default Nexus/Harvester
+[WARN]: no default NexusMassRecall/Nexus
 [WARN]: no default NexusShieldRecharge/Nexus
 [WARN]: no default NovaBoombotBurrow/NovaBoombot
 [WARN]: no default NovaDomination/NovaHero
@@ -469,5 +470,5 @@ Start Check defaults (log file: Defaults.log)
 [WARN]: no default ZealotHallucination/Voranor
 [ERROR]: no default SIRoot/SIFactory
 ----------------------------
-Finished (Check defaults) - WARNs: 466 ERRORs: 1 
+Finished (Check defaults) - WARNs: 467 ERRORs: 1 
 ============================
diff --git a/FrenchAzerty/TheCore Lite.SC2Hotkeys b/FrenchAzerty/TheCore Lite.SC2Hotkeys
@@ -16,19 +16,19 @@ CameraCenter=Alt+Tab,Alt+CapsLock,Alt+Apostrophe,Control+V,Alt+Shift
 CameraFollow=Insert
 CameraPush=MiddleMouseButton
 CameraSave0=Alt+Z
-CameraSave1=Alt+1,Control+F
+CameraSave1=Alt
 CameraSave2=Alt+2,Control+R
-CameraSave3=Alt+3
+CameraSave3=Alt+3,Control+E
 CameraSave4=Alt+Q
 CameraSave5=Alt+S
 CameraSave6=Alt+W
 CameraSave7=Alt+X
 CameraTurnLeft=Alt+T
 CameraTurnRight=Alt+G
 CameraView0=Shift+Z
-CameraView1=Shift+1,Control+D
-CameraView2=Shift+2,Control+E
-CameraView3=Shift+3
+CameraView1=Shift+CapsLock
+CameraView2=Shift+2,Control+D
+CameraView3=Shift+3,Control+F
 CameraView4=Shift+Q
 CameraView5=Shift+S
 CameraView6=Shift+W
@@ -96,7 +96,7 @@ ControlGroupRecall8=S
 ControlGroupRecall9=W
 DialogDismiss=Escape
 FPS=Alt+F2
-GameTooltipsOn=Shift
+GameTooltipsOn=NumPadMultiply
 IdleWorker=F1
 LeaderAPM=Comma
 LeaderArmy=Q
@@ -168,7 +168,7 @@ StatPanelResources=Control+I
 StatPanelUnitsLost=Control+R
 StatusAll=BackSlash
 StatusAlly=BracketClose
-StatusEnemy=Alt
+StatusEnemy=Control,Control+Alt,Shift+Alt
 StatusOwner=SemiColon
 SubgroupNext=Tab,ForwardMouseButton
 SubgroupPrev=Shift+Tab,BackMouseButton
@@ -1130,6 +1130,7 @@ NeuralParasite/Infestor2=C
 NeuralParasite/InfestorBurrowed=C
 Nexus/Harvester=E
 Nexus/Probe=E
+NexusMassRecall/Nexus=C
 NexusShieldRecharge/Nexus=C
 NovaBoombotBurrow/NovaBoombot=E,Space
 NovaDomination/NovaHero=R

diff --git a/German/TheCore Lite.SC2Hotkeys b/German/TheCore Lite.SC2Hotkeys
@@ -16,19 +16,19 @@ CameraCenter=Alt+Tab,Alt+CapsLock,Alt+BackSlash,Control+V,Alt+Shift
 CameraFollow=Insert
 CameraPush=MiddleMouseButton
 CameraSave0=Alt+W
-CameraSave1=Alt+1,Control+F
+CameraSave1=Alt
 CameraSave2=Alt+2,Control+R
-CameraSave3=Alt+3
+CameraSave3=Alt+3,Control+E
 CameraSave4=Alt+A
 CameraSave5=Alt+S
 CameraSave6=Alt+Y
 CameraSave7=Alt+X
 CameraTurnLeft=Alt+T
 CameraTurnRight=Alt+G
 CameraView0=Shift+W
-CameraView1=Shift+1,Control+D
-CameraView2=Shift+2,Control+E
-CameraView3=Shift+3
+CameraView1=Shift+CapsLock
+CameraView2=Shift+2,Control+D
+CameraView3=Shift+3,Control+F
 CameraView4=Shift+A
 CameraView5=Shift+S
 CameraView6=Shift+Y
@@ -96,7 +96,7 @@ ControlGroupRecall8=S
 ControlGroupRecall9=Y
 DialogDismiss=Escape
 FPS=Alt+F2
-GameTooltipsOn=Shift
+GameTooltipsOn=NumPadMultiply
 IdleWorker=F1
 LeaderAPM=M
 LeaderArmy=A
@@ -168,7 +168,7 @@ StatPanelResources=Control+I
 StatPanelUnitsLost=Control+R
 StatusAll=Slash
 StatusAlly=SemiColon
-StatusEnemy=Alt
+StatusEnemy=Control,Control+Alt,Shift+Alt
 StatusOwner=Equals
 SubgroupNext=Tab,ForwardMouseButton
 SubgroupPrev=Shift+Tab,BackMouseButton
@@ -1130,6 +1130,7 @@ NeuralParasite/Infestor2=C
 NeuralParasite/InfestorBurrowed=C
 Nexus/Harvester=E
 Nexus/Probe=E
+NexusMassRecall/Nexus=C
 NexusShieldRecharge/Nexus=C
 NovaBoombotBurrow/NovaBoombot=E,Space
 NovaDomination/NovaHero=R

diff --git a/Latin/TheCore Lite.SC2Hotkeys b/Latin/TheCore Lite.SC2Hotkeys
@@ -16,19 +16,19 @@ CameraCenter=Alt+Tab,Alt+CapsLock,Alt+Grave,Control+V,Alt+Shift
 CameraFollow=Insert
 CameraPush=MiddleMouseButton
 CameraSave0=Alt+W
-CameraSave1=Alt+1,Control+F
+CameraSave1=Alt
 CameraSave2=Alt+2,Control+R
-CameraSave3=Alt+3
+CameraSave3=Alt+3,Control+E
 CameraSave4=Alt+A
 CameraSave5=Alt+S
 CameraSave6=Alt+Z
 CameraSave7=Alt+X
 CameraTurnLeft=Alt+T
 CameraTurnRight=Alt+G
 CameraView0=Shift+W
-CameraView1=Shift+1,Control+D
-CameraView2=Shift+2,Control+E
-CameraView3=Shift+3
+CameraView1=Shift+CapsLock
+CameraView2=Shift+2,Control+D
+CameraView3=Shift+3,Control+F
 CameraView4=Shift+A
 CameraView5=Shift+S
 CameraView6=Shift+Z
@@ -96,7 +96,7 @@ ControlGroupRecall8=S
 ControlGroupRecall9=Z
 DialogDismiss=Escape
 FPS=Alt+F2
-GameTooltipsOn=Shift
+GameTooltipsOn=NumPadMultiply
 IdleWorker=F1
 LeaderAPM=M
 LeaderArmy=A
@@ -168,7 +168,7 @@ StatPanelResources=Control+I
 StatPanelUnitsLost=Control+R
 StatusAll=BackSlash
 StatusAlly=SemiColon
-StatusEnemy=Alt
+StatusEnemy=Control,Control+Alt,Shift+Alt
 StatusOwner=Equals
 SubgroupNext=Tab,ForwardMouseButton
 SubgroupPrev=Shift+Tab,BackMouseButton
@@ -1130,6 +1130,7 @@ NeuralParasite/Infestor2=C
 NeuralParasite/InfestorBurrowed=C
 Nexus/Harvester=E
 Nexus/Probe=E
+NexusMassRecall/Nexus=C
 NexusShieldRecharge/Nexus=C
 NovaBoombotBurrow/NovaBoombot=E,Space
 NovaDomination/NovaHero=R

diff --git a/MissingConflict.log b/MissingConflict.log
@@ -523,6 +523,9 @@ in seed TheCore Lite, keys =
 [ERROR]: NeuralParasite/InfestorBurrowed not related to a conflict
 in seed TheCore Lite, keys =C
 
+[ERROR]: NexusMassRecall/Nexus not related to a conflict
+in seed TheCore Lite, keys =C
+
 [ERROR]: NexusShieldRecharge/Nexus not related to a conflict
 in seed TheCore Lite, keys =C
 
@@ -1771,5 +1774,5 @@ but is inherited
 in seed TheCore Lite, keys =T
 
 ----------------------------
-Finished (commands with no attached conflict) - ERRORs: 372 WARNs: 145 
+Finished (commands with no attached conflict) - ERRORs: 373 WARNs: 145 
 ============================
diff --git a/Nordic/TheCore Lite.SC2Hotkeys b/Nordic/TheCore Lite.SC2Hotkeys
@@ -16,19 +16,19 @@ CameraCenter=Alt+Tab,Alt+CapsLock,Alt+BackSlash,Control+V,Alt+Shift
 CameraFollow=Insert
 CameraPush=MiddleMouseButton
 CameraSave0=Alt+W
-CameraSave1=Alt+1,Control+F
+CameraSave1=Alt
 CameraSave2=Alt+2,Control+R
-CameraSave3=Alt+3
+CameraSave3=Alt+3,Control+E
 CameraSave4=Alt+A
 CameraSave5=Alt+S
 CameraSave6=Alt+Z
 CameraSave7=Alt+X
 CameraTurnLeft=Alt+T
 CameraTurnRight=Alt+G
 CameraView0=Shift+W
-CameraView1=Shift+1,Control+D
-CameraView2=Shift+2,Control+E
-CameraView3=Shift+3
+CameraView1=Shift+CapsLock
+CameraView2=Shift+2,Control+D
+CameraView3=Shift+3,Control+F
 CameraView4=Shift+A
 CameraView5=Shift+S
 CameraView6=Shift+Z
@@ -96,7 +96,7 @@ ControlGroupRecall8=S
 ControlGroupRecall9=Z
 DialogDismiss=Escape
 FPS=Alt+F2
-GameTooltipsOn=Shift
+GameTooltipsOn=NumPadMultiply
 IdleWorker=F1
 LeaderAPM=M
 LeaderArmy=A
@@ -168,7 +168,7 @@ StatPanelResources=Control+I
 StatPanelUnitsLost=Control+R
 StatusAll=Slash
 StatusAlly=BracketClose
-StatusEnemy=Alt
+StatusEnemy=Control,Control+Alt,Shift+Alt
 StatusOwner=SemiColon
 SubgroupNext=Tab,ForwardMouseButton
 SubgroupPrev=Shift+Tab,BackMouseButton
@@ -1130,6 +1130,7 @@ NeuralParasite/Infestor2=C
 NeuralParasite/InfestorBurrowed=C
 Nexus/Harvester=E
 Nexus/Probe=E
+NexusMassRecall/Nexus=C
 NexusShieldRecharge/Nexus=C
 NovaBoombotBurrow/NovaBoombot=E,Space
 NovaDomination/NovaHero=R

diff --git a/Portuguese-Portugal/TheCore Lite.SC2Hotkeys b/Portuguese-Portugal/TheCore Lite.SC2Hotkeys
@@ -16,19 +16,19 @@ CameraCenter=Alt+Tab,Alt+CapsLock,Alt+Grave,Control+V,Alt+Shift
 CameraFollow=Insert
 CameraPush=MiddleMouseButton
 CameraSave0=Alt+W
-CameraSave1=Alt+1,Control+F
+CameraSave1=Alt
 CameraSave2=Alt+2,Control+R
-CameraSave3=Alt+3
+CameraSave3=Alt+3,Control+E
 CameraSave4=Alt+A
 CameraSave5=Alt+S
 CameraSave6=Alt+Z
 CameraSave7=Alt+X
 CameraTurnLeft=Alt+T
 CameraTurnRight=Alt+G
 CameraView0=Shift+W
-CameraView1=Shift+1,Control+D
-CameraView2=Shift+2,Control+E
-CameraView3=Shift+3
+CameraView1=Shift+CapsLock
+CameraView2=Shift+2,Control+D
+CameraView3=Shift+3,Control+F
 CameraView4=Shift+A
 CameraView5=Shift+S
 CameraView6=Shift+Z
@@ -96,7 +96,7 @@ ControlGroupRecall8=S
 ControlGroupRecall9=Z
 DialogDismiss=Escape
 FPS=Alt+F2
-GameTooltipsOn=Shift
+GameTooltipsOn=NumPadMultiply
 IdleWorker=F1
 LeaderAPM=M
 LeaderArmy=A
@@ -168,7 +168,7 @@ StatPanelResources=Control+I
 StatPanelUnitsLost=Control+R
 StatusAll=Slash
 StatusAlly=Equals
-StatusEnemy=Alt
+StatusEnemy=Control,Control+Alt,Shift+Alt
 StatusOwner=SemiColon
 SubgroupNext=Tab,ForwardMouseButton
 SubgroupPrev=Shift+Tab,BackMouseButton
@@ -1130,6 +1130,7 @@ NeuralParasite/Infestor2=C
 NeuralParasite/InfestorBurrowed=C
 Nexus/Harvester=E
 Nexus/Probe=E
+NexusMassRecall/Nexus=C
 NexusShieldRecharge/Nexus=C
 NovaBoombotBurrow/NovaBoombot=E,Space
 NovaDomination/NovaHero=R

diff --git a/QGMLWB/TheCore Lite.SC2Hotkeys b/QGMLWB/TheCore Lite.SC2Hotkeys
@@ -16,19 +16,19 @@ CameraCenter=Alt+Tab,Alt+CapsLock,Alt+Grave,Control+F,Alt+Shift
 CameraFollow=Insert
 CameraPush=MiddleMouseButton
 CameraSave0=Alt+G
-CameraSave1=Alt+1,Control+N
+CameraSave1=Alt
 CameraSave2=Alt+2,Control+L
-CameraSave3=Alt+3
+CameraSave3=Alt+3,Control+M
 CameraSave4=Alt+D
 CameraSave5=Alt+S
 CameraSave6=Alt+Z
 CameraSave7=Alt+X
 CameraTurnLeft=Alt+W
 CameraTurnRight=Alt+R
 CameraView0=Shift+G
-CameraView1=Shift+1,Control+T
-CameraView2=Shift+2,Control+M
-CameraView3=Shift+3
+CameraView1=Shift+CapsLock
+CameraView2=Shift+2,Control+T
+CameraView3=Shift+3,Control+N
 CameraView4=Shift+D
 CameraView5=Shift+S
 CameraView6=Shift+Z
@@ -96,7 +96,7 @@ ControlGroupRecall8=S
 ControlGroupRecall9=Z
 DialogDismiss=Escape
 FPS=Alt+F2
-GameTooltipsOn=Shift
+GameTooltipsOn=NumPadMultiply
 IdleWorker=F1
 LeaderAPM=P
 LeaderArmy=D
@@ -168,7 +168,7 @@ StatPanelResources=Control+U
 StatPanelUnitsLost=Control+L
 StatusAll=BackSlash
 StatusAlly=BracketOpen
-StatusEnemy=Alt
+StatusEnemy=Control,Control+Alt,Shift+Alt
 StatusOwner=BracketClose
 SubgroupNext=Tab,ForwardMouseButton
 SubgroupPrev=Shift+Tab,BackMouseButton
@@ -1130,6 +1130,7 @@ NeuralParasite/Infestor2=C
 NeuralParasite/InfestorBurrowed=C
 Nexus/Harvester=M
 Nexus/Probe=M
+NexusMassRecall/Nexus=C
 NexusShieldRecharge/Nexus=C
 NovaBoombotBurrow/NovaBoombot=M,Space
 NovaDomination/NovaHero=L

diff --git a/QGMLWY/TheCore Lite.SC2Hotkeys b/QGMLWY/TheCore Lite.SC2Hotkeys
@@ -16,19 +16,19 @@ CameraCenter=Alt+Tab,Alt+CapsLock,Alt+Grave,Control+V,Alt+Shift
 CameraFollow=Insert
 CameraPush=MiddleMouseButton
 CameraSave0=Alt+G
-CameraSave1=Alt+1,Control+N
+CameraSave1=Alt
 CameraSave2=Alt+2,Control+L
-CameraSave3=Alt+3
+CameraSave3=Alt+3,Control+M
 CameraSave4=Alt+D
 CameraSave5=Alt+S
 CameraSave6=Alt+Z
 CameraSave7=Alt+X
 CameraTurnLeft=Alt+W
 CameraTurnRight=Alt+R
 CameraView0=Shift+G
-CameraView1=Shift+1,Control+T
-CameraView2=Shift+2,Control+M
-CameraView3=Shift+3
+CameraView1=Shift+CapsLock
+CameraView2=Shift+2,Control+T
+CameraView3=Shift+3,Control+N
 CameraView4=Shift+D
 CameraView5=Shift+S
 CameraView6=Shift+Z
@@ -96,7 +96,7 @@ ControlGroupRecall8=S
 ControlGroupRecall9=Z
 DialogDismiss=Escape
 FPS=Alt+F2
-GameTooltipsOn=Shift
+GameTooltipsOn=NumPadMultiply
 IdleWorker=F1
 LeaderAPM=P
 LeaderArmy=D
@@ -168,7 +168,7 @@ StatPanelResources=Control+U
 StatPanelUnitsLost=Control+L
 StatusAll=BackSlash
 StatusAlly=BracketOpen
-StatusEnemy=Alt
+StatusEnemy=Control,Control+Alt,Shift+Alt
 StatusOwner=BracketClose
 SubgroupNext=Tab,ForwardMouseButton
 SubgroupPrev=Shift+Tab,BackMouseButton
@@ -1130,6 +1130,7 @@ NeuralParasite/Infestor2=C
 NeuralParasite/InfestorBurrowed=C
 Nexus/Harvester=M
 Nexus/Probe=M
+NexusMassRecall/Nexus=C
 NexusShieldRecharge/Nexus=C
 NovaBoombotBurrow/NovaBoombot=M,Space
 NovaDomination/NovaHero=L