Update to Release 1.4.7

Steamhammer/Source/BuildingManager.cpp

@@ -773,7 +773,7 @@ void BuildingManager::removeBuildings(const std::vector< std::reference_wrapper<
 {
     for (Building & b : toRemove)
     {
-		auto & it = std::find(_buildings.begin(), _buildings.end(), b);
+		auto it = std::find(_buildings.begin(), _buildings.end(), b);
 
 		if (it != _buildings.end())
 		{

Steamhammer/Source/CombatCommander.cpp

@@ -251,6 +251,7 @@ void CombatCommander::updateReconSquad()
 			if (unit->getType().isDetector())
 			{
 				reconSquad.removeUnit(unit);
+				break;
 			}
 		}
 		hasDetector = false;
@@ -460,6 +461,7 @@ void CombatCommander::updateAttackSquads()
 				if (unit->getType().isDetector())
 				{
 					groundSquad.removeUnit(unit);
+					break;
 				}
 			}
 			groundDetector = false;
@@ -471,6 +473,7 @@ void CombatCommander::updateAttackSquads()
 				if (unit->getType().isDetector())
 				{
 					flyingSquad.removeUnit(unit);
+					break;
 				}
 			}
 			flyingDetector = false;
@@ -525,7 +528,6 @@ void CombatCommander::updateAttackSquads()
 				if (flyingSquad.containsUnit(unit))
 				{
 					flyingSquad.removeUnit(unit);
-					UAB_ASSERT(_squadData.canAssignUnitToSquad(unit, groundSquad), "can't go to ground");
 				}
 				if (_squadData.canAssignUnitToSquad(unit, groundSquad))
 				{
@@ -713,11 +715,11 @@ void CombatCommander::updateScoutDefenseSquad()
 
 	if (assignScoutDefender)
 	{
-		// The enemy worker to catch.
-		BWAPI::Unit enemyWorker = *enemyUnitsInRegion.begin();
-
 		if (scoutDefenseSquad.isEmpty())
 		{
+			// The enemy worker to catch.
+			BWAPI::Unit enemyWorker = *enemyUnitsInRegion.begin();
+
 			BWAPI::Unit workerDefender = findClosestWorkerToTarget(_combatUnits, enemyWorker);
 
 			if (workerDefender)
@@ -743,7 +745,7 @@ void CombatCommander::updateBaseDefenseSquads()
     { 
         return; 
     }
-
+     
     BWTA::BaseLocation * enemyBaseLocation = InformationManager::Instance().getEnemyMainBaseLocation();
     BWTA::Region * enemyRegion = nullptr;
     if (enemyBaseLocation)
@@ -766,15 +768,11 @@ void CombatCommander::updateBaseDefenseSquads()
 			continue;
 		}
 
-		// start off assuming all enemy units in region are just workers
-		const int numDefendersPerEnemyUnit = 2;
-
 		// all of the enemy units in this region
 		BWAPI::Unitset enemyUnitsInRegion;
         for (const auto unit : BWAPI::Broodwar->enemy()->getUnits())
         {
             // If it's a harmless air unit, don't worry about it for base defense.
-			// TODO something more sensible
             if (unit->getType() == BWAPI::UnitTypes::Zerg_Overlord ||
 				unit->getType() == BWAPI::UnitTypes::Protoss_Observer ||
 				unit->isLifted())  // floating terran building
@@ -789,8 +787,8 @@ void CombatCommander::updateBaseDefenseSquads()
         }
 
         // we ignore the first enemy worker in our region since we assume it is a scout
-		// This is because we can't catch it early. Should skip this check when we can. 
-		// TODO replace with something sensible
+		// This is because we can't catch it early. Should skip this check when we can.
+		// TODO drop this when we are able to catch it
         for (const auto unit : enemyUnitsInRegion)
         {
             if (unit->getType().isWorker())
@@ -813,7 +811,7 @@ void CombatCommander::updateBaseDefenseSquads()
 				_squadData.getSquad(squadName.str()).clear();
 			}
 
-            // and return, nothing to defend here
+            // Finished with this region, nothing to defend here.
             continue;
         }
         else 
@@ -834,7 +832,9 @@ void CombatCommander::updateBaseDefenseSquads()
 		UAB_ASSERT(_squadData.squadExists(squadName.str()), "Squad should exist: %s", squadName.str().c_str());
         Squad & defenseSquad = _squadData.getSquad(squadName.str());
 
-        // figure out how many units we need on defense
+		// A simpleminded way of figuring out how much defense we need.
+		const int numDefendersPerEnemyUnit = 2;
+
 	    int flyingDefendersNeeded = numDefendersPerEnemyUnit * numEnemyFlyingInRegion;
 	    int groundDefendersNeeded = numDefendersPerEnemyUnit * numEnemyGroundInRegion;
 
@@ -878,7 +878,7 @@ void CombatCommander::updateBaseDefenseSquads()
     }
 
     // for each of our defense squads, if there aren't any enemy units near the position, clear the squad
-	// TODO partially overlaps with "is enemy in region check" above
+	// TODO partially overlaps with "is enemy in region check" above, could cause oscillating behavior
 	for (const auto & kv : _squadData.getSquads())
 	{
 		const Squad & squad = kv.second;
@@ -925,6 +925,7 @@ void CombatCommander::updateDefenseSquadUnits(Squad & defenseSquad, const size_t
 			if (unit->getType().isDetector())
 			{
 				defenseSquad.removeUnit(unit);
+				break;
 			}
 		}
 		hasDetector = false;
@@ -954,7 +955,6 @@ void CombatCommander::updateDefenseSquadUnits(Squad & defenseSquad, const size_t
 	while (flyingDefendersNeeded > flyingDefendersInSquad + flyingDefendersAdded &&
 		(defenderToAdd = findClosestDefender(defenseSquad, defenseSquad.getSquadOrder().getPosition(), true, false, enemyHasAntiAir)))
 	{
-		UAB_ASSERT(!defenderToAdd->getType().isWorker(), "flying worker defender");
 		_squadData.assignUnitToSquad(defenderToAdd, defenseSquad);
 		++flyingDefendersAdded;
 	}

Steamhammer/Source/Config.cpp

@@ -12,7 +12,7 @@ namespace Config
     {
         bool ConfigFileFound                = false;
         bool ConfigFileParsed               = false;
-        std::string ConfigFileLocation      = "bwapi-data/AI/Steamhammer_1.4.6.json";
+        std::string ConfigFileLocation      = "bwapi-data/AI/Steamhammer_1.4.7.json";
     }
 
 	namespace IO

Steamhammer/Source/MicroOverlords.h

@@ -16,8 +16,8 @@ class MicroOverlords : public MicroManager
 
 public:
 	MicroOverlords();
-	void executeMicro(const BWAPI::Unitset & targets) {};
-
-	void update();
+	void executeMicro(const BWAPI::Unitset & targets) {};
+
+	void update();
 };
 };

Steamhammer/Source/ScoutManager.cpp

@@ -215,7 +215,7 @@ void ScoutManager::update()
 		}
 		if (moveScout)
 		{
-			moveGroundScout(_workerScout);
+			moveGroundScout();
 		}
 	}
 	else if (_gasStealOver)
