X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=ea0e71ccb912aee1ce9ae60ea34a6b23a4dd44fa;hb=eadcddf7699d5df683d544531b441332d79b6661;hp=4f802db6e25a9f340a9da02074b219d80502b0ab;hpb=497f9b478cdaf0ad1825d95d612caab33ba7c403;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 4f802db..ea0e71c 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -1,5 +1,6 @@
from plomrogue.errors import GameError, PlayError
from plomrogue.mapping import YX
+from plomrogue.misc import quote
import random
@@ -23,6 +24,7 @@ class Thing(ThingBase):
protection = '.'
commandable = False
carried = False
+ carrying = False
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -40,22 +42,29 @@ 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
@@ -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 ' +
@@ -151,11 +164,32 @@ 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
+ fov = fov_map_class(self.game.things, 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):