X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=ca9dcb16a895baa1550eec3e5ba1616a0b7b2e46;hb=2a7e3040d58b1d7dcddf64378bfd1abd8d7ded7c;hp=dd14db5b657352c16d2a0db0adc1e175db4a2b53;hpb=0f924e175d0f321e703e3f00511b547c4a027dbc;p=plomrogue2 diff --git a/plomrogue/things.py b/plomrogue/things.py index dd14db5..ca9dcb1 100644 --- a/plomrogue/things.py +++ b/plomrogue/things.py @@ -26,7 +26,10 @@ class Thing(ThingBase): portable = False protection = '.' commandable = False + cookable = False carried = False + consumable = False + sittable = False def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -48,7 +51,7 @@ class Thing(ThingBase): def lower_msg_by_volume(msg, volume, largest_audible_distance, url_limits = []): - factor = largest_audible_distance / 4 + factor = largest_audible_distance / 2 lowered_msg = '' in_url = False i = 0 @@ -127,8 +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 - self.game.add_thing(self.child_type, self.position) + return None + return self.game.add_thing(self.child_type, self.position) @@ -146,6 +149,17 @@ 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) @@ -161,19 +175,49 @@ class ThingInstallable(Thing): +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_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): @@ -182,11 +226,17 @@ 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): symbol_hint = 'P' portable = True + cookable = True + consumable = True @@ -202,6 +252,8 @@ class Thing_Bottle(Thing): full = True thing_char = '~' spinnable = True + cookable = True + consumable = True def empty(self): self.thing_char = '_' @@ -239,6 +291,8 @@ class Thing_Hat(Thing): portable = True design = ' +--+ ' + ' | | ' + '======' spinnable = True + cookable = True + design_size = YX(3, 6) def spin(self): new_design = '' @@ -289,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) @@ -318,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:'] @@ -389,18 +445,20 @@ 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']) + 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) def accept(self): @@ -411,9 +469,37 @@ 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 @@ -424,7 +510,7 @@ class Thing_Cookie(Thing): class Thing_CookieSpawner(Thing): - symbol_hint = 'O' + symbol_hint = 'o' def accept(self, thing): self.sound('OVEN', '*heat* *brrzt* here\'s a cookie!') @@ -432,8 +518,30 @@ class Thing_CookieSpawner(Thing): +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): - blocks_movement = True + energy = 50 def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -462,6 +570,7 @@ 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): @@ -571,6 +680,7 @@ class Thing_Player(ThingAnimate): tripping = 0 need_for_toilet = 0 standing = True + dancing = 0 def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -583,18 +693,22 @@ class Thing_Player(ThingAnimate): 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: + 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 > 1000000: + 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') @@ -606,6 +720,28 @@ 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.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: @@ -626,6 +762,24 @@ 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) + + 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."')