home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make thing dropping directional.
[plomrogue2]
/
plomrogue
/
tasks.py
diff --git
a/plomrogue/tasks.py
b/plomrogue/tasks.py
index a5407f345867a7c5f8ad8cc2c632cdbc411d4cbc..d8d118a78108eb9fce1cad108816ac8509c8dd94 100644
(file)
--- a/
plomrogue/tasks.py
+++ b/
plomrogue/tasks.py
@@
-10,6
+10,12
@@
class Task:
self.thing = thing
self.args = args
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
def check(self):
pass
@@
-25,12
+31,8
@@
class Task_WAIT(Task):
class Task_MOVE(Task):
argtypes = 'string:direction'
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):
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')
if test_yxyx in [t.position for t in self.thing.game.things
if t.blocking]:
raise PlayError('blocked by other thing')
@@
-39,7
+41,7
@@
class Task_MOVE(Task):
def do(self):
self.thing.game.record_fov_change(self.thing.position)
def do(self):
self.thing.game.record_fov_change(self.thing.position)
- self.thing.position = self.get_move_target()
+ 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
self.thing.game.record_fov_change(self.thing.position)
if self.thing.carrying:
self.thing.carrying.position = self.thing.position
@@
-95,6
+97,8
@@
class Task_PICK_UP(Task):
raise PlayError('cannot pick up oneself')
elif to_pick_up.type_ == 'Player':
raise PlayError('cannot pick up player')
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:
elif to_pick_up.position not in reach:
raise PlayError('thing not in reach')
elif not to_pick_up.portable:
@@
-104,42
+108,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 = 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):
class Task_DROP(Task):
+ argtypes = 'string:direction+here'
def check(self):
if not self.thing.carrying:
raise PlayError('nothing to drop')
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'
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):
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'
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()
t.accept()
- self.thing.game.remove_thing(
self.thing.carrying
)
+ self.thing.game.remove_thing(
dropped
)
break
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'
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
break
- self.thing.carrying = None
class Task_DOOR(Task):
def do(self):
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
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
@@
-208,8
+216,8
@@
class Task_INSTALL(Task):
def do(self):
if self.thing.carrying:
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()
self.thing.send_msg('CHAT "You install the thing you carry."')
else:
self._get_uninstallables()[0].uninstall()