X-Git-Url: https://plomlompom.com/repos/day?a=blobdiff_plain;f=rogue_chat.html;h=3a636198a9bd69e888bbcad4607ce26f214f5129;hb=dc2747c7daca975526206bfadecc1dd0ddcc8d67;hp=d8d9db7c896535082a37e36ff8ac9bc3b25ebc5c;hpb=017484da7f2648254dda67a30a64ddd699dc0efc;p=plomrogue2
diff --git a/rogue_chat.html b/rogue_chat.html
index d8d9db7..3a63619 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -57,7 +57,6 @@ keyboard input/control:
-
@@ -67,6 +66,7 @@ keyboard input/control:
+
@@ -705,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", "spin"];
+ "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",
@@ -717,7 +717,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');
@@ -763,22 +764,26 @@ 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();
+ this.switch_mode(return_mode);
+ }
+
if (this.mode && this.mode.name == 'control_tile_draw') {
tui.log_msg('@ finished tile protection drawing.')
}
this.tile_draw = false;
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;
+ return fail('not carrying anything commandable', 'play');
};
- if (mode_name == 'drop_thing' && (!game.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', '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';
@@ -796,9 +801,7 @@ let tui = {
}
}
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;
}
@@ -1043,8 +1046,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) {
@@ -1586,8 +1590,6 @@ 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')) {
@@ -1626,6 +1628,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();
}
|