From 7dd91120f996671b034ba0a81c1e6f38e4610cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=86=E4=BC=AF=E8=A8=80?= <maoxuner@126.com>
Date: Wed, 13 Sep 2023 12:13:00 +0800
Subject: [PATCH] refactor: m for menu, o for on/off IMPORTANT change bind keys
 n,m to m,o Before: n for (next) menu, m for on/off After: m for menu, o for
 on/off n,m keys are too close, avoid accidentally touching

---
 README.md                | 8 ++++----
 skills/binds/install.cfg | 4 ++--
 skills/binds/m/0.cfg     | 4 +++-
 skills/binds/m/1.cfg     | 4 +++-
 skills/binds/m/2.cfg     | 4 +++-
 skills/binds/m/3.cfg     | 4 +++-
 skills/binds/m/4.cfg     | 4 +++-
 skills/binds/n/0.cfg     | 3 ---
 skills/binds/n/1.cfg     | 3 ---
 skills/binds/n/2.cfg     | 3 ---
 skills/binds/n/3.cfg     | 3 ---
 skills/binds/n/4.cfg     | 3 ---
 skills/binds/o/0.cfg     | 1 +
 skills/binds/o/1.cfg     | 1 +
 skills/binds/o/2.cfg     | 1 +
 skills/binds/o/3.cfg     | 1 +
 skills/binds/o/4.cfg     | 1 +
 17 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 skills/binds/n/0.cfg
 delete mode 100644 skills/binds/n/1.cfg
 delete mode 100644 skills/binds/n/2.cfg
 delete mode 100644 skills/binds/n/3.cfg
 delete mode 100644 skills/binds/n/4.cfg
 create mode 100644 skills/binds/o/0.cfg
 create mode 100644 skills/binds/o/1.cfg
 create mode 100644 skills/binds/o/2.cfg
 create mode 100644 skills/binds/o/3.cfg
 create mode 100644 skills/binds/o/4.cfg

diff --git a/README.md b/README.md
index f45cddb..1121a34 100644
--- a/README.md
+++ b/README.md
@@ -47,8 +47,8 @@
 | `ctrl`+`h` | 速飞开关                               |
 | `ctrl`+`x` | 切分身时自动切锤开关                   |
 | `t`        | 分身同步                               |
-| `n`        | 技能菜单（逐个显示）                   |
-| `m`        | 开关当前菜单显示的技能                 |
+| `m`        | 技能菜单（逐个显示）                   |
+| `o`        | 开关当前菜单显示的技能                 |
 
 ## 参考
 
@@ -100,8 +100,8 @@ If there is a `settings_ddnet.cfg` file, backup it, keep it safe.
 | `ctrl`+`h` | Deep fly on/off                                             |
 | `ctrl`+`x` | Hammer take on/off                                          |
 | `t`        | Dummy copy moves                                            |
-| `n`        | Menu(walk through skills)                                   |
-| `m`        | Turn on/off the skill in current menu                       |
+| `m`        | Menu(walk through skills)                                   |
+| `o`        | Turn on/off the skill in current menu                       |
 
 ## References
 
diff --git a/skills/binds/install.cfg b/skills/binds/install.cfg
index 3eb605c..e20b9f5 100644
--- a/skills/binds/install.cfg
+++ b/skills/binds/install.cfg
@@ -1,9 +1,9 @@
-unbind n
 unbind m
+unbind o
 unbind ctrl+h
 unbind ctrl+x
 
-bind n exec configs/skills/binds/n/0.cfg
+bind m exec configs/skills/binds/m/0.cfg
 
 bind ctrl+h "exec configs/skills/DeepFlyOn.cfg"
 bind ctrl+x "exec configs/skills/HammerTakeOn.cfg"
