From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 10 Nov 2020 11:19:12 +0000 (+0100)
Subject: Put all editing below play mode.
X-Git-Url: https://plomlompom.com/repos/?a=commitdiff_plain;h=35a30b2b2579f5cac20ba94cd5e162d11fd283ee;p=plomrogue2

Put all editing below play mode.
---

diff --git a/config.json b/config.json
index cc81fab..27853c1 100644
--- a/config.json
+++ b/config.json
@@ -1,8 +1,8 @@
 {
     "switch_to_chat": "t",
     "switch_to_play": "p",
-    "switch_to_annotate": "m",
-    "switch_to_portal": "P",
+    "switch_to_annotate": "M",
+    "switch_to_portal": "T",
     "switch_to_study": "?",
     "switch_to_edit": "m",
     "flatten": "F",
diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index b09dcc7..946c8ae 100755
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -210,7 +210,7 @@ class TUI:
         import json
         self.host = host
         self.mode_play = self.Mode('play', 'This mode allows you to interact with the map.')
-        self.mode_study = self.Mode('study', 'This mode allows you to study the map and its tiles in detail.  Move the question mark over a tile, and the right half of the screen will show detailed information on it (unless obscured by this help screen here, which you can disappear with any key).', shows_info=True)
+        self.mode_study = self.Mode('study', 'This mode allows you to study the map and its tiles in detail.  Move the question mark over a tile, and the right half of the screen will show detailed information on it.', shows_info=True)
         self.mode_edit = self.Mode('edit', '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.')
         self.mode_annotate = self.Mode('annotate', '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.', has_input_prompt=True, shows_info=True)
         self.mode_portal = self.Mode('portal', '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.', has_input_prompt=True, shows_info=True)
@@ -233,9 +233,9 @@ class TUI:
         self.keys = {
             'switch_to_chat': 't',
             'switch_to_play': 'p',
-            'switch_to_password': 'p',
-            'switch_to_annotate': 'm',
-            'switch_to_portal': 'P',
+            'switch_to_password': 'P',
+            'switch_to_annotate': 'M',
+            'switch_to_portal': 'T',
             'switch_to_study': '?',
             'switch_to_edit': 'm',
             'flatten': 'F',
@@ -289,10 +289,10 @@ class TUI:
         elif self.mode.name == 'password':
             self.input_ = self.password
 
-    def switch_mode(self, mode_name, keep_position = False):
+    def switch_mode(self, mode_name):
         self.map_mode = 'terrain'
         self.mode = getattr(self, 'mode_' + mode_name)
-        if self.mode.shows_info and not keep_position:
+        if self.mode.shows_info:
             player = self.game.get_thing(self.game.player_id, False)
             self.explorer = YX(player.position.y, player.position.x)
         if self.mode.name == 'waiting_for_server':
@@ -504,10 +504,12 @@ class TUI:
                 if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
                     content += "[%s] – flatten player's surroundings\n" % self.keys['flatten']
                 content += 'Other modes available from here:\n'
-                content += '[%s] – terrain edit mode\n' % self.keys['switch_to_edit']
-                content += '[%s] – terrain password edit mode\n' % self.keys['switch_to_password']
                 content += '[%s] – chat mode\n' % self.keys['switch_to_chat']
                 content += '[%s] – study mode\n' % self.keys['switch_to_study']
+                content += '[%s] – terrain edit mode\n' % self.keys['switch_to_edit']
+                content += '[%s] – portal edit mode\n' % self.keys['switch_to_portal']
+                content += '[%s] – annotation mode\n' % self.keys['switch_to_annotate']
+                content += '[%s] – password input mode\n' % self.keys['switch_to_password']
             elif self.mode == self.mode_study:
                 content += 'Available actions:\n'
                 content += '[%s] – move question mark\n' % ','.join(self.movement_keys)
@@ -515,8 +517,6 @@ class TUI:
                 content += '\n\nOther modes available from here:'
                 content += '[%s] – chat mode\n' % self.keys['switch_to_chat']
                 content += '[%s] – play mode\n' % self.keys['switch_to_play']
-                content += '[%s] – portal mode\n' % self.keys['switch_to_portal']
-                content += '[%s] – annotation mode\n' % self.keys['switch_to_annotate']
             elif self.mode == self.mode_chat:
                 content += '/nick NAME – re-name yourself to NAME\n'
                 content += '/msg USER TEXT – send TEXT to USER\n'
@@ -637,16 +637,16 @@ class TUI:
                 if self.input_ == '':
                     self.input_ = ' '
                 self.send('ANNOTATE %s %s %s' % (self.explorer, quote(self.input_),
-                                                 quote(self.password))
+                                                 quote(self.password)))
                 self.input_ = ""
-                self.switch_mode('study', keep_position=True)
+                self.switch_mode('play')
             elif self.mode == self.mode_portal and key == '\n':
                 if self.input_ == '':
                     self.input_ = ' '
                 self.send('PORTAL %s %s %s' % (self.explorer, quote(self.input_),
                                                quote(self.password)))
                 self.input_ = ""
-                self.switch_mode('study', keep_position=True)
+                self.switch_mode('play')
             elif self.mode == self.mode_teleport and key == '\n':
                 if self.input_ == 'YES!':
                     self.host = self.teleport_target_host
@@ -660,10 +660,6 @@ class TUI:
                     self.switch_mode('chat')
                 elif key == self.keys['switch_to_play']:
                     self.switch_mode('play')
-                elif key == self.keys['switch_to_annotate']:
-                    self.switch_mode('annotate', keep_position=True)
-                elif key == self.keys['switch_to_portal']:
-                    self.switch_mode('portal', keep_position=True)
                 elif key == self.keys['toggle_map_mode']:
                     if self.map_mode == 'terrain':
                         self.map_mode = 'control'
@@ -676,6 +672,10 @@ class TUI:
                     self.switch_mode('chat')
                 elif key == self.keys['switch_to_study']:
                     self.switch_mode('study')
+                elif key == self.keys['switch_to_annotate']:
+                    self.switch_mode('annotate')
+                elif key == self.keys['switch_to_portal']:
+                    self.switch_mode('portal')
                 elif key == self.keys['switch_to_password']:
                     self.switch_mode('password')
                 if key == self.keys['switch_to_edit'] and\
diff --git a/rogue_chat_nocanvas_monochrome.html b/rogue_chat_nocanvas_monochrome.html
index 085c8a2..1e3653b 100644
--- a/rogue_chat_nocanvas_monochrome.html
+++ b/rogue_chat_nocanvas_monochrome.html
@@ -26,10 +26,10 @@ flatten surroundings: <input id="key_flatten" type="text" value="F" /><br />
 switch to chat mode: <input id="key_switch_to_chat" type="text" value="t" /><br />
 switch to play mode: <input id="key_switch_to_play" type="text" value="p" /><br />
 switch to study mode: <input id="key_switch_to_study" type="text" value="?" /><br />
-edit terrain (from play mode): <input id="key_switch_to_edit" type="text" value="m" /><br />
-enter terrain password (from play mode): <input id="key_switch_to_password" type="text" value="P" /><br />
-annotate terrain (from study mode): <input id="key_switch_to_annotate" type="text" value="m" /><br />
-annotate portal (from study mode): <input id="key_switch_to_portal" type="text" value="P" /><br />
+edit tile (from play mode): <input id="key_switch_to_edit" type="text" value="m" /><br />
+enter tile password (from play mode): <input id="key_switch_to_password" type="text" value="P" /><br />
+annotate tile (from play mode): <input id="key_switch_to_annotate" type="text" value="M" /><br />
+annotate portal (from play mode): <input id="key_switch_to_portal" type="text" value="T" /><br />
 toggle terrain/control view (from study mode): <input id="key_toggle_map_mode" type="text" value="M" /><br />
 </div>
 <script>
@@ -347,10 +347,10 @@ let tui = {
         };
     };
   },
