X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fgame.py;h=d390e94d95e87a23c4cdddbeffb79119849d605f;hb=0f7053c69a136af83d0517aa1241caa5b9c0268c;hp=a57a507cfc0a1f1d98d677068f60b3fc6772f3bd;hpb=028871514fd40755055facc5883a4f8076dcebad;p=plomrogue2 diff --git a/plomrogue/game.py b/plomrogue/game.py index a57a507..d390e94 100755 --- a/plomrogue/game.py +++ b/plomrogue/game.py @@ -213,6 +213,8 @@ class Game(GameBase): return None def remove_thing(self, t): + if t.carrying: + t.uncarry() self.things.remove(t) self.record_fov_change(t.position) @@ -247,7 +249,7 @@ class Game(GameBase): player_fovs += [player._fov] player_fov_ids += [player.id_] new_fovs = [] - single_core_until = 8 # since multiprocess has its own overhead + single_core_until = 16 # since multiprocess has its own overhead if len(player_fovs) > single_core_until: pool = multiprocessing.Pool() new_fovs = pool.map(FovMap.init_terrain, [fov for fov in player_fovs]) @@ -289,6 +291,9 @@ class Game(GameBase): 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 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)]: @@ -354,6 +359,7 @@ class Game(GameBase): y_range_end = absolute_position.y + fov_radius 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: