X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fplomrogue%2Fthings.py;h=8900d9a983d751490b7b0d84f0802d9b2efae1ec;hb=ecf3799b03f0a9098956d529f26be54f37c6534b;hp=0e47cc0b6cd6df06fb4f83e6df8b5b856a232456;hpb=b65fcff5e5499f5c3c57f0c4d8f205643be5ebb7;p=plomrogue2-experiments

diff --git a/new/plomrogue/things.py b/new/plomrogue/things.py
index 0e47cc0..8900d9a 100644
--- a/new/plomrogue/things.py
+++ b/new/plomrogue/things.py
@@ -51,7 +51,7 @@ class Thing(ThingBase):
     def _position_set(self, pos):
         super()._position_set(pos)
         for t_id in self.inventory:
-            t = self.game.get_thing(t_id)
+            t = self.game.get_thing(t_id, create_unfound=False)
             t.position = self.position
         if not self.id_ == self.game.player_id:
             return
@@ -110,6 +110,19 @@ class ThingAnimate(Thing):
         self.set_task('WAIT')
         self._last_task_result = None
         self.unset_surroundings()
+        self.close_maps = ()
+
+    def _position_set(self, pos):
+        """For player we need to update .close_maps on every move via the
+           self.surroundings property method, to keep their reality
+           bubble in sync with their movement.
+
+        """
+        super()._position_set(pos)
+        if self.id_ == self.game.player_id:
+            if not hasattr(self, '_surroundings'):
+                self._surroundings = None
+            self.surroundings
 
     def move_on_dijkstra_map(self, own_pos, targets):
         visible_map = self.get_visible_map()
@@ -134,8 +147,14 @@ class ThingAnimate(Thing):
                        dijkstra_map[small_yx] < dijkstra_map[pos] - 1:
                         dijkstra_map[pos] = dijkstra_map[small_yx] + 1
                         shrunk = True
-        get_neighbors((YX(0,0), own_pos), dijkstra_map.size,
-                      dijkstra_map.start_indented)
+        #print('DEBUG DIJKSTRA ---------------------', self.id_, self.position)
+        #for y, line in dijkstra_map.lines():
+        #    line_to_print = []
+        #    for x in line:
+        #        line_to_print += ['%3s' % x]
+        #    print(' '.join(line_to_print))
+        neighbors = get_neighbors((YX(0,0), own_pos), dijkstra_map.size,
+                                  dijkstra_map.start_indented)
         n = n_max
         target_direction = None
         for direction in sorted(neighbors.keys()):
@@ -147,33 +166,33 @@ class ThingAnimate(Thing):
                     target_direction = direction
         return target_direction
 
-    def hunt_player(self):
-        visible_things = self.get_visible_things()
-        target = None
-        for t in visible_things:
-            if t.type_ == 'human':
-                target = t.position[1] - self.view_offset
-                break
-        if target is not None:
-            try:
-                offset_self_pos = self.position[1] - self.view_offset
-                target_dir = self.move_on_dijkstra_map(offset_self_pos,
-                                                       [target])
-                if target_dir is not None:
-                    self.set_task('MOVE', (target_dir,))
-                    return True
-            except GameError:
-                pass
-        return False
+    #def hunt_player(self):
+    #    visible_things = self.get_visible_things()
+    #    target = None
+    #    for t in visible_things:
+    #        if t.type_ == 'human':
+    #            target = t.position[1] - self.view_offset
+    #            break
+    #    if target is not None:
+    #        try:
+    #            offset_self_pos = self.position[1] - self.view_offset
+    #            target_dir = self.move_on_dijkstra_map(offset_self_pos,
+    #                                                   [target])
+    #            if target_dir is not None:
+    #                self.set_task('MOVE', (target_dir,))
+    #                return True
+    #        except GameError:
+    #            pass
+    #    return False
 
     def hunt_food_satisfaction(self):
         for id_ in self.inventory:
-            t = self.game.get_thing(id_)
+            t = self.game.get_thing(id_, create_unfound=False)
             if t.type_ == 'food':
                 self.set_task('EAT', (id_,))
                 return True
         for id_ in self.get_pickable_items():
-            t = self.game.get_thing(id_)
+            t = self.game.get_thing(id_, create_unfound=False)
             if t.type_ == 'food':
                 self.set_task('PICKUP', (id_,))
                 return True
@@ -181,8 +200,12 @@ class ThingAnimate(Thing):
         food_targets = []
         for t in visible_things:
             if t.type_ == 'food':
-                food_targets += [t.position[1] - self.view_offset]
-        offset_self_pos = self.position[1] - self.view_offset
+                food_targets += [self.game.map_geometry.pos_in_view(t.position,
+                                                                    self.view_offset,
+                                                                    self.game.map_size)]
+        offset_self_pos = self.game.map_geometry.pos_in_view(self.position,
+                                                             self.view_offset,
+                                                             self.game.map_size)
         target_dir = self.move_on_dijkstra_map(offset_self_pos,
                                                food_targets)
         if target_dir:
@@ -223,6 +246,7 @@ class ThingAnimate(Thing):
             if self is self.game.player:
                 self.game.player_is_alive = False
             else:
+                # TODO: Handle inventory.
                 del self.game.things[self.game.things.index(self)]
             return
         try:
@@ -260,9 +284,12 @@ class ThingAnimate(Thing):
     def surroundings(self):
         if self._surroundings is not None:
             return self._surroundings
-        s = self.game.map_geometry.get_view(self.game.map_size,
-                                            self.game.get_map,
-                                            self._radius, self.view_offset)
+        s, close_maps = self.\
+            game.map_geometry.get_view_and_seen_maps(self.game.map_size,
+                                                     self.game.get_map,
+                                                     self._radius,
+                                                     self.view_offset)
+        self.close_maps = close_maps
         self._surroundings = s
         return self._surroundings
 
@@ -279,7 +306,7 @@ class ThingAnimate(Thing):
 
     def get_visible_map(self):
         stencil = self.get_stencil()
-        m = Map(self.surroundings.size, ' ')
+        m = Map(self.surroundings.size, ' ', self.surroundings.start_indented)
         for pos in m:
             if stencil[pos] == '.':
                 m[pos] = self.surroundings[pos]