X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=c8ef346b13a05e831d092f9430d9a93c49a8473e;hb=dfb05774efac717d1adc699e97b6140599e5df1e;hp=666a14d6f2301dc9e901d67ceeef4874f87eeb17;hpb=3e0f898a8bc308e6b7d06573a90c197eff8d82f3;p=plomrogue2 diff --git a/plomrogue/things.py b/plomrogue/things.py index 666a14d..c8ef346 100644 --- a/plomrogue/things.py +++ b/plomrogue/things.py @@ -1,5 +1,5 @@ from plomrogue.errors import GameError, PlayError -from plomrogue.mapping import YX +from plomrogue.mapping import YX, FovMap from plomrogue.misc import quote import random @@ -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()] @@ -92,7 +93,17 @@ class Thing(ThingBase): lowered_nick = lower_msg_by_volume(name, volume, largest_audible_distance) symbol = '' - if listener.fov_test(self.position[0], self.position[1]): + # if listener.fov_test(self.position[0], self.position[1]): + # TODO: We might want to only show chat faces of players that are + # in the listener's FOV. However, if we do a fov_test here, + # this might set up a listener._fov where previously there was None, + # with ._fov = None serving to Game.send_gamestate() as an indicator + # that map view data for listener might be subject to change and + # therefore needs to be re-sent. If we generate an un-set ._fov + # here, this inhibits send_gamestate() from sending new map view + # data to listener. We need to re-structure this whole process + # if we want to use a FOV test on listener here. + if listener_distance < largest_audible_distance / 2: self.game.io.send('CHATFACE %s' % self.id_, c_id) if self.type_ == 'Player' and hasattr(self, 'thing_char'): symbol = '/@' + self.thing_char @@ -116,8 +127,8 @@ class ThingSpawner(Thing): def proceed(self): for t in [t for t in self.game.things if t != self and t.position == self.position]: - return - self.game.add_thing(self.child_type, self.position) + return None + return self.game.add_thing(self.child_type, self.position) @@ -153,16 +164,31 @@ class ThingInstallable(Thing): class Thing_DoorSpawner(ThingSpawner): child_type = 'Door' + def proceed(self): + door = super().proceed() + if door: + key = self.game.add_thing('DoorKey', self.position) + key.door = door + + + +class Thing_DoorKey(Thing): + portable = True + symbol_hint = 'k' + + class Thing_Door(ThingInstallable): symbol_hint = 'D' blocks_movement = False + locked = False def open(self): self.blocks_movement = False self.blocks_light = False self.blocks_sound = False + self.locked = False del self.thing_char def close(self): @@ -171,6 +197,10 @@ class Thing_Door(ThingInstallable): self.blocks_sound = True self.thing_char = '#' + def lock(self): + self.locked = True + self.thing_char = 'L' + class Thing_Psychedelic(Thing): @@ -200,12 +230,11 @@ class Thing_Bottle(Thing): all_players = [t for t in self.game.things if t.type_ == 'Player'] # TODO: refactor with ThingPlayer.prepare_multiprocessible_fov_stencil # and ThingPlayer.fov_test - fov_map_class = self.game.map_geometry.fov_map_class fov_radius = 12 light_blockers = self.game.get_light_blockers() obstacles = [t.position for t in self.game.things if t.blocks_light] - fov = fov_map_class(light_blockers, obstacles, self.game.maps, - self.position, fov_radius, self.game.get_map) + fov = FovMap(light_blockers, obstacles, self.game.maps, + self.position, fov_radius, self.game.get_map) fov.init_terrain() visible_players = [] for p in all_players: @@ -423,7 +452,7 @@ class Thing_CookieSpawner(Thing): class ThingAnimate(Thing): - blocks_movement = True + weariness = 0 def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -452,6 +481,7 @@ class ThingAnimate(Thing): task = self.next_task[0] self.next_task = [None] task.check() + task.todo += self.weariness * 10 return task def proceed(self): @@ -470,12 +500,11 @@ class ThingAnimate(Thing): self.task = self.get_next_task() def prepare_multiprocessible_fov_stencil(self): - fov_map_class = self.game.map_geometry.fov_map_class fov_radius = 3 if self.drunk > 0 else 12 light_blockers = self.game.get_light_blockers() obstacles = [t.position for t in self.game.things if t.blocks_light] - self._fov = fov_map_class(light_blockers, obstacles, self.game.maps, - self.position, fov_radius, self.game.get_map) + self._fov = FovMap(light_blockers, obstacles, self.game.maps, + self.position, fov_radius, self.game.get_map) def multiprocessible_fov_stencil(self): self._fov.init_terrain() @@ -490,9 +519,6 @@ class ThingAnimate(Thing): self.multiprocessible_fov_stencil() return self._fov - def fov_stencil_make(self): - self._fov.make() - def fov_test(self, big_yx, little_yx): test_position = self.fov_stencil.target_yx(big_yx, little_yx) if self.fov_stencil.inside(test_position): @@ -564,6 +590,7 @@ class Thing_Player(ThingAnimate): drunk = 0 tripping = 0 need_for_toilet = 0 + standing = True def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -576,7 +603,7 @@ class Thing_Player(ThingAnimate): if self.tripping >= 0: self.tripping -= 1 if self.need_for_toilet > 0: - self.need_for_toilet *= 1.01 + self.need_for_toilet += 1 terrain = self.game.maps[self.position[0]][self.position[1]] if terrain in self.game.terrains: terrain_type = self.game.terrains[terrain] @@ -584,7 +611,10 @@ class Thing_Player(ThingAnimate): self.send_msg('CHAT "You use the toilet. What a relief!"') self.need_for_toilet = 0 if 10000 * random.random() < self.need_for_toilet / 100000: - self.send_msg('CHAT "You need to use a toilet."') + self.send_msg('CHAT "You need to go to a toilet."') + if self.need_for_toilet > 1000000: + self.send_msg('CHAT "You pee into your pants. Eww!"') + self.need_for_toilet = 0 if self.drunk == 0: self.send_msg('CHAT "You sober up."') self.invalidate('fov') @@ -596,6 +626,11 @@ class Thing_Player(ThingAnimate): elif self.tripping > 0 and self.tripping % 250 == 0: self.send_msg('RANDOM_COLORS') self.game.changed = True + if random.random() > 0.9999: + if self.standing: + self.weariness += 1 + elif self.weariness > 0: + self.weariness -= 1 def send_msg(self, msg): for c_id in self.game.sessions: @@ -616,6 +651,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)