Implements MultipleFactoryCap for RulesClass.

Vinifera-Developers · Mar 28, 2023 · 6207d36 · 6207d36
1 parent b04a53a
commit 6207d36
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/src/extensions/rules/rulesext.cpp b/src/extensions/rules/rulesext.cpp
@@ -74,7 +74,8 @@ RulesClassExtension::RulesClassExtension(const RulesClass *this_ptr) :
     IsMPPrePlacedConYards(false),
     IsBuildOffAlly(true),
     IsShowSuperWeaponTimers(true),
-    LowPowerPenaltyModifier(1.0f)
+    LowPowerPenaltyModifier(1.0f),
+    MultipleFactoryCap(0)
 {
     //if (this_ptr) EXT_DEBUG_TRACE("RulesClassExtension::RulesClassExtension - 0x%08X\n", (uintptr_t)(ThisPtr));
 
@@ -446,13 +447,15 @@ bool RulesClassExtension::AudioVisual(CCINIClass &ini)
 {
     //EXT_DEBUG_TRACE("RulesClassExtension::General - 0x%08X\n", (uintptr_t)(This()));
 
+    static char const * const GENERAL = "General";
     static char const * const AUDIOVISUAL = "AudioVisual";
 
     if (!ini.Is_Present(AUDIOVISUAL)) {
         return false;
     }
 
     IsShowSuperWeaponTimers = ini.Get_Bool(AUDIOVISUAL, "ShowSuperWeaponTimers", IsShowSuperWeaponTimers);
+    MultipleFactoryCap = ini.Get_Int(GENERAL, "MultipleFactoryCap", MultipleFactoryCap);
 
     return true;
 }

diff --git a/src/extensions/rules/rulesext.h b/src/extensions/rules/rulesext.h
@@ -96,4 +96,10 @@ class RulesClassExtension final : public GlobalExtensionClass<RulesClass>
          *  units you are short of to get the actual penalty to the build speed.
          */
         float LowPowerPenaltyModifier;
+
+        /**
+         *  The maximum number of factories that can be considered when calculating
+         *  the multiple factory bonus on an object's build time.
+         */
+        int MultipleFactoryCap;
 };
diff --git a/src/extensions/techno/technoext.cpp b/src/extensions/techno/technoext.cpp
@@ -480,6 +480,20 @@ int TechnoClassExtension::Time_To_Build() const
      *  @author: CCHyper
      */
     if (Rule->MultipleFactory > 0.0 && (divisor-1) > 0) {
+
+        /**
+         *  #issue-659
+         * 
+         *  Implements MultipleFactoryCap for RulesClass.
+         * 
+         *  @author: CCHyper
+         */
+        if (RuleExtension->MultipleFactoryCap > 0) {
+            divisor = RuleExtension->MultipleFactoryCap;
+        }
+
+        divisor = (divisor-1);
+
         while (divisor) {
             time *= Rule->MultipleFactory;
             --divisor;