diff --git a/UXAssist/CHANGELOG.md b/UXAssist/CHANGELOG.md index 38cde7c..ce5d55d 100644 --- a/UXAssist/CHANGELOG.md +++ b/UXAssist/CHANGELOG.md @@ -3,6 +3,12 @@ ## Changlog +* 1.4.5 + * New feature: `Ctrl+Shift+Click to pick items from whole belts`, with 2 suboptions: `Include branches of belts` and `Include connected inserters` + * Patch [BlueprintTweaks](https://thunderstore.io/c/dyson-sphere-program/p/kremnev8/BlueprintTweaks/) temporarily to fix `Drag Remove` functions (And wait for limoka to merge the [Pull Request](https://github.com/limoka/DSP-Mods/pull/133)): + * Ground rendering is correct now. + * Dismantle logic follows offcial's implementation to avoid possible crashes. + * Fixed CommonAPI patch to make shortcut key settings saved as expect now, sorry for wrong implementation in last version. * 1.4.4 * `Remember window position and size on last exit`: Fix compatiblity for game patch 0.10.33 * `Real-time logistic stations info panel`: Try to fix a display issue. @@ -350,6 +356,12 @@ ## 更新日志 +* 1.4.5 + * 新功能:`按住Ctrl+Shift点击从整条传送带抓取物品`,包含两个子选项:`包含传送带分支` 和 `包含连接的分拣器` + * 临时修复 [BlueprintTweaks](https://thunderstore.io/c/dyson-sphere-program/p/kremnev8/BlueprintTweaks/) 的 `拖拽拆除` 功能(等待 limoka 合并 [Pull Request](https://github.com/limoka/DSP-Mods/pull/133)): + * 地面绘制现在已正确 + * 拆除逻辑遵循官方实现,避免潜在崩溃可能 + * 修正了 CommonAPI 的补丁,现在快捷键设置可以如预期保存了,不好意思上一版本实现有误 * 1.4.4 * `记住上次退出时的窗口位置和大小`:修复对游戏补丁0.10.33的兼容性 * `物流站实时信息面板`:尝试修复一个显示问题 diff --git a/UXAssist/UIConfigWindow.cs b/UXAssist/UIConfigWindow.cs index 72a2c96..abe51b7 100644 --- a/UXAssist/UIConfigWindow.cs +++ b/UXAssist/UIConfigWindow.cs @@ -71,7 +71,7 @@ public static class UIConfigWindow I18N.Add("Drag building power poles in maximum connection range", "Drag building power poles in maximum connection range", "拖动建造电线杆时自动使用最大连接距离间隔"); I18N.Add("Build Tesla Tower and Wireless Power Tower alternately", "Build Tesla Tower and Wireless Power Tower alternately", "交替建造电力感应塔和无线输电塔"); I18N.Add("Belt signals for buy out dark fog items automatically", "Belt signals for buy out dark fog items automatically", "用于自动购买黑雾物品的传送带信号"); - I18N.Add("Ctrl+Shift+Click to pick items from whole belts", "Press Ctrl+Shift to pick items from whole belts", "按住Ctrl+Shift键从整条传送抓取物品"); + I18N.Add("Ctrl+Shift+Click to pick items from whole belts", "Ctrl+Shift+Click to pick items from whole belts", "按住Ctrl+Shift点击从整条传送带抓取物品"); I18N.Add("Include branches of belts", "Include branches of belts", "包含传送带分支"); I18N.Add("Include connected inserters", "Include connected inserters (and their connected belts if above is checked)", "包含连接的分拣器(若勾选上面的选项则包含分拣器连接的传送带)"); I18N.Add("Auto-config logistic stations", "Auto-config logistic stations", "自动配置物流设施"); @@ -407,12 +407,23 @@ public static class UIConfigWindow } } - y += 36f; - wnd.AddCheckBox(x, y, tab2, FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled, "Ctrl+Shift+Click to pick items from whole belts"); - y += 27f; - wnd.AddCheckBox(x + 10, y, tab2, FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeBranches, "Include branches of belts", 13); - y += 27f; - wnd.AddCheckBox(x + 10, y, tab2, FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeInserters, "Include connected inserters", 13); + { + y += 36f; + wnd.AddCheckBox(x, y, tab2, FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled, "Ctrl+Shift+Click to pick items from whole belts"); + y += 27f; + var includeBranches = wnd.AddCheckBox(x + 10, y, tab2, FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeBranches, "Include branches of belts", 13); + y += 27f; + var includeInserters = wnd.AddCheckBox(x + 10, y, tab2, FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeInserters, "Include connected inserters", 13); + FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled.SettingChanged += PressShiftToTakeWholeBeltItemsEnabledChanged; + wnd.OnFree += () => { FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled.SettingChanged -= PressShiftToTakeWholeBeltItemsEnabledChanged; }; + PressShiftToTakeWholeBeltItemsEnabledChanged(null, null); + + void PressShiftToTakeWholeBeltItemsEnabledChanged(object o, EventArgs e) + { + includeBranches.SetEnable(FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled.Value); + includeInserters.SetEnable(FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled.Value); + } + } x = 400f; y = 10f; diff --git a/UXAssist/UXAssist.cs b/UXAssist/UXAssist.cs index ea391e1..803635e 100644 --- a/UXAssist/UXAssist.cs +++ b/UXAssist/UXAssist.cs @@ -142,9 +142,9 @@ public class UXAssist : BaseUnityPlugin, IModCanSave "Dismantle blueprint selected buildings"); FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled = Config.Bind("Factory", "PressShiftToTakeWholeBeltItems", false, "Ctrl+Shift+Click to pick items from whole belts"); - FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeBranches = Config.Bind("Factory", "PressShiftToTakeWholeBeltItemsIncludeBranches", true, + FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeBranches = Config.Bind("Factory", "PressShiftToTakeWholeBeltItemsIncludeBranches", false, "Include branches of belts"); - FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeInserters = Config.Bind("Factory", "PressShiftToTakeWholeBeltItemsIncludeInserters", true, + FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeInserters = Config.Bind("Factory", "PressShiftToTakeWholeBeltItemsIncludeInserters", false, "Include connected inserters"); LogisticsPatch.AutoConfigLogisticsEnabled = Config.Bind("Factory", "AutoConfigLogistics", false, "Auto-config logistic stations"); diff --git a/UXAssist/UXAssist.csproj b/UXAssist/UXAssist.csproj index d4dc40d..38565e9 100644 --- a/UXAssist/UXAssist.csproj +++ b/UXAssist/UXAssist.csproj @@ -4,7 +4,7 @@ net472 org.soardev.uxassist DSP MOD - UXAssist - 1.4.4 + 1.4.5 true latest UXAssist diff --git a/UXAssist/package/manifest.json b/UXAssist/package/manifest.json index 2872995..3fcaf5b 100644 --- a/UXAssist/package/manifest.json +++ b/UXAssist/package/manifest.json @@ -1,6 +1,6 @@ { "name": "UXAssist", - "version_number": "1.4.4", + "version_number": "1.4.5", "website_url": "https://github.com/soarqin/DSP_Mods/tree/master/UXAssist", "description": "Some functions and patches for better user experience / 一些提升用户体验的功能和补丁", "dependencies": [