Author SHA1 Message Date
soarqin c7fcf31c30 fix(cheatenabler): require UXAssist 1.6.3 before loading
Align the runtime and package minimum with the official release that provides the shared production API. Keep official UXAssist 1.6.3 supported and document the dependency in both languages.

Assisted-by: Cindy (https://cindy.app)
2026-11-05 21:34:35 +08:00
52 changed files with 1000 additions and 189 deletions

No files matched your search

+2
View File
@@ -4,6 +4,7 @@
## Changlog
* 2.4.8
* Require UXAssist 1.6.3 or later for the shared production API. Older versions are rejected before initialization instead of failing while loading belt-signal features.
* `Mecha and Drones/Fleets invincible`: Fix mecha HP and energy shield protection failing when enabled after taking damage, and restore protection for space fleets.
* `Finish build immediately`: Fix possible errors when starting a new game. Construction begins after the opening cutscene ends or is skipped.
* `Belt signal item generation`:
@@ -208,6 +209,7 @@
## 更新日志
* 2.4.8
* 需要 UXAssist 1.6.3 或更高版本提供共享生产计算 API。旧版本会在初始化前被拒绝加载,避免加载传送带信号功能时出错。
* `机甲和战斗无人机无敌`:修复受伤后启用时机甲耐久度和能量护盾保护可能失效的问题,并恢复太空编队的无敌保护。
* `建造秒完成`:修复开始新游戏时可能报错的问题。建造会在开场动画播放结束或跳过后开始。
* `传送带信号物品生成`:
+1 -1
View File
@@ -10,7 +10,7 @@ using UXAssist.Common.ModFeatures;
namespace CheatEnabler;
[BepInPlugin(PluginInfo.PLUGIN_GUID, PluginInfo.PLUGIN_NAME, PluginInfo.PLUGIN_VERSION)]
[BepInDependency(UXAssist.PluginInfo.PLUGIN_GUID)]
[BepInDependency(UXAssist.PluginInfo.PLUGIN_GUID, "1.6.3")]
public class CheatEnabler : BaseUnityPlugin
{
public new static readonly BepInEx.Logging.ManualLogSource Logger =
@@ -1,10 +1,12 @@
using System;
using UnityEngine;
using UXAssist.Common;
using UXAssist.Common.ModFeatures;
using CheatEnabler;
namespace CheatEnabler.Functions.DysonSphere;
[ModFeature("DysonSphereResolver")]
public static class DysonSphereResolver
{
public static (global::DysonSphere sphere, StarData star)? ResolveCurrent()
@@ -3,11 +3,13 @@ using HarmonyLib;
using UnityEngine;
using UXAssist.Common;
using UXAssist.Common.GameConstants;
using UXAssist.Common.ModFeatures;
using UXAssist.Common.Utils;
using CheatEnabler;
namespace CheatEnabler.Functions.DysonSphere;
[ModFeature("FrameRemovalFunctions")]
public static class FrameRemovalFunctions
{
public static void RemoveAllFrames()
@@ -7,10 +7,12 @@ using static CheatEnabler.Functions.DysonSphere.GeometryHelpers;
using UnityEngine;
using UXAssist.Common;
using UXAssist.Common.GameConstants;
using UXAssist.Common.ModFeatures;
using CheatEnabler;
namespace CheatEnabler.Functions.DysonSphere;
[ModFeature("IllegalShellFunctions")]
public static class IllegalShellFunctions
{
private static void EnsureDysonShellMaps()
@@ -39,7 +41,7 @@ public static class IllegalShellFunctions
layer.shellCursor = 1;
}
private static void FinalizeDysonSphereChanges(global::DysonSphere sphere, bool notify = false, bool resetRenderMasks = false)
private static void FinalizeDysonSphereChanges(global::DysonSphere sphere, DysonSphereLayer layer, bool notify = false, bool resetRenderMasks = false)
{
if (sphere == null) return;
sphere.CheckAutoNodes();
@@ -138,7 +140,7 @@ public static class IllegalShellFunctions
node.RecalcSpReq();
node.RecalcCpReq();
}
FinalizeDysonSphereChanges(dysonSphere, true, true);
FinalizeDysonSphereChanges(dysonSphere, layer, true, true);
}
public static void KeepMaxProductionShells()
@@ -243,7 +245,7 @@ public static class IllegalShellFunctions
node.RecalcCpReq();
}
}
FinalizeDysonSphereChanges(dysonSphere);
FinalizeDysonSphereChanges(dysonSphere, null);
}
public static void CreateIllegalDysonShellQuickly(int triangleCount)
@@ -315,7 +317,7 @@ public static class IllegalShellFunctions
node.RecalcSpReq();
node.RecalcCpReq();
}
FinalizeDysonSphereChanges(dysonSphere, true);
FinalizeDysonSphereChanges(dysonSphere, layer, true);
return;
}
}
@@ -431,7 +433,7 @@ public static class IllegalShellFunctions
var shellsChanged = CreateIllegalDysonShellWithMaxOutputForLayer(layer);
FinalizeDysonSphereChanges(dysonSphere, shellsChanged, true);
FinalizeDysonSphereChanges(dysonSphere, layer, shellsChanged, true);
}
public static void CreateIllegalDysonShellWithMaxOutputForAllLayers()
@@ -447,7 +449,7 @@ public static class IllegalShellFunctions
shellsChanged = CreateIllegalDysonShellWithMaxOutputForLayer(layer) || shellsChanged;
}
FinalizeDysonSphereChanges(dysonSphere, shellsChanged, true);
FinalizeDysonSphereChanges(dysonSphere, dysonSphere.layersSorted.FirstOrDefault(l => l != null), shellsChanged, true);
}
public static void CreateIllegalDysonShellsSpecially()
@@ -475,6 +477,8 @@ public static class IllegalShellFunctions
for (var idx = 1; idx <= 2; idx++)
{
Dictionary<(int, int), int> availableFrames = [];
HashSet<int> unusedFrameIds = [];
var layer = dysonSphere.layersIdBased[idx];
if (layer != null)
{
@@ -567,6 +571,6 @@ public static class IllegalShellFunctions
}
}
FinalizeDysonSphereChanges(dysonSphere, shellsChanged, true);
FinalizeDysonSphereChanges(dysonSphere, dysonSphere.layersIdBased[2], shellsChanged, true);
}
}
@@ -3,11 +3,13 @@ using System.Linq;
using HarmonyLib;
using UnityEngine;
using UXAssist.Common;
using UXAssist.Common.ModFeatures;
using UXAssist.Common.Utils;
using CheatEnabler;
namespace CheatEnabler.Functions.DysonSphere;
[ModFeature("ShellCompletionFunctions")]
public static class ShellCompletionFunctions
{
public static void CompleteShellsInstantly()
@@ -1,9 +1,11 @@
using BepInEx.Configuration;
using CheatEnabler.Functions.DysonSphere;
using UXAssist.Common;
using UXAssist.Common.ModFeatures;
namespace CheatEnabler.Functions;
[ModFeature("CheatDysonSphere", Order = 20)]
public static class DysonSphereFunctions
{
public const int MinShellsCountForFunctions = 1;
+3 -1
View File
@@ -1,7 +1,9 @@
using Random = UnityEngine.Random;
using UXAssist.Common.ModFeatures;
namespace CheatEnabler.Functions;
[ModFeature("PlanetFunctions")]
public static class PlanetFunctions
{
public static void BuryAllVeins(bool bury)
@@ -33,4 +35,4 @@ public static class PlanetFunctions
}
GameMain.gpuiManager.SyncAllGPUBuffer();
}
}
}
@@ -2,9 +2,11 @@
using System.Linq;
using UXAssist.Common;
using UXAssist.Common.GameConstants;
using UXAssist.Common.ModFeatures;
namespace CheatEnabler.Functions;
[ModFeature("PlayerFunctions")]
public static class PlayerFunctions
{
public static void Init()
@@ -16,6 +16,7 @@ internal class BeltSignalGenerator : PatchImpl<BeltSignalGenerator>
private static Dictionary<int, BeltSignal>[] _signalBelts;
private static Dictionary<long, int> _portalFrom;
private static Dictionary<int, HashSet<long>> _portalTo;
private static int _signalBeltsCapacity;
private static bool _initialized;
private static ProductionCatalog _sourceCatalog;
private static ProductionItem _preferredProliferator;
@@ -49,6 +50,7 @@ internal class BeltSignalGenerator : PatchImpl<BeltSignalGenerator>
_signalBelts = null;
_portalFrom = null;
_portalTo = null;
_signalBeltsCapacity = 0;
PendingSources.Clear();
ClearSourceCache();
}
@@ -82,6 +84,7 @@ internal class BeltSignalGenerator : PatchImpl<BeltSignalGenerator>
GameLogicProc.OnGameBegin -= OnGameBegin;
_initialized = false;
_signalBelts = null;
_signalBeltsCapacity = 0;
PendingSources.Clear();
ClearSourceCache();
}
@@ -178,6 +181,7 @@ internal class BeltSignalGenerator : PatchImpl<BeltSignalGenerator>
{
if (DSPGame.IsMenuDemo) return;
_signalBelts = new Dictionary<int, BeltSignal>[64];
_signalBeltsCapacity = 64;
_portalFrom = [];
_portalTo = [];
@@ -221,12 +225,13 @@ internal class BeltSignalGenerator : PatchImpl<BeltSignalGenerator>
{
Dictionary<int, BeltSignal> obj;
if (index < 0) return null;
if (index >= _signalBelts.Length)
if (index >= _signalBeltsCapacity)
{
var newCapacity = _signalBelts.Length * 2;
var newCapacity = _signalBeltsCapacity * 2;
var newSignalBelts = new Dictionary<int, BeltSignal>[newCapacity];
Array.Copy(_signalBelts, newSignalBelts, _signalBelts.Length);
Array.Copy(_signalBelts, newSignalBelts, _signalBeltsCapacity);
_signalBelts = newSignalBelts;
_signalBeltsCapacity = newCapacity;
}
else
{
@@ -241,7 +246,7 @@ internal class BeltSignalGenerator : PatchImpl<BeltSignalGenerator>
private static Dictionary<int, BeltSignal> GetSignalBelts(int index)
{
return index >= 0 && _signalBelts != null && index < _signalBelts.Length ? _signalBelts[index] : null;
return index >= 0 && index < _signalBeltsCapacity ? _signalBelts[index] : null;
}
private static void SetSignalBelt(int factory, int beltId, int signalId, int number)
+2 -30
View File
@@ -17,7 +17,7 @@ internal static class TechClickHandler
}
catch (Exception e)
{
CheatEnabler.Logger.LogWarning($"[TechTweaks] click handling failed: {e}");
TechLog.Warn($"click handling failed: {e}");
}
}
@@ -40,7 +40,7 @@ internal static class TechClickHandler
return;
}
if (!TryDecodeModifiers(out int steps))
if (!TechKeyCombo.TryDecode(out int steps))
{
return;
}
@@ -54,32 +54,4 @@ internal static class TechClickHandler
TechUnlock.Run(history, techProto, steps);
}
}
private static bool TryDecodeModifiers(out int steps)
{
steps = 0;
if (VFInput.shift)
{
if (VFInput.alt) return false;
steps = VFInput.control ? 100 : 1;
return true;
}
if (VFInput.control)
{
if (VFInput.alt) return false;
steps = 10;
return true;
}
if (VFInput.alt)
{
// Alt applies or reverts every level available to this click.
steps = int.MaxValue;
return true;
}
return false;
}
}
+1 -1
View File
@@ -20,7 +20,7 @@ internal static class TechDowngrade
{
if (!TryGetLastAppliedLevel(history, techProto, out int lastApplied) || steps <= 0) return;
int target = steps == int.MaxValue
int target = steps == TechKeyCombo.LevelToMax
? techProto.Level - 1
: System.Math.Max(techProto.Level - 1, lastApplied - steps);
Targets.Clear();
+4 -4
View File
@@ -410,7 +410,7 @@ namespace CheatEnabler.Patches.Tech
// a downgrade can walk thousands of levels and must not flood the log.
if (UnknownFuncsWarned.Add(func))
{
CheatEnabler.Logger.LogWarning($"[TechTweaks] revert: no inverse known for tech function {func} (value={value}, level={level}); " +
TechLog.Warn($"revert: no inverse known for tech function {func} (value={value}, level={level}); " +
"the field was left untouched. A game update may have added a new function.");
}
@@ -429,7 +429,7 @@ namespace CheatEnabler.Patches.Tech
ModeConfig freeMode = Configs.freeMode;
if (freeMode == null)
{
CheatEnabler.Logger.LogWarning($"[TechTweaks] recompute of tech function {func} skipped: Configs.freeMode is not available");
TechLog.Warn($"recompute of tech function {func} skipped: Configs.freeMode is not available");
return;
}
@@ -819,7 +819,7 @@ namespace CheatEnabler.Patches.Tech
if (Configs.freeMode == null || history.gameData == null || player?.mecha == null ||
player.package?.grids == null || player.deliveryPackage?.grids == null)
{
CheatEnabler.Logger.LogWarning("[TechTweaks] downgrade skipped: game data is not ready");
TechLog.Warn("downgrade skipped: game data is not ready");
return false;
}
@@ -836,7 +836,7 @@ namespace CheatEnabler.Patches.Tech
int func = proto.UnlockFunctions[j];
if (!(func is >= 1 and <= 45 or >= 61 and <= 86 or 99))
{
CheatEnabler.Logger.LogWarning($"[TechTweaks] downgrade skipped: unsupported tech function {func} in tech {proto.ID}");
TechLog.Warn($"downgrade skipped: unsupported tech function {func} in tech {proto.ID}");
UIRealtimeTip.Popup(Localization.TechDowngradeUnsupportedFunction.Translate());
return false;
}
+59
View File
@@ -0,0 +1,59 @@
namespace CheatEnabler.Patches.Tech;
/// <summary>
/// The key-modifier semantics shared by the upgrade and the downgrade side.
///
/// Both directions use the same modifier mapping:
///
/// <list type="table">
/// <item><term>Shift</term><description>+1 / -1</description></item>
/// <item><term>Ctrl</term><description>+10 / -10</description></item>
/// <item><term>Ctrl + Shift</term><description>+100 / -100</description></item>
/// <item><term>Alt</term><description>to MAX / back to locked</description></item>
/// <item><term>Shift + Alt, Ctrl + Alt</term><description>ignored</description></item>
/// </list>
/// </summary>
internal static class TechKeyCombo
{
/// <summary>Sentinel for the "Alt" combination: apply or revert everything this click can.</summary>
public const int LevelToMax = int.MaxValue;
/// <summary>
/// Decodes the currently held modifiers.
/// Returns false when the combination carries no meaning and the click must be left alone.
/// </summary>
public static bool TryDecode(out int steps)
{
steps = 0;
if (VFInput.shift)
{
if (VFInput.alt)
{
return false;
}
steps = VFInput.control ? 100 : 1;
return true;
}
if (VFInput.control)
{
if (VFInput.alt)
{
return false;
}
steps = 10;
return true;
}
if (VFInput.alt)
{
steps = LevelToMax;
return true;
}
return false;
}
}
+16
View File
@@ -0,0 +1,16 @@
namespace CheatEnabler.Patches.Tech;
/// <summary>
/// Single funnel for the tech unlock / downgrade feature's log output.
///
/// Only real problems are reported: a Harmony target that no longer resolves, a tech function without
/// a known inverse, or a refused package resize. Those are conditions the player or the maintainer
/// needs to know about after a game update.
/// </summary>
internal static class TechLog
{
public static void Warn(string message)
{
CheatEnabler.Logger.LogWarning("[TechTweaks] " + message);
}
}
+1 -1
View File
@@ -17,7 +17,7 @@ internal static class TechUnlock
{
// Mirrors the built-in maxLevel argument: "to MAX" passes the default, the other combinations
// pass -(steps) so the loop advances exactly `steps` levels.
int maxLevel = steps == int.MaxValue ? 10000 : -steps;
int maxLevel = steps == TechKeyCombo.LevelToMax ? 10000 : -steps;
UnlockTechRecursive(history, techProto, maxLevel);
+2
View File
@@ -93,6 +93,7 @@ The item icon selects the output; no hotkey is needed.
## Notes
* Requires UXAssist 1.6.3 or later. When upgrading manually, replace the old UXAssist DLL and remove duplicate copies from the BepInEx plugins folder.
* Please upgrade `BepInEx` 5.4.21 or later if using with [BlueprintTweaks](https://dsp.thunderstore.io/package/kremnev8/BlueprintTweaks/) to avoid possible conflicts.
* You can download [BepInEx here](https://github.com/bepinex/bepinex/releases/latest)(choose x64 edition).
* If using with r2modman, you can upgrade `BepInEx` by clicking `Settings` -> `Browse profile folder`, then extract downloaded zip to the folder and overwrite existing files.
@@ -198,6 +199,7 @@ The item icon selects the output; no hotkey is needed.
## 注意事项
* 需要 UXAssist 1.6.3 或更高版本。手动升级时,请替换旧的 UXAssist DLL,并删除 BepInEx 插件目录中的重复副本。
* 如果和[BlueprintTweaks](https://dsp.thunderstore.io/package/kremnev8/BlueprintTweaks/)一起使用,请升级`BepInEx`到5.4.21或更高版本,以避免可能的冲突
* 你可以在[这里](https://github.com/bepinex/bepinex/releases/latest)(选择x64版本)下载`BepInEx`
* 如果使用r2modman,你可以点击`Settings` -> `Browse profile folder`,然后将下载的zip解压到该文件夹并覆盖现有文件
+13 -5
View File
@@ -12,6 +12,8 @@ namespace CheatEnabler;
public static class UIConfigWindow
{
private static RectTransform _windowTrans;
private static UIButton _resignGameBtn;
private static UIButton _clearBanBtn;
@@ -74,12 +76,13 @@ 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, "Cheat Enabler", "tab-group-cheatenabler");
var tab1 = wnd.AddTab(trans, "General");
var tab1 = wnd.AddTab(_windowTrans, "General");
var cb = wnd.AddCheckBox(x, y, tab1, GamePatch.DevShortcutsEnabled, "Enable Dev Shortcuts");
x += cb.Width + 5f;
y += 6f;
@@ -104,7 +107,7 @@ public static class UIConfigWindow
y = 10f;
_resignGameBtn = wnd.AddButton(x, y, 300f, tab1, "Assign gamesave to current account", 16, "resign-game-btn", () => { GameMain.data.account = AccountData.me; });
var tab2 = wnd.AddTab(trans, "Factory");
var tab2 = wnd.AddTab(_windowTrans, "Factory");
x = 0f;
y = 10f;
wnd.AddCheckBox(x, y, tab2, FactoryPatch.ImmediateEnabled, "Finish build immediately");
@@ -167,7 +170,7 @@ public static class UIConfigWindow
wnd.AddText2(x + 32f, y, tab2, "Boost fuel power 2", 13);
// Planet Tab
var tab3 = wnd.AddTab(trans, "Planet");
var tab3 = wnd.AddTab(_windowTrans, "Planet");
x = 0f;
y = 10f;
wnd.AddCheckBox(x, y, tab3, ResourcePatch.InfiniteResourceEnabled, "Infinite Natural Resources");
@@ -204,7 +207,7 @@ public static class UIConfigWindow
GameMain.localPlanet.factory.PlanetReformRevert();
});
var tab4 = wnd.AddTab(trans, "Dyson Sphere");
var tab4 = wnd.AddTab(_windowTrans, "Dyson Sphere");
x = 0f;
y = 10f;
wnd.AddCheckBox(x, y, tab4, DysonSpherePatch.SkipBulletEnabled, "Skip bullet period");
@@ -296,7 +299,7 @@ public static class UIConfigWindow
}
}
var tab5 = wnd.AddTab(trans, "Mecha/Combat");
var tab5 = wnd.AddTab(_windowTrans, "Mecha/Combat");
x = 0f;
y = 10f;
wnd.AddCheckBox(x, y, tab5, CombatPatch.MechaInvincibleEnabled, "Mecha and Drones/Fleets invicible");
@@ -312,6 +315,11 @@ public static class UIConfigWindow
}
private static void UpdateUI()
{
UpdateButtons();
}
private static void UpdateButtons()
{
if (_resignGameBtn == null || _clearBanBtn == null) return;
var data = GameMain.data;
+1 -1
View File
@@ -5,6 +5,6 @@
"description": "Add various cheat functions while disabling abnormal determinants / 添加一些作弊功能,同时屏蔽异常检测",
"dependencies": [
"xiaoye97-BepInEx-5.4.17",
"soarqin-UXAssist-1.4.0"
"soarqin-UXAssist-1.6.3"
]
}
+23 -5
View File
@@ -28,14 +28,31 @@ public static class BeltSignal
}
}
private static Sprite LoadDustbinSprite()
private static byte[] LoadEmbeddedResource(string path, Assembly assembly = null)
{
using var stream = Assembly.GetExecutingAssembly()
.GetManifestResourceStream("Dustbin.assets.icon.signal-410.png")!;
if (assembly == null)
{
assembly = Assembly.GetCallingAssembly();
}
var info = assembly.GetName();
var name = info.Name;
using var stream = assembly.GetManifestResourceStream($"{name}.{path.Replace('/', '.')}")!;
var buffer = new byte[stream.Length];
_ = stream.Read(buffer, 0, buffer.Length);
return buffer;
}
private static Texture2D LoadEmbeddedTexture(string path, Assembly assembly = null)
{
var fileData = LoadEmbeddedResource(path, assembly);
var tex = new Texture2D(2, 2);
tex.LoadImage(buffer);
tex.LoadImage(fileData);
return tex;
}
private static Sprite LoadEmbeddedSprite(string path, Assembly assembly = null)
{
var tex = LoadEmbeddedTexture(path, assembly);
return Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f));
}
@@ -44,6 +61,7 @@ public static class BeltSignal
private static void VFPreload_InvokeOnLoadWorkEnded_Postfix()
{
if (_initialized) return;
var assembly = Assembly.GetExecutingAssembly();
var signals = LDB._signals;
var index = signals.dataArray.Length;
var p = new SignalProto
@@ -52,7 +70,7 @@ public static class BeltSignal
Name = "DUSTBIN",
GridIndex = 3110,
IconPath = "Assets/signal-410.png",
_iconSprite = LoadDustbinSprite(),
_iconSprite = LoadEmbeddedSprite("assets/icon/signal-410.png", assembly),
SID = ""
};
p.name = p.Name.Translate();
+87
View File
@@ -20,6 +20,9 @@ public class HideTips : BaseUnityPlugin
private static bool _noResearchCompletionPopups = true;
private static bool _noResearchCompletionTips;
private static bool _skipPrologue = true;
// private static bool _hideMenuDemo;
private static Harmony _patch;
private void Awake()
{
@@ -31,8 +34,21 @@ public class HideTips : BaseUnityPlugin
_noResearchCompletionPopups = Config.Bind("General", "NoResearchCompletionPopups", _noResearchCompletionPopups, "Disable Research Completion Popup Windows").Value;
_noResearchCompletionTips = Config.Bind("General", "NoResearchCompletionTips", _noResearchCompletionTips, "Disable Research Completion Tips").Value;
_skipPrologue = Config.Bind("General", "SkipPrologue", _skipPrologue, "Skip prologue for new game").Value;
// _hideMenuDemo = Config.Bind("General", "HideMenuDemo", _hideMenuDemo, "Disable title screen demo scene loading").Value;
if (!_cfgEnabled) return;
Harmony.CreateAndPatchAll(typeof(HideTips));
/*
if (_hideMenuDemo)
{
_patch = Harmony.CreateAndPatchAll(typeof(HideMenuDemo));
}
*/
}
private void OnDestroy()
{
_patch?.UnpatchSelf();
_patch = null;
}
[HarmonyPrefix]
@@ -130,3 +146,74 @@ public class HideTips : BaseUnityPlugin
return false;
}
}
/*
[HarmonyPatch]
class HideMenuDemo
{
[HarmonyPriority(Priority.First), HarmonyPrefix]
[HarmonyPatch(typeof(DSPGame), nameof(DSPGame.StartDemoGame), typeof(int))]
private static bool DSPGame_StartDemoGame_Prefix()
{
if (DSPGame.Game != null)
{
DSPGame.EndGame();
}
DSPGame.IsMenuDemo = true;
DSPGame.CreateGameMainObject();
DSPGame.Game.isMenuDemo = true;
DSPGame.Game.CreateIconSet();
GameMain.data = new GameData();
GameMain.data.mainPlayer = Player.Create(GameMain.data, 1);
GameMain.data.galaxy = new GalaxyData
{
starCount = 0
};
if (GameMain.universeSimulator != null)
{
UnityEngine.Object.Destroy(GameMain.universeSimulator.gameObject);
}
GameMain.universeSimulator = UnityEngine.Object.Instantiate(Configs.builtin.universeSimulatorPrefab);
GameMain.universeSimulator.spaceAudio = new GameObject("Space Audio")
{
transform =
{
parent = GameMain.universeSimulator.transform
}
}.AddComponent<SpaceAudio>();
GameMain.Begin();
return false;
}
[HarmonyPriority(Priority.First), HarmonyPrefix]
[HarmonyPatch(typeof(VFPreload), nameof(VFPreload.IsMenuDemoLoaded))]
private static bool VFPreload_IsMenuDemoLoaded_Prefix(ref bool __result)
{
__result = true;
return false;
}
[HarmonyPriority(Priority.First), HarmonyPrefix]
[HarmonyPatch(typeof(DSPGame), nameof(DSPGame.LateUpdate))]
[HarmonyPatch(typeof(GameMain), nameof(GameMain.LateUpdate))]
[HarmonyPatch(typeof(GameMain), nameof(GameMain.FixedUpdate))]
[HarmonyPatch(typeof(GameMain), nameof(GameMain.Update))]
[HarmonyPatch(typeof(GameCamera), nameof(GameCamera.LateUpdate))]
private static bool DSPGame_LateUpdate_Prefix()
{
return !DSPGame.IsMenuDemo;
}
[HarmonyPriority(Priority.First), HarmonyPrefix]
[HarmonyPatch(typeof(GameMain), nameof(GameMain.Begin))]
private static bool GameMain_Begin_Prefix()
{
if (!DSPGame.IsMenuDemo) return true;
DSPGame.Game._loading = false;
DSPGame.Game._running = true;
return false;
}
}
*/
+15 -5
View File
@@ -21,6 +21,17 @@ function New-OpCts {
[Threading.CancellationTokenSource]::new([TimeSpan]::FromSeconds($TimeoutSec))
}
function Get-ConnSocket {
param($Conn)
if ($null -eq $Conn) { return $null }
if ($Conn -is [hashtable]) {
if ($Conn.ContainsKey('Ws')) { return $Conn['Ws'] }
return $null
}
if ($Conn.PSObject.Properties.Name -contains 'Ws') { return $Conn.Ws }
return $null
}
function Connect-Api {
param([string] $Uri)
$ws = [Net.WebSockets.ClientWebSocket]::new()
@@ -38,8 +49,7 @@ function Connect-Api {
function Close-Api {
param($Conn)
if ($null -eq $Conn) { return }
$ws = $Conn.Ws
$ws = Get-ConnSocket $Conn
if ($null -eq $ws) { return }
$cts = New-OpCts
try {
@@ -54,7 +64,7 @@ function Close-Api {
function Send-Text {
param($Conn, [string] $Text, [bool] $End = $true)
$ws = $Conn.Ws
$ws = Get-ConnSocket $Conn
$bytes = $utf8.GetBytes($Text)
$seg = [ArraySegment[byte]]::new($bytes)
$cts = New-OpCts
@@ -65,7 +75,7 @@ function Send-Text {
function Receive-Message {
param($Conn)
$ws = $Conn.Ws
$ws = Get-ConnSocket $Conn
$buffer = [byte[]]::new(65536)
$ms = [IO.MemoryStream]::new()
$cts = New-OpCts
@@ -173,7 +183,7 @@ try {
$cts = New-OpCts
try {
$null = $conn.Ws.SendAsync(
$null = (Get-ConnSocket $conn).SendAsync(
[ArraySegment[byte]]::new([byte[]](1, 2, 3)),
[Net.WebSockets.WebSocketMessageType]::Binary,
$true,
+25
View File
@@ -0,0 +1,25 @@
using HarmonyLib;
namespace MechaDronesTweaks;
class FastDronesRemover
{
public const string FastDronesGuid = "com.dkoppstein.plugin.DSP.FastDrones";
private const string FastDronesVersion = "0.0.5";
public static bool Run(Harmony harmony)
{
if (!BepInEx.Bootstrap.Chainloader.PluginInfos.TryGetValue(FastDronesGuid, out var pluginInfo) ||
pluginInfo.Metadata.Version.ToString() != FastDronesVersion) return false;
var assembly = pluginInfo.Instance.GetType().Assembly;
var classType = assembly.GetType("com.dkoppstein.plugin.DSP.FastDrones.FastDronesPlugin");
harmony.Patch(AccessTools.Method(classType, "Start"),
new HarmonyMethod(typeof(FastDronesRemover).GetMethod("PatchFastDronesStart")));
return true;
}
public static bool PatchFastDronesStart()
{
return false;
}
}
+6 -11
View File
@@ -9,11 +9,9 @@ using UnityEngine;
namespace MechaDronesTweaks;
[BepInPlugin(PluginInfo.PLUGIN_GUID, PluginInfo.PLUGIN_NAME, PluginInfo.PLUGIN_VERSION)]
[BepInDependency(FastDronesGuid, BepInDependency.DependencyFlags.SoftDependency)]
[BepInDependency(FastDronesRemover.FastDronesGuid, BepInDependency.DependencyFlags.SoftDependency)]
public class MechaDronesTweaksPlugin : BaseUnityPlugin
{
private const string FastDronesGuid = "com.dkoppstein.plugin.DSP.FastDrones";
public new static readonly BepInEx.Logging.ManualLogSource Logger =
BepInEx.Logging.Logger.CreateLogSource(PluginInfo.PLUGIN_NAME);
@@ -24,13 +22,8 @@ public class MechaDronesTweaksPlugin : BaseUnityPlugin
/* Remove FastDrones MOD if loaded */
try
{
if (BepInEx.Bootstrap.Chainloader.PluginInfos.TryGetValue(FastDronesGuid, out var pluginInfo) &&
pluginInfo.Metadata.Version.ToString() == "0.0.5")
if (FastDronesRemover.Run(_harmony))
{
var assembly = pluginInfo.Instance.GetType().Assembly;
var classType = assembly.GetType("com.dkoppstein.plugin.DSP.FastDrones.FastDronesPlugin");
_harmony.Patch(AccessTools.Method(classType, "Start"),
new HarmonyMethod(AccessTools.Method(typeof(MechaDronesTweaksPlugin), nameof(PatchFastDronesStart))));
Logger.LogInfo("Unpatch FastDrones - OK");
}
}
@@ -40,8 +33,6 @@ public class MechaDronesTweaksPlugin : BaseUnityPlugin
}
}
private static bool PatchFastDronesStart() => false;
public void Awake()
{
MechaDronesTweaks.UseFixedSpeed = Config.Bind("MechaDrones", "UseFixedSpeed", MechaDronesTweaks.UseFixedSpeed,
@@ -63,6 +54,10 @@ public class MechaDronesTweaksPlugin : BaseUnityPlugin
MechaDronesTweaks.EnergyMultiplier,
new ConfigDescription("Energy consumption multiplier for mecha drones",
new AcceptableValueRange<float>(0f, 1f))).Value;
MechaDronesTweaks.EnergyMultiplier = Config.Bind("MechaDrones", "EnergyMultiplier",
MechaDronesTweaks.EnergyMultiplier,
new ConfigDescription("Energy consumption multiplier for mecha drones",
new AcceptableValueRange<float>(0f, 1f))).Value;
_harmony.PatchAll(typeof(MechaDronesTweaks));
}
+42 -1
View File
@@ -104,6 +104,21 @@ public class Patch : BaseUnityPlugin, IModCanSave
{
}
/* Belt fix for GalacticScale old versions, should be of no use now.
[HarmonyTranspiler, HarmonyPatch(typeof(BuildTool_Path), "CheckBuildConditions")]
private static IEnumerable<CodeInstruction> BuildTool_Path_CheckBuildConditions_Transpiler(
IEnumerable<CodeInstruction> instructions)
{
foreach (var instr in instructions)
{
if (instr.opcode == OpCodes.Ldc_R4 && instr.OperandIs(0.28f))
{
instr.operand = 0.21f;
}
yield return instr;
}
}
*/
[HarmonyPostfix, HarmonyPatch(typeof(LabComponent), "SetFunction")]
private static void LabComponent_SetFunction_Postfix(ref LabComponent __instance)
@@ -365,6 +380,20 @@ public class Patch : BaseUnityPlugin, IModCanSave
foreach (var proto in LDB.items.dataArray)
{
var prefabDesc = proto.prefabDesc;
/* Fix collision sizes, for GalacticScale old versions, should be of no use now.
FixExtValue(ref prefabDesc.buildCollider.ext.x);
FixExtValue(ref prefabDesc.buildCollider.ext.y);
FixExtValue(ref prefabDesc.buildCollider.ext.z);
if (prefabDesc.buildColliders != null)
{
for (var i = 0; i < prefabDesc.buildColliders.Length; i++)
{
FixExtValue(ref prefabDesc.buildColliders[i].ext.x);
FixExtValue(ref prefabDesc.buildColliders[i].ext.y);
FixExtValue(ref prefabDesc.buildColliders[i].ext.z);
}
}
*/
if (prefabDesc.isInserter)
{
@@ -443,4 +472,16 @@ public class Patch : BaseUnityPlugin, IModCanSave
}
}
}
/*
private static void FixExtValue(ref float v)
{
if (v == 0f)
{
return;
}
var b = Math.Abs(v);
v = (v - b) * 0.75f + b;
}
*/
}
+109 -70
View File
@@ -24,23 +24,23 @@ public class PoolOptPatch : BaseUnityPlugin
foreach (var planet in GameMain.data.factories)
{
if (planet == null) continue;
if (OptimizePool((in EntityData n, int index) => n.id == index, () =>
if (OptimizePool((in EntityData n) => n.id, () =>
{
planet.entityCapacity = 0;
planet.SetEntityCapacity(1024);
},
ref planet.entityPool, ref planet.entityCursor,
ref planet.entityPool, ref planet.entityCursor, ref planet.entityCapacity,
ref planet.entityRecycle, ref planet.entityRecycleCursor))
{
Logger.LogDebug($"Optimized `{nameof(planet.entityPool)}` on Planet {planet.planetId}");
}
if (OptimizePool((in PrebuildData n, int index) => n.id == index, () =>
if (OptimizePool((in PrebuildData n) => n.id, () =>
{
planet.prebuildCapacity = 0;
planet.SetPrebuildCapacity(256);
},
ref planet.prebuildPool, ref planet.prebuildCursor,
ref planet.prebuildPool, ref planet.prebuildCursor, ref planet.prebuildCapacity,
ref planet.prebuildRecycle, ref planet.prebuildRecycleCursor))
{
Logger.LogDebug($"Optimized `{nameof(planet.prebuildPool)}` on Planet {planet.planetId}");
@@ -49,152 +49,152 @@ public class PoolOptPatch : BaseUnityPlugin
var cargoTraffic = planet.cargoTraffic;
if (cargoTraffic != null)
{
if (OptimizePool((in BeltComponent n, int index) => n.id == index, () =>
if (OptimizePool((in BeltComponent n) => n.id, () =>
{
cargoTraffic.beltCapacity = 0;
cargoTraffic.SetBeltCapacity(16);
},
ref cargoTraffic.beltPool, ref cargoTraffic.beltCursor,
ref cargoTraffic.beltPool, ref cargoTraffic.beltCursor, ref cargoTraffic.beltCapacity,
ref cargoTraffic.beltRecycle, ref cargoTraffic.beltRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(cargoTraffic.beltPool)}` on Planet {planet.planetId}");
if (OptimizePool((in CargoPath n, int index) => (n?.id ?? 0) == index, () =>
if (OptimizePool((in CargoPath n) => n?.id ?? 0, () =>
{
cargoTraffic.pathCapacity = 0;
cargoTraffic.SetPathCapacity(16);
},
ref cargoTraffic.pathPool, ref cargoTraffic.pathCursor,
ref cargoTraffic.pathPool, ref cargoTraffic.pathCursor, ref cargoTraffic.pathCapacity,
ref cargoTraffic.pathRecycle, ref cargoTraffic.pathRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(cargoTraffic.pathPool)}` on Planet {planet.planetId}");
if (OptimizePool((in SplitterComponent n, int index) => n.id == index, () =>
if (OptimizePool((in SplitterComponent n) => n.id, () =>
{
cargoTraffic.splitterCapacity = 0;
cargoTraffic.SetSplitterCapacity(16);
},
ref cargoTraffic.splitterPool, ref cargoTraffic.splitterCursor,
ref cargoTraffic.splitterPool, ref cargoTraffic.splitterCursor, ref cargoTraffic.splitterCapacity,
ref cargoTraffic.splitterRecycle, ref cargoTraffic.splitterRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(cargoTraffic.splitterPool)}` on Planet {planet.planetId}");
if (OptimizePool((in MonitorComponent n, int index) => n.id == index, () =>
if (OptimizePool((in MonitorComponent n) => n.id, () =>
{
cargoTraffic.monitorCapacity = 0;
cargoTraffic.SetMonitorCapacity(16);
},
ref cargoTraffic.monitorPool, ref cargoTraffic.monitorCursor,
ref cargoTraffic.monitorPool, ref cargoTraffic.monitorCursor, ref cargoTraffic.monitorCapacity,
ref cargoTraffic.monitorRecycle, ref cargoTraffic.monitorRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(cargoTraffic.monitorPool)}` on Planet {planet.planetId}");
if (OptimizePool((in SpraycoaterComponent n, int index) => n.id == index, () =>
if (OptimizePool((in SpraycoaterComponent n) => n.id, () =>
{
cargoTraffic.spraycoaterCapacity = 0;
cargoTraffic.SetSpraycoaterCapacity(16);
},
ref cargoTraffic.spraycoaterPool, ref cargoTraffic.spraycoaterCursor,
ref cargoTraffic.spraycoaterPool, ref cargoTraffic.spraycoaterCursor, ref cargoTraffic.spraycoaterCapacity,
ref cargoTraffic.spraycoaterRecycle, ref cargoTraffic.spraycoaterRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(cargoTraffic.spraycoaterPool)}` on Planet {planet.planetId}");
if (OptimizePool((in PilerComponent n, int index) => n.id == index, () =>
if (OptimizePool((in PilerComponent n) => n.id, () =>
{
cargoTraffic.pilerCapacity = 0;
cargoTraffic.SetPilerCapacity(16);
},
ref cargoTraffic.pilerPool, ref cargoTraffic.pilerCursor,
ref cargoTraffic.pilerPool, ref cargoTraffic.pilerCursor, ref cargoTraffic.pilerCapacity,
ref cargoTraffic.pilerRecycle, ref cargoTraffic.pilerRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(cargoTraffic.pilerPool)}` on Planet {planet.planetId}");
}
var factoryStorage = planet.factoryStorage;
if (factoryStorage != null)
{
if (OptimizePool((in StorageComponent n, int index) => (n?.id ?? 0) == index, () =>
if (OptimizePool((in StorageComponent n) => n?.id ?? 0, () =>
{
factoryStorage.storageCapacity = 0;
factoryStorage.SetStorageCapacity(64);
},
ref factoryStorage.storagePool, ref factoryStorage.storageCursor,
ref factoryStorage.storagePool, ref factoryStorage.storageCursor, ref factoryStorage.storageCapacity,
ref factoryStorage.storageRecycle, ref factoryStorage.storageRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(factoryStorage.storagePool)}` on Planet {planet.planetId}");
if (OptimizePool((in TankComponent n, int index) => n.id == index, () =>
if (OptimizePool((in TankComponent n) => n.id, () =>
{
factoryStorage.tankCapacity = 0;
factoryStorage.SetTankCapacity(256);
},
ref factoryStorage.tankPool, ref factoryStorage.tankCursor,
ref factoryStorage.tankPool, ref factoryStorage.tankCursor, ref factoryStorage.tankCapacity,
ref factoryStorage.tankRecycle, ref factoryStorage.tankRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(factoryStorage.tankPool)}` on Planet {planet.planetId}");
}
var factorySystem = planet.factorySystem;
if (factorySystem != null)
{
if (OptimizePool((in MinerComponent n, int index) => n.id == index, () =>
if (OptimizePool((in MinerComponent n) => n.id, () =>
{
factorySystem.minerCapacity = 0;
factorySystem.SetMinerCapacity(256);
},
ref factorySystem.minerPool, ref factorySystem.minerCursor,
ref factorySystem.minerPool, ref factorySystem.minerCursor, ref factorySystem.minerCapacity,
ref factorySystem.minerRecycle, ref factorySystem.minerRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(factorySystem.minerPool)}` on Planet {planet.planetId}");
if (OptimizePool((in InserterComponent n, int index) => n.id == index, () =>
if (OptimizePool((in InserterComponent n) => n.id, () =>
{
factorySystem.inserterCapacity = 0;
factorySystem.SetInserterCapacity(256);
},
ref factorySystem.inserterPool, ref factorySystem.inserterCursor,
ref factorySystem.inserterPool, ref factorySystem.inserterCursor, ref factorySystem.inserterCapacity,
ref factorySystem.inserterRecycle, ref factorySystem.inserterRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(factorySystem.inserterPool)}` on Planet {planet.planetId}");
if (OptimizePool((in AssemblerComponent n, int index) => n.id == index, () =>
if (OptimizePool((in AssemblerComponent n) => n.id, () =>
{
factorySystem.assemblerCapacity = 0;
factorySystem.SetAssemblerCapacity(256);
},
ref factorySystem.assemblerPool, ref factorySystem.assemblerCursor,
ref factorySystem.assemblerPool, ref factorySystem.assemblerCursor, ref factorySystem.assemblerCapacity,
ref factorySystem.assemblerRecycle, ref factorySystem.assemblerRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(factorySystem.assemblerPool)}` on Planet {planet.planetId}");
if (OptimizePool((in FractionatorComponent n, int index) => n.id == index, () =>
if (OptimizePool((in FractionatorComponent n) => n.id, () =>
{
factorySystem.fractionatorCapacity = 0;
factorySystem.SetFractionatorCapacity(32);
},
ref factorySystem.fractionatorPool, ref factorySystem.fractionatorCursor,
ref factorySystem.fractionatorPool, ref factorySystem.fractionatorCursor, ref factorySystem.fractionatorCapacity,
ref factorySystem.fractionatorRecycle, ref factorySystem.fractionatorRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(factorySystem.fractionatorPool)}` on Planet {planet.planetId}");
if (OptimizePool((in EjectorComponent n, int index) => n.id == index, () =>
if (OptimizePool((in EjectorComponent n) => n.id, () =>
{
factorySystem.ejectorCapacity = 0;
factorySystem.SetEjectorCapacity(32);
},
ref factorySystem.ejectorPool, ref factorySystem.ejectorCursor,
ref factorySystem.ejectorPool, ref factorySystem.ejectorCursor, ref factorySystem.ejectorCapacity,
ref factorySystem.ejectorRecycle, ref factorySystem.ejectorRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(factorySystem.ejectorPool)}` on Planet {planet.planetId}");
if (OptimizePool((in SiloComponent n, int index) => n.id == index, () =>
if (OptimizePool((in SiloComponent n) => n.id, () =>
{
factorySystem.siloCapacity = 0;
factorySystem.SetSiloCapacity(32);
},
ref factorySystem.siloPool, ref factorySystem.siloCursor,
ref factorySystem.siloPool, ref factorySystem.siloCursor, ref factorySystem.siloCapacity,
ref factorySystem.siloRecycle, ref factorySystem.siloRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(factorySystem.siloPool)}` on Planet {planet.planetId}");
if (OptimizePool((in LabComponent n, int index) => n.id == index, () =>
if (OptimizePool((in LabComponent n) => n.id, () =>
{
factorySystem.labCapacity = 0;
factorySystem.SetLabCapacity(256);
},
ref factorySystem.labPool, ref factorySystem.labCursor,
ref factorySystem.labPool, ref factorySystem.labCursor, ref factorySystem.labCapacity,
ref factorySystem.labRecycle, ref factorySystem.labRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(factorySystem.labPool)}` on Planet {planet.planetId}");
}
var transport = planet.transport;
if (transport != null)
{
if (OptimizePool((in StationComponent n, int index) => (n?.id ?? 0) == index, () =>
if (OptimizePool((in StationComponent n) => n?.id ?? 0, () =>
{
transport.stationCapacity = 0;
transport.SetStationCapacity(16);
},
ref transport.stationPool, ref transport.stationCursor,
ref transport.stationPool, ref transport.stationCursor, ref transport.stationCapacity,
ref transport.stationRecycle, ref transport.stationRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(transport.stationPool)}` on Planet {planet.planetId}");
if (OptimizePool((in DispenserComponent n, int index) => (n?.id ?? 0) == index, () =>
if (OptimizePool((in DispenserComponent n) => n?.id ?? 0, () =>
{
transport.dispenserCapacity = 0;
transport.SetDispenserCapacity(8);
},
ref transport.dispenserPool, ref transport.dispenserCursor,
ref transport.dispenserPool, ref transport.dispenserCursor, ref transport.dispenserCapacity,
ref transport.dispenserRecycle, ref transport.dispenserRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(transport.dispenserPool)}` on Planet {planet.planetId}");
}
@@ -202,54 +202,54 @@ public class PoolOptPatch : BaseUnityPlugin
var powerSystem = planet.powerSystem;
if (powerSystem != null)
{
if (OptimizePool((in PowerGeneratorComponent n, int index) => n.id == index, () =>
if (OptimizePool((in PowerGeneratorComponent n) => n.id, () =>
{
powerSystem.genCapacity = 0;
powerSystem.SetGeneratorCapacity(8);
},
ref powerSystem.genPool, ref powerSystem.genCursor,
ref powerSystem.genPool, ref powerSystem.genCursor, ref powerSystem.genCapacity,
ref powerSystem.genRecycle, ref powerSystem.genRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(powerSystem.genPool)}` on Planet {planet.planetId}");
if (OptimizePool((in PowerNodeComponent n, int index) => n.id == index, () =>
if (OptimizePool((in PowerNodeComponent n) => n.id, () =>
{
powerSystem.nodeCapacity = 0;
powerSystem.SetNodeCapacity(8);
},
ref powerSystem.nodePool, ref powerSystem.nodeCursor,
ref powerSystem.nodePool, ref powerSystem.nodeCursor, ref powerSystem.nodeCapacity,
ref powerSystem.nodeRecycle, ref powerSystem.nodeRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(powerSystem.nodePool)}` on Planet {planet.planetId}");
if (OptimizePool((in PowerConsumerComponent n, int index) => n.id == index, () =>
if (OptimizePool((in PowerConsumerComponent n) => n.id, () =>
{
powerSystem.consumerCapacity = 0;
powerSystem.SetConsumerCapacity(8);
},
ref powerSystem.consumerPool, ref powerSystem.consumerCursor,
ref powerSystem.consumerPool, ref powerSystem.consumerCursor, ref powerSystem.consumerCapacity,
ref powerSystem.consumerRecycle, ref powerSystem.consumerRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(powerSystem.consumerPool)}` on Planet {planet.planetId}");
if (OptimizePool((in PowerAccumulatorComponent n, int index) => n.id == index, () =>
if (OptimizePool((in PowerAccumulatorComponent n) => n.id, () =>
{
powerSystem.accCapacity = 0;
powerSystem.SetAccumulatorCapacity(8);
},
ref powerSystem.accPool, ref powerSystem.accCursor,
ref powerSystem.accPool, ref powerSystem.accCursor, ref powerSystem.accCapacity,
ref powerSystem.accRecycle, ref powerSystem.accRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(powerSystem.accPool)}` on Planet {planet.planetId}");
if (OptimizePool((in PowerExchangerComponent n, int index) => n.id == index, () =>
if (OptimizePool((in PowerExchangerComponent n) => n.id, () =>
{
powerSystem.excCapacity = 0;
powerSystem.SetExchangerCapacity(8);
},
ref powerSystem.excPool, ref powerSystem.excCursor,
ref powerSystem.excPool, ref powerSystem.excCursor, ref powerSystem.excCapacity,
ref powerSystem.excRecycle, ref powerSystem.excRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(powerSystem.excPool)}` on Planet {planet.planetId}");
if (OptimizePool((in PowerNetwork n, int index) => (n?.id ?? 0) == index, () =>
if (OptimizePool((in PowerNetwork n) => n?.id ?? 0, () =>
{
powerSystem.netCapacity = 0;
powerSystem.SetNetworkCapacity(8);
powerSystem.netPool[0] = new PowerNetwork();
powerSystem.netPool[0].Reset(0);
},
ref powerSystem.netPool, ref powerSystem.netCursor,
ref powerSystem.netPool, ref powerSystem.netCursor, ref powerSystem.netCapacity,
ref powerSystem.netRecycle, ref powerSystem.netRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(powerSystem.netPool)}` on Planet {planet.planetId}");
}
@@ -257,12 +257,12 @@ public class PoolOptPatch : BaseUnityPlugin
var trashContainer = GameMain.data.trashSystem?.container;
if (trashContainer != null)
{
if (OptimizePool((in TrashObject n, int index) => n.item != 0, () =>
if (OptimizePool((in TrashObject n) => n.item == 0, () =>
{
trashContainer.trashCapacity = 0;
trashContainer.SetTrashCapacity(16);
},
ref trashContainer.trashObjPool, ref trashContainer.trashCursor,
ref trashContainer.trashObjPool, ref trashContainer.trashCursor, ref trashContainer.trashCapacity,
ref trashContainer.trashRecycle, ref trashContainer.trashRecycleCursor))
{
Logger.LogDebug($"Optimized `{nameof(trashContainer.trashObjPool)}`");
@@ -271,12 +271,12 @@ public class PoolOptPatch : BaseUnityPlugin
var warningSystem = GameMain.data.warningSystem;
if (warningSystem != null)
{
if (OptimizePool((in WarningData n, int index) => n.id == index, () =>
if (OptimizePool((in WarningData n) => n.id, () =>
{
warningSystem.warningCapacity = 0;
warningSystem.SetWarningCapacity(32);
},
ref warningSystem.warningPool, ref warningSystem.warningCursor,
ref warningSystem.warningPool, ref warningSystem.warningCursor, ref warningSystem.warningCapacity,
ref warningSystem.warningRecycle, ref warningSystem.warningRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(warningSystem.warningPool)}`");
}
@@ -286,48 +286,48 @@ public class PoolOptPatch : BaseUnityPlugin
foreach (var dysonSphere in dysonSpheres)
{
if (dysonSphere == null) continue;
if (OptimizePool((in DysonRocket n, int index) => n.id == index, () =>
if (OptimizePool((in DysonRocket n) => n.id, () =>
{
dysonSphere.rocketCapacity = 0;
dysonSphere.SetRocketCapacity(256);
},
ref dysonSphere.rocketPool, ref dysonSphere.rocketCursor,
ref dysonSphere.rocketPool, ref dysonSphere.rocketCursor, ref dysonSphere.rocketCapacity,
ref dysonSphere.rocketRecycle, ref dysonSphere.rocketRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(dysonSphere.rocketPool)}` on Star {dysonSphere.starData.id}");
if (OptimizePool((in DysonNodeRData n, int index) => n.id == index, () =>
if (OptimizePool((in DysonNodeRData n) => n.id, () =>
{
dysonSphere.nrdCapacity = 0;
dysonSphere.SetNrdCapacity(128);
},
ref dysonSphere.nrdPool, ref dysonSphere.nrdCursor,
ref dysonSphere.nrdPool, ref dysonSphere.nrdCursor, ref dysonSphere.nrdCapacity,
ref dysonSphere.nrdRecycle, ref dysonSphere.nrdRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(dysonSphere.nrdPool)}` on Star {dysonSphere.starData.id}");
if (dysonSphere.layersIdBased == null) continue;
foreach (var layer in dysonSphere.layersSorted)
{
if (layer == null) continue;
if (OptimizePool((in DysonNode n, int index) => (n?.id ?? 0) == index, () =>
if (OptimizePool((in DysonNode n) => n?.id ?? 0, () =>
{
layer.nodeCapacity = 64;
layer.SetNodeCapacity(64);
},
ref layer.nodePool, ref layer.nodeCursor,
ref layer.nodePool, ref layer.nodeCursor, ref layer.nodeCapacity,
ref layer.nodeRecycle, ref layer.nodeRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(layer.nodePool)}` on Star {dysonSphere.starData.id} layer {layer.id}");
if (OptimizePool((in DysonFrame n, int index) => (n?.id ?? 0) == index, () =>
if (OptimizePool((in DysonFrame n) => n?.id ?? 0, () =>
{
layer.frameCapacity = 64;
layer.SetFrameCapacity(64);
},
ref layer.framePool, ref layer.frameCursor,
ref layer.framePool, ref layer.frameCursor, ref layer.frameCapacity,
ref layer.frameRecycle, ref layer.frameRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(layer.framePool)}` on Star {dysonSphere.starData.id} layer {layer.id}");
if (OptimizePool((in DysonShell n, int index) => (n?.id ?? 0) == index, () =>
if (OptimizePool((in DysonShell n) => n?.id ?? 0, () =>
{
layer.shellCapacity = 64;
layer.SetShellCapacity(64);
},
ref layer.shellPool, ref layer.shellCursor,
ref layer.shellPool, ref layer.shellCursor, ref layer.shellCapacity,
ref layer.shellRecycle, ref layer.shellRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(layer.shellPool)}` on Star {dysonSphere.starData.id} layer {layer.id}");
}
@@ -335,12 +335,12 @@ public class PoolOptPatch : BaseUnityPlugin
var swarm = dysonSphere.swarm;
if (swarm != null)
{
if (OptimizePool((in SailBullet n, int index) => n.id == index, () =>
if (OptimizePool((in SailBullet n) => n.id, () =>
{
swarm.bulletCapacity = 0;
swarm.SetBulletCapacity(128);
},
ref swarm.bulletPool, ref swarm.bulletCursor,
ref swarm.bulletPool, ref swarm.bulletCursor, ref swarm.bulletCapacity,
ref swarm.bulletRecycle, ref swarm.bulletRecycleCursor))
Logger.LogDebug($"Optimized `{nameof(swarm.bulletPool)}` on Star {dysonSphere.starData.id}");
}
@@ -350,10 +350,12 @@ public class PoolOptPatch : BaseUnityPlugin
GC.Collect();
}
private delegate bool IsOccupied<T>(in T s, int index);
private delegate int GetId<T>(in T s);
private delegate void SetToInitialCapacity();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static bool OptimizePool<T>(IsOccupied<T> isOccupied, Action initCapacity, ref T[] pool, ref int cursor, ref int[] recycle, ref int recycleCursor)
private static bool OptimizePool<T>(GetId<T> getter, SetToInitialCapacity initCapacity, ref T[] pool, ref int cursor, ref int capacity, ref int[] recycle, ref int recycleCursor)
{
if (cursor <= 1) return false;
if (recycleCursor == cursor - 1)
@@ -367,7 +369,7 @@ public class PoolOptPatch : BaseUnityPlugin
var pos = cursor - 1;
while (pos > 0)
{
if (isOccupied(pool[pos], pos)) break;
if (getter(pool[pos]) == pos) break;
pos--;
}
@@ -389,4 +391,41 @@ public class PoolOptPatch : BaseUnityPlugin
return true;
}
}
private delegate bool IsEmpty<T>(in T s);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static bool OptimizePool<T>(IsEmpty<T> checker, SetToInitialCapacity initCapacity, ref T[] pool, ref int cursor, ref int capacity, ref int[] recycle, ref int recycleCursor)
{
if (cursor <= 1) return false;
if (recycleCursor == cursor - 1)
{
cursor = 1;
recycleCursor = 0;
initCapacity();
Logger.LogDebug("Resetted pool to initial status");
return true;
}
var pos = cursor - 1;
while (pos > 0)
{
if (!checker(pool[pos])) break;
pos--;
}
if (pos + 1 == cursor) return false;
if (pos == 0)
{
cursor = 1;
recycleCursor = 0;
initCapacity();
return true;
}
cursor = pos + 1;
Array.Sort(recycle, 0, recycleCursor);
var idx = Array.BinarySearch(recycle, 0, recycleCursor, pos + 1);
recycleCursor = idx < 0 ? ~idx : idx;
Logger.LogDebug($"Shrinked pool size to {cursor} and recycle size to {recycleCursor}");
return true;
}
}
+15
View File
@@ -133,6 +133,21 @@ public static class I18N
ApplyIndexers();
}
/// <summary>
/// Returns the localized text for the given key in the currently active language,
/// falling back to the key itself when no entry is registered.
/// </summary>
/// <param name="key">The lookup key.</param>
/// <returns>The localized text, or <paramref name="key"/> if no entry exists.</returns>
internal static string Translate(string key)
{
if (!Entries.TryGetValue(key, out var loc)) return key;
var languageIndex = Localization.currentLanguageIndex;
if (languageIndex >= 0 && languageIndex < Localization.Languages.Length && Localization.Languages[languageIndex].lcId == 2052)
return loc.Zh;
return loc.En;
}
[HarmonyPostfix, HarmonyPriority(Priority.Last), HarmonyPatch(typeof(Localization), nameof(Localization.LoadSettings))]
private static void Localization_LoadSettings_Postfix()
{
+4 -4
View File
@@ -2,8 +2,8 @@ namespace UXAssist.Common;
public enum KnownItemId : int
{
Drone = GameConstants.ItemIds.LogisticsDrone,
Ship = GameConstants.ItemIds.LogisticsVessel,
Bot = GameConstants.ItemIds.LogisticsBot,
Warper = GameConstants.ItemIds.SpaceWarper,
Drone = 5001,
Ship = 5002,
Bot = 5003,
Warper = 1210,
}
+6
View File
@@ -80,6 +80,12 @@ public static class WinApi
#endregion
#region Errors
private const int ERROR_INSUFFICIENT_BUFFER = 122;
#endregion
#region Structs
[StructLayout(LayoutKind.Sequential)]
+12
View File
@@ -27,6 +27,14 @@ internal static class MenuButtonUI
I18N.OnInitialized += RecreateConfigWindow;
}
public static void Start()
{
}
public static void Uninit()
{
}
public static void OnInputUpdate()
{
if (_toggleKey.keyValue)
@@ -35,6 +43,10 @@ internal static class MenuButtonUI
}
}
public static void OnUpdate()
{
}
public static void ToggleConfigWindow()
{
if (!_configWinInitialized)
+12
View File
@@ -35,6 +35,10 @@ internal static class MilkyWayUI
GameLogicProc.OnGameEnd += ResetState;
}
public static void Start()
{
}
public static void Uninit()
{
GameLogicProc.OnGameEnd -= ResetState;
@@ -46,6 +50,14 @@ internal static class MilkyWayUI
_topTenPlayerData = null;
}
public static void OnInputUpdate()
{
}
public static void OnUpdate()
{
}
public static void AddClusterUploadResult(int result, float requestTime)
{
lock (_clusterUploadResultsLock)
+20
View File
@@ -58,6 +58,26 @@ internal static class StarmapFilterUI
{1000, 23},
};
public static void Init()
{
}
public static void Start()
{
}
public static void Uninit()
{
}
public static void OnInputUpdate()
{
}
public static void OnUpdate()
{
}
public static void InitStarmapButtons()
{
var uiRoot = UIRoot.instance;
+11
View File
@@ -10,6 +10,7 @@ public static class UIFunctions
public static void Init()
{
MenuButtonUI.Init();
StarmapFilterUI.Init();
MilkyWayUI.Init();
UXAssist.RegisterExporter(ExportClusterUploadResults);
@@ -18,22 +19,32 @@ public static class UIFunctions
public static void Start()
{
MenuButtonUI.Start();
StarmapFilterUI.Start();
MilkyWayUI.Start();
}
public static void Uninit()
{
MenuButtonUI.Uninit();
StarmapFilterUI.Uninit();
MilkyWayUI.Uninit();
}
public static void OnInputUpdate()
{
MenuButtonUI.OnInputUpdate();
StarmapFilterUI.OnInputUpdate();
MilkyWayUI.OnInputUpdate();
}
public static void OnUpdate()
{
MenuButtonUI.OnUpdate();
AutoCruiseUI.OnUpdate();
AutoConstructUI.OnUpdate();
StarmapFilterUI.OnUpdate();
MilkyWayUI.OnUpdate();
}
public static void InitMenuButtons()
+13
View File
@@ -46,6 +46,19 @@ public static class WindowFunctions
process.PriorityClass = (ProcessPriorityClass)ProrityFlags[ProcessPriority.Value];
}
private static string GetPriorityName(int priority)
{
return priority switch
{
WinApi.HIGH_PRIORITY_CLASS => I18NKeys.High.Translate(),
WinApi.ABOVE_NORMAL_PRIORITY_CLASS => I18NKeys.AboveNormal.Translate(),
WinApi.NORMAL_PRIORITY_CLASS => I18NKeys.Normal.Translate(),
WinApi.BELOW_NORMAL_PRIORITY_CLASS => I18NKeys.BelowNormal.Translate(),
WinApi.IDLE_PRIORITY_CLASS => I18NKeys.Idle.Translate(),
_ => I18NKeys.Unknown.Translate()
};
}
public static void SetWindowTitle()
{
// Get profile name from command line arguments, and set window title accordingly
@@ -10,6 +10,15 @@ namespace UXAssist.Patches.Factory;
internal static class ArchitectModePatch
{
public static void Enable(bool enable)
{
UnlimitInteractive.Enable(enable);
RemoveSomeConditionBuild.Enable(enable);
RemoveBuildRangeLimit.Enable(enable);
LargerAreaForUpgradeAndDismantle.Enable(enable);
LargerAreaForTerraform.Enable(enable);
}
internal class UnlimitInteractive : PatchImpl<UnlimitInteractive>
{
// Harmony transpiler: PlayerAction_Inspect_GetObjectSelectDistance_Transpiler
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using HarmonyLib;
using UXAssist.Common;
@@ -13,6 +14,11 @@ namespace UXAssist.Patches.Factory;
[ModFeature("BeltSignalsForBuyOut")]
internal static class BeltSignalPatch
{
public static void Enable(bool enable)
{
BeltSignalsForBuyOut.Enable(enable);
}
public static void InitPersist()
{
BeltSignalsForBuyOut.InitPersist();
@@ -119,6 +125,23 @@ internal static class BeltSignalPatch
_loaded = true;
}
private static void RemoveBeltSignalProtos()
{
if (!_initialized || !_loaded) return;
var signals = LDB._signals;
if (signals.dataIndices.TryGetValue(301, out var index))
{
signals.dataArray = [.. signals.dataArray.Take(index), .. signals.dataArray.Skip(index + 6)];
for (var id = 301; id <= 306; id++)
signals.dataIndices.Remove(id);
var len = signals.dataArray.Length;
for (; index < len; index++)
signals.dataIndices[signals.dataArray[index].ID] = index;
}
_loaded = false;
}
private static void InitSignalBelts()
{
if (!GameMain.isRunning) return;
@@ -79,6 +79,8 @@ internal static class BuildToolPatch
internal class OffGridBuilding : PatchImpl<OffGridBuilding>
{
// private const float SteppedRotationDegrees = 15f;
private static bool _initialized;
private static void SetupRichTextSupport()
@@ -290,6 +292,62 @@ internal static class BuildToolPatch
return matcher.InstructionEnumeration();
}
/*
public static IEnumerable<CodeInstruction> PatchToPerformSteppedRotate(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
{
var matcher = new CodeMatcher(instructions, generator);
MatchIgnoreGridAndCheckIfRotatable(matcher, out var ifBlockEntryLabel, out var elseBlockEntryLabel);
if (matcher.IsInvalid)
return instructions;
while (!matcher.Labels.Contains(elseBlockEntryLabel.Value))
matcher.Advance(1);
Label? ifBlockExitLabel = null;
matcher.MatchBack(false, new CodeMatch(ci => ci.Branches(out ifBlockExitLabel)));
if (matcher.IsInvalid)
return instructions;
while (!matcher.Labels.Contains(ifBlockEntryLabel.Value))
matcher.Advance(-1);
var instructionToClone = matcher.Instruction.Clone();
var overwriteWith = CodeInstruction.LoadField(typeof(VFInput), nameof(VFInput.control));
matcher.SetAndAdvance(overwriteWith.opcode, overwriteWith.operand);
matcher.Insert(instructionToClone);
matcher.CreateLabel(out var existingEntryLabel);
matcher.InsertAndAdvance(
new CodeInstruction(OpCodes.Brfalse, existingEntryLabel),
new CodeInstruction(OpCodes.Ldarg_0),
CodeInstruction.Call(typeof(OffGridBuilding), nameof(RotateStepped)),
new CodeInstruction(OpCodes.Br, ifBlockExitLabel)
);
return matcher.InstructionEnumeration();
}
public static void RotateStepped(BuildTool_Click instance)
{
if (VFInput._rotate.onDown)
{
instance.yaw += SteppedRotationDegrees;
instance.yaw = Mathf.Repeat(instance.yaw, 360f);
instance.yaw = Mathf.Round(instance.yaw / SteppedRotationDegrees) * SteppedRotationDegrees;
}
if (VFInput._counterRotate.onDown)
{
instance.yaw -= SteppedRotationDegrees;
instance.yaw = Mathf.Repeat(instance.yaw, 360f);
instance.yaw = Mathf.Round(instance.yaw / SteppedRotationDegrees) * SteppedRotationDegrees;
}
}
*/
}
internal class TreatStackingAsSingle : PatchImpl<TreatStackingAsSingle>
@@ -8,6 +8,11 @@ namespace UXAssist.Patches.Factory;
internal static class BuildingBufferPatch
{
public static void Enable(bool enable)
{
TweakBuildingBuffer.Enable(enable);
}
internal class TweakBuildingBuffer : PatchImpl<TweakBuildingBuffer>
{
public static void RefreshAssemblerBufferMultipliers()
@@ -10,6 +10,11 @@ namespace UXAssist.Patches.Factory;
[ModFeature("VeinProtection")]
internal static partial class VeinProtectionPatch
{
public static void Enable(bool enable)
{
ProtectVeinsFromExhaustion.Enable(enable);
}
public static void InitConfig()
{
ProtectVeinsFromExhaustion.InitConfig();
+143
View File
@@ -19,6 +19,7 @@ public class GamePatch : PatchImpl<GamePatch>
public static ConfigEntry<bool> EnableWindowResizeEnabled;
public static ConfigEntry<bool> LoadLastWindowRectEnabled;
// public static ConfigEntry<bool> AutoSaveOptEnabled;
public static ConfigEntry<bool> ConvertSavesFromPeaceEnabled;
public static ConfigEntry<Vector4> LastWindowRect;
public static ConfigEntry<bool> ProfileBasedSaveFolderEnabled;
@@ -80,6 +81,7 @@ public class GamePatch : PatchImpl<GamePatch>
FixLastWindowRect();
}
};
// AutoSaveOptEnabled.SettingChanged += (_, _) => AutoSaveOpt.Enable(AutoSaveOptEnabled.Value);
ConvertSavesFromPeaceEnabled.SettingChanged += (_, _) => ConvertSavesFromPeace.Enable(ConvertSavesFromPeaceEnabled.Value);
ProfileBasedSaveFolderEnabled.SettingChanged += (_, _) => RefreshSavePath();
ProfileBasedOptionEnabled.SettingChanged += (_, _) => ProfileBasedOption.Enable(ProfileBasedOptionEnabled.Value);
@@ -110,6 +112,7 @@ public class GamePatch : PatchImpl<GamePatch>
}
}
EnableWindowResize.Enable(EnableWindowResizeEnabled.Value);
// AutoSaveOpt.Enable(AutoSaveOptEnabled.Value);
ConvertSavesFromPeace.Enable(ConvertSavesFromPeaceEnabled.Value);
Enable(true);
@@ -120,6 +123,7 @@ public class GamePatch : PatchImpl<GamePatch>
{
Enable(false);
EnableWindowResize.Enable(false);
// AutoSaveOpt.Enable(false);
ConvertSavesFromPeace.Enable(false);
}
@@ -307,6 +311,145 @@ public class GamePatch : PatchImpl<GamePatch>
}
}
/*
private class AutoSaveOpt: PatchImpl<AutoSaveOpt>
{
protected override void OnEnable()
{
Directory.CreateDirectory(GameConfig.gameSaveFolder + "AutoSaves/");
}
[HarmonyPrefix]
[HarmonyPatch(typeof(GameSave), nameof(GameSave.AutoSave))]
private static bool GameSave_AutoSave_Prefix(ref bool __result)
{
if (!GameSave.SaveCurrentGame(GameSave.AutoSaveTmp))
{
GlobalObject.SaveOpCounter();
__result = false;
return false;
}
var tmpFilename = GameConfig.gameSaveFolder + GameSave.AutoSaveTmp + GameSave.saveExt;
var targetFilename = $"{GameConfig.gameSaveFolder}AutoSaves/[{GameMain.data.gameDesc.clusterString}] {DateTime.Now:yyyy-MM-dd_hh-mm-ss}{GameSave.saveExt}";
File.Move(tmpFilename, targetFilename);
__result = true;
return false;
}
[HarmonyPostfix]
[HarmonyPatch(typeof(UILoadGameWindow), nameof(UILoadGameWindow.RefreshList))]
public static void UILoadGameWindow_RefreshList_Postfix(UILoadGameWindow __instance)
{
var baseDir = GameConfig.gameSaveFolder + "AutoSaves/";
var files = Directory.GetFiles(baseDir, "*" + GameSave.saveExt, SearchOption.TopDirectoryOnly);
var entries = __instance.entries;
var entries2 = new List<UIGameSaveEntry>();
var entryPrefab = __instance.entryPrefab;
var entryPrefabParent = entryPrefab.transform.parent;
foreach (var f in files)
{
var fileInfo = new FileInfo(f);
var entry = Object.Instantiate(entryPrefab, entryPrefabParent);
entry.fileInfo = fileInfo;
entries2.Add(entry);
}
entries2.Sort((x, y) => -x.fileDate.CompareTo(y.fileDate));
if (entries2.Count > 10)
entries2.RemoveRange(10, entries2.Count - 10);
var autoSaveText = ">> " + I18NKeys.AutoSaveEntry.Translate();
foreach (var entry in entries2)
{
entry.indexText.text = "";
var saveName = entry.saveName;
entry._saveName = $"AutoSaves/{saveName}";
var quoteIndex = saveName.IndexOf('[');
if (quoteIndex >= 0)
{
var quoteIndex2 = saveName.IndexOf(']', quoteIndex + 1);
if (quoteIndex2 > 0) saveName = saveName.Substring(quoteIndex, quoteIndex2 + 1 - quoteIndex);
}
entry.nameText.text = $"{autoSaveText} {saveName}";
entry.nameText.fontStyle = FontStyle.Italic;
entry.nameText.color = new Color(1f, 1f, 1f, 0.7f);
entry.timeText.text = $"{entry.fileDate:yyyy-MM-dd HH:mm:ss}";
GameSave.ReadModes(entry.fileInfo.FullName, out var isSandbox, out var isPeace);
if (entry.sandboxIcon != null)
{
entry.sandboxIcon.gameObject.SetActive(isSandbox);
}
if (entry.combatIcon != null)
{
entry.combatIcon.gameObject.SetActive(!isPeace);
}
entry.selected = false;
entry.gameObject.SetActive(true);
}
entries.AddRange(entries2);
entries.Sort((x, y) => -x.fileDate.CompareTo(y.fileDate));
var displayIndex = 1;
for (var i = 0; i < entries.Count; i++)
{
var entry = entries[i];
entry.index = i + 1;
entry.rectTrans.anchoredPosition = new Vector2(entry.rectTrans.anchoredPosition.x, -40 * i);
if (string.IsNullOrEmpty(entry.indexText.text)) continue;
entry.indexText.text = displayIndex.ToString();
displayIndex++;
}
}
[HarmonyPostfix]
[HarmonyPatch(typeof(UISaveGameWindow), nameof(UISaveGameWindow.RefreshList))]
public static void UISaveGameWindow_RefreshList_Postfix(UISaveGameWindow __instance)
{
var entries = __instance.entries;
entries.Sort((x, y) => -x.fileDate.CompareTo(y.fileDate));
for (var i = 0; i < entries.Count; i++)
{
var entry = entries[i];
entry.index = i + 1;
entry.rectTrans.anchoredPosition = new Vector2(entry.rectTrans.anchoredPosition.x, -40 * i);
entry.indexText.text = (i + 1).ToString();
}
}
// Harmony transpiler: UILoadGameWindow_ReplaceSaveName_Transpiler
// Target: UILoadGameWindow.DoLoadSelectedGame, UILoadGameWindow.OnSelectedChange
// Fallback: None — patch will fail loudly if the target method body changes.
[HarmonyTranspiler]
[HarmonyPatch(typeof(UILoadGameWindow), nameof(UILoadGameWindow.DoLoadSelectedGame))]
[HarmonyPatch(typeof(UILoadGameWindow), nameof(UILoadGameWindow.OnSelectedChange))]
private static IEnumerable<CodeInstruction> UILoadGameWindow_ReplaceSaveName_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
{
var matcher = new CodeMatcher(instructions, generator);
matcher.Start().MatchForward(false,
new CodeMatch(OpCodes.Callvirt, AccessTools.PropertyGetter(typeof(UIGameSaveEntry), nameof(UIGameSaveEntry.saveName)))
);
matcher.Repeat(m => m.SetAndAdvance(OpCodes.Ldfld, AccessTools.Field(typeof(UIGameSaveEntry), nameof(UIGameSaveEntry._saveName))));
return matcher.InstructionEnumeration();
}
// Harmony transpiler: GameSave_RemoveValidateOnLoad_Transpiler
// Target: GameSave.LoadCurrentGame, GameSave.LoadGameDesc, GameSave.ReadHeader, GameSave.ReadHeaderAndDescAndProperty, GameSave.SaveExist, GameSave.SavePath
// Fallback: Checks CodeMatcher.IsInvalid/IsValid and returns original instructions on mismatch.
[HarmonyTranspiler]
[HarmonyPatch(typeof(GameSave), nameof(GameSave.LoadCurrentGame))]
[HarmonyPatch(typeof(GameSave), nameof(GameSave.LoadGameDesc))]
[HarmonyPatch(typeof(GameSave), nameof(GameSave.ReadHeader))]
[HarmonyPatch(typeof(GameSave), nameof(GameSave.ReadHeaderAndDescAndProperty))]
[HarmonyPatch(typeof(GameSave), nameof(GameSave.SaveExist))]
[HarmonyPatch(typeof(GameSave), nameof(GameSave.SavePath))]
private static IEnumerable<CodeInstruction> GameSave_RemoveValidateOnLoad_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
{
var matcher = new CodeMatcher(instructions, generator);
matcher.Start().MatchForward(false,
new CodeMatch(OpCodes.Call, AccessTools.Method(typeof(CommonUtils), nameof(CommonUtils.ValidFileName)))
);
matcher.RemoveInstruction();
return matcher.InstructionEnumeration();
}
}
*/
private class ConvertSavesFromPeace : PatchImpl<ConvertSavesFromPeace>
{
private static bool _needConvert;
@@ -639,7 +639,7 @@ internal static class RealtimeLogisticsInfoPanel
|| rectPoint.x is < -4096f or > 4096f
|| rectPoint.y is < -4096f or > 4096f
|| Phys.RayCastSphere(localPosition, vec / magnitude, magnitude, Vector3.zero, realRadius, out _)
|| storageArray.All(storage => storage.itemId == 0))
|| storageArray.Select(x => x.itemId).All(x => x == 0))
{
stationTip.gameObject.SetActive(false);
continue;
+104
View File
@@ -204,6 +204,110 @@ public class PlayerPatch : PatchImpl<PlayerPatch>
{
ShowAllStarsNameStatus = 0;
}
/*
// Harmony transpiler: UIStarmapPlanet__OnLateUpdate_Transpiler
// Target: UIStarmapPlanet._OnLateUpdate
// Fallback: None — patch will fail loudly if the target method body changes.
[HarmonyTranspiler]
[HarmonyPatch(typeof(UIStarmapPlanet), nameof(UIStarmapPlanet._OnLateUpdate))]
private static IEnumerable<CodeInstruction> UIStarmapPlanet__OnLateUpdate_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
{
var matcher = new CodeMatcher(instructions, generator);
matcher.MatchForward(false,
new CodeMatch(OpCodes.Ldarg_0),
new CodeMatch(OpCodes.Ldloc_3),
new CodeMatch(OpCodes.Stfld, AccessTools.Field(typeof(UIStarmapPlanet), nameof(UIStarmapPlanet.projected)))
);
matcher.Advance(3);
matcher.CreateLabel(out var jumpPos1);
matcher.InsertAndAdvance(
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(ShortcutKeysForStarsName), nameof(_showAllStarsNameStatus))),
new CodeInstruction(OpCodes.Ldc_I4_2),
new CodeInstruction(OpCodes.Ceq),
new CodeInstruction(OpCodes.Brfalse, jumpPos1),
new CodeInstruction(OpCodes.Ldc_I4_0),
new CodeInstruction(OpCodes.Stloc_3)
);
matcher.MatchForward(false,
new CodeMatch(OpCodes.Ldarg_0),
new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(UIStarmapPlanet), nameof(UIStarmapPlanet.gameHistory))),
new CodeMatch(OpCodes.Ldarg_0),
new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(UIStarmapPlanet), nameof(UIStarmapPlanet.planet))),
new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(PlanetData), nameof(PlanetData.id))),
new CodeMatch(OpCodes.Callvirt, AccessTools.Field(typeof(GameHistoryData), nameof(GameHistoryData.GetPlanetPin))),
new CodeMatch(OpCodes.Ldc_I4_1),
new CodeMatch(ci => ci.Branches(out _)),
new CodeMatch(OpCodes.Ldc_I4_1),
new CodeMatch(ci => ci.IsStloc()),
new CodeMatch(ci => ci.Branches(out _))
);
matcher.CreateLabelAt(matcher.Pos + 8, out var jumpPos);
var labels = matcher.Labels;
matcher.Labels = [];
matcher.InsertAndAdvance(
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(ShortcutKeysForStarsName), nameof(_showAllStarsNameStatus))).WithLabels(labels),
new CodeInstruction(OpCodes.Ldc_I4_1),
new CodeInstruction(OpCodes.Ceq),
new CodeInstruction(OpCodes.Brtrue, jumpPos),
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(PlayerPatch), nameof(_showAllStarsNameKey))),
new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(KeyBindings), nameof(KeyBindings.IsKeyPressing))),
new CodeInstruction(OpCodes.Brtrue, jumpPos)
);
return matcher.InstructionEnumeration();
}
// Harmony transpiler: UIStarmapDFHive__OnLateUpdate_Transpiler
// Target: UIStarmapDFHive._OnLateUpdate
// Fallback: None — patch will fail loudly if the target method body changes.
[HarmonyTranspiler]
[HarmonyPatch(typeof(UIStarmapDFHive), nameof(UIStarmapDFHive._OnLateUpdate))]
private static IEnumerable<CodeInstruction> UIStarmapDFHive__OnLateUpdate_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
{
var matcher = new CodeMatcher(instructions, generator);
matcher.MatchForward(false,
new CodeMatch(OpCodes.Ldarg_0),
new CodeMatch(ci => ci.IsLdloc()),
new CodeMatch(OpCodes.Stfld, AccessTools.Field(typeof(UIStarmapDFHive), nameof(UIStarmapDFHive.projected)))
);
matcher.Advance(3);
matcher.CreateLabel(out var jumpPos1);
matcher.InsertAndAdvance(
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(ShortcutKeysForStarsName), nameof(_showAllStarsNameStatus))),
new CodeInstruction(OpCodes.Ldc_I4_2),
new CodeInstruction(OpCodes.Ceq),
new CodeInstruction(OpCodes.Brfalse, jumpPos1),
new CodeInstruction(OpCodes.Ldc_I4_0),
new CodeInstruction(OpCodes.Stloc_S, 4)
);
matcher.MatchForward(false,
new CodeMatch(OpCodes.Ldarg_0),
new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(UIStarmapDFHive), nameof(UIStarmapDFHive.gameHistory))),
new CodeMatch(OpCodes.Ldarg_0),
new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(UIStarmapDFHive), nameof(UIStarmapDFHive.hive))),
new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(EnemyDFHiveSystem), nameof(EnemyDFHiveSystem.hiveStarId))),
new CodeMatch(OpCodes.Ldc_I4, 1000000),
new CodeMatch(OpCodes.Sub),
new CodeMatch(OpCodes.Callvirt, AccessTools.Field(typeof(GameHistoryData), nameof(GameHistoryData.GetHivePin))),
new CodeMatch(OpCodes.Ldc_I4_1),
new CodeMatch(ci => ci.Branches(out _)),
new CodeMatch(OpCodes.Ldc_I4_1),
new CodeMatch(ci => ci.IsStloc()),
new CodeMatch(ci => ci.Branches(out _))
);
matcher.CreateLabelAt(matcher.Pos + 10, out var jumpPos);
var labels = matcher.Labels;
matcher.Labels = [];
matcher.InsertAndAdvance(
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(ShortcutKeysForStarsName), nameof(_showAllStarsNameStatus))).WithLabels(labels),
new CodeInstruction(OpCodes.Ldc_I4_1),
new CodeInstruction(OpCodes.Ceq),
new CodeInstruction(OpCodes.Brtrue, jumpPos),
new CodeInstruction(OpCodes.Ldsfld, AccessTools.Field(typeof(PlayerPatch), nameof(_showAllStarsNameKey))),
new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(KeyBindings), nameof(KeyBindings.IsKeyPressing))),
new CodeInstruction(OpCodes.Brtrue, jumpPos)
);
return matcher.InstructionEnumeration();
}
*/
}
+5
View File
@@ -106,6 +106,11 @@ public class UIPatch : PatchImpl<UIPatch>
}
}
private static Vector2 GetAdjustedSizeDelta(Vector2 origSizeDelta)
{
return new Vector2(origSizeDelta.x + 40f, origSizeDelta.y);
}
protected override void OnDisable()
{
if (planetVeinCount != null)
@@ -88,8 +88,7 @@ public static class BlueprintDescriptionFormatter
var input = new List<string>();
var output = new SortedDictionary<int, double>();
var research = new SortedDictionary<int, double>();
var orderedFlows = report.ItemFlows.Values.OrderBy(flow => flow.ItemId).ToArray();
foreach (var flow in orderedFlows)
foreach (var flow in report.ItemFlows.Values.OrderBy(flow => flow.ItemId))
{
var shortage = Math.Min(flow.IntermediateShortage,
flow.SteadyStateExternalSupply ?? flow.RequiredExternalSupply);
@@ -99,14 +98,14 @@ public static class BlueprintDescriptionFormatter
if (report.MaterialComplete)
{
foreach (var flow in orderedFlows)
foreach (var flow in report.ItemFlows.Values.OrderBy(flow => flow.ItemId))
{
if (flow.OverbuildSurplus.GetValueOrDefault() > Tolerance)
excess.Add(FormatItem(flow.ItemId, flow.OverbuildSurplus.Value, itemTag));
}
}
foreach (var flow in orderedFlows)
foreach (var flow in report.ItemFlows.Values.OrderBy(flow => flow.ItemId))
{
var requiredSupply = flow.SteadyStateExternalSupply ?? flow.RequiredExternalSupply;
if (requiredSupply > Tolerance && flow.IntermediateShortage <= Tolerance)
@@ -119,7 +119,8 @@ public static class ProductionCatalogReader
}
return new ProductionCatalog(items, recipes, buildings,
Cargo.accTableMilli, Cargo.incTableMilli, Cargo.powerTableRatio, technologies, matrixIds);
(double[])Cargo.accTableMilli.Clone(), (double[])Cargo.incTableMilli.Clone(),
(double[])Cargo.powerTableRatio.Clone(), technologies, matrixIds);
}
private static void AddSpecialRecipes(IEnumerable<ItemProto> itemProtos,
+7
View File
@@ -32,6 +32,8 @@ public class MyKeyBinder : MonoBehaviour
[SerializeField] public UIButton setNoneKeyUIButton;
private bool _nextNotOn;
protected void OnDestroy()
{
OnFree?.Invoke();
@@ -221,6 +223,11 @@ public class MyKeyBinder : MonoBehaviour
{
inputUIButton.highlighted = true;
if (!_nextNotOn) return;
_nextNotOn = false;
inputUIButton.highlighted = false;
setTheKeyToggle.isOn = false;
waitingText.gameObject.SetActive(false);
}
public void OnSetDefaultKeyClick(int data)
+28
View File
@@ -559,6 +559,15 @@ public abstract class MyWindowManager
win._Destroy();
}
/*
public static void SetRect(ManualBehaviour win, RectTransform rect)
{
var rectTransform = win.GetComponent<RectTransform>();
//rectTransform.position =
//rectTransform.sizeDelta = rect;
}
*/
public class Patch : PatchImpl<Patch>
{
protected override void OnEnable()
@@ -577,6 +586,14 @@ public abstract class MyWindowManager
Initialized = true;
}
/*
//_Create -> _Init
[HarmonyPostfix, HarmonyPatch(typeof(UIGame), nameof(UIGame._OnCreate))]
public static void UIGame__OnCreate_Postfix()
{
}
*/
[HarmonyPostfix, HarmonyPatch(typeof(UIRoot), nameof(UIRoot._OnDestroy))]
public static void UIRoot__OnDestroy_Postfix()
{
@@ -595,6 +612,17 @@ public abstract class MyWindowManager
InitAllWindows();
}
/*
[HarmonyPostfix, HarmonyPatch(typeof(UIGame), nameof(UIGame._OnFree))]
public static void UIGame__OnFree_Postfix()
{
foreach (var win in Windows)
{
win._Free();
}
}
*/
[HarmonyPostfix, HarmonyPatch(typeof(UIRoot), nameof(UIRoot._OnUpdate))]
public static void UIRoot__OnUpdate_Postfix()
{
+36 -12
View File
@@ -96,19 +96,37 @@ public static class UIConfigWindow
private class AutoConfigDispenserChargePowerMapper() : MyWindow.RangeValueMapper<int>(3, 30)
{
public override string FormatValue(string format, int value) => FormatPower(value * 300000L);
public override string FormatValue(string format, int value)
{
var sb = new StringBuilder(" ");
StringBuilderUtility.WriteKMG(sb, 8, value * 300000L, false);
sb.Append('W');
return sb.ToString().Trim();
}
}
private class AutoConfigBattleBaseChargePowerMapper() : MyWindow.RangeValueMapper<int>(4, 40)
{
public override string FormatValue(string format, int value) => FormatPower(value * 300000L);
public override string FormatValue(string format, int value)
{
var sb = new StringBuilder(" ");
StringBuilderUtility.WriteKMG(sb, 8, value * 300000L, false);
sb.Append('W');
return sb.ToString().Trim();
}
}
private class AutoConfigPLSChargePowerMapper() : MyWindow.RangeValueMapper<int>(2, 20)
{
public override string FormatValue(string format, int value) => FormatPower(value * 3000000L);
public override string FormatValue(string format, int value)
{
var sb = new StringBuilder(" ");
StringBuilderUtility.WriteKMG(sb, 8, value * 3000000L, false);
sb.Append('W');
return sb.ToString().Trim();
}
}
private class AutoConfigCarrierMinDeliverMapper() : MyWindow.RangeValueMapper<int>(0, 10)
@@ -129,7 +147,13 @@ public static class UIConfigWindow
private class AutoConfigILSChargePowerMapper() : MyWindow.RangeValueMapper<int>(2, 20)
{
public override string FormatValue(string format, int value) => FormatPower(value * 15000000L);
public override string FormatValue(string format, int value)
{
var sb = new StringBuilder(" ");
StringBuilderUtility.WriteKMG(sb, 8, value * 15000000L, false);
sb.Append('W');
return sb.ToString().Trim();
}
}
private class AutoConfigILSMaxTripShipMapper() : MyWindow.RangeValueMapper<int>(1, 41)
@@ -168,14 +192,6 @@ public static class UIConfigWindow
}
}
private static string FormatPower(long watts)
{
var sb = new StringBuilder(" ");
StringBuilderUtility.WriteKMG(sb, 8, watts, false);
sb.Append('W');
return sb.ToString().Trim();
}
private static void CreateUI(MyConfigWindow wnd, RectTransform trans)
{
UnityEngine.UI.Text txt;
@@ -187,6 +203,14 @@ public static class UIConfigWindow
wnd.AddCheckBox(x, y, tab1, GamePatch.EnableWindowResizeEnabled, I18NKeys.EnableGameWindowResize);
y += 36f;
wnd.AddCheckBox(x, y, tab1, GamePatch.LoadLastWindowRectEnabled, I18NKeys.RemeberWindowPositionAndSizeOnLastExit);
/*
y += 30f;
wnd.AddCheckBox(x, y, tab1, GamePatch.AutoSaveOptEnabled, "Better auto-save mechanism");
x = 200f;
y += 6f;
wnd.AddTipsButton2(x, y, tab1, "Better auto-save mechanism", "Better auto-save mechanism tips", "auto-save-opt-tips");
x = 0f;
*/
y += 36f;
wnd.AddCheckBox(x, y, tab1, GamePatch.ConvertSavesFromPeaceEnabled, I18NKeys.ConvertOldSavesToCombatModeOnLoading);
MyCheckBox checkBoxForMeasureTextWidth;
+4
View File
@@ -89,6 +89,10 @@ public class UXAssist : BaseUnityPlugin, IModCanSave
"Profile-based option");
GamePatch.DefaultProfileName = Config.Bind("Game", "DefaultProfileName", "Default",
"Default profile name, used when profile-based save folder is enabled. Use original game save folder if matched");
/*
GamePatch.AutoSaveOptEnabled = Config.Bind("Game", "AutoSaveOpt", false,
"Better auto-save mechanism");
*/
GamePatch.ConvertSavesFromPeaceEnabled = Config.Bind("Game", "ConvertSavesFromPeace", false,
"Convert saves from Peace mode to Combat mode on save loading");
GamePatch.GameUpsFactor = _dummyConfig.Bind("Game", "GameUpsFactor", 1.0,
@@ -1,7 +1,9 @@
using System.IO;
using UXAssist.Common.ModFeatures;
namespace UniverseGenTweaks;
[ModFeature("UniverseGenSave", Order = 13)]
public static class GalaxyGenSave
{
public static void Export(BinaryWriter w)
@@ -12,6 +12,10 @@ 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;
@@ -58,28 +62,28 @@ public static class GalaxySelectUIPatch
{
__instance.starCountSlider.maxValue = MoreSettings.MaxStarCount.Value;
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);
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);
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);
@@ -109,7 +113,10 @@ public static class GalaxySelectUIPatch
[HarmonyPatch(typeof(UIGalaxySelect), nameof(UIGalaxySelect._OnUnregEvent))]
private static void UIGalaxySelect__OnUnregEvent_Postfix()
{
RemoveAllListeners();
_minDistSlider.onValueChanged.RemoveAllListeners();
_minStepSlider.onValueChanged.RemoveAllListeners();
_maxStepSlider.onValueChanged.RemoveAllListeners();
_flattenSlider.onValueChanged.RemoveAllListeners();
}
}
+6 -3
View File
@@ -7,6 +7,8 @@ namespace UniverseGenTweaks;
public static class UIConfigWindow
{
private static RectTransform _windowTrans;
public static void Init()
{
MyConfigWindow.OnUICreated += CreateUI;
@@ -14,12 +16,13 @@ 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(trans, "General");
var tab1 = wnd.AddTab(_windowTrans, "General");
MyCheckBox.CreateCheckBox(x, y, tab1, MoreSettings.Enabled, Localization.EnableMoreSettingsOnUniverseGen);
x += 20f;
y += 26f;
@@ -67,7 +70,7 @@ public static class UIConfigWindow
EpicDifficulty.OilMultiplier.Value = val;
sl2.SetLabelText(val.ToString(sl2.labelFormat));
};
var tab2 = wnd.AddTab(trans, Localization.BirthStar);
var tab2 = wnd.AddTab(_windowTrans, Localization.BirthStar);
x = 0f;
y = 10f;
MyCheckBox.CreateCheckBox(x, y, tab2, BirthPlanetPatch.SitiVeinsOnBirthPlanet, Localization.SiliconTitaniumOnBirthPlanet);
@@ -91,4 +94,4 @@ public static class UIConfigWindow
y += 36f;
MyCheckBox.CreateCheckBox(x, y, tab2, BirthPlanetPatch.HighLuminosityBirthStar, Localization.BirthStarHasHighLuminosity);
}
}
}