X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fcommands.py;h=3a183b9f08f905062e83a902784c5bf2406c9e48;hb=3484a01e592bafc9d573b878ff94ef5e64755476;hp=0ccbdc1cb50ef3b646474e1d165fe0a4444ea701;hpb=c7a3af00680ba0449310bbb7336a187dd4ed6bcf;p=plomrogue2
diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 0ccbdc1..3a183b9 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -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.record_fov_change((big_yx, little_yx))
cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char'
def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
@@ -192,14 +191,14 @@ 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_MAP_LINE(game, big_yx, y, line):
@@ -228,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'
@@ -318,12 +309,31 @@ 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) != 9:
+ 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'