CheatEnabler and UXAssist new versions

CheatEnabler/CheatEnabler.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net472</TargetFramework>
     <BepInExPluginGuid>org.soardev.cheatenabler</BepInExPluginGuid>
     <Description>DSP MOD - CheatEnabler</Description>
-    <Version>2.3.11</Version>
+    <Version>2.3.13</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <PackageId>CheatEnabler</PackageId>

CheatEnabler/FactoryPatch.cs

@@ -26,6 +26,7 @@ public static class FactoryPatch
 
     private static Harmony _factoryPatch;
     private static PressKeyBind _noConditionKey;
+    private static PressKeyBind _noCollisionKey;
 
     public static void Init()
     {
@@ -33,12 +34,25 @@ public static class FactoryPatch
         _noConditionKey = KeyBindings.RegisterKeyBinding(new BuiltinKey
             {
                 key = new CombineKey((int)KeyCode.Q, CombineKey.ALT_COMB, ECombineKeyAction.OnceClick, false),
-                conflictGroup = KeyBindConflict.BUILD_MODE_1 | KeyBindConflict.KEYBOARD_KEYBIND,
+                conflictGroup = KeyBindConflict.MOVEMENT | KeyBindConflict.FLYING | KeyBindConflict.SAILING | KeyBindConflict.BUILD_MODE_1 | KeyBindConflict.KEYBOARD_KEYBIND,
                 name = "ToggleNoCondition",
                 canOverride = true
             }
         );
+        _noCollisionKey = KeyBindings.RegisterKeyBinding(new BuiltinKey
+            {
+                key = new CombineKey((int)KeyCode.W, CombineKey.ALT_COMB, ECombineKeyAction.OnceClick, false),
+                conflictGroup = KeyBindConflict.MOVEMENT | KeyBindConflict.FLYING | KeyBindConflict.SAILING | KeyBindConflict.BUILD_MODE_1 | KeyBindConflict.KEYBOARD_KEYBIND,
+                name = "ToggleNoCollision",
+                canOverride = true
+            }
+        );
         I18N.Add("KEYToggleNoCondition", "Toggle No Condition Build", "切换无条件建造");
+        I18N.Add("KEYToggleNoCollision", "Toggle No Collision", "切换无碰撞");
+        I18N.Add("NoConditionOn", "No condition build is enabled!", "无条件建造已启用");
+        I18N.Add("NoConditionOff", "No condition build is disabled!", "无条件建造已禁用");
+        I18N.Add("NoCollisionOn", "No collision is enabled!", "无碰撞已启用");
+        I18N.Add("NoCollisionOff", "No collision is disabled!", "无碰撞已禁用");
         ImmediateEnabled.SettingChanged += (_, _) => ImmediateBuild.Enable(ImmediateEnabled.Value);
         ArchitectModeEnabled.SettingChanged += (_, _) => ArchitectMode.Enable(ArchitectModeEnabled.Value);
         NoConditionEnabled.SettingChanged += (_, _) => NoConditionBuild.Enable(NoConditionEnabled.Value);
@@ -68,6 +82,18 @@ public static class FactoryPatch
         if (_noConditionKey.keyValue)
         {
             NoConditionEnabled.Value = !NoConditionEnabled.Value;
+            if (!DSPGame.IsMenuDemo && GameMain.isRunning)
+            {
+                UIRoot.instance.uiGame.generalTips.InvokeRealtimeTipAhead((NoConditionEnabled.Value ? "NoConditionOn" : "NoConditionOff").Translate());
+            }
+        }
+        if (_noCollisionKey.keyValue)
+        {
+            NoCollisionEnabled.Value = !NoCollisionEnabled.Value;
+            if (!DSPGame.IsMenuDemo && GameMain.isRunning)
+            {
+                UIRoot.instance.uiGame.generalTips.InvokeRealtimeTipAhead((NoCollisionEnabled.Value ? "NoCollisionOn" : "NoCollisionOff").Translate());
+            }
         }
     }
 

CheatEnabler/README.md

@@ -4,8 +4,13 @@
 #### 添加一些作弊功能，同时屏蔽异常检测
 
 ## Changlog
+* 2.3.13
+  + Fix a bug that shortcuts are not working and have display issue on settings window. 
+* 2.3.12
+  + Add a shortcut to toggle `No collision`(Alt+W by default), you can modify the shortcut on system settings window.
+  + Add realtime tips when toggling `No condition build` and `No collision` with shortcuts.
 * 2.3.11
-  + Add a shortcut to toggle `No condition build`, you can modify the shortcut on system settings window. This depends on [UXAssist](https://dsp.thunderstore.io/package/soarqin/UXAssist) 1.0.15 or later.
+  + Add a shortcut to toggle `No condition build`(Alt+Q by default), you can modify the shortcut on system settings window. This depends on [UXAssist](https://dsp.thunderstore.io/package/soarqin/UXAssist) 1.0.15 or later.
 * 2.3.10
   + Fix following functions not working in new game updates:
     - `Pump Anywhere`
@@ -126,6 +131,11 @@
 * [Multifunction_mod](https://github.com/blacksnipebiu/Multifunction_mod): Some cheat functions
 
 ## 更新日志
+* 2.3.13
+  + 修复了快捷键无效和设置窗口上的按键显示问题
+* 2.3.12
+  + 添加了一个快捷键来切换`无碰撞`，你可以在系统设置面板中修改快捷键。
+  + 在使用快捷键切换`无条件建造`和`无碰撞`时添加了实时提示信息。
 * 2.3.11
   + 添加了一个快捷键来切换`无条件建造`，你可以在系统设置面板中修改快捷键。这依赖于[UXAssist](https://dsp.thunderstore.io/package/soarqin/UXAssist) 1.0.15或更高版本
 * 2.3.10

CheatEnabler/package/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "CheatEnabler",
-  "version_number": "2.3.11",
+  "version_number": "2.3.13",
   "website_url": "https://github.com/soarqin/DSP_Mods/tree/master/CheatEnabler",
   "description": "Add various cheat functions while disabling abnormal determinants / 添加一些作弊功能，同时屏蔽异常检测",
   "dependencies": [