Update to SteamHammer 2.4.2

kant2002 · Sep 4, 2020 · 870d342 · 870d342
1 parent 97513d4
commit 870d342
Show file tree

Hide file tree

Showing 40 changed files with 859 additions and 374 deletions.
diff --git a/Steamhammer/Source/Base.cpp b/Steamhammer/Source/Base.cpp
@@ -80,6 +80,20 @@ Base::Base(BWAPI::TilePosition pos, const BWAPI::Unitset availableResources)
     }
 }
 
+// The base is on an island, unconnected by ground to any starting base.
+bool Base::isIsland() const
+{
+    for (BWAPI::TilePosition tile : BWAPI::Broodwar->getStartLocations())
+    {
+        if (tile != getTilePosition() && getTileDistance(tile) > 0)
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 // Recalculate the base's set of geysers, including refineries (completed or not).
 // This only works for visible geysers, so it should be called only for bases we own.
 // Called to work around a bug related to BWAPI 4.1.2.
@@ -149,10 +163,10 @@ int Base::getInitialGas() const
 // NOTE This doesn't account for mineral patches mining out, decreasing the maximum.
 int Base::getMaxWorkers() const
 {
-	return 2 * minerals.size() + 3 * geysers.size();
+	return 2 * minerals.size() + Config::Macro::WorkersPerRefinery * geysers.size();
 }
 
-// Two per mineral patch plus three per geyser.
+// How many workers are acually assigned?
 int Base::getNumWorkers() const
 {
 	// The number of assigned mineral workers.

diff --git a/Steamhammer/Source/Base.h b/Steamhammer/Source/Base.h
@@ -40,6 +40,7 @@ class Base
     BWAPI::Unit		getDepot()        const { return resourceDepot; };
     BWAPI::Player	getOwner()        const { return owner; };
     bool            isAStartingBase() const { return startingBase; };
+    bool            isIsland()        const;
 
     void findGeysers();
 

diff --git a/Steamhammer/Source/Bases.cpp b/Steamhammer/Source/Bases.cpp
@@ -388,11 +388,10 @@ void Bases::updateBaseOwners()
 				);
 			// Is one of the units a resource depot?
 			BWAPI::Unit depot = nullptr;
-			for (const auto unit : units)
+			for (BWAPI::Unit unit : units)
 			{
 				if (unit->getType().isResourceDepot() && !unit->isLifted())
 				{
-                    UAB_ASSERT(unit->getType() != BWAPI::UnitTypes::Zerg_Infested_Command_Center, "infested resource depot");
 					depot = unit;
 					break;
 				}
@@ -907,9 +906,9 @@ int Bases::geyserCount() const
 	return count;
 }
 
-// Current number of completed refineries at my completed bases,
+// Current number of my completed refineries at my completed bases,
 // and number of bare geysers available to be taken.
-// Not counted: The number of refineries currently under construction.
+// Not counted: Enemy stolen refineries; refineries under construction.
 void Bases::gasCounts(int & nRefineries, int & nFreeGeysers) const
 {
 	int refineries = 0;
@@ -921,25 +920,21 @@ void Bases::gasCounts(int & nRefineries, int & nFreeGeysers) const
 		{
 			// Recalculate the base's geysers every time.
 			// This is a slow but accurate way to work around the BWAPI geyser bug.
-			// To save cycles, call findGeysers() only when necessary (e.g. a refinery is destroyed).
 			base->findGeysers();
 
 			for (BWAPI::Unit geyser : base->getGeysers())
 			{
-				if (geyser && geyser->exists())
-				{
-					if (geyser->getPlayer() == BWAPI::Broodwar->self() &&
-						geyser->getType().isRefinery() &&
-						geyser->isCompleted())
-					{
-						++refineries;
-					}
-					else if (geyser->getPlayer() == BWAPI::Broodwar->neutral())
-					{
-						++geysers;
-					}
-				}
-			}
+                if (geyser->getPlayer() == BWAPI::Broodwar->self() &&
+                    geyser->getType().isRefinery() &&
+                    geyser->isCompleted())
+                {
+                    ++refineries;
+                }
+                else if (geyser->getType() == BWAPI::UnitTypes::Resource_Vespene_Geyser)
+                {
+                    ++geysers;
+                }
+            }
 		}
 	}
 

diff --git a/Steamhammer/Source/BuildingManager.cpp b/Steamhammer/Source/BuildingManager.cpp
@@ -612,6 +612,21 @@ bool BuildingManager::isGasStealInQueue() const
 	return false;
 }
 
+// We have queued an expansion to the given base.
+// (Or at least some building at the same location.)
+bool BuildingManager::isBasePlanned(const Base * base) const
+{
+    for (const Building & b : _buildings)
+    {
+        if (b.finalPosition == base->getTilePosition())
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 void BuildingManager::drawBuildingInformation(int x, int y)
 {
     if (!Config::Debug::DrawBuildingInfo)

diff --git a/Steamhammer/Source/BuildingManager.h b/Steamhammer/Source/BuildingManager.h
@@ -61,6 +61,7 @@ class BuildingManager
 	size_t              getNumUnstarted() const;
 	size_t              getNumUnstarted(BWAPI::UnitType type) const;
 	bool				isGasStealInQueue() const;
+    bool                isBasePlanned(const Base * base) const;
 
     std::vector<BWAPI::UnitType> buildingsQueued();