ProductOverflow & RecipePowerRate changes

Author: Awbugl

data/recipes.json

@@ -439,6 +439,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "Overflow": 2,
     "NonProductive": false
   },
   {
@@ -854,6 +855,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "Overflow": 2,
     "NonProductive": false
   },
   {
@@ -1093,6 +1095,7 @@
     ],
     "Explicit": false,
     "Handcraft": false,
+    "PowerFactor": 18,
     "NonProductive": true
   },
   {
@@ -1588,6 +1591,7 @@
     ],
     "Explicit": false,
     "Handcraft": false,
+    "PowerFactor": 18,
     "NonProductive": false
   },
   {
@@ -2055,6 +2059,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "PowerFactor": 18,
     "NonProductive": true
   },
   {
@@ -2916,6 +2921,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "PowerFactor": 4,
     "NonProductive": true
   },
   {
@@ -4603,6 +4609,8 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "Overflow": 32,
+    "PowerFactor": 8,
     "NonProductive": false
   },
   {
@@ -4984,6 +4992,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "Overflow": 2,
     "NonProductive": false
   },
   {
@@ -5245,6 +5254,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "PowerFactor": 18,
     "NonProductive": true
   },
   {
@@ -5361,6 +5371,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "PowerFactor": 8,
     "NonProductive": false
   },
   {
@@ -5417,6 +5428,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "PowerFactor": 8,
     "NonProductive": false
   },
   {
@@ -5643,6 +5655,8 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "Overflow": 32,
+    "PowerFactor": 4,
     "NonProductive": false
   },
   {
@@ -5672,6 +5686,8 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "Overflow": 32,
+    "PowerFactor": 4,
     "NonProductive": false
   },
   {
@@ -5753,6 +5769,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "PowerFactor": 4,
     "NonProductive": false
   },
   {
@@ -5863,6 +5880,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "Overflow": 2,
     "NonProductive": false
   },
   {
@@ -5892,6 +5910,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "Overflow": 2,
     "NonProductive": false
   },
   {
@@ -5921,6 +5940,7 @@
     ],
     "Explicit": true,
     "Handcraft": false,
+    "Overflow": 2,
     "NonProductive": false
   },
   {
@@ -6514,6 +6534,7 @@
     ],
     "Explicit": true,
     "Handcraft": true,
+    "Overflow": 32,
     "NonProductive": false
   }
 ]

data/strings.json

