X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=da995d311dd84b7a777f9c0cc28aae2f091be0d5;hb=249d0afc8663af2a1dbdd9d2f893582fe235cf6c;hp=c538a235d8c4a7d301800563022470b3a41638c7;hpb=1ece82099bbf02faed3d1348d7014b8ed38528a9;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index c538a23..da995d3 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -28,6 +28,7 @@ class Thing(ThingBase):
commandable = False
cookable = False
carried = False
+ consumable = False
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -208,6 +209,7 @@ class Thing_Psychedelic(Thing):
symbol_hint = 'P'
portable = True
cookable = True
+ consumable = True
@@ -224,6 +226,7 @@ class Thing_Bottle(Thing):
thing_char = '~'
spinnable = True
cookable = True
+ consumable = True
def empty(self):
self.thing_char = '_'
@@ -435,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
@@ -479,7 +497,7 @@ class Thing_CrateSpawner(ThingSpawner):
class ThingAnimate(Thing):
- energy = 0
+ energy = 50
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -663,7 +681,7 @@ class Thing_Player(ThingAnimate):
self.energy -= 1
else:
self.energy += 1
- if self.energy < 0 and self.energy % 5 == 0:
+ 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."')
@@ -675,7 +693,7 @@ class Thing_Player(ThingAnimate):
if random.random() > 0.9:
self.energy -= 1
self.game.changed = True
- if 1000000 * random.random() < self.energy:
+ if 1000000 * random.random() < self.energy - 50:
self.send_msg('CHAT "Your body tries to '
'dance off its energy surplus."')
self.dancing += 50