X-Git-Url: https://plomlompom.com/repos/unset_cookie?a=blobdiff_plain;f=rogue_chat.html;h=1ba0ff1f6fcf02debf88eaefcc07b2c9e71c3d07;hb=80814ef774cbdf10820001490aa45681af44056f;hp=9740fff34c7b251509d4e7b40d341fdf98282481;hpb=52b01fc00d6ea2c053f9022981498b97ebd05839;p=plomrogue2 diff --git a/rogue_chat.html b/rogue_chat.html index 9740fff..1ba0ff1 100644 --- a/rogue_chat.html +++ b/rogue_chat.html @@ -19,7 +19,7 @@ terminal rows:
@@ -454,7 +454,6 @@ let server = { this.url = url; this.websocket = new WebSocket(this.url); this.websocket.onopen = function(event) { - server.connected = true; game.thing_types = {}; game.terrains = {}; server.send(['TASKS']); @@ -464,7 +463,6 @@ let server = { tui.switch_mode('login'); }; this.websocket.onclose = function(event) { - server.connected = false; tui.switch_mode('waiting_for_server'); tui.log_msg("@ server disconnected :("); }; @@ -532,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') { @@ -767,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'); @@ -789,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; } @@ -813,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(); @@ -850,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(), @@ -1044,8 +1043,9 @@ let tui = { }; map_lines_split.push(line); if (this.map_mode == 'terrain + annotations') { - for (const coordinate of explorer.info_hints) { - map_lines_split[coordinate[0]][coordinate[1]] = 'A '; + for (const [coordinate, _] of Object.entries(explorer.annotations)) { + const yx = coordinate.split(',') + map_lines_split[yx[0]][yx[1]] = 'A '; } } else if (this.map_mode == 'terrain + things') { for (const p in game.portals) { @@ -1082,11 +1082,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') { @@ -1105,7 +1104,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]]; } @@ -1327,9 +1326,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') @@ -1472,11 +1470,12 @@ tui.inputEl.addEventListener('keydown', (event) => { if (event.key == 'Enter') { event.preventDefault(); } - if (tui.mode.has_input_prompt && event.key == 'Enter' - && tui.inputEl.value.length == 0 - && ['chat', 'command_thing', 'take_thing', 'drop_thing', - 'admin_enter'].includes(tui.mode.name)) { - if (tui.mode.name != 'chat') { + if ((!tui.mode.is_intro && event.key == 'Escape') + || (tui.mode.has_input_prompt && event.key == 'Enter' + && tui.inputEl.value.length == 0 + && ['chat', 'command_thing', 'take_thing', 'drop_thing', + 'admin_enter'].includes(tui.mode.name))) { + if (!['chat', 'play', 'study', 'edit'].includes(tui.mode.name)) { tui.log_msg('@ aborted'); } tui.switch_mode('play'); @@ -1659,13 +1658,13 @@ for (let key_selector of key_selectors) { }, false); } window.setInterval(function() { - if (server.connected) { + if (server.websocket.readyState == 1) { server.send(['PING']); - } else { + } else if (server.websocket.readyState != 0) { server.reconnect_to(server.url); tui.log_msg('@ attempting reconnect â¦') } -}, 5000); +}, 1000); window.setInterval(function() { let val = "?"; let span_decoration = "none"; |