X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=0dced0da0a612b1c10248c3ba8f9eef52e057a72;hb=cd0fee3d91d70525d7d4f434985abad6ea73faf0;hp=116ad696338ffea4fae46fc579426f8e6489048f;hpb=04230c463dc78b92adfe0f1a432117e349aa771e;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 116ad69..0dced0d 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -1,11 +1,13 @@
 from plomrogue.errors import GameError, PlayError
 from plomrogue.mapping import YX
+from plomrogue.misc import quote
 import random
 
 
 
 class ThingBase:
     type_ = '?'
+    carrying = False
 
     def __init__(self, game, id_=0, position=(YX(0, 0), YX(0, 0))):
         self.game = game
@@ -18,10 +20,13 @@ class ThingBase:
 
 
 class Thing(ThingBase):
-    blocking = False
+    blocks_movement = False
+    blocks_sound = False
+    blocks_light = False
     portable = False
     protection = '.'
     commandable = False
+    carried = False
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -39,29 +44,40 @@ class Thing(ThingBase):
 
     def sound(self, name, msg):
         from plomrogue.mapping import DijkstraMap
-        from plomrogue.misc import quote
+        import re
 
-        def lower_msg_by_volume(msg, volume, largest_audible_distance):
+        def lower_msg_by_volume(msg, volume, largest_audible_distance,
+                                url_limits = []):
             import random
             factor = largest_audible_distance / 4
             lowered_msg = ''
+            in_url = False
+            i = 0
             for c in msg:
                 c = c
-                while random.random() > volume * factor:
-                    if c.isupper():
-                        c = c.lower()
-                    elif c != '.' and c != ' ':
-                        c = '.'
-                    else:
-                        c = ' '
+                if i in url_limits:
+                    in_url = False if in_url else True
+                if not in_url:
+                    while random.random() > volume * factor:
+                        if c.isupper():
+                            c = c.lower()
+                        elif c != '.' and c != ' ':
+                            c = '.'
+                        else:
+                            c = ' '
                 lowered_msg += c
+                i += 1
             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']
-        dijkstra_map = DijkstraMap(things, self.game.maps, self.position,
-                                   largest_audible_distance, self.game.get_map)
+        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, 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()]
         for c_id in self.game.sessions:
             listener = self.game.get_player(c_id)
             target_yx = dijkstra_map.target_yx(*listener.position, True)
@@ -72,13 +88,19 @@ class Thing(ThingBase):
                 continue
             volume = 1 / max(1, listener_distance)
             lowered_msg = lower_msg_by_volume(msg, volume,
-                                              largest_audible_distance)
+                                              largest_audible_distance,
+                                              url_limits)
             lowered_nick = lower_msg_by_volume(name, volume,
                                                largest_audible_distance)
+            symbol = ''
+            if listener.fov_test(self.position[0], self.position[1]):
+                self.game.io.send('CHATFACE %s' % self.id_, c_id)
+                if self.type_ == 'Player' and hasattr(self, 'thing_char'):
+                    symbol = '/@' + self.thing_char
             self.game.io.send('CHAT ' +
-                              quote('(volume: %.2f) %s: %s' % (volume,
-                                                               lowered_nick,
-                                                               lowered_msg)),
+                              quote('vol:%.f%s %s%s: %s' % (volume * 100, '%',
+                                                            lowered_nick, symbol,
+                                                            lowered_msg)),
                               c_id)
 
 
@@ -96,10 +118,7 @@ class ThingSpawner(Thing):
         for t in [t for t in self.game.things
                   if t != self and t.position == self.position]:
             return
-        t = self.game.thing_types[self.child_type](self.game,
-                                                   position=self.position)
-        self.game.things += [t]
-        self.game.changed = True
+        self.game.add_thing(self.child_type, self.position)
 
 
 
@@ -127,16 +146,20 @@ class Thing_DoorSpawner(ThingSpawner):
 
 class Thing_Door(Thing):
     symbol_hint = 'D'
