try to fix belt signal generation source calculation

work in progress
2026-02-04 15:12:17 +08:00 · 2025-08-10 15:34:37 +08:00 · 2025-08-10 15:16:53 +08:00
23 changed files with 58 additions and 45 deletions
--- a/CheatEnabler/CheatEnabler.csproj
+++ b/CheatEnabler/CheatEnabler.csproj
@@ -16,7 +16,7 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
  </ItemGroup>

--- a/CheatEnabler/Patches/DysonSpherePatch.cs
+++ b/CheatEnabler/Patches/DysonSpherePatch.cs
@@ -4,6 +4,7 @@ using System.Reflection.Emit;
 using BepInEx.Configuration;
 using HarmonyLib;
 using UXAssist.Common;
+using GameLogic = UXAssist.Common.GameLogic;

 namespace CheatEnabler.Patches;

--- a/CheatEnabler/Patches/FactoryPatch.cs
+++ b/CheatEnabler/Patches/FactoryPatch.cs
@@ -8,6 +8,7 @@ using HarmonyLib;
 using UnityEngine;
 using UnityEngine.UI;
 using UXAssist.Common;
+using GameLogic = UXAssist.Common.GameLogic;

 namespace CheatEnabler.Patches;

@@ -806,13 +807,13 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
            var result = new Dictionary<int, float>();
            var extra = new Dictionary<int, float>();
            CalculateAllProductions(result, extra, itemId);
-            foreach (var p in extra)
-            {
-                if (result.TryGetValue(itemId, out var v) && v >= p.Value) continue;
-                result[itemId] = p.Value;
-            }

            result.Remove(itemId);
+
+            foreach (var p in extra)
+            {
+                result[p.Key] = (result.TryGetValue(p.Key, out var v) ? v : 0) + p.Value;
+            }
            var cnt = result.Count;
            if (cnt == 0)
            {
@@ -1252,16 +1253,12 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
                times = count / itemSource.Count;
            }

-            {
-                result.TryGetValue(itemId, out var oldCount);
-                result[itemId] = oldCount + count;
-            }
+            result[itemId] = (result.TryGetValue(itemId, out var oldCount) ? oldCount : 0) + count;
            if (itemSource.Extra != null)
            {
                foreach (var p in itemSource.Extra)
                {
-                    extra.TryGetValue(p.Key, out var oldCount);
-                    extra[p.Key] = oldCount + times * p.Value;
+                    extra[p.Key] = (extra.TryGetValue(p.Key, out oldCount) ? oldCount : 0) + times * p.Value;
                }
            }

--- a/Dustbin/Dustbin.csproj
+++ b/Dustbin/Dustbin.csproj
@@ -16,7 +16,7 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="DysonSphereProgram.Modding.DSPModSave" Version="1.*" />
    <PackageReference Include="DysonSphereProgram.Modding.NebulaMultiplayerModApi" Version="2.0.0" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
@@ -28,7 +28,7 @@
  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <Reference Include="Assembly-CSharp">
      <HintPath>GameAssembly\Assembly-CSharp.dll</HintPath>
--- a/DustbinPreloader/DustbinPreloader.csproj
+++ b/DustbinPreloader/DustbinPreloader.csproj
@@ -14,14 +14,14 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
  </ItemGroup>

  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
  </ItemGroup>
-  
+
  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Release'">
    <Exec Command="IF NOT EXIST ..\Dustbin\package\patchers (mkdir ..\Dustbin\package\patchers)&#xA;copy /y $(TargetPath) ..\Dustbin\package\patchers\" />
  </Target>
--- a/HideTips/HideTips.csproj
+++ b/HideTips/HideTips.csproj
@@ -15,14 +15,14 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
  </ItemGroup>
-  
+
  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
  </ItemGroup>
-  
+
  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Release'">
    <Exec Command="del /F /Q package\$(ProjectName)-$(Version).zip&#xA;powershell Compress-Archive -Force -DestinationPath 'package/$(ProjectName)-$(Version).zip' -Path '$(TargetPath)', package/icon.png, package/manifest.json, README.md" />
  </Target>
--- a/LabOpt/LabOpt.csproj
+++ b/LabOpt/LabOpt.csproj
@@ -15,10 +15,10 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
  </ItemGroup>
