X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=a677f5015c6e08f15a7ed3e1a7bfb6708c98b548;hb=d16c11ef2034c2903418b44ee8b8f5f06714347a;hp=0dced0da0a612b1c10248c3ba8f9eef52e057a72;hpb=cd0fee3d91d70525d7d4f434985abad6ea73faf0;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 0dced0d..a677f50 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -48,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
@@ -139,16 +138,26 @@ 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'
     blocks_movement = False
-    portable = True
-    installable = True
 
     def open(self):
         self.blocks_movement = False
@@ -162,11 +171,17 @@ class Thing_Door(Thing):
         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'
 
 
 
@@ -182,7 +197,6 @@ 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
@@ -410,7 +424,6 @@ class Thing_CookieSpawner(Thing):
 
 class ThingAnimate(Thing):
     blocks_movement = True
-    drunk = 0
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -442,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
@@ -558,11 +561,46 @@ class ThingAnimate(Thing):
 
 class Thing_Player(ThingAnimate):
     symbol_hint = '@'
+    drunk = 0
+    tripping = 0
+    need_for_toilet = 0
+    last_pee_need_test = datetime.datetime.now()
 
     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.0001
+            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 self.last_pee_need_test + datetime.timedelta(seconds=1) <\
+               datetime.datetime.now() and\
+               10000 * random.random() < self.need_for_toilet / 100000:
+                self.send_msg('CHAT "You need to use a toilet."')
+                self.last_pee_need_test = datetime.datetime.now()
+        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_: