fix: Fix gas saturation, #34

Only check vespene workers every 10 frames, to prevent too many vespene workers from being added and oversaturated.

Author: ImpulseCloud

src/plugins/Miner.cpp

@@ -138,7 +138,17 @@ void DistrubuteMineralWorker(const sc2::Unit* unit_) {
 
 }  // namespace
 
+Miner::Miner() {
+    m_turns_to_skip = 7;
+}
+
 void Miner::OnStep(Builder* builder_) {
+    if (m_skip_until_turn > gAPI->observer().GetGameLoop())
+        return;
+
+    // add 1 extra, otherwise skipping 1 turn would trigger next turn, etc
+    m_skip_until_turn = m_turns_to_skip + (gAPI->observer().GetGameLoop() + 1);
+
     SecureMineralsIncome(builder_);
     SecureVespeneIncome();
 
@@ -151,7 +161,12 @@ void Miner::OnUnitCreated(const sc2::Unit* unit_, Builder*) {
         DistrubuteMineralWorker(unit_);
 }
 
-void Miner::OnUnitIdle(const sc2::Unit* unit_, Builder*) {
+void Miner::OnUnitIdle(const sc2::Unit* unit_, Builder* builder_) {
     if (unit_->unit_type == gHub->GetCurrentWorkerType())
         DistrubuteMineralWorker(unit_);
+
+    if (sc2::IsTownHall()(unit_->unit_type) &&
+        unit_->assigned_harvesters <= unit_->ideal_harvesters &&
+        builder_->CountScheduledOrders(gHub->GetCurrentWorkerType()) < 1)
+        builder_->ScheduleOptionalOrder(gHub->GetCurrentWorkerType(), unit_);
 }

src/plugins/Miner.h

@@ -8,6 +8,8 @@
 #include "Plugin.h"
 
 struct Miner : Plugin {
+    Miner();
+
     void OnStep(Builder* builder_) final;
 
     void OnUnitCreated(const sc2::Unit* unit_, Builder*) final;

src/plugins/Plugin.h

@@ -38,4 +38,8 @@ struct Plugin {
 
     virtual void OnGameEnd() {
     }
+
+ protected:
+    uint32_t m_turns_to_skip = 0;
+    uint32_t m_skip_until_turn = 0;  // set with turns_to_skip + (CurrentGameLoop + 1)
 };

src/plugins/QuarterMaster.cpp

@@ -111,20 +111,20 @@ float CalcConsumptionRate::operator()(float sum, const sc2::Unit* unit_) const {
 
 }  // namespace
 
-QuarterMaster::QuarterMaster():
-    Plugin(), m_skip_until_frame(0) {
+QuarterMaster::QuarterMaster() {
+    m_turns_to_skip = 10 * 22;  // 10 Seconds * 22 Frames Per Second (~22.4)
 }
 
 void QuarterMaster::OnStep(Builder* builder_) {
-    if (m_skip_until_frame > gAPI->observer().GetGameLoop())
+    if (m_skip_until_turn > gAPI->observer().GetGameLoop())
         return;
 
     auto units = gAPI->observer().GetUnits();
     std::list<Order> orders = builder_->GetOrders();
 
     if (!orders.empty()
         && orders.begin()->unit_type_id == gHub->GetCurrentSupplyType()) {
-        m_skip_until_frame = gAPI->observer().GetGameLoop() + m_frames_to_skip;
+        m_skip_until_turn = m_turns_to_skip + (gAPI->observer().GetGameLoop() + 1);
         return;  // wait 10 seconds if already scheduled Supply
     }
 
@@ -140,13 +140,13 @@ void QuarterMaster::OnStep(Builder* builder_) {
     gHistory.info() << "Request additional supplies: " <<
         expected_consumption << " >= " << expected_supply << std::endl;
 
-    m_skip_until_frame = gAPI->observer().GetGameLoop() + m_frames_to_skip;
+    m_skip_until_turn = m_turns_to_skip + (gAPI->observer().GetGameLoop() + 1);
 
     builder_->ScheduleObligatoryOrder(gHub->GetCurrentSupplyType(), true);
 }
 
 void QuarterMaster::OnUnitCreated(const sc2::Unit* unit_,  Builder*) {
     if (unit_->unit_type == gHub->GetCurrentSupplyType()) {
-        m_skip_until_frame = 0;
+        m_skip_until_turn = 0;
     }
 }

src/plugins/QuarterMaster.h

@@ -13,8 +13,4 @@ struct QuarterMaster : Plugin {
     void OnStep(Builder* builder_) final;
 
     void OnUnitCreated(const sc2::Unit* unit_, Builder*) final;
-
- private:
-    const size_t m_frames_to_skip = 10 * 22;  // 10 Seconds * 22 Frames Per Second (~22.4)
-    size_t m_skip_until_frame;
 };