blocks_sound, blocks_movement)
cmd_TERRAIN.argtypes = 'char string bool bool bool'
+def cmd_TERRAIN_TAG(game, character, tag):
+ if not character in game.terrains:
+ raise GameError('terrain does not exist: %s' % character)
+ game.terrains[character].tags.add(tag)
+cmd_TERRAIN_TAG.argtypes = 'char string'
+
def cmd_ALL(game, msg, connection_id):
speaker = game.get_player(connection_id)
if not speaker:
raise GameError('need to be logged in for this')
+ if speaker.drunk > 0:
+ import random
+ drunken_msg = ''
+ for c in msg:
+ if random.random() > 0.85:
+ c = random.choice(['l', 'll', 'n', 'nhg', 'w', 'wl', 'bw'])
+ drunken_msg += c
+ msg = drunken_msg
speaker.sound(speaker.name, msg)
cmd_ALL.argtypes = 'string'
nick = nick.strip()
if len(nick) == 0:
raise GameError('empty name')
- for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
- raise GameError('name already in use')
if game.get_player(connection_id):
raise GameError('cannot log in twice')
- t = game.add_thing('Player', game.spawn_point)
- t.name = nick
- t.thing_char = game.get_next_player_char()
- game.sessions[connection_id] = {
- 'thing_id': t.id_,
- 'status': 'player'
- }
- game.io.send('PLAYER_ID %s' % t.id_, connection_id)
- game.io.send('LOGIN_OK', connection_id)
- game.io.send('CHAT ' + quote(t.name + ' entered the map.'))
- for s in [s for s in game.things
- if s.type_ == 'SpawnPoint' and s.name == t.name]:
- t.position = s.position
- break
- # game.changed = True # handled by game.add_thing
+ game.login_requests += [(nick, connection_id)]
cmd_LOGIN.argtypes = 'string'
def cmd_BECOME_ADMIN(game, password, connection_id):
- player = game.thing_types['Player'](game)
+ player = game.get_player(connection_id)
if not player:
raise GameError('need to be logged in for this')
if password in game.admin_passwords:
map_control = game.get_map(big_yx, 'control')
map_control[little_yx] = control_char
game.changed = True
- game.record_fov_change((big_yx, little_yx))
+ game.record_change((big_yx, little_yx), 'fov')
cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char'
-def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
+def cmd_THING_PROTECTION(game, protection_char, connection_id):
player = game.get_player(connection_id)
if not player:
raise GameError('need to be logged in for this')
if not game.sessions[connection_id]['status'] == 'admin':
raise GameError('need to be admin for this')
- t = game.get_thing(thing_id)
- if not t:
- raise GameError('thing of ID %s not found' % thing_id)
- t.protection = protection_char
+ if not player.carrying:
+ raise GameError('need to carry a thing to protect it')
+ player.carrying.protection = protection_char
game.changed = True
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change(t.position)
-cmd_THING_PROTECTION.argtypes = 'int:pos char'
+ game.record_change(player.carrying.position, 'other')
+cmd_THING_PROTECTION.argtypes = 'char'
def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
player = game.get_player(connection_id)
if tile_class == '.':
raise GameError('tile class "." must remain unprotected')
game.map_control_passwords[tile_class] = password
- #game.changed = True
cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string'
def cmd_NICK(game, nick, connection_id):
t.name = nick
game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
game.changed = True
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change(t.position)
+ game.record_change(t.position, 'other')
cmd_NICK.argtypes = 'string'
def cmd_GET_GAMESTATE(game, connection_id):
if big_yx not in game.annotations:
game.annotations[big_yx] = {}
game.annotations[big_yx][little_yx] = msg
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change([big_yx, little_yx])
+ game.record_change([big_yx, little_yx], 'other')
game.changed = True
cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
if big_yx not in game.portals:
game.portals[big_yx] = {}
game.portals[big_yx][little_yx] = msg
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change([big_yx, little_yx])
+ game.record_change([big_yx, little_yx], 'other')
game.changed = True
cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
raise GameError('illegal thing type %s' % thing_type)
_ = game.get_map(big_yx)
game.add_thing(thing_type, (big_yx, little_yx), id_=thing_id)
- # game.changed = True handled by add_thing
cmd_THING.argtypes = 'yx_tuple yx_tuple:nonneg string:thing_type int:nonneg'
-def cmd_THING_NAME(game, thing_id, name, pw, connection_id):
- # TODO check if thing in FOV
- t = game.get_thing(thing_id)
- if not t:
- raise GameError('thing of ID %s not found' % thing_id)
- if not game.can_do_thing_with_pw(t, pw):
+def cmd_THING_NAME(game, name, pw, connection_id):
+ player = game.get_player(connection_id)
+ if not player:
+ raise GameError('need to be logged in for this')
+ if not player.carrying:
+ raise GameError('need to carry a thing to rename it')
+ if not game.can_do_thing_with_pw(player.carrying, pw):
raise GameError('wrong password for thing')
if name == ' ':
- if hasattr(t.__class__, 'name'):
+ if hasattr(player.carrying.__class__, 'name'):
raise GameError('cannot un-name things of this type')
- if hasattr(t, 'name'):
- del t.name
+ if hasattr(player.carrying, 'name'):
+ del player.carrying.name
else:
- t.name = name
+ player.carrying.name = name
game.changed = True
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change(t.position)
-cmd_THING_NAME.argtypes = 'int:pos string string'
+ game.record_change(player.carrying.position, 'other')
+cmd_THING_NAME.argtypes = 'string string'
def cmd_GOD_THING_NAME(game, thing_id, name):
t = game.get_thing(thing_id)
t.protection = protection_char
cmd_GOD_THING_PROTECTION.argtypes = 'int:pos char'
-def cmd_THING_DOOR_CLOSED(game, thing_id):
+def cmd_THING_DOOR_CLOSED(game, thing_id, locked):
t = game.get_thing(thing_id)
if not t:
raise GameError('thing of ID %s not found' % thing_id)
if not t.type_ == 'Door':
raise GameError('thing of ID %s not door' % thing_id)
- t.blocking = True
- t.portable = False
- t.thing_char = '#'
-cmd_THING_DOOR_CLOSED.argtypes = 'int:pos'
+ t.close()
+ if locked:
+ t.lock()
+cmd_THING_DOOR_CLOSED.argtypes = 'int:pos bool'
def cmd_THING_MUSICPLAYER_SETTINGS(game, thing_id, playing, index, repeat):
t = game.get_thing(thing_id)
raise GameError('wrong face string length')
game.faces[t.name] = face
game.changed = True
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change(t.position)
+ game.record_change(t.position, 'other')
cmd_PLAYER_FACE.argtypes = 'string'
def cmd_PLAYER_HAT(game, hat, connection_id):
% (c, legal_chars))
game.hats[t.name] = hat
game.changed = True
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change(t.position)
+ game.record_change(t.position, 'other')
cmd_PLAYER_HAT.argtypes = 'string'
def cmd_GOD_PLAYER_FACE(game, name, face):
raise GameError('thing of ID %s not a hat' % thing_id)
t.design = design
cmd_THING_HAT_DESIGN.argtypes = 'int:pos string'
+
+def cmd_THING_DOOR_KEY(game, key_id, door_id):
+ key = game.get_thing(key_id)
+ if not key:
+ raise GameError('thing of ID %s not found' % key_id)
+ if key.type_ != 'DoorKey':
+ raise GameError('thing of ID %s not a door key' % key_id)
+ door = game.get_thing(door_id)
+ if not door:
+ raise GameError('thing of ID %s not found' % door_id)
+ if door.type_ != 'Door':
+ raise GameError('thing of ID %s not a door' % key_id)
+ key.door = door
+cmd_THING_DOOR_KEY.argtypes = 'int:pos int:pos'
+
+def cmd_THING_CRATE_ITEM(game, crate_id, item_id):
+ crate = game.get_thing(crate_id)
+ if not crate:
+ raise GameError('thing of ID %s not found' % crate_id)
+ if crate.type_ != 'Crate':
+ raise GameError('thing of ID %s not a crate' % crate_id)
+ item = game.get_thing(item_id)
+ if not item:
+ raise GameError('thing of ID %s not found' % item_id)
+ if item.type_ == 'Crate':
+ raise GameError('thing of ID %s is a crate' % item_id)
+ crate.accept(item)
+cmd_THING_CRATE_ITEM.argtypes = 'int:pos int:pos'
+
+def cmd_MAP_CONTROL_PRESETS(game, draw_control_presets):
+ game.draw_control_presets = draw_control_presets
+cmd_MAP_CONTROL_PRESETS.argtypes = 'bool'
+
+def cmd_THING_SPAWNPOINT_CREATED(game, spawnpoint_id, timestamp):
+ import datetime
+ spawnpoint = game.get_thing(spawnpoint_id)
+ if not spawnpoint:
+ raise GameError('thing of ID %s not found' % spawnpoint_id)
+ if spawnpoint.type_ != 'SpawnPoint':
+ raise GameError('thing of ID %s not a SpawnPoint' % spawnpoint_id)
+ if timestamp == 0:
+ spawnpoint.temporary = False
+ else:
+ spawnpoint.temporary = True
+ spawnpoint.created_at = datetime.datetime.fromtimestamp(timestamp)
+cmd_THING_SPAWNPOINT_CREATED.argtypes = 'int:pos int:nonneg'
projects / plomrogue2 / blobdiff