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
Refactor, fix typo, handle exceptions in client.
[plomrogue2-experiments]
/
server.py
diff --git
a/server.py
b/server.py
index f4e29015aa9d7e4ed82abb68aac6dcbf321dbdf6..a840bd7c38caf73884a6af88b289aba7388dd13f 100755
(executable)
--- a/
server.py
+++ b/
server.py
@@
-81,6
+81,8
@@
class IO_Handler(socketserver.BaseRequestHandler):
class World:
turn = 0
class World:
turn = 0
+ map_ = 'xxxxx\nx...x\nx.X.x\nx...x\nxxxxx'
+ player_pos = (3, 3)
def fib(n):
def fib(n):
@@
-132,7
+134,7
@@
class CommandHandler:
self.send_to(connection_id, reply)
def cmd_inc(self, connection_id):
self.send_to(connection_id, reply)
def cmd_inc(self, connection_id):
- """Increment world.turn, send
TURN_FINISHED, NEW_TURN
to everyone.
+ """Increment world.turn, send
game turn data
to everyone.
To simulate game processing waiting times, a one second delay between
TURN_FINISHED and NEW_TURN occurs; after NEW_TURN, some expensive
To simulate game processing waiting times, a one second delay between
TURN_FINISHED and NEW_TURN occurs; after NEW_TURN, some expensive
@@
-146,7
+148,10
@@
class CommandHandler:
sleep(1)
self.world.turn += 1
self.send_all('NEW_TURN ' + str(self.world.turn))
sleep(1)
self.world.turn += 1
self.send_all('NEW_TURN ' + str(self.world.turn))
- self.pool_result = self.pool.map_async(fib, (35,35))
+ self.send_all('TERRAIN\n' + 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))
def cmd_get_turn(self, connection_id):
"""Send world.turn to caller."""
def cmd_get_turn(self, connection_id):
"""Send world.turn to caller."""