X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;f=server_%2Fgame.py;h=bcf41b7ddeb10bd50f3283da04b76c898bb00c7a;hb=4fc1e457d1a4b4497334f3141a372d525d25bcfe;hp=5e38daae0a6a05eebf7610e1c5775c999b4b3e9c;hpb=b7d8d49aaca0cdfd7be583c5da44aa37e9ad693c;p=plomrogue2-experiments

diff --git a/server_/game.py b/server_/game.py
index 5e38daa..bcf41b7 100644
--- a/server_/game.py
+++ b/server_/game.py
@@ -51,7 +51,7 @@ class Map(game_common.Map):
     #    return abs(pos_1[0] - pos_2[0]) <= 1 and abs(pos_1[1] - pos_2[1] <= 1)
 
     def are_neighbors(self, pos_1, pos_2):
-        if pos_1[0] == pos_2[0] and abs(pos_1[1] - pos_2[1] <= 1):
+        if pos_1[0] == pos_2[0] and abs(pos_1[1] - pos_2[1]) <= 1:
             return True
         elif abs(pos_1[0] - pos_2[0]) == 1:
             if pos_1[0] % 2 == 0:
@@ -111,6 +111,7 @@ class World(game_common.World):
     def __init__(self):
         super().__init__()
         self.Thing = Thing  # use local Thing class instead of game_common's
+        self.Map = Map # use local Map class instead of game_common's
         self.map_ = Map()  # use extended child class
         self.player_id = 0
 
@@ -276,7 +277,7 @@ class Game(game_common.CommonCommandsMixin):
             return 'Y:' + str(tuple_[0]) + ',X:' + str(tuple_[1])
 
         self.io.send('NEW_TURN ' + str(self.world.turn))
-        self.io.send('MAP_SIZE ' + stringify_yx(self.world.map_.size))
+        self.io.send('MAP ' + stringify_yx(self.world.map_.size))
         visible_map = self.world.get_player().get_visible_map()
         for y, line in visible_map.lines():
             self.io.send('VISIBLE_MAP_LINE %5s %s' % (y, self.io.quote(line)))