X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=08a4a4f58119d2818a89a18a5b5e2577f230b945;hb=856b68988876a63409737dac77b4d4921b9a466b;hp=dbe23153f11d7ee842b04bca60ed694bab40f038;hpb=3ac4bfc7722ec4366698ae17f5e2006e6a9e8b30;p=plomrogue2
diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index dbe2315..08a4a4f 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -41,6 +41,7 @@ class Task_MOVE(Task):
self.thing.position = self.get_move_target()
if self.thing.carrying:
self.thing.carrying.position = self.thing.position
+ self.thing.game.changed_fovs = True
@@ -56,6 +57,7 @@ class Task_WRITE(Task):
big_yx = self.thing.position[0]
little_yx = self.thing.position[1]
self.thing.game.maps[big_yx][little_yx] = self.args[0]
+ self.thing.game.changed_fovs = True
@@ -72,11 +74,12 @@ class Task_FLATTEN_SURROUNDINGS(Task):
if not self.thing.game.can_do_tile_with_pw(*yxyx, self.args[0]):
continue
self.thing.game.maps[yxyx[0]][yxyx[1]] = '.'
+ self.thing.game.changed_fovs = True
class Task_PICK_UP(Task):
- argtypes = 'int:nonneg'
+ argtypes = 'int:pos'
def check(self):
if self.thing.carrying:
@@ -86,15 +89,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:
- 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:
- raise PlayError('thing of ID %s not in reach' % self.args[0])
+ raise PlayError('thing not in reach')
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])
@@ -120,7 +123,13 @@ class Task_DROP(Task):
if t.type_ == 'BottleDeposit'
and t.position == self.thing.position]:
t.accept()
- self.thing.game.things.remove(self.thing.carrying)
+ self.thing.game.remove_thing(self.thing.carrying)
+ break
+ elif self.thing.carrying.type_ == 'Hat':
+ for t in [t for t in self.thing.game.things
+ if t.type_ == 'HatRemixer'
+ and t.position == self.thing.position]:
+ t.accept(self.thing.carrying)
break
self.thing.carrying = None
@@ -138,6 +147,7 @@ class Task_DOOR(Task):
t.open()
else:
t.close()
+ self.thing.game.changed_fovs = True
@@ -154,12 +164,11 @@ class Task_INTOXICATE(Task):
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.game.changed_fovs = True
+
class Task_COMMAND(Task):
@@ -173,7 +182,66 @@ class Task_COMMAND(Task):
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))
+
+
+
+class Task_INSTALL(Task):
+
+ def _get_uninstallables(self):
+ return [t for t in self.thing.game.things
+ if t != self.thing
+ and hasattr(t, 'installable') and t.installable
+ and (not t.portable)
+ and t.position == self.thing.position]
+
+ def check(self):
+ if self.thing.carrying:
+ if not hasattr(self.thing.carrying, 'installable')\
+ or not self.thing.carrying.installable:
+ raise PlayError('carried thing not installable')
+ elif len(self._get_uninstallables()) == 0:
+ raise PlayError('nothing to uninstall here')
+
+ def do(self):
+ 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()
+ self.thing.send_msg('CHAT "You uninstall the thing here."')
+
+
+
+class Task_WEAR(Task):
+
+ def check(self):
+ if self.thing.name in self.thing.game.hats:
+ return
+ if not self.thing.carrying:
+ raise PlayError('carrying nothing to wear')
+ if self.thing.name in self.thing.game.hats:
+ raise PlayError('already wearing a hat')
+ if self.thing.carrying.type_ != 'Hat':
+ raise PlayError('can only wear a hat')
+
+ def do(self):
+ if self.thing.name in self.thing.game.hats:
+ t = self.thing.game.add_thing('Hat', self.thing.position)
+ t.design = self.thing.game.hats[self.thing.name]
+ del self.thing.game.hats[self.thing.name]
+ self.thing.send_msg('CHAT "You drop your hat."')
+ for remixer in [t for t in self.thing.game.things
+ if t.type_ == 'HatRemixer'
+ and t.position == self.thing.position]:
+ remixer.accept(t)
+ break
+ else:
+ from plomrogue.misc import quote
+ self.thing.game.hats[self.thing.name] = self.thing.carrying.design
+ self.thing.game.things.remove(self.thing.carrying)
+ self.thing.carrying = None
+ self.thing.send_msg('CHAT "You put on a hat."')