X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=6f8b79d5d1ce02e32cca57c4b950e884c7acf930;hb=ce80e43db5939580763b1f66bff4f87f1cccc383;hp=4cc3512cf82cc952f85e80ae9c35d00cd04538c5;hpb=6a16b94fff101209e90ce93ee53847d84a25da5c;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 4cc3512..6f8b79d 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -26,6 +26,7 @@ class Thing(ThingBase):
portable = False
protection = '.'
commandable = False
+ cookable = False
carried = False
def __init__(self, *args, **kwargs):
@@ -127,8 +128,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)
@@ -164,16 +165,31 @@ class ThingInstallable(Thing):
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 +198,16 @@ 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
@@ -202,6 +223,7 @@ class Thing_Bottle(Thing):
full = True
thing_char = '~'
spinnable = True
+ cookable = True
def empty(self):
self.thing_char = '_'
@@ -239,6 +261,7 @@ class Thing_Hat(Thing):
portable = True
design = ' +--+ ' + ' | | ' + '======'
spinnable = True
+ cookable = True
def spin(self):
new_design = ''
@@ -289,6 +312,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)
@@ -433,7 +457,7 @@ class Thing_CookieSpawner(Thing):
class ThingAnimate(Thing):
- blocks_movement = True
+ weariness = 0
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -462,6 +486,7 @@ class ThingAnimate(Thing):
task = self.next_task[0]
self.next_task = [None]
task.check()
+ task.todo += self.weariness * 10
return task
def proceed(self):
@@ -583,18 +608,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 +635,12 @@ 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.weariness += 1
+ elif self.weariness > 0:
+ self.weariness -= 1
+ self.game.changed = True
def send_msg(self, msg):
for c_id in self.game.sessions: