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"
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.
world_db["WORLD_ACTIVE"] = 0
+def integer_test(val_string, min, max):
+ """Return val_string if possible integer >= min and <= max, else False."""
+ try:
+ val = int(val_string)
+ if val < min or val > max:
+ raise ValueError
+ return val
+ except ValueError:
+ print("Ignoring: Please use integer >= " + str(min) + " and <= " +
+ str(max) + ".")
+ return False
+
+
def worlddb_value_setter(key, min, max):
"""Generate: Set world_db[key] to int(val_string) if >= min and <= max."""
def func(val_string):
- try:
- val = int(val_string)
- if val < min or val > max:
- raise ValueError
+ val = integer_test(val_string, min, max)
+ if val:
world_db[key] = val
- except ValueError:
- print("Ignoring: Please use integer >= " + str(min) + " and <= " +
- str(max) + ".")
return func
def command_worldactive(worldactive_string):
# DUMMY.
- try:
- val = int(worldactive_string)
- if not (0 == val or 1 == val):
- raise ValueError
- except ValueError:
- print("Ignoring: Please use integer 0 or 1.")
- return
- if 0 != world_db["WORLD_ACTIVE"] and 0 == val:
- set_world_inactive()
- elif 0 == world_db["WORLD_ACTIVE"]:
- wait_exists = False
- player_exists = False
- map_exists = False
- # TODO: perform tests:
- # Is there thing action of name 'wait'?
- # Is there a player thing?
- # Is there a map?
- if wait_exists and player_exists and map_exists:
- # TODO: rebuild al things' FOVs, map memories
- world_db["WORLD_ACTIVE"] = 1
+ val = integer_test(worldactive_string, 0, 1)
+ if val:
+ if 0 != world_db["WORLD_ACTIVE"] and 0 == val:
+ set_world_inactive()
+ elif 0 == world_db["WORLD_ACTIVE"]:
+ wait_exists = False
+ player_exists = False
+ map_exists = False
+ # TODO: perform tests:
+ # Is there thing action of name 'wait'?
+ # Is there a player thing?
+ # Is there a map?
+ if wait_exists and player_exists and map_exists:
+ # TODO: rebuild al things' FOVs, map memories
+ world_db["WORLD_ACTIVE"] = 1
def command_taid(id_string):
- # DUMMY
- def new(id):
- """Add new ThingAction to world_db["thing_actions"]."""
- if 0 == id:
- while 1:
- id = id + 1
- if id not in world_db["thing actions"]:
- break
- if id > 255:
- print("Ignoring: No unused ID available to add to ID list.")
- return
- world_db["thing actions"][id] = { "TA_EFFORT": 1, "TA_NAME": "wait" }
- min = 0
- max = 255
- try:
- id = int(id_string)
- if id < min or id > max:
- raise ValueError
- except ValueError:
- print("Ignoring: Please use integer >= " + str(min) + " and <= " +
- str(max) + ".")
- return
- if id in world_db["thing actions"]:
- pass # TODO: Assign ID to work on in other TA_ commands …
+ """Set ID of ThingAction to manipulate. ID unused? Create new ThingAction.
+
+ The ID of the ThingAction to manipulate is stored as command_taid.id. If
+ the integer of the input value is valid (>= 0 and <= 255), but 0, a new ID
+ is calculated: The lowest unused ID >0 and <= 255. A new ThingAction's
+ "TA_EFFORT" defaults to 1, its "TA_NAME" to "wait".
+ """
+ id = integer_test(id_string, 0, 255)
+ if id:
+ 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["ThingActions"]:
+ break
+ if id > 255:
+ print("Ignoring: "
+ "No unused ID available to add to ID list.")
+ return
+ 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:
- new(id)
- print(world_db)
+ print("No thing action defined to manipulate yet.")
+
"""Commands database.
"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)
}
"PLAYER_TYPE": 0,
"MAP_LENGTH": 64,
"WORLD_ACTIVE": 0,
- "thing actions": {},
- "thing types": {},
- "things": {}
+ "ThingActions": {},
+ "ThingTypes": {},
+ "Things": {}
}
projects / plomrogue / blobdiff