Feature #34: Fix gas saturation

If gas oversaturated, remove from busy_workers and call DistributeWorker.
If gas under-saturated and any base is mineral-oversaturated, send one of those mineral workers to that gas.

Author: ImpulseCloud

src/Hub.cpp

@@ -279,6 +279,25 @@ void Hub::AssignVespeneHarvester(const sc2::Unit& refinery_) {
     worker->GatherVespene(refinery_);
 }
 
+const sc2::Unit* Hub::RemoveVespeneHarvester(const sc2::Unit& refinery_) {
+    const std::list<Worker>& workers = m_busy_workers();
+    for (auto& worker : workers) {
+        const sc2::Unit* unit = gAPI->observer().GetUnit(worker.Tag());
+        if (!unit || worker.GetJob() != GATHERING_VESPENE)
+            continue;
+
+        if (!unit->orders.empty() &&
+            unit->orders.front().target_unit_tag == refinery_.tag &&
+            unit->last_seen_game_loop == gAPI->observer().GetGameLoop()) {
+
+            m_busy_workers.Swap(worker, m_free_workers);
+            return unit;
+        }
+    }
+
+    return nullptr;
+}
+
 bool Hub::AssignLarva(Order* order_) {
     if (m_larva.Empty())
         return false;

src/Hub.h

@@ -15,6 +15,8 @@
 
 template <typename T>
 struct Cache {
+    const std::list<T>& operator()();
+
     bool Empty() const;
 
     uint64_t Count() const;
@@ -37,6 +39,11 @@ struct Cache {
     std::list<T> m_objects;
 };
 
+template <typename T>
+const std::list<T>& Cache<T>::operator()() {
+    return m_objects;
+}
+
 template <typename T>
 bool Cache<T>::Empty() const {
     return m_objects.empty();
@@ -145,6 +152,8 @@ struct Hub {
 
     void AssignVespeneHarvester(const sc2::Unit& refinery_);
 
+    const sc2::Unit* RemoveVespeneHarvester(const sc2::Unit& refinery_);
+
     bool AssignLarva(Order* order_);
 
     const Cache<GameObject>&  GetLarvas() const;

src/objects/Worker.cpp

@@ -27,3 +27,7 @@ void Worker::GatherVespene(const sc2::Unit& target_) {
     gAPI->action().Cast(ToUnit(), sc2::ABILITY_ID::SMART, target_);
     m_job = Job::GATHERING_VESPENE;
 }
+
+Job Worker::GetJob() const {
+    return m_job;
+}

src/objects/Worker.h

@@ -22,6 +22,8 @@ struct Worker: GameObject {
     void Build(Order* order_, const sc2::Point2D& point_);
 
     void GatherVespene(const sc2::Unit& target_);
+    
+    Job GetJob() const;
 
  private:
     Job m_job;

src/plugins/Miner.cpp

@@ -16,63 +16,6 @@
 namespace {
 const int mule_energy_cost = 50;
 
-void SecureMineralsIncome(Builder* builder_) {
-    auto town_halls = gAPI->observer().GetUnits(sc2::IsTownHall());
-
-    for (const auto& i : town_halls()) {
-        if (!i->orders.empty() || i->build_progress != BUILD_FINISHED)
-            continue;
-
-        if (i->assigned_harvesters > i->ideal_harvesters)
-            continue;
-
-        if (builder_->CountScheduledOrders(gHub->GetCurrentWorkerType()) > 0)
-            continue;
-
-        // FIXME (alkurbatov): We should set an assignee for drones
-        // and pick a larva closest to the assignee.
-        if (gHub->GetCurrentRace() == sc2::Race::Zerg) {
-            builder_->ScheduleOptionalOrder(sc2::UNIT_TYPEID::ZERG_DRONE);
-            continue;
-        }
-
-        builder_->ScheduleOptionalOrder(gHub->GetCurrentWorkerType(), i);
-    }
-}
-
-void SecureVespeneIncome() {
-    auto refineries = gAPI->observer().GetUnits(IsRefinery());
-
-    for (const auto& i : refineries()) {
-        if (i->assigned_harvesters >= i->ideal_harvesters)
-            continue;
-
-        gHub->AssignVespeneHarvester(*i);
-    }
-}
-
-void CallDownMULE() {
-    auto orbitals = gAPI->observer().GetUnits(
-        IsUnit(sc2::UNIT_TYPEID::TERRAN_ORBITALCOMMAND));
-
-    if (orbitals.Empty())
-        return;
-
-    auto units = gAPI->observer().GetUnits(sc2::IsVisibleMineralPatch(),
-        sc2::Unit::Alliance::Neutral);
-
-    for (const auto& i : orbitals()) {
-        if (i->energy < mule_energy_cost)
-            continue;
-
-        const sc2::Unit* mineral_target = units.GetClosestUnit(i->pos);
-        if (!mineral_target)
-            continue;
-
-        gAPI->action().Cast(*i, sc2::ABILITY_ID::EFFECT_CALLDOWNMULE, *mineral_target);
-    }
-}
-
 const Expansion* GetBestMiningExpansionNear(const sc2::Unit* unit_) {
     if (!unit_)
         return nullptr;
@@ -136,6 +79,77 @@ void DistrubuteMineralWorker(const sc2::Unit* unit_) {
     gAPI->action().Cast(*unit_, sc2::ABILITY_ID::SMART, *mineral_target);
 }
 
+void SecureMineralsIncome(Builder* builder_) {
+    auto town_halls = gAPI->observer().GetUnits(sc2::IsTownHall());
+
+    for (const auto& i : town_halls()) {
+        if (!i->orders.empty() || i->build_progress != BUILD_FINISHED)
+            continue;
+
+        if (i->assigned_harvesters > i->ideal_harvesters)
+            continue;
+
+        if (builder_->CountScheduledOrders(gHub->GetCurrentWorkerType()) > 0)
+            continue;
+
+        // FIXME (alkurbatov): We should set an assignee for drones
+        // and pick a larva closest to the assignee.
+        if (gHub->GetCurrentRace() == sc2::Race::Zerg) {
+            builder_->ScheduleOptionalOrder(sc2::UNIT_TYPEID::ZERG_DRONE);
+            continue;
+        }
+
+        builder_->ScheduleOptionalOrder(gHub->GetCurrentWorkerType(), i);
+    }
+}
+
+void SecureVespeneIncome() {
+    auto refineries = gAPI->observer().GetUnits(IsRefinery());
+
+    for (const auto& i : refineries()) {
+        if (i->assigned_harvesters > i->ideal_harvesters) {  // gas ideal_harvesters is always 3
+            const sc2::Unit* removed = gHub->RemoveVespeneHarvester(*i);
+            DistrubuteMineralWorker(removed);
+            continue;
+        }
+
+        if (i->assigned_harvesters == i->ideal_harvesters)  // gas already saturated
+            continue;
+
+        auto town_halls = gAPI->observer().GetUnits(sc2::IsTownHall());
+        auto close_town_hall = town_halls.GetClosestUnit(i->pos);
+        if (close_town_hall &&
+            close_town_hall->assigned_harvesters > close_town_hall->ideal_harvesters) {
+            gHub->AssignVespeneHarvester(*i);  // reassign overflow mineral workers
+            continue;
+        }
+
+        gHub->AssignVespeneHarvester(*i);
+    }
+}
+
+void CallDownMULE() {
+    auto orbitals = gAPI->observer().GetUnits(
+        IsUnit(sc2::UNIT_TYPEID::TERRAN_ORBITALCOMMAND));
+
+    if (orbitals.Empty())
+        return;
+
+    auto units = gAPI->observer().GetUnits(sc2::IsVisibleMineralPatch(),
+        sc2::Unit::Alliance::Neutral);
+
+    for (const auto& i : orbitals()) {
+        if (i->energy < mule_energy_cost)
+            continue;
+
+        const sc2::Unit* mineral_target = units.GetClosestUnit(i->pos);
+        if (!mineral_target)
+            continue;
+
+        gAPI->action().Cast(*i, sc2::ABILITY_ID::EFFECT_CALLDOWNMULE, *mineral_target);
+    }
+}
+
 }  // namespace
 
 void Miner::OnStep(Builder* builder_) {