X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=c7b35bd00b76bfa6ee0f3695f098c5e71b758fa3;hb=3484a01e592bafc9d573b878ff94ef5e64755476;hp=0bc0d9cf23c30c29e0b675f20ba0c77f0debe59f;hpb=e5a83f8987647c3c239e48d5bc1ff939ce531544;p=plomrogue2
diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 0bc0d9c..c7b35bd 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -38,7 +38,9 @@ class Task_MOVE(Task):
raise PlayError('blocked by impassable tile')
def do(self):
+ self.thing.game.record_fov_change(self.thing.position)
self.thing.position = self.get_move_target()
+ self.thing.game.record_fov_change(self.thing.position)
if self.thing.carrying:
self.thing.carrying.position = self.thing.position
@@ -56,6 +58,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.record_fov_change((big_yx, little_yx))
@@ -72,28 +75,34 @@ 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.record_fov_change(yxyx)
class Task_PICK_UP(Task):
+ argtypes = 'int:pos'
def check(self):
if self.thing.carrying:
raise PlayError('already carrying something')
- nothing_to_pick_up = True
- for t in [t for t in self.thing.game.things
- if t.portable
- and t != self.thing and t.position == self.thing.position and
- t.type_ != 'Player']:
- nothing_to_pick_up = False
- break
- if nothing_to_pick_up:
- raise PlayError('nothing to pick up')
+ to_pick_up = self.thing.game.get_thing(self.args[0])
+ neighbors = self.thing.game.map_geometry.\
+ get_neighbors_yxyx(self.thing.position).values()
+ reach = [self.thing.position] + list(neighbors)
+ if to_pick_up is None:
+ 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 not in reach')
+ elif not to_pick_up.portable:
+ raise PlayError('thing not portable')
def do(self):
- to_pick_up = [t for t in self.thing.game.things
- if t.portable
- and t != self.thing and t.position == self.thing.position][0]
+ to_pick_up = self.thing.game.get_thing(self.args[0])
+ to_pick_up.position = self.thing.position[:]
self.thing.carrying = to_pick_up
@@ -103,8 +112,26 @@ class Task_DROP(Task):
def check(self):
if not self.thing.carrying:
raise PlayError('nothing to drop')
+ if self.thing.carrying.type_ == 'Bottle' and self.thing.carrying.full:
+ for t in [t for t in self.thing.game.things
+ if t.type_ == 'BottleDeposit'
+ and t.position == self.thing.position]:
+ raise PlayError('cannot drop full bottle into bottle deposit')
def do(self):
+ if self.thing.carrying.type_ == 'Bottle' and not self.thing.carrying.full:
+ for t in [t for t in self.thing.game.things
+ if t.type_ == 'BottleDeposit'
+ and t.position == self.thing.position]:
+ t.accept()
+ 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
@@ -112,7 +139,6 @@ class Task_DROP(Task):
class Task_DOOR(Task):
def do(self):
- self.thing.carrying = None
action_radius = list(self.thing.game.map_geometry.
get_neighbors_yxyx(self.thing.position).values())
for t in [t for t in self.thing.game.things if
@@ -121,6 +147,7 @@ class Task_DOOR(Task):
t.open()
else:
t.close()
+ self.thing.game.record_fov_change(t.position)
@@ -128,19 +155,20 @@ class Task_INTOXICATE(Task):
def check(self):
if self.thing.carrying is None:
- raise PlayError('nothing to consume')
- if self.thing.carrying.type_ != 'Consumable':
- raise PlayError('cannot consume non-consumable')
+ raise PlayError('carrying nothing to drink from')
+ if self.thing.carrying.type_ != 'Bottle':
+ raise PlayError('cannot drink from non-bottle')
+ if not self.thing.carrying.full:
+ raise PlayError('bottle is empty')
def do(self):
- self.thing.game.things.remove(self.thing.carrying)
- self.thing.carrying = None
- 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.carrying.full = False
+ self.thing.carrying.empty()
+ self.thing.send_msg('RANDOM_COLORS')
+ self.thing.send_msg('CHAT "You are drunk now."')
self.thing.drunk = 10000
+ self.thing.invalidate_map_view()
+
class Task_COMMAND(Task):
@@ -154,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.remove_thing(self.thing.carrying)
+ self.thing.carrying = None
+ self.thing.send_msg('CHAT "You put on a hat."')