Skip to content

Commit

Permalink
TheCore Lite: all but one ambiguous coop conflict have been fixed, In…
Browse files Browse the repository at this point in the history
…heritance.ini change made all TheCore .SC2Hotkeys regenerated
  • Loading branch information
bobo38 committed Feb 20, 2016
1 parent f41b2a7 commit 2b5ee46
Show file tree
Hide file tree
Showing 232 changed files with 605 additions and 622 deletions.
14 changes: 1 addition & 13 deletions ConflictCheck.log
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,6 @@ Start conflict check (log file: ConflictCheck.log)
[ERROR]: Conflict of hotkeys in seed: Z commandcard: LotV Prologue/Protoss Story/Units/Zeratul (LotV Prologue)
[ERROR]: Conflict of hotkeys in seed: Z commandcard: LotV Prologue/Protoss/Units/Probe/General
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Protoss Story/Units/Centurion (Vorazun Commander)
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Protoss Story/Units/High Templar
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Protoss/Structures/Forge (Karax Commander)
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Protoss/Structures/Stargate
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Protoss/Units/Observer
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Terran Story/Structures/Tech Reactor/Attached to Factory (Swann Commander)
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Terran/Structures/Engineering Bay (Raynor Commander)
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Terran/Structures/Factory/General (kinda Swann Commander)
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Terran/Structures/Tech Lab/Attached to Factory (Swann(+Raynor) Commander)
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Zerg Story/Structures/Scourge Nest
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Zerg/Structures/Hydralisk Den (Kerrigan Commander)
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Zerg/Structures/Spire
[ERROR]: Conflict of hotkeys in seed: Lite commandcard: Coop/Zerg/Units/Overseer
----------------------------
Finished (conflict check) - ERRORs: 124
Finished (conflict check) - ERRORs: 112
============================
56 changes: 28 additions & 28 deletions FrenchAzerty/TheCore Lite .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=F
Arbiter/StargateWarp=
ArbiterMPRecall/ArbiterMP=R
ArbiterMPStasisField/ArbiterMP=F
ArchonAdvancedMergeSelection=C
ArchonAdvancedMergeSelection=R
ArchonHallucination/Nexus=CapsLock
ArchonHallucination/Sentry=CapsLock
ArchonHallucination/Voranor=CapsLock
Expand Down Expand Up @@ -319,7 +319,7 @@ DehakaMirrorImage/Dehaka=C
Detonate/SpiderMine=
DetonateScourge/Scourge=X
DevastatingShot/InfestedStukov=Space
Diamondback/Factory=D
Diamondback/Factory=C
DisableBuildingAttack/Baneling=E
DisableBuildingAttack/HotSHunter=E
DisableBuildingAttack/HotSSplitterlingBig=E
Expand Down Expand Up @@ -358,8 +358,8 @@ EvolveBanelingHeal/BanelingNest=E
EvolveBanelingRupture/BanelingNest=R
EvolveBileLauncherBombardmentCooldown/SpawningPool=D
EvolveBileLauncherIncreasedRange/SpawningPool=E
EvolveBroodLordSpeed/GreaterSpire=E
EvolveBroodLordSpeed/Spire=E
EvolveBroodLordSpeed/GreaterSpire=C
EvolveBroodLordSpeed/Spire=C
EvolveBurrowCharge/Hatchery=
EvolveBurrowCharge/UltraliskCavern=D
EvolveCentrificalHooks/BanelingNest=C
Expand All @@ -382,8 +382,8 @@ EvolveMutaliskRapidRegeneration/GreaterSpire=R
EvolveMutaliskRapidRegeneration/Spire=R
EvolveOrganicCarapace/RoachWarren=O
EvolvePeristalsis/InfestationPit=P
EvolveScourgeGasCostReduction/ScourgeNest=G
EvolveScourgeSplashDamage/ScourgeNest=D
EvolveScourgeGasCostReduction/ScourgeNest=E
EvolveScourgeSplashDamage/ScourgeNest=R
EvolveSunderingGlave/GreaterSpire=F
EvolveSunderingGlave/Spire=F
EvolveTissueAssimilation/UltraliskCavern=C
Expand Down Expand Up @@ -436,7 +436,7 @@ GhostAcademy/SCV=Space
GhostHoldFire/Ghost=F
GiantYetiLeap/GiantYeti=A
Glare/Oracle=
Goliath/Factory=C
Goliath/Factory=H
GravitonBeam/Phoenix=E,Space
GravitonBeam/PhoenixPurifier=G
GravitonBeam/Urun=E,Space
Expand Down Expand Up @@ -465,7 +465,7 @@ HerculesUnloadAll/Hercules=E
HeroNukeCalldown/Nova=5
HeroNukeCalldown/Tosh=5
HighArchonPsiStorm/HighArchonTemplar=E
HighTemplar=G
HighTemplar=Space
HighTemplarHallucination/Nexus=Space
HighTemplarHallucination/Sentry=Space
HighTemplarHallucination/Voranor=Space
Expand Down Expand Up @@ -655,11 +655,11 @@ MorphtoDefiler/Larva=F
MorphtoDevourer/Mutalisk=
MorphtoHunter/HotSRaptor=E
MorphtoHunter/HotSSwarmling=E
MorphtoObserver/Observer=T
MorphtoObserverSiege/Observer=E
MorphtoObserver/Observer=E
MorphtoObserverSiege/Observer=R
MorphtoOverlordTransport/Overlord=CapsLock
MorphtoOverseer/Overseer=T
MorphtoOverseerSiege/Overseer=E
MorphtoOverseer/Overseer=E
MorphtoOverseerSiege/Overseer=R
MorphtoRoach/Larva=R
MorphtoSplitterling/HotSRaptor=E
MorphtoSplitterling/HotSSwarmling=E
Expand Down Expand Up @@ -695,8 +695,8 @@ Observer/RoboticsFacility=Space
Observer/RoboticsFacilityWarp=Space
OdinBarrage/Odin=C
OdinNukeCalldown/Odin=5
Oracle/Stargate=E
Oracle/StargateWarp=E
Oracle/Stargate=R
Oracle/StargateWarp=R
OracleAttack=D
OracleBuildStasisTrap/Oracle=E
OracleEnergyUpgrade/FleetBeacon=E
Expand Down Expand Up @@ -817,7 +817,7 @@ ResearchBarrelStabilizers/BarracksTechLab=
ResearchBarrier/RoboticsBay=R
ResearchBattlecruiserEnergyUpgrade/FusionCore=Space
ResearchBattlecruiserSpecializations/FusionCore=C
ResearchBunkerUpgrade/ScienceFacility=T
ResearchBunkerUpgrade/ScienceFacility=H
ResearchBurrow=R
ResearchCerberusMines/FactoryTechLab=C
ResearchCerberusMines/FactoryTechReactor=C
Expand All @@ -839,8 +839,8 @@ ResearchEngineeredExplosives/BarracksTechLab=
ResearchEvadeObserver/Observatory=
ResearchExplosiveShrapnelShells/StarportTechLab=E
ResearchExtendedThermalLance/RoboticsBay=C
ResearchFireSuppression/ScienceFacility=Y
ResearchFireSuppressionSystems/EngineeringBay=
ResearchFireSuppression/ScienceFacility=V
ResearchFireSuppressionSystems/EngineeringBay=V
ResearchFirebat/ScienceFacility=C
ResearchFortifiedBunkers/EngineeringBay=
ResearchG4Charge/BarracksTechLab=R
Expand All @@ -856,11 +856,11 @@ ResearchHellbatHellArmor/FactoryTechLab=H
ResearchHellbatHellArmor/FactoryTechReactor=H
ResearchHellion/ScienceFacility=E
ResearchHiSecAutoTracking/EngineeringBay=E
ResearchHighCapacityBarrels/FactoryTechLab=E
ResearchHighCapacityBarrels/FactoryTechReactor=E
ResearchHighCapacityBarrels/FactoryTechLab=V
ResearchHighCapacityBarrels/FactoryTechReactor=V
ResearchHighCapacityFuelTanks/StarportTechLab=R
ResearchHighTemplarEnergyUpgrade/TemplarArchive=D
ResearchImprovedTurretAttackSpeed/EngineeringBay=R
ResearchImprovedTurretAttackSpeed/EngineeringBay=E
ResearchIncineratorGauntlets/BarracksTechLab=I
ResearchIncineratorGauntlets/BarracksTechReactor=I
ResearchIncineratorNozzles/BarracksTechLab=C
Expand All @@ -872,14 +872,14 @@ ResearchJackhammerConcussionGrenade/BarracksTechLab=D
ResearchJackhammerConcussionGrenade/BarracksTechReactor=D
ResearchJuggernautPlating/BarracksTechLab=J
ResearchJuggernautPlating/BarracksTechReactor=J
ResearchKaraxTurretAttackSpeed/Forge=E
ResearchKaraxTurretAttackSpeed/Forge=C
ResearchKaraxTurretRange/Forge=R
ResearchKhaydarinCore/ArbiterTribunal=
ResearchKhaydarinGenerator/FleetBeacon=
ResearchLockOnRangeUpgrade/FactoryTechLab=R
ResearchLockOnRangeUpgrade/FactoryTechReactor=R
ResearchLocustLifetimeIncrease/InfestationPit=4
ResearchLurkerRange/HydraliskDen=E
ResearchLurkerRange/HydraliskDen=V
ResearchLurkerRange/LurkerDen=E
ResearchMaelstromRounds/FactoryTechLab=Comma
ResearchMaelstromRounds/FactoryTechReactor=Comma
Expand All @@ -894,7 +894,7 @@ ResearchMultiLockWeaponsSystem/FactoryTechReactor=L
ResearchNeosteelFrame/EngineeringBay=R
ResearchNeuralParasite/InfestationPit=F
ResearchOracleStasisWardUpgrade/FleetBeacon=Q
ResearchPerditionTurret/ScienceFacility=V
ResearchPerditionTurret/ScienceFacility=D
ResearchPersonalCloaking/GhostAcademy=C
ResearchPhobosClassWeaponsSystem/StarportTechLab=
ResearchPhobosClassWeaponsSystem/StarportTechReactor=
Expand Down Expand Up @@ -1223,8 +1223,8 @@ Vortex/Artanis=E
Vortex/Mothership=E
Vulture/Factory=G
WarHound/Factory=D
WarpInAdept/Gateway=Space
WarpInAdept/WarpGate=Space
WarpInAdept/Gateway=G
WarpInAdept/WarpGate=G
WarpInCorsair/Stargate=
WarpInDarkArchonChampion/TwilightCouncil=C
WarpInFenixChampion/TwilightCouncil=F
Expand Down Expand Up @@ -1280,9 +1280,9 @@ ZeratulStun/ZeratulVoid=E
ZergBuild/Drone=Space
ZergBuildAdvanced/Drone=CapsLock
Zergling/Larva=D
hydraliskspeed/HydraliskDen=G
hydraliskspeed/LurkerDen=G
hydraliskspeed/LurkerDenMP=G
hydraliskspeed/HydraliskDen=Space
hydraliskspeed/LurkerDen=Space
hydraliskspeed/LurkerDenMP=Space
overlordspeed=C
zergflyerarmor1=Space
zergflyerattack1=D
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore PLL .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=5
Arbiter/StargateWarp=5
ArbiterMPRecall/ArbiterMP=5
ArbiterMPStasisField/ArbiterMP=R
ArchonAdvancedMergeSelection=
ArchonAdvancedMergeSelection=5
ArchonHallucination/Nexus=F
ArchonHallucination/Sentry=F
ArchonHallucination/Voranor=F
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore PLM .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=4
Arbiter/StargateWarp=4
ArbiterMPRecall/ArbiterMP=4
ArbiterMPStasisField/ArbiterMP=E
ArchonAdvancedMergeSelection=
ArchonAdvancedMergeSelection=4
ArchonHallucination/Nexus=D
ArchonHallucination/Sentry=D
ArchonHallucination/Voranor=D
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore PLS .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=3
Arbiter/StargateWarp=3
ArbiterMPRecall/ArbiterMP=3
ArbiterMPStasisField/ArbiterMP=Z
ArchonAdvancedMergeSelection=
ArchonAdvancedMergeSelection=3
ArchonHallucination/Nexus=S
ArchonHallucination/Sentry=S
ArchonHallucination/Voranor=S
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore PRL .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=8
Arbiter/StargateWarp=8
ArbiterMPRecall/ArbiterMP=8
ArbiterMPStasisField/ArbiterMP=I
ArchonAdvancedMergeSelection=
ArchonAdvancedMergeSelection=8
ArchonHallucination/Nexus=K
ArchonHallucination/Sentry=K
ArchonHallucination/Voranor=K
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore PRM .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=9
Arbiter/StargateWarp=9
ArbiterMPRecall/ArbiterMP=9
ArbiterMPStasisField/ArbiterMP=O
ArchonAdvancedMergeSelection=
ArchonAdvancedMergeSelection=9
ArchonHallucination/Nexus=L
ArchonHallucination/Sentry=L
ArchonHallucination/Voranor=L
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore PRS .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=0
Arbiter/StargateWarp=0
ArbiterMPRecall/ArbiterMP=0
ArbiterMPStasisField/ArbiterMP=P
ArchonAdvancedMergeSelection=
ArchonAdvancedMergeSelection=0
ArchonHallucination/Nexus=M
ArchonHallucination/Sentry=M
ArchonHallucination/Voranor=M
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore TLL .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=5
Arbiter/StargateWarp=5
ArbiterMPRecall/ArbiterMP=4
ArbiterMPStasisField/ArbiterMP=T
ArchonAdvancedMergeSelection=V
ArchonAdvancedMergeSelection=F
ArchonHallucination/Nexus=4
ArchonHallucination/Sentry=4
ArchonHallucination/Voranor=4
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore TLM .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=4
Arbiter/StargateWarp=4
ArbiterMPRecall/ArbiterMP=3
ArbiterMPStasisField/ArbiterMP=R
ArchonAdvancedMergeSelection=C
ArchonAdvancedMergeSelection=D
ArchonHallucination/Nexus=3
ArchonHallucination/Sentry=3
ArchonHallucination/Voranor=3
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore TLS .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=3
Arbiter/StargateWarp=3
ArbiterMPRecall/ArbiterMP=2
ArbiterMPStasisField/ArbiterMP=E
ArchonAdvancedMergeSelection=X
ArchonAdvancedMergeSelection=S
ArchonHallucination/Nexus=2
ArchonHallucination/Sentry=2
ArchonHallucination/Voranor=2
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore TRL .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=8
Arbiter/StargateWarp=8
ArbiterMPRecall/ArbiterMP=9
ArbiterMPStasisField/ArbiterMP=U
ArchonAdvancedMergeSelection=Comma
ArchonAdvancedMergeSelection=K
ArchonHallucination/Nexus=9
ArchonHallucination/Sentry=9
ArchonHallucination/Voranor=9
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore TRM .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=9
Arbiter/StargateWarp=9
ArbiterMPRecall/ArbiterMP=0
ArbiterMPStasisField/ArbiterMP=I
ArchonAdvancedMergeSelection=Period
ArchonAdvancedMergeSelection=L
ArchonHallucination/Nexus=0
ArchonHallucination/Sentry=0
ArchonHallucination/Voranor=0
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore TRS .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=0
Arbiter/StargateWarp=0
ArbiterMPRecall/ArbiterMP=BracketOpen
ArbiterMPStasisField/ArbiterMP=O
ArchonAdvancedMergeSelection=Slash
ArchonAdvancedMergeSelection=M
ArchonHallucination/Nexus=BracketOpen
ArchonHallucination/Sentry=BracketOpen
ArchonHallucination/Voranor=BracketOpen
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore ZLL .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=D
Arbiter/StargateWarp=D
ArbiterMPRecall/ArbiterMP=D
ArbiterMPStasisField/ArbiterMP=H
ArchonAdvancedMergeSelection=V
ArchonAdvancedMergeSelection=D
ArchonHallucination/Nexus=Z
ArchonHallucination/Sentry=Z
ArchonHallucination/Voranor=Z
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore ZLM .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=S
Arbiter/StargateWarp=S
ArbiterMPRecall/ArbiterMP=S
ArbiterMPStasisField/ArbiterMP=G
ArchonAdvancedMergeSelection=C
ArchonAdvancedMergeSelection=S
ArchonHallucination/Nexus=A
ArchonHallucination/Sentry=A
ArchonHallucination/Voranor=A
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore ZLS .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=Q
Arbiter/StargateWarp=Q
ArbiterMPRecall/ArbiterMP=Q
ArbiterMPStasisField/ArbiterMP=F
ArchonAdvancedMergeSelection=X
ArchonAdvancedMergeSelection=Q
ArchonHallucination/Nexus=Tab
ArchonHallucination/Sentry=Tab
ArchonHallucination/Voranor=Tab
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore ZRL .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=L
Arbiter/StargateWarp=L
ArbiterMPRecall/ArbiterMP=L
ArbiterMPStasisField/ArbiterMP=H
ArchonAdvancedMergeSelection=Comma
ArchonAdvancedMergeSelection=L
ArchonHallucination/Nexus=P
ArchonHallucination/Sentry=P
ArchonHallucination/Voranor=P
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore ZRM .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=M
Arbiter/StargateWarp=M
ArbiterMPRecall/ArbiterMP=M
ArbiterMPStasisField/ArbiterMP=J
ArchonAdvancedMergeSelection=Period
ArchonAdvancedMergeSelection=M
ArchonHallucination/Nexus=BracketClose
ArchonHallucination/Sentry=BracketClose
ArchonHallucination/Voranor=BracketClose
Expand Down
2 changes: 1 addition & 1 deletion FrenchAzerty/TheCore ZRS .SC2Hotkeys
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Arbiter/Stargate=Grave
Arbiter/StargateWarp=Grave
ArbiterMPRecall/ArbiterMP=Grave
ArbiterMPStasisField/ArbiterMP=K
ArchonAdvancedMergeSelection=Slash
ArchonAdvancedMergeSelection=Grave
ArchonHallucination/Nexus=SemiColon
ArchonHallucination/Sentry=SemiColon
ArchonHallucination/Voranor=SemiColon
Expand Down
Loading

0 comments on commit 2b5ee46

Please sign in to comment.