home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove redundant SourcedMap center neutralization.
[plomrogue2]
/
plomrogue
/
tasks.py
diff --git
a/plomrogue/tasks.py
b/plomrogue/tasks.py
index 4a6df1641202d75ca66f7f1a057d779774f155f9..1dec10d7e8b1a639474ba8e07d6e371cf1963185 100644
(file)
--- a/
plomrogue/tasks.py
+++ b/
plomrogue/tasks.py
@@
-36,15
+36,19
@@
class Task_MOVE(Task):
test_yxyx = self._get_move_target()
move_blockers = self.thing.game.get_movement_blockers()
if test_yxyx in [t.position for t in self.thing.game.things
test_yxyx = self._get_move_target()
move_blockers = self.thing.game.get_movement_blockers()
if test_yxyx in [t.position for t in self.thing.game.things
- if t.block
ing
]:
+ if t.block
s_movement
]:
raise PlayError('blocked by other thing')
elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] in move_blockers:
raise PlayError('blocked by impassable tile')
def do(self):
raise PlayError('blocked by other thing')
elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] in move_blockers:
raise PlayError('blocked by impassable tile')
def do(self):
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
+ if self.thing.blocks_light:
+ self.thing.game.record_change(self.thing.position, 'fov')
self.thing.position = self._get_move_target()
self.thing.position = self._get_move_target()
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
+ if self.thing.blocks_light:
+ self.thing.game.record_change(self.thing.position, 'fov')
if self.thing.carrying:
self.thing.carrying.position = self.thing.position
if self.thing.carrying:
self.thing.carrying.position = self.thing.position
@@
-62,7
+66,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]
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)
)
+ self.thing.game.record_
change((big_yx, little_yx), 'fov'
)
@@
-79,7
+83,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.get_flatland()
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.get_flatland()
- self.thing.game.record_
fov_change(yxyx
)
+ self.thing.game.record_
change(yxyx, 'fov'
)
@@
-111,8
+115,7
@@
class Task_PICK_UP(Task):
to_pick_up.position = self.thing.position[:]
self.thing.carrying = to_pick_up
to_pick_up.carried = True
to_pick_up.position = self.thing.position[:]
self.thing.carrying = to_pick_up
to_pick_up.carried = True
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
@@
-155,8
+158,7
@@
class Task_DROP(Task):
and t.position == dropped.position]:
t.accept(dropped)
break
and t.position == dropped.position]:
t.accept(dropped)
break
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
@@
-167,11
+169,12
@@
class Task_DOOR(Task):
get_neighbors_yxyx(self.thing.position).values())
for t in [t for t in self.thing.game.things if
t.type_ == 'Door' and t.position in action_radius]:
get_neighbors_yxyx(self.thing.position).values())
for t in [t for t in self.thing.game.things if
t.type_ == 'Door' and t.position in action_radius]:
- if t.block
ing
:
+ if t.block
s_movement
:
t.open()
else:
t.close()
t.open()
else:
t.close()
- self.thing.game.record_fov_change(t.position)
+ self.thing.game.record_change(t.position, 'other')
+ self.thing.game.record_change(t.position, 'fov')
@@
-193,8
+196,8
@@
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.send_msg('RANDOM_COLORS')
self.thing.send_msg('CHAT "You are drunk now."')
self.thing.drunk = 10000
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_
fov_change(self.thing.position
)
+ self.thing.invalidate('fov')
+ self.thing.game.record_
change(self.thing.position, 'other'
)
elif self.thing.carrying.type_ == 'Cookie':
self.thing.send_msg('CHAT ' + quote('You eat a cookie and gain the ability to draw the following character: "%s"' % self.thing.carrying.thing_char))
self.thing.add_cookie_char(self.thing.carrying.thing_char)
elif self.thing.carrying.type_ == 'Cookie':
self.thing.send_msg('CHAT ' + quote('You eat a cookie and gain the ability to draw the following character: "%s"' % self.thing.carrying.thing_char))
self.thing.add_cookie_char(self.thing.carrying.thing_char)
@@
-248,8
+251,7
@@
class Task_INSTALL(Task):
else:
self._get_uninstallables()[0].uninstall()
self.thing.send_msg('CHAT "You uninstall the thing here."')
else:
self._get_uninstallables()[0].uninstall()
self.thing.send_msg('CHAT "You uninstall the thing here."')
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')
@@
-285,10
+287,9
@@
class Task_WEAR(Task):
self.thing.game.hats[self.thing.name] =\
self.thing.carrying.design
self.thing.send_msg('CHAT "You put on a hat."')
self.thing.game.hats[self.thing.name] =\
self.thing.carrying.design
self.thing.send_msg('CHAT "You put on a hat."')
- dropped = self.uncarry()
+ dropped = self.
thing.
uncarry()
self.thing.game.remove_thing(dropped)
self.thing.game.remove_thing(dropped)
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ self.thing.game.record_change(self.thing.position, 'other')