From e9bd2eb5770a2ca1f4c7c5728540fb7480ad7347 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Thu, 12 Nov 2020 11:18:04 +0100 Subject: [PATCH] Improve volume logic, display. --- plomrogue/commands.py | 14 +++++++++++--- plomrogue/mapping.py | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/plomrogue/commands.py b/plomrogue/commands.py index a3d1f4c..ccc09c0 100644 --- a/plomrogue/commands.py +++ b/plomrogue/commands.py @@ -18,10 +18,18 @@ def cmd_ALL(game, msg, connection_id): listener = game.get_thing(game.sessions[c_id], create_unfound=False) d_y = abs(speaker.position.y - listener.position.y) d_x = abs(speaker.position.x - listener.position.x) - d = math.sqrt(d_y ** 2 + d_x ** 2) - distance = '(close)' if d < 3 else '(distant)' + distance = math.sqrt(d_y ** 2 + d_x ** 2) + fov_overlap = 1 + if listener.fov_stencil[speaker.position] != '.': + fov_overlap_tiles = 0 + for i in range(speaker.fov_stencil.size_i): + if speaker.fov_stencil.terrain[i] == '.' and\ + listener.fov_stencil.terrain[i] == '.': + fov_overlap_tiles += 1 + fov_overlap = fov_overlap_tiles / speaker.fov_stencil.size_i + volume = fov_overlap / max(1, distance) game.io.send('CHAT ' + - quote('%s %s: %s' % (distance, speaker.nickname, msg)), + quote('(volume: %.3f) %s: %s' % (volume, speaker.nickname, msg)), c_id) cmd_ALL.argtypes = 'string' diff --git a/plomrogue/mapping.py b/plomrogue/mapping.py index 4f2f5f9..10f9b70 100644 --- a/plomrogue/mapping.py +++ b/plomrogue/mapping.py @@ -149,7 +149,7 @@ class FovMap(Map): def __init__(self, source_map, center): self.source_map = source_map self.size = self.source_map.size - self.fov_radius = (self.size.y / 2) - 0.5 + self.fov_radius = 12 # (self.size.y / 2) - 0.5 self.start_indented = True #source_map.start_indented self.terrain = '?' * self.size_i self.center = center -- 2.30.2