X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=server%2Fcommands.py;h=fc384528704cf88e8cfec3b975a857d1433594f2;hb=9ae02cea8243472195d97b756542f9d344a67459;hp=1ce6464a3527965e16da391940217f86cc9269c7;hpb=65c57618b95b9111b07f8fbc4c38c99d942a272a;p=plomrogue
diff --git a/server/commands.py b/server/commands.py
index 1ce6464..fc38452 100644
--- a/server/commands.py
+++ b/server/commands.py
@@ -87,8 +87,8 @@ def command_makeworld(seed_string):
"""Call make_world()."""
val = integer_test(seed_string, 0, 4294967295)
if None != val:
- from server.config.misc import make_world_func
- make_world_func(val)
+ from server.make_world import make_world
+ make_world(val)
def command_maplength(maplength_string):
@@ -142,7 +142,6 @@ def command_worldactive(worldactive_string):
world_db["WORLD_ACTIVE"] = 1
else:
print("Ignoring: No map defined for world to activate.")
- return
def command_tid(id_string):
@@ -316,16 +315,13 @@ def command_taname(name):
or name == "pickup":
world_db["ThingActions"][command_taid.id]["TA_NAME"] = name
if 1 == world_db["WORLD_ACTIVE"]:
- wait_defined = False
for id in world_db["ThingActions"]:
if "wait" == world_db["ThingActions"][id]["TA_NAME"]:
- wait_defined = True
break
- if not wait_defined:
+ else:
set_world_inactive()
else:
print("Ignoring: Invalid action name.")
- # In contrast to the original,naming won't map a function to a ThingAction.
def setter(category, key, min, max=None):
@@ -517,6 +513,6 @@ def play_move(str_arg):
def command_ai():
"""Call ai() on player Thing, then turn_over()."""
- from server.config.actions import ai_func
- ai_func(world_db["Things"][0])
+ from server.ai import ai
+ ai(world_db["Things"][0])
turn_over()