home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify toilet need calcuation, add pee-into-pants emergency exit.
[plomrogue2]
/
plomrogue
/
tasks.py
diff --git
a/plomrogue/tasks.py
b/plomrogue/tasks.py
index 98609da7232b2bb3ead257f1585f972e59ceee1b..4f390d47c92a88fbb1782944f623b3c44012d846 100644
(file)
--- a/
plomrogue/tasks.py
+++ b/
plomrogue/tasks.py
@@
-183,8
+183,8
@@
class Task_INTOXICATE(Task):
def check(self):
if self.thing.carrying is None:
def check(self):
if self.thing.carrying is None:
- raise PlayError('carrying nothing to
drink from
')
- if self.thing.carrying.type_ not in {'Bottle', 'Cookie'}:
+ raise PlayError('carrying nothing to
consume
')
+ if self.thing.carrying.type_ not in {'Bottle', 'Cookie'
, 'Psychedelic'
}:
raise PlayError('cannot consume this kind of thing')
if self.thing.carrying.type_ == 'Bottle' and\
not self.thing.carrying.full:
raise PlayError('cannot consume this kind of thing')
if self.thing.carrying.type_ == 'Bottle' and\
not self.thing.carrying.full:
@@
-194,11
+194,17
@@
class Task_INTOXICATE(Task):
if self.thing.carrying.type_ == 'Bottle':
self.thing.carrying.full = False
self.thing.carrying.empty()
if self.thing.carrying.type_ == 'Bottle':
self.thing.carrying.full = False
self.thing.carrying.empty()
- self.thing.send_msg('RANDOM_COLORS')
self.thing.send_msg('CHAT "You are drunk now."')
self.thing.send_msg('CHAT "You are drunk now."')
+ self.thing.need_for_toilet += 10000
self.thing.drunk = 10000
self.thing.invalidate('fov')
self.thing.game.record_change(self.thing.position, 'other')
self.thing.drunk = 10000
self.thing.invalidate('fov')
self.thing.game.record_change(self.thing.position, 'other')
+ elif self.thing.carrying.type_ == 'Psychedelic':
+ self.thing.tripping = 10000
+ self.thing.send_msg('CHAT "You start tripping."')
+ self.thing.send_msg('RANDOM_COLORS')
+ eaten = self.thing.uncarry()
+ self.thing.game.remove_thing(eaten)
elif self.thing.carrying.type_ == 'Cookie':
self.thing.send_msg('CHAT ' + quote('You eat a cookie and gain the ability to draw the following character: "%s"' % self.thing.carrying.thing_char))
self.thing.add_cookie_char(self.thing.carrying.thing_char)
elif self.thing.carrying.type_ == 'Cookie':
self.thing.send_msg('CHAT ' + quote('You eat a cookie and gain the ability to draw the following character: "%s"' % self.thing.carrying.thing_char))
self.thing.add_cookie_char(self.thing.carrying.thing_char)