def helper(category, id_string, special_keys={}):
string = ""
- for id in world_db[category]:
+ for id in sorted(world_db[category].keys()):
string = string + id_string + " " + str(id) + "\n"
- for key in world_db[category][id]:
+ for key in sorted(world_db[category][id].keys()):
if not key in special_keys:
x = world_db[category][id][key]
argument = quote(x) if str == type(x) else str(x)
return string
string = ""
- for key in world_db:
+ for key in sorted(world_db.keys()):
if dict != type(world_db[key]) and key != "MAP" and \
key != "WORLD_ACTIVE" and key != "SEED_MAP":
string = string + key + " " + str(world_db[key]) + "\n"
string = string + "SEED_MAP " + str(world_db["SEED_MAP"]) + "\n"
string = string + helper("ThingActions", "TA_ID")
string = string + helper("ThingTypes", "TT_ID", {"TT_CORPSE_ID": False})
- for id in world_db["ThingTypes"]:
+ for id in sorted(world_db["ThingTypes"].keys()):
string = string + "TT_ID " + str(id) + "\n" + "TT_CORPSE_ID " + \
str(world_db["ThingTypes"][id]["TT_CORPSE_ID"]) + "\n"
string = string + helper("Things", "T_ID",
"T_MEMMAP": mapsetter("T_MEMMAP"),
"T_MEMTHING": memthing, "fovmap": False,
"T_MEMDEPTHMAP": mapsetter("T_MEMDEPTHMAP")})
- for id in world_db["Things"]:
+ for id in sorted(world_db["Things"].keys()):
if [] != world_db["Things"][id]["T_CARRIES"]:
string = string + "T_ID " + str(id) + "\n"
- for carried_id in world_db["Things"][id]["T_CARRIES"]:
- string = string + "T_CARRIES " + str(carried_id) + "\n"
+ for carried in sorted(world_db["Things"][id]["T_CARRIES"].keys()):
+ string = string + "T_CARRIES " + str(carried) + "\n"
string = string + "SEED_RANDOMNESS " + str(rand.seed) + "\n" + \
"WORLD_ACTIVE " + str(world_db["WORLD_ACTIVE"])
atomic_write(io_db["path_save"], string)
world_db["WORLD_ACTIVE"] = 0
-def integer_test(val_string, min, max):
- """Return val_string if possible integer >= min and <= max, else None."""
+def integer_test(val_string, min, max=None):
+ """Return val_string if integer >= min & (if max set) <= max, else None."""
try:
val = int(val_string)
- if val < min or val > max:
+ if val < min or (max != None and val > max):
raise ValueError
return val
except ValueError:
- print("Ignoring: Please use integer >= " + str(min) + " and <= " +
- str(max) + ".")
+ msg = "Ignoring: Please use integer >= " + str(min)
+ if max != None:
+ msg += " and <= " + str(max)
+ msg += "."
+ print(msg)
return None
-def setter(category, key, min, max):
+def setter(category, key, min, max=None):
"""Build setter for world_db([category + "s"][id])[key] to >=min/<=max."""
if category is None:
def f(val_string):
def id_setter(id, category, id_store=False, start_at_1=False):
"""Set ID of object of category to manipulate ID unused? Create new one.
-
The ID is stored as id_store.id (if id_store is set). If the integer of the
- input is valid (if start_at_1, >= 0 and <= 255, else >= -32768 and <=
- 32767), but <0 or (if start_at_1) <1, calculate new ID: lowest unused ID
- >=0 or (if start_at_1) >= 1, and <= 255. None is always returned when no
- new object is created, otherwise the new object's ID.
+ input is valid (if start_at_1, >= 0, else >= -1), but <0 or (if start_at_1)
+ <1, calculate new ID: lowest unused ID >=0 or (if start_at_1) >= 1. None is
+ always returned when no new object is created, else the new object's ID.
"""
- min = 0 if start_at_1 else -32768
- max = 255 if start_at_1 else 32767
+ min = 0 if start_at_1 else -1
if str == type(id):
- id = integer_test(id, min, max)
+ id = integer_test(id, min)
if None != id:
if id in world_db[category]:
if id_store:
return None
else:
if (start_at_1 and 0 == id) \
- or ((not start_at_1) and (id < 0 or id > 255)):
- id = -1
+ or ((not start_at_1) and (id < 0)):
+ id = 0 if start_at_1 else -1
while 1:
id = id + 1
if id not in world_db[category]:
break
- if id > 255:
- print("Ignoring: "
- "No unused ID available to add to ID list.")
return None
if id_store:
id_store.id = id
@test_Thing_id
def command_tcommand(str_int):
"""Set T_COMMAND of selected Thing."""
- val = integer_test(str_int, 0, 255)
+ val = integer_test(str_int, 0)
if None != val:
if 0 == val or val in world_db["ThingActions"]:
world_db["Things"][command_tid.id]["T_COMMAND"] = val
@test_Thing_id
def command_ttype(str_int):
"""Set T_TYPE of selected Thing."""
- val = integer_test(str_int, 0, 255)
+ val = integer_test(str_int, 0)
if None != val:
if val in world_db["ThingTypes"]:
world_db["Things"][command_tid.id]["T_TYPE"] = val
The ID int(str_int) must not be of the selected Thing, and must belong to a
Thing with unset "carried" flag. Its "carried" flag will be set on owning.
"""
- val = integer_test(str_int, 0, 255)
+ val = integer_test(str_int, 0)
if None != val:
if val == command_tid.id:
print("Ignoring: Thing cannot carry itself.")
The type must fit to an existing ThingType, and the position into the map.
"""
- type = integer_test(str_t, 0, 255)
+ type = integer_test(str_t, 0)
posy = integer_test(str_y, 0, 255)
posx = integer_test(str_x, 0, 255)
if None != type and None != posy and None != posx:
@test_ThingType_id
def command_ttcorpseid(str_int):
"""Set TT_CORPSE_ID of selected ThingType."""
- val = integer_test(str_int, 0, 255)
+ val = integer_test(str_int, 0)
if None != val:
if val in world_db["ThingTypes"]:
world_db["ThingTypes"][command_ttid.id]["TT_CORPSE_ID"] = val
"SEED_MAP": (1, False, command_seedmap),
"SEED_RANDOMNESS": (1, False, command_seedrandomness),
"TURN": (1, False, setter(None, "TURN", 0, 65535)),
- "PLAYER_TYPE": (1, False, setter(None, "PLAYER_TYPE", 0, 255)),
+ "PLAYER_TYPE": (1, False, setter(None, "PLAYER_TYPE", 0)),
"MAP_LENGTH": (1, False, command_maplength),
"WORLD_ACTIVE": (1, False, command_worldactive),
"TA_ID": (1, False, command_taid),
projects / plomrogue / blobdiff