From ac9f4ee8a99ac042766e88bab5a9915e695c7283 Mon Sep 17 00:00:00 2001 From: Soar Qin Date: Fri, 3 Oct 2025 14:29:41 +0800 Subject: [PATCH] UXAssist: Drag build Power Towers fix --- UXAssist/CHANGELOG.md | 8 ++++++++ UXAssist/Patches/FactoryPatch.cs | 35 +++++++++++++++++++++----------- UXAssist/UXAssist.csproj | 2 +- UXAssist/package/manifest.json | 2 +- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/UXAssist/CHANGELOG.md b/UXAssist/CHANGELOG.md index e4da460..bcded17 100644 --- a/UXAssist/CHANGELOG.md +++ b/UXAssist/CHANGELOG.md @@ -3,6 +3,10 @@ ## Changlog +* 1.4.3 + * `Build Tesla Tower and Wireless Power Tower alternately`: + * Fix wrong implementation for latest game patch. + * Cannot use Tesla Tower as start Power Tower now, due to new matrix build mechanism. * 1.4.2 * Fixed a crash issue. * 1.4.1 @@ -340,6 +344,10 @@ ## 更新日志 +* 1.4.3 + * `交替建造电力感应塔和无线输电塔`: + * 修复了在最新游戏补丁中的错误实现 + * 由于新的矩阵建造机制，现在无法使用电力感应塔作为起始电塔 * 1.4.2 * 修复了一个崩溃问题 * 1.4.1 diff --git a/UXAssist/Patches/FactoryPatch.cs b/UXAssist/Patches/FactoryPatch.cs index 57ff23e..4a570d3 100644 --- a/UXAssist/Patches/FactoryPatch.cs +++ b/UXAssist/Patches/FactoryPatch.cs @@ -1401,7 +1401,7 @@ public class FactoryPatch : PatchImpl { private static readonly List OldDragBuild = []; private static readonly List OldDragBuildDist = []; - private static readonly int[] PowerPoleIds = [2201, 2202, 2212]; + private static readonly int[] PowerPoleIds = [2202, 2212]; protected override void OnEnable() { @@ -1435,13 +1435,13 @@ public class FactoryPatch : PatchImpl OldDragBuildDist.Clear(); foreach (var id in PowerPoleIds) { - var powerPole = LDB.items.Select(id); - if (powerPole?.prefabDesc == null) return; - OldDragBuild.Add(powerPole.prefabDesc.dragBuild); - OldDragBuildDist.Add(powerPole.prefabDesc.dragBuildDist); - powerPole.prefabDesc.dragBuild = true; - var distance = (id == 2201 && DragBuildPowerPolesAlternatelyEnabled.Value ? LDB.items.Select(2202) : powerPole).prefabDesc.powerConnectDistance - 0.72f; - powerPole.prefabDesc.dragBuildDist = new Vector2(distance, distance); + var prefabDesc = LDB.items.Select(id)?.prefabDesc; + if (prefabDesc == null) return; + OldDragBuild.Add(prefabDesc.dragBuild); + OldDragBuildDist.Add(prefabDesc.dragBuildDist); + prefabDesc.dragBuild = true; + var distance = prefabDesc.powerConnectDistance - 0.72f; + prefabDesc.dragBuildDist = new Vector2(distance, distance); } } @@ -1560,17 +1560,28 @@ public class FactoryPatch : PatchImpl new CodeMatch(OpCodes.Ldarg_0), new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(BuildTool_Click), nameof(BuildTool_Click.handPrefabDesc))), new CodeMatch(OpCodes.Stfld, AccessTools.Field(typeof(BuildPreview), nameof(BuildPreview.desc))) - ).Advance(2).InsertAndAdvance(new CodeInstruction(OpCodes.Ldloc_S, 6)).SetInstructionAndAdvance(Transpilers.EmitDelegate((BuildTool_Click click, int i) => + ); + var pos = matcher.Pos; + matcher.MatchBack(false, + new CodeMatch(ci => ci.IsLdloc()), + new CodeMatch(ci => ci.IsLdloc()), + new CodeMatch(OpCodes.Mul), + new CodeMatch(ci => ci.IsLdloc()), + new CodeMatch(OpCodes.Add) + ); + var operand = matcher.Operand; + matcher.Start().Advance(pos); + matcher.Advance(2).InsertAndAdvance(new CodeInstruction(OpCodes.Ldloc_S, operand)).SetInstructionAndAdvance(Transpilers.EmitDelegate((BuildTool_Click click, int i) => { if (!DragBuildPowerPolesAlternatelyEnabled.Value || (i & 1) == 0) return click.handItem; var id = click.handItem.ID; - if (id != 2201 && id != 2202) return click.handItem; + if (id != 2202) return click.handItem; return LDB.items.Select(id ^ 3); - })).Advance(3).InsertAndAdvance(new CodeInstruction(OpCodes.Ldloc_S, 6)).SetInstructionAndAdvance(Transpilers.EmitDelegate((BuildTool_Click click, int i) => + })).Advance(3).InsertAndAdvance(new CodeInstruction(OpCodes.Ldloc_S, operand)).SetInstructionAndAdvance(Transpilers.EmitDelegate((BuildTool_Click click, int i) => { if (!DragBuildPowerPolesAlternatelyEnabled.Value || (i & 1) == 0) return click.handPrefabDesc; var id = click.handItem.ID; - if (id != 2201 && id != 2202) return click.handPrefabDesc; + if (id != 2202) return click.handPrefabDesc; return LDB.items.Select(id ^ 3).prefabDesc; })); return matcher.InstructionEnumeration(); diff --git a/UXAssist/UXAssist.csproj b/UXAssist/UXAssist.csproj index 6bd3ec2..9c28014 100644 --- a/UXAssist/UXAssist.csproj +++ b/UXAssist/UXAssist.csproj @@ -4,7 +4,7 @@ net472 org.soardev.uxassist DSP MOD - UXAssist - 1.4.2 + 1.4.3 true latest UXAssist diff --git a/UXAssist/package/manifest.json b/UXAssist/package/manifest.json index a5e65b7..8e02612 100644 --- a/UXAssist/package/manifest.json +++ b/UXAssist/package/manifest.json @@ -1,6 +1,6 @@ { "name": "UXAssist", - "version_number": "1.4.2", + "version_number": "1.4.3", "website_url": "https://github.com/soarqin/DSP_Mods/tree/master/UXAssist", "description": "Some functions and patches for better user experience / 一些提升用户体验的功能和补丁", "dependencies": [