X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=950a777f0bc951defb35f0f32cefe912f1008e25;hb=9ac7e8befde463275086945c1ed5399bb8ef3af0;hp=09dc4b678a066ba83f475250a8f205ac7ab4ec90;hpb=faf760cf585b035e207e5bc80ec4fce720685c23;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 09dc4b6..950a777 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -1,5 +1,5 @@
 from plomrogue.errors import GameError, PlayError
-from plomrogue.mapping import YX
+from plomrogue.mapping import YX, FovMap
 from plomrogue.misc import quote
 import random
 
@@ -92,7 +92,17 @@ class Thing(ThingBase):
             lowered_nick = lower_msg_by_volume(name, volume,
                                                largest_audible_distance)
             symbol = ''
-            if listener.fov_test(self.position[0], self.position[1]):
+            # if listener.fov_test(self.position[0], self.position[1]):
+            # TODO: We might want to only show chat faces of players that are
+            # in the listener's FOV.  However, if we do a fov_test here,
+            # this might set up a listener._fov where previously there was None,
+            # with ._fov = None serving to Game.send_gamestate() as an indicator
+            # that map view data for listener might be subject to change and
+            # therefore needs to be re-sent.  If we generate an un-set ._fov
+            # here, this inhibits send_gamestate() from sending new map view
+            # data to listener.  We need to re-structure this whole process
+            # if we want to use a FOV test on listener here.
+            if listener_distance < largest_audible_distance / 2:
                 self.game.io.send('CHATFACE %s' % self.id_, c_id)
                 if self.type_ == 'Player' and hasattr(self, 'thing_char'):
                     symbol = '/@' + self.thing_char
@@ -200,12 +210,11 @@ class Thing_Bottle(Thing):
         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()
         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 = FovMap(light_blockers, obstacles, self.game.maps,
+                     self.position, fov_radius, self.game.get_map)
         fov.init_terrain()
         visible_players = []
         for p in all_players:
@@ -470,12 +479,11 @@ class ThingAnimate(Thing):
             self.task = self.get_next_task()
 
     def prepare_multiprocessible_fov_stencil(self):
-        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()
         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)
+        self._fov = FovMap(light_blockers, obstacles, self.game.maps,
+                           self.position, fov_radius, self.game.get_map)
 
     def multiprocessible_fov_stencil(self):
         self._fov.init_terrain()
@@ -490,9 +498,6 @@ class ThingAnimate(Thing):
         self.multiprocessible_fov_stencil()
         return self._fov
 
-    def fov_stencil_make(self):
-        self._fov.make()
-
     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):
@@ -564,6 +569,7 @@ class Thing_Player(ThingAnimate):
     drunk = 0
     tripping = 0
     need_for_toilet = 0
+    standing = True
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -584,13 +590,14 @@ class Thing_Player(ThingAnimate):
                     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 use a toilet."')
+                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
-            self.need_for_toilet *= 2
-            self.need_for_toilet += 1
         if self.tripping == 0:
             self.send_msg('DEFAULT_COLORS')
             self.send_msg('CHAT "You sober up."')