Removed keybinds that conflict with Watson builtins (as of 0.12.0) an…

…d updated documentation.
totemo · Sep 25, 2015 · 769d485 · 769d485
1 parent b56352f
commit 769d485
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -120,35 +120,20 @@ The sample configuration also binds the following key combinations:
   <tr>
     <th>Event</th> <th>Action</th>
   </tr>
-  <tr>
-    <td>Ctrl-w</td> <td>Toggle the Watson display on or off.</td>
-  </tr>
   <tr>
     <td>Ctrl-o</td> <td>Toggle the Watson overlay on or off.</td>
   </tr>
   <tr>
     <td>Ctrl-n</td> <td>Run "/lb next" to request the next page of LogBlock query results.</td>
   </tr>
   <tr>
-    <td>Ctrl-c</td> <td>Query all edits by the most recently selected player in a 30 block radius.  Use the LogBlock inspector tool to select the player by querying a single edit first.</td>
-  </tr>
-  <tr>
-    <td>Ctrl-t</td> <td>Query the total number of constructive and destructive edits by the most recently selected player in a 30 block radius.  Use the LogBlock inspector tool to select the player by querying a single edit first.</td>
-  </tr>
-  <tr>
-    <td>Ctrl-y</td> <td>Query the total number of constructive and destructive edits by the most recently selected player with no distance restriction.  Use the LogBlock inspector tool to select the player by querying a single edit first.</td>
+    <td>Ctrl-c</td> <td>Query all edits by the most recently selected player in a 30 block radius.  Use the LogBlock inspector tool to select the player by querying a single edit first.  The Macro/Keybind script is: $${ECHO(/lb coords player %WATSON_PLAYER% area 30);}$$</td>
   </tr>
   <tr>
-    <td>Ctrl-Mouse-Scroll-Down</td> <td>Teleport to the next ore deposit (/w tp).</td>
+    <td>Ctrl-t</td> <td>Query the total number of constructive and destructive edits by the most recently selected player in a 30 block radius.  Use the LogBlock inspector tool to select the player by querying a single edit first.  The bound Macro/Keybind script assumes a /trace-r &lt;player&gt; &lt;range&gt; command.  Roughly equivalent code that runs LogBlock directly would be: $${ECHO(/lb player %WATSON_PLAYER% area 30 time 28d sum blocks);}$$</td>
   </tr>
   <tr>
-    <td>Ctrl-Mouse-Scroll-Up</td> <td>Teleport to the previous ore deposit (/w tp prev).</td>
-  </tr>
-  <tr>
-    <td>Ctrl-Right-Mouse-Button</td> <td>Query previous edits (/w pre).</td>
-  </tr>
-  <tr>
-    <td>F4</td> <td>Toggle ModMode (issue the /modmode command).</td>
+    <td>Ctrl-y</td> <td>Query the total number of constructive and destructive edits by the most recently selected player with no distance restriction.  Use the LogBlock inspector tool to select the player by querying a single edit first.  The bound Macro/Keybind script assumes a /trace &lt;player&gt; command.  Roughly equivalent code that runs LogBlock directly would be: $${ECHO(/lb player %WATSON_PLAYER% area 10000 time 28d sum blocks);}$$ </td>
   </tr>
   <tr>
     <td>Ctrl-m</td> <td>Toggle ModMode (issue the /modmode command).</td>
@@ -158,6 +143,8 @@ The sample configuration also binds the following key combinations:
   </tr>
 </table>
 
+Note that as of version 0.12.0, Watson itself supports configurable keybinds for some common Watson commands.
+
 
 Contact Details
 ---------------

diff --git a/config/macros/latest/.gui.xml b/config/macros/latest/.gui.xml
@@ -2,11 +2,11 @@
 <!--                                                                                    --><!-- GUI layout configuration for mod_macros. Do not edit this file by hand, unless you --><!-- want to, in which case go ahead. But don't blame me if it formats your hard drive. --><!--                                                                                    --><gui xmlns:gb="http://eq2online.net/macros/guibinding" xmlns:gc="http://eq2online.net/macros/guiconfiguration">
     <!-- GUI slot bindings -->
     <gb:bindings>
