From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 7 Nov 2020 18:45:30 +0000 (+0100)
Subject: Remove command char configurability, hardcode '/'.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/static/%7B%7B%20web_path%20%7D%7D/task?a=commitdiff_plain;h=95ea4ca4ac0d5bd1c18d60087619f4df898ed6a7;p=plomrogue2-experiments

Remove command char configurability, hardcode '/'.
---

diff --git a/new2/rogue_chat_curses.py b/new2/rogue_chat_curses.py
index 9eb99c8..5b3a7a8 100755
--- a/new2/rogue_chat_curses.py
+++ b/new2/rogue_chat_curses.py
@@ -219,11 +219,11 @@ class TUI:
     def help(self):
         self.log_msg("HELP:");
         self.log_msg("chat mode commands:");
-        self.log_msg("  :nick NAME - re-name yourself to NAME");
-        self.log_msg("  :msg USER TEXT - send TEXT to USER");
-        self.log_msg("  :help - show this help");
-        self.log_msg("  :P or :play - switch to play mode");
-        self.log_msg("  :? or :study - switch to study mode");
+        self.log_msg("  /nick NAME - re-name yourself to NAME");
+        self.log_msg("  /msg USER TEXT - send TEXT to USER");
+        self.log_msg("  /help - show this help");
+        self.log_msg("  /P or /play - switch to play mode");
+        self.log_msg("  /? or /study - switch to study mode");
         self.log_msg("commands common to study and play mode:");
         if type(self.game.map_geometry) == MapGeometrySquare:
             self.log_msg("  w,a,s,d - move");
@@ -455,22 +455,22 @@ class TUI:
                 self.send('LOGIN ' + quote(self.input_))
                 self.input_ = ""
             elif self.mode == self.mode_chat and key == '\n':
-                if self.input_[0] == ':':
-                    if self.input_ in {':P', ':play'}:
+                if self.input_[0] == '/':
+                    if self.input_ in {'/P', '/play'}:
                         self.switch_mode('play')
-                    elif self.input_ in {':?', ':study'}:
+                    elif self.input_ in {'/?', '/study'}:
                         self.switch_mode('study')
-                    if self.input_ == ':help':
+                    elif self.input_ == '/help':
                         self.help()
-                    if self.input_ == ':reconnect':
+                    elif self.input_ == '/reconnect':
                         reconnect()
-                    elif self.input_.startswith(':nick'):
+                    elif self.input_.startswith('/nick'):
                         tokens = self.input_.split(maxsplit=1)
                         if len(tokens) == 2:
                             self.send('LOGIN ' + quote(tokens[1]))
                         else:
                             self.log_msg('? need login name')
-                    elif self.input_.startswith(':msg'):
+                    elif self.input_.startswith('/msg'):
                         tokens = self.input_.split(maxsplit=2)
                         if len(tokens) == 3:
                             self.send('QUERY %s %s' % (quote(tokens[1]),
diff --git a/new2/rogue_chat_nocanvas_monochrome.html b/new2/rogue_chat_nocanvas_monochrome.html
index e983c35..b81dcb1 100644
--- a/new2/rogue_chat_nocanvas_monochrome.html
+++ b/new2/rogue_chat_nocanvas_monochrome.html
@@ -10,7 +10,6 @@ movement: <select id="movement_keys" name="movement_keys" >
 </select>
 rows: <input id="n_rows" type="number" step=4 min=8 value=24 />
 cols: <input id="n_cols" type="number" step=4 min=20 value=80 />
-command character: <select id="command_char"" >
 <option value=":" selected>:</option>
 <option value="/">/</option>
 </select>
@@ -24,7 +23,6 @@ let websocket_location = "ws://localhost:8000";
 let movement_keys_selector = document.getElementById("movement_keys");
 let rows_selector = document.getElementById("n_rows");
 let cols_selector = document.getElementById("n_cols");
-let command_char_selector = document.getElementById("command_char");
 
 let terminal = {
   foreground: 'white',
@@ -155,7 +153,7 @@ let server = {
         };
         this.websocket.onclose = function(event) {
             tui.log_msg("@ server disconnected :(");
-            tui.log_msg("@ hint: try the '" + command_char_selector.value + "reconnect' command");
+            tui.log_msg("@ hint: try the '/reconnect' command");
         };
 	this.websocket.onmessage = this.handle_event;
     },
@@ -402,11 +400,11 @@ let tui = {
   log_help: function() {
     this.log_msg("HELP:");
     this.log_msg("chat mode commands:");
-    this.log_msg("  " + command_char_selector.value + "nick NAME - re-name yourself to NAME");
-    this.log_msg("  " + command_char_selector.value + "msg USER TEXT - send TEXT to USER");
-    this.log_msg("  " + command_char_selector.value + "help - show this help");
-    this.log_msg("  " + command_char_selector.value + "P or " + command_char_selector.value + "play - switch to play mode");
-    this.log_msg("  " + command_char_selector.value + "? or " + command_char_selector.value + "study - switch to study mode");
+    this.log_msg("  /nick NAME - re-name yourself to NAME");
+    this.log_msg("  /msg USER TEXT - send TEXT to USER");
+    this.log_msg("  /help - show this help");
+    this.log_msg("  /P or /play - switch to play mode");
+    this.log_msg("  /? or /study - switch to study mode");
     this.log_msg("commands common to study and play mode:");
     this.log_msg("  " + this.movement_keys_desc + " - move");
     this.log_msg("  C - switch to chat mode");
@@ -704,7 +702,7 @@ tui.inputEl.addEventListener('keydown', (event) => {
     } else if (tui.mode == mode_chat && event.key == 'Enter') {
         let [tokens, token_starts] = parser.tokenize(tui.inputEl.value);
         if (tokens.length > 0 && tokens[0].length > 0) {
-            if (tui.inputEl.value[0][0] == command_char_selector.value) {
+            if (tui.inputEl.value[0][0] == '/') {
                 if (tokens[0].slice(1) == 'play' || tokens[0].slice(1) == 'P') {
                     tui.switch_mode(mode_play);
                 } else if (tokens[0].slice(1) == 'study' || tokens[0].slice(1) == '?') {
@@ -794,7 +792,7 @@ cols_selector.addEventListener('input', function() {
     tui.full_refresh();
 }, false);
 window.setInterval(function() {
-    if (!(['input', 'n_cols', 'n_rows', 'movement_keys', 'command_char'].includes(document.activeElement.id))) {
+    if (!(['input', 'n_cols', 'n_rows', 'movement_keys'].includes(document.activeElement.id))) {
         tui.inputEl.focus();
     }
 }, 100);