soarqin/DSP_Mods
1
0
Fork 0
mirror of https://github.com/soarqin/DSP_Mods.git synced 2025-12-08 20:53:28 +08:00
Code Activity

UniverseGenTweaks 1.2.10

Browse Source
This commit is contained in:
Soar Qin
2025-09-15 14:25:39 +08:00
parent 688b50344c
commit 8446fba0e4
5 changed files with 156 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
UniverseGenTweaks/CHANGELOG.md
View File

@@ -3,6 +3,9 @@
## Changelog ## Changelog
* 1.2.10
* Fix issues which cause universe settings not applied on staring a new game or loading game (again).
* Reset star distance/flatten settings on entering galaxy creation screen.
* 1.2.9 * 1.2.9
* Fix some issues that universe settings not applied on staring a new game or loading game. * Fix some issues that universe settings not applied on staring a new game or loading game.
* Always show Black hole/Neutron star on preview galaxy map while creating new game. * Always show Black hole/Neutron star on preview galaxy map while creating new game.
@@ -43,6 +46,9 @@
## 更新日志 ## 更新日志
* 1.2.10
* (再次)修复新建游戏或加载存档时宇宙设置没有应用的问题
* 进入宇宙创建界面时重置星系间距/扁平度设置
* 1.2.9 * 1.2.9
* 修复了一些在新建游戏或加载存档时宇宙设置没有应用的问题 * 修复了一些在新建游戏或加载存档时宇宙设置没有应用的问题
* 在新建游戏时的星系预览图中始终显示黑洞/中子星 * 在新建游戏时的星系预览图中始终显示黑洞/中子星

221
UniverseGenTweaks/MoreSettings.cs
View File

