Don't obfuscate sounded URLs.

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 7234d8ea395e05ab017fa55796bc32df1f21d94c..ab54e306c2a86215565159a10ddda45e57e0e4a7 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -41,21 +41,29 @@ class Thing(ThingBase):
 
     def sound(self, name, msg):
         from plomrogue.mapping import DijkstraMap
 
     def sound(self, name, msg):
         from plomrogue.mapping import DijkstraMap

+        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 = ''
             import random
             factor = largest_audible_distance / 4
             lowered_msg = ''

+            in_url = False
+            i = 0

             for c in msg:
                 c = c
             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
                 lowered_msg += c

+                i += 1

             return lowered_msg
 
         largest_audible_distance = 20
             return lowered_msg
 
         largest_audible_distance = 20


@@ -63,6 +71,9 @@ class Thing(ThingBase):
         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)
         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)

+        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)
         for c_id in self.game.sessions:
             listener = self.game.get_player(c_id)
             target_yx = dijkstra_map.target_yx(*listener.position, True)


@@ -73,7 +84,8 @@ class Thing(ThingBase):
                 continue
             volume = 1 / max(1, listener_distance)
             lowered_msg = lower_msg_by_volume(msg, volume,
                 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)
             self.game.io.send('CHAT ' +
             lowered_nick = lower_msg_by_volume(name, volume,
                                                largest_audible_distance)
             self.game.io.send('CHAT ' +