Refactor hat editing into general design editing.

[plomrogue2] / plomrogue / game.py

diff --git a/plomrogue/game.py b/plomrogue/game.py
index cfc4271935ba7ab2c420ef3cff296f36cdde3f06..c560993e40b5da675b9b6d73f3fea82014b525ba 100755 (executable)
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -306,10 +306,7 @@ class Game(GameBase):
                                                            quote(t.thing_char)), c_id)
                     if hasattr(t, 'installable') and not t.portable:
                         self.io.send('THING_INSTALLED %s' % (t.id_), c_id)
-                    if t.type_ == 'Hat':
-                        self.io.send('THING_HAT %s %s' % (t.id_,
-                                                          quote(t.design)), c_id)
-                    elif hasattr(t, 'design'):
+                    if hasattr(t, 'design'):
                         self.io.send('THING_DESIGN %s %s %s'
                                      % (t.id_, t.design_size, quote(t.design)),
                                      c_id)
@@ -559,13 +556,10 @@ class Game(GameBase):
                     write(f, 'GOD_THING_NAME %s %s' % (t.id_, quote(t.name)))
                 if hasattr(t, 'installable') and (not t.portable):
                     write(f, 'THING_INSTALLED %s' % t.id_)
+                if hasattr(t, 'design'):
+                    write(f, 'GOD_THING_DESIGN %s %s' % (t.id_, quote(t.design)))
                 if t.type_ == 'Door' and t.blocks_movement:
                     write(f, 'THING_DOOR_CLOSED %s %s' % (t.id_, int(t.locked)))
-                elif t.type_ == 'Hat':
-                    write(f, 'THING_HAT_DESIGN %s %s' % (t.id_,
-                                                         quote(t.design)))
-                elif hasattr(t, 'design'):
-                    write(f, 'GOD_THING_DESIGN %s %s' % (t.id_, quote(t.design)))
                 elif t.type_ == 'MusicPlayer':
                     write(f, 'THING_MUSICPLAYER_SETTINGS %s %s %s %s' %
                           (t.id_, int(t.playing), t.playlist_index, int(t.repeat)))