X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fthings.py;h=2146c1a222f48a78b4e3abe9187e09aa86909ba2;hb=441cf8d41a223e9bcd702d4ccb41ae679e6fcae3;hp=ca53e87dd057056e655c07df0141c3f27ede3141;hpb=80b6be9545812304bed7cf2a25434ef5f08a25c3;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index ca53e87..2146c1a 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -43,21 +43,73 @@ class Thing_Item(Thing):
 
 
 
-class Thing_Spawner(Thing):
+class ThingSpawner(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)
+        t = self.game.thing_types[self.child_type](self.game,
+                                                   position=self.position)
         self.game.things += [t]
         self.game.changed = True
 
 
 
+class Thing_ItemSpawner(ThingSpawner):
+    child_type = 'Item'
+
+
+
+class Thing_SpawnPointSpawner(ThingSpawner):
+    child_type = 'SpawnPoint'
+
+
+
+class Thing_SpawnPoint(Thing):
+    symbol_hint = 's'
+    portable = True
+    name = 'username'
+
+
+
+class Thing_DoorSpawner(ThingSpawner):
+    child_type = 'Door'
+
+
+
+class Thing_Door(Thing):
+    symbol_hint = 'D'
+    blocking = False
+    portable = True
+
+    def open(self):
+        self.blocking = False
+        self.portable = True
+        del self.thing_char
+
+    def close(self):
+        self.blocking = True
+        self.portable = False
+        self.thing_char = '#'
+
+
+
+class Thing_Consumable(Thing):
+    symbol_hint = 'B'
+    portable = True
+
+
+
+class Thing_ConsumableSpawner(ThingSpawner):
+    child_type = 'Consumable'
+
+
+
 class ThingAnimate(Thing):
     blocking = True
+    drunk = 0
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -83,11 +135,17 @@ class ThingAnimate(Thing):
             return None
 
     def proceed(self):
+        self.drunk -= 1
+        if self.drunk == 0:
+            for c_id in self.game.sessions:
+                if self.game.sessions[c_id]['thing_id'] == self.id_:
+                    self.game.io.send('DEFAULT_COLORS', c_id)
+                    self.game.io.send('CHAT "You sober up."', c_id)
+            self.game.changed = True
         self._fov = None
         if self.task is None:
             self.task = self.get_next_task()
             return
-
         try:
             self.task.check()
         except GameError as e:
@@ -104,8 +162,8 @@ 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.maps, self.position, 12,
-                                  self.game.get_map)
+        self._fov = fov_map_class(self.game.things, self.game.maps, self.position,
+                                  12, self.game.get_map)
         return self._fov
 
     def fov_test(self, big_yx, little_yx):