Differentiate Spawner into ItemSpawner.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index b6fe5e15e5e919483962b87f63fdfa4a99a380e5..98dff00dbb40868e2af8d2beb35e85fdfda2d23c 100644 (file)
--- 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()
@@ -18,6 +18,8 @@ class ThingBase:
 
 class Thing(ThingBase):
     blocking = False
+    portable = False
+    protection = '.'
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -35,8 +37,23 @@ class Thing(ThingBase):
 
 
 
-class Thing_Stone(Thing):
-    symbol_hint = 'o'
+class Thing_Item(Thing):
+    symbol_hint = 'i'
+    portable = True
+
+
+
+class Thing_ItemSpawner(Thing):
+    symbol_hint = 'S'
+
+    def proceed(self):
+        for t in [t for t in self.game.things
+                  if t != self and t.position == self.position]:
+            return
+        t = self.game.thing_types['Item'](self.game, position=self.position)
+        self.game.things += [t]
+        self.game.changed = True
+
 
 
 class ThingAnimate(Thing):
@@ -75,8 +92,7 @@ class ThingAnimate(Thing):
             self.task.check()
         except GameError as e:
             self.task = None
-            raise GameError
-            return
+            raise e
         self.task.todo -= 1
         if self.task.todo <= 0:
             self._last_task_result = self.task.do()
@@ -88,14 +104,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
@@ -107,5 +133,4 @@ class Thing_Player(ThingAnimate):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.nickname = 'undefined'
         self.carrying = None