-  switch_mode: function(mode, keep_pos=false) {
+  switch_mode: function(mode) {
     this.show_help = false;
     this.map_mode = 'terrain';
-    if (mode == mode_study && !keep_pos && game.player_id in game.things) {
+    if (mode.shows_info && game.player_id in game.things) {
       explorer.position = game.things[game.player_id].position;
     }
     this.mode = mode;
@@ -530,10 +530,12 @@ let tui = {
               content += "[" + tui.keys.flatten + "] – flatten player's surroundings\n";
           }
           content += '\nOther modes available from here:\n';
-          content += '[' + this.keys.switch_to_edit + '] – terrain edit mode\n';
-          content += '[' + this.keys.switch_to_password + '] – terrain password edit mode\n';
           content += '[' + this.keys.switch_to_chat + '] – chat mode\n';
           content += '[' + this.keys.switch_to_study + '] – study mode\n';
+          content += '[' + this.keys.switch_to_edit + '] – terrain edit mode\n';
+          content += '[' + this.keys.switch_to_portal + '] – portal edit mode\n';
+          content += '[' + this.keys.switch_to_annotate + '] – annotation mode\n';
+          content += '[' + this.keys.switch_to_password + '] – password input mode\n';
       } else if (this.mode == mode_study) {
           content += "Available actions:\n";
           content += '[' + movement_keys_desc + '] – move question mark\n';
@@ -541,8 +543,6 @@ let tui = {
           content += '\nOther modes available from here:\n';
           content += '[' + this.keys.switch_to_chat + '] – chat mode\n';
           content += '[' + this.keys.switch_to_play + '] – play mode\n';
-          content += '[' + this.keys.switch_to_portal + '] – portal mode\n';
-          content += '[' + this.keys.switch_to_annotate + '] – annotation mode\n';
       } else if (this.mode == mode_chat) {
           content += '/nick NAME – re-name yourself to NAME\n';
           content += '/msg USER TEXT – send TEXT to USER\n';
@@ -758,10 +758,10 @@ tui.inputEl.addEventListener('keydown', (event) => {
         tui.empty_input();
     } else if (tui.mode == mode_portal && event.key == 'Enter') {
         explorer.set_portal(tui.inputEl.value);
-        tui.switch_mode(mode_study, true);
+        tui.switch_mode(mode_play);
     } else if (tui.mode == mode_annotate && event.key == 'Enter') {
         explorer.annotate(tui.inputEl.value);
-        tui.switch_mode(mode_study, true);
+        tui.switch_mode(mode_play);
     } else if (tui.mode == mode_password && event.key == 'Enter') {
         if (tui.inputEl.value.length == 0) {
             tui.inputEl.value = " ";
@@ -798,22 +798,22 @@ tui.inputEl.addEventListener('keydown', (event) => {
                     }
                 } else if (tokens[0].slice(1) == 'reconnect') {
 		    if (tokens.length > 1) {
-                        server.reconnect_to(tokens[1]);
+                server.reconnect_to(tokens[1]);
 		    } else {
                         server.reconnect();
 		    }
                 } else {
                     tui.log_msg('? unknown command');
                 }
-	    } else {
-	        server.send(['ALL', tui.inputEl.value]);
+            } else {
+	            server.send(['ALL', tui.inputEl.value]);
             }
-	} else if (tui.inputEl.valuelength > 0) {
-	    server.send(['ALL', tui.inputEl.value]);
+        } else if (tui.inputEl.valuelength > 0) {
+	        server.send(['ALL', tui.inputEl.value]);
         }
         tui.empty_input();
         tui.full_refresh();
-      } else if (tui.mode == mode_play) {
+    } else if (tui.mode == mode_play) {
           if (event.key === tui.keys.switch_to_chat) {
               event.preventDefault();
               tui.switch_mode(mode_chat);
@@ -832,6 +832,12 @@ tui.inputEl.addEventListener('keydown', (event) => {
           } else if (event.key in tui.movement_keys
                      && game.tasks.includes('MOVE')) {
               server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
+          } else if (event.key === tui.keys.switch_to_portal) {
+              event.preventDefault();
+              tui.switch_mode(mode_portal);
+          } else if (event.key === tui.keys.switch_to_annotate) {
+              event.preventDefault();
+              tui.switch_mode(mode_annotate);
           };
     } else if (tui.mode == mode_study) {
         if (event.key === tui.keys.switch_to_chat) {
@@ -839,9 +845,6 @@ tui.inputEl.addEventListener('keydown', (event) => {
             tui.switch_mode(mode_chat);
         } else if (event.key == tui.keys.switch_to_play) {
             tui.switch_mode(mode_play);
-        } else if (event.key === tui.keys.switch_to_portal) {
-            event.preventDefault();
-            tui.switch_mode(mode_portal);
         } else if (event.key in tui.movement_keys) {
             explorer.move(tui.movement_keys[event.key]);
         } else if (event.key == tui.keys.toggle_map_mode) {
@@ -851,9 +854,6 @@ tui.inputEl.addEventListener('keydown', (event) => {
                 tui.map_mode = 'terrain';
             }
             tui.full_refresh();
-        } else if (event.key === tui.keys.switch_to_annotate) {
-            event.preventDefault();
-            tui.switch_mode(mode_annotate);
         };
     }
 }, false);