Refactor hat editing into general design editing.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 8422161b26c6b95bc372c51614acef6a3fc124e6..9c34a1c98058043027e9cf9766c7ac9eeaedacfe 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -337,25 +337,6 @@ def cmd_PLAYER_FACE(game, face, connection_id):
     game.record_change(t.position, 'other')
 cmd_PLAYER_FACE.argtypes = 'string'
 
-def cmd_PLAYER_HAT(game, hat, connection_id):
-    t = game.get_player(connection_id)
-    if not t:
-        raise GameError('can only edit hat when already logged in')
-    if not t.name in game.hats:
-        raise GameError('not currently wearing an editable hat')
-    if len(hat) != 18:
-        raise GameError('wrong hat string length')
-    legal_chars = t.get_cookie_chars()
-    for c in hat:
-        if c not in legal_chars:
-            raise GameError('used illegal character: "%s" – '
-                            'allowed characters: %s'
-                            % (c, legal_chars))
-    game.hats[t.name] = hat
-    game.changed = True
-    game.record_change(t.position, 'other')
-cmd_PLAYER_HAT.argtypes = 'string'
-
 def cmd_GOD_PLAYER_FACE(game, name, face):
     if len(face) != 18:
         raise GameError('wrong face string length')
@@ -372,17 +353,6 @@ def cmd_GOD_PLAYERS_HAT_CHARS(game, name, hat_chars):
     game.players_hat_chars[name] = hat_chars
 cmd_GOD_PLAYERS_HAT_CHARS.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'
-
 def cmd_THING_DESIGN(game, design, pw, connection_id):
     player = game.get_player(connection_id)
     if not player:
@@ -393,6 +363,13 @@ def cmd_THING_DESIGN(game, design, pw, connection_id):
         raise GameError('wrong password for thing')
     if not hasattr(player.carrying, 'design'):
         raise GameError('carried thing not designable')
+    if player.carrying.type_ == 'Hat':
+        legal_chars = player.get_cookie_chars()
+        for c in design:
+            if c not in legal_chars:
+                raise GameError('used illegal character: "%s" – '
+                                'allowed characters: %s'
+                                % (c, legal_chars))
     size = player.carrying.design_size
     if len(design) != size.y * size.x:
         raise GameError('design for carried thing of wrong length')