From 37ceb9d9fd14ae9081af386905947a60bd941a55 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 25 Nov 2020 04:22:41 +0100
Subject: [PATCH] Enable edit mode movement in web client.

---
 rogue_chat.html      | 22 +++++++++++-----------
 rogue_chat_curses.py |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/rogue_chat.html b/rogue_chat.html
index 51ac81d..1846e98 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -49,9 +49,9 @@ terminal columns: <input id="n_cols" type="number" step=4 min=80 value=80 />
   <tr>
     <td><button id="switch_to_play">play mode</button></td>
     <td>
-      <button id="take_thing">take thing</button>
-      <button id="teleport">teleport</button>
+      <button id="take_thing">pick up thing</button>
       <button id="drop_thing">drop thing</button>
+      <button id="teleport">teleport</button>
     </td>
   </tr>
   <tr>
@@ -947,7 +947,7 @@ let tui = {
               content += "[" + this.keys.take_thing + "] – pick up thing\n";
           }
           if (game.tasks.includes('DROP')) {
-              content += "[" + this.keys.drop_thing + "] – drop picked up thing\n";
+              content += "[" + this.keys.drop_thing + "] – drop picked-up thing\n";
           }
           content += "[" + tui.keys.teleport + "] – teleport to other space\n";
           content += '\n';
@@ -1408,56 +1408,56 @@ document.getElementById("teleport").onclick = function() {
     game.teleport();
 };
 document.getElementById("move_upleft").onclick = function() {
-    if (tui.mode.name == 'play') {
+    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
         server.send(['TASK:MOVE', 'UPLEFT']);
     } else {
         explorer.move('UPLEFT');
     };
 };
 document.getElementById("move_left").onclick = function() {
-    if (tui.mode.name == 'play') {
+    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
         server.send(['TASK:MOVE', 'LEFT']);
     } else {
         explorer.move('LEFT');
     };
 };
 document.getElementById("move_downleft").onclick = function() {
-    if (tui.mode.name == 'play') {
+    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
         server.send(['TASK:MOVE', 'DOWNLEFT']);
     } else {
         explorer.move('DOWNLEFT');
     };
 };
 document.getElementById("move_down").onclick = function() {
-    if (tui.mode.name == 'play') {
+    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
         server.send(['TASK:MOVE', 'DOWN']);
     } else {
         explorer.move('DOWN');
     };
 };
 document.getElementById("move_up").onclick = function() {
-    if (tui.mode.name == 'play') {
+    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
         server.send(['TASK:MOVE', 'UP']);
     } else {
         explorer.move('UP');
     };
 };
 document.getElementById("move_upright").onclick = function() {
-    if (tui.mode.name == 'play') {
+    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
         server.send(['TASK:MOVE', 'UPRIGHT']);
     } else {
         explorer.move('UPRIGHT');
     };
 };
 document.getElementById("move_right").onclick = function() {
-    if (tui.mode.name == 'play') {
+    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
         server.send(['TASK:MOVE', 'RIGHT']);
     } else {
         explorer.move('RIGHT');
     };
 };
 document.getElementById("move_downright").onclick = function() {
-    if (tui.mode.name == 'play') {
+    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
         server.send(['TASK:MOVE', 'DOWNRIGHT']);
     } else {
         explorer.move('DOWNRIGHT');
diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index c3d2165..b498ce0 100755
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -742,7 +742,7 @@ class TUI:
                 if 'PICK_UP' in self.game.tasks:
                     content += "[%s] – pick up thing\n" % self.keys['take_thing']
                 if 'DROP' in self.game.tasks:
-                    content += "[%s] – drop picked up thing\n" % self.keys['drop_thing']
+                    content += "[%s] – drop picked-up thing\n" % self.keys['drop_thing']
                 content += '[%s] – teleport to other space\n' % self.keys['teleport']
                 content += '\n'
             elif self.mode.name == 'study':
-- 
2.30.2