diff --git a/src/CombatCommander.cpp b/src/CombatCommander.cpp index 129db6d7c4e65145fb438a5e0f9d72a50c1a2195..5c1ae3a6280edbe3cac0022e46d2e7fe48062a03 100644 --- a/src/CombatCommander.cpp +++ b/src/CombatCommander.cpp @@ -60,7 +60,7 @@ void CombatCommander::onFrame(const std::vector<Unit> & combatUnits) bool CombatCommander::shouldWeStartAttacking() { - return m_bot.Strategy().getCurrentStrategy().m_attackCondition.eval(); + return true; //m_bot.Strategy().getCurrentStrategy().m_attackCondition.eval(); } void CombatCommander::updateIdleSquad() diff --git a/src/GameCommander.cpp b/src/GameCommander.cpp index 64602767c962b6c3e81d075189d9dbafcd7d1a61..64f6efef8cb9d84db6df811b5006c48c0523f375 100644 --- a/src/GameCommander.cpp +++ b/src/GameCommander.cpp @@ -85,7 +85,7 @@ void GameCommander::setScoutUnits() bool GameCommander::shouldSendInitialScout() { - return m_bot.Strategy().scoutConditionIsMet(); + return true; // m_bot.Strategy().scoutConditionIsMet(); } // Sets combat units to be passed to CombatCommander. diff --git a/src/IDABot.cpp b/src/IDABot.cpp index e17dcbd524a9b18a322dfb1dfc6e2222eb8129f9..63a93eabc0488aefcb158c07e523e1ba3f4ab69d 100644 --- a/src/IDABot.cpp +++ b/src/IDABot.cpp @@ -464,7 +464,6 @@ IDABot::IDABot() , m_unitInfo(*this) , m_workers(*this) , m_gameCommander(*this) - , m_strategy(*this) , m_techTree(*this) , m_buildingPlacer(*this) { @@ -489,7 +488,6 @@ void IDABot::OnGameStart() // ----------------------------------------------------------------- setUnits(); m_techTree.onStart(); - m_strategy.onStart(); m_map.onStart(); m_unitInfo.onStart(); m_bases.onStart(); @@ -582,11 +580,6 @@ const MapTools & IDABot::Map() const return m_map; } -const StrategyManager & IDABot::Strategy() const -{ - return m_strategy; -} - const BaseLocationManager & IDABot::Bases() const { return m_bases; diff --git a/src/IDABot.h b/src/IDABot.h index 1ee8087451207ff001aec7778d6445ae8f0b9ef4..733cd3a66aee086d8f169414e0220e02db88818c 100644 --- a/src/IDABot.h +++ b/src/IDABot.h @@ -12,7 +12,6 @@ #include "BotConfig.h" #include "GameCommander.h" #include "BuildingPlacer.h" -#include "StrategyManager.h" #include "TechTree.h" #include "MetaType.h" #include "Unit.h" @@ -23,7 +22,6 @@ class IDABot : public sc2::Agent BaseLocationManager m_bases; UnitInfoManager m_unitInfo; WorkerManager m_workers; - StrategyManager m_strategy; BotConfig m_config; TechTree m_techTree; GameCommander m_gameCommander; @@ -120,7 +118,6 @@ public: const BaseLocationManager & Bases() const; const MapTools & Map() const; const UnitInfoManager & UnitInfo() const; - const StrategyManager & Strategy() const; const TypeData & Data(const UnitType & type) const; const TypeData & Data(const CCUpgrade & type) const; const TypeData & Data(const MetaType & type) const; diff --git a/src/ProductionManager.cpp b/src/ProductionManager.cpp index a965ef6a3dec25f95111f602ecc595df9cc80d3e..2e3c04821087258e9204240f910d6e911f5c245e 100644 --- a/src/ProductionManager.cpp +++ b/src/ProductionManager.cpp @@ -24,7 +24,7 @@ void ProductionManager::setBuildOrder(const BuildOrder & buildOrder) void ProductionManager::onStart() { m_buildingManager.onStart(); - setBuildOrder(m_bot.Strategy().getOpeningBookBuildOrder()); + //setBuildOrder(m_bot.Strategy().getOpeningBookBuildOrder()); } void ProductionManager::onFrame()