"flatten": "F",
"switch_to_enter_face": "f",
"switch_to_take_thing": "z",
- "drop_thing": "u",
+ "switch_to_drop_thing": "u",
"teleport": "p",
"door": "D",
"install": "I",
def get_string_options(self, string_option_type):
if string_option_type == 'direction':
return self.map_geometry.directions
+ elif string_option_type == 'direction+here':
+ return ['HERE'] + self.map_geometry.directions
elif string_option_type == 'char':
return [c for c in
string.digits + string.ascii_letters + string.punctuation + ' ']
self.thing = thing
self.args = args
+ def _get_move_target(self):
+ if self.args[0] == 'HERE':
+ return self.thing.position
+ return self.thing.game.map_geometry.move_yxyx(self.thing.position,
+ self.args[0])
+
def check(self):
pass
class Task_MOVE(Task):
argtypes = 'string:direction'
- def get_move_target(self):
- return self.thing.game.map_geometry.move_yxyx(self.thing.position,
- self.args[0])
-
def check(self):
- test_yxyx = self.get_move_target()
+ test_yxyx = self._get_move_target()
if test_yxyx in [t.position for t in self.thing.game.things
if t.blocking]:
raise PlayError('blocked by other thing')
def do(self):
self.thing.game.record_fov_change(self.thing.position)
- self.thing.position = self.get_move_target()
+ self.thing.position = self._get_move_target()
self.thing.game.record_fov_change(self.thing.position)
if self.thing.carrying:
self.thing.carrying.position = self.thing.position
class Task_DROP(Task):
+ argtypes = 'string:direction+here'
def check(self):
if not self.thing.carrying:
raise PlayError('nothing to drop')
+ target_position = self._get_move_target()
if self.thing.carrying.type_ == 'Bottle' and self.thing.carrying.full:
for t in [t for t in self.thing.game.things
if t.type_ == 'BottleDeposit'
- and t.position == self.thing.position]:
+ and t.position == target_position]:
raise PlayError('cannot drop full bottle into bottle deposit')
def do(self):
+ target_position = self._get_move_target()
dropped = self.thing.uncarry()
+ dropped.position = target_position
if dropped.type_ == 'Bottle' and not dropped.full:
for t in [t for t in self.thing.game.things
if t.type_ == 'BottleDeposit'
- and t.position == self.thing.position]:
+ and t.position == dropped.position]:
t.accept()
self.thing.game.remove_thing(dropped)
break
elif dropped.type_ == 'Hat':
for t in [t for t in self.thing.game.things
if t.type_ == 'HatRemixer'
- and t.position == self.thing.position]:
+ and t.position == dropped.position]:
t.accept(dropped)
break
<td><button id="switch_to_play"></button></td>
<td>
<button id="switch_to_take_thing"></button>
- <button id="drop_thing"></button>
+ <button id="switch_to_drop_thing"></button>
<button id="door"></button>
<button id="consume"></button>
<button id="switch_to_command_thing"></button>
<li>help: <input id="key_help" type="text" value="h" />
<li>flatten surroundings: <input id="key_flatten" type="text" value="F" />
<li>teleport: <input id="key_teleport" type="text" value="p" />
-<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>(un-)wear: <input id="key_wear" type="text" value="W" />
+<li><input id="key_switch_to_drop_thing" type="text" value="u" />
<li><input id="key_switch_to_enter_face" type="text" value="f" />
<li><input id="key_switch_to_take_thing" type="text" value="z" />
<li><input id="key_switch_to_chat" type="text" value="t" />
'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:',
'help': 'help',
'flatten': 'flatten surroundings',
'teleport': 'teleport',
- 'drop_thing': 'drop thing',
'door': 'open/close',
'consume': 'consume',
'install': '(un-)install',
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') {
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'),
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"];
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",
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) {
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') {
};
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;
}
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');
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]]);
- }
- tui.inputEl.value = "";
- tui.switch_mode('play');
+ 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');
} 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')) {
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]);
};
'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:',
game.tui.mode_write.legal = 'WRITE' in game.tasks
game.tui.mode_command_thing.legal = 'COMMAND' in game.tasks
game.tui.mode_take_thing.legal = 'PICK_UP' in game.tasks
+ game.tui.mode_drop_thing.legal = 'DROP' in game.tasks
cmd_TASKS.argtypes = 'string'
def cmd_THING_TYPE(game, thing_type, symbol_hint):
mode_name_thing = Mode('name_thing', has_input_prompt=True, shows_info=True)
mode_command_thing = Mode('command_thing', has_input_prompt=True)
mode_take_thing = Mode('take_thing', has_input_prompt=True)
+ mode_drop_thing = Mode('drop_thing', has_input_prompt=True)
mode_enter_face = Mode('enter_face', has_input_prompt=True)
is_admin = False
tile_draw = False
import os
import json
self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
- "command_thing", "take_thing"]
- self.mode_play.available_actions = ["move", "drop_thing",
- "teleport", "door", "consume",
+ "command_thing", "take_thing",
+ "drop_thing"]
+ self.mode_play.available_actions = ["move", "teleport", "door", "consume",
"install", "wear"]
self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
self.mode_study.available_actions = ["toggle_map_mode", "move_explorer"]
'flatten': 'F',
'switch_to_enter_face': 'f',
'switch_to_take_thing': 'z',
- 'drop_thing': 'u',
+ 'switch_to_drop_thing': 'u',
'teleport': 'p',
'consume': 'C',
'door': 'D',
else:
select_range += [player.position + YX(-1, -1),
player.position + YX(1, -1)]
- self.selectables = [t for t in self.game.things
+ self.selectables = [t.id_ for t in self.game.things
if t.portable and t.position in select_range]
if len(self.selectables) == 0:
self.log_msg('none')
return
else:
for i in range(len(self.selectables)):
- t = self.selectables[i]
+ t = self.game.get_thing(self.selectables[i])
self.log_msg(str(i) + ': ' + self.get_thing_info(t))
+ elif self.mode.name == 'drop_thing':
+ self.log_msg('Direction to drop thing to:')
+ self.selectables =\
+ ['HERE'] + list(self.game.tui.movement_keys.values())
+ for i in range(len(self.selectables)):
+ self.log_msg(str(i) + ': ' + self.selectables[i])
elif self.mode.name == 'command_thing':
self.send('TASK:COMMAND ' + quote('HELP'))
elif self.mode.name == 'control_pw_pw':
if self.show_help:
draw_help()
+ def pick_selectable(task_name):
+ try:
+ i = int(self.input_)
+ if i < 0 or i >= len(self.selectables):
+ self.log_msg('? invalid index, aborted')
+ else:
+ self.send('TASK:%s %s' % (task_name, self.selectables[i]))
+ except ValueError:
+ self.log_msg('? invalid index, aborted')
+ self.input_ = ''
+ self.switch_mode('play')
+
action_descriptions = {
'move': 'move',
'flatten': 'flatten surroundings',
self.input_ = self.input_[:-1]
elif self.mode.has_input_prompt and key == '\n' and self.input_ == ''\
and self.mode.name in {'chat', 'command_thing', 'take_thing',
- 'admin_enter'}:
+ 'drop_thing', 'admin_enter'}:
if self.mode.name != 'chat':
self.log_msg('@ aborted')
self.switch_mode('play')
self.input_ = ""
self.switch_mode('edit')
elif self.mode.name == 'take_thing' and key == '\n':
- try:
- i = int(self.input_)
- if i < 0 or i >= len(self.selectables):
- self.log_msg('? invalid index, aborted')
- else:
- self.send('TASK:PICK_UP %s' % self.selectables[i].id_)
- except ValueError:
- self.log_msg('? invalid index, aborted')
- self.input_ = ''
- self.switch_mode('play')
+ pick_selectable('PICK_UP')
+ elif self.mode.name == 'drop_thing' and key == '\n':
+ pick_selectable('DROP')
elif self.mode.name == 'command_thing' and key == '\n':
self.send('TASK:COMMAND ' + quote(self.input_))
self.input_ = ""
elif self.mode.name == 'play':
if self.mode.mode_switch_on_key(self, key):
continue
- elif key == self.keys['drop_thing'] and task_action_on('drop_thing'):
- self.send('TASK:DROP')
elif key == self.keys['door'] and task_action_on('door'):
self.send('TASK:DOOR')
elif key == self.keys['consume'] and task_action_on('consume'):