home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add song deletion to MusicPlayer.
[plomrogue2]
/
plomrogue
/
tasks.py
diff --git
a/plomrogue/tasks.py
b/plomrogue/tasks.py
index a6602cea926822ae8b7a58a4c7c50baad28f6e1b..9165cd44b63d0adece3c1da95366cdbd7b5fae4a 100644
(file)
--- a/
plomrogue/tasks.py
+++ b/
plomrogue/tasks.py
@@
-86,15
+86,15
@@
class Task_PICK_UP(Task):
get_neighbors_yxyx(self.thing.position).values()
reach = [self.thing.position] + list(neighbors)
if to_pick_up is None:
get_neighbors_yxyx(self.thing.position).values()
reach = [self.thing.position] + list(neighbors)
if to_pick_up is None:
- raise PlayError('no
thing of ID %s exists %s' % self.args[0]
)
+ raise PlayError('no
such thing exists'
)
elif to_pick_up == self.thing:
raise PlayError('cannot pick up oneself')
elif to_pick_up.type_ == 'Player':
raise PlayError('cannot pick up player')
elif to_pick_up.position not in reach:
elif to_pick_up == self.thing:
raise PlayError('cannot pick up oneself')
elif to_pick_up.type_ == 'Player':
raise PlayError('cannot pick up player')
elif to_pick_up.position not in reach:
- raise PlayError('thing
of ID %s not in reach' % self.args[0]
)
+ raise PlayError('thing
not in reach'
)
elif not to_pick_up.portable:
elif not to_pick_up.portable:
- raise PlayError('thing
of ID %s not portable' % self.args[0]
)
+ raise PlayError('thing
not portable'
)
def do(self):
to_pick_up = self.thing.game.get_thing(self.args[0])
def do(self):
to_pick_up = self.thing.game.get_thing(self.args[0])
@@
-154,11
+154,8
@@
class Task_INTOXICATE(Task):
def do(self):
self.thing.carrying.full = False
self.thing.carrying.empty()
def do(self):
self.thing.carrying.full = False
self.thing.carrying.empty()
- for c_id in self.thing.game.sessions:
- if self.thing.game.sessions[c_id]['thing_id'] == self.thing.id_:
- self.thing.game.io.send('RANDOM_COLORS', c_id)
- self.thing.game.io.send('CHAT "You are drunk now."', c_id)
- break
+ self.thing.send_msg('RANDOM_COLORS')
+ self.thing.send_msg('CHAT "You are drunk now."')
self.thing.drunk = 10000
self.thing.drunk = 10000
@@
-174,10
+171,9
@@
class Task_COMMAND(Task):
def do(self):
from plomrogue.misc import quote
def do(self):
from plomrogue.misc import quote
- reply = self.thing.carrying.interpret(self.args[0])
- for c_id in self.thing.game.sessions:
- if self.thing.game.sessions[c_id]['thing_id'] == self.thing.id_:
- self.thing.game.io.send('REPLY ' + quote(reply), c_id)
+ reply_lines = self.thing.carrying.interpret(self.args[0])
+ for line in reply_lines:
+ self.thing.send_msg('REPLY ' + quote(line))
@@
-202,5
+198,7
@@
class Task_INSTALL(Task):
if self.thing.carrying:
self.thing.carrying.install()
self.thing.carrying = None
if self.thing.carrying:
self.thing.carrying.install()
self.thing.carrying = None
+ self.thing.send_msg('CHAT "You install the thing you carry."')
else:
self._get_uninstallables()[0].uninstall()
else:
self._get_uninstallables()[0].uninstall()
+ self.thing.send_msg('CHAT "You uninstall the thing here."')