Skip to content

Commit

Permalink
SC2Hotkeys: big release after integration of new Defaults.ini/Conflic…
Browse files Browse the repository at this point in the history 
…tChecks.py
  • Loading branch information
@bobo38
bobo38 committed Jun 19, 2016
1 parent 31703d5 commit 34572c7
Show file tree
Hide file tree
Showing 333 changed files with 22,776 additions and 384,605 deletions.
113 changes: 1 addition & 112 deletions ConflictCheck.log
View file
@@ -1,117 +1,6 @@
============================
Start conflict check (log file: ConflictCheck.log)
----------------------------
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Protoss Story/Structures/Warp Stargate
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Protoss/Structures/Forge (Karax Commander)
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Protoss/Structures/Stargate
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Terran Story/Units/Hyperion (Raynor Commander)
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Terran/Structures/Barracks (kinda Raynor Commander)/General (AI)
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Terran/Units/Ghost
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Zerg Story/Structures/Scourge Nest
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Zerg Story/Units/Kerrigan/General
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Zerg Story/Units/Scourge/Building Attack Enabled
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Zerg Story/Units/Zagara/General
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Zerg/Units/Overlord/General (Creeping)
[ERROR]: Conflict of hotkeys in seed: P commandcard: Coop/Zerg/Units/Viper
[ERROR]: Conflict of hotkeys in seed: P commandcard: HotS Campaign/Terran/Structures/Barracks/General (non-constructing)
[ERROR]: Conflict of hotkeys in seed: P commandcard: LotV Multiplayer/Terran/Units/Ghost
[ERROR]: Conflict of hotkeys in seed: P commandcard: LotV Prologue/Protoss Story/Units/Zeratul (LotV Prologue)
[ERROR]: Conflict of hotkeys in seed: P commandcard: LotV Prologue/Terran/Structures/Barracks/General
[ERROR]: Conflict of hotkeys in seed: P commandcard: WoL Campaign/Terran/Structures/Starport/General
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss Story/Structures/Warp Stargate
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss Story/Structures/Warp Stargate
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss Story/Units/Energizer (Karax Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss Story/Units/High Templar
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss Story/Units/Immortal
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss Story/Units/Shadow Guard
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss/Structures/Forge (Karax Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss/Structures/Forge (Karax Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss/Structures/Stargate
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss/Structures/Twilight Council (Artanis commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss/Units/Archon
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Protoss/Units/Observer
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran Story/Structures/Tech Reactor/Attached to Factory (Swann Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran Story/Units/Spectre (Tosh framework, AI)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Structures/Armory
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Structures/Command Center/General
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Structures/Engineering Bay (Raynor Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Structures/Engineering Bay (Raynor Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Structures/Factory/General (kinda Swann Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Structures/Factory/General3
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Structures/Planetary Fortress
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Structures/Tech Lab/Attached to Factory (Swann(+Raynor) Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Units/Cyclone
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Units/Ghost
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Units/Hellion (Swann Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Units/Siege Tank/General (Wreckage,Swann Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Units/Thor (Swann Commander)/Front 01
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Terran/Units/Thor (Swann Commander)/Front 03
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg Story/Units/Kerrigan/Burrowed
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg Story/Units/Kerrigan/General
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg Story/Units/Kerrigan/General
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg Story/Units/Scourge/General
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg Story/Units/Zagara/Burrowed
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg Story/Units/Zagara/General
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Structures/Baneling Nest (Zagara Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Structures/Evolution Chamber (Kerrigan+Zagara Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Structures/Evolution Chamber (Kerrigan+Zagara Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Structures/Greater Spire
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Structures/Greater Spire
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Structures/Hydralisk Den (Kerrigan Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Structures/Spawning Pool (Zagara Commander)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Structures/Spire
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Structures/Spire
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Structures/Spire
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Units/Larva/General
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Units/Larva/General
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Units/Overlord/General (Creeping)
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Units/Overseer
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Units/Queen
[ERROR]: Conflict of hotkeys in seed: T commandcard: Coop/Zerg/Units/Viper
[ERROR]: Conflict of hotkeys in seed: T commandcard: HotS Multiplayer/Protoss/Units/Oracle
[ERROR]: Conflict of hotkeys in seed: T commandcard: HotS Multiplayer/Zerg/Structures/Hydralisk Den
[ERROR]: Conflict of hotkeys in seed: T commandcard: Left2Die/Terran Story/Units/Hammer Securities (Marauder Merc)
[ERROR]: Conflict of hotkeys in seed: T commandcard: LotV Campaign/Zerg Story/Units/Kerrigan/Kerrigan - Void
[ERROR]: Conflict of hotkeys in seed: T commandcard: LotV Campaign/Zerg/Structures/Hydralisk Den
[ERROR]: Conflict of hotkeys in seed: T commandcard: LotV Multiplayer/Terran/Units/Ghost
[ERROR]: Conflict of hotkeys in seed: T commandcard: LotV Prologue/Protoss Story/Units/Zeratul (LotV Prologue)
[ERROR]: Conflict of hotkeys in seed: T commandcard: LotV Prologue/Protoss/Units/Shadow of the Void (Zealot)
[ERROR]: Conflict of hotkeys in seed: T commandcard: WoL Campaign/Terran/Units/SCV/Basic Structures
[ERROR]: Conflict of hotkeys in seed: T commandcard: WoL Campaign/Terran/Units/SCV/Basic Structures (Orbital Relay purchased)
[ERROR]: Conflict of hotkeys in seed: T commandcard: WoL Campaign/Zerg/Units/Larva/General
[ERROR]: Conflict of hotkeys in seed: R commandcard: Coop/Protoss/Structures/Robotics Bay (Karax Commander)(not tested)
[ERROR]: Conflict of hotkeys in seed: R commandcard: Coop/Terran/Units/Ghost
[ERROR]: Conflict of hotkeys in seed: R commandcard: Coop/Zerg/Units/Overseer
[ERROR]: Conflict of hotkeys in seed: R commandcard: HotS Campaign/Terran/Structures/Starport/General
[ERROR]: Conflict of hotkeys in seed: R commandcard: HotS Campaign/Terran/Structures/Starport/General (non-constructing)
[ERROR]: Conflict of hotkeys in seed: R commandcard: HotS Campaign/Zerg/Units/Infestor
[ERROR]: Conflict of hotkeys in seed: R commandcard: LotV Campaign/Terran Story/Units/Spectre/Cloaked
[ERROR]: Conflict of hotkeys in seed: R commandcard: LotV Multiplayer/Terran/Units/Ghost
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Protoss Story/Structures/Warp Stargate
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Protoss Story/Units/Dark Templar (Vorazun Commander)
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Protoss Story/Units/Shadow Guard
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Protoss/Structures/Fleet Beacon (Artanis+Vorazun Commander)
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Protoss/Structures/Stargate
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Terran Story/Structures/Tech Reactor/Attached to Barracks (Raynor Commander, notAvailable)
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Terran/Structures/Tech Lab/Attached to Barracks (Raynor Commander)
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Terran/Units/Ghost
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Terran/Units/SCV/Basic Structures
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Zerg Story/Structures/Scourge Nest
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Zerg Story/Units/Zagara/Burrowed
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Zerg Story/Units/Zagara/General
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Zerg Story/Units/Zagara/General
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Zerg/Structures/Hatchery
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Zerg/Structures/Hive
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Zerg/Structures/Lair
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Zerg/Structures/Spire
[ERROR]: Conflict of hotkeys in seed: Z commandcard: Coop/Zerg/Units/Queen
[ERROR]: Conflict of hotkeys in seed: Z commandcard: HotS Campaign/Terran/Structures/Factory/General (non-constructing)
[ERROR]: Conflict of hotkeys in seed: Z commandcard: HotS Campaign/Terran/Structures/Starport/General
[ERROR]: Conflict of hotkeys in seed: Z commandcard: HotS Campaign/Terran/Structures/Starport/General (non-constructing)
[ERROR]: Conflict of hotkeys in seed: Z commandcard: HotS Campaign/Terran/Structures/Starport/General (non-constructing)
[ERROR]: Conflict of hotkeys in seed: Z commandcard: LotV Multiplayer/Terran/Units/Ghost
[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
----------------------------
Finished (conflict check) - ERRORs: 111
Finished (conflict check) - ERRORs: 0
============================
33 changes: 7 additions & 26 deletions Defaults.log
View file
Expand Up @@ -7,13 +7,9 @@ Start Check defaults (log file: Defaults.log)
[WARN]: no default ArchonHallucination/Nexus
[WARN]: no default ArchonHallucination/Voranor
[WARN]: no default Assimilator/Harvester
[WARN]: no default AttackAllowsInvulnerable/DrakkenLaserDrill
[WARN]: no default AttackChampions
[WARN]: no default Baneling/Zergling2
[WARN]: no default BuildAutoTurret/Raven
[WARN]: no default BuildCreepTumor/BroodMother
[WARN]: no default BuildCreepTumor/Queen2
[WARN]: no default BuildPointDefenseDrone/Raven
[WARN]: no default BuildScarab/Reaver
[WARN]: no default BurrowChargeMP/Ultralisk
[WARN]: no default BurrowHydraliskImpalerDown
Expand Down Expand Up @@ -65,9 +61,7 @@ Start Check defaults (log file: Defaults.log)
[WARN]: no default Immortal
[WARN]: no default Immortal/Gateway
[WARN]: no default Immortal/WarpGate
[WARN]: no default ImmortalBarrierBase/Immortal
[WARN]: no default ImmortalHallucination/Nexus
[WARN]: no default ImpalerDen/HydraliskDen
[WARN]: no default IncineratorNozzles/DevilDog
[WARN]: no default InfestedTerrans/Infestor2
[WARN]: no default InjectLarva/Queen
Expand All @@ -81,7 +75,6 @@ Start Check defaults (log file: Defaults.log)
[WARN]: no default MorphMorphalisk/BroodMother
[WARN]: no default MorphMorphalisk/Queen2
[WARN]: no default MorphtoDefiler/Larva
[WARN]: no default MorphtoDevourer/Mutalisk
[WARN]: no default MorphtoRoach/Larva
[WARN]: no default MoveChampions
[WARN]: no default MutateintoDefilerMound/Drone
Expand Down Expand Up @@ -158,23 +151,11 @@ Start Check defaults (log file: Defaults.log)
[WARN]: no default SwarmHostUprootUnburrow/SwarmHostBurrowed
[WARN]: no default SwarmHostUprootUnburrow/SwarmHostSplitABurrowed
[WARN]: no default SwarmHostUprootUnburrow/SwarmHostSplitBBurrowed
[WARN]: no default SwarmQueenCorpser/HugeSwarmQueen
[WARN]: no default SwarmQueenCorpser/LargeSwarmQueen
[WARN]: no default SwarmQueenCorpser/SwarmQueen
[WARN]: no default SwarmQueenHydraliskImpaler/HugeSwarmQueen
[WARN]: no default SwarmQueenHydraliskImpaler/LargeSwarmQueen
[WARN]: no default SwarmQueenHydraliskImpaler/SwarmQueen
[WARN]: no default SwarmQueenHydraliskLurker/HugeSwarmQueen
[WARN]: no default SwarmQueenHydraliskLurker/LargeSwarmQueen
[WARN]: no default SwarmQueenHydraliskLurker/SwarmQueen
[WARN]: no default SwarmQueenRaptor/HugeSwarmQueen
[WARN]: no default SwarmQueenRaptor/LargeSwarmQueen
[WARN]: no default SwarmQueenRaptor/SwarmQueen
[WARN]: no default SwarmQueenSwarmling/HugeSwarmQueen
[WARN]: no default SwarmQueenSwarmling/LargeSwarmQueen
[WARN]: no default SwarmQueenSwarmling/SwarmQueen
[WARN]: no default SwarmQueenVile/HugeSwarmQueen
[WARN]: no default SwarmQueenVile/LargeSwarmQueen
[WARN]: no default SwarmQueenVile/SwarmQueen
[WARN]: no default TechReactor/Barracks
[WARN]: no default TechReactor/Factory
Expand All @@ -201,22 +182,22 @@ Start Check defaults (log file: Defaults.log)
[WARN]: no default WormholeTransit/Predator
[WARN]: no default ZealotHallucination/Nexus
[WARN]: no default ZealotHallucination/Voranor
[WARN]: no default hydraliskspeed/LurkerDen
[ERROR]: no default CommanderAbility0
[ERROR]: no default CommanderAbility1
[ERROR]: no default CommanderAbility2
[ERROR]: no default CommanderAbility3
[ERROR]: key has multiple different defaults - please set in all seed layouts a value for this key (or at leased unbound it) HeroNukeCalldown/NovaHero
[ERROR]: key has multiple different defaults - please set in all seed layouts a value for this key (or at leased unbound it) PsionicLift/K5KerriganPsiStrike
[ERROR]: key has multiple different defaults - please set in all seed layouts a value for this key (or at leased unbound it) Raven/VoidRift
[ERROR]: key has multiple different defaults - please set in all seed layouts a value for this key (or at leased unbound it) Raven/VoidRiftUnselectable
[ERROR]: key has multiple different defaults - please set in all seed layouts a value for this key (or at leased unbound it) ResearchLurkerRange/LurkerDenMP
[ERROR]: key has multiple different defaults - please set in all seed layouts a value for this key (or at leased unbound it) SpawnCorruptor/SpacePlatformVentsUnit
[ERROR]: no default EvolveAdrenalineBoost/EvolutionChamber
[ERROR]: no default EvolveGlialRegeneration/GreaterRoachWarren
[ERROR]: no default EvolveHydriodicBile/GreaterRoachWarren
[ERROR]: no default EvolveTunnelingClaws/GreaterRoachWarren
[ERROR]: no default GreaterRoachWarren/RoachWarren
[ERROR]: no default Lurker/HydraliskImpaler
[ERROR]: no default MorphToGuardian/Mutalisk
[ERROR]: no default ResearchLocustNest/EvolutionChamber
[ERROR]: no default ResearchSpikeBurstRankOne/EvolutionChamber
[ERROR]: no default ResearchStabRankOne/EvolutionChamber
[ERROR]: key has multiple different defaults - please set in all seed layouts a value for this key (or at leased unbound it) ResearchStabilizerMedpacks/BarracksTechLab
----------------------------
Finished (Check defaults) - WARNs: 201 ERRORs: 15
Finished (Check defaults) - WARNs: 181 ERRORs: 16
============================

0 comments on commit 34572c7

Please sign in to comment.