X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=new2%2Frogue_chat_nocanvas_monochrome.html;h=2d60619ee7282d2590a1818f73a3156161b65168;hb=4eb281718a289961da0737570ceceee069fa681a;hp=754021f6ead49f6f6f4d5ad3aa010c26ab35a701;hpb=021e4276cce114de08c0ce3c5e781ffc2184d4ee;p=plomrogue2-experiments
diff --git a/new2/rogue_chat_nocanvas_monochrome.html b/new2/rogue_chat_nocanvas_monochrome.html
index 754021f..2d60619 100644
--- a/new2/rogue_chat_nocanvas_monochrome.html
+++ b/new2/rogue_chat_nocanvas_monochrome.html
@@ -4,12 +4,16 @@
-movement:
@@ -17,9 +21,10 @@ cols:
"use strict";
let websocket_location = "ws://localhost:8000";
-let wasd_selector = document.getElementById("WASD_selector");
+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',
@@ -133,20 +138,95 @@ let parser = {
},
}
+class Thing {
+ constructor(yx) {
+ this.position = yx;
+ }
+}
+
let server = {
init: function(url) {
- this.websocket = new WebSocket(url);
+ this.url = url;
+ this.websocket = new WebSocket(this.url);
this.websocket.onopen = function(event) {
window.setInterval(function() { server.send(['PING']) }, 30000);
tui.log_msg("@ server connected! :)");
tui.init_login();
};
this.websocket.onclose = function(event) {
- tui.log_msg('@ server disconnected :(');
- }
+ tui.log_msg("@ server disconnected :(");
+ tui.log_msg("@ hint: try the '" + command_char_selector.value + "reconnect' command");
+ };
+ this.websocket.onmessage = this.handle_event;
+ },
+ reconnect: function() {
+ this.reconnect_to(this.url);
+ },
+ reconnect_to: function(url) {
+ this.websocket.close();
+ this.init(url);
},
send: function(tokens) {
this.websocket.send(unparser.untokenize(tokens));
+ },
+ handle_event: function(event) {
+ let tokens = parser.tokenize(event.data)[0];
+ if (tokens[0] === 'TURN') {
+ game.turn_complete = false;
+ game.things = {};
+ game.portals = {};
+ game.turn = parseInt(tokens[1]);
+ } else if (tokens[0] === 'THING_POS') {
+ game.get_thing(tokens[1], true).position = parser.parse_yx(tokens[2]);
+ } else if (tokens[0] === 'THING_NAME') {
+ game.get_thing(tokens[1], true).name_ = tokens[2];
+ } else if (tokens[0] === 'MAP') {
+ game.map_geometry = tokens[1];
+ tui.init_wasd();
+ game.map_size = parser.parse_yx(tokens[2]);
+ game.map = tokens[3]
+ } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
+ game.turn_complete = true;
+ explorer.empty_info_db();
+ if (tui.mode == mode_post_login_wait) {
+ tui.switch_mode(mode_play);
+ tui.log_help();
+ } else if (tui.mode == mode_study) {
+ explorer.query_info();
+ }
+ let t = game.get_thing(game.player_id);
+ if (t.position in game.portals) {
+ tui.teleport_target = game.portals[t.position];
+ tui.switch_mode(mode_teleport);
+ return;
+ }
+ tui.full_refresh();
+ } else if (tokens[0] === 'CHAT') {
+ tui.log_msg('# ' + tokens[1], 1);
+ } else if (tokens[0] === 'PLAYER_ID') {
+ game.player_id = parseInt(tokens[1]);
+ } else if (tokens[0] === 'LOGIN_OK') {
+ this.send(['GET_GAMESTATE']);
+ tui.switch_mode(mode_post_login_wait);
+ } else if (tokens[0] === 'PORTAL') {
+ let position = parser.parse_yx(tokens[1]);
+ game.portals[position] = tokens[2];
+ } else if (tokens[0] === 'ANNOTATION') {
+ let position = parser.parse_yx(tokens[1]);
+ explorer.update_info_db(position, tokens[2]);
+ } else if (tokens[0] === 'UNHANDLED_INPUT') {
+ tui.log_msg('? unknown command');
+ } else if (tokens[0] === 'PLAY_ERROR') {
+ terminal.blink_screen();
+ } else if (tokens[0] === 'ARGUMENT_ERROR') {
+ tui.log_msg('? syntax error: ' + tokens[1]);
+ } else if (tokens[0] === 'GAME_ERROR') {
+ tui.log_msg('? game error: ' + tokens[1]);
+ } else if (tokens[0] === 'PONG') {
+ console.log('PONG');
+ } else {
+ tui.log_msg('? unhandled input: ' + event.data);
+ }
}
}
@@ -176,20 +256,23 @@ let unparser = {
}
class Mode {
- constructor(name, has_input_prompt=false, shows_annotations=false, is_intro=false) {
+ constructor(name, has_input_prompt=false, shows_info=false, is_intro=false) {
this.name = name;
this.has_input_prompt = has_input_prompt;
- this.shows_annotations = shows_annotations;
+ this.shows_info= shows_info;
this.is_intro = is_intro;
}
}
let mode_waiting_for_server = new Mode('waiting_for_server', false, false, true);
let mode_login = new Mode('login', true, false, true);
+let mode_post_login_wait = new Mode('waiting for game world', false, false, true);
let mode_chat = new Mode('chat / write messages to players', true, false);
let mode_annotate = new Mode('add message to map tile', true, true);
let mode_play = new Mode('play / move around', false, false);
let mode_study = new Mode('check map tiles for messages', false, true);
let mode_edit = new Mode('write ASCII char to map tile', false, false);
+let mode_teleport = new Mode('teleport away?', true);
+let mode_portal = new Mode('add portal to map tile', true, true);
let tui = {
mode: mode_waiting_for_server,
@@ -209,36 +292,74 @@ let tui = {
this.init_wasd();
},
init_wasd: function() {
- if (wasd_selector.value == 'w, a, s, d') {
- tui.key_up = 'w';
- tui.key_down = 's';
- tui.key_left = 'a';
- tui.key_right = 'd';
- } else if (wasd_selector.value == 'arrow keys') {
- tui.key_up = 'ArrowUp';
- tui.key_down = 'ArrowDown';
- tui.key_left = 'ArrowLeft';
- tui.key_right = 'ArrowRight';
+
+ if (movement_keys_selector.value == 'alphabetic') {
+ if (game.map_geometry == 'Square') {
+ this.movement_keys = {
+ 'w': 'UP',
+ 'a': 'LEFT',
+ 's': 'DOWN',
+ 'd': 'RIGHT'
+ };
+ tui.movement_keys_desc = 'w, a, s, d';
+ } else if (game.map_geometry == 'Hex') {
+ this.movement_keys = {
+ 'w': 'UPLEFT',
+ 'e': 'UPRIGHT',
+ 'd': 'RIGHT',
+ 'c': 'DOWNRIGHT',
+ 'x': 'DOWNLEFT',
+ 's': 'LEFT'
+ };
+ tui.movement_keys_desc = 'e, d, c, x, s, w';
+ };
+ } else if (movement_keys_selector.value == 'arrow_or_numpad') {
+ if (game.map_geometry == 'Square') {
+ this.movement_keys = {
+ 'ArrowUp': 'UP',
+ 'ArrowLeft': 'LEFT',
+ 'ArrowDown': 'DOWN',
+ 'ArrowRight': 'RIGHT'
+ };
+ tui.movement_keys_desc = 'arrow keys';
+ } else if (game.map_geometry == 'Hex') {
+ this.movement_keys = {
+ '7': 'UPLEFT',
+ '9': 'UPRIGHT',
+ '6': 'RIGHT',
+ '3': 'DOWNRIGHT',
+ '1': 'DOWNLEFT',
+ '4': 'LEFT'
+ };
+ tui.movement_keys_desc = 'numpad keys';
+ };
};
- tui.movement_keys_desc = wasd_selector.value;
},
init_login: function() {
this.log_msg("@ please enter your username:");
this.switch_mode(mode_login);
},
switch_mode: function(mode, keep_pos=false) {
- if (mode == mode_study && !keep_pos) {
- explorer.position = game.things[game.player_id];
+ if (mode == mode_study && !keep_pos && game.player_id in game.things) {
+ explorer.position = game.things[game.player_id].position;
}
this.mode = mode;
this.empty_input();
if (mode == mode_annotate && explorer.position in explorer.info_db) {
let info = explorer.info_db[explorer.position];
if (info != "(none)") {
- this.inputEl.value = explorer.info_db[explorer.position];
+ this.inputEl.value = info;
this.recalc_input_lines();
}
}
+ if (mode == mode_portal && explorer.position in game.portals) {
+ let portal = game.portals[explorer.position]
+ this.inputEl.value = portal;
+ this.recalc_input_lines();
+ } else if (mode == mode_teleport) {
+ tui.log_msg("@ May teleport to: " + tui.teleport_target);
+ tui.log_msg("@ Enter 'YES!' to entusiastically affirm.");
+ }
this.full_refresh();
},
empty_input: function(str) {
@@ -257,19 +378,21 @@ let tui = {
let chunk = "";
let lines = [];
for (let i = 0, x = 0; i < msg.length; i++, x++) {
- if (x >= width) {
+ if (x >= width || msg[i] == "\n") {
lines.push(chunk);
chunk = "";
x = 0;
};
- chunk += msg[i];
+ if (msg[i] != "\n") {
+ chunk += msg[i];
+ }
}
lines.push(chunk);
return lines;
},
log_msg: function(msg) {
this.log.push(msg);
- while (this.log.length > terminal.rows * 4) {
+ while (this.log.length > 100) {
this.log.shift();
};
this.full_refresh();
@@ -277,57 +400,78 @@ let tui = {
log_help: function() {
this.log_msg("HELP:");
this.log_msg("chat mode commands:");
- 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(" " + 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("commands common to study and play mode:");
this.log_msg(" " + this.movement_keys_desc + " - move");
- this.log_msg(" c - switch to chat mode");
+ this.log_msg(" C - switch to chat mode");
this.log_msg("commands specific to play mode:");
- this.log_msg(" e - write following ASCII character");
+ this.log_msg(" E - write following ASCII character");
this.log_msg(" f - flatten surroundings");
this.log_msg(" ? - switch to study mode");
this.log_msg("commands specific to study mode:");
- this.log_msg(" e - annotate terrain");
- this.log_msg(" p - switch to play mode");
+ this.log_msg(" E - annotate terrain");
+ this.log_msg(" P - switch to play mode");
},
draw_map: function() {
- let map_lines = [];
+ let map_lines_split = [];
let line = [];
for (let i = 0, j = 0; i < game.map.length; i++, j++) {
if (j == game.map_size[1]) {
- map_lines.push(line);
+ map_lines_split.push(line);
line = [];
j = 0;
};
line.push(game.map[i]);
};
- map_lines.push(line);
- let player_position = [0,0];
- let center_pos = [Math.floor(game.map_size[0] / 2),
- Math.floor(game.map_size[1] / 2)];
+ map_lines_split.push(line);
for (const thing_id in game.things) {
let t = game.things[thing_id];
- map_lines[t[0]][t[1]] = '@';
- if (game.player_id == thing_id) {
- center_pos = t;
- }
+ map_lines_split[t.position[0]][t.position[1]] = '@';
};
- if (tui.mode.shows_annotations) {
- map_lines[explorer.position[0]][explorer.position[1]] = '?';
- center_pos = explorer.position;
+ if (tui.mode.shows_info) {
+ map_lines_split[explorer.position[0]][explorer.position[1]] = '?';
}
- let offset = [(terminal.rows / 2) - center_pos[0],
- this.window_width / 2 - center_pos[1]];
- for (let term_y = offset[0], map_y = 0;
- term_y < terminal.rows && map_y < game.map_size[0];
- term_y++, map_y++) {
- if (term_y >= 0) {
- let to_draw = map_lines[map_y].join('').slice(0, this.window_width - offset[1]);
- terminal.write(term_y, offset[1], to_draw);
- }
+ let map_lines = []
+ if (game.map_geometry == 'Square') {
+ for (let line_split of map_lines_split) {
+ map_lines.push(line_split.join(''));
+ };
+ } else if (game.map_geometry == 'Hex') {
+ let indent = 0
+ for (let line_split of map_lines_split) {
+ map_lines.push(' '.repeat(indent) + line_split.join(' '));
+ if (indent == 0) {
+ indent = 1;
+ } else {
+ indent = 0;
+ };
+ };
+ }
+ let window_center = [terminal.rows / 2, this.window_width / 2];
+ let player = game.things[game.player_id];
+ let center_position = [player.position[0], player.position[1]];
+ if (tui.mode.shows_info) {
+ center_position = [explorer.position[0], explorer.position[1]];
+ }
+ if (game.map_geometry == 'Hex') {
+ center_position[1] = center_position[1] * 2;
+ };
+ let offset = [center_position[0] - window_center[0],
+ center_position[1] - window_center[1]]
+ if (game.map_geometry == 'Hex' && offset[0] % 2) {
+ offset[1] += 1;
+ };
+ let term_y = Math.max(0, -offset[0]);
+ let term_x = Math.max(0, -offset[1]);
+ let map_y = Math.max(0, offset[0]);
+ let map_x = Math.max(0, offset[1]);
+ for (; term_y < terminal.rows && map_y < game.map_size[0]; term_y++, map_y++) {
+ let to_draw = map_lines[map_y].slice(map_x, this.window_width + offset[1]);
+ terminal.write(term_y, term_x, to_draw);
}
},
draw_mode_line: function() {
@@ -356,7 +500,7 @@ let tui = {
},
draw_input: function() {
if (this.mode.has_input_prompt) {
- for (let y = terminal.rows - this.height_input, i = 0; y < terminal.rows && i < this.input_lines.length; y++, i++) {
+ for (let y = terminal.rows - this.height_input, i = 0; i < this.input_lines.length; y++, i++) {
terminal.write(y, this.window_width, this.input_lines[i]);
}
}
@@ -367,10 +511,12 @@ let tui = {
this.draw_history();
this.draw_input();
} else {
- this.draw_map();
- this.draw_turn_line();
+ if (game.turn_complete) {
+ this.draw_map();
+ this.draw_turn_line();
+ }
this.draw_mode_line();
- if (this.mode.shows_annotations) {
+ if (this.mode.shows_info) {
this.draw_info();
} else {
this.draw_history();
@@ -382,83 +528,84 @@ let tui = {
}
let game = {
- things: {},
- turn: 0,
- map: "",
- map_size: [0,0],
- player_id: -1
+ init: function() {
+ this.things = {};
+ this.turn = -1;
+ this.map = "";
+ this.map_size = [0,0];
+ this.player_id = -1;
+ this.portals = {};
+ },
+ get_thing: function(id_, create_if_not_found=false) {
+ if (id_ in game.things) {
+ return game.things[id_];
+ } else if (create_if_not_found) {
+ let t = new Thing([0,0]);
+ game.things[id_] = t;
+ return t;
+ };
+ },
+ move: function(start_position, direction) {
+ let target = [start_position[0], start_position[1]];
+ if (direction == 'LEFT') {
+ target[1] -= 1;
+ } else if (direction == 'RIGHT') {
+ target[1] += 1;
+ } else if (game.map_geometry == 'Square') {
+ if (direction == 'UP') {
+ target[0] -= 1;
+ } else if (direction == 'DOWN') {
+ target[0] += 1;
+ };
+ } else if (game.map_geometry == 'Hex') {
+ let start_indented = start_position[0] % 2;
+ if (direction == 'UPLEFT') {
+ target[0] -= 1;
+ if (!start_indented) {
+ target[1] -= 1;
+ }
+ } else if (direction == 'UPRIGHT') {
+ target[0] -= 1;
+ if (start_indented) {
+ target[1] += 1;
+ }
+ } else if (direction == 'DOWNLEFT') {
+ target[0] += 1;
+ if (!start_indented) {
+ target[1] -= 1;
+ }
+ } else if (direction == 'DOWNRIGHT') {
+ target[0] += 1;
+ if (start_indented) {
+ target[1] += 1;
+ }
+ };
+ };
+ if (target[0] < 0 || target[1] < 0 ||
+ target[0] >= this.map_size[0] || target[1] >= this.map_size[1]) {
+ return null;
+ };
+ return target;
+ }
}
+game.init();
tui.init();
tui.full_refresh();
-
server.init(websocket_location);
-server.websocket.onmessage = function (event) {
- let tokens = parser.tokenize(event.data)[0];
- if (tokens[0] === 'TURN') {
- game.things = {}
- game.turn = parseInt(tokens[1]);
- } else if (tokens[0] === 'THING_POS') {
- game.things[tokens[1]] = parser.parse_yx(tokens[2]);
- } else if (tokens[0] === 'MAP') {
- game.map_size = parser.parse_yx(tokens[1]);
- game.map = tokens[2]
- } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
- explorer.empty_info_db();
- if (tui.mode == mode_study) {
- explorer.query_info();
- }
- tui.full_refresh();
- } else if (tokens[0] === 'CHAT') {
- tui.log_msg('# ' + tokens[1], 1);
- } else if (tokens[0] === 'PLAYER_ID') {
- game.player_id = parseInt(tokens[1]);
- } else if (tokens[0] === 'LOGIN_OK') {
- server.send(['GET_GAMESTATE']);
- tui.log_help();
- tui.switch_mode(mode_play);
- } else if (tokens[0] === 'ANNOTATION') {
- let position = parser.parse_yx(tokens[1]);
- explorer.update_info_db(position, tokens[2]);
- } else if (tokens[0] === 'UNHANDLED_INPUT') {
- tui.log_msg('? unknown command');
- } else if (tokens[0] === 'PLAY_ERROR') {
- terminal.blink_screen();
- } else if (tokens[0] === 'ARGUMENT_ERROR') {
- tui.log_msg('? syntax error: ' + tokens[1]);
- } else if (tokens[0] === 'GAME_ERROR') {
- tui.log_msg('? game error: ' + tokens[1]);
- } else if (tokens[0] === 'PONG') {
- console.log('PONG');
- } else {
- tui.log_msg('? unhandled input: ' + event.data);
- }
-}
let explorer = {
position: [0,0],
info_db: {},
move: function(direction) {
- let try_pos = [0,0];
- try_pos[0] = this.position[0];
- try_pos[1] = this.position[1];
- if (direction == 'left') {
- try_pos[1] -= 1;
- } else if (direction == 'right') {
- try_pos[1] += 1;
- } else if (direction == 'up') {
- try_pos[0] -= 1;
- } else if (direction == 'down') {
- try_pos[0] += 1;
- };
- if (!(try_pos[0] < 0) &&
- !(try_pos[1] < 0) &&
- !(try_pos[0] >= game.map_size[0])
- && !(try_pos[1] >= game.map_size[1])) {
- this.position = try_pos;
+ let target = game.move(this.position, direction);
+ if (target) {
+ this.position = target
this.query_info();
tui.full_refresh();
- }
+ } else {
+ terminal.blink_screen();
+ };
},
update_info_db: function(yx, str) {
this.info_db[yx] = str;
@@ -476,23 +623,46 @@ let explorer = {
server.send(["GET_ANNOTATION", unparser.to_yx(explorer.position)]);
},
get_info: function() {
+ let info = "";
+ let position_i = this.position[0] * game.map_size[1] + this.position[1];
+ info += "TERRAIN: " + game.map[position_i] + "\n";
+ for (let t_id in game.things) {
+ let t = game.things[t_id];
+ if (t.position[0] == this.position[0] && t.position[1] == this.position[1]) {
+ info += "PLAYER @";
+ if (t.name_) {
+ info += ": " + t.name_;
+ }
+ info += "\n";
+ }
+ }
+ if (this.position in game.portals) {
+ info += "PORTAL: " + game.portals[this.position] + "\n";
+ }
if (this.position in this.info_db) {
- return this.info_db[this.position];
+ info += "ANNOTATIONS: " + this.info_db[this.position];
} else {
- return 'waiting â¦';
+ info += 'waiting â¦';
}
+ return info;
},
annotate: function(msg) {
if (msg.length == 0) {
msg = " "; // triggers annotation deletion
}
server.send(["ANNOTATE", unparser.to_yx(explorer.position), msg]);
+ },
+ set_portal: function(msg) {
+ if (msg.length == 0) {
+ msg = " "; // triggers portal deletion
+ }
+ server.send(["PORTAL", unparser.to_yx(explorer.position), msg]);
}
}
tui.inputEl.addEventListener('input', (event) => {
if (tui.mode.has_input_prompt) {
- let max_length = tui.window_width * terminal.rows - tui.input_prompt.length;
+ let max_length = tui.window_width * terminal.rows - tui.input_prompt.length;
if (tui.inputEl.value.length > max_length) {
tui.inputEl.value = tui.inputEl.value.slice(0, max_length);
};
@@ -501,41 +671,64 @@ tui.inputEl.addEventListener('input', (event) => {
} else if (tui.mode == mode_edit && tui.inputEl.value.length > 0) {
server.send(["TASK:WRITE", tui.inputEl.value[0]]);
tui.switch_mode(mode_play);
+ } else if (tui.mode == mode_teleport) {
+ if (['Y', 'y'].includes(tui.inputEl.value[0])) {
+ server.reconnect_to(tui.teleport_target);
+ } else {
+ tui.log_msg("@ teleportation aborted");
+ tui.switch_mode(mode_play);
+ }
}
}, false);
tui.inputEl.addEventListener('keydown', (event) => {
if (event.key == 'Enter') {
- event.preventDefault();
+ event.preventDefault();
}
if (tui.mode == mode_login && event.key == 'Enter') {
server.send(['LOGIN', tui.inputEl.value]);
tui.switch_mode(mode_login);
+ } else if (tui.mode == mode_portal && event.key == 'Enter') {
+ explorer.set_portal(tui.inputEl.value);
+ tui.switch_mode(mode_study, true);
} else if (tui.mode == mode_annotate && event.key == 'Enter') {
explorer.annotate(tui.inputEl.value);
tui.switch_mode(mode_study, true);
+ } else if (tui.mode == mode_teleport && event.key == 'Enter') {
+ if (tui.inputEl.value == 'YES!') {
+ server.reconnect_to(tui.teleport_target);
+ } else {
+ tui.log_msg('@ teleport aborted');
+ tui.switch_mode(mode_play);
+ };
} 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 (tokens[0][0] == ':') {
- if (tokens[0] == ':play' || tokens[0] == ':p') {
+ if (tui.inputEl.value[0][0] == command_char_selector.value) {
+ if (tokens[0].slice(1) == 'play' || tokens[0].slice(1) == 'p') {
tui.switch_mode(mode_play);
- } else if (tokens[0] == ':study' || tokens[0] == ':?') {
+ } else if (tokens[0].slice(1) == 'study' || tokens[0].slice(1) == '?') {
tui.switch_mode(mode_study);
- } else if (tokens[0] == ':help') {
+ } else if (tokens[0].slice(1) == 'help') {
tui.log_help();
- } else if (tokens[0] == ':nick') {
+ } else if (tokens[0].slice(1) == 'nick') {
if (tokens.length > 1) {
server.send(['LOGIN', tokens[1]]);
} else {
tui.log_msg('? need login name');
}
- } else if (tokens[0] == ':msg') {
+ } else if (tokens[0].slice(1) == 'msg') {
if (tokens.length > 2) {
let msg = tui.inputEl.value.slice(token_starts[2]);
server.send(['QUERY', tokens[1], msg]);
} else {
tui.log_msg('? need message target and message');
}
+ } else if (tokens[0].slice(1) == 'reconnect') {
+ if (tokens.length > 1) {
+ server.reconnect_to(tokens[1]);
+ } else {
+ server.reconnect();
+ }
} else {
tui.log_msg('? unknown command');
}
@@ -548,10 +741,10 @@ tui.inputEl.addEventListener('keydown', (event) => {
tui.empty_input();
tui.full_refresh();
} else if (tui.mode == mode_play) {
- if (event.key === 'c') {
+ if (event.key === 'C') {
event.preventDefault();
tui.switch_mode(mode_chat);
- } else if (event.key === 'e') {
+ } else if (event.key === 'E') {
event.preventDefault();
tui.switch_mode(mode_edit);
} else if (event.key === '?') {
@@ -560,49 +753,47 @@ tui.inputEl.addEventListener('keydown', (event) => {
tui.log_help();
} else if (event.key === 'f') {
server.send(["TASK:FLATTEN_SURROUNDINGS"]);
- } else if (event.key === tui.key_left) {
- server.send(['TASK:MOVE', 'LEFT']);
- } else if (event.key === tui.key_right) {
- server.send(['TASK:MOVE', 'RIGHT']);
- } else if (event.key === tui.key_up) {
- server.send(['TASK:MOVE', 'UP']);
- } else if (event.key === tui.key_down) {
- server.send(['TASK:MOVE', 'DOWN']);
+ } else if (event.key in tui.movement_keys) {
+ server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
};
} else if (tui.mode == mode_study) {
- if (event.key === 'c') {
+ if (event.key === 'C') {
+ event.preventDefault();
tui.switch_mode(mode_chat);
- } else if (event.key == 'p') {
+ } else if (event.key == 'P') {
tui.switch_mode(mode_play);
- } else if (event.key === tui.key_left) {
- explorer.move('left');
- } else if (event.key === tui.key_right) {
- explorer.move('right');
- } else if (event.key === tui.key_up) {
- explorer.move('up');
- } else if (event.key === tui.key_down) {
- explorer.move('down');
- } else if (event.key === 'e') {
+ } else if (event.key === 'p') {
+ event.preventDefault();
+ tui.switch_mode(mode_portal);
+ } else if (event.key in tui.movement_keys) {
+ explorer.move(tui.movement_keys[event.key]);
+ } else if (event.key === 'E') {
event.preventDefault();
tui.switch_mode(mode_annotate);
};
}
}, false);
-wasd_selector.addEventListener('input', function() {
+movement_keys_selector.addEventListener('input', function() {
tui.init_wasd();
}, false);
rows_selector.addEventListener('input', function() {
+ if (rows_selector.value % 2 != 0) {
+ return;
+ }
terminal.initialize();
tui.full_refresh();
}, false);
cols_selector.addEventListener('input', function() {
+ if (cols_selector.value % 4 != 0) {
+ return;
+ }
terminal.initialize();
tui.window_width = terminal.cols / 2,
tui.full_refresh();
}, false);
window.setInterval(function() {
- if (!(['input', 'n_cols', 'n_rows', 'WASD_selector'].includes(document.activeElement.id))) {
+ if (!(['input', 'n_cols', 'n_rows', 'movement_keys', 'command_char'].includes(document.activeElement.id))) {
tui.inputEl.focus();
}
}, 100);