From fbce872bf4a04ac7be7d965061dabe441258999c Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Fri, 11 Dec 2020 02:51:24 +0100 Subject: [PATCH] Send THING_CARRYING only after all things have been set up. --- plomrogue/game.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plomrogue/game.py b/plomrogue/game.py index d390e94..d5f8430 100755 --- a/plomrogue/game.py +++ b/plomrogue/game.py @@ -269,7 +269,9 @@ class Game(GameBase): player.fov_stencil.geometry.size, quote(player.visible_terrain)), c_id) self.io.send('MAP_CONTROL %s' % quote(player.visible_control), c_id) - for t in [t for t in self.things if player.fov_test(*t.position)]: + seen_things = [t for t in self.things + if player.fov_test(*t.position)] + for t in seen_things: target_yx = player.fov_stencil.target_yx(*t.position) self.io.send('THING %s %s %s %s %s %s' % (target_yx, t.type_, quote(t.protection), t.id_, @@ -286,14 +288,15 @@ class Game(GameBase): if hasattr(t, 'thing_char'): self.io.send('THING_CHAR %s %s' % (t.id_, quote(t.thing_char)), c_id) - if hasattr(t, 'carrying') and t.carrying: - self.io.send('THING_CARRYING %s %s' % (t.id_, t.carrying.id_), - c_id) if hasattr(t, 'installable') and not t.portable: self.io.send('THING_INSTALLED %s' % (t.id_), c_id) if hasattr(t, 'design'): self.io.send('THING_HAT %s %s' % (t.id_, quote(t.design)), c_id) + for t in [t for t in seen_things if t.carrying]: + # 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)]: -- 2.30.2