From 10a6ced224b17e00fc9d2b56627bad7ee34c6c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Bergstr=C3=B6m?= <davbe125@student.liu.se>
Date: Mon, 25 Jun 2018 10:42:07 +0200
Subject: [PATCH] Remove StrategyManager
---
src/CombatCommander.cpp | 2 +-
src/GameCommander.cpp | 2 +-
src/IDABot.cpp | 7 -------
src/IDABot.h | 3 ---
src/ProductionManager.cpp | 2 +-
5 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/CombatCommander.cpp b/src/CombatCommander.cpp
index 129db6d..5c1ae3a 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 6460276..64f6efe 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 e17dcbd..63a93ea 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 1ee8087..733cd3a 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 a965ef6..2e3c048 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()
--
GitLab