X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=3b8639bfb3883bf7c3a3e5acec324b0f1c5bd4a2;hb=59ce8a7af974dd20b24d4054a57c0f8377e153bb;hp=7b1fefbaa2c0c3a004c87def831f097846acdaee;hpb=1f530d9bf745036092ef4c344137ced7bafbd153;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index 7b1fefb..3b8639b 100755 --- a/plomrogue-server.py +++ b/plomrogue-server.py @@ -120,9 +120,14 @@ def save_world(): # Dummy for saving all commands to reconstruct current world state. # Misses same optimizations as record() from the original record(). 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") + # 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): @@ -237,73 +242,145 @@ def play_game(): obey(read_command(), "in file", do_record=True) -def command_ping(): - """Send PONG line to server output file.""" - io_db["file_out"].write("PONG\n") - io_db["file_out"].flush() +def remake_map(): + # DUMMY. + print("I'd (re-)make the map now, if only I knew how.") -def command_quit(): - """Abort server process.""" - raise SystemExit("received QUIT command") +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 set_world_db_integer_value(key, val_string, min, max): - """Set world_db[key] to int(val_string) if legal value >= min & <= max.""" +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 - world_db[key] = val + return val except ValueError: print("Ignoring: Please use integer >= " + str(min) + " and <= " + - "str(max)+ '.") + 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): + val = integer_test(val_string, min, max) + if val: + world_db[key] = val + return func -def command_turn(turn_string): - """Set turn to what's described in turn_string.""" - set_world_db_integer_value("TURN", turn_string, 0, 65535) +def command_ping(): + """Send PONG line to server output file.""" + io_db["file_out"].write("PONG\n") + io_db["file_out"].flush() -def command_seedmap(mapseed_string): - """Set map seed to what's described in mapseed_string.""" - set_world_db_integer_value("SEED_MAP", mapseed_string, 0, 4294967295) +def command_quit(): + """Abort server process.""" + raise SystemExit("received QUIT command") -def command_seedrandomness(randseed_string): - """Set randomness seed to what's described in randseed_string.""" - set_world_db_integer_value("SEED_RANDOMNESS", randseed_string, 0, - 4294967295) + +def command_seedmap(seed_string): + """Set world_db["SEED_MAP"] to int(seed_string), then (re-)make map.""" + worlddb_value_setter("SEED_MAP", 0, 4294967295)(seed_string) + remake_map() def command_makeworld(seed_string): - # Mere dummy so far. - set_world_db_integer_value("SEED_MAP", seed_string, 0, 4294967295) - set_world_db_integer_value("SEED_RANDOMNESS", seed_string, 0, 4294967295) + # 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): + # 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" } + val = integer_test(id_string, 0, 255) + if val: + if id in world_db["thing actions"]: + pass # TODO: Assign ID to work on in other TA_ commands … + else: + new(id) """Commands database. -Map command start tokens to ([0]) minimum number of expected command arguments, -([1]) the command's meta-ness (i.e. is it to be written to the record file, is -it to be ignored in replay mode if read from server input file), and ([2]) a -function to be called on it. +Map command start tokens to ([0]) number of expected command arguments, ([1]) +the command's meta-ness (i.e. is it to be written to the record file, is it to +be ignored in replay mode if read from server input file), and ([2]) a function +to be called on it. """ commands_db = { "QUIT": (0, True, command_quit), "PING": (0, True, command_ping), "MAKE_WORLD": (1, False, command_makeworld), "SEED_MAP": (1, False, command_seedmap), - "SEED_RANDOMNESS": (1, False, command_seedrandomness), - "TURN": (1, False, command_turn) + "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)), + "MAP_LENGTH": (1, False, command_maplength), + "WORLD_ACTIVE": (1, False, command_worldactive), + "TA_ID": (1, False, command_taid) } -"""World state database,""" +"""World state database. With sane default values.""" world_db = { - "TURN": 0, + "TURN": 1, "SEED_MAP": 0, - "SEED_RANDOMNESS": 0 + "SEED_RANDOMNESS": 0, + "PLAYER_TYPE": 0, + "MAP_LENGTH": 64, + "WORLD_ACTIVE": 0, + "thing actions": {}, + "thing types": {}, + "things": {} }