X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=770fb2282d6a9f803bfe9210cda905340a041875;hb=856b68988876a63409737dac77b4d4921b9a466b;hp=dea4b63d4c4c69e0d42b8abc90a7c345c2945312;hpb=018bb0242ebd2b7e9fde170fae830376dea55e16;p=plomrogue2
diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index dea4b63..770fb22 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -1,5 +1,5 @@
from plomrogue.misc import quote
-from plomrogue.errors import GameError
+from plomrogue.errors import GameError, ArgError
@@ -40,9 +40,7 @@ def cmd_LOGIN(game, nick, connection_id):
raise GameError('name already in use')
if game.get_player(connection_id):
raise GameError('cannot log in twice')
- t = game.thing_types['Player'](game)
- t.position = game.spawn_point
- game.things += [t] # TODO refactor into Thing.__init__?
+ t = game.add_thing('Player', game.spawn_point)
t.thing_char = game.get_next_player_char()
game.sessions[connection_id] = {
'thing_id': t.id_,
@@ -84,6 +82,7 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id):
map_control = game.get_map(big_yx, 'control')
map_control[little_yx] = control_char
game.changed = True
+ game.changed_fovs = True
cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char'
def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
@@ -96,7 +95,7 @@ def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
if not t:
raise GameError('thing of ID %s not found' % thing_id)
t.protection = protection_char
- game.changed = True
+ #game.changed = True
cmd_THING_PROTECTION.argtypes = 'int:pos char'
def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
@@ -108,7 +107,7 @@ def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
if tile_class == '.':
raise GameError('tile class "." must remain unprotected')
game.map_control_passwords[tile_class] = password
- game.changed = True
+ #game.changed = True
cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string'
def cmd_NICK(game, nick, connection_id):
@@ -151,6 +150,8 @@ def cmd_TURN(game, n):
cmd_TURN.argtypes = 'int:nonneg'
def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
+ if len(msg) > 500:
+ raise ArgError('annotation text must be <= 500 characters')
player = game.get_player(connection_id)
big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
if not player.fov_test(big_yx, little_yx):
@@ -190,28 +191,16 @@ def cmd_GOD_ANNOTATE(game, big_yx, little_yx, msg):
if big_yx not in game.annotations:
game.annotations[big_yx] = {}
game.annotations[big_yx][little_yx] = msg
- game.changed = True
+ #game.changed = True
cmd_GOD_ANNOTATE.argtypes = 'yx_tuple yx_tuple:nonneg string'
def cmd_GOD_PORTAL(game, big_yx, little_yx, msg):
if big_yx not in game.portals:
game.portals[big_yx] = {}
game.portals[big_yx][little_yx] = msg
- game.changed = True
+ #game.changed = True
cmd_GOD_PORTAL.argtypes = 'yx_tuple yx_tuple:nonneg string'
-def cmd_GET_ANNOTATION(game, yx, connection_id):
- player = game.get_player(connection_id)
- big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
- annotation = '(unknown)'
- if player.fov_test(big_yx, little_yx):
- annotation = '(none)'
- if big_yx in game.annotations:
- if little_yx in game.annotations[big_yx]:
- annotation = game.annotations[big_yx][little_yx]
- game.io.send('ANNOTATION %s %s' % (yx, quote(annotation)))
-cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg'
-
def cmd_MAP_LINE(game, big_yx, y, line):
map_ = game.get_map(big_yx)
map_.set_line(y, line)
@@ -238,15 +227,7 @@ def cmd_THING(game, big_yx, little_yx, thing_type, thing_id):
if thing_type not in game.thing_types:
raise GameError('illegal thing type %s' % thing_type)
_ = game.get_map(big_yx)
- t_old = None
- if thing_id > 0:
- t_old = game.get_thing(thing_id)
- t_new = game.thing_types[thing_type](game, id_=thing_id, position=(big_yx,
- little_yx))
- if t_old:
- game.things[game.things.index(t_old)] = t_new
- else:
- game.things += [t_new]
+ game.add_thing(thing_type, (big_yx, little_yx), id_=thing_id)
game.changed = True
cmd_THING.argtypes = 'yx_tuple yx_tuple:nonneg string:thing_type int:nonneg'
@@ -295,7 +276,7 @@ def cmd_THING_MUSICPLAYER_SETTINGS(game, thing_id, playing, index, repeat):
t.playing = playing
t.playlist_index = index
t.repeat = repeat
-cmd_THING_MUSICPLAYER_SETTINGS.argtypes = 'int:pos bool int:nonneg bool'
+cmd_THING_MUSICPLAYER_SETTINGS.argtypes = 'int:pos bool int bool'
def cmd_THING_MUSICPLAYER_PLAYLIST_ITEM(game, thing_id, title, length):
t = game.get_thing(thing_id)
@@ -312,5 +293,47 @@ def cmd_THING_BOTTLE_EMPTY(game, thing_id):
raise GameError('thing of ID %s not found' % thing_id)
if not t.type_ == 'Bottle':
raise GameError('thing of ID %s not bottle' % thing_id)
- t.full = False
+ t.empty()
cmd_THING_BOTTLE_EMPTY.argtypes = 'int:pos'
+
+def cmd_THING_INSTALLED(game, thing_id):
+ t = game.get_thing(thing_id)
+ if not t:
+ raise GameError('thing of ID %s not found' % thing_id)
+ if not hasattr(t, 'installable'):
+ raise GameError('thing of ID %s not installable' % thing_id)
+ t.install()
+cmd_THING_INSTALLED.argtypes = 'int:pos'
+
+def cmd_PLAYER_FACE(game, face, connection_id):
+ t = game.get_player(connection_id)
+ if not t:
+ raise GameError('can only draw face when already logged in')
+ if len(face) != 18:
+ raise GameError('wrong face string length')
+ game.faces[t.name] = face
+ game.changed = True
+cmd_PLAYER_FACE.argtypes = 'string'
+
+def cmd_GOD_PLAYER_FACE(game, name, face):
+ if len(face) != 18:
+ raise GameError('wrong face string length')
+ game.faces[name] = face
+cmd_GOD_PLAYER_FACE.argtypes = 'string string'
+
+def cmd_GOD_PLAYER_HAT(game, name, hat):
+ if len(hat) != 18:
+ raise GameError('wrong hat string length')
+ game.hats[name] = hat
+cmd_GOD_PLAYER_HAT.argtypes = 'string string'
+
+def cmd_THING_HAT_DESIGN(game, thing_id, design):
+ if len(design) != 18:
+ raise GameError('hat design of wrong length')
+ t = game.get_thing(thing_id)
+ if not t:
+ raise GameError('thing of ID %s not found' % thing_id)
+ if t.type_ != 'Hat':
+ raise GameError('thing of ID %s not a hat' % thing_id)
+ t.design = design
+cmd_THING_HAT_DESIGN.argtypes = 'int:pos string'