X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=rogue_chat.html;h=23d1a574679c804582021ef1d53b4fe6997e3cfa;hb=e9314285cc797bad29b3621d713ad2a0703c4d2e;hp=fe78f6b7118571666775d0f15df731ec3b710193;hpb=836f37cfc14cd1a27ac5aee1f8465925a7ed87c4;p=plomrogue2

diff --git a/rogue_chat.html b/rogue_chat.html
index fe78f6b..23d1a57 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -57,7 +57,6 @@ keyboard input/control: <span id="keyboard_control"></span>
       <button id="consume"></button>
       <button id="switch_to_command_thing"></button>
       <button id="teleport"></button>
-      <button id="install"></button>
       <button id="wear"></button>
       <button id="spin"></button>
     </td>
@@ -67,6 +66,7 @@ keyboard input/control: <span id="keyboard_control"></span>
     <td>
       <button id="switch_to_write"></button>
       <button id="flatten"></button>
+      <button id="install"></button>
       <button id="switch_to_annotate"></button>
       <button id="switch_to_portal"></button>
       <button id="switch_to_name_thing"></button>
@@ -513,7 +513,7 @@ let server = {
             game.thing_types[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'THING_CARRYING') {
             let t = game.get_thing(tokens[1], false);
-            t.carrying = t = game.get_thing(tokens[2], false);
+            t.carrying = game.get_thing(tokens[2], false);
         } else if (tokens[0] === 'THING_INSTALLED') {
             let t = game.get_thing(tokens[1], false);
             t.installed = true;
@@ -539,6 +539,9 @@ let server = {
             }
         } else if (tokens[0] === 'CHAT') {
              tui.log_msg('# ' + tokens[1], 1);
+        } else if (tokens[0] === 'CHATFACE') {
+            tui.draw_face = tokens[1];
+            tui.full_refresh();
         } else if (tokens[0] === 'REPLY') {
              tui.log_msg('#MUSICPLAYER: ' + tokens[1], 1);
         } else if (tokens[0] === 'PLAYER_ID') {
@@ -701,11 +704,12 @@ let tui = {
   offset: [0,0],
   map_lines: [],
   selectables: [],
+  draw_face: false,
   init: function() {
       this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
                                         "command_thing", "take_thing", "drop_thing"]
       this.mode_play.available_actions = ["move", "teleport", "door", "consume",
-                                          "install", "wear", "spin"];
+                                          "wear", "spin"];
       this.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
       this.mode_study.available_actions = ["toggle_map_mode", "move_explorer"];
       this.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type",
@@ -717,7 +721,8 @@ let tui = {
       this.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
                                         "password", "chat", "study", "play",
                                         "admin_enter", "enter_face"]
-      this.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"]
+      this.mode_edit.available_actions = ["move", "flatten", "install",
+                                          "toggle_map_mode"]
       this.inputEl = document.getElementById("input");
       this.inputEl.focus();
       this.switch_mode('waiting_for_server');
@@ -764,25 +769,26 @@ let tui = {
   },
   switch_mode: function(mode_name) {
 
-    function fail(msg) {
+    function fail(msg, return_mode) {
         tui.log_msg('? ' + msg);
         terminal.blink_screen();
-        this.switch_mode('play');
+        tui.switch_mode(return_mode);
     }
 
     if (this.mode && this.mode.name == 'control_tile_draw') {
         tui.log_msg('@ finished tile protection drawing.')
     }
+    this.draw_face = false;
     this.tile_draw = false;
       if (mode_name == 'command_thing' && (!game.player.carrying
                                            || !game.player.carrying.commandable)) {
-        return fail('not carrying anything commandable');
+        return fail('not carrying anything commandable', 'play');
     };
     if (mode_name == 'take_thing' && game.player.carrying) {
-        return fail('already carrying something');
+        return fail('already carrying something', 'play');
     };
     if (mode_name == 'drop_thing' && !game.player.carrying) {
-        return fail('not carrying anything droppable');
+        return fail('not carrying anything droppable', 'play');
     }
     if (mode_name == 'admin_enter' && this.is_admin) {
         mode_name = 'admin';
@@ -800,7 +806,7 @@ let tui = {
             }
         }
         if (!thing_id) {
-            return fail('not standing over thing');
+            return fail('not standing over thing', 'fail');
         } else {
             this.selected_thing_id = thing_id;
         }
@@ -1126,6 +1132,28 @@ let tui = {
         terminal.write(term_y, term_x, to_draw);
     }
   },
+  draw_face_popup: function() {
+      const t = game.things[this.draw_face];
+      if (!t || !t.face) {
+          this.draw_face = false;
+          return;
+      }
+      const start_x = tui.window_width - 10;
+      function draw_body_part(body_part, end_y) {
+          terminal.write(end_y - 4, start_x, ' ________ ');
+          terminal.write(end_y - 3, start_x, '|        |');
+          terminal.write(end_y - 2, start_x, '| ' + body_part.slice(0, 6) + ' |');
+          terminal.write(end_y - 1, start_x, '| ' + body_part.slice(6, 12) + ' |');
+          terminal.write(end_y, start_x, '| ' + body_part.slice(12, 18) + ' |');
+      }
+      if (t.face) {
+          draw_body_part(t.face, terminal.rows - 2);
+      }
+      if (t.hat) {
+          draw_body_part(t.hat, terminal.rows - 5);
+      }
+      terminal.write(terminal.rows - 1, start_x, '|        |');
+  },
   draw_mode_line: function() {
       let help = 'hit [' + this.keys.help + '] for help';
       if (this.mode.has_input_prompt) {
@@ -1214,7 +1242,8 @@ let tui = {
       content += this.mode.list_available_modes();
       let start_x = 0;
       if (!this.mode.has_input_prompt) {
-          start_x = this.window_width
+          start_x = this.window_width;
+          this.draw_links = false;
       }
       terminal.drawBox(0, start_x, terminal.rows, this.window_width);
       let [lines, _] = this.msg_into_lines_of_width(content, this.window_width);
@@ -1241,6 +1270,7 @@ let tui = {
       }
   },
   full_refresh: function() {
+    this.draw_links = true;
     this.links = {};
     terminal.drawBox(0, 0, terminal.rows, terminal.cols);
     this.recalc_input_lines();
@@ -1261,6 +1291,12 @@ let tui = {
     if (this.show_help) {
         this.draw_help();
     }
+    if (this.draw_face && ['chat', 'play'].includes(this.mode.name)) {
+        this.draw_face_popup();
+    }
+    if (!this.draw_links) {
+        this.links = {};
+    }
     terminal.refresh();
   }
 }
@@ -1589,8 +1625,6 @@ tui.inputEl.addEventListener('keydown', (event) => {
               server.send(["TASK:INTOXICATE"]);
           } else if (event.key === tui.keys.door && tui.task_action_on('door')) {
               server.send(["TASK:DOOR"]);
-          } else if (event.key === tui.keys.install && tui.task_action_on('install')) {
-              server.send(["TASK:INSTALL"]);
           } else if (event.key === tui.keys.wear && tui.task_action_on('wear')) {
               server.send(["TASK:WEAR"]);
           } else if (event.key === tui.keys.spin && tui.task_action_on('spin')) {
@@ -1629,6 +1663,8 @@ tui.inputEl.addEventListener('keydown', (event) => {
             server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
         } else if (event.key === tui.keys.flatten && tui.task_action_on('flatten')) {
             server.send(["TASK:FLATTEN_SURROUNDINGS", tui.password]);
+          } else if (event.key === tui.keys.install && tui.task_action_on('install')) {
+              server.send(["TASK:INSTALL", tui.password]);
         } else if (event.key == tui.keys.toggle_map_mode) {
             tui.toggle_map_mode();
         }