From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 14 Dec 2020 19:51:20 +0000 (+0100)
Subject: Refactor change recording; don't regen FOV on non-FOV changes.
X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/process?a=commitdiff_plain;h=4a49836086c55c2736bcc7def243f6c4a72ae690;p=plomrogue2
Refactor change recording; don't regen FOV on non-FOV changes.
---
diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index aed5830..3a727ad 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -92,7 +92,7 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id):
map_control = game.get_map(big_yx, 'control')
map_control[little_yx] = control_char
game.changed = True
- game.record_fov_change((big_yx, little_yx))
+ game.record_change((big_yx, little_yx), 'fov')
cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char'
def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
@@ -106,8 +106,7 @@ def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
raise GameError('thing of ID %s not found' % thing_id)
t.protection = protection_char
game.changed = True
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change(t.position)
+ game.record_change(t.position, 'other')
cmd_THING_PROTECTION.argtypes = 'int:pos char'
def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
@@ -135,8 +134,7 @@ def cmd_NICK(game, nick, connection_id):
t.name = nick
game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
game.changed = True
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change(t.position)
+ game.record_change(t.position, 'other')
cmd_NICK.argtypes = 'string'
def cmd_GET_GAMESTATE(game, connection_id):
@@ -183,8 +181,7 @@ def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
if big_yx not in game.annotations:
game.annotations[big_yx] = {}
game.annotations[big_yx][little_yx] = msg
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change([big_yx, little_yx])
+ game.record_change([big_yx, little_yx], 'other')
game.changed = True
cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
@@ -203,8 +200,7 @@ def cmd_PORTAL(game, yx, msg, pw, connection_id):
if big_yx not in game.portals:
game.portals[big_yx] = {}
game.portals[big_yx][little_yx] = msg
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change([big_yx, little_yx])
+ game.record_change([big_yx, little_yx], 'other')
game.changed = True
cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
@@ -268,8 +264,7 @@ def cmd_THING_NAME(game, thing_id, name, pw, connection_id):
else:
t.name = name
game.changed = True
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change(t.position)
+ game.record_change(t.position, 'other')
cmd_THING_NAME.argtypes = 'int:pos string string'
def cmd_GOD_THING_NAME(game, thing_id, name):
@@ -343,8 +338,7 @@ def cmd_PLAYER_FACE(game, face, connection_id):
raise GameError('wrong face string length')
game.faces[t.name] = face
game.changed = True
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change(t.position)
+ game.record_change(t.position, 'other')
cmd_PLAYER_FACE.argtypes = 'string'
def cmd_PLAYER_HAT(game, hat, connection_id):
@@ -363,8 +357,7 @@ def cmd_PLAYER_HAT(game, hat, connection_id):
% (c, legal_chars))
game.hats[t.name] = hat
game.changed = True
- # FIXME: pseudo-FOV-change actually
- game.record_fov_change(t.position)
+ game.record_change(t.position, 'other')
cmd_PLAYER_HAT.argtypes = 'string'
def cmd_GOD_PLAYER_FACE(game, name, face):
diff --git a/plomrogue/game.py b/plomrogue/game.py
index a3a636d..ba7c285 100755
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -118,7 +118,7 @@ class Game(GameBase):
from plomrogue.misc import Terrain
super().__init__(*args, **kwargs)
self.changed = True
- self.changed_tiles = []
+ self.changed_tiles = {'fov': [], 'other': []}
self.io = GameIO(self, save_file)
self.tasks = {}
self.thing_types = {}
@@ -214,7 +214,9 @@ class Game(GameBase):
if t.carrying:
t.uncarry()
self.things.remove(t)
- self.record_fov_change(t.position)
+ self.record_change(t.position, 'other')
+ if t.blocking:
+ self.record_change(t.position, 'fov')
def add_thing(self, type_, position, id_=0):
t_old = None
@@ -225,7 +227,9 @@ class Game(GameBase):
self.things[self.things.index(t_old)] = t
else:
self.things += [t]
- self.record_fov_change(t.position)
+ self.record_change(t.position, 'other')
+ if t.blocking:
+ self.record_change(t.position, 'fov')
return t
def send_gamestate(self, connection_id=None):
@@ -240,14 +244,18 @@ class Game(GameBase):
c_ids = [c_id for c_id in self.sessions]
# Only recalc FOVs for players with ._fov = None
player_fovs = []
- player_fov_ids = []
+ player_ids_send_fov = []
+ player_ids_send_other = []
for c_id in c_ids:
player = self.get_player(c_id)
- if player._fov:
- continue
- player.prepare_multiprocessible_fov_stencil()
- player_fovs += [player._fov]
- player_fov_ids += [player.id_]
+ if not player._fov:
+ player.prepare_multiprocessible_fov_stencil()
+ player_fovs += [player._fov]
+ player_ids_send_fov += [player.id_]
+ if not (player._seen_things
+ and player._seen_annotation_positions
+ and player._seen_portal_positions):
+ player_ids_send_other += [player.id_]
new_fovs = []
single_core_until = 16 # since multiprocess has its own overhead
if len(player_fovs) > single_core_until:
@@ -258,28 +266,23 @@ class Game(GameBase):
elif len(player_fovs) <= single_core_until:
for fov in player_fovs:
new_fovs += [fov.init_terrain()]
- for i in range(len(player_fov_ids)):
- id_ = player_fov_ids[i]
+ for i in range(len(player_ids_send_fov)):
+ id_ = player_ids_send_fov[i]
player = self.get_thing(id_)
player._fov = new_fovs[i]
for c_id in c_ids:
self.io.send('TURN ' + str(self.turn), c_id)
player = self.get_player(c_id)
- if player.id_ in player_fov_ids:
+ self.io.send('PLAYERS_HAT_CHARS ' + quote(player.get_cookie_chars()),
+ c_id)
+ if player.id_ in player_ids_send_fov:
self.io.send('FOV %s' % quote(player.fov_stencil.terrain), c_id)
self.io.send('MAP %s %s %s' % (self.get_map_geometry_shape(),
player.fov_stencil.geometry.size,
quote(player.visible_terrain)), c_id)
self.io.send('MAP_CONTROL %s' % quote(player.visible_control), c_id)
- if player.id_ in player_fov_ids:
- # FIXME: Many of the following updates are triggered by technically
- # inappropriate calls to game.record_fov_change, since they depict
- # states that might change independent of FOV changes. They are
- # collected here as a shortcut, but a cleaner way would be to
- # differentiate the changes somehow.
- self.io.send('PSEUDO_FOV_WIPE', c_id)
- self.io.send('PLAYERS_HAT_CHARS ' + quote(player.get_cookie_chars()),
- c_id)
+ if player.id_ in player_ids_send_other:
+ self.io.send('OTHER_WIPE', c_id)
for t in player.seen_things:
target_yx = player.fov_stencil.target_yx(*t.position)
self.io.send('THING %s %s %s %s %s %s'
@@ -306,25 +309,23 @@ class Game(GameBase):
# send this last so all carryable things are already created
self.io.send('THING_CARRYING %s %s' % (t.id_, t.carrying.id_),
c_id)
- for big_yx in self.portals:
- for little_yx in [little_yx for little_yx in self.portals[big_yx]
- if player.fov_test(big_yx, little_yx)]:
- target_yx = player.fov_stencil.target_yx(big_yx, little_yx)
- portal = self.portals[big_yx][little_yx]
- self.io.send('PORTAL %s %s' % (target_yx, quote(portal)), c_id)
- for big_yx in self.annotations:
- for little_yx in [little_yx for little_yx in self.annotations[big_yx]
- if player.fov_test(big_yx, little_yx)]:
- target_yx = player.fov_stencil.target_yx(big_yx, little_yx)
- annotation = self.annotations[big_yx][little_yx]
- self.io.send('ANNOTATION %s %s' % (target_yx,
- quote(annotation)), c_id)
+ for position in player.seen_portal_positions:
+ target_yx = player.fov_stencil.target_yx(position[0],
+ position[1])
+ portal = self.portals[position[0]][position[1]]
+ self.io.send('PORTAL %s %s' % (target_yx, quote(portal)), c_id)
+ for position in player.seen_annotation_positions:
+ target_yx = player.fov_stencil.target_yx(position[0],
+ position[1])
+ annotation = self.annotations[position[0]][position[1]]
+ self.io.send('ANNOTATION %s %s' % (target_yx,
+ quote(annotation)), c_id)
self.io.send('GAME_STATE_COMPLETE', c_id)
- def record_fov_change(self, position):
+ def record_change(self, position, type_):
big_yx, little_yx = position
- self.changed_tiles += [self.map_geometry.undouble_yxyx(big_yx,
- little_yx)]
+ self.changed_tiles[type_] += [self.map_geometry.undouble_yxyx(big_yx,
+ little_yx)]
self.changed = True
def run_tick(self):
@@ -362,7 +363,10 @@ class Game(GameBase):
# re-calculating players' FOVs, so don't send it out too often
if self.last_send_gamestate < \
datetime.datetime.now() -self.send_gamestate_interval:
- if len(self.changed_tiles) > 0:
+ n_changes = 0
+ for type_ in self.changed_tiles:
+ n_changes += len(self.changed_tiles[type_])
+ if n_changes > 0:
for t in [t for t in self.things if t.type_ == 'Player']:
fov_radius = 12 # TODO: un-hardcode
absolute_position =\
@@ -373,18 +377,19 @@ class Game(GameBase):
x_range_start = absolute_position.x - fov_radius
x_range_end = absolute_position.x + fov_radius
# TODO: refactor with SourcedMap.inside?
- for position in self.changed_tiles:
- if position.y < y_range_start\
- or position.y > y_range_end:
- continue
- if position.x < x_range_start\
- or position.x > x_range_end:
- continue
- t.invalidate_map_view()
- break
+ for type_ in self.changed_tiles:
+ for position in self.changed_tiles[type_]:
+ if position.y < y_range_start\
+ or position.y > y_range_end:
+ continue
+ if position.x < x_range_start\
+ or position.x > x_range_end:
+ continue
+ t.invalidate(type_)
+ break
self.send_gamestate()
self.changed = False
- self.changed_tiles = []
+ self.changed_tiles = {'fov': [], 'other': []}
self.save()
self.last_send_gamestate = datetime.datetime.now()
diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 5376634..8af4bb9 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -42,9 +42,13 @@ class Task_MOVE(Task):
raise PlayError('blocked by impassable tile')
def do(self):
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
+ if self.thing.blocking:
+ self.thing.game.record_change(self.thing.position, 'fov')
self.thing.position = self._get_move_target()
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
+ if self.thing.blocking:
+ self.thing.game.record_change(self.thing.position, 'fov')
if self.thing.carrying:
self.thing.carrying.position = self.thing.position
@@ -62,7 +66,7 @@ class Task_WRITE(Task):
big_yx = self.thing.position[0]
little_yx = self.thing.position[1]
self.thing.game.maps[big_yx][little_yx] = self.args[0]
- self.thing.game.record_fov_change((big_yx, little_yx))
+ self.thing.game.record_change((big_yx, little_yx), 'fov')
@@ -79,7 +83,7 @@ class Task_FLATTEN_SURROUNDINGS(Task):
if not self.thing.game.can_do_tile_with_pw(*yxyx, self.args[0]):
continue
self.thing.game.maps[yxyx[0]][yxyx[1]] = self.thing.game.get_flatland()
- self.thing.game.record_fov_change(yxyx)
+ self.thing.game.record_change(yxyx, 'fov')
@@ -111,8 +115,7 @@ class Task_PICK_UP(Task):
to_pick_up.position = self.thing.position[:]
self.thing.carrying = to_pick_up
to_pick_up.carried = True
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
@@ -155,8 +158,7 @@ class Task_DROP(Task):
and t.position == dropped.position]:
t.accept(dropped)
break
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
@@ -171,7 +173,8 @@ class Task_DOOR(Task):
t.open()
else:
t.close()
- self.thing.game.record_fov_change(t.position)
+ self.thing.game.record_change(t.position, 'other')
+ self.thing.game.record_change(t.position, 'fov')
@@ -193,8 +196,8 @@ class Task_INTOXICATE(Task):
self.thing.send_msg('RANDOM_COLORS')
self.thing.send_msg('CHAT "You are drunk now."')
self.thing.drunk = 10000
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.invalidate('fov')
+ self.thing.game.record_change(self.thing.position, 'other')
elif self.thing.carrying.type_ == 'Cookie':
self.thing.send_msg('CHAT ' + quote('You eat a cookie and gain the ability to draw the following character: "%s"' % self.thing.carrying.thing_char))
self.thing.add_cookie_char(self.thing.carrying.thing_char)
@@ -248,8 +251,7 @@ class Task_INSTALL(Task):
else:
self._get_uninstallables()[0].uninstall()
self.thing.send_msg('CHAT "You uninstall the thing here."')
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
@@ -287,8 +289,7 @@ class Task_WEAR(Task):
self.thing.send_msg('CHAT "You put on a hat."')
dropped = self.thing.uncarry()
self.thing.game.remove_thing(dropped)
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 5948cb6..df5ea58 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -246,8 +246,7 @@ 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.position)
+ self.game.record_change(self.position, 'other')
@@ -412,13 +411,19 @@ class ThingAnimate(Thing):
super().__init__(*args, **kwargs)
self.next_task = [None]
self.task = None
- self.invalidate_map_view()
-
- def invalidate_map_view(self):
- self._fov = None
- self._visible_terrain = None
- self._visible_control = None
- self._seen_things = None
+ self.invalidate('fov')
+ self.invalidate('other') # currently redundant though
+
+ def invalidate(self, type_):
+ if type_ == 'fov':
+ self._fov = None
+ self._visible_terrain = None
+ self._visible_control = None
+ self.invalidate('other')
+ elif type_ == 'other':
+ self._seen_things = None
+ self._seen_annotation_positions = None
+ self._seen_portal_positions = None
def set_next_task(self, task_name, args=()):
task_class = self.game.tasks[task_name]
@@ -439,9 +444,7 @@ 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()
- # FIXME: pseudo-FOV-change actually
- self.game.record_fov_change(self.position)
+ self.invalidate('fov')
break
self.game.changed = True
if self.task is None:
@@ -521,6 +524,31 @@ class ThingAnimate(Thing):
if self.fov_test(*t.position)]
return self._seen_things
+ @property
+ def seen_annotation_positions(self):
+ if self._seen_annotation_positions is not None:
+ return self._seen_annotation_positions
+ self._seen_annotation_positions = []
+ for big_yx in self.game.annotations:
+ for little_yx in [little_yx for little_yx
+ in self.game.annotations[big_yx]
+ if self.fov_test(big_yx, little_yx)]:
+ self._seen_annotation_positions += [(big_yx, little_yx)]
+ return self._seen_annotation_positions
+
+ @property
+ def seen_portal_positions(self):
+ if self._seen_portal_positions is not None:
+ return self._seen_portal_positions
+ self._seen_portal_positions = []
+ for big_yx in self.game.portals:
+ for little_yx in [little_yx for little_yx
+ in self.game.portals[big_yx]
+ if self.fov_test(big_yx, little_yx)]:
+ self._seen_portal_positions += [(big_yx, little_yx)]
+ return self._seen_portal_positions
+
+
class Thing_Player(ThingAnimate):
symbol_hint = '@'
diff --git a/rogue_chat.html b/rogue_chat.html
index 5003854..3f28157 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -484,7 +484,7 @@ let server = {
if (tokens[0] === 'TURN') {
game.turn_complete = false;
game.turn = parseInt(tokens[1]);
- } else if (tokens[0] === 'PSEUDO_FOV_WIPE') {
+ } else if (tokens[0] === 'OTHER_WIPE') {
game.portals_new = {};
explorer.annotations_new = {};
game.things_new = [];
diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index c6113df..8f4f7da 100755
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -178,11 +178,11 @@ def cmd_TURN(game, n):
game.turn_complete = False
cmd_TURN.argtypes = 'int:nonneg'
-def cmd_PSEUDO_FOV_WIPE(game):
+def cmd_OTHER_WIPE(game):
game.portals_new = {}
game.annotations_new = {}
game.things_new = []
-cmd_PSEUDO_FOV_WIPE.argtypes = ''
+cmd_OTHER_WIPE.argtypes = ''
def cmd_LOGIN_OK(game):
game.tui.switch_mode('post_login_wait')
@@ -377,7 +377,7 @@ class Game(GameBase):
self.register_command(cmd_REPLY)
self.register_command(cmd_PLAYER_ID)
self.register_command(cmd_TURN)
- self.register_command(cmd_PSEUDO_FOV_WIPE)
+ self.register_command(cmd_OTHER_WIPE)
self.register_command(cmd_THING)
self.register_command(cmd_THING_TYPE)
self.register_command(cmd_THING_NAME)