X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=server_%2Fgame.py;h=82759c25aee6b97fa37e978589f1fc3d05744aae;hb=f2dd5a3a7f60321fdfd4189d453ac952f6b15716;hp=87d7a5359c9d9f4d9051433602afcf8e9ade0063;hpb=4592fd68c258ae32b8e7156a6509cff75bfe946d;p=plomrogue2-experiments

diff --git a/server_/game.py b/server_/game.py
index 87d7a53..82759c2 100644
--- a/server_/game.py
+++ b/server_/game.py
@@ -9,6 +9,18 @@ class GameError(Exception):
 
 class Map(game_common.Map):
 
+    def __getitem__(self, yx):
+        return self.terrain[self.get_pos_i(yx)]
+
+    def __setitem__(self, yx, c):
+        pos_i = self.get_pos_i(yx)
+        self.terrain = self.terrain[:pos_i] + c + self.terrain[pos_i + 1:]
+
+    def __iter__(self):
+        for y in range(self.size[0]):
+            for x in range(self.size[1]):
+                yield [y, x]
+
     @property
     def size_i(self):
         return self.size[0] * self.size[1]
@@ -27,21 +39,9 @@ class Map(game_common.Map):
     def get_pos_i(self, yx):
         return yx[0] * self.size[1] + yx[1]
 
-    def set_terrain_at(self, pos, c):
-        pos_i = self.get_pos_i(pos)
-        self.terrain = self.terrain[:pos_i] + c + self.terrain[pos_i + 1:]
-
-    def get_terrain_at(self, yx):
-        return self.terrain[self.get_pos_i(yx)]
-
     def new_from_shape(self, init_char):
         return Map(self.size, init_char*self.size_i)
 
-    def iterate(self):
-        for y in range(self.size[0]):
-            for x in range(self.size[1]):
-                yield [y, x]
-
     def are_neighbors(self, pos_1, pos_2):
         return abs(pos_1[0] - pos_2[0]) <= 1 and abs(pos_1[1] - pos_2[1] <= 1)
 
@@ -117,10 +117,8 @@ class Task:
                 direction = self.args[0]
             else:
                 direction = self.kwargs['direction']
-            test_pos = self.thing.world.map_.move(self.thing.position,
-                                                  direction)
-            map_tile = self.thing.world.map_.get_terrain_at(test_pos)
-            if map_tile != '.':
+            test_pos = self.thing.world.map_.move(self.thing.position, direction)
+            if self.thing.world.map_[test_pos] != '.':
                 raise GameError('would move into illegal terrain')
             for t in self.thing.world.things:
                 if t.position == test_pos:
@@ -187,25 +185,25 @@ class Thing(game_common.Thing):
         if self._stencil is not None:
             return self._stencil
         m = self.world.map_.new_from_shape('?')
-        for pos in m.iterate():
+        for pos in m:
             if pos == self.position or m.are_neighbors(pos, self.position):
-                m.set_terrain_at(pos, '.')
+                m[pos] = '.'
         self._stencil = m
         return self._stencil
 
     def get_visible_map(self):
         stencil = self.get_stencil()
         m = self.world.map_.new_from_shape(' ')
-        for pos in m.iterate():
-            if stencil.get_terrain_at(pos) == '.':
-                m.set_terrain_at(pos, self.world.map_.get_terrain_at(pos))
+        for pos in m:
+            if stencil[pos] == '.':
+                m[pos] = self.world.map_[pos]
         return m
 
     def get_visible_things(self):
         stencil = self.get_stencil()
         visible_things = []
         for thing in self.world.things:
-            if stencil.get_terrain_at(thing.position) == '.':
+            if stencil[thing.position] == '.':
                 visible_things += [thing]
         return visible_things