fix: Fix gas saturation, #34

Checks each refinery for oversaturation, and finds a worker on its way to refinery (not-inside-refinery) to STOP and force OnIdle next turn to be re-distributed to minerals.

Author: ImpulseCloud

src/Hub.cpp

@@ -279,6 +279,22 @@ void Hub::AssignVespeneHarvester(const sc2::Unit& refinery_) {
     worker->GatherVespene(refinery_);
 }
 
+void Hub::RemoveVespeneHarvester(const sc2::Unit& refinery_) {
+    const std::list<Worker>& workers = m_busy_workers();
+    auto vespener = std::find_if(workers.begin(), workers.end(),
+    [refinery_](const Worker& worker_) {
+        return !worker_.m_unit->orders.empty() &&
+            worker_.m_unit->orders.front().target_unit_tag == refinery_.tag &&
+            worker_.m_unit->last_seen_game_loop == gAPI->observer().GetGameLoop();
+    });
+
+    if (vespener == workers.end())
+        return;
+
+    // NOTE (impulsecloud): STOP forces OnIdle next frame
+    gAPI->action().Cast(vespener->ToUnit(), sc2::ABILITY_ID::STOP_STOP);
+}
+
 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_);
 
+    void RemoveVespeneHarvester(const sc2::Unit& refinery_);
+
     bool AssignLarva(Order* order_);
 
     const Cache<GameObject>&  GetLarvas() const;

src/objects/GameObject.cpp

@@ -6,9 +6,10 @@
 #include "core/API.h"
 
 GameObject::GameObject(sc2::Tag tag_): m_tag(tag_) {
+    m_unit = gAPI->observer().GetUnit(tag_);
 }
 
-GameObject::GameObject(const sc2::Unit& unit_): m_tag(unit_.tag) {
+GameObject::GameObject(const sc2::Unit& unit_): m_unit(&unit_), m_tag(unit_.tag) {
 }
 
 bool GameObject::operator==(const GameObject& obj_) const {

src/objects/GameObject.h

@@ -24,6 +24,8 @@ struct GameObject {
 
     static sc2::Unit ToUnit(sc2::Tag tag_);
 
+    const sc2::Unit* m_unit;
+
  private:
     sc2::Tag m_tag;
 };

src/plugins/Miner.cpp

@@ -44,7 +44,12 @@ void SecureVespeneIncome() {
     auto refineries = gAPI->observer().GetUnits(IsRefinery());
 
     for (const auto& i : refineries()) {
-        if (i->assigned_harvesters >= i->ideal_harvesters)
+        if (i->assigned_harvesters > i->ideal_harvesters) {
+            gHub->RemoveVespeneHarvester(*i);
+            continue;
+        }
+
+        if (i->assigned_harvesters == i->ideal_harvesters)
             continue;
 
         gHub->AssignVespeneHarvester(*i);