home
·
contact
·
privacy
projects
/
plomrogue
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e94d05a
)
Server: Simplify turn_over().
author
Christian Heller
<c.heller@plomlompom.de>
Fri, 26 Feb 2016 12:21:40 +0000
(13:21 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Fri, 26 Feb 2016 12:21:40 +0000
(13:21 +0100)
server/world.py
patch
|
blob
|
history
diff --git
a/server/world.py
b/server/world.py
index f0156a355b6519119faaac8f71b5e48a5e3f6100..0e07785fe53d83d4431524b6b858437967a9cac2 100644
(file)
--- a/
server/world.py
+++ b/
server/world.py
@@
-56,7
+56,6
@@
def turn_over():
from server.config.misc import thingproliferation_func, calc_effort_func
from server.update_map_memory import update_map_memory
id = 0
from server.config.misc import thingproliferation_func, calc_effort_func
from server.update_map_memory import update_map_memory
id = 0
- whilebreaker = False
while world_db["Things"][0]["T_LIFEPOINTS"]:
proliferable_map = world_db["MAP"][:]
for id in [id for id in world_db["Things"]
while world_db["Things"][0]["T_LIFEPOINTS"]:
proliferable_map = world_db["MAP"][:]
for id in [id for id in world_db["Things"]
@@
-73,8
+72,7
@@
def turn_over():
if not Thing["T_COMMAND"]:
update_map_memory(Thing)
if 0 == id:
if not Thing["T_COMMAND"]:
update_map_memory(Thing)
if 0 == id:
- whilebreaker = True
- break
+ return
ai_func(Thing)
try_healing(Thing)
hunger(Thing)
ai_func(Thing)
try_healing(Thing)
hunger(Thing)
@@
-90,6
+88,4
@@
def turn_over():
Thing["T_COMMAND"] = 0
Thing["T_PROGRESS"] = 0
thingproliferation_func(Thing, proliferable_map)
Thing["T_COMMAND"] = 0
Thing["T_PROGRESS"] = 0
thingproliferation_func(Thing, proliferable_map)
- if whilebreaker:
- break
world_db["TURN"] += 1
world_db["TURN"] += 1