X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fplomrogue%2Fthings.py;h=a631b174f9292dde5ab047b98836bd2820939137;hb=65e83c99b95a619afc79e8984e6f5027bc7aac1b;hp=2decc6709f747113e888edc9327f406c8e43739c;hpb=faf90001efa004054b41df5e2638b6c7c4c1fd98;p=plomrogue2-experiments

diff --git a/new/plomrogue/things.py b/new/plomrogue/things.py
index 2decc67..a631b17 100644
--- a/new/plomrogue/things.py
+++ b/new/plomrogue/things.py
@@ -5,14 +5,36 @@ from plomrogue.errors import GameError
 class ThingBase:
     type_ = '?'
 
-    def __init__(self, world, id_, position=[0,0]):
+    def __init__(self, world, id_=None, position=(0,0)):
         self.world = world
-        self.id_ = id_
         self.position = position
+        if id_ is None:
+            self.id_ = self.world.new_thing_id()
+        else:
+            self.id_ = id_
 
 
 
 class Thing(ThingBase):
+    blocking = False
+    in_inventory = False
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.inventory = []
+
+    def proceed(self):
+        pass
+
+
+
+class ThingItem(Thing):
+    type_ = 'item'
+
+
+
+class ThingAnimate(Thing):
+    blocking = True
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -41,7 +63,7 @@ class Thing(ThingBase):
         neighbors = dijkstra_map.get_neighbors(tuple(self.position))
         n = n_max
         target_direction = None
-        for direction in neighbors:
+        for direction in sorted(neighbors.keys()):
             yx = neighbors[direction]
             if yx is not None:
                 n_new = dijkstra_map[yx]
@@ -123,16 +145,16 @@ class Thing(ThingBase):
         stencil = self.get_stencil()
         visible_things = []
         for thing in self.world.things:
-            if stencil[thing.position] == '.':
+            if (not thing.in_inventory) and stencil[thing.position] == '.':
                 visible_things += [thing]
         return visible_things
 
 
 
-class ThingHuman(Thing):
+class ThingHuman(ThingAnimate):
     type_ = 'human'
 
 
 
-class ThingMonster(Thing):
+class ThingMonster(ThingAnimate):
     type_ = 'monster'