X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=db4a4322d442c086a7109660f8704e1ef4a73419;hb=b69f30da99f9096834f4389a13dd4ffac26e7a80;hp=f8f13733ec2aef82ceab45c5dd27768c7b64eb46;hpb=738d909ab62b9248adb1cf5244b37daa412b39c7;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index f8f1373..db4a432 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
@@ -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,6 +175,21 @@ 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'
@@ -206,6 +235,8 @@ class Thing_Door(ThingInstallable):
class Thing_Psychedelic(Thing):
symbol_hint = 'P'
portable = True
+ cookable = True
+ consumable = True
@@ -221,6 +252,8 @@ class Thing_Bottle(Thing):
full = True
thing_char = '~'
spinnable = True
+ cookable = True
+ consumable = True
def empty(self):
self.thing_char = '_'
@@ -258,6 +291,8 @@ class Thing_Hat(Thing):
portable = True
design = ' +--+ ' + ' | | ' + '======'
spinnable = True
+ cookable = True
+ design_size = YX(3, 6)
def spin(self):
new_design = ''
@@ -308,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)
@@ -337,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:']
@@ -408,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):
@@ -430,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
@@ -443,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!')
@@ -451,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):
- weariness = 0
+ energy = 50
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -481,7 +570,10 @@ class ThingAnimate(Thing):
task = self.next_task[0]
self.next_task = [None]
task.check()
- task.todo += self.weariness * 10
+ if 1000 * random.random() < -self.energy:
+ self.send_msg('CHAT "You movements are slowed down '
+ 'due to your low energy."')
+ task.todo += max(0, -self.energy * 10)
return task
def proceed(self):
@@ -591,6 +683,7 @@ class Thing_Player(ThingAnimate):
tripping = 0
need_for_toilet = 0
standing = True
+ dancing = 0
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -632,9 +725,31 @@ class Thing_Player(ThingAnimate):
self.game.changed = True
if random.random() > 0.9999:
if self.standing:
- self.weariness += 1
- elif self.weariness > 0:
- self.weariness -= 1
+ self.energy -= 1
+ else:
+ self.energy += 1
+ if self.energy <= 0 and self.standing and self.energy % 10 == 0:
+ self.send_msg('CHAT "All that walking or standing uses up '
+ 'your energy, which slows you down. Find a'
+ ' place to sit or lie down to regain it."')
+ if self.energy < -100:
+ self.send_msg('CHAT "Due to low energy, you collapse on the '
+ 'floor. Somebody calls an ambulance. You remember '
+ 'little of what happens afterwards. You end up '
+ 'back here, pumped full with stimulants."')
+ self.energy = 100
+ 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):
@@ -662,3 +777,18 @@ class Thing_Player(ThingAnimate):
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."')