X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=ef50a63be2617bcd9e57e80faf1ca889ca6f9a3a;hb=8d1f606e1dd84a5418f1612d266ece318747832b;hp=df5ea58c4c89291b846d0d0c649896dfa50e1289;hpb=4a49836086c55c2736bcc7def243f6c4a72ae690;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index df5ea58..ef50a63 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -20,7 +20,9 @@ class ThingBase:
 
 
 class Thing(ThingBase):
-    blocking = False
+    blocks_movement = False
+    blocks_sound = False
+    blocks_light = False
     portable = False
     protection = '.'
     commandable = False
@@ -46,7 +48,6 @@ class Thing(ThingBase):
 
         def lower_msg_by_volume(msg, volume, largest_audible_distance,
                                 url_limits = []):
-            import random
             factor = largest_audible_distance / 4
             lowered_msg = ''
             in_url = False
@@ -68,11 +69,11 @@ class Thing(ThingBase):
             return lowered_msg
 
         largest_audible_distance = 20
-        # player's don't block sound (or should they?)
-        things = [t for t in self.game.things if t.type_ != 'Player']
+        obstacles = [t.position for t in self.game.things if t.blocks_sound]
         sound_blockers = self.game.get_sound_blockers()
-        dijkstra_map = DijkstraMap(sound_blockers, things, self.game.maps, self.position,
-                                   largest_audible_distance, self.game.get_map)
+        dijkstra_map = DijkstraMap(sound_blockers, obstacles, self.game.maps,
+                                   self.position, largest_audible_distance,
+                                   self.game.get_map)
         url_limits = []
         for m in re.finditer('https?://[^\s]+', msg):
             url_limits += [m.start(), m.end()]
@@ -117,7 +118,6 @@ class ThingSpawner(Thing):
                   if t != self and t.position == self.position]:
             return
         self.game.add_thing(self.child_type, self.position)
-        # self.game.changed = True  handled by add_thing
 
 
 
@@ -138,30 +138,50 @@ class Thing_SpawnPoint(Thing):
 
 
 
+class ThingInstallable(Thing):
+    portable = True
+    installable = True
+
+    def install(self):
+        self.portable = False
+
+    def uninstall(self):
+        self.portable = True
+
+
+
 class Thing_DoorSpawner(ThingSpawner):
     child_type = 'Door'
 
 
 
-class Thing_Door(Thing):
+class Thing_Door(ThingInstallable):
     symbol_hint = 'D'
-    blocking = False
-    portable = True
-    installable = True
+    blocks_movement = False
 
     def open(self):
-        self.blocking = False
+        self.blocks_movement = False
+        self.blocks_light = False
+        self.blocks_sound = False
         del self.thing_char
 
     def close(self):
-        self.blocking = True
+        self.blocks_movement = True
+        self.blocks_light = True
+        self.blocks_sound = True
         self.thing_char = '#'
 
-    def install(self):
-        self.portable = False
 
-    def uninstall(self):
-        self.portable = True
+
+class Thing_Psychedelic(Thing):
+    symbol_hint = 'P'
+    portable = True
+
+
+
+class Thing_PsychedelicSpawner(ThingSpawner):
+    symbol_hint = 'P'
+    child_type = 'Psychedelic'
 
 
 
@@ -177,14 +197,14 @@ class Thing_Bottle(Thing):
         self.full = False
 
     def spin(self):
-        import random
         all_players = [t for t in self.game.things if t.type_ == 'Player']
         # TODO: refactor with ThingPlayer.prepare_multiprocessible_fov_stencil
         # and ThingPlayer.fov_test
         fov_map_class = self.game.map_geometry.fov_map_class
         fov_radius = 12
         light_blockers = self.game.get_light_blockers()
-        fov = fov_map_class(light_blockers, self.game.things, self.game.maps,
+        obstacles = [t.position for t in self.game.things if t.blocks_light]
+        fov = fov_map_class(light_blockers, obstacles, self.game.maps,
                             self.position, fov_radius, self.game.get_map)
         fov.init_terrain()
         visible_players = []
@@ -372,7 +392,6 @@ class Thing_BottleDeposit(Thing):
             elif choice == 'Hat':
                 msg += 'pick it up and then use "(un-)wear" on it!'
             self.sound('BOTTLE DEPOSITOR', msg)
-            # self.game.changed = True  done by game.add_thing
 
     def accept(self):
         self.bottle_counter += 1
@@ -404,8 +423,7 @@ class Thing_CookieSpawner(Thing):
 
 
 class ThingAnimate(Thing):
-    blocking = True
-    drunk = 0
+    blocks_movement = True
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -437,16 +455,6 @@ class ThingAnimate(Thing):
             return task
 
     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_:
-                    # 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('fov')
-                    break
-            self.game.changed = True
         if self.task is None:
             self.task = self.get_next_task()
             return
@@ -465,7 +473,8 @@ class ThingAnimate(Thing):
         fov_map_class = self.game.map_geometry.fov_map_class
         fov_radius = 3 if self.drunk > 0 else 12
         light_blockers = self.game.get_light_blockers()
-        self._fov = fov_map_class(light_blockers, self.game.things, self.game.maps,
+        obstacles = [t.position for t in self.game.things if t.blocks_light]
+        self._fov = fov_map_class(light_blockers, obstacles, self.game.maps,
                                   self.position, fov_radius, self.game.get_map)
 
     def multiprocessible_fov_stencil(self):
@@ -552,11 +561,46 @@ class ThingAnimate(Thing):
 
 class Thing_Player(ThingAnimate):
     symbol_hint = '@'
+    drunk = 0
+    tripping = 0
+    need_for_toilet = 0
+    standing = True
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.carrying = None
 
+    def proceed(self):
+        super().proceed()
+        if self.drunk >= 0:
+            self.drunk -= 1
+        if self.tripping >= 0:
+            self.tripping -= 1
+        if self.need_for_toilet > 0:
+            self.need_for_toilet += 1
+            terrain = self.game.maps[self.position[0]][self.position[1]]
+            if terrain in self.game.terrains:
+                terrain_type = self.game.terrains[terrain]
+                if 'toilet' in terrain_type.tags:
+                    self.send_msg('CHAT "You use the toilet. What a relief!"')
+                    self.need_for_toilet = 0
+            if 10000 * random.random() < self.need_for_toilet / 100000:
+                self.send_msg('CHAT "You need to go to a toilet."')
+            if self.need_for_toilet > 1000000:
+                self.send_msg('CHAT "You pee into your pants. Eww!"')
+                self.need_for_toilet = 0
+        if self.drunk == 0:
+            self.send_msg('CHAT "You sober up."')
+            self.invalidate('fov')
+            self.game.changed = True
+        if self.tripping == 0:
+            self.send_msg('DEFAULT_COLORS')
+            self.send_msg('CHAT "You sober up."')
+            self.game.changed = True
+        elif self.tripping > 0 and self.tripping % 250 == 0:
+            self.send_msg('RANDOM_COLORS')
+            self.game.changed = True
+
     def send_msg(self, msg):
         for c_id in self.game.sessions:
             if self.game.sessions[c_id]['thing_id'] == self.id_: