X-Git-Url: https://plomlompom.com/repos/unset_cookie?a=blobdiff_plain;f=rogue_chat.html;h=9740fff34c7b251509d4e7b40d341fdf98282481;hb=52b01fc00d6ea2c053f9022981498b97ebd05839;hp=1b501b5189354e70fcb5658c61db8a62e4acb862;hpb=dbb17811ffb485471c228544549e8c8ff940a946;p=plomrogue2
diff --git a/rogue_chat.html b/rogue_chat.html
index 1b501b5..9740fff 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -52,13 +52,14 @@ keyboard input/control:
|
-
+
+
|
@@ -99,11 +100,12 @@ keyboard input/control:
help:
flatten surroundings:
teleport:
-drop thing:
+spin:
open/close:
consume:
install:
(un-)wear:
+
@@ -159,6 +161,11 @@ let mode_helps = {
'intro': 'Pick up a thing in reach by entering its index number. Enter nothing to abort.',
'long': 'You see a list of things which you could pick up. Enter the target thing\'s index, or, to leave, nothing.'
},
+ 'drop_thing': {
+ 'short': 'drop thing',
+ 'intro': 'Enter number of direction to which you want to drop thing.',
+ 'long': 'Drop currently carried thing by entering the target direction index. Enter nothing to return to play mode..'
+ },
'admin_thing_protect': {
'short': 'change thing protection',
'intro': '@ enter thing protection character:',
@@ -244,11 +251,11 @@ let key_descriptions = {
'help': 'help',
'flatten': 'flatten surroundings',
'teleport': 'teleport',
- 'drop_thing': 'drop thing',
'door': 'open/close',
'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',
@@ -485,6 +492,7 @@ let server = {
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);
t.name_ = tokens[2];
@@ -502,11 +510,12 @@ let server = {
tui.mode_write.legal = game.tasks.includes('WRITE');
tui.mode_command_thing.legal = game.tasks.includes('WRITE');
tui.mode_take_thing.legal = game.tasks.includes('PICK_UP');
+ tui.mode_drop_thing.legal = game.tasks.includes('DROP');
} 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 = true;
+ t.carrying = t = game.get_thing(tokens[2], false);
} else if (tokens[0] === 'THING_INSTALLED') {
let t = game.get_thing(tokens[1], false);
t.installed = true;
@@ -670,6 +679,7 @@ let tui = {
mode_name_thing: new Mode('name_thing', true, true),
mode_command_thing: new Mode('command_thing', true),
mode_take_thing: new Mode('take_thing', true),
+ mode_drop_thing: new Mode('drop_thing', true),
mode_enter_face: new Mode('enter_face', true),
mode_admin_enter: new Mode('admin_enter', true),
mode_admin: new Mode('admin'),
@@ -686,15 +696,16 @@ let tui = {
'wear': 'WEAR',
'command': 'COMMAND',
'consume': 'INTOXICATE',
+ 'spin': 'SPIN',
},
offset: [0,0],
map_lines: [],
selectables: [],
init: function() {
this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
- "command_thing", "take_thing"]
- this.mode_play.available_actions = ["move", "drop_thing", "teleport",
- "door", "consume", "install", "wear"];
+ "command_thing", "take_thing", "drop_thing"]
+ this.mode_play.available_actions = ["move", "teleport", "door", "consume",
+ "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",
@@ -756,17 +767,30 @@ 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)) {
+ this.log_msg('? not carrying anything commandable');
+ terminal.blink_screen();
+ this.switch_mode('play');
+ return;
+ };
+ 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 == 'admin_enter' && this.is_admin) {
mode_name = 'admin';
} else if (['name_thing', 'admin_thing_protect'].includes(mode_name)) {
- let player_position = game.things[game.player_id].position;
let thing_id = null;
for (let t_id in game.things) {
if (t_id == game.player_id) {
continue;
}
let t = game.things[t_id];
- if (player_position[0] == t.position[0] && player_position[1] == t.position[1]) {
+ if (player.position[0] == t.position[0]
+ && player.position[1] == t.position[1]) {
thing_id = t_id;
break;
}
@@ -849,7 +873,7 @@ let tui = {
if (select_range.includes(t.position[0].toString()
+ ':' + t.position[1].toString())
&& t.portable) {
- this.selectables.push([t_id, t]);
+ this.selectables.push(t_id);
}
};
if (this.selectables.length == 0) {
@@ -858,10 +882,17 @@ let tui = {
this.switch_mode('play');
return;
} else {
- for (let [i, t] of this.selectables.entries()) {
- this.log_msg(i + ': ' + explorer.get_thing_info(t[1]));
+ for (let [i, t_id] of this.selectables.entries()) {
+ const t = game.things[t_id];
+ this.log_msg(i + ': ' + explorer.get_thing_info(t));
}
}
+ } else if (this.mode.name == 'drop_thing') {
+ this.log_msg('Direction to drop thing to:');
+ this.selectables = ['HERE'].concat(Object.values(this.movement_keys));
+ for (let [i, direction] of this.selectables.entries()) {
+ this.log_msg(i + ': ' + direction);
+ };
} else if (this.mode.name == 'command_thing') {
server.send(['TASK:COMMAND', 'HELP']);
} else if (this.mode.name == 'control_pw_pw') {
@@ -982,6 +1013,16 @@ let tui = {
};
this.full_refresh();
},
+ pick_selectable: function(task_name) {
+ const i = parseInt(this.inputEl.value);
+ if (isNaN(i) || i < 0 || i >= this.selectables.length) {
+ tui.log_msg('? invalid index, aborted');
+ } else {
+ server.send(['TASK:' + task_name, tui.selectables[i]]);
+ }
+ this.inputEl.value = "";
+ this.switch_mode('play');
+ },
draw_map: function() {
if (!game.turn_complete && this.map_lines.length == 0) {
return;
@@ -1433,7 +1474,7 @@ tui.inputEl.addEventListener('keydown', (event) => {
}
if (tui.mode.has_input_prompt && event.key == 'Enter'
&& tui.inputEl.value.length == 0
- && ['chat', 'command_thing', 'take_thing',
+ && ['chat', 'command_thing', 'take_thing', 'drop_thing',
'admin_enter'].includes(tui.mode.name)) {
if (tui.mode.name != 'chat') {
tui.log_msg('@ aborted');
@@ -1459,19 +1500,12 @@ tui.inputEl.addEventListener('keydown', (event) => {
tui.inputEl.value = "";
tui.switch_mode('edit');
} else if (tui.mode.name == 'command_thing' && event.key == 'Enter') {
- if (tui.task_action_on('command')) {
- server.send(['TASK:COMMAND', tui.inputEl.value]);
- tui.inputEl.value = "";
- }
- } else if (tui.mode.name == 'take_thing' && event.key == 'Enter') {
- const i = parseInt(tui.inputEl.value);
- if (isNaN(i) || i < 0 || i >= tui.selectables.length) {
- tui.log_msg('? invalid index, aborted');
- } else {
- server.send(['TASK:PICK_UP', tui.selectables[i][0]]);
- }
+ server.send(['TASK:COMMAND', tui.inputEl.value]);
tui.inputEl.value = "";
- tui.switch_mode('play');
+ } else if (tui.mode.name == 'take_thing' && event.key == 'Enter') {
+ tui.pick_selectable('PICK_UP');
+ } else if (tui.mode.name == 'drop_thing' && event.key == 'Enter') {
+ tui.pick_selectable('DROP');
} else if (tui.mode.name == 'control_pw_pw' && event.key == 'Enter') {
if (tui.inputEl.value.length == 0) {
tui.log_msg('@ aborted');
@@ -1550,8 +1584,6 @@ tui.inputEl.addEventListener('keydown', (event) => {
} else if (tui.mode.name == 'play') {
if (tui.mode.mode_switch_on_key(event)) {
null;
- } else if (event.key === tui.keys.drop_thing && tui.task_action_on('drop_thing')) {
- server.send(["TASK:DROP"]);
} else if (event.key === tui.keys.consume && tui.task_action_on('consume')) {
server.send(["TASK:INTOXICATE"]);
} else if (event.key === tui.keys.door && tui.task_action_on('door')) {
@@ -1560,6 +1592,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) {
@@ -1667,9 +1701,6 @@ document.getElementById("toggle_map_mode").onclick = function() {
tui.toggle_map_mode();
tui.full_refresh();
};
-document.getElementById("drop_thing").onclick = function() {
- server.send(['TASK:DROP']);
-};
document.getElementById("flatten").onclick = function() {
server.send(['TASK:FLATTEN_SURROUNDINGS', tui.password]);
};
@@ -1685,6 +1716,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();
};