+        <gb:binding slot="inchat">inchat</gb:binding>
         <gb:binding slot="playback">default</gb:binding>
         <gb:binding slot="scoreboard">ingame</gb:binding>
-        <gb:binding slot="indebug">ingame</gb:binding>
-        <gb:binding slot="inchat">inchat</gb:binding>
         <gb:binding slot="ingame">ingame</gb:binding>
+        <gb:binding slot="indebug">ingame</gb:binding>
     </gb:bindings>
     <!-- Config for layout 'default' -->
     <gc:guilayout columns="7" display="default" dots="false" grid="false" name="default" padding="2" rows="13">
@@ -261,6 +261,10 @@
             </gc:button>
         </gc:controls>
     </gc:guilayout>
+    <!-- Config for layout 'inchat' -->
+    <gc:guilayout columns="6" display="inchat" dots="false" grid="false" name="inchat" padding="2" rows="10">
+        <gc:controls/>
+    </gc:guilayout>
     <!-- Config for layout 'watson_overlay' -->
     <gc:guilayout columns="7" display="Watson Overlay" dots="false" grid="false" name="watson_overlay" padding="2" rows="13">
         <gc:controls>
@@ -329,10 +333,6 @@
             </gc:label>
         </gc:controls>
     </gc:guilayout>
-    <!-- Config for layout 'inchat' -->
-    <gc:guilayout columns="6" display="inchat" dots="false" grid="false" name="inchat" padding="2" rows="10">
-        <gc:controls/>
-    </gc:guilayout>
     <!-- Config for layout 'ingame' -->
     <gc:guilayout columns="7" display="ingame" dots="false" grid="false" name="ingame" padding="2" rows="13">
         <gc:metrics>

diff --git a/config/macros/latest/.macros.txt b/config/macros/latest/.macros.txt
@@ -4,7 +4,7 @@
 #
 
 # Version number of the mod which saved this file. ***Do not alter this value!***
-version=1002
+version=1101
 
 #
 # Settings
@@ -165,7 +165,7 @@ keyboard.symbols={42,30}{54,30}{156,17}{200,24}{203,27}{205,26}{208,25}{248,24}{
 layout.bindings.loadatstartup=1
 
 # Item ID/damage values to include in the items list that aren't automatically enumerated, use {id} for base items and {id:damage} for specific damage values
-list.items.include={18:2}{80}
+list.items.include={80}{18:2}
 
 # Base directory for ancilliary macro config files, relative to the Minecraft directory. Use . to use the Minecraft directory (old behaviour)
 macrosdirectory=/mods/macros/
@@ -256,13 +256,6 @@ Macro[9].Control=1
 Macro[10].Macro=/check p:9
 Macro[10].Control=1
 
-# KEY_EQUALS
-Macro[13].Macro=/count-entities 200 chicken cow sheep pig villager skeleton zombie spider
-Macro[13].Control=1
-
-# KEY_W
-Macro[17].Macro=$${WATSON("/w display")}$$
-
 # KEY_T
 Macro[20].Macro=$${ECHO(/trace-r %WATSON_PLAYER% 30);}$$
 Macro[20].Control=1
@@ -295,22 +288,6 @@ Macro[49].Control=1
 Macro[50].Macro=/modmode
 Macro[50].Control=1
 
-# KEY_F4
-Macro[62].Macro=/modmode
-
-# KEY_MWHEELUP
-Macro[248].Macro=$${WATSON("/w tp prev")}$$
-Macro[248].Control=1
-
-# KEY_MWHEELDOWN
-Macro[249].Macro=$${WATSON("/w tp")}$$
-Macro[249].Control=1
-
-# KEY_RMOUSE
-Macro[251].Macro=$${WATSON("/w pre")}$$
-Macro[251].Condition=TRUE
-Macro[251].Control=1
-
 # CONTROL_RATIOBUTTON
 Macro[257].Macro=$${WATSON("/w ratio")}$$