X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=98d056ac650508b239a284d84ee99cf40dc8b736;hb=a87fff596af07090497fc16c429c4df739f0c3d9;hp=950a777f0bc951defb35f0f32cefe912f1008e25;hpb=9ac7e8befde463275086945c1ed5399bb8ef3af0;p=plomrogue2 diff --git a/plomrogue/things.py b/plomrogue/things.py index 950a777..98d056a 100644 --- a/plomrogue/things.py +++ b/plomrogue/things.py @@ -70,10 +70,11 @@ class Thing(ThingBase): largest_audible_distance = 20 obstacles = [t.position for t in self.game.things if t.blocks_sound] + targets = [t.position for t in self.game.things if t.type_ == 'Player'] sound_blockers = self.game.get_sound_blockers() - dijkstra_map = DijkstraMap(sound_blockers, obstacles, self.game.maps, - self.position, largest_audible_distance, - self.game.get_map) + dijkstra_map = DijkstraMap(targets, sound_blockers, obstacles, + 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()] @@ -432,7 +433,6 @@ class Thing_CookieSpawner(Thing): class ThingAnimate(Thing): - blocks_movement = True def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -625,6 +625,9 @@ class Thing_Player(ThingAnimate): self.game.players_hat_chars[self.name] += c def get_cookie_chars(self): + chars = ' #' # default if self.name in self.game.players_hat_chars: - return self.game.players_hat_chars[self.name] - return ' #' # default + chars = self.game.players_hat_chars[self.name] + chars_split = list(chars) + chars_split.sort() + return ''.join(chars_split)