X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=df5ea58c4c89291b846d0d0c649896dfa50e1289;hb=4a49836086c55c2736bcc7def243f6c4a72ae690;hp=5948cb6b6ebbc1b92f6ec8d8adc76f919351d578;hpb=9f80260dd126a305f4b71541f00dcc88264ce716;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 5948cb6..df5ea58 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -246,8 +246,7 @@ class Thing_HatRemixer(Thing):
hat.design = new_design
self.sound('HAT REMIXER', 'remixing a hat â¦')
self.game.changed = True
- # FIXME: pseudo-FOV-change actually
- self.game.record_fov_change(self.position)
+ self.game.record_change(self.position, 'other')
@@ -412,13 +411,19 @@ class ThingAnimate(Thing):
super().__init__(*args, **kwargs)
self.next_task = [None]
self.task = None
- self.invalidate_map_view()
-
- def invalidate_map_view(self):
- self._fov = None
- self._visible_terrain = None
- self._visible_control = None
- self._seen_things = None
+ self.invalidate('fov')
+ self.invalidate('other') # currently redundant though
+
+ def invalidate(self, type_):
+ if type_ == 'fov':
+ self._fov = None
+ self._visible_terrain = None
+ self._visible_control = None
+ self.invalidate('other')
+ elif type_ == 'other':
+ self._seen_things = None
+ self._seen_annotation_positions = None
+ self._seen_portal_positions = None
def set_next_task(self, task_name, args=()):
task_class = self.game.tasks[task_name]
@@ -439,9 +444,7 @@ class ThingAnimate(Thing):
# TODO: refactor with self.send_msg
self.game.io.send('DEFAULT_COLORS', c_id)
self.game.io.send('CHAT "You sober up."', c_id)
- #self.invalidate_map_view()
- # FIXME: pseudo-FOV-change actually
- self.game.record_fov_change(self.position)
+ self.invalidate('fov')
break
self.game.changed = True
if self.task is None:
@@ -521,6 +524,31 @@ class ThingAnimate(Thing):
if self.fov_test(*t.position)]
return self._seen_things
+ @property
+ def seen_annotation_positions(self):
+ if self._seen_annotation_positions is not None:
+ return self._seen_annotation_positions
+ self._seen_annotation_positions = []
+ for big_yx in self.game.annotations:
+ for little_yx in [little_yx for little_yx
+ in self.game.annotations[big_yx]
+ if self.fov_test(big_yx, little_yx)]:
+ self._seen_annotation_positions += [(big_yx, little_yx)]
+ return self._seen_annotation_positions
+
+ @property
+ def seen_portal_positions(self):
+ if self._seen_portal_positions is not None:
+ return self._seen_portal_positions
+ self._seen_portal_positions = []
+ for big_yx in self.game.portals:
+ for little_yx in [little_yx for little_yx
+ in self.game.portals[big_yx]
+ if self.fov_test(big_yx, little_yx)]:
+ self._seen_portal_positions += [(big_yx, little_yx)]
+ return self._seen_portal_positions
+
+
class Thing_Player(ThingAnimate):
symbol_hint = '@'