home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Server: Make ai func selectable.
[plomrogue]
/
server
/
world.py
diff --git
a/server/world.py
b/server/world.py
index f31c3a69cae77efcd104006f1e0ce88c52c700c8..9bd9f6d197f3e65bc09f0bcfebd27643189ceef1 100644
(file)
--- a/
server/world.py
+++ b/
server/world.py
@@
-264,6
+264,10
@@
def make_world(seed):
return (y, x)
rand.seed = seed
return (y, x)
rand.seed = seed
+ if world_db["MAP_LENGTH"] < 1:
+ print("Ignoring: No map length >= 1 defined.")
+ return
+ libpr.set_maplength(world_db["MAP_LENGTH"])
player_will_be_generated = False
playertype = world_db["PLAYER_TYPE"]
for ThingType in world_db["ThingTypes"]:
player_will_be_generated = False
playertype = world_db["PLAYER_TYPE"]
for ThingType in world_db["ThingTypes"]:
@@
-305,8
+309,7
@@
def make_world(seed):
def turn_over():
"""Run game world and its inhabitants until new player input expected."""
def turn_over():
"""Run game world and its inhabitants until new player input expected."""
- from server.config.actions import action_db
- from server.ai import ai
+ from server.config.actions import action_db, ai_func
id = 0
whilebreaker = False
while world_db["Things"][0]["T_LIFEPOINTS"]:
id = 0
whilebreaker = False
while world_db["Things"][0]["T_LIFEPOINTS"]:
@@
-327,7
+330,7
@@
def turn_over():
if 0 == id:
whilebreaker = True
break
if 0 == id:
whilebreaker = True
break
- ai(Thing)
+ ai
_func
(Thing)
try_healing(Thing)
hunger(Thing)
if Thing["T_LIFEPOINTS"]:
try_healing(Thing)
hunger(Thing)
if Thing["T_LIFEPOINTS"]:
@@
-338,7
+341,6
@@
def turn_over():
if Thing["T_PROGRESS"] == ThingAction["TA_EFFORT"]:
action = action_db["actor_" + ThingAction["TA_NAME"]]
action(Thing)
if Thing["T_PROGRESS"] == ThingAction["TA_EFFORT"]:
action = action_db["actor_" + ThingAction["TA_NAME"]]
action(Thing)
- #eval("actor_" + ThingAction["TA_NAME"])(Thing)
Thing["T_COMMAND"] = 0
Thing["T_PROGRESS"] = 0
thingproliferation(Thing, proliferable_map)
Thing["T_COMMAND"] = 0
Thing["T_PROGRESS"] = 0
thingproliferation(Thing, proliferable_map)