-    blocking = False
+    blocks_movement = False
     portable = True
     installable = True
 
     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):
@@ -152,11 +175,34 @@ class Thing_Bottle(Thing):
     portable = True
     full = True
     thing_char = '~'
+    spinnable = True
 
     def empty(self):
         self.thing_char = '_'
         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()
+        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 = []
+        for p in all_players:
+            test_position = fov.target_yx(p.position[0], p.position[1])
+            if fov.inside(test_position) and fov[test_position] == '.':
+                visible_players += [p]
+        if len(visible_players) == 0:
+            self.sound('BOTTLE', 'no visible players in spin range')
+        pick = random.choice(visible_players)
+        self.sound('BOTTLE', 'BOTTLE picks: ' + pick.name)
+
 
 
 class Thing_BottleSpawner(ThingSpawner):
@@ -168,6 +214,29 @@ class Thing_Hat(Thing):
     symbol_hint = 'H'
     portable = True
     design = ' +--+ ' + ' |  | ' + '======'
+    spinnable = True
+
+    def spin(self):
+        new_design = ''
+        new_design += self.design[12]
+        new_design += self.design[13]
+        new_design += self.design[6]
+        new_design += self.design[7]
+        new_design += self.design[0]
+        new_design += self.design[1]
+        new_design += self.design[14]
+        new_design += self.design[15]
+        new_design += self.design[8]
+        new_design += self.design[9]
+        new_design += self.design[2]
+        new_design += self.design[3]
+        new_design += self.design[16]
+        new_design += self.design[17]
+        new_design += self.design[10]
+        new_design += self.design[11]
+        new_design += self.design[4]
+        new_design += self.design[5]
+        self.design = ''.join(new_design)
 
 
 
@@ -183,6 +252,7 @@ class Thing_HatRemixer(Thing):
         hat.design = new_design
         self.sound('HAT REMIXER', 'remixing a hat …')
         self.game.changed = True
+        self.game.record_change(self.position, 'other')
 
 
 
@@ -255,6 +325,7 @@ class Thing_MusicPlayer(Thing):
             self.playlist_index -= 1
             if self.playlist_index < -1:
                 self.playlist_index = -1
+            self.game.changed = True
             return ['removed song']
         elif command == 'REWIND':
             self.playlist_index = -1
@@ -300,15 +371,13 @@ class Thing_BottleDeposit(Thing):
         if self.bottle_counter >= 3:
             self.bottle_counter = 0
             choice = random.choice(['MusicPlayer', 'Hat'])
-            t = self.game.thing_types[choice](self.game, position=self.position)
-            self.game.things += [t]
+            self.game.add_thing(choice, self.position)
             msg = 'here is a gift as a reward for ecological consciousness –'
             if choice == 'MusicPlayer':
                 msg += 'pick it up and then use "command thing" on it!'
             elif choice == 'Hat':
                 msg += 'pick it up and then use "(un-)wear" on it!'
             self.sound('BOTTLE DEPOSITOR', msg)
-            self.game.changed = True
 
     def accept(self):
         self.bottle_counter += 1
@@ -318,16 +387,48 @@ class Thing_BottleDeposit(Thing):
 
 
 
+class Thing_Cookie(Thing):
+    symbol_hint = 'c'
+    portable = True
+
+    def __init__(self, *args, **kwargs):
+        import string
+        super().__init__(*args, **kwargs)
+        legal_chars = string.ascii_letters + string.digits + string.punctuation + ' '
+        self.thing_char = random.choice(list(legal_chars))
+
+
+
+class Thing_CookieSpawner(Thing):
+    symbol_hint = 'O'
+
+    def accept(self, thing):
+        self.sound('OVEN', '*heat* *brrzt* here\'s a cookie!')
+        self.game.add_thing('Cookie', self.position)
+
+
 
 class ThingAnimate(Thing):
