X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=072f2513ce9a11a56e86c92828cbfde3cb1f594b;hb=9f83e41901f23e282737e7344c84e8a692d05ef0;hp=8885aa0820fc2de63ab17e2ff0ae8cfa1ea42e7c;hpb=74c0ec0247f058b977996f9e1e2d696f3d2d162b;p=plomrogue2 diff --git a/plomrogue/things.py b/plomrogue/things.py index 8885aa0..072f251 100644 --- a/plomrogue/things.py +++ b/plomrogue/things.py @@ -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 @@ -68,10 +70,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, - largest_audible_distance, self.game.get_map) + obstacles = [t.position for t in self.game.things if t.blocks_sound] + 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) url_limits = [] for m in re.finditer('https?://[^\s]+', msg): url_limits += [m.start(), m.end()] @@ -116,7 +119,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 handled by add_thing @@ -144,16 +146,20 @@ class Thing_DoorSpawner(ThingSpawner): class Thing_Door(Thing): symbol_hint = 'D' - blocking = False + blocks_movement = False portable = True installable = True 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): @@ -164,6 +170,18 @@ class Thing_Door(Thing): +class Thing_Psychedelic(Thing): + symbol_hint = 'P' + portable = True + + + +class Thing_PsychedelicSpawner(ThingSpawner): + symbol_hint = 'P' + child_type = 'Psychedelic' + + + class Thing_Bottle(Thing): symbol_hint = 'B' portable = True @@ -182,7 +200,9 @@ class Thing_Bottle(Thing): # 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, + 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.init_terrain() visible_players = [] @@ -244,8 +264,7 @@ class Thing_HatRemixer(Thing): hat.design = new_design self.sound('HAT REMIXER', 'remixing a hat …') self.game.changed = True - # FIXME: pseudo-FOV-change actually - self.game.record_fov_change(self.thing.position) + self.game.record_change(self.position, 'other') @@ -371,7 +390,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 done by game.add_thing def accept(self): self.bottle_counter += 1 @@ -381,22 +399,49 @@ 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 + blocks_movement = True drunk = 0 + tripping = 0 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._seen_things = 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] @@ -410,18 +455,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() - # FIXME: pseudo-FOV-change actually - self.game.record_fov_change(self.thing.position) - break - self.game.changed = True if self.task is None: self.task = self.get_next_task() return @@ -439,7 +472,9 @@ class ThingAnimate(Thing): 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, + 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) def multiprocessible_fov_stencil(self): @@ -498,6 +533,31 @@ class ThingAnimate(Thing): 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 = '@' @@ -506,6 +566,22 @@ class Thing_Player(ThingAnimate): super().__init__(*args, **kwargs) self.carrying = None + def proceed(self): + super().proceed() + self.drunk -= 1 + if self.drunk == 0: + self.send_msg('CHAT "You sober up."') + self.invalidate('fov') + self.game.changed = True + self.tripping -= 1 + 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_: @@ -517,3 +593,14 @@ 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): + if self.name in self.game.players_hat_chars: + return self.game.players_hat_chars[self.name] + return ' #' # default