X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue-server.py;h=73d7c232febc3edf7776b899b5e7a74c8cb72d32;hb=87e07e4f2e412215019c2526430d47b26e1aafa2;hp=5028e609b905cf0fc58a93fad9dfdc5b2a19cd70;hpb=294583d0345a39cbca8c6c64a673f023826ee3e3;p=plomrogue
diff --git a/plomrogue-server.py b/plomrogue-server.py
index 5028e60..73d7c23 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -123,7 +123,8 @@ def save_world():
for id in world_db["ThingActions"]:
ta = world_db["ThingActions"][id]
ta_string = ta_string + "TA_ID " + str(id) + "\n" + \
- "TA_EFFORT " + str(ta["TA_EFFORT"]) + "\n"
+ "TA_EFFORT " + str(ta["TA_EFFORT"]) + "\n" + \
+ "TA_NAME " + ta["TA_NAME"] + "\n"
atomic_write(io_db["path_save"],
"WORLD_ACTIVE " + str(world_db["WORLD_ACTIVE"]) + "\n" +
"MAP_LENGTH " + str(world_db["MAP_LENGTH"]) + "\n" +
@@ -369,9 +370,33 @@ def command_taeffort(str_int):
if val:
world_db["ThingActions"][command_taid.id]["TA_EFFORT"] = val
else:
- print("No thing action defined to manipulate yet.")
+ print("Ignoring: No thing action defined to manipulate yet.")
+def command_taname(name):
+ """Set to name name value of ThingAction of command_taid.id.
+
+ The name must match a valid thing action function. If after the name
+ setting no ThingAction with name "wait" remains, call set_world_inactive().
+ """
+ if hasattr(command_taid, "id"):
+ if name == "wait" or name == "move" or name == "use" \
+ or name == "drop" or name == "pick_up":
+ 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:
+ set_world_inactive()
+ else:
+ print("Ignoring: Invalid action name.")
+ else:
+ print("Ignoring: No thing action defined to manipulate yet.")
+ # In contrast to the original,naming won't map a function to a ThingAction.
+
"""Commands database.
@@ -392,7 +417,8 @@ commands_db = {
"MAP_LENGTH": (1, False, command_maplength),
"WORLD_ACTIVE": (1, False, command_worldactive),
"TA_ID": (1, False, command_taid),
- "TA_EFFORT": (1, False, command_taeffort)
+ "TA_EFFORT": (1, False, command_taeffort),
+ "TA_NAME": (1, False, command_taname)
}