X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Fthings.py;h=da995d311dd84b7a777f9c0cc28aae2f091be0d5;hb=52a97e1d01fd8541ec8993f1d680aeb56243df9d;hp=4cc3512cf82cc952f85e80ae9c35d00cd04538c5;hpb=6a16b94fff101209e90ce93ee53847d84a25da5c;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 4cc3512..da995d3 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -26,7 +26,9 @@ class Thing(ThingBase):
portable = False
protection = '.'
commandable = False
+ cookable = False
carried = False
+ consumable = False
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -127,8 +129,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 +166,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 +199,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 +225,8 @@ class Thing_Bottle(Thing):
full = True
thing_char = '~'
spinnable = True
+ cookable = True
+ consumable = True
def empty(self):
self.thing_char = '_'
@@ -239,6 +264,7 @@ class Thing_Hat(Thing):
portable = True
design = ' +--+ ' + ' | | ' + '======'
spinnable = True
+ cookable = True
def spin(self):
new_design = ''
@@ -289,6 +315,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)
@@ -411,9 +438,24 @@ 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_Cookie(Thing):
symbol_hint = 'c'
portable = True
+ consumable = True
def __init__(self, *args, **kwargs):
import string
@@ -432,8 +474,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 +526,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 +636,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 +649,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 +676,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: