X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=cedee68266583f9486dea676a0d67bd5bacb2378;hb=e70fd4a07b3e35f5bda57d7112e721a2290082c6;hp=da5cf7771c5698c0ce5c487737dc1ea26902362c;hpb=3795deac19be4816d54829ed2e728e78f57f86de;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index da5cf77..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,22 +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_test(self, yx):
- test_position = yx - self.fov_stencil.offset
+ 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):
+ def fov_stencil_map(self, map_type='normal'):
visible_terrain = ''
for yx in self.fov_stencil:
if self.fov_stencil[yx] == '.':
- corrected_yx = yx + self.fov_stencil.offset
- visible_terrain += map[corrected_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