"switch_to_study": "?",
"switch_to_edit": "E",
"switch_to_write": "m",
+ "switch_to_name_thing": "N",
"switch_to_admin": "A",
"switch_to_control_pw_pw": "C",
"switch_to_control_tile_type": "Q",
game.changed = True
cmd_THING.argtypes = 'yx_tuple yx_tuple:nonneg string:thing_type int:nonneg'
-def cmd_THING_NAME(game, thing_id, name):
+def cmd_THING_NAME(game, thing_id, name, connection_id):
t = game.get_thing(thing_id)
if not t:
raise GameError('thing of ID %s not found' % thing_id)
t.name = name
+ game.changed = True
cmd_THING_NAME.argtypes = 'int:pos string'
+
+def cmd_GOD_THING_NAME(game, thing_id, name):
+ t = game.get_thing(thing_id)
+ if not t:
+ raise GameError('thing of ID %s not found' % thing_id)
+ t.name = name
+cmd_GOD_THING_NAME.argtypes = 'int:pos string'
write(f, 'THING %s %s %s %s' % (t.position[0],
t.position[1], t.type_, t.id_))
if hasattr(t, 'name'):
- write(f, 'THING_NAME %s %s' % (t.id_, quote(t.name)))
+ write(f, 'GOD_THING_NAME %s %s' % (t.id_, quote(t.name)))
write(f, 'SPAWN_POINT %s %s' % (self.spawn_point[0],
self.spawn_point[1]))
<button id="flatten">flatten surroundings</button>
<button id="switch_to_annotate">annotate tile</button>
<button id="switch_to_portal">edit portal</button>
+ <button id="switch_to_name_thing">name thing</button>
<button id="switch_to_password">enter map edit password</button>
</td>
</tr>
<li><input id="key_switch_to_study" type="text" value="?" />
<li><input id="key_switch_to_edit" type="text" value="E" />
<li><input id="key_switch_to_write" type="text" value="m" />
+<li><input id="key_switch_to_name_thing" type="text" value="N" />
<li><input id="key_switch_to_password" type="text" value="P" />
<li><input id="key_switch_to_admin_enter" type="text" value="A" />
<li><input id="key_switch_to_control_pw_type" type="text" value="C" />
'short': 'study',
'long': 'This mode allows you to study the map and its tiles in detail. Move the question mark over a tile, and the right half of the screen will show detailed information on it. Toggle the map view to show or hide different information layers.'},
'edit': {
- 'short': 'map edit',
- 'long': 'This mode allows you to change the map in various ways. Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view. You can edit a tile if you set the map edit password that matches its protection character. The character "." marks the absence of protection: Such tiles can always be edited.'
+ 'short': 'world edit',
+ 'long': 'This mode allows you to change the game world in various ways. Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view. You can edit a tile if you set the map edit password that matches its protection character. The character "." marks the absence of protection: Such tiles can always be edited.'
+ },
+ 'name_thing': {
+ 'short': 'name thing',
+ 'long': 'Give name to/change name of thing here.'
},
'write': {
'short': 'change terrain',
mode_control_pw_type: new Mode('control_pw_type', true),
mode_portal: new Mode('portal', true, true),
mode_password: new Mode('password', true),
+ mode_name_thing: new Mode('name_thing', true, true),
mode_admin_enter: new Mode('admin_enter', true),
mode_admin: new Mode('admin'),
mode_control_pw_pw: new Mode('control_pw_pw', true),
"control_tile_type", "chat",
"study", "play", "edit"]
this.mode_control_tile_draw.available_modes = ["admin_enter"]
- this.mode_edit.available_modes = ["write", "annotate", "portal",
+ this.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
"password", "chat", "study", "play",
"admin_enter"]
this.mode = this.mode_waiting_for_server;
this.tile_draw = false;
if (mode_name == 'admin_enter' && this.is_admin) {
mode_name = 'admin';
+ } else if (mode_name == 'name_thing') {
+ 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]) {
+ thing_id = t_id;
+ break;
+ }
+ }
+ if (!thing_id) {
+ terminal.blink_screen();
+ this.log_msg('? not standing over thing');
+ return;
+ } else {
+ this.selected_thing_id = thing_id;
+ }
};
this.mode = this['mode_' + mode_name];
if (["control_tile_draw", "control_tile_type", "control_pw_type"].includes(this.mode.name)) {
document.getElementById("switch_to_write").disabled = false;
document.getElementById("switch_to_portal").disabled = false;
document.getElementById("switch_to_password").disabled = false;
+ document.getElementById("switch_to_name_thing").disabled = false;
document.getElementById("toggle_map_mode").disabled = false;
} else if (this.mode.name == 'admin') {
document.getElementById("switch_to_control_pw_type").disabled = false;
} else if (this.mode.name == 'password') {
this.inputEl.value = this.password;
this.recalc_input_lines();
+ } else if (this.mode.name == 'name_thing') {
+ let t = game.get_thing(this.selected_thing_id);
+ if (t && t.name_) {
+ this.inputEl.value = t.name_;
+ this.recalc_input_lines();
+ }
}
},
empty_input: function(str) {
} else if (tui.mode.name == 'portal' && event.key == 'Enter') {
explorer.set_portal(tui.inputEl.value);
tui.switch_mode('edit');
+ } else if (tui.mode.name == 'name_thing' && event.key == 'Enter') {
+ if (tui.inputEl.value.length == 0) {
+ tui.inputEl.value = " ";
+ }
+ server.send(["THING_NAME", tui.selected_thing_id, tui.inputEl.value]);
+ tui.switch_mode('edit');
} else if (tui.mode.name == 'annotate' && event.key == 'Enter') {
explorer.annotate(tui.inputEl.value);
tui.switch_mode('edit');
cmd_GOD_ANNOTATE, cmd_GOD_PORTAL, cmd_THING_TYPES,
cmd_THING_NAME, cmd_TERRAINS, cmd_ADMIN_PASSWORD,
cmd_BECOME_ADMIN, cmd_SET_TILE_CONTROL,
+ cmd_GOD_THING_NAME,
cmd_SET_MAP_CONTROL_PASSWORD, cmd_SPAWN_POINT)
from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE, Task_PICK_UP,
Task_DROP, Task_FLATTEN_SURROUNDINGS)
game.register_command(cmd_TERRAINS)
game.register_command(cmd_THING)
game.register_command(cmd_THING_NAME)
+game.register_command(cmd_GOD_THING_NAME)
game.register_command(cmd_ADMIN_PASSWORD)
game.register_command(cmd_SET_TILE_CONTROL)
game.register_command(cmd_SET_MAP_CONTROL_PASSWORD)
'short': 'study',
'long': 'This mode allows you to study the map and its tiles in detail. Move the question mark over a tile, and the right half of the screen will show detailed information on it. Toggle the map view to show or hide different information layers.'},
'edit': {
- 'short': 'map edit',
- 'long': 'This mode allows you to change the map in various ways. Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view. You can edit a tile if you set the map edit password that matches its protection character. The character "." marks the absence of protection: Such tiles can always be edited.'
+ 'short': 'world edit',
+ 'long': 'This mode allows you to change the game world in various ways. Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view. You can edit a tile if you set the map edit password that matches its protection character. The character "." marks the absence of protection: Such tiles can always be edited.'
+ },
+ 'name_thing': {
+ 'short': 'name thing',
+ 'long': 'Give name to/change name of thing here.'
},
'write': {
'short': 'change terrain',
mode_login = Mode('login', has_input_prompt=True, is_intro=True)
mode_post_login_wait = Mode('post_login_wait', is_intro=True)
mode_password = Mode('password', has_input_prompt=True)
+ mode_name_thing = Mode('name_thing', has_input_prompt=True, shows_info=True)
is_admin = False
tile_draw = False
"control_tile_type", "chat",
"study", "play", "edit"]
self.mode_control_tile_draw.available_modes = ["admin_enter"]
- self.mode_edit.available_modes = ["write", "annotate", "portal",
+ self.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
"password", "chat", "study", "play",
"admin_enter"]
self.mode = None
'switch_to_study': '?',
'switch_to_edit': 'E',
'switch_to_write': 'm',
+ 'switch_to_name_thing': 'N',
'switch_to_admin_enter': 'A',
'switch_to_control_pw_type': 'C',
'switch_to_control_tile_type': 'Q',
self.input_ = self.game.portals[self.explorer]
elif self.mode.name == 'password':
self.input_ = self.password
+ elif self.mode.name == 'name_thing':
+ if hasattr(self.thing_selected, 'name'):
+ self.input_ = self.thing_selected.name
def send_tile_control_command(self):
self.send('SET_TILE_CONTROL %s %s' %
self.tile_draw = False
if mode_name == 'admin_enter' and self.is_admin:
mode_name = 'admin'
+ elif mode_name == 'name_thing':
+ player = self.game.get_thing(self.game.player_id)
+ thing = None
+ for t in [t for t in self.game.things if t.position == player.position
+ and t.id_ != player.id_]:
+ thing = t
+ break
+ if not thing:
+ self.flash = True
+ self.log_msg('? not standing over thing')
+ return
+ else:
+ self.thing_selected = thing
self.mode = getattr(self, 'mode_' + mode_name)
if self.mode.name == 'control_tile_draw':
self.log_msg('@ finished tile protection drawing.')
else:
self.send('ALL ' + quote(self.input_))
self.input_ = ""
+ elif self.mode.name == 'name_thing' and key == '\n':
+ if self.input_ == '':
+ self.input_ = ' '
+ self.send('THING_NAME %s %s' % (self.thing_selected.id_,
+ quote(self.input_)))
+ self.switch_mode('edit')
elif self.mode.name == 'annotate' and key == '\n':
if self.input_ == '':
self.input_ = ' '
projects / plomrogue2 / commitdiff