X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=ca9dcb16a895baa1550eec3e5ba1616a0b7b2e46;hb=2a7e3040d58b1d7dcddf64378bfd1abd8d7ded7c;hp=53837e36194b9479454500381153e67cff8f5248;hpb=88c8acab582aeb25735d86b78defe28441439cba;p=plomrogue2 diff --git a/plomrogue/things.py b/plomrogue/things.py index 53837e3..ca9dcb1 100644 --- a/plomrogue/things.py +++ b/plomrogue/things.py @@ -1,11 +1,13 @@ from plomrogue.errors import GameError, PlayError -from plomrogue.mapping import YX +from plomrogue.mapping import YX, FovMap +from plomrogue.misc import quote import random class ThingBase: type_ = '?' + carrying = False def __init__(self, game, id_=0, position=(YX(0, 0), YX(0, 0))): self.game = game @@ -18,10 +20,16 @@ class ThingBase: class Thing(ThingBase): - blocking = False + blocks_movement = False + blocks_sound = False + blocks_light = False portable = False protection = '.' commandable = False + cookable = False + carried = False + consumable = False + sittable = False def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -39,29 +47,40 @@ class Thing(ThingBase): def sound(self, name, msg): from plomrogue.mapping import DijkstraMap - from plomrogue.misc import quote + import re - def lower_msg_by_volume(msg, volume, largest_audible_distance): - import random - factor = largest_audible_distance / 4 + def lower_msg_by_volume(msg, volume, largest_audible_distance, + url_limits = []): + factor = largest_audible_distance / 2 lowered_msg = '' + in_url = False + i = 0 for c in msg: c = c - while random.random() > volume * factor: - if c.isupper(): - c = c.lower() - elif c != '.' and c != ' ': - c = '.' - else: - c = ' ' + if i in url_limits: + in_url = False if in_url else True + if not in_url: + while random.random() > volume * factor: + if c.isupper(): + c = c.lower() + elif c != '.' and c != ' ': + c = '.' + else: + c = ' ' lowered_msg += c + i += 1 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): + url_limits += [m.start(), m.end()] for c_id in self.game.sessions: listener = self.game.get_player(c_id) target_yx = dijkstra_map.target_yx(*listener.position, True) @@ -72,13 +91,29 @@ class Thing(ThingBase): continue volume = 1 / max(1, listener_distance) lowered_msg = lower_msg_by_volume(msg, volume, - largest_audible_distance) + largest_audible_distance, + 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) @@ -95,11 +130,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 - t = self.game.thing_types[self.child_type](self.game, - position=self.position) - self.game.things += [t] - self.game.changed = True + return None + return self.game.add_thing(self.child_type, self.position) @@ -117,33 +149,100 @@ class Thing_SpawnPoint(Thing): symbol_hint = 's' portable = True name = 'username' + temporary = False + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.created_at = datetime.datetime.now() + + def proceed(self): + super().proceed() + if self.temporary and datetime.datetime.now() >\ + self.created_at + datetime.timedelta(minutes=10): + self.game.remove_thing(self) + + + +class ThingInstallable(Thing): + portable = True + installable = True + + def install(self): + self.portable = False + + def uninstall(self): + self.portable = True + + + +class Thing_SignSpawner(ThingSpawner): + child_type = 'Sign' + + + +class Thing_Sign(ThingInstallable): + symbol_hint = '?' + design_size = YX(16, 36) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.design = 'x' * self.design_size.y * self.design_size.x 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_Door(Thing): - symbol_hint = 'D' - blocking = False +class Thing_DoorKey(Thing): portable = True - installable = True + symbol_hint = 'k' + + + + +class Thing_Door(ThingInstallable): + symbol_hint = 'D' + blocks_movement = False + locked = False def open(self): - self.blocking = False + self.blocks_movement = False + self.blocks_light = False + self.blocks_sound = False + self.locked = 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 lock(self): + self.locked = True + self.thing_char = 'L' - def uninstall(self): - self.portable = True + + +class Thing_Psychedelic(Thing): + symbol_hint = 'P' + portable = True + cookable = True + consumable = True + + + +class Thing_PsychedelicSpawner(ThingSpawner): + symbol_hint = 'P' + child_type = 'Psychedelic' @@ -152,11 +251,34 @@ class Thing_Bottle(Thing): portable = True full = True thing_char = '~' + spinnable = True + cookable = True + consumable = True def empty(self): self.thing_char = '_' self.full = False + def spin(self): + 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_radius = 12 + 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: + test_position = fov.target_yx(p.position[0], p.position[1]) + if fov.inside(test_position) and fov[test_position] == '.': + visible_players += [p] + if len(visible_players) == 0: + self.sound('BOTTLE', 'no visible players in spin range') + pick = random.choice(visible_players) + self.sound('BOTTLE', 'BOTTLE picks: ' + pick.name) + class Thing_BottleSpawner(ThingSpawner): @@ -168,6 +290,31 @@ class Thing_Hat(Thing): symbol_hint = 'H' portable = True design = ' +--+ ' + ' | | ' + '======' + spinnable = True + cookable = True + design_size = YX(3, 6) + + def spin(self): + new_design = '' + new_design += self.design[12] + new_design += self.design[13] + new_design += self.design[6] + new_design += self.design[7] + new_design += self.design[0] + new_design += self.design[1] + new_design += self.design[14] + new_design += self.design[15] + new_design += self.design[8] + new_design += self.design[9] + new_design += self.design[2] + new_design += self.design[3] + new_design += self.design[16] + new_design += self.design[17] + new_design += self.design[10] + new_design += self.design[11] + new_design += self.design[4] + new_design += self.design[5] + self.design = ''.join(new_design) @@ -182,6 +329,8 @@ class Thing_HatRemixer(Thing): new_design += random.choice(list(legal_chars)) hat.design = new_design self.sound('HAT REMIXER', 'remixing a hat …') + self.game.changed = True + self.game.record_change(self.position, 'other') @@ -194,6 +343,7 @@ class Thing_MusicPlayer(Thing): next_song_start = datetime.datetime.now() playlist_index = -1 playing = True + cookable = True def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -223,10 +373,11 @@ class Thing_MusicPlayer(Thing): msg_lines += ['HELP – show this help'] msg_lines += ['ON/OFF – toggle playback on/off'] msg_lines += ['REWIND – return to start of playlist'] - msg_lines += ['LIST – list programmed songs, durations'] - msg_lines += ['SKIP – to skip to next song'] + msg_lines += ['LIST – list programmed item, durations'] + msg_lines += ['REMOVE – remove current item'] + msg_lines += ['SKIP – to skip to next item'] msg_lines += ['REPEAT – toggle playlist repeat on/off'] - msg_lines += ['ADD LENGTH SONG – add SONG to playlist, with LENGTH in format "minutes:seconds", i.e. something like "0:47" or "11:02"'] + msg_lines += ['ADD LENGTH ITEM – add ITEM to playlist, with LENGTH in format "minutes:seconds" (something like "0:47" or "11:02")'] return msg_lines elif command == 'LIST': msg_lines += ['playlist:'] @@ -254,6 +405,7 @@ class Thing_MusicPlayer(Thing): self.playlist_index -= 1 if self.playlist_index < -1: self.playlist_index = -1 + self.game.changed = True return ['removed song'] elif command == 'REWIND': self.playlist_index = -1 @@ -293,21 +445,21 @@ class Thing_MusicPlayer(Thing): class Thing_BottleDeposit(Thing): bottle_counter = 0 - symbol_hint = 'O' + symbol_hint = 'b' def proceed(self): if self.bottle_counter >= 3: self.bottle_counter = 0 - choice = random.choice(['MusicPlayer', 'Hat']) - t = self.game.thing_types[choice](self.game, position=self.position) - self.game.things += [t] + choice = random.choice(['MusicPlayer', 'Hat', 'Stimulant', 'Psychedelic']) + self.game.add_thing(choice, self.position) msg = 'here is a gift as a reward for ecological consciousness –' if choice == 'MusicPlayer': msg += 'pick it up and then use "command thing" on it!' elif choice == 'Hat': msg += 'pick it up and then use "(un-)wear" on it!' + elif choice in {'Psychedelic', 'Stimulant'}: + msg += 'pick it up and then use "consume" on it!' self.sound('BOTTLE DEPOSITOR', msg) - self.game.changed = True def accept(self): self.bottle_counter += 1 @@ -317,16 +469,97 @@ class Thing_BottleDeposit(Thing): +class Thing_Stimulant(Thing): + symbol_hint = 'e' + cookable = True + portable = True + consumable = True + + + +class Thing_StimulantSpawner(ThingSpawner): + symbol_hint = 'e' + child_type = 'Stimulant' + + + +class Thing_Chair(Thing): + symbol_hint = 'h' + portable = True + sittable = True + + + +class Thing_ChairSpawner(ThingSpawner): + symbol_hint = 'e' + child_type = 'Chair' + + + +class Thing_Cookie(Thing): + symbol_hint = 'c' + portable = True + consumable = 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 Thing_Crate(Thing): + portable = True + symbol_hint = 'C' + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.content = [] + + def accept(self, thing): + self.content += [thing] + + def remove_from_crate(self, thing): + self.content.remove(thing) + + + +class Thing_CrateSpawner(ThingSpawner): + child_type = 'Crate' + symbol_hint = 'C' + + class ThingAnimate(Thing): - blocking = True - drunk = 0 + energy = 50 def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.next_task = [None] self.task = None - self._fov = 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] @@ -337,18 +570,10 @@ class ThingAnimate(Thing): task = self.next_task[0] self.next_task = [None] task.check() + task.todo += max(0, -self.energy * 10) 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_: - self.game.io.send('DEFAULT_COLORS', c_id) - self.game.io.send('CHAT "You sober up."', c_id) - break - self.game.changed = True - self._fov = None if self.task is None: self.task = self.get_next_task() return @@ -364,10 +589,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() @@ -382,9 +608,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): @@ -392,7 +615,7 @@ class ThingAnimate(Thing): return True return False - def fov_stencil_map(self, map_type='normal'): + def fov_stencil_map(self, map_type): visible_terrain = '' for yx in self.fov_stencil: if self.fov_stencil[yx] == '.': @@ -403,17 +626,160 @@ class ThingAnimate(Thing): visible_terrain += ' ' return visible_terrain + @property + def visible_terrain(self): + if self._visible_terrain: + return self._visible_terrain + self._visible_terrain = self.fov_stencil_map('normal') + return self._visible_terrain + + @property + def visible_control(self): + if self._visible_control: + return self._visible_control + 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 + dancing = 0 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: + 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 self.need_for_toilet > 0: + if random.random() > 0.9999: + self.need_for_toilet += 1 + self.game.changed = True + if 100000 * random.random() < self.need_for_toilet: + self.send_msg('CHAT "You need to go to a toilet."') + if self.need_for_toilet > 100: + self.send_msg('CHAT "You pee into your pants. Eww!"') + self.need_for_toilet = 0 + self.game.changed = True + 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 + if random.random() > 0.9999: + if self.standing: + self.energy -= 1 + else: + self.energy += 1 + if self.energy < 0 and self.standing and self.energy % 5 == 0: + self.send_msg('CHAT "All that walking or standing uses up ' + 'your energy, which makes you slower. Find a' + ' place to sit or lie down to regain it."') + self.game.changed = True + if self.dancing and random.random() > 0.99 and not self.next_task[0]: + self.dancing -= 1 + direction = random.choice(self.game.map_geometry.directions) + self.set_next_task('MOVE', [direction]) + if random.random() > 0.9: + self.energy -= 1 + self.game.changed = True + if 1000000 * random.random() < self.energy - 50: + self.send_msg('CHAT "Your body tries to ' + 'dance off its energy surplus."') + self.dancing += 50 + 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_: self.game.io.send(msg, c_id) break + + def uncarry(self): + t = self.carrying + 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) + + def try_to_sit(self): + terrain = self.game.maps[self.position[0]][self.position[1]] + if terrain in self.game.terrains: + terrain_type = self.game.terrains[terrain] + if 'sittable' in terrain_type.tags: + self.standing = False + self.send_msg('CHAT "You sink into the %s. ' + 'Staying here will replenish your energy."' + % terrain_type.description) + for t in [t for t in self.game.things + if t.type_ == 'Chair' and t.position == self.position]: + self.standing = False + self.send_msg('CHAT "You sink into the Chair. ' + 'Staying here will replenish your energy."')