X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=1e6737b64671188b967e42210a6fda8f73b7e3c9;hb=8477309adb13b14ea254d08c4ab81f46a0a29392;hp=2312ab4f6e0b268fa32254c9b5815e713623887c;hpb=bf8653594beb9ee94b8e7c4139b2891425a6367b;p=plomrogue2
diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 2312ab4..1e6737b 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -1,4 +1,5 @@
from plomrogue.errors import PlayError, GameError
+from plomrogue.misc import quote
@@ -10,6 +11,12 @@ class Task:
self.thing = thing
self.args = args
+ def _get_move_target(self):
+ if self.args[0] == 'HERE':
+ return self.thing.position
+ return self.thing.game.map_geometry.move_yxyx(self.thing.position,
+ self.args[0])
+
def check(self):
pass
@@ -25,12 +32,8 @@ class Task_WAIT(Task):
class Task_MOVE(Task):
argtypes = 'string:direction'
- def get_move_target(self):
- return self.thing.game.map_geometry.move_yxyx(self.thing.position,
- self.args[0])
-
def check(self):
- test_yxyx = self.get_move_target()
+ test_yxyx = self._get_move_target()
if test_yxyx in [t.position for t in self.thing.game.things
if t.blocking]:
raise PlayError('blocked by other thing')
@@ -38,7 +41,9 @@ class Task_MOVE(Task):
raise PlayError('blocked by impassable tile')
def do(self):
- self.thing.position = self.get_move_target()
+ 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 +61,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,6 +78,7 @@ 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)
@@ -91,6 +98,8 @@ class Task_PICK_UP(Task):
raise PlayError('cannot pick up oneself')
elif to_pick_up.type_ == 'Player':
raise PlayError('cannot pick up player')
+ elif to_pick_up.carried:
+ raise PlayError('thing already carried by a player')
elif to_pick_up.position not in reach:
raise PlayError('thing not in reach')
elif not to_pick_up.portable:
@@ -100,42 +109,46 @@ class Task_PICK_UP(Task):
to_pick_up = self.thing.game.get_thing(self.args[0])
to_pick_up.position = self.thing.position[:]
self.thing.carrying = to_pick_up
+ to_pick_up.carried = True
class Task_DROP(Task):
+ argtypes = 'string:direction+here'
def check(self):
if not self.thing.carrying:
raise PlayError('nothing to drop')
+ target_position = self._get_move_target()
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]:
+ and t.position == target_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:
+ target_position = self._get_move_target()
+ dropped = self.thing.uncarry()
+ dropped.position = target_position
+ if dropped.type_ == 'Bottle' and not dropped.full:
for t in [t for t in self.thing.game.things
if t.type_ == 'BottleDeposit'
- and t.position == self.thing.position]:
+ and t.position == dropped.position]:
t.accept()
- self.thing.game.things.remove(self.thing.carrying)
+ self.thing.game.remove_thing(dropped)
break
- elif self.thing.carrying.type_ == 'Hat':
+ elif dropped.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)
+ and t.position == dropped.position]:
+ t.accept(dropped)
break
- self.thing.carrying = None
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
@@ -144,6 +157,7 @@ class Task_DOOR(Task):
t.open()
else:
t.close()
+ self.thing.game.record_fov_change(t.position)
@@ -163,6 +177,7 @@ class Task_INTOXICATE(Task):
self.thing.send_msg('RANDOM_COLORS')
self.thing.send_msg('CHAT "You are drunk now."')
self.thing.drunk = 10000
+ self.thing.invalidate_map_view()
@@ -176,7 +191,6 @@ class Task_COMMAND(Task):
raise PlayError('cannot command this item type')
def do(self):
- from plomrogue.misc import quote
reply_lines = self.thing.carrying.interpret(self.args[0])
for line in reply_lines:
self.thing.send_msg('REPLY ' + quote(line))
@@ -202,8 +216,8 @@ class Task_INSTALL(Task):
def do(self):
if self.thing.carrying:
- self.thing.carrying.install()
- self.thing.carrying = None
+ t = self.thing.uncarry()
+ t.install()
self.thing.send_msg('CHAT "You install the thing you carry."')
else:
self._get_uninstallables()[0].uninstall()
@@ -225,19 +239,30 @@ class Task_WEAR(Task):
def do(self):
if self.thing.name in self.thing.game.hats:
- t = self.thing.game.thing_types['Hat'](self.thing.game,
- position=self.thing.position)
- self.thing.game.things += [t]
+ 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 t in [t for t in self.thing.game.things
- if t.type_ == 'HatRemixer'
- and t.position == self.thing.position]:
- t.accept(t)
+ 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:
self.thing.game.hats[self.thing.name] = self.thing.carrying.design
- self.thing.game.things.remove(self.thing.carrying)
+ self.thing.game.remove_thing(self.thing.carrying)
self.thing.carrying = None
self.thing.send_msg('CHAT "You put on a hat."')
+
+
+
+class Task_SPIN(Task):
+
+ def check(self):
+ if not self.thing.carrying:
+ raise PlayError('holding nothing to spin')
+ if not hasattr(self.thing.carrying, 'spinnable'):
+ raise PlayError('held object not spinnable')
+
+ def do(self):
+ self.thing.carrying.spin()