@@ -1031,8 +1031,8 @@
   },
   {
     "Name": "R水电解",
-    "ZHCN": "通过直流电将水电解为氢气与氧气，是获取清洁氢能源的基础工艺。\n<color=\"#FD965ECC\">在所有产物均堆积前不会停止工作。</color>",
-    "ENUS": "Electrolysis of water into hydrogen and oxygen using direct current—the fundamental process for obtaining clean hydrogen energy.\n<color=\"#FD965ECC\">Will not stop working until all products are accumulated.</color>"
+    "ZHCN": "通过直流电将水电解为氢气与氧气，是获取清洁氢能源的基础工艺。",
+    "ENUS": "Electrolysis of water into hydrogen and oxygen using direct current—the fundamental process for obtaining clean hydrogen energy."
   },
   {
     "Name": "盐水电解",
@@ -1041,8 +1041,8 @@
   },
   {
     "Name": "R盐水电解",
-    "ZHCN": "采用离子交换膜电解技术处理氯化钠溶液，阳极产生的氯气与阴极产生的氢气经催化反应后溶于水形成盐酸，同时阴极区富集氢氧化钠溶液。\n<color=\"#FD965ECC\">在所有产物均堆积前不会停止工作。</color>",
-    "ENUS": "Utilizing ion exchange membrane electrolysis to process sodium chloride solution—chlorine gas from the anode and hydrogen gas from the cathode undergo catalytic reaction and dissolve in water to form hydrochloric acid, while sodium hydroxide solution is enriched at the cathode.\n<color=\"#FD965ECC\">Will not stop working until all products are accumulated.</color>"
+    "ZHCN": "采用离子交换膜电解技术处理氯化钠溶液，阳极产生的氯气与阴极产生的氢气经催化反应后溶于水形成盐酸，同时阴极区富集氢氧化钠溶液。",
+    "ENUS": "Utilizing ion exchange membrane electrolysis to process sodium chloride solution—chlorine gas from the anode and hydrogen gas from the cathode undergo catalytic reaction and dissolve in water to form hydrochloric acid, while sodium hydroxide solution is enriched at the cathode."
   },
   {
     "Name": "钠盐转化",
@@ -1061,8 +1061,8 @@
   },
   {
     "Name": "R海水淡化",
-    "ZHCN": "采用半透膜分离技术，在压力驱动下使水分子选择性透过而截留盐分，实现海水向淡水的转化。\n<color=\"#FD965ECC\">在所有产物均堆积前不会停止工作。</color>",
-    "ENUS": "Employing semi-permeable membrane separation technology, driving water molecules to selectively permeate while retaining salts under pressure—achieving the conversion of seawater to freshwater.\n<color=\"#FD965ECC\">Will not stop working until all products are accumulated.</color>"
+    "ZHCN": "采用半透膜分离技术，在压力驱动下使水分子选择性透过而截留盐分，实现海水向淡水的转化。",
+    "ENUS": "Employing semi-permeable membrane separation technology, driving water molecules to selectively permeate while retaining salts under pressure—achieving the conversion of seawater to freshwater."
   },
   {
     "Name": "甲烷偶联",
@@ -1071,8 +1071,8 @@
   },
   {
     "Name": "R甲烷偶联",
-    "ZHCN": "在催化剂作用下使甲烷分子发生氧化偶联反应，碳-氢键断裂并重组为丙烯分子，是实现低碳烷烃高值化利用的关键路径。\n<color=\"#FD965ECC\">在所有产物均堆积前不会停止工作。</color>",
-    "ENUS": "Catalytic oxidative coupling of methane molecules, breaking and reforming carbon-hydrogen bonds into propylene molecules—a key pathway for high-value utilization of low-carbon alkanes.\n<color=\"#FD965ECC\">Will not stop working until all products are accumulated.</color>"
+    "ZHCN": "在催化剂作用下使甲烷分子发生氧化偶联反应，碳-氢键断裂并重组为丙烯分子，是实现低碳烷烃高值化利用的关键路径。",
+    "ENUS": "Catalytic oxidative coupling of methane molecules, breaking and reforming carbon-hydrogen bonds into propylene molecules—a key pathway for high-value utilization of low-carbon alkanes."
   },
   {
     "Name": "合成氨",
@@ -1181,8 +1181,8 @@
   },
   {
     "Name": "R等离子精炼",
-    "ZHCN": "利用高温等离子体流裂解原油大分子，轻组分气化后经冷凝分离得氢气，重组分富集为焦油。\n<color=\"#FD965ECC\">在所有产物均堆积前不会停止工作。</color>",
-    "ENUS": "Utilizing high-temperature plasma flow to crack crude oil macromolecules—light components gasified and separated by condensation to obtain hydrogen, heavy components enriched as tar.\n<color=\"#FD965ECC\">Will not stop working until all products are accumulated.</color>"
+    "ZHCN": "利用高温等离子体流裂解原油大分子，轻组分气化后经冷凝分离得氢气，重组分富集为焦油。",
+    "ENUS": "Utilizing high-temperature plasma flow to crack crude oil macromolecules—light components gasified and separated by condensation to obtain hydrogen, heavy components enriched as tar."
   },
   {
     "Name": "催化重整",
@@ -1191,8 +1191,8 @@
   },
   {
     "Name": "R催化重整",
-    "ZHCN": "在铂铼双金属催化剂作用下，丙烯经历脱氢环化与芳构化反应转化为苯，虽效率受限但为化石能源清洁利用的经典工艺。\n<color=\"#FD965ECC\">在所有产物均堆积前不会停止工作。</color>",
-    "ENUS": "Under platinum-rhenium bimetallic catalysis, propylene undergoes dehydrogenation cyclization and aromatization to convert to benzene—though efficiency-limited, a classic process for clean utilization of fossil energy.\n<color=\"#FD965ECC\">Will not stop working until all products are accumulated.</color>"
+    "ZHCN": "在铂铼双金属催化剂作用下，丙烯经历脱氢环化与芳构化反应转化为苯，虽效率受限但为化石能源清洁利用的经典工艺。",
+    "ENUS": "Under platinum-rhenium bimetallic catalysis, propylene undergoes dehydrogenation cyclization and aromatization to convert to benzene—though efficiency-limited, a classic process for clean utilization of fossil energy."
   },
   {
     "Name": "氨氧化",
@@ -1206,8 +1206,8 @@
   },
   {
     "Name": "R石墨烯",
-    "ZHCN": "在铜箔基底上进行化学气相沉积，甲烷高温裂解出的碳原子自组装为单层石墨烯，同时副产氢气。\n<color=\"#FD965ECC\">在所有产物均堆积前不会停止工作。</color>",
-    "ENUS": "Chemical vapor deposition on copper foil substrate—carbon atoms from high-temperature methane cracking self-assemble into monolayer graphene, with hydrogen as byproduct.\n<color=\"#FD965ECC\">Will not stop working until all products are accumulated.</color>"
+    "ZHCN": "在铜箔基底上进行化学气相沉积，甲烷高温裂解出的碳原子自组装为单层石墨烯，同时副产氢气。",
+    "ENUS": "Chemical vapor deposition on copper foil substrate—carbon atoms from high-temperature methane cracking self-assemble into monolayer graphene, with hydrogen as byproduct."
   },
   {
     "Name": "R石墨烯（高效）",
@@ -1231,8 +1231,8 @@
   },
   {
     "Name": "R放射矿物精炼",
-    "ZHCN": "采用碱法浸出工艺，以氢氧化钠溶液溶解放射性矿物基质，使铀、钍元素以可溶性络合物形式进入溶液后沉淀富集。\n<color=\"#FD965ECC\">在所有产物均堆积前不会停止工作。</color>",
-    "ENUS": "Employing alkaline leaching process, using sodium hydroxide solution to dissolve radioactive mineral matrix—uranium and thorium enter solution as soluble complexes and precipitate for enrichment.\n<color=\"#FD965ECC\">Will not stop working until all products are accumulated.</color>"
+    "ZHCN": "采用碱法浸出工艺，以氢氧化钠溶液溶解放射性矿物基质，使铀、钍元素以可溶性络合物形式进入溶液后沉淀富集。",
+    "ENUS": "Employing alkaline leaching process, using sodium hydroxide solution to dissolve radioactive mineral matrix—uranium and thorium enter solution as soluble complexes and precipitate for enrichment."
   },
   {
     "Name": "物质回收",

data/strings_mod.json

@@ -244,6 +244,21 @@
     "ZHCN": "机甲背包负熵奇点数量不足，无法折跃",
     "ENUS": "The mecha does not have enough Negentropy Singularity to Quantum Navigation"
   },
