X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=5028e609b905cf0fc58a93fad9dfdc5b2a19cd70;hb=294583d0345a39cbca8c6c64a673f023826ee3e3;hp=5a45c1b18b41fbd2b56956e3fb069c6d2c5d003e;hpb=3598b2537f135ff7b7635e22a823661c6bdb9ff5;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index 5a45c1b..5028e60 100755 --- a/plomrogue-server.py +++ b/plomrogue-server.py @@ -119,11 +119,21 @@ 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" 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. def obey_lines_in_file(path, name, do_record=False): @@ -243,17 +253,33 @@ def remake_map(): print("I'd (re-)make the map now, if only I knew how.") +def set_world_inactive(): + """Set world_db["WORLD_ACTIVE"] to 0 and remove worldstate file.""" + server_test() + if os.access(io_db["path_worldstate"], os.F_OK): + os.remove(io_db["path_worldstate"]) + 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 @@ -275,9 +301,76 @@ def command_seedmap(seed_string): def command_makeworld(seed_string): - # Mere dummy so far. + # DUMMY. worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string) worlddb_value_setter("SEED_RANDOMNESS", 0, 4294967295)(seed_string) + # TODO: Test for existence of player thing and 'wait' thing action? + + +def command_maplength(maplength_string): + # DUMMY. + set_world_inactive() + # TODO: remove things, map + worlddb_value_setter("MAP_LENGTH", 1, 256)(maplength_string) + + +def command_worldactive(worldactive_string): + # DUMMY. + 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): + """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: + print("No thing action defined to manipulate yet.") + """Commands database. @@ -295,16 +388,25 @@ commands_db = { "SEED_RANDOMNESS": (1, False, worlddb_value_setter("SEED_RANDOMNESS", 0, 4294967295)), "TURN": (1, False, worlddb_value_setter("TURN", 0, 65535)), - "PLAYER_TYPE": (1, False, worlddb_value_setter("PLAYER_TYPE", 0, 255)) + "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_EFFORT": (1, False, command_taeffort) } -"""World state database,""" +"""World state database. With sane default values.""" world_db = { - "TURN": 0, + "TURN": 1, "SEED_MAP": 0, "SEED_RANDOMNESS": 0, - "PLAYER_TYPE": 0 + "PLAYER_TYPE": 0, + "MAP_LENGTH": 64, + "WORLD_ACTIVE": 0, + "ThingActions": {}, + "ThingTypes": {}, + "Things": {} }