mirror of
https://github.com/soarqin/DSP_Mods.git
synced 2026-11-19 17:05:20 +08:00
refactor: remove single-owner helpers and redundant plumbing
Return feature-only helpers to their owners, remove inactive scaffolding and duplicate state, and reuse existing calculation and UI work without changing public contracts or gameplay. Record repository-wide coverage, justified retentions, independent reviews and validation, including baseline dashboard fixture failures. Assisted-by: Cindy (https://cindy.app)
This commit is contained in:
1 parent
64a23e9772
commit
e35fba88ae
60 files changed
+1094
-994
No files matched your search
@@ -1,9 +1,7 @@
|
||||
using System.IO;
|
||||
using UXAssist.Common.ModFeatures;
|
||||
|
||||
namespace UniverseGenTweaks;
|
||||
|
||||
[ModFeature("UniverseGenSave", Order = 13)]
|
||||
public static class GalaxyGenSave
|
||||
{
|
||||
public static void Export(BinaryWriter w)
|
||||
|
||||
@@ -12,10 +12,6 @@ namespace UniverseGenTweaks;
|
||||
[ModFeature("UniverseGenGalaxySelectUI", Order = 10)]
|
||||
public static class GalaxySelectUIPatch
|
||||
{
|
||||
private static Text _minDistTitle;
|
||||
private static Text _minStepTitle;
|
||||
private static Text _maxStepTitle;
|
||||
private static Text _flattenTitle;
|
||||
private static Slider _minDistSlider;
|
||||
private static Slider _minStepSlider;
|
||||
private static Slider _maxStepSlider;
|
||||
@@ -62,28 +58,28 @@ public static class GalaxySelectUIPatch
|
||||
{
|
||||
__instance.starCountSlider.maxValue = MoreSettings.MaxStarCount.Value;
|
||||
|
||||
CreateSliderWithText(__instance.starCountSlider, out _minDistTitle, out _minDistSlider, out _minDistText, out var minDistLocalizer);
|
||||
CreateSliderWithText(__instance.starCountSlider, out _minStepTitle, out _minStepSlider, out _minStepText, out var minStepLocalizer);
|
||||
CreateSliderWithText(__instance.starCountSlider, out _maxStepTitle, out _maxStepSlider, out _maxStepText, out var maxStepLocalizer);
|
||||
CreateSliderWithText(__instance.starCountSlider, out _flattenTitle, out _flattenSlider, out _flattenText, out var flattenLocalizer);
|
||||
CreateSliderWithText(__instance.starCountSlider, out var minDistTitle, out _minDistSlider, out _minDistText, out var minDistLocalizer);
|
||||
CreateSliderWithText(__instance.starCountSlider, out var minStepTitle, out _minStepSlider, out _minStepText, out var minStepLocalizer);
|
||||
CreateSliderWithText(__instance.starCountSlider, out var maxStepTitle, out _maxStepSlider, out _maxStepText, out var maxStepLocalizer);
|
||||
CreateSliderWithText(__instance.starCountSlider, out var flattenTitle, out _flattenSlider, out _flattenText, out var flattenLocalizer);
|
||||
minDistLocalizer.stringKey = Localization.StarDistanceMin;
|
||||
_minDistTitle.text = Localization.StarDistanceMin.Translate();
|
||||
minDistTitle.text = Localization.StarDistanceMin.Translate();
|
||||
minStepLocalizer.stringKey = Localization.StepDistanceMin;
|
||||
_minStepTitle.text = Localization.StepDistanceMin.Translate();
|
||||
minStepTitle.text = Localization.StepDistanceMin.Translate();
|
||||
maxStepLocalizer.stringKey = Localization.StepDistanceMax;
|
||||
_maxStepTitle.text = Localization.StepDistanceMax.Translate();
|
||||
maxStepTitle.text = Localization.StepDistanceMax.Translate();
|
||||
flattenLocalizer.stringKey = Localization.Flatness;
|
||||
_flattenTitle.text = Localization.Flatness.Translate();
|
||||
flattenTitle.text = Localization.Flatness.Translate();
|
||||
|
||||
_minDistTitle.name = "min-dist";
|
||||
_minStepTitle.name = "min-step";
|
||||
_maxStepTitle.name = "max-step";
|
||||
_flattenTitle.name = "flatten";
|
||||
minDistTitle.name = "min-dist";
|
||||
minStepTitle.name = "min-step";
|
||||
maxStepTitle.name = "max-step";
|
||||
flattenTitle.name = "flatten";
|
||||
|
||||
TransformDeltaY(_minDistTitle.transform, UniverseGenConstants.SliderRowSpacing);
|
||||
TransformDeltaY(_minStepTitle.transform, UniverseGenConstants.SliderRowSpacing * 2);
|
||||
TransformDeltaY(_maxStepTitle.transform, UniverseGenConstants.SliderRowSpacing * 3);
|
||||
TransformDeltaY(_flattenTitle.transform, UniverseGenConstants.SliderRowSpacing * 4);
|
||||
TransformDeltaY(minDistTitle.transform, UniverseGenConstants.SliderRowSpacing);
|
||||
TransformDeltaY(minStepTitle.transform, UniverseGenConstants.SliderRowSpacing * 2);
|
||||
TransformDeltaY(maxStepTitle.transform, UniverseGenConstants.SliderRowSpacing * 3);
|
||||
TransformDeltaY(flattenTitle.transform, UniverseGenConstants.SliderRowSpacing * 4);
|
||||
TransformDeltaY(__instance.darkFogToggle.transform.parent, UniverseGenConstants.SliderRowSpacing * 4);
|
||||
TransformDeltaY(__instance.resourceMultiplierSlider.transform.parent, UniverseGenConstants.SliderRowSpacing * 4);
|
||||
TransformDeltaY(__instance.sandboxToggle.transform.parent, UniverseGenConstants.SliderRowSpacing * 4);
|
||||
@@ -113,10 +109,7 @@ public static class GalaxySelectUIPatch
|
||||
[HarmonyPatch(typeof(UIGalaxySelect), nameof(UIGalaxySelect._OnUnregEvent))]
|
||||
private static void UIGalaxySelect__OnUnregEvent_Postfix()
|
||||
{
|
||||
_minDistSlider.onValueChanged.RemoveAllListeners();
|
||||
_minStepSlider.onValueChanged.RemoveAllListeners();
|
||||
_maxStepSlider.onValueChanged.RemoveAllListeners();
|
||||
_flattenSlider.onValueChanged.RemoveAllListeners();
|
||||
RemoveAllListeners();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,8 +7,6 @@ namespace UniverseGenTweaks;
|
||||
|
||||
public static class UIConfigWindow
|
||||
{
|
||||
private static RectTransform _windowTrans;
|
||||
|
||||
public static void Init()
|
||||
{
|
||||
MyConfigWindow.OnUICreated += CreateUI;
|
||||
@@ -16,13 +14,12 @@ public static class UIConfigWindow
|
||||
|
||||
private static void CreateUI(MyConfigWindow wnd, RectTransform trans)
|
||||
{
|
||||
_windowTrans = trans;
|
||||
// General tab
|
||||
var x = 0f;
|
||||
var y = 10f;
|
||||
wnd.AddSplitter(trans, 10f);
|
||||
wnd.AddTabGroup(trans, Localization.UniverseGen, "tab-group-galaxygen");
|
||||
var tab1 = wnd.AddTab(_windowTrans, "General");
|
||||
var tab1 = wnd.AddTab(trans, "General");
|
||||
MyCheckBox.CreateCheckBox(x, y, tab1, MoreSettings.Enabled, Localization.EnableMoreSettingsOnUniverseGen);
|
||||
x += 20f;
|
||||
y += 26f;
|
||||
@@ -70,7 +67,7 @@ public static class UIConfigWindow
|
||||
EpicDifficulty.OilMultiplier.Value = val;
|
||||
sl2.SetLabelText(val.ToString(sl2.labelFormat));
|
||||
};
|
||||
var tab2 = wnd.AddTab(_windowTrans, Localization.BirthStar);
|
||||
var tab2 = wnd.AddTab(trans, Localization.BirthStar);
|
||||
x = 0f;
|
||||
y = 10f;
|
||||
MyCheckBox.CreateCheckBox(x, y, tab2, BirthPlanetPatch.SitiVeinsOnBirthPlanet, Localization.SiliconTitaniumOnBirthPlanet);
|
||||
@@ -94,4 +91,4 @@ public static class UIConfigWindow
|
||||
y += 36f;
|
||||
MyCheckBox.CreateCheckBox(x, y, tab2, BirthPlanetPatch.HighLuminosityBirthStar, Localization.BirthStarHasHighLuminosity);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user