X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=rogue_chat.html;h=fe78f6b7118571666775d0f15df731ec3b710193;hb=836f37cfc14cd1a27ac5aee1f8465925a7ed87c4;hp=1c1fd1a125ddce134471b3cfb8432726e6a6e2ca;hpb=d524cfceadd9338a18759e8a7ea1db659cd6cbb5;p=plomrogue2
diff --git a/rogue_chat.html b/rogue_chat.html
index 1c1fd1a..fe78f6b 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -19,7 +19,7 @@ terminal rows:
keyboard input/control:
-button controls for mouse players
+button controls for hard-to-remember keybindings
|
@@ -59,6 +59,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 :(");
};
@@ -529,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') {
@@ -693,6 +696,7 @@ let tui = {
'wear': 'WEAR',
'command': 'COMMAND',
'consume': 'INTOXICATE',
+ 'spin': 'SPIN',
},
offset: [0,0],
map_lines: [],
@@ -701,7 +705,7 @@ let tui = {
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"];
+ "install", "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",
@@ -759,22 +763,26 @@ let tui = {
return game.tasks.includes(this.action_tasks[action]);
},
switch_mode: function(mode_name) {
+
+ function fail(msg) {
+ tui.log_msg('? ' + msg);
+ terminal.blink_screen();
+ this.switch_mode('play');
+ }
+
if (this.mode && this.mode.name == 'control_tile_draw') {
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)) {
- 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');
};
- if (mode_name == 'drop_thing' && (!player.carrying)) {
- this.log_msg('? not carrying anything droppable');
- terminal.blink_screen();
- this.switch_mode('play');
- return;
+ if (mode_name == 'take_thing' && game.player.carrying) {
+ return fail('already carrying something');
+ };
+ if (mode_name == 'drop_thing' && !game.player.carrying) {
+ return fail('not carrying anything droppable');
}
if (mode_name == 'admin_enter' && this.is_admin) {
mode_name = 'admin';
@@ -785,16 +793,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');
} else {
this.selected_thing_id = thing_id;
}
@@ -809,7 +815,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();
@@ -846,9 +852,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(),
@@ -1040,8 +1045,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) {
@@ -1078,11 +1084,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') {
@@ -1101,7 +1106,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]];
}
@@ -1323,9 +1328,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')
@@ -1468,11 +1472,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');
@@ -1588,6 +1593,8 @@ tui.inputEl.addEventListener('keydown', (event) => {
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) {
@@ -1653,13 +1660,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";
@@ -1710,6 +1717,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();
};