-    blocking = True
+    blocks_movement = True
     drunk = 0
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.next_task = [None]
         self.task = None
-        self._fov = None
+        self.invalidate('fov')
+        self.invalidate('other')  # currently redundant though
+
+    def invalidate(self, type_):
+        if type_ == 'fov':
+            self._fov = None
+            self._visible_terrain = None
+            self._visible_control = None
+            self.invalidate('other')
+        elif type_ == 'other':
+            self._seen_things = None
+            self._seen_annotation_positions = None
+            self._seen_portal_positions = None
 
     def set_next_task(self, task_name, args=()):
         task_class = self.game.tasks[task_name]
@@ -345,11 +446,12 @@ class ThingAnimate(Thing):
         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
-        self._fov = None
         if self.task is None:
             self.task = self.get_next_task()
             return
@@ -367,7 +469,9 @@ class ThingAnimate(Thing):
     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
-        self._fov = fov_map_class(self.game.things, self.game.maps,
+        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)
 
     def multiprocessible_fov_stencil(self):
@@ -393,7 +497,7 @@ class ThingAnimate(Thing):
                 return True
         return False
 
-    def fov_stencil_map(self, map_type='normal'):
+    def fov_stencil_map(self, map_type):
         visible_terrain = ''
         for yx in self.fov_stencil:
             if self.fov_stencil[yx] == '.':
@@ -404,6 +508,52 @@ class ThingAnimate(Thing):
                 visible_terrain += ' '
         return visible_terrain
 
+    @property
+    def visible_terrain(self):
+        if self._visible_terrain:
+            return self._visible_terrain
+        self._visible_terrain = self.fov_stencil_map('normal')
+        return self._visible_terrain
+
+    @property
+    def visible_control(self):
+        if self._visible_control:
+            return self._visible_control
+        self._visible_control = self.fov_stencil_map('control')
+        return self._visible_control
+
+    @property
+    def seen_things(self):
+        if self._seen_things is not None:
+            return self._seen_things
+        self._seen_things = [t for t in self.game.things
+                             if self.fov_test(*t.position)]
+        return self._seen_things
+
+    @property
+    def seen_annotation_positions(self):
+        if self._seen_annotation_positions is not None:
+            return self._seen_annotation_positions
+        self._seen_annotation_positions = []
+        for big_yx in self.game.annotations:
+            for little_yx in [little_yx for little_yx
+                              in self.game.annotations[big_yx]
+                              if self.fov_test(big_yx, little_yx)]:
+                self._seen_annotation_positions += [(big_yx, little_yx)]
+        return self._seen_annotation_positions
+
+    @property
+    def seen_portal_positions(self):
+        if self._seen_portal_positions is not None:
+            return self._seen_portal_positions
+        self._seen_portal_positions = []
+        for big_yx in self.game.portals:
+            for little_yx in [little_yx for little_yx
+                              in self.game.portals[big_yx]
+                              if self.fov_test(big_yx, little_yx)]:
+                self._seen_portal_positions += [(big_yx, little_yx)]
+        return self._seen_portal_positions
+
 
 
 class Thing_Player(ThingAnimate):
@@ -418,3 +568,20 @@ class Thing_Player(ThingAnimate):
             if self.game.sessions[c_id]['thing_id'] == self.id_:
                 self.game.io.send(msg, c_id)
                 break
+
+    def uncarry(self):
+        t = self.carrying
+        t.carried = False
+        self.carrying = None
+        return t
+
+    def add_cookie_char(self, c):
+        if not self.name in self.game.players_hat_chars:
+            self.game.players_hat_chars[self.name] = ' #'  # default
+        if not c in self.game.players_hat_chars[self.name]:
+            self.game.players_hat_chars[self.name] += c
+
+    def get_cookie_chars(self):
+        if self.name in self.game.players_hat_chars:
+            return self.game.players_hat_chars[self.name]
+        return ' #'  # default