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 chat QUERY.
[plomrogue2]
/
plomrogue
/
tasks.py
diff --git
a/plomrogue/tasks.py
b/plomrogue/tasks.py
index 99bb41f516249e81dc3470caa09444e18c21047d..2c0c3fce395c05011a114b3227e01843f58640f2 100644
(file)
--- a/
plomrogue/tasks.py
+++ b/
plomrogue/tasks.py
@@
-1,4
+1,4
@@
-from plomrogue.errors import PlayError
+from plomrogue.errors import PlayError
, GameError
from plomrogue.mapping import YX
from plomrogue.mapping import YX
@@
-48,10
+48,12
@@
class Task_MOVE(Task):
class Task_WRITE(Task):
todo = 1
class Task_WRITE(Task):
todo = 1
- argtypes = 'string:char'
+ argtypes = 'string:char
string
'
def check(self):
def check(self):
- pass
+ if not self.thing.game.can_do_tile_with_pw(self.thing.position,
+ self.args[1]):
+ raise GameError('wrong password for tile')
def do(self):
self.thing.game.map[self.thing.position] = self.args[0]
def do(self):
self.thing.game.map[self.thing.position] = self.args[0]
@@
-60,12
+62,15
@@
class Task_WRITE(Task):
class Task_FLATTEN_SURROUNDINGS(Task):
todo = 10
class Task_FLATTEN_SURROUNDINGS(Task):
todo = 10
+ argtypes = 'string'
def check(self):
pass
def do(self):
def check(self):
pass
def do(self):
- self.thing.game.map[self.thing.position] = '.'
-
for yx in self.thing.game.map_geometry.get_neighbors(self.thing.position).values(
):
+ for yx in[self.thing.position] + \
+
list(self.thing.game.map_geometry.get_neighbors(self.thing.position).values()
):
if yx is not None:
if yx is not None:
+ if not self.thing.game.can_do_tile_with_pw(yx, self.args[0]):
+ continue
self.thing.game.map[yx] = '.'
self.thing.game.map[yx] = '.'