@@ -66,6 +66,7 @@ keyboard input/control:
|
+
@@ -99,6 +100,7 @@ keyboard input/control:
help:
flatten surroundings:
teleport:
+spin:
open/close:
consume:
install:
@@ -253,6 +255,7 @@ let key_descriptions = {
'consume': 'consume',
'install': '(un-)install',
'wear': '(un-)wear',
+ 'spin': 'spin',
'toggle_map_mode': 'toggle map view',
'toggle_tile_draw': 'toggle protection character drawing',
'hex_move_upleft': 'up-left',
@@ -451,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']);
@@ -461,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 :(");
};
@@ -478,29 +479,29 @@ let server = {
let tokens = parser.tokenize(event.data);
if (tokens[0] === 'TURN') {
game.turn_complete = false;
- explorer.empty_annotations();
- game.things = {};
- game.portals = {};
- game.fov = '';
game.turn = parseInt(tokens[1]);
+ } else if (tokens[0] === 'PSEUDO_FOV_WIPE') {
+ game.portals_new = {};
+ explorer.annotations_new = {};
+ game.things_new = [];
} else if (tokens[0] === 'THING') {
- let t = game.get_thing(tokens[4], true);
+ let t = game.get_thing_temp(tokens[4], true);
t.position = parser.parse_yx(tokens[1]);
t.type_ = tokens[2];
t.protection = tokens[3];
t.portable = parseInt(tokens[5]);
t.commandable = parseInt(tokens[6]);
} else if (tokens[0] === 'THING_NAME') {
- let t = game.get_thing(tokens[1], false);
+ let t = game.get_thing_temp(tokens[1]);
t.name_ = tokens[2];
} else if (tokens[0] === 'THING_FACE') {
- let t = game.get_thing(tokens[1], false);
+ let t = game.get_thing_temp(tokens[1]);
t.face = tokens[2];
} else if (tokens[0] === 'THING_HAT') {
- let t = game.get_thing(tokens[1], false);
+ let t = game.get_thing_temp(tokens[1]);
t.hat = tokens[2];
} else if (tokens[0] === 'THING_CHAR') {
- let t = game.get_thing(tokens[1], false);
+ let t = game.get_thing_temp(tokens[1]);
t.thing_char = tokens[2];
} else if (tokens[0] === 'TASKS') {
game.tasks = tokens[1].split(',');
@@ -511,31 +512,43 @@ let server = {
} else if (tokens[0] === 'THING_TYPE') {
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);
+ let t = game.get_thing_temp(tokens[1]);
+ t.carrying = game.get_thing(tokens[2], false);
} else if (tokens[0] === 'THING_INSTALLED') {
- let t = game.get_thing(tokens[1], false);
+ let t = game.get_thing_temp(tokens[1]);
t.installed = true;
} else if (tokens[0] === 'TERRAIN') {
game.terrains[tokens[1]] = tokens[2]
} else if (tokens[0] === 'MAP') {
- game.map_geometry = tokens[1];
- tui.init_keys();
- game.map_size = parser.parse_yx(tokens[2]);
- game.map = tokens[3]
+ game.map_geometry_new = tokens[1];
+ game.map_size_new = parser.parse_yx(tokens[2]);
+ game.map_new = tokens[3]
} else if (tokens[0] === 'FOV') {
- game.fov = tokens[1]
+ game.fov_new = tokens[1]
} else if (tokens[0] === 'MAP_CONTROL') {
- game.map_control = tokens[1]
+ game.map_control_new = tokens[1]
} else if (tokens[0] === 'GAME_STATE_COMPLETE') {
+ game.portals = game.portals_new;
+ game.map_geometry = game.map_geometry_new;
+ game.map_size = game.map_size_new;
+ game.map = game.map_new;
+ tui.init_keys();
+ game.map_control = game.map_control_new;
+ explorer.annotations = explorer.annotations_new;
+ explorer.info_cached = false;
+ game.things = game.things_new;
+ game.player = game.things[game.player_id];
game.turn_complete = true;
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] === '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') {
@@ -553,11 +566,10 @@ let server = {
tui.switch_mode('admin');
} else if (tokens[0] === 'PORTAL') {
let position = parser.parse_yx(tokens[1]);
- game.portals[position] = tokens[2];
+ game.portals_new[position] = tokens[2];
} else if (tokens[0] === 'ANNOTATION') {
let position = parser.parse_yx(tokens[1]);
- explorer.update_annotations(position, tokens[2]);
- tui.full_refresh();
+ explorer.annotations_new[position] = tokens[2];
} else if (tokens[0] === 'UNHANDLED_INPUT') {
tui.log_msg('? unknown command');
} else if (tokens[0] === 'PLAY_ERROR') {
@@ -693,15 +705,17 @@ let tui = {
'wear': 'WEAR',
'command': 'COMMAND',
'consume': 'INTOXICATE',
+ 'spin': 'SPIN',
},
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"];
+ "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",
@@ -713,7 +727,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');
@@ -759,17 +774,28 @@ let tui = {
return game.tasks.includes(this.action_tasks[action]);
},
switch_mode: function(mode_name) {
+
+ function fail(msg, return_mode) {
+ tui.log_msg('? ' + msg);
+ terminal.blink_screen();
+ 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;
- const player = game.things[game.player_id];
- if (mode_name == 'command_thing' && (!player.carrying || !player.carrying.commandable)) {
- this.log_msg('? not carrying anything commandable');
- terminal.blink_screen();
- this.switch_mode('play');
- return;
+ if (mode_name == 'command_thing' && (!game.player.carrying
+ || !game.player.carrying.commandable)) {
+ return fail('not carrying anything commandable', 'play');
+ };
+ if (mode_name == 'take_thing' && game.player.carrying) {
+ return fail('already carrying something', 'play');
};
+ if (mode_name == 'drop_thing' && !game.player.carrying) {
+ return fail('not carrying anything droppable', 'play');
+ }
if (mode_name == 'admin_enter' && this.is_admin) {
mode_name = 'admin';
} else if (['name_thing', 'admin_thing_protect'].includes(mode_name)) {
@@ -779,16 +805,14 @@ 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;
}
}
if (!thing_id) {
- terminal.blink_screen();
- this.log_msg('? not standing over thing');
- return;
+ return fail('not standing over thing', 'fail');
} else {
this.selected_thing_id = thing_id;
}
@@ -803,7 +827,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();
@@ -840,9 +864,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(),
@@ -1034,8 +1057,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) {
@@ -1072,11 +1096,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') {
@@ -1095,7 +1118,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]];
}
@@ -1115,6 +1138,32 @@ 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;
+ let t_char = ' ';
+ if (t.thing_char) {
+ t_char = t.thing_char;
+ }
+ function draw_body_part(body_part, end_y) {
+ terminal.write(end_y - 4, start_x, ' _[ @' + t_char + ' ]_ ');
+ 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) {
@@ -1203,7 +1252,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);
@@ -1230,6 +1280,7 @@ let tui = {
}
},
full_refresh: function() {
+ this.draw_links = true;
this.links = {};
terminal.drawBox(0, 0, terminal.rows, terminal.cols);
this.recalc_input_lines();
@@ -1250,30 +1301,48 @@ 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();
}
}
let game = {
init: function() {
- this.things = {};
this.turn = -1;
+ this.player_id = -1;
+ this.tasks = {};
+ this.things = {};
+ this.things_new = {};
+ this.fov = "";
+ this.fov_new = "";
this.map = "";
+ this.map_new = "";
this.map_control = "";
+ this.map_control_new = "";
this.map_size = [0,0];
- this.player_id = -1;
+ this.map_size_new = [0,0];
this.portals = {};
- this.tasks = {};
+ this.portals_new = {};
},
- get_thing: function(id_, create_if_not_found=false) {
- if (id_ in game.things) {
- return game.things[id_];
+ get_thing_temp: function(id_, create_if_not_found=false) {
+ if (id_ in game.things_new) {
+ return game.things_new[id_];
} else if (create_if_not_found) {
let t = new Thing([0,0]);
- game.things[id_] = t;
+ game.things_new[id_] = t;
return t;
};
},
+ get_thing: function(id_, create_if_not_found=false) {
+ if (id_ in game.things) {
+ return game.things[id_];
+ };
+ },
move: function(start_position, direction) {
let target = [start_position[0], start_position[1]];
if (direction == 'LEFT') {
@@ -1317,9 +1386,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')
@@ -1335,6 +1403,7 @@ server.init(websocket_location);
let explorer = {
position: [0,0],
annotations: {},
+ annotations_new: {},
info_cached: false,
move: function(direction) {
let target = game.move(this.position, direction);
@@ -1348,18 +1417,6 @@ let explorer = {
terminal.blink_screen();
};
},
- update_annotations: function(yx, str) {
- this.annotations[yx] = str;
- if (tui.mode.name == 'study') {
- tui.full_refresh();
- }
- },
- empty_annotations: function() {
- this.annotations = {};
- if (tui.mode.name == 'study') {
- tui.full_refresh();
- }
- },
get_info: function() {
if (this.info_cached) {
return this.info_cached;
@@ -1462,11 +1519,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');
@@ -1578,10 +1636,10 @@ 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')) {
+ server.send(["TASK:SPIN"]);
} else if (event.key in tui.movement_keys && tui.task_action_on('move')) {
server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
} else if (event.key === tui.keys.teleport) {
@@ -1616,6 +1674,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();
}
@@ -1647,13 +1707,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";
@@ -1704,6 +1764,9 @@ document.getElementById("install").onclick = function() {
document.getElementById("wear").onclick = function() {
server.send(['TASK:WEAR']);
};
+document.getElementById("spin").onclick = function() {
+ server.send(['TASK:SPIN']);
+};
document.getElementById("teleport").onclick = function() {
game.teleport();
};
|