@@ -8,16 +8,27 @@ using UnityEngine.UI;
using UXAssist.Common; using UXAssist.Common;
using Object = UnityEngine.Object; using Object = UnityEngine.Object;
namespace UniverseGenTweaks; namespace UniverseGenTweaks;
public class MoreSettings public class MoreSettings
{ {
const double DEFAULT_MIN_DIST = 2;
const double DEFAULT_MIN_STEP = 2;
const double DEFAULT_MAX_STEP = 3.2;
const double DEFAULT_FLATTEN = 0.18;
public static ConfigEntry<bool> Enabled; public static ConfigEntry<bool> Enabled;
public static ConfigEntry<int> MaxStarCount; public static ConfigEntry<int> MaxStarCount;
private static double _minDist = 2; private static double _minDist = DEFAULT_MIN_DIST;
private static double _minStep = 2; private static double _minStep = DEFAULT_MIN_STEP;
private static double _maxStep = 3.2; private static double _maxStep = DEFAULT_MAX_STEP;
private static double _flatten = 0.18; private static double _flatten = DEFAULT_FLATTEN;
private static double _gameMinDist = DEFAULT_MIN_DIST;
private static double _gameMinStep = DEFAULT_MIN_STEP;
private static double _gameMaxStep = DEFAULT_MAX_STEP;
private static double _gameFlatten = DEFAULT_FLATTEN;
private static Text _minDistTitle; private static Text _minDistTitle;
private static Text _minStepTitle; private static Text _minStepTitle;
@@ -33,11 +44,6 @@ public class MoreSettings
private static Text _flattenText; private static Text _flattenText;
private static Harmony _patch, _permanentPatch; private static Harmony _patch, _permanentPatch;
private static double _gameMinDist = 2;
private static double _gameMinStep = 2;
private static double _gameMaxStep = 3.2;
private static double _gameFlatten = 0.18;
public static void Init() public static void Init()
{ {
I18N.Add("恒星最小距离", "Star Distance Min", "恒星最小距离"); I18N.Add("恒星最小距离", "Star Distance Min", "恒星最小距离");
@@ -87,6 +93,33 @@ public class MoreSettings
((RectTransform)trans).anchoredPosition3D = pos; ((RectTransform)trans).anchoredPosition3D = pos;
} }
private static void UpdateSliderControls()
{
_minDistSlider.minValue = 10f;
_minDistSlider.maxValue = 50f;
_minDistSlider.value = (float)(_minDist * 10.0);
_minStepTitle.name = "min-step";
_minStepSlider.minValue = (float)(_minDist * 10.0);
_minStepSlider.maxValue = (float)(_maxStep * 10.0);
_minStepSlider.value = (float)(_minStep * 10.0);
_maxStepTitle.name = "max-step";
_maxStepSlider.minValue = (float)(_minStep * 10.0);
_maxStepSlider.maxValue = 100f;
_maxStepSlider.value = (float)(_maxStep * 10.0);
_flattenTitle.name = "flatten";
_flattenSlider.minValue = 1f;
_flattenSlider.maxValue = 50f;
_flattenSlider.value = (float)(_flatten * 50.0);
_minDistText.text = _minDist.ToString();
_minStepText.text = _minStep.ToString();
_maxStepText.text = _maxStep.ToString();
_flattenText.text = _flatten.ToString();
}
[HarmonyPostfix] [HarmonyPostfix]
[HarmonyPatch(typeof(UIGalaxySelect), nameof(UIGalaxySelect._OnCreate))] [HarmonyPatch(typeof(UIGalaxySelect), nameof(UIGalaxySelect._OnCreate))]
private static void UIGalaxySelect__OnCreate_Postfix(UIGalaxySelect __instance) private static void UIGalaxySelect__OnCreate_Postfix(UIGalaxySelect __instance)
@@ -108,12 +141,12 @@ public class MoreSettings
_minDistSlider.value = (float)(_minDist * 10.0); _minDistSlider.value = (float)(_minDist * 10.0);
_minStepTitle.name = "min-step"; _minStepTitle.name = "min-step";
_minStepSlider.minValue = 10f; _minStepSlider.minValue = (float)(_minDist * 10.0);
_minStepSlider.maxValue = (float)(_maxStep * 10.0 - 1.0); _minStepSlider.maxValue = (float)(_maxStep * 10.0);
_minStepSlider.value = (float)(_minStep * 10.0); _minStepSlider.value = (float)(_minStep * 10.0);
_maxStepTitle.name = "max-step"; _maxStepTitle.name = "max-step";
_maxStepSlider.minValue = (float)(_minStep * 10.0 + 1.0); _maxStepSlider.minValue = (float)(_minStep * 10.0);
_maxStepSlider.maxValue = 100f; _maxStepSlider.maxValue = 100f;
_maxStepSlider.value = (float)(_maxStep * 10.0); _maxStepSlider.value = (float)(_maxStep * 10.0);
@@ -137,15 +170,12 @@ public class MoreSettings
[HarmonyPatch(typeof(UIGalaxySelect), nameof(UIGalaxySelect._OnOpen))] [HarmonyPatch(typeof(UIGalaxySelect), nameof(UIGalaxySelect._OnOpen))]
private static void UIGalaxySelect__OnOpen_Prefix() private static void UIGalaxySelect__OnOpen_Prefix()
{ {
_gameMinDist = _minDist; _minDist = DEFAULT_MIN_DIST;
_gameMinStep = _minStep; _minStep = DEFAULT_MIN_STEP;
_gameMaxStep = _maxStep; _maxStep = DEFAULT_MAX_STEP;
_gameFlatten = _flatten; _flatten = DEFAULT_FLATTEN;
_minDistText.text = _minDist.ToString(); UpdateSliderControls();
_minStepText.text = _minStep.ToString();
_maxStepText.text = _maxStep.ToString();
_flattenText.text = _flatten.ToString();
} }
[HarmonyPostfix] [HarmonyPostfix]
@@ -157,20 +187,21 @@ public class MoreSettings
{ {
var newVal = Mathf.Round(val) / 10.0; var newVal = Mathf.Round(val) / 10.0;
if (newVal.Equals(_minDist)) return; if (newVal.Equals(_minDist)) return;
_minDist = _gameMinDist = newVal; _minDist = newVal;
_minDistText.text = _minDist.ToString(); _minDistText.text = _minDist.ToString();
if (_minStep < _minDist) if (_minStep < _minDist)
{ {
_minStep = _gameMinStep = _minDist; _minStep = _minDist;
_minStepSlider.value = (float)(_minStep * 10.0); _minStepSlider.value = (float)(_minStep * 10.0);
_minStepText.text = _minStep.ToString(); _minStepText.text = _minStep.ToString();
if (_maxStep < _minStep) if (_maxStep < _minStep)
{ {
_maxStep = _gameMaxStep = _minStep; _maxStep = _minStep;
_maxStepSlider.value = (float)(_maxStep * 10.0); _maxStepSlider.value = (float)(_maxStep * 10.0);
_maxStepText.text = _maxStep.ToString(); _maxStepText.text = _maxStep.ToString();
} }
} }
_minStepSlider.minValue = (float)(_minDist * 10.0);
__instance.SetStarmapGalaxy(); __instance.SetStarmapGalaxy();
}); });
_minStepSlider.onValueChanged.RemoveAllListeners(); _minStepSlider.onValueChanged.RemoveAllListeners();
@@ -178,7 +209,7 @@ public class MoreSettings
{ {
var newVal = Mathf.Round(val) / 10.0; var newVal = Mathf.Round(val) / 10.0;
if (newVal.Equals(_minStep)) return; if (newVal.Equals(_minStep)) return;
_minStep = _gameMinStep = newVal; _minStep = newVal;
_maxStepSlider.minValue = (float)(newVal * 10.0); _maxStepSlider.minValue = (float)(newVal * 10.0);
_minStepText.text = _minStep.ToString(); _minStepText.text = _minStep.ToString();
__instance.SetStarmapGalaxy(); __instance.SetStarmapGalaxy();
@@ -188,7 +219,7 @@ public class MoreSettings
{ {
var newVal = Mathf.Round(val) / 10.0; var newVal = Mathf.Round(val) / 10.0;
if (newVal.Equals(_maxStep)) return; if (newVal.Equals(_maxStep)) return;
_maxStep = _gameMaxStep = newVal; _maxStep = newVal;
_minStepSlider.maxValue = (float)(newVal * 10.0); _minStepSlider.maxValue = (float)(newVal * 10.0);
_maxStepText.text = _maxStep.ToString(); _maxStepText.text = _maxStep.ToString();
__instance.SetStarmapGalaxy(); __instance.SetStarmapGalaxy();
@@ -198,7 +229,7 @@ public class MoreSettings
{ {
var newVal = Mathf.Round(val) / 50.0; var newVal = Mathf.Round(val) / 50.0;
if (newVal.Equals(_flatten)) return; if (newVal.Equals(_flatten)) return;
_flatten = _gameFlatten = newVal; _flatten = newVal;
_flattenText.text = _flatten.ToString(); _flattenText.text = _flatten.ToString();
__instance.SetStarmapGalaxy(); __instance.SetStarmapGalaxy();
}); });
@@ -230,20 +261,31 @@ public class MoreSettings
private static class PermanentPatch private static class PermanentPatch
{ {
public static void ResetSettings()
[HarmonyPrefix]
[HarmonyPatch(typeof(GameMain), nameof(GameMain.Start))]
private static void GameMain_Start_Prefix()
{ {
_gameMinDist = 2; _gameMinDist = DEFAULT_MIN_DIST;
_gameMinStep = 2; _gameMinStep = DEFAULT_MIN_STEP;
_gameMaxStep = 3.2; _gameMaxStep = DEFAULT_MAX_STEP;
_gameFlatten = 0.18; _gameFlatten = DEFAULT_FLATTEN;
} }
[HarmonyPrefix] [HarmonyPrefix]
[HarmonyPatch(typeof(GameData), nameof(GameData.SetForNewGame))] [HarmonyPatch(typeof(GameData), nameof(GameData.NewGame))]
private static void GameData_SetForNewGame_Prefix(GameData __instance) private static void GameData_NewGame_Prefix()
{ {
if (Enabled.Value) return; if (!Enabled.Value) return;
ResetSettings(); _gameMinDist = _minDist;
_gameMinStep = _minStep;
_gameMaxStep = _maxStep;
_gameFlatten = _flatten;
_minDist = DEFAULT_MIN_DIST;
_minStep = DEFAULT_MIN_STEP;
_maxStep = DEFAULT_MAX_STEP;
_flatten = DEFAULT_FLATTEN;
} }
[HarmonyTranspiler] [HarmonyTranspiler]
@@ -278,14 +320,26 @@ public class MoreSettings
private static IEnumerable<CodeInstruction> UniverseGen_CreateGalaxy_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator) private static IEnumerable<CodeInstruction> UniverseGen_CreateGalaxy_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
{ {
var matcher = new CodeMatcher(instructions, generator); var matcher = new CodeMatcher(instructions, generator);
var b0 = generator.DefineLabel();
var b1 = generator.DefineLabel();
matcher.MatchForward(false, matcher.MatchForward(false,
new CodeMatch(OpCodes.Call, AccessTools.Method(typeof(UniverseGen), nameof(UniverseGen.GenerateTempPoses))) new CodeMatch(OpCodes.Call, AccessTools.Method(typeof(UniverseGen), nameof(UniverseGen.GenerateTempPoses)))
).Advance(-4).RemoveInstructions(4).Insert( ).Advance(-4).RemoveInstructions(4).InsertAndAdvance(
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_gameMinDist))), new CodeInstruction(OpCodes.Call, AccessTools.PropertyGetter(typeof(UIRoot), nameof(UIRoot.instance))),
new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(UIRoot), nameof(UIRoot.galaxySelect))),
new CodeInstruction(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(ManualBehaviour), nameof(ManualBehaviour.active))),
new CodeInstruction(OpCodes.Brfalse, b0),
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_minDist))),
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_minStep))),
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_maxStep))),
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_flatten))),
new CodeInstruction(OpCodes.Br, b1),
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_gameMinDist))).WithLabels(b0),
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_gameMinStep))), new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_gameMinStep))),
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_gameMaxStep))), new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_gameMaxStep))),
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_gameFlatten))) new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(MoreSettings), nameof(_gameFlatten)))
); );
matcher.Labels.Add(b1);
return matcher.InstructionEnumeration(); return matcher.InstructionEnumeration();
} }
@@ -320,8 +374,9 @@ public class MoreSettings
new CodeInstruction(OpCodes.Stloc, local1) new CodeInstruction(OpCodes.Stloc, local1)
).Advance(3).Insert( ).Advance(3).Insert(
new CodeInstruction(OpCodes.Ldloc, local1), new CodeInstruction(OpCodes.Ldloc, local1),
Transpilers.EmitDelegate(bool (UIVirtualStarmap.StarNode starNode) => { Transpilers.EmitDelegate(bool (UIVirtualStarmap.StarNode starNode) =>
return starNode.starData.type switch {
return starNode?.starData?.type switch
{ {
EStarType.NeutronStar or EStarType.BlackHole => true, EStarType.NeutronStar or EStarType.BlackHole => true,
_ => false, _ => false,
@@ -331,6 +386,30 @@ public class MoreSettings
); );
return matcher.InstructionEnumeration(); return matcher.InstructionEnumeration();
} }
[HarmonyTranspiler]
[HarmonyPatch(typeof(UIGalaxySelect), nameof(UIGalaxySelect.UpdateUIDisplay))]
private static IEnumerable<CodeInstruction> UIGalaxySelect_UpdateUIDisplay_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
{
var matcher = new CodeMatcher(instructions, generator);
Label? b1 = null;
matcher.MatchForward(false,
new CodeMatch(OpCodes.Ldc_I4_0),
new CodeMatch(ci => ci.IsStloc()),
new CodeMatch(ci => ci.Branches(out b1)),
new CodeMatch(ci => ci.IsLdloc()),
new CodeMatch(ci => ci.IsLdloc()),
new CodeMatch(OpCodes.Ldelem_Ref),
new CodeMatch(ci => ci.IsStloc()),
new CodeMatch(ci => ci.IsLdloc())
).Advance(7);
var instr = matcher.InstructionAt(0);
matcher.Insert(
instr,
new CodeInstruction(OpCodes.Brfalse, b1!)
);
return matcher.InstructionEnumeration();
}
} }
#region CombatSettings #region CombatSettings
@@ -475,10 +554,10 @@ public class MoreSettings
return false; return false;
} }
[HarmonyPrefix] [HarmonyPrefix]
[HarmonyPatch(typeof(UICombatSettingsDF), nameof(UICombatSettingsDF.OnCombatThreatSliderChanged))] [HarmonyPatch(typeof(UICombatSettingsDF), nameof(UICombatSettingsDF.OnCombatThreatSliderChanged))]
private static bool UICombatSettingsDF_OnCombatThreatSliderChanged_Prefix(UICombatSettingsDF __instance) private static bool UICombatSettingsDF_OnCombatThreatSliderChanged_Prefix(UICombatSettingsDF __instance)
{ {
__instance.combatSettings.battleThreatFactor = __instance.combatThreatSlider.value switch __instance.combatSettings.battleThreatFactor = __instance.combatThreatSlider.value switch
{ {
< 0.5f => 0.01f, < 0.5f => 0.01f,
@@ -494,8 +573,8 @@ public class MoreSettings
_ => 20f _ => 20f
}; };
__instance.UpdateUIParametersDisplay(); __instance.UpdateUIParametersDisplay();
return false; return false;
} }
[HarmonyPrefix] [HarmonyPrefix]
[HarmonyPatch(typeof(UICombatSettingsDF), nameof(UICombatSettingsDF.OnEXPSliderChanged))] [HarmonyPatch(typeof(UICombatSettingsDF), nameof(UICombatSettingsDF.OnEXPSliderChanged))]
@@ -518,12 +597,12 @@ public class MoreSettings
__instance.UpdateUIParametersDisplay(); __instance.UpdateUIParametersDisplay();
return false; return false;
} }
[HarmonyPrefix] [HarmonyPrefix]
[HarmonyPatch(typeof(UICombatSettingsDF), nameof(UICombatSettingsDF.UpdateUIParametersDisplay))] [HarmonyPatch(typeof(UICombatSettingsDF), nameof(UICombatSettingsDF.UpdateUIParametersDisplay))]
private static bool UICombatSettingsDF_UpdateUIParametersDisplay_Prefix(UICombatSettingsDF __instance) private static bool UICombatSettingsDF_UpdateUIParametersDisplay_Prefix(UICombatSettingsDF __instance)
{ {
var text = ""; var text = "";
__instance.aggresiveSlider.value = __instance.combatSettings.aggressiveness switch __instance.aggresiveSlider.value = __instance.combatSettings.aggressiveness switch
{ {
< -0.99f => 0f, < -0.99f => 0f,
@@ -544,7 +623,7 @@ public class MoreSettings
_ => text _ => text
}; };
__instance.aggresiveText.text = text; __instance.aggresiveText.text = text;
var num = __instance.combatSettings.initialLevel; var num = __instance.combatSettings.initialLevel;
__instance.initLevelSlider.value = num switch __instance.initLevelSlider.value = num switch
{ {
< 0.01f => 0f, < 0.01f => 0f,
@@ -580,7 +659,7 @@ public class MoreSettings
_ => 30f _ => 30f
}; };
__instance.initLevelText.text = num.ToString(); __instance.initLevelText.text = num.ToString();
num = __instance.combatSettings.initialGrowth; num = __instance.combatSettings.initialGrowth;
__instance.initGrowthSlider.value = num switch __instance.initGrowthSlider.value = num switch
{ {
< 0.01f => 0f, < 0.01f => 0f,
@@ -597,7 +676,7 @@ public class MoreSettings
}; };
text = num * 100f + "%"; text = num * 100f + "%";
__instance.initGrowthText.text = text; __instance.initGrowthText.text = text;
num = __instance.combatSettings.initialColonize; num = __instance.combatSettings.initialColonize;
__instance.initOccupiedSlider.value = num switch __instance.initOccupiedSlider.value = num switch
{ {
< 0.02f => 0f, < 0.02f => 0f,
@@ -614,7 +693,7 @@ public class MoreSettings
}; };
text = num * 100f + "%"; text = num * 100f + "%";
__instance.initOccupiedText.text = text; __instance.initOccupiedText.text = text;
num = __instance.combatSettings.maxDensity; num = __instance.combatSettings.maxDensity;
__instance.maxDensitySlider.value = num switch __instance.maxDensitySlider.value = num switch
{ {
< 1.01f => 0f, < 1.01f => 0f,
@@ -625,7 +704,7 @@ public class MoreSettings
}; };
text = num + "x"; text = num + "x";
__instance.maxDensityText.text = text; __instance.maxDensityText.text = text;
num = __instance.combatSettings.growthSpeedFactor; num = __instance.combatSettings.growthSpeedFactor;
__instance.growthSpeedSlider.value = num switch __instance.growthSpeedSlider.value = num switch
{ {
< 0.26f => 0f, < 0.26f => 0f,
@@ -639,7 +718,7 @@ public class MoreSettings
}; };
text = num * 100f + "%"; text = num * 100f + "%";
__instance.growthSpeedText.text = text; __instance.growthSpeedText.text = text;
num = __instance.combatSettings.powerThreatFactor; num = __instance.combatSettings.powerThreatFactor;
__instance.powerThreatSlider.value = num switch __instance.powerThreatSlider.value = num switch
{ {
< 0.02f => 0f, < 0.02f => 0f,
@@ -656,7 +735,7 @@ public class MoreSettings
}; };
text = num * 100f + "%"; text = num * 100f + "%";
__instance.powerThreatText.text = text; __instance.powerThreatText.text = text;
num = __instance.combatSettings.battleThreatFactor; num = __instance.combatSettings.battleThreatFactor;
__instance.combatThreatSlider.value = num switch __instance.combatThreatSlider.value = num switch
{ {
< 0.02f => 0f, < 0.02f => 0f,
@@ -673,7 +752,7 @@ public class MoreSettings
}; };
text = num * 100f + "%"; text = num * 100f + "%";
__instance.combatThreatText.text = text; __instance.combatThreatText.text = text;
num = __instance.combatSettings.battleExpFactor; num = __instance.combatSettings.battleExpFactor;
__instance.DFExpSlider.value = num switch __instance.DFExpSlider.value = num switch
{ {
< 0.02f => 0f, < 0.02f => 0f,
@@ -690,19 +769,19 @@ public class MoreSettings
}; };
text = num * 100f + "%"; text = num * 100f + "%";
__instance.DFExpText.text = text; __instance.DFExpText.text = text;
var gameDesc = new GameDesc(); var gameDesc = new GameDesc();
var difficulty = __instance.combatSettings.difficulty; var difficulty = __instance.combatSettings.difficulty;
var text2 = difficulty >= 9.9999f ? difficulty.ToString("0.00") : difficulty.ToString("0.000"); var text2 = difficulty >= 9.9999f ? difficulty.ToString("0.00") : difficulty.ToString("0.000");
__instance.difficultyText.text = string.Format("难度系数值".Translate(), text2); __instance.difficultyText.text = string.Format("难度系数值".Translate(), text2);
__instance.difficultTipGroupDF.SetActive((__instance.combatSettings.aggressiveLevel == EAggressiveLevel.Rampage && difficulty > 4.5f) || difficulty > 6f); __instance.difficultTipGroupDF.SetActive((__instance.combatSettings.aggressiveLevel == EAggressiveLevel.Rampage && difficulty > 4.5f) || difficulty > 6f);
__instance.gameDesc.CopyTo(gameDesc); __instance.gameDesc.CopyTo(gameDesc);
gameDesc.combatSettings = __instance.combatSettings; gameDesc.combatSettings = __instance.combatSettings;
__instance.propertyMultiplierText.text = "元数据生成倍率".Translate() + " " + gameDesc.propertyMultiplier.ToString("0%"); __instance.propertyMultiplierText.text = "元数据生成倍率".Translate() + " " + gameDesc.propertyMultiplier.ToString("0%");
return false; return false;
} }
[HarmonyPrefix] [HarmonyPrefix]
[HarmonyPatch(typeof(CombatSettings),nameof(CombatSettings.difficulty), MethodType.Getter)] [HarmonyPatch(typeof(CombatSettings), nameof(CombatSettings.difficulty), MethodType.Getter)]
private static bool CombatSettings_difficulty_Getter_Prefix(CombatSettings __instance, ref float __result) private static bool CombatSettings_difficulty_Getter_Prefix(CombatSettings __instance, ref float __result)
{ {
var aggressivenessScore = __instance.aggressiveness switch var aggressivenessScore = __instance.aggressiveness switch
@@ -798,10 +877,10 @@ public class MoreSettings
_ => 20f _ => 20f
}; };
var score1 = aggressivenessScore < 0f ? 0f : 0.25f + aggressivenessScore * (powerThreatFactorScore * 0.5f + battleThreatFactorScore * 0.5f); var score1 = aggressivenessScore < 0f ? 0f : 0.25f + aggressivenessScore * (powerThreatFactorScore * 0.5f + battleThreatFactorScore * 0.5f);
var score2 = 0.375f + 0.625f * ((initialLevelScore + battleExpFactorScore) / 10f); var score2 = 0.375f + 0.625f * ((initialLevelScore + battleExpFactorScore) / 10f);
var score3 = 0.375f + 0.625f * ((initialColonizeScore * 0.6f + initialGrowthScore * 0.4f * (initialColonizeScore * 0.75f + 0.25f)) * 0.6f + growthSpeedFactorScore * 0.4f * (initialColonizeScore * 0.8f + 0.2f) + maxDensityScore * 0.29f * (initialColonizeScore * 0.5f + 0.5f)); var score3 = 0.375f + 0.625f * ((initialColonizeScore * 0.6f + initialGrowthScore * 0.4f * (initialColonizeScore * 0.75f + 0.25f)) * 0.6f + growthSpeedFactorScore * 0.4f * (initialColonizeScore * 0.8f + 0.2f) + maxDensityScore * 0.29f * (initialColonizeScore * 0.5f + 0.5f));
__result = (int)(score1 * score2 * score3 * 10000f + 0.5f) / 10000f; __result = (int)(score1 * score2 * score3 * 10000f + 0.5f) / 10000f;
return false; return false;
} }
#endregion #endregion
@@ -823,11 +902,5 @@ public class MoreSettings
_gameFlatten = r.ReadDouble(); _gameFlatten = r.ReadDouble();
} }
public static void IntoOtherSave()
{
// Skip prologue demo save
if (DSPGame.IsMenuDemo && DSPGame.LoadDemoIndex == -99) return;
PermanentPatch.ResetSettings();
}
#endregion #endregion
} }

