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
Fix faulty assumption about position of player in world.things.
[plomrogue2-experiments]
/
server_
/
game.py
diff --git
a/server_/game.py
b/server_/game.py
index da2f61184b43bce0052d42139c438fd6fee7e54c..148c5c7c8fd9db3909df52eea4213ce6284476df 100644
(file)
--- a/
server_/game.py
+++ b/
server_/game.py
@@
-38,16
+38,20
@@
class World(game_common.World):
the player's task is finished, the loop breaks.
"""
while True:
the player's task is finished, the loop breaks.
"""
while True:
- for thing in self.things[self.player_id+1:]:
+ player = self.get_player()
+ player_i = self.things.index(player)
+ for thing in self.things[player_i+1:]:
thing.proceed()
self.turn += 1
thing.proceed()
self.turn += 1
- for thing in self.things[:
self.player_id
]:
+ for thing in self.things[:
player_i
]:
thing.proceed()
thing.proceed()
- player = self.get_thing(self.player_id)
player.proceed(is_AI=False)
if player.task is None:
break
player.proceed(is_AI=False)
if player.task is None:
break
+ def get_player(self):
+ return self.get_thing(self.player_id)
+
class Task:
class Task: