home
·
contact
·
privacy
projects
/
plomrogue2-experiments
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Create new Map object instead of changing it.
[plomrogue2-experiments]
/
game_common.py
diff --git
a/game_common.py
b/game_common.py
index b729a29b82e79818e914b5386b34c32c81dbca14..5aa4b2544729d337fcef2ee939fe1ddeddc3ea63 100644
(file)
--- a/
game_common.py
+++ b/
game_common.py
@@
-18,13
+18,6
@@
class Map:
self.terrain = self.terrain[:y * width_map] + line +\
self.terrain[(y + 1) * width_map:]
self.terrain = self.terrain[:y * width_map] + line +\
self.terrain[(y + 1) * width_map:]
- def set_size(self, yx):
- y, x = yx
- self.size = (y, x)
- self.terrain = ''
- for y in range(self.size[0]):
- self.terrain += '?' * self.size[1]
-
def get_position_index(self, yx):
return yx[0] * self.size[1] + yx[1]
def get_position_index(self, yx):
return yx[0] * self.size[1] + yx[1]
@@
-32,10
+25,11
@@
class Map:
class World:
def __init__(self):
class World:
def __init__(self):
+ self.Map = Map # child classes may use an extended Map class here
+ self.Thing = Thing # child classes may use an extended Thing class here
self.turn = 0
self.turn = 0
- self.map_ = Map()
+ self.map_ =
self.
Map()
self.things = []
self.things = []
- self.Thing = Thing # child classes may use an extended Thing class here
def get_thing(self, id_):
for thing in self.things:
def get_thing(self, id_):
for thing in self.things:
@@
-45,6
+39,9
@@
class World:
self.things += [t]
return t
self.things += [t]
return t
+ def new_map(self, yx):
+ self.map_ = self.Map(yx, '?')
+
class Thing:
class Thing:
@@
-57,10
+54,10
@@
class Thing:
class CommonCommandsMixin:
class CommonCommandsMixin:
- def cmd_MAP
_SIZE
(self, yx):
- """
Set self.map_size to yx, redraw self.terrain_map as
'?' cells."""
- self.world.
map_.set_size
(yx)
- cmd_MAP
_SIZE
.argtypes = 'yx_tuple:nonneg'
+ def cmd_MAP(self, yx):
+ """
Create new map of size yx and only
'?' cells."""
+ self.world.
new_map
(yx)
+ cmd_MAP.argtypes = 'yx_tuple:nonneg'
def cmd_THING_TYPE(self, i, type_):
t = self.world.get_thing(i)
def cmd_THING_TYPE(self, i, type_):
t = self.world.get_thing(i)