X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=plomrogue-server.py;h=1fec5d5b5b5467328ca41afcca8f1d559800015f;hb=96cdebb17848901906799677f45c67263f759f6a;hp=7c4a663a617b90ce8bdb7b8c300afdd7ae811297;hpb=41630461a19fa3c38560011bdf44296f2c02ccbb;p=plomrogue
diff --git a/plomrogue-server.py b/plomrogue-server.py
index 7c4a663..1fec5d5 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -119,13 +119,20 @@ def record(command):
def save_world():
# Dummy for saving all commands to reconstruct current world state.
# Misses same optimizations as record() from the original record().
+ ta_string = ""
+ 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_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" +
"PLAYER_TYPE " + str(world_db["PLAYER_TYPE"]) + "\n" +
"TURN " + str(world_db["TURN"]) + "\n" +
"SEED_RANDOMNESS " + str(world_db["SEED_RANDOMNESS"]) + "\n" +
- "SEED_MAP " + str(world_db["SEED_MAP"]) + "\n")
+ "SEED_MAP " + str(world_db["SEED_MAP"]) + "\n" +
+ ta_string)
# TODO: If all this ever does is just writing down what's in world_db, some
# loop over its entries should be all that's needed.
@@ -337,26 +344,60 @@ def command_taid(id_string):
"""
id = integer_test(id_string, 0, 255)
if id:
- if id in world_db["thing actions"]:
+ if id in world_db["ThingActions"]:
command_taid.id = id
else:
-
if 0 == id:
while 1:
id = id + 1
- if id not in world_db["thing actions"]:
+ if id not in world_db["ThingActions"]:
break
if id > 255:
print("Ignoring: "
"No unused ID available to add to ID list.")
return
- world_db["thing actions"][id] = {
+ world_db["ThingActions"][id] = {
"TA_EFFORT": 1,
"TA_NAME": "wait"
}
command_taid.id = id
+def command_taeffort(str_int):
+ """Set to int(str_int) effort value of ThingAction of command_taid.id."""
+ if hasattr(command_taid, "id"):
+ val = integer_test(str_int, 0, 255)
+ if val:
+ world_db["ThingActions"][command_taid.id]["TA_EFFORT"] = val
+ else:
+ 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("No thing action defined to manipulate yet.")
+ # In contrast to the original,naming won't map a function to a ThingAction.
+
+
"""Commands database.
Map command start tokens to ([0]) number of expected command arguments, ([1])
@@ -375,7 +416,9 @@ commands_db = {
"PLAYER_TYPE": (1, False, worlddb_value_setter("PLAYER_TYPE", 0, 255)),
"MAP_LENGTH": (1, False, command_maplength),
"WORLD_ACTIVE": (1, False, command_worldactive),
- "TA_ID": (1, False, command_taid)
+ "TA_ID": (1, False, command_taid),
+ "TA_EFFORT": (1, False, command_taeffort),
+ "TA_NAME": (1, False, command_taname)
}
@@ -387,9 +430,9 @@ world_db = {
"PLAYER_TYPE": 0,
"MAP_LENGTH": 64,
"WORLD_ACTIVE": 0,
- "thing actions": {},
- "thing types": {},
- "things": {}
+ "ThingActions": {},
+ "ThingTypes": {},
+ "Things": {}
}