@@ -226,7 +226,7 @@ void ScoutManager::update()
 
 	if (_overlordScout)
 	{
-		moveAirScout(_overlordScout);
+		moveAirScout();
 	}
 
     drawScoutInformation(200, 320);
@@ -322,7 +322,7 @@ void ScoutManager::drawScoutInformation(int x, int y)
 }
 
 // Move the worker scout.
-void ScoutManager::moveGroundScout(BWAPI::Unit scout)
+void ScoutManager::moveGroundScout()
 {
 	const int scoutDistanceThreshold = 30;    // in tiles
 
@@ -338,19 +338,19 @@ void ScoutManager::moveGroundScout(BWAPI::Unit scout)
 
 		UAB_ASSERT(enemyBaseLocation, "no enemy base");
 
-		int scoutDistanceToEnemy = MapTools::Instance().getGroundTileDistance(scout->getPosition(), enemyBaseLocation->getPosition());
+		int scoutDistanceToEnemy = MapTools::Instance().getGroundTileDistance(_workerScout->getPosition(), enemyBaseLocation->getPosition());
 		bool scoutInRangeOfenemy = scoutDistanceToEnemy <= scoutDistanceThreshold;
 
 		// we only care if the scout is under attack within the enemy region
 		// this ignores if their scout worker attacks it on the way to their base
-		int scoutHP = scout->getHitPoints() + scout->getShields();
+		int scoutHP = _workerScout->getHitPoints() + _workerScout->getShields();
 		if (scoutHP < _previousScoutHP)
 		{
 			_scoutUnderAttack = true;
 		}
 		_previousScoutHP = scoutHP;
 
-		if (!scout->isUnderAttack() && !enemyWorkerInRadius())
+		if (!_workerScout->isUnderAttack() && !enemyWorkerInRadius())
 		{
 			_scoutUnderAttack = false;
 		}
@@ -371,7 +371,7 @@ void ScoutManager::moveGroundScout(BWAPI::Unit scout)
 				{
 					_scoutStatus = "Harass enemy worker";
 					_currentRegionVertexIndex = -1;
-					Micro::CatchAndAttackUnit(scout, closestWorker);
+					Micro::CatchAndAttackUnit(_workerScout, closestWorker);
 				}
 				// otherwise keep circling the enemy region
 				else
@@ -396,7 +396,7 @@ void ScoutManager::moveGroundScout(BWAPI::Unit scout)
 }
 
 // Move the overlord scout.
-void ScoutManager::moveAirScout(BWAPI::Unit scout)
+void ScoutManager::moveAirScout()
 {
 	// get the enemy base location, if we have one
 	// Note: In case of an enemy proxy or weird map, this might be our own base. Roll with it.
@@ -804,7 +804,7 @@ void ScoutManager::calculateEnemyRegionVertices()
 
         std::vector<BWAPI::Position> temp;
 
-        for (size_t s(maxFarthestEnd); s != maxFarthestStart; s = (s+1) % sortedVertices.size())
+        for (int s(maxFarthestEnd); s != maxFarthestStart; s = (s+1) % sortedVertices.size())
         {
             temp.push_back(sortedVertices[s]);
         }

Steamhammer/Source/ScoutManager.h

@@ -39,8 +39,8 @@ class ScoutManager
 	BWAPI::Unit						getTheEnemyGeyser() const;
 	BWAPI::Unit						enemyWorkerToHarass() const;
     void                            followPerimeter();
-	void                            moveGroundScout(BWAPI::Unit scout);
-	void                            moveAirScout(BWAPI::Unit scout);
+	void                            moveGroundScout();
+	void                            moveAirScout();
 	void                            drawScoutInformation(int x, int y);
     void                            calculateEnemyRegionVertices();