soarqin/DSP_Mods
1
0
Fork 0
mirror of https://github.com/soarqin/DSP_Mods.git synced 2026-08-06 04:10:27 +08:00
Code Activity

refactor(CheatEnabler/UniverseGen): consume more centralized constants

Browse Source
This commit is contained in:
soarqin
2026-06-23 20:48:35 +08:00
parent 25b33144b8
commit 1939a9cf22
6 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CheatEnabler/Functions/PlayerFunctions.cs
+13 -12
View File
@@ -1,6 +1,7 @@
using System; using System;
using System.Linq; using System.Linq;
using UXAssist.Common; using UXAssist.Common;
using UXAssist.Common.GameConstants;
using UXAssist.Common.ModFeatures; using UXAssist.Common.ModFeatures;
namespace CheatEnabler.Functions; namespace CheatEnabler.Functions;
@@ -101,10 +102,10 @@ public static class PlayerFunctions
var propertySystem = DSPGame.propertySystem; var propertySystem = DSPGame.propertySystem;
if (propertySystem == null) return; if (propertySystem == null) return;
PurgePropertySystem(propertySystem); PurgePropertySystem(propertySystem);
var itemCnt = new int[6]; var itemCnt = new int[ItemIds.Metaverse - ItemIds.HydrogenFuelRod + 1];
foreach (var cons in propertySystem.propertyDatas.SelectMany(data => data.totalConsumption.Where(cons => cons.id is >= 6001 and <= 6006))) foreach (var cons in propertySystem.propertyDatas.SelectMany(data => data.totalConsumption.Where(cons => cons.id is >= ItemIds.HydrogenFuelRod and <= ItemIds.Metaverse)))
{ {
itemCnt[cons.id - 6001] += cons.count; itemCnt[cons.id - ItemIds.HydrogenFuelRod] += cons.count;
} }
if (itemCnt.All(cnt => cnt == 0)) if (itemCnt.All(cnt => cnt == 0))
@@ -113,11 +114,11 @@ public static class PlayerFunctions
return; return;
} }
var msg = "ClearAllMetadataConsumptionDetails".Translate(); var msg = "ClearAllMetadataConsumptionDetails".Translate();
for (var i = 0; i < 6; i++) for (var i = 0; i < itemCnt.Length; i++)
{ {
if (itemCnt[i] > 0) if (itemCnt[i] > 0)
{ {
msg += $"\n {LDB.items.Select(i + 6001).propertyName} x{itemCnt[i]}"; msg += $"\n {LDB.items.Select(i + ItemIds.HydrogenFuelRod).propertyName} x{itemCnt[i]}";
} }
} }
UIMessageBox.Show("Remove all metadata consumption records".Translate(), msg, "取消".Translate(), "确定".Translate(), UIMessageBox.QUESTION, null, () => UIMessageBox.Show("Remove all metadata consumption records".Translate(), msg, "取消".Translate(), "确定".Translate(), UIMessageBox.QUESTION, null, () =>
@@ -141,7 +142,7 @@ public static class PlayerFunctions
var propertySystem = DSPGame.propertySystem; var propertySystem = DSPGame.propertySystem;
if (propertySystem == null) return; if (propertySystem == null) return;
PurgePropertySystem(propertySystem); PurgePropertySystem(propertySystem);
var itemCnt = new int[6]; var itemCnt = new int[ItemIds.Metaverse - ItemIds.HydrogenFuelRod + 1];
var seedKey = DSPGame.GameDesc.seedKey64; var seedKey = DSPGame.GameDesc.seedKey64;
var clusterPropertyData = propertySystem.propertyDatas.FirstOrDefault(cpd => cpd.seedKey == seedKey); var clusterPropertyData = propertySystem.propertyDatas.FirstOrDefault(cpd => cpd.seedKey == seedKey);
if (clusterPropertyData == null) if (clusterPropertyData == null)
@@ -150,9 +151,9 @@ public static class PlayerFunctions
return; return;
} }
var currentGamePropertyData = GameMain.data.history.propertyData; var currentGamePropertyData = GameMain.data.history.propertyData;
foreach (var cons in currentGamePropertyData.totalConsumption.Where(cons => cons.id is >= 6001 and <= 6006)) foreach (var cons in currentGamePropertyData.totalConsumption.Where(cons => cons.id is >= ItemIds.HydrogenFuelRod and <= ItemIds.Metaverse))
{ {
itemCnt[cons.id - 6001] += cons.count; itemCnt[cons.id - ItemIds.HydrogenFuelRod] += cons.count;
} }
if (itemCnt.All(cnt => cnt == 0)) if (itemCnt.All(cnt => cnt == 0))
@@ -161,11 +162,11 @@ public static class PlayerFunctions
return; return;
} }
var msg = "ClearCurrentMetadataConsumptionDetails".Translate(); var msg = "ClearCurrentMetadataConsumptionDetails".Translate();
for (var i = 0; i < 6; i++) for (var i = 0; i < itemCnt.Length; i++)
{ {
if (itemCnt[i] > 0) if (itemCnt[i] > 0)
{ {
msg += $"\n {LDB.items.Select(i + 6001).propertyName} x{itemCnt[i]}"; msg += $"\n {LDB.items.Select(i + ItemIds.HydrogenFuelRod).propertyName} x{itemCnt[i]}";
} }
} }
UIMessageBox.Show("Remove metadata consumption record in current game".Translate(), msg, "取消".Translate(), "确定".Translate(), UIMessageBox.QUESTION, null, () => UIMessageBox.Show("Remove metadata consumption record in current game".Translate(), msg, "取消".Translate(), "确定".Translate(), UIMessageBox.QUESTION, null, () =>
@@ -174,8 +175,8 @@ public static class PlayerFunctions
{ {
if (clusterPropertyData.totalConsumption[i].count == 0) continue; if (clusterPropertyData.totalConsumption[i].count == 0) continue;
var id = clusterPropertyData.totalConsumption[i].id; var id = clusterPropertyData.totalConsumption[i].id;
if (id < 6001 || id > 6006) continue; if (id < ItemIds.HydrogenFuelRod || id > ItemIds.Metaverse) continue;
var currentGameCount = itemCnt[id - 6001]; var currentGameCount = itemCnt[id - ItemIds.HydrogenFuelRod];
if (currentGameCount == 0) continue; if (currentGameCount == 0) continue;
var totalCount = clusterPropertyData.totalConsumption[i].count; var totalCount = clusterPropertyData.totalConsumption[i].count;
clusterPropertyData.totalConsumption[i] = new IDCNT(id, totalCount > currentGameCount ? totalCount - currentGameCount : 0); clusterPropertyData.totalConsumption[i] = new IDCNT(id, totalCount > currentGameCount ? totalCount - currentGameCount : 0);
CheatEnabler/Patches/Factory/BeltSignalPatch.cs
+1 -1
View File
@@ -246,7 +246,7 @@ internal class BeltSignalGenerator : PatchImpl<BeltSignalGenerator>
if (result.TryGetValue(ItemIds.ProliferatorMkIII, out var pv)) if (result.TryGetValue(ItemIds.ProliferatorMkIII, out var pv))
{ {
proliferatorCount = pv; proliferatorCount = pv;
result.Remove(1143); result.Remove(ItemIds.ProliferatorMkIII);
} }
if (FactoryPatch.BeltSignalUseProliferatorEnabled.Value) if (FactoryPatch.BeltSignalUseProliferatorEnabled.Value)
{ {
UniverseGenTweaks/EpicDifficulty.cs
+4 -3
View File
@@ -5,6 +5,7 @@ using BepInEx.Configuration;
using HarmonyLib; using HarmonyLib;
using UnityEngine.UI; using UnityEngine.UI;
using UXAssist.Common; using UXAssist.Common;
using UXAssist.Common.GameConstants;
using UXAssist.Common.ModFeatures; using UXAssist.Common.ModFeatures;
namespace UniverseGenTweaks; namespace UniverseGenTweaks;
@@ -87,7 +88,7 @@ public static class EpicDifficulty
[HarmonyPatch(typeof(UIGalaxySelect), nameof(UIGalaxySelect._OnInit))] [HarmonyPatch(typeof(UIGalaxySelect), nameof(UIGalaxySelect._OnInit))]
private static void PatchGalaxyUI_OnInit(UIGalaxySelect __instance) private static void PatchGalaxyUI_OnInit(UIGalaxySelect __instance)
{ {
__instance.resourceMultiplierSlider.maxValue = 11f; __instance.resourceMultiplierSlider.maxValue = UniverseGenConstants.ResourceMultiplierSliderMax;
} }
[HarmonyPrefix] [HarmonyPrefix]
@@ -165,10 +166,10 @@ public static class EpicDifficulty
matcher.Start().InsertAndAdvance( matcher.Start().InsertAndAdvance(
new CodeInstruction(OpCodes.Ldarg_0), new CodeInstruction(OpCodes.Ldarg_0),
new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(GameDesc), nameof(GameDesc.resourceMultiplier))), new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(GameDesc), nameof(GameDesc.resourceMultiplier))),
new CodeInstruction(OpCodes.Ldc_R4, 0.05f), new CodeInstruction(OpCodes.Ldc_R4, UniverseGenConstants.OilMultiplierThreshold),
new CodeInstruction(OpCodes.Ble_S, label1) new CodeInstruction(OpCodes.Ble_S, label1)
).End().Advance(1).Insert( ).End().Advance(1).Insert(
new CodeInstruction(OpCodes.Ldc_R4, 0.5f * OilMultiplier.Value).WithLabels(label1), new CodeInstruction(OpCodes.Ldc_R4, UniverseGenConstants.OilMultiplierBase * OilMultiplier.Value).WithLabels(label1),
new CodeInstruction(OpCodes.Ret) new CodeInstruction(OpCodes.Ret)
); );
} }
UniverseGenTweaks/Patches/GalaxySelectUIPatch.cs
+25 -25
View File
@@ -80,15 +80,15 @@ public static class GalaxySelectUIPatch
_maxStepTitle.name = "max-step"; _maxStepTitle.name = "max-step";
_flattenTitle.name = "flatten"; _flattenTitle.name = "flatten";
TransformDeltaY(_minDistTitle.transform, -36f); TransformDeltaY(_minDistTitle.transform, UniverseGenConstants.SliderRowSpacing);
TransformDeltaY(_minStepTitle.transform, -36f * 2); TransformDeltaY(_minStepTitle.transform, UniverseGenConstants.SliderRowSpacing * 2);
TransformDeltaY(_maxStepTitle.transform, -36f * 3); TransformDeltaY(_maxStepTitle.transform, UniverseGenConstants.SliderRowSpacing * 3);
TransformDeltaY(_flattenTitle.transform, -36f * 4); TransformDeltaY(_flattenTitle.transform, UniverseGenConstants.SliderRowSpacing * 4);
TransformDeltaY(__instance.darkFogToggle.transform.parent, -36f * 4); TransformDeltaY(__instance.darkFogToggle.transform.parent, UniverseGenConstants.SliderRowSpacing * 4);
TransformDeltaY(__instance.resourceMultiplierSlider.transform.parent, -36f * 4); TransformDeltaY(__instance.resourceMultiplierSlider.transform.parent, UniverseGenConstants.SliderRowSpacing * 4);
TransformDeltaY(__instance.sandboxToggle.transform.parent, -36f * 4); TransformDeltaY(__instance.sandboxToggle.transform.parent, UniverseGenConstants.SliderRowSpacing * 4);
TransformDeltaY(__instance.propertyMultiplierText.transform, -36f * 4); TransformDeltaY(__instance.propertyMultiplierText.transform, UniverseGenConstants.SliderRowSpacing * 4);
TransformDeltaY(__instance.addrText.transform.parent, -36f * 4); TransformDeltaY(__instance.addrText.transform.parent, UniverseGenConstants.SliderRowSpacing * 4);
RemoveAllListeners(); RemoveAllListeners();
UpdateSliderControls(); UpdateSliderControls();
@@ -138,21 +138,21 @@ public static class GalaxySelectUIPatch
private static void UpdateSliderControls() private static void UpdateSliderControls()
{ {
_minDistSlider.minValue = 10f; _minDistSlider.minValue = UniverseGenConstants.MinDistSliderMin;
_minDistSlider.maxValue = 50f; _minDistSlider.maxValue = UniverseGenConstants.MinDistSliderMax;
_minDistSlider.value = (float)(GalaxyGenSettingsPatch.MinDist * 10.0); _minDistSlider.value = (float)(GalaxyGenSettingsPatch.MinDist * UniverseGenConstants.StepSliderScale);
_minStepSlider.minValue = (float)(GalaxyGenSettingsPatch.MinDist * 10.0); _minStepSlider.minValue = (float)(GalaxyGenSettingsPatch.MinDist * UniverseGenConstants.StepSliderScale);
_minStepSlider.maxValue = (float)(GalaxyGenSettingsPatch.MaxStep * 10.0); _minStepSlider.maxValue = (float)(GalaxyGenSettingsPatch.MaxStep * UniverseGenConstants.StepSliderScale);
_minStepSlider.value = (float)(GalaxyGenSettingsPatch.MinStep * 10.0); _minStepSlider.value = (float)(GalaxyGenSettingsPatch.MinStep * UniverseGenConstants.StepSliderScale);
_maxStepSlider.minValue = (float)(GalaxyGenSettingsPatch.MinStep * 10.0); _maxStepSlider.minValue = (float)(GalaxyGenSettingsPatch.MinStep * UniverseGenConstants.StepSliderScale);
_maxStepSlider.maxValue = 100f; _maxStepSlider.maxValue = UniverseGenConstants.MaxStepSliderMax;
_maxStepSlider.value = (float)(GalaxyGenSettingsPatch.MaxStep * 10.0); _maxStepSlider.value = (float)(GalaxyGenSettingsPatch.MaxStep * UniverseGenConstants.StepSliderScale);
_flattenSlider.minValue = 1f; _flattenSlider.minValue = UniverseGenConstants.FlattenSliderMin;
_flattenSlider.maxValue = 50f; _flattenSlider.maxValue = UniverseGenConstants.FlattenSliderMax;
_flattenSlider.value = (float)(GalaxyGenSettingsPatch.Flatten * 50.0); _flattenSlider.value = (float)(GalaxyGenSettingsPatch.Flatten * UniverseGenConstants.FlattenSliderScale);
_minDistText.text = GalaxyGenSettingsPatch.MinDist.ToString(); _minDistText.text = GalaxyGenSettingsPatch.MinDist.ToString();
_minStepText.text = GalaxyGenSettingsPatch.MinStep.ToString(); _minStepText.text = GalaxyGenSettingsPatch.MinStep.ToString();
@@ -174,7 +174,7 @@ public static class GalaxySelectUIPatch
{ {
_minDistSlider.onValueChanged.AddListener(val => _minDistSlider.onValueChanged.AddListener(val =>
{ {
var newVal = Mathf.Round(val) / 10.0; var newVal = Mathf.Round(val) / UniverseGenConstants.StepSliderScale;
if (newVal.Equals(GalaxyGenSettingsPatch.MinDist)) return; if (newVal.Equals(GalaxyGenSettingsPatch.MinDist)) return;
GalaxyGenSettingsPatch.MinDist = newVal; GalaxyGenSettingsPatch.MinDist = newVal;
_minDistText.text = GalaxyGenSettingsPatch.MinDist.ToString(); _minDistText.text = GalaxyGenSettingsPatch.MinDist.ToString();
@@ -195,7 +195,7 @@ public static class GalaxySelectUIPatch
}); });
_minStepSlider.onValueChanged.AddListener(val => _minStepSlider.onValueChanged.AddListener(val =>
{ {
var newVal = Mathf.Round(val) / 10.0; var newVal = Mathf.Round(val) / UniverseGenConstants.StepSliderScale;
if (newVal.Equals(GalaxyGenSettingsPatch.MinStep)) return; if (newVal.Equals(GalaxyGenSettingsPatch.MinStep)) return;
GalaxyGenSettingsPatch.MinStep = newVal; GalaxyGenSettingsPatch.MinStep = newVal;
_maxStepSlider.minValue = (float)(newVal * 10.0); _maxStepSlider.minValue = (float)(newVal * 10.0);
@@ -204,7 +204,7 @@ public static class GalaxySelectUIPatch
}); });
_maxStepSlider.onValueChanged.AddListener(val => _maxStepSlider.onValueChanged.AddListener(val =>
{ {
var newVal = Mathf.Round(val) / 10.0; var newVal = Mathf.Round(val) / UniverseGenConstants.StepSliderScale;
if (newVal.Equals(GalaxyGenSettingsPatch.MaxStep)) return; if (newVal.Equals(GalaxyGenSettingsPatch.MaxStep)) return;
GalaxyGenSettingsPatch.MaxStep = newVal; GalaxyGenSettingsPatch.MaxStep = newVal;
_minStepSlider.maxValue = (float)(newVal * 10.0); _minStepSlider.maxValue = (float)(newVal * 10.0);
@@ -213,7 +213,7 @@ public static class GalaxySelectUIPatch
}); });
_flattenSlider.onValueChanged.AddListener(val => _flattenSlider.onValueChanged.AddListener(val =>
{ {
var newVal = Mathf.Round(val) / 50.0; var newVal = Mathf.Round(val) / UniverseGenConstants.FlattenSliderScale;
if (newVal.Equals(GalaxyGenSettingsPatch.Flatten)) return; if (newVal.Equals(GalaxyGenSettingsPatch.Flatten)) return;
GalaxyGenSettingsPatch.Flatten = newVal; GalaxyGenSettingsPatch.Flatten = newVal;
_flattenText.text = GalaxyGenSettingsPatch.Flatten.ToString(); _flattenText.text = GalaxyGenSettingsPatch.Flatten.ToString();
UniverseGenTweaks/UIConfigWindow.cs
+3 -2
View File
@@ -1,6 +1,7 @@
using UnityEngine; using UnityEngine;
using UXAssist.UI; using UXAssist.UI;
using UXAssist.Common; using UXAssist.Common;
using UXAssist.Common.GameConstants;
namespace UniverseGenTweaks; namespace UniverseGenTweaks;
@@ -51,10 +52,10 @@ public static class UIConfigWindow
MyWindow.AddText(x, y, tab1, "Maximum star count", 16); MyWindow.AddText(x, y, tab1, "Maximum star count", 16);
x += 20f; x += 20f;
y += 26f; y += 26f;
var sl0 = MySlider.CreateSlider(x, y, tab1, MoreSettings.MaxStarCount.Value, 64f, 1024f, "G", 240f); var sl0 = MySlider.CreateSlider(x, y, tab1, MoreSettings.MaxStarCount.Value, UniverseGenConstants.StarCountSliderMin, UniverseGenConstants.StarCountSliderMax, "G", 240f);
sl0.OnValueChanged += () => sl0.OnValueChanged += () =>
{ {
sl0.Value = MoreSettings.MaxStarCount.Value = (Mathf.RoundToInt(sl0.Value) + 7) & ~7; sl0.Value = MoreSettings.MaxStarCount.Value = (Mathf.RoundToInt(sl0.Value) + UniverseGenConstants.StarCountAlignmentMask) & ~UniverseGenConstants.StarCountAlignmentMask;
}; };
x -= 30f; x -= 30f;
y += 36f; y += 36f;
UniverseGenTweaks/UniverseGenTweaks.cs
+4 -3
View File
@@ -3,6 +3,7 @@ using System.Reflection;
using BepInEx; using BepInEx;
using BepInEx.Configuration; using BepInEx.Configuration;
using crecheng.DSPModSave; using crecheng.DSPModSave;
using UXAssist.Common.GameConstants;
using UXAssist.Common.ModFeatures; using UXAssist.Common.ModFeatures;
namespace UniverseGenTweaks; namespace UniverseGenTweaks;
@@ -19,9 +20,9 @@ public class UniverseGenTweaks : BaseUnityPlugin, IModCanSave
private void Awake() private void Awake()
{ {
MoreSettings.Enabled = Config.Bind("MoreSettings", "Enabled", true, "Enable more settings on Universe Generation"); MoreSettings.Enabled = Config.Bind("MoreSettings", "Enabled", true, "Enable more settings on Universe Generation");
MoreSettings.MaxStarCount = Config.Bind("MoreSettings", "MaxStarCount", 128, MoreSettings.MaxStarCount = Config.Bind("MoreSettings", "MaxStarCount", UniverseGenConstants.DefaultMaxStarCount,
new ConfigDescription("(32 ~ 1024)\nMaximum star count for Universe Generation, enable MoreSettings.Enabled to take effect", new ConfigDescription($"({UniverseGenConstants.MinStarCount} ~ {UniverseGenConstants.MaxStarCount})\nMaximum star count for Universe Generation, enable MoreSettings.Enabled to take effect",
new AcceptableValueRange<int>(32, 1024), new { })); new AcceptableValueRange<int>(UniverseGenConstants.MinStarCount, UniverseGenConstants.MaxStarCount), new { }));
EpicDifficulty.Enabled = Config.Bind("EpicDifficulty", "Enabled", true, "Enable Epic difficulty"); EpicDifficulty.Enabled = Config.Bind("EpicDifficulty", "Enabled", true, "Enable Epic difficulty");
EpicDifficulty.ResourceMultiplier = Config.Bind("EpicDifficulty", "ResourceMultiplier", 0.01f, EpicDifficulty.ResourceMultiplier = Config.Bind("EpicDifficulty", "ResourceMultiplier", 0.01f,