+  {
+    "Name": "配方额外耗电提示",
+    "ZHCN": "配方额外耗电：",
+    "ENUS": "Additional power consumption: "
+  },
+  {
+    "Name": "此配方允许所有产物溢出运行",
+    "ZHCN": "在所有产物均堆积前不会停止工作。",
+    "ENUS": "Will not stop working until all products are accumulated."
+  },
+  {
+    "Name": "此配方允许x位产物溢出运行",
+    "ZHCN": "此配方的第{0}个产物不会堆积。",
+    "ENUS": "This recipe allows product(s) {0} to overflow."
+  },
   {
     "Name": "化学能",
     "ZHCN": "化学能",

preloader/Preloader.cs

@@ -44,11 +44,16 @@ private static FieldDefinition GetFieldByName(this TypeDefinition type, string n
         private static void AddEnumField(this TypeDefinition type, string name, object constant, FieldAttributes fieldAttributes) =>
             type.Fields.Add(new FieldDefinition(name, fieldAttributes, type) { Constant = constant, });
 
-        private static void AddTypeField(this AssemblyDefinition assembly, string typeName, string oriFieldName, string newFieldName)
+        private static void AddTypeField(this AssemblyDefinition assembly, string typeName, string oriFieldName, string newFieldName,
+            bool notSerialized = false)
         {
             TypeDefinition type = assembly.GetTypeByName(typeName);
             FieldDefinition oriField = type.GetFieldByName(oriFieldName);
-            type.Fields.Add(new FieldDefinition(newFieldName, oriField.Attributes, oriField.FieldType));
+            var fieldDefinition = new FieldDefinition(newFieldName, oriField.Attributes, oriField.FieldType);
+
+            if (notSerialized) fieldDefinition.Attributes |= FieldAttributes.NotSerialized;
+
+            type.Fields.Add(fieldDefinition);
         }
 
         public static void Patch(AssemblyDefinition assembly)
@@ -73,6 +78,9 @@ public static void Patch(AssemblyDefinition assembly)
             assembly.AddTypeField("PlanetData", "birthResourcePoint0", "birthResourcePoint4");
 
             assembly.AddTypeField("GameDesc", "isSandboxMode", "isFastStartMode");
+
+            assembly.AddTypeField("RecipeProto", "TimeSpend", "PowerFactor", true);
+            assembly.AddTypeField("RecipeProto", "TimeSpend", "Overflow", true);
         }
     }
 }

src/Patches/Hooks/AddMatrix/ResearchLabPatches.cs

@@ -228,13 +228,13 @@ public static IEnumerable<CodeInstruction> FactorySystem_GameTickLabResearchMode
                 IL_0300: call         instance unsigned int32 LabComponent::InternalUpdateResearch(float32, float32, int32[], valuetype TechState&, int32&, int64&, int64&)
                 IL_0305: stloc.s      _state
              */
-            
+
             matcher.MatchForward(false,
                 new CodeMatch(new CodeInstruction(OpCodes.Call,
                     AccessTools.Method(typeof(LabComponent), nameof(LabComponent.InternalUpdateResearch)))));
 
             object local = matcher.Advance(-8).Operand;
-            
+
             // change techSpeed
             matcher.Advance(3).InsertAndAdvance(new CodeInstruction(OpCodes.Ldarg_0), new CodeInstruction(OpCodes.Ldloc_S, local),
                 new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(ResearchLabPatches), nameof(SetResearchSpeed))));