<button id="consume"></button>
<button id="switch_to_command_thing"></button>
<button id="teleport"></button>
+ <button id="install"></button>
</td>
</tr>
<tr>
<li>drop thing: <input id="key_drop_thing" type="text" value="u" />
<li>open/close: <input id="key_door" type="text" value="D" />
<li>consume: <input id="key_consume" type="text" value="C" />
+<li>install: <input id="key_install" type="text" value="I" />
<li><input id="key_switch_to_take_thing" type="text" value="z" />
<li><input id="key_switch_to_chat" type="text" value="t" />
<li><input id="key_switch_to_play" type="text" value="p" />
},
'take_thing': {
'short': 'take thing',
- 'intro': '',
+ '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.'
},
'admin_thing_protect': {
'chat': {
'short': 'chat',
'intro': '',
- 'long': 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message. Lines that start with a "/" are used for commands like:'
+ 'long': 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message. Lines that start with a "/" are used for commands like:\n\n/nick NAME – re-name yourself to NAME'
},
'login': {
'short': 'login',
'drop_thing': 'drop thing',
'door': 'open/close',
'consume': 'consume',
+ 'install': '(un-)install',
'toggle_map_mode': 'toggle map view',
'toggle_tile_draw': 'toggle protection character drawing',
'hex_move_upleft': 'up-left',
t.position = parser.parse_yx(tokens[1]);
t.type_ = tokens[2];
t.protection = tokens[3];
+ t.portable = parseInt(tokens[5]);
} else if (tokens[0] === 'THING_NAME') {
let t = game.get_thing(tokens[1], false);
if (t) {
tui.mode_take_thing.legal = game.tasks.includes('PICK_UP');
} 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);
+ if (t) {
+ t.carrying = true;
+ };
+ } else if (tokens[0] === 'THING_INSTALLED') {
+ let t = game.get_thing(tokens[1], false);
+ if (t) {
+ t.installed = true;
+ };
} else if (tokens[0] === 'TERRAIN') {
game.terrains[tokens[1]] = tokens[2]
} else if (tokens[0] === 'MAP') {
'drop_thing': 'DROP',
'move': 'MOVE',
'door': 'DOOR',
+ 'install': 'INSTALL',
'command': 'COMMAND',
'consume': 'INTOXICATE',
},
map_lines: [],
selectables: [],
init: function() {
- this.mode_chat.available_modes = ["play", "study", "edit", "admin_enter"]
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"];
+ "teleport", "door", "consume", "install"];
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",
} else if (this.mode.is_single_char_entry) {
this.show_help = true;
} else if (this.mode.name == 'take_thing') {
- this.log_msg("selectable things:");
+ 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]
+ let select_range = [y.toString() + ':' + x.toString(),
+ (y + 0).toString() + ':' + (x - 1).toString(),
+ (y + 0).toString() + ':' + (x + 1).toString(),
+ (y - 1).toString() + ':' + (x).toString(),
+ (y + 1).toString() + ':' + (x).toString()];
+ if (game.map_geometry == 'Hex') {
+ if (y % 2) {
+ select_range.push((y - 1).toString() + ':' + (x + 1).toString());
+ select_range.push((y + 1).toString() + ':' + (x + 1).toString());
+ } else {
+ select_range.push((y - 1).toString() + ':' + (x - 1).toString());
+ select_range.push((y + 1).toString() + ':' + (x - 1).toString());
+ }
+ };
this.selectables = [];
for (const t_id in game.things) {
const t = game.things[t_id];
- if (t.position[0] == player.position[0]
- && t.position[1] == player.position[1]
- && t != player && t.type_ != 'Player') {
+ if (select_range.includes(t.position[0].toString()
+ + ':' + t.position[1].toString())
+ && t.portable) {
this.selectables.push([t_id, t]);
}
};
if (used_positions.includes(t.position.toString())) {
meta_char = '+';
};
+ if (t.carrying) {
+ meta_char = '$';
+ }
map_lines_split[t.position[0]][t.position[1]] = symbol + meta_char;
used_positions.push(t.position.toString());
}
let term_x = Math.max(0, -this.offset[1]);
let map_y = Math.max(0, this.offset[0]);
let map_x = Math.max(0, this.offset[1]);
- for (; term_y < terminal.rows && map_y < game.map_size[0]; term_y++, map_y++) {
+ for (; term_y < terminal.rows && map_y < this.map_lines.length; term_y++, map_y++) {
let to_draw = this.map_lines[map_y].slice(map_x, this.window_width + this.offset[1]);
terminal.write(term_y, term_x, to_draw);
}
movement_keys_desc = Object.keys(this.movement_keys).join(',');
}
let content = this.mode.short_desc + " help\n\n" + this.mode.help_intro + "\n\n";
- if (this.mode.name == 'chat') {
- content += '/nick NAME – re-name yourself to NAME\n';
- content += '/' + this.keys.switch_to_play + ' or /play – switch to play mode\n';
- content += '/' + this.keys.switch_to_study + ' or /study – switch to study mode\n';
- content += '/' + this.keys.switch_to_edit + ' or /edit – switch to world edit mode\n';
- content += '/' + this.keys.switch_to_admin_enter + ' or /admin – switch to admin mode\n';
- } else if (this.mode.available_actions.length > 0) {
+ if (this.mode.available_actions.length > 0) {
content += "Available actions:\n";
for (let action of this.mode.available_actions) {
if (Object.keys(this.action_tasks).includes(action)) {
get_thing_info: function(t) {
const symbol = game.thing_types[t.type_];
let info = t.type_ + " / " + symbol;
- if (t.thing_char) {
- info += t.thing_char;
- };
- if (t.name_) {
- info += " (" + t.name_ + ")";
- }
+ if (t.thing_char) {
+ info += t.thing_char;
+ };
+ if (t.name_) {
+ info += " (" + t.name_ + ")";
+ }
+ if (t.installed) {
+ info += " / installed";
+ }
return info;
},
annotate: function(msg) {
if (event.key == 'Enter') {
event.preventDefault();
}
- if (tui.mode.has_input_prompt && event.key == 'Enter' && tui.inputEl.value == '/help') {
+ if (tui.mode.has_input_prompt && event.key == 'Enter'
+ && tui.inputEl.value.length == 0
+ && ['chat', 'command_thing', 'take_thing',
+ 'admin_enter'].includes(tui.mode.name)) {
+ if (tui.mode.name != 'chat') {
+ tui.log_msg('@ aborted');
+ }
+ tui.switch_mode('play');
+ } else if (tui.mode.has_input_prompt && event.key == 'Enter' && tui.inputEl.value == '/help') {
tui.show_help = true;
tui.inputEl.value = "";
tui.restore_input_values();
server.send(['LOGIN', tui.inputEl.value]);
tui.inputEl.value = "";
} else if (tui.mode.name == 'command_thing' && event.key == 'Enter') {
- if (tui.inputEl.value.length == 0) {
- tui.log_msg('@ aborted');
- tui.switch_mode('play');
- } else if (tui.task_action_on('command')) {
+ 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') {
- if (tui.inputEl.value.length == 0) {
- tui.log_msg('@ aborted');
+ const i = parseInt(tui.inputEl.value);
+ if (isNaN(i) || i < 0 || i >= tui.selectables.length) {
+ tui.log_msg('? invalid index, aborted');
} else {
- 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:PICK_UP', tui.selectables[i][0]]);
}
tui.inputEl.value = "";
tui.switch_mode('play');
let tokens = parser.tokenize(tui.inputEl.value);
if (tokens.length > 0 && tokens[0].length > 0) {
if (tui.inputEl.value[0][0] == '/') {
- if (tokens[0].slice(1) == 'play' || tokens[0][1] == tui.keys.switch_to_play) {
- tui.switch_mode('play');
- } else if (tokens[0].slice(1) == 'study' || tokens[0][1] == tui.keys.switch_to_study) {
- tui.switch_mode('study');
- } else if (tokens[0].slice(1) == 'edit' || tokens[0][1] == tui.keys.switch_to_edit) {
- tui.switch_mode('edit');
- } else if (tokens[0].slice(1) == 'admin' || tokens[0][1] == tui.keys.switch_to_admin_enter) {
- tui.switch_mode('admin_enter');
- } else if (tokens[0].slice(1) == 'nick') {
+ if (tokens[0].slice(1) == 'nick') {
if (tokens.length > 1) {
server.send(['NICK', tokens[1]]);
} else {
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 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) {
document.getElementById("consume").onclick = function() {
server.send(['TASK:INTOXICATE']);
};
+document.getElementById("install").onclick = function() {
+ server.send(['TASK:INSTALL']);
+};
document.getElementById("teleport").onclick = function() {
game.teleport();
};
projects / plomrogue2 / blobdiff