X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fthings.py;h=cedee68266583f9486dea676a0d67bd5bacb2378;hb=f00c3aa40e107332b5a7d672ae8b939f0212031c;hp=0a06601e8a3836a77cd05602ff010467c2560e92;hpb=73607030fbd5ae9ebb98ceaefa973c98924ce61b;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 0a06601..cedee68 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -6,7 +6,7 @@ from plomrogue.mapping import YX
class ThingBase:
type_ = '?'
- def __init__(self, game, id_=0, position=(YX(0,0))):
+ def __init__(self, game, id_=0, position=(YX(0,0),YX(0,0))):
self.game = game
if id_ == 0:
self.id_ = self.game.new_thing_id()
@@ -94,14 +94,24 @@ class ThingAnimate(Thing):
if self._fov:
return self._fov
fov_map_class = self.game.map_geometry.fov_map_class
- self._fov = fov_map_class(self.game.map, self.position)
+ self._fov = fov_map_class(self.game.maps, self.position, 12,
+ self.game.get_map)
return self._fov
- def fov_stencil_map(self, map):
+ def fov_test(self, big_yx, little_yx):
+ test_position = self.fov_stencil.target_yx(big_yx, little_yx)
+ if self.fov_stencil.inside(test_position):
+ if self.fov_stencil[test_position] == '.':
+ return True
+ return False
+
+ def fov_stencil_map(self, map_type='normal'):
visible_terrain = ''
- for i in range(self.fov_stencil.size_i):
- if self.fov_stencil.terrain[i] == '.':
- visible_terrain += map.terrain[i]
+ for yx in self.fov_stencil:
+ if self.fov_stencil[yx] == '.':
+ big_yx, little_yx = self.fov_stencil.source_yxyx(yx)
+ map_ = self.game.get_map(big_yx, map_type)
+ visible_terrain += map_[little_yx]
else:
visible_terrain += ' '
return visible_terrain