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
Add MAP_SIZE reply, add constraint checks.
[plomrogue2-experiments]
/
server.py
diff --git
a/server.py
b/server.py
index 90e8c0b84dc8312c6d76b99408d6ec399a4e1518..a3fa8e43eeb7c6a2ade762812e0caab8c9aa3e20 100755
(executable)
--- a/
server.py
+++ b/
server.py
@@
-81,6
+81,7
@@
class IO_Handler(socketserver.BaseRequestHandler):
class World:
turn = 0
class World:
turn = 0
+ map_size = (5, 5)
map_ = 'xxxxx\nx...x\nx.X.x\nx...x\nxxxxx'
player_pos = (3, 3)
map_ = 'xxxxx\nx...x\nx.X.x\nx...x\nxxxxx'
player_pos = (3, 3)
@@
-142,15
+143,19
@@
class CommandHandler:
until a further INC finishes the turn.
"""
from time import sleep
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))
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('MAP_SIZE ' + stringify_yx(self.world.map_size))
self.send_all('TERRAIN\n' + self.world.map_)
self.send_all('TERRAIN\n' + self.world.map_)
- self.send_all('POSITION y:' + str(self.world.player_pos[0]) +
- ',x:' + str(self.world.player_pos[1]))
+ 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):
self.pool_result = self.pool.map_async(fib, (35, 35))
def cmd_get_turn(self, connection_id):