Cache player object, so some player data is available even during turn update.

[plomrogue2] / rogue_chat.html

diff --git a/rogue_chat.html b/rogue_chat.html
index 86c4644af7c17e74399d5b14332337af7ba5fa7b..d8d9db7c896535082a37e36ff8ac9bc3b25ebc5c 100644 (file)
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -530,11 +530,13 @@ let server = {
             game.map_control = tokens[1]
         } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
             game.turn_complete = true;
+            game.player = game.things[game.player_id];
+            explorer.info_cached = false;
             if (tui.mode.name == 'post_login_wait') {
                 tui.switch_mode('play');
+            } else {
+                tui.full_refresh();
             }
-            explorer.info_cached = false;
-            tui.full_refresh();
         } else if (tokens[0] === 'CHAT') {
              tui.log_msg('# ' + tokens[1], 1);
         } else if (tokens[0] === 'REPLY') {
@@ -765,14 +767,14 @@ let tui = {
         tui.log_msg('@ finished tile protection drawing.')
     }
     this.tile_draw = false;
-    const player = game.things[game.player_id];
-    if (mode_name == 'command_thing' && (!player.carrying || !player.carrying.commandable)) {
+      if (mode_name == 'command_thing' && (!game.player.carrying
+                                           || !game.player.carrying.commandable)) {
         this.log_msg('? not carrying anything commandable');
         terminal.blink_screen();
         this.switch_mode('play');
         return;
     };
-    if (mode_name == 'drop_thing' && (!player.carrying)) {
+    if (mode_name == 'drop_thing' && (!game.player.carrying)) {
         this.log_msg('? not carrying anything droppable');
         terminal.blink_screen();
         this.switch_mode('play');
@@ -787,8 +789,8 @@ let tui = {
                 continue;
             }
             let t = game.things[t_id];
-            if (player.position[0] == t.position[0]
-                && player.position[1] == t.position[1]) {
+            if (game.player.position[0] == t.position[0]
+                && game.player.position[1] == t.position[1]) {
                 thing_id = t_id;
                 break;
             }
@@ -811,7 +813,7 @@ let tui = {
         this.inputEl.focus();
     }
     if (game.player_id in game.things && (this.mode.shows_info || this.mode.name == 'control_tile_draw')) {
-        explorer.position = game.things[game.player_id].position;
+        explorer.position = game.player.position;
     }
     this.inputEl.value = "";
     this.restore_input_values();
@@ -848,9 +850,8 @@ let tui = {
         this.show_help = true;
     } else if (this.mode.name == 'take_thing') {
         this.log_msg("Portable things in reach for pick-up:");
-        const player = game.things[game.player_id];
-        const y = player.position[0]
-        const x = player.position[1]
+        const y = game.player.position[0]
+        const x = game.player.position[1]
         let select_range = [y.toString() + ':' + x.toString(),
                             (y + 0).toString() + ':' + (x - 1).toString(),
                             (y + 0).toString() + ':' + (x + 1).toString(),
@@ -1080,11 +1081,10 @@ let tui = {
                 }
             };
         }
-        let player = game.things[game.player_id];
         if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
             map_lines_split[explorer.position[0]][explorer.position[1]] = '??';
         } else if (tui.map_mode != 'terrain + things') {
-            map_lines_split[player.position[0]][player.position[1]] = '??';
+            map_lines_split[game.player.position[0]][game.player.position[1]] = '??';
         }
         this.map_lines = []
         if (game.map_geometry == 'Square') {
@@ -1103,7 +1103,7 @@ let tui = {
             };
         }
         let window_center = [terminal.rows / 2, this.window_width / 2];
-        let center_position = [player.position[0], player.position[1]];
+        let center_position = [game.player.position[0], game.player.position[1]];
         if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
             center_position = [explorer.position[0], explorer.position[1]];
         }
@@ -1325,9 +1325,8 @@ let game = {
         return target;
     },
     teleport: function() {
-        let player = this.get_thing(game.player_id);
-        if (player.position in this.portals) {
-            server.reconnect_to(this.portals[player.position]);
+        if (game.player.position in this.portals) {
+            server.reconnect_to(this.portals[game.player.position]);
         } else {
             terminal.blink_screen();
             tui.log_msg('? not standing on portal')