-  
+
  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
  </ItemGroup>
--- a/LabOptPreloader/LabOptPreloader.csproj
+++ b/LabOptPreloader/LabOptPreloader.csproj
@@ -14,14 +14,14 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
  </ItemGroup>
-  
+
  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
  </ItemGroup>
-  
+
  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Release'">
    <Exec Command="IF NOT EXIST ..\LabOpt\package\patchers (mkdir ..\LabOpt\package\patchers)&#xA;copy /y $(TargetPath) ..\LabOpt\package\patchers\" />
  </Target>
--- a/LogisticMiner/LogisticMiner.csproj
+++ b/LogisticMiner/LogisticMiner.csproj
@@ -15,7 +15,7 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
  </ItemGroup>

--- a/MechaDronesTweaks/MechaDronesTweaks.csproj
+++ b/MechaDronesTweaks/MechaDronesTweaks.csproj
@@ -15,7 +15,7 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
  </ItemGroup>

--- a/OCBatchBuild/OCBatchBuild.csproj
+++ b/OCBatchBuild/OCBatchBuild.csproj
@@ -15,7 +15,7 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
  </ItemGroup>

--- a/OverclockEverything/OverclockEverything.csproj
+++ b/OverclockEverything/OverclockEverything.csproj
@@ -16,15 +16,15 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="DysonSphereProgram.Modding.DSPModSave" Version="1.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
  </ItemGroup>
-  
+
  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
  </ItemGroup>
-  
+
  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Release'">
    <Exec Command="del /F /Q package\$(ProjectName)-$(Version).zip&#xA;powershell Compress-Archive -Force -DestinationPath 'package/$(ProjectName)-$(Version).zip' -Path '$(TargetPath)', package/icon.png, package/manifest.json, README.md" />
  </Target>
--- a/PoolOpt/PoolOpt.csproj
+++ b/PoolOpt/PoolOpt.csproj
@@ -15,14 +15,14 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
  </ItemGroup>
-  
+
  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
  </ItemGroup>
-  
+
  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Configuration)' == 'Release'">
    <Exec Command="del /F /Q package\$(ProjectName)-$(Version).zip&#xA;powershell Compress-Archive -Force -DestinationPath 'package/$(ProjectName)-$(Version).zip' -Path '$(TargetPath)', package/icon.png, package/manifest.json, README.md" />
  </Target>
--- a/UXAssist/Functions/UIFunctions.cs
+++ b/UXAssist/Functions/UIFunctions.cs
@@ -1,13 +1,14 @@
-namespace UXAssist.Functions;
-
-using UI;
-using Common;
 using CommonAPI.Systems;
 using UnityEngine;
 using UnityEngine.UI;
 using System;
 using System.Linq;
 using System.Collections.Generic;
+using UXAssist.UI;
+using UXAssist.Common;
+using GameLogic = UXAssist.Common.GameLogic;
+
+namespace UXAssist.Functions;

 public static class UIFunctions
 {
--- a/UXAssist/Patches/DysonSpherePatch.cs
+++ b/UXAssist/Patches/DysonSpherePatch.cs
@@ -5,6 +5,7 @@ using BepInEx.Configuration;
 using HarmonyLib;
 using UnityEngine.UI;
 using UXAssist.Common;
+using GameLogic = UXAssist.Common.GameLogic;

 namespace UXAssist.Patches;

--- a/UXAssist/Patches/FactoryPatch.cs
+++ b/UXAssist/Patches/FactoryPatch.cs
@@ -10,6 +10,7 @@ using HarmonyLib;
 using UnityEngine;
 using UnityEngine.UI;
 using UXAssist.Common;
+using GameLogic = UXAssist.Common.GameLogic;

 namespace UXAssist.Patches;

@@ -445,12 +446,20 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
                new CodeMatch(OpCodes.Ldloca_S),
                new CodeMatch(OpCodes.Call, AccessTools.PropertyGetter(typeof(Vector3), nameof(Vector3.magnitude)))
            );
+            var ldlocOpr = matcher.InstructionAt(0).operand;
            var jumpPos = matcher.InstructionAt(3).operand;
