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, plugin: Refactor make_world modularity.
[plomrogue]
/
server
/
commands.py
diff --git
a/server/commands.py
b/server/commands.py
index 1ce6464a3527965e16da391940217f86cc9269c7..72018be4006a93a58a94d8e69144fed3004d9466 100644
(file)
--- 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:
"""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):
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.")
world_db["WORLD_ACTIVE"] = 1
else:
print("Ignoring: No map defined for world to activate.")
- return
def command_tid(id_string):
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"]:
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"]:
for id in world_db["ThingActions"]:
if "wait" == world_db["ThingActions"][id]["TA_NAME"]:
- wait_defined = True
break
break
-
if not wait_defined
:
+
else
:
set_world_inactive()
else:
print("Ignoring: Invalid action name.")
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):
def setter(category, key, min, max=None):