X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=plomrogue-server.py;h=1fec5d5b5b5467328ca41afcca8f1d559800015f;hb=96cdebb17848901906799677f45c67263f759f6a;hp=9e4f008a5198d58d3dc937456532eaf1480a482f;hpb=b4e6d1d9288cc3b44c7b524ddd74d2feb0e24b3d;p=plomrogue
diff --git a/plomrogue-server.py b/plomrogue-server.py
index 9e4f008..1fec5d5 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -69,7 +69,7 @@ def obey(command, prefix, replay=False, do_record=False):
print("Can't tokenize command string: " + str(err) + ".")
return
if len(tokens) > 0 and tokens[0] in commands_db \
- and len(tokens) >= commands_db[tokens[0]][0] + 1:
+ and len(tokens) == commands_db[tokens[0]][0] + 1:
if commands_db[tokens[0]][1]:
commands_db[tokens[0]][2]()
elif replay:
@@ -119,7 +119,22 @@ 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().
- atomic_write(io_db["path_save"], "TURN " + str(world_db["TURN"]) + "\n")
+ 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" +
+ 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):
@@ -203,7 +218,7 @@ def replay_game():
io_db["file_record"] = open(io_db["path_record"], "r")
io_db["file_record"].prefix = "record file line "
io_db["file_record"].line_n = 1
- while world_db["turn"] < opts.replay:
+ while world_db["TURN"] < opts.replay:
line = io_db["file_record"].readline()
if "" == line:
break
@@ -234,9 +249,39 @@ def play_game():
obey(read_command(), "in file", do_record=True)
-def command_makeworld(seed):
- """Mere dummy so far."""
- print("I would build a whole world now if only I knew how.")
+def remake_map():
+ # DUMMY.
+ 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):
+ val = integer_test(val_string, min, max)
+ if val:
+ world_db[key] = val
+ return func
def command_ping():
@@ -250,29 +295,144 @@ def command_quit():
raise SystemExit("received QUIT command")
-def command_turn(turn_string):
- """Set turn to what's described in turn_string."""
- world_db["TURN"] = int(turn_string)
+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):
+ # 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("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]) 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),
- "TURN": (1, False, command_turn)
+ "SEED_MAP": (1, False, command_seedmap),
+ "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),
+ "TA_EFFORT": (1, False, command_taeffort),
+ "TA_NAME": (1, False, command_taname)
}
-"""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,
+ "MAP_LENGTH": 64,
+ "WORLD_ACTIVE": 0,
+ "ThingActions": {},
+ "ThingTypes": {},
+ "Things": {}
}