Enable un-naming of things.

[plomrogue2] / plomrogue / things.py

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 7234d8ea395e05ab017fa55796bc32df1f21d94c..8885aa0820fc2de63ab17e2ff0ae8cfa1ea42e7c 100644 (file)
--- 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,13 +85,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)
 
 
@@ -98,7 +116,7 @@ class ThingSpawner(Thing):
                   if t != self and t.position == self.position]:
             return
         self.game.add_thing(self.child_type, self.position)
-        self.game.changed = True
+        # self.game.changed = True  handled by add_thing
 
 
 
@@ -188,6 +206,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)
 
 
 
@@ -203,6 +244,8 @@ class Thing_HatRemixer(Thing):
         hat.design = new_design
         self.sound('HAT REMIXER', 'remixing a hat …')
         self.game.changed = True
+        # FIXME: pseudo-FOV-change actually
+        self.game.record_fov_change(self.thing.position)
 
 
 
@@ -328,7 +371,7 @@ class Thing_BottleDeposit(Thing):
             elif choice == 'Hat':
                 msg += 'pick it up and then use "(un-)wear" on it!'
             self.sound('BOTTLE DEPOSITOR', msg)
-            self.game.changed = True
+            # self.game.changed = True  done by game.add_thing
 
     def accept(self):
         self.bottle_counter += 1
@@ -353,6 +396,7 @@ class ThingAnimate(Thing):
         self._fov = None
         self._visible_terrain = None
         self._visible_control = None
+        self._seen_things = None
 
     def set_next_task(self, task_name, args=()):
         task_class = self.game.tasks[task_name]
@@ -373,7 +417,9 @@ class ThingAnimate(Thing):
                     # 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_map_view()
+                    #self.invalidate_map_view()
+                    # FIXME: pseudo-FOV-change actually
+                    self.game.record_fov_change(self.thing.position)
                     break
             self.game.changed = True
         if self.task is None:
@@ -444,6 +490,13 @@ class ThingAnimate(Thing):
         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
 
 
 class Thing_Player(ThingAnimate):