X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=ad87ebd90c52bd65c3b44615b89a971e1144d00c;hb=2df42b53c56bd32dc445df532b4c42c53d97b767;hp=6637b3744199d94a989fc23000b4b40963d2e3c7;hpb=cfb8df3d49ecb0bbdf55de23d31a2a33a7c20edc;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 6637b37..ad87ebd 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -28,6 +28,8 @@ class Thing(ThingBase):
commandable = False
cookable = False
carried = False
+ consumable = False
+ sittable = False
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -147,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)
@@ -162,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'
@@ -208,6 +236,7 @@ class Thing_Psychedelic(Thing):
symbol_hint = 'P'
portable = True
cookable = True
+ consumable = True
@@ -224,6 +253,7 @@ class Thing_Bottle(Thing):
thing_char = '~'
spinnable = True
cookable = True
+ consumable = True
def empty(self):
self.thing_char = '_'
@@ -262,6 +292,7 @@ class Thing_Hat(Thing):
design = ' +--+ ' + ' | | ' + '======'
spinnable = True
cookable = True
+ design_size = YX(3, 6)
def spin(self):
new_design = ''
@@ -342,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:']
@@ -418,13 +450,15 @@ class Thing_BottleDeposit(Thing):
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):
@@ -435,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
@@ -479,7 +541,7 @@ class Thing_CrateSpawner(ThingSpawner):
class ThingAnimate(Thing):
- weariness = 0
+ energy = 50
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -508,7 +570,7 @@ class ThingAnimate(Thing):
task = self.next_task[0]
self.next_task = [None]
task.check()
- task.todo += self.weariness * 10
+ task.todo += max(0, -self.energy * 10)
return task
def proceed(self):
@@ -660,25 +722,25 @@ class Thing_Player(ThingAnimate):
self.game.changed = True
if random.random() > 0.9999:
if self.standing:
- self.weariness += 1
+ self.energy -= 1
else:
- self.weariness -= 1
- if self.weariness > 0 and self.weariness % 5 == 0:
- self.send_msg('CHAT "All that walking or standing makes '
- 'you weary, and thereby slower. Find a place '
- 'to sit or lie down to regain energy."')
+ 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.weariness += 1
+ self.energy -= 1
self.game.changed = True
- if 1000000 * random.random() < -self.weariness:
+ if 1000000 * random.random() < self.energy - 50:
self.send_msg('CHAT "Your body tries to '
'dance off its energy surplus."')
- self.dancing = 50
+ self.dancing += 50
self.game.changed = True
def send_msg(self, msg):