Add MAP_SIZE reply, add constraint checks.

[plomrogue2-experiments] / server.py

diff --git a/server.py b/server.py
index 4e3f4a25330c240f6798217a8bcb60994594071e..a3fa8e43eeb7c6a2ade762812e0caab8c9aa3e20 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -81,8 +81,9 @@ class IO_Handler(socketserver.BaseRequestHandler):
 
 class World:
     turn = 0
+    map_size = (5, 5)
     map_ = 'xxxxx\nx...x\nx.X.x\nx...x\nxxxxx'
-    player_pos = (3,3)
+    player_pos = (3, 3)
 
 
 def fib(n):
@@ -142,16 +143,20 @@ class CommandHandler:
         until a further INC finishes the turn.
         """
         from time import sleep
+
+        def stringify_yx(tuple_):
+            return 'Y:' + str(tuple_[0]) + ',X:' + str(tuple_[1])
+
         if self.pool_result is not None:
             self.pool_result.wait()
         self.send_all('TURN_FINISHED ' + str(self.world.turn))
         sleep(1)
         self.world.turn += 1
         self.send_all('NEW_TURN ' + str(self.world.turn))
-        self.send_all('TERRAIN ' + self.world.map_)
-        self.send_all('POSITION_Y ' + str(self.world.player_pos[0]))
-        self.send_all('POSITION_X ' + str(self.world.player_pos[1]))
-        self.pool_result = self.pool.map_async(fib, (35,35))
+        self.send_all('MAP_SIZE ' + stringify_yx(self.world.map_size))
+        self.send_all('TERRAIN\n' + self.world.map_)
+        self.send_all('POSITION ' + stringify_yx(self.world.player_pos))
+        self.pool_result = self.pool.map_async(fib, (35, 35))
 
     def cmd_get_turn(self, connection_id):
         """Send world.turn to caller."""