diff --git a/skills/binds/m/0.cfg b/skills/binds/m/0.cfg
index ba26d5b..06b8175 100644
--- a/skills/binds/m/0.cfg
+++ b/skills/binds/m/0.cfg
@@ -1 +1,3 @@
-bind m "exec configs/skills/ZenMode.cfg; echo Zen Mode Enabled; bind m \"exec configs/skills/ZenMode.cfg; echo Zen Mode Disabled; exec configs/skills/binds/m/0.cfg\""
+echo ZenMode
+exec configs/skills/binds/o/0.cfg
+bind m exec configs/skills/binds/m/1.cfg
diff --git a/skills/binds/m/1.cfg b/skills/binds/m/1.cfg
index 6be0ea0..ccc7be4 100644
--- a/skills/binds/m/1.cfg
+++ b/skills/binds/m/1.cfg
@@ -1 +1,3 @@
-bind m "exec configs/skills/HammerTakeOn.cfg; bind m \"exec configs/skills/HammerTakeOff.cfg; exec configs/skills/binds/m/1.cfg\""
+echo HammerTake
+exec configs/skills/binds/o/1.cfg
+bind m exec configs/skills/binds/m/2.cfg
diff --git a/skills/binds/m/2.cfg b/skills/binds/m/2.cfg
index fc30fcf..3a6130d 100644
--- a/skills/binds/m/2.cfg
+++ b/skills/binds/m/2.cfg
@@ -1 +1,3 @@
-bind m "exec configs/skills/DeepFlyOn.cfg; bind m \"exec configs/skills/DeepFlyOff.cfg; exec configs/skills/binds/m/2.cfg\""
+echo DeepFly
+exec configs/skills/binds/o/2.cfg
+bind m exec configs/skills/binds/m/3.cfg
diff --git a/skills/binds/m/3.cfg b/skills/binds/m/3.cfg
index 989a5f5..efa2a83 100644
--- a/skills/binds/m/3.cfg
+++ b/skills/binds/m/3.cfg
@@ -1 +1,3 @@
-bind m "exec configs/skills/HammerThrowDummy/DummyMoverOn.cfg; bind m \"exec configs/skills/HammerThrowDummy/DummyMoverOff.cfg; exec configs/skills/binds/m/3.cfg\""
+echo HammerThrowDummy
+exec configs/skills/binds/o/3.cfg
+bind m exec configs/skills/binds/m/4.cfg
diff --git a/skills/binds/m/4.cfg b/skills/binds/m/4.cfg
index 3dad9f7..0faaddd 100644
--- a/skills/binds/m/4.cfg
+++ b/skills/binds/m/4.cfg
@@ -1 +1,3 @@
-bind m "exec configs/skills/EdgeJumpOn.cfg; bind m \"exec configs/skills/EdgeJumpOff.cfg; exec configs/skills/binds/m/4.cfg\""
+echo EdgeJump
+exec configs/skills/binds/o/4.cfg
+bind m exec configs/skills/binds/m/0.cfg
diff --git a/skills/binds/n/0.cfg b/skills/binds/n/0.cfg
deleted file mode 100644
index ec0c329..0000000
--- a/skills/binds/n/0.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-echo ZenMode
-exec configs/skills/binds/m/0.cfg
-bind n exec configs/skills/binds/n/1.cfg
diff --git a/skills/binds/n/1.cfg b/skills/binds/n/1.cfg
deleted file mode 100644
index bb1be65..0000000
--- a/skills/binds/n/1.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-echo HammerTake
-exec configs/skills/binds/m/1.cfg
-bind n exec configs/skills/binds/n/2.cfg
diff --git a/skills/binds/n/2.cfg b/skills/binds/n/2.cfg
deleted file mode 100644
index c1860f5..0000000
--- a/skills/binds/n/2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-echo DeepFly
-exec configs/skills/binds/m/2.cfg
-bind n exec configs/skills/binds/n/3.cfg
diff --git a/skills/binds/n/3.cfg b/skills/binds/n/3.cfg
deleted file mode 100644
index 872ff40..0000000
--- a/skills/binds/n/3.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-echo HammerThrowDummy
-exec configs/skills/binds/m/3.cfg
-bind n exec configs/skills/binds/n/4.cfg
diff --git a/skills/binds/n/4.cfg b/skills/binds/n/4.cfg
deleted file mode 100644
index 7d9151b..0000000
--- a/skills/binds/n/4.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-echo EdgeJump
-exec configs/skills/binds/m/4.cfg
-bind n exec configs/skills/binds/n/0.cfg
diff --git a/skills/binds/o/0.cfg b/skills/binds/o/0.cfg
new file mode 100644
index 0000000..a11d183
--- /dev/null
+++ b/skills/binds/o/0.cfg
@@ -0,0 +1 @@
+bind o "exec configs/skills/ZenMode.cfg; echo Zen Mode Enabled; bind o \"exec configs/skills/ZenMode.cfg; echo Zen Mode Disabled; exec configs/skills/binds/o/0.cfg\""
diff --git a/skills/binds/o/1.cfg b/skills/binds/o/1.cfg
new file mode 100644
index 0000000..c97c9c1
--- /dev/null
+++ b/skills/binds/o/1.cfg
@@ -0,0 +1 @@
+bind o "exec configs/skills/HammerTakeOn.cfg; bind o \"exec configs/skills/HammerTakeOff.cfg; exec configs/skills/binds/o/1.cfg\""
diff --git a/skills/binds/o/2.cfg b/skills/binds/o/2.cfg
new file mode 100644
index 0000000..572087a
--- /dev/null
+++ b/skills/binds/o/2.cfg
@@ -0,0 +1 @@
+bind o "exec configs/skills/DeepFlyOn.cfg; bind o \"exec configs/skills/DeepFlyOff.cfg; exec configs/skills/binds/o/2.cfg\""
diff --git a/skills/binds/o/3.cfg b/skills/binds/o/3.cfg
new file mode 100644
index 0000000..2d3541a
--- /dev/null
+++ b/skills/binds/o/3.cfg
@@ -0,0 +1 @@
+bind o "exec configs/skills/HammerThrowDummy/DummyMoverOn.cfg; bind o \"exec configs/skills/HammerThrowDummy/DummyMoverOff.cfg; exec configs/skills/binds/o/3.cfg\""
diff --git a/skills/binds/o/4.cfg b/skills/binds/o/4.cfg
new file mode 100644
index 0000000..6b5dc71
--- /dev/null
+++ b/skills/binds/o/4.cfg
@@ -0,0 +1 @@
+bind o "exec configs/skills/EdgeJumpOn.cfg; bind o \"exec configs/skills/EdgeJumpOff.cfg; exec configs/skills/binds/o/4.cfg\""