3
UniverseGenTweaks/UniverseGenTweaks.cs
View File

@@ -63,7 +63,7 @@ public class UniverseGenTweaks : BaseUnityPlugin, IModCanSave
EpicDifficulty.Uninit(); EpicDifficulty.Uninit();
MoreSettings.Uninit(); MoreSettings.Uninit();
} }
#region IModCanSave #region IModCanSave
private const ushort ModSaveVersion = 1; private const ushort ModSaveVersion = 1;
@@ -82,7 +82,6 @@ public class UniverseGenTweaks : BaseUnityPlugin, IModCanSave
public void IntoOtherSave() public void IntoOtherSave()
{ {
MoreSettings.IntoOtherSave();
} }
#endregion #endregion
} }

2
UniverseGenTweaks/UniverseGenTweaks.csproj
View File

@@ -6,7 +6,7 @@
<AssemblyName>UniverseGenTweaks</AssemblyName> <AssemblyName>UniverseGenTweaks</AssemblyName>
<BepInExPluginGuid>org.soardev.universegentweaks</BepInExPluginGuid> <BepInExPluginGuid>org.soardev.universegentweaks</BepInExPluginGuid>
<Description>DSP MOD - UniverseGenTweaks</Description> <Description>DSP MOD - UniverseGenTweaks</Description>
<Version>1.2.9</Version> <Version>1.2.10</Version>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<RestoreAdditionalProjectSources>https://nuget.bepinex.dev/v3/index.json</RestoreAdditionalProjectSources> <RestoreAdditionalProjectSources>https://nuget.bepinex.dev/v3/index.json</RestoreAdditionalProjectSources>

2
UniverseGenTweaks/package/manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "UniverseGenTweaks", "name": "UniverseGenTweaks",
"version_number": "1.2.9", "version_number": "1.2.10",
"website_url": "https://github.com/soarqin/DSP_Mods/tree/master/UniverseGenTweaks", "website_url": "https://github.com/soarqin/DSP_Mods/tree/master/UniverseGenTweaks",
"description": "Universe Generation Tweaks / 宇宙生成参数调节", "description": "Universe Generation Tweaks / 宇宙生成参数调节",
"dependencies": [ "dependencies": [