X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=4cc3512cf82cc952f85e80ae9c35d00cd04538c5;hb=6a16b94fff101209e90ce93ee53847d84a25da5c;hp=0195a623f88e2426f214d56b1ce80b5bad887ac4;hpb=01b6b1da2a94fe26d1ad44348afb133edcd2a273;p=plomrogue2 diff --git a/plomrogue/things.py b/plomrogue/things.py index 0195a62..4cc3512 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 @@ -20,7 +20,9 @@ class ThingBase: class Thing(ThingBase): - blocking = False + blocks_movement = False + blocks_sound = False + blocks_light = False portable = False protection = '.' commandable = False @@ -46,7 +48,6 @@ class Thing(ThingBase): def lower_msg_by_volume(msg, volume, largest_audible_distance, url_limits = []): - import random factor = largest_audible_distance / 4 lowered_msg = '' in_url = False @@ -68,9 +69,11 @@ class Thing(ThingBase): return lowered_msg largest_audible_distance = 20 - # player's don't block sound (or should they?) - things = [t for t in self.game.things if t.type_ != 'Player'] - dijkstra_map = DijkstraMap(things, self.game.maps, self.position, + 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(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): @@ -89,13 +92,26 @@ class Thing(ThingBase): url_limits) lowered_nick = lower_msg_by_volume(name, volume, largest_audible_distance) + symbol = '' + # 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 self.game.io.send('CHAT ' + - quote('(volume: %.2f) %s: %s' % (volume, - lowered_nick, - lowered_msg)), + quote('vol:%.f%s %s%s: %s' % (volume * 100, '%', + lowered_nick, symbol, + lowered_msg)), c_id) - if listener.fov_test(self.position[0], self.position[1]): - self.game.io.send('CHATFACE %s' % self.id_) @@ -113,7 +129,6 @@ class ThingSpawner(Thing): if t != self and t.position == self.position]: return self.game.add_thing(self.child_type, self.position) - self.game.changed = True @@ -134,30 +149,50 @@ class Thing_SpawnPoint(Thing): +class ThingInstallable(Thing): + portable = True + installable = True + + def install(self): + self.portable = False + + def uninstall(self): + self.portable = True + + + class Thing_DoorSpawner(ThingSpawner): child_type = 'Door' -class Thing_Door(Thing): +class Thing_Door(ThingInstallable): symbol_hint = 'D' - blocking = False - portable = True - installable = True + blocks_movement = False def open(self): - self.blocking = False + self.blocks_movement = False + self.blocks_light = False + self.blocks_sound = False del self.thing_char def close(self): - self.blocking = True + self.blocks_movement = True + self.blocks_light = True + self.blocks_sound = True self.thing_char = '#' - def install(self): - self.portable = False - def uninstall(self): - self.portable = True + +class Thing_Psychedelic(Thing): + symbol_hint = 'P' + portable = True + + + +class Thing_PsychedelicSpawner(ThingSpawner): + symbol_hint = 'P' + child_type = 'Psychedelic' @@ -173,14 +208,14 @@ class Thing_Bottle(Thing): self.full = False def spin(self): - import random 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 - fov = fov_map_class(self.game.things, self.game.maps, - self.position, fov_radius, self.game.get_map) + light_blockers = self.game.get_light_blockers() + obstacles = [t.position for t in self.game.things if t.blocks_light] + 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: @@ -241,6 +276,7 @@ class Thing_HatRemixer(Thing): hat.design = new_design self.sound('HAT REMIXER', 'remixing a hat …') self.game.changed = True + self.game.record_change(self.position, 'other') @@ -366,7 +402,6 @@ class Thing_BottleDeposit(Thing): elif choice == 'Hat': msg += 'pick it up and then use "(un-)wear" on it!' self.sound('BOTTLE DEPOSITOR', msg) - self.game.changed = True def accept(self): self.bottle_counter += 1 @@ -376,21 +411,47 @@ class Thing_BottleDeposit(Thing): +class Thing_Cookie(Thing): + symbol_hint = 'c' + portable = True + + def __init__(self, *args, **kwargs): + import string + super().__init__(*args, **kwargs) + legal_chars = string.ascii_letters + string.digits + string.punctuation + ' ' + self.thing_char = random.choice(list(legal_chars)) + + + +class Thing_CookieSpawner(Thing): + symbol_hint = 'O' + + def accept(self, thing): + self.sound('OVEN', '*heat* *brrzt* here\'s a cookie!') + self.game.add_thing('Cookie', self.position) + + class ThingAnimate(Thing): - blocking = True - drunk = 0 + blocks_movement = True def __init__(self, *args, **kwargs): 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.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] @@ -404,16 +465,6 @@ class ThingAnimate(Thing): return task def proceed(self): - self.drunk -= 1 - if self.drunk == 0: - for c_id in self.game.sessions: - if self.game.sessions[c_id]['thing_id'] == self.id_: - # 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() - break - self.game.changed = True if self.task is None: self.task = self.get_next_task() return @@ -429,10 +480,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 - self._fov = fov_map_class(self.game.things, self.game.maps, - self.position, fov_radius, self.game.get_map) + light_blockers = self.game.get_light_blockers() + obstacles = [t.position for t in self.game.things if t.blocks_light] + 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() @@ -447,9 +499,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): @@ -482,15 +531,82 @@ class ThingAnimate(Thing): self._visible_control = self.fov_stencil_map('control') return self._visible_control + @property + def seen_things(self): + if self._seen_things is not None: + return self._seen_things + self._seen_things = [t for t in self.game.things + 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 = '@' + drunk = 0 + tripping = 0 + need_for_toilet = 0 + standing = True def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.carrying = None + def proceed(self): + super().proceed() + if self.drunk >= 0: + self.drunk -= 1 + if self.tripping >= 0: + self.tripping -= 1 + if self.need_for_toilet > 0: + 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] + if 'toilet' in terrain_type.tags: + 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 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') + self.game.changed = True + if self.tripping == 0: + self.send_msg('DEFAULT_COLORS') + self.send_msg('CHAT "You sober up."') + self.game.changed = True + elif self.tripping > 0 and self.tripping % 250 == 0: + self.send_msg('RANDOM_COLORS') + self.game.changed = True + def send_msg(self, msg): for c_id in self.game.sessions: if self.game.sessions[c_id]['thing_id'] == self.id_: @@ -502,3 +618,17 @@ class Thing_Player(ThingAnimate): t.carried = False self.carrying = None return t + + def add_cookie_char(self, c): + if not self.name in self.game.players_hat_chars: + self.game.players_hat_chars[self.name] = ' #' # default + if not c in self.game.players_hat_chars[self.name]: + self.game.players_hat_chars[self.name] += c + + def get_cookie_chars(self): + chars = ' #' # default + if self.name in self.game.players_hat_chars: + chars = self.game.players_hat_chars[self.name] + chars_split = list(chars) + chars_split.sort() + return ''.join(chars_split)