home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Password-protect tiles from (un-)installing things on them.
[plomrogue2]
/
plomrogue
/
game.py
diff --git
a/plomrogue/game.py
b/plomrogue/game.py
index 143248f4e7afaf0546beca3431fe1df485ca2887..d390e94d95e87a23c4cdddbeffb79119849d605f 100755
(executable)
--- a/
plomrogue/game.py
+++ b/
plomrogue/game.py
@@
-184,6
+184,8
@@
class Game(GameBase):
def get_string_options(self, string_option_type):
if string_option_type == 'direction':
return self.map_geometry.directions
def get_string_options(self, string_option_type):
if string_option_type == 'direction':
return self.map_geometry.directions
+ elif string_option_type == 'direction+here':
+ return ['HERE'] + self.map_geometry.directions
elif string_option_type == 'char':
return [c for c in
string.digits + string.ascii_letters + string.punctuation + ' ']
elif string_option_type == 'char':
return [c for c in
string.digits + string.ascii_letters + string.punctuation + ' ']
@@
-211,6
+213,8
@@
class Game(GameBase):
return None
def remove_thing(self, t):
return None
def remove_thing(self, t):
+ if t.carrying:
+ t.uncarry()
self.things.remove(t)
self.record_fov_change(t.position)
self.things.remove(t)
self.record_fov_change(t.position)
@@
-245,7
+249,7
@@
class Game(GameBase):
player_fovs += [player._fov]
player_fov_ids += [player.id_]
new_fovs = []
player_fovs += [player._fov]
player_fov_ids += [player.id_]
new_fovs = []
- single_core_until =
8
# since multiprocess has its own overhead
+ single_core_until =
16
# since multiprocess has its own overhead
if len(player_fovs) > single_core_until:
pool = multiprocessing.Pool()
new_fovs = pool.map(FovMap.init_terrain, [fov for fov in player_fovs])
if len(player_fovs) > single_core_until:
pool = multiprocessing.Pool()
new_fovs = pool.map(FovMap.init_terrain, [fov for fov in player_fovs])
@@
-287,6
+291,9
@@
class Game(GameBase):
c_id)
if hasattr(t, 'installable') and not t.portable:
self.io.send('THING_INSTALLED %s' % (t.id_), c_id)
c_id)
if hasattr(t, 'installable') and not t.portable:
self.io.send('THING_INSTALLED %s' % (t.id_), c_id)
+ if hasattr(t, 'design'):
+ self.io.send('THING_HAT %s %s' % (t.id_,
+ quote(t.design)), c_id)
for big_yx in self.portals:
for little_yx in [little_yx for little_yx in self.portals[big_yx]
if player.fov_test(big_yx, little_yx)]:
for big_yx in self.portals:
for little_yx in [little_yx for little_yx in self.portals[big_yx]
if player.fov_test(big_yx, little_yx)]:
@@
-352,6
+359,7
@@
class Game(GameBase):
y_range_end = absolute_position.y + fov_radius
x_range_start = absolute_position.x - fov_radius
x_range_end = absolute_position.x + fov_radius
y_range_end = absolute_position.y + fov_radius
x_range_start = absolute_position.x - fov_radius
x_range_end = absolute_position.x + fov_radius
+ # TODO: refactor with SourcedMap.inside?
for position in self.changed_tiles:
if position.y < y_range_start\
or position.y > y_range_end:
for position in self.changed_tiles:
if position.y < y_range_start\
or position.y > y_range_end: