Add multi-class thing type system.

[plomrogue2-experiments] / new / plomrogue / commands.py

diff --git a/new/plomrogue/commands.py b/new/plomrogue/commands.py
index aa3253ae8520a46b12fa63364de1a73f5bcd15ea..6a27f80075afda9904262942d16023506dd51010 100644 (file)
--- a/new/plomrogue/commands.py
+++ b/new/plomrogue/commands.py
@@ -16,9 +16,25 @@ def cmd_MAP(game, yx):
 cmd_MAP.argtypes = 'yx_tuple:pos'
 
 def cmd_THING_TYPE(game, i, type_):
-    t = game.world.get_thing(i)
-    t.type_ = type_
-cmd_THING_TYPE.argtypes = 'int:nonneg string'
+    t_old = game.world.get_thing(i)
+    t_new = game.thing_types[type_](game.world, i)
+    #attr_names_of_old = [name for name in dir(t_old) where name[:2] != '__']
+    #attr_names_of_new = [name for name in dir(t_new) where name[:2] != '__']
+    #class_new = type(t_new)
+    #for attr_name in [v for v in attr_names_of_old if v in attr_names_of_new]:
+    #    if hasattr(class_new, attr_name):
+    #        attr_new = getattr(class_new, attr_name)
+    #        if type(attr_new) == property and attr_new.fset is None:
+    #            continue  # ignore read-only properties on t_new
+    #    attr_old = getattr(t_old, attr_name)
+    #    attr_new = getattr(t_new, attr_name)
+    #    if type(attr_old) != type(attr_new):
+    #        continue
+    #    setattr(t_new, attr_name, attr_old)
+    t_new.position = t_old.position
+    t_old_index = game.world.things.index(t_old)
+    game.world.things[t_old_index] = t_new
+cmd_THING_TYPE.argtypes = 'int:nonneg string:thingtype'
 
 def cmd_THING_POS(game, i, yx):
     t = game.world.get_thing(i)
@@ -67,7 +83,9 @@ def cmd_SAVE(game):
             task = thing.task
             if task is not None:
                 task_args = task.get_args_string()
-                write(f, 'SET_TASK:%s %s %s %s' % (task.name, thing.id_,
+                task_name = [k for k in game.tasks.keys()
+                             if game.tasks[k] == task.__class__][0]
+                write(f, 'SET_TASK:%s %s %s %s' % (task_name, thing.id_,
                                                    task.todo, task_args))
         write(f, 'PLAYER_ID %s' % game.world.player_id)
 cmd_SAVE.dont_save = True