X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=9bf03b2f0d881364c56a32999d6a16c8fe1b13c4;hb=017484da7f2648254dda67a30a64ddd699dc0efc;hp=7234d8ea395e05ab017fa55796bc32df1f21d94c;hpb=52b01fc00d6ea2c053f9022981498b97ebd05839;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 7234d8e..9bf03b2 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -7,6 +7,7 @@ import random
 
 class ThingBase:
     type_ = '?'
+    carrying = False
 
     def __init__(self, game, id_=0, position=(YX(0, 0), YX(0, 0))):
         self.game = game
@@ -41,21 +42,29 @@ class Thing(ThingBase):
 
     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 = ''
+            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
@@ -63,6 +72,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)
+        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)
@@ -73,7 +85,8 @@ 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)
             self.game.io.send('CHAT ' +
@@ -188,6 +201,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)