-            var labels = matcher.Labels;
-            matcher.Labels = [];
-            /* Insert: br   2358 (1C12) ldloc.s V_8 (8)
+            /* Insert after btrue:
+             *  Ldloc.s  V_8 (8)
+             *  ldfld	class PrefabDesc BuildPreview::desc
+             *  ldfld	bool PrefabDesc::isPowerGen
+             *  brtrue	2358 (1C12) ldloc.s V_8 (8)
             */
-            matcher.Insert(new CodeInstruction(OpCodes.Br, jumpPos).WithLabels(labels));
+            matcher.Advance(4).InsertAndAdvance(
+                new CodeInstruction(OpCodes.Ldloc_S, ldlocOpr),
+                new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(BuildPreview), nameof(BuildPreview.desc))),
+                new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(PrefabDesc), nameof(PrefabDesc.isPowerGen))),
+                new CodeInstruction(OpCodes.Brtrue_S, jumpPos)
+            );
            return matcher.InstructionEnumeration();
        }

--- a/UXAssist/Patches/LogisticsPatch.cs
+++ b/UXAssist/Patches/LogisticsPatch.cs
@@ -9,6 +9,7 @@ using UnityEngine.EventSystems;
 using UnityEngine.Serialization;
 using UnityEngine.UI;
 using UXAssist.Common;
+using GameLogic = UXAssist.Common.GameLogic;
 using Object = UnityEngine.Object;

 namespace UXAssist.Patches;
--- a/UXAssist/Patches/TechPatch.cs
+++ b/UXAssist/Patches/TechPatch.cs
@@ -5,6 +5,7 @@ using BepInEx.Configuration;
 using HarmonyLib;
 using UnityEngine.UI;
 using UXAssist.Common;
+using GameLogic = UXAssist.Common.GameLogic;

 namespace UXAssist.Patches;

--- a/UXAssist/UXAssist.cs
+++ b/UXAssist/UXAssist.cs
@@ -14,6 +14,7 @@ using UXAssist.Functions;
 using UXAssist.Patches;
 using UXAssist.UI;
 using Util = UXAssist.Common.Util;
+using GameLogic = UXAssist.Common.GameLogic;

 namespace UXAssist;

--- a/UXAssist/UXAssist.csproj
+++ b/UXAssist/UXAssist.csproj
@@ -16,7 +16,7 @@
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="DysonSphereProgram.Modding.CommonAPI" Version="1.6.5" />
    <PackageReference Include="DysonSphereProgram.Modding.DSPModSave" Version="1.*" />
  </ItemGroup>
--- a/UniverseGenTweaks/BirthPlanetPatch.cs
+++ b/UniverseGenTweaks/BirthPlanetPatch.cs
@@ -2,6 +2,7 @@
 using BepInEx.Configuration;
 using HarmonyLib;
 using UXAssist.Common;
+using GameLogic = UXAssist.Common.GameLogic;

 namespace UniverseGenTweaks;
 public static class BirthPlanetPatch
--- a/UniverseGenTweaks/UniverseGenTweaks.csproj
+++ b/UniverseGenTweaks/UniverseGenTweaks.csproj
@@ -16,7 +16,7 @@
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="DysonSphereProgram.Modding.DSPModSave" Version="1.*" />
  </ItemGroup>

--- a/UserCloak/UserCloak.csproj
+++ b/UserCloak/UserCloak.csproj
@@ -15,10 +15,10 @@
  <ItemGroup>
    <PackageReference Include="BepInEx.Core" Version="5.*" />
    <PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
-    <PackageReference Include="DysonSphereProgram.GameLibs" Version="*-r.*" />
+    <PackageReference Include="DysonSphereProgram.GameLibs" Version="0.10.32.*-r.*" />
    <PackageReference Include="UnityEngine.Modules" Version="2018.4.12" IncludeAssets="compile" />
  </ItemGroup>
-  
+
  <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
  </ItemGroup>
Author	SHA1	Message	Date
Soar Qin	a9dd130f76	try to fix belt signal generation source calculation	2025-08-10 15:34:37 +08:00
Soar Qin	0178c8cc2e	work in progress	2025-08-10 15:16:53 +08:00