},
'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',
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] === 'TERRAIN') {
game.terrains[tokens[1]] = tokens[2]
} else if (tokens[0] === 'MAP') {
},
offset: [0,0],
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",
} 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("Things in reach for pick-up:");
const player = game.things[game.player_id];
- let selectables = [];
+ 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]
+ if (select_range.includes(t.position[0].toString()
+ + ':' + t.position[1].toString())
&& t != player && t.type_ != 'Player') {
- selectables.push([t_id, t]);
+ this.selectables.push([t_id, t]);
}
};
- if (selectables.length == 0) {
+ if (this.selectables.length == 0) {
this.log_msg('none')
} else {
- for (const t of selectables) {
- this.log_msg(t[0] + ' ' + explorer.get_thing_info(t[1]));
+ for (let [i, t] of this.selectables.entries()) {
+ this.log_msg(i + ': ' + explorer.get_thing_info(t[1]));
}
}
} else if (this.mode.name == 'command_thing') {
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());
}
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)) {
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 {
- server.send(['TASK:PICK_UP', tui.inputEl.value]);
+ 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 {
projects / plomrogue2 / blobdiff