From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 22 Nov 2020 03:09:53 +0000 (+0100)
Subject: Minor mode description handling improvements.
X-Git-Url: https://plomlompom.com/repos/foo.html?a=commitdiff_plain;h=69ad51772914eee6255ae185507f4ea1406f8795;p=plomrogue2

Minor mode description handling improvements.
---

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index c29b405..d22539b 100755
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -23,11 +23,11 @@ mode_helps = {
         'long': 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.'
     },
     'control_pw_type': {
-        'short': 'change tile control password',
+        'short': 'change tiles control password',
         'long': 'This mode is the first of two steps to change the password for a tile control character.  First enter the tile control character for which you want to change the password!'
     },
     'control_pw_pw': {
-        'short': 'change tile control password',
+        'short': 'change tiles control password',
         'long': 'This mode is the second of two steps to change the password for a tile control character.  Enter the new password for the tile control character you chose.'
     },
     'control_tile_type': {
@@ -39,7 +39,7 @@ mode_helps = {
         'long': 'This mode is the second of two steps to change tile control areas on the map.  Move cursor around the map to draw selected tile control character'
     },
     'annotate': {
-        'short': 'annotation',
+        'short': 'annotate tile',
         'long': 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so).  Hit Return to leave.'
     },
     'portal': {
@@ -47,7 +47,7 @@ mode_helps = {
         'long': 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map editing password authorizes you so).  Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target.  Hit Return to leave.'
     },
     'chat': {
-        'short': 'chat mode',
+        'short': 'chat',
         'long': 'This mode allows you to engage in chit-chat with other users.  Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message.  Lines that start with a "/" are used for commands like:'
     },
     'login': {
diff --git a/rogue_chat_nocanvas_monochrome.html b/rogue_chat_nocanvas_monochrome.html
index 6713a27..381b0f2 100644
--- a/rogue_chat_nocanvas_monochrome.html
+++ b/rogue_chat_nocanvas_monochrome.html
@@ -81,17 +81,17 @@ terminal columns: <input id="n_cols" type="number" step=4 min=80 value=80 />
 <li>teleport: <input id="key_teleport" type="text" value="p" />
 <li>take thing under player: <input id="key_take_thing" type="text" value="z" />
 <li>drop carried thing: <input id="key_drop_thing" type="text" value="u" />
-<li>switch to chat mode: <input id="key_switch_to_chat" type="text" value="t" />
-<li>switch to play mode: <input id="key_switch_to_play" type="text" value="p" />
-<li>switch to study mode: <input id="key_switch_to_study" type="text" value="?" />
-<li>edit tile (from play mode): <input id="key_switch_to_edit" type="text" value="m" />
-<li>enter tile password (from play mode): <input id="key_switch_to_password" type="text" value="P" />
-<li>enter admin password (from play mode): <input id="key_switch_to_admin" type="text" value="A" />
-<li>change tile control password (from play mode): <input id="key_switch_to_control_pw_type" type="text" value="C" />
-<li>change tiles control (from play mode): <input id="key_switch_to_control_tile_type" type="text" value="Q" />
-<li>annotate tile (from play mode): <input id="key_switch_to_annotate" type="text" value="M" />
-<li>annotate portal (from play mode): <input id="key_switch_to_portal" type="text" value="T" />
-<li>toggle terrain/annotations/control view (from study mode): <input id="key_toggle_map_mode" type="text" value="M" />
+<li><input id="key_switch_to_chat" type="text" value="t" />
+<li><input id="key_switch_to_play" type="text" value="p" />
+<li><input id="key_switch_to_study" type="text" value="?" />
+<li><input id="key_switch_to_edit" type="text" value="m" />
+<li><input id="key_switch_to_password" type="text" value="P" />
+<li><input id="key_switch_to_admin" type="text" value="A" />
+<li><input id="key_switch_to_control_pw_type" type="text" value="C" />
+<li><input id="key_switch_to_control_tile_type" type="text" value="Q" />
+<li><input id="key_switch_to_annotate" type="text" value="M" />
+<li><input id="key_switch_to_portal" type="text" value="T" />
+<li>toggle terrain/annotations/control view: <input id="key_toggle_map_mode" type="text" value="M" />
 </ul>
 </div>
 <script>
@@ -112,11 +112,11 @@ let mode_helps = {
         'long': 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.'
     },
     'control_pw_type': {
-        'short': 'change tile control password',
+        'short': 'change tiles control password',
         'long': 'This mode is the first of two steps to change the password for a tile control character.  First enter the tile control character for which you want to change the password!'
     },
     'control_pw_pw': {
-        'short': 'change tile control password',
+        'short': 'change tiles control password',
         'long': 'This mode is the second of two steps to change the password for a tile control character.  Enter the new password for the tile control character you chose.'
     },
     'control_tile_type': {
@@ -128,7 +128,7 @@ let mode_helps = {
         'long': 'This mode is the second of two steps to change tile control areas on the map.  Move cursor around the map to draw selected tile control character'
     },
     'annotate': {
-        'short': 'annotation',
+        'short': 'annotate tile',
         'long': 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so).  Hit Return to leave.'
     },
     'portal': {
@@ -136,7 +136,7 @@ let mode_helps = {
         'long': 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map editing password authorizes you so).  Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target.  Hit Return to leave.'
     },
     'chat': {
-        'short': 'chat mode',
+        'short': 'chat',
         'long': 'This mode allows you to engage in chit-chat with other users.  Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message.  Lines that start with a "/" are used for commands like:'
     },
     'login': {
@@ -165,6 +165,12 @@ let rows_selector = document.getElementById("n_rows");
 let cols_selector = document.getElementById("n_cols");
 let key_selectors = document.querySelectorAll('[id^="key_"]');
 
+for (const key_switch_selector of document.querySelectorAll('[id^="key_switch_to_"]')) {
+    const action = key_switch_selector.id.slice("key_switch_to_".length);
+    const msg = "[" + mode_helps[action].short + "]: ";
+    key_switch_selector.parentNode.prepend(msg);
+}
+
 function restore_selector_value(selector) {
     let stored_selection = window.localStorage.getItem(selector.id);
     if (stored_selection) {