X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/static/git-logo.png?a=blobdiff_plain;ds=sidebyside;f=roguelike-server;h=773a2fa4a5827fb6639974ff9cc2ef03637b9fc5;hb=fa1580196b809e6f14e59e59fe92d36664b49f27;hp=9d53bd0d2e08ade07eb41480bf27da00aa5f00b5;hpb=41444a809c3acb7804666844ad4506cd326010e1;p=plomrogue

diff --git a/roguelike-server b/roguelike-server
index 9d53bd0..773a2fa 100755
--- a/roguelike-server
+++ b/roguelike-server
@@ -15,6 +15,10 @@ import ctypes
 import math
 
 
+from server.config.world_data import world_db, directions_db
+from server.config.io import io_db
+
+
 class RandomnessIO:
     """"Interface to libplomrogue's pseudo-randomness generator."""
 
@@ -34,7 +38,7 @@ def prep_library():
     """Prepare ctypes library at ./libplomrogue.so"""
     libpath = ("./libplomrogue.so")
     if not os.access(libpath, os.F_OK):
-        raise SystemExit("No library " + libpath + ", run ./redo first?")
+        raise SystemExit("No library " + libpath + ", run ./build.sh first?")
     libpr = ctypes.cdll.LoadLibrary(libpath)
     libpr.seed_rrand.restype = ctypes.c_uint32
     return libpr
@@ -56,7 +60,7 @@ def setup_server_io():
     """Fill IO files DB with proper file( path)s. Write process IO test string.
 
     Ensure IO files directory at server/. Remove any old input file if found.
-    Set up new input file for reading, and new output file for writing. Start
+    Set up new input file for reading, and new output file for appending. Start
     output file with process hash line of format PID + " " + floated UNIX time
     (io_db["teststring"]). Raise SystemExit if file is found at path of either
     record or save file plus io_db["tmp_suffix"].
@@ -73,7 +77,7 @@ def setup_server_io():
     io_db["verbose"] = False
     io_db["record_chunk"] = ""
     os.makedirs(io_db["path_server"], exist_ok=True)
-    io_db["file_out"] = open(io_db["path_out"], "w")
+    io_db["file_out"] = open(io_db["path_out"], "a")
     strong_write(io_db["file_out"], io_db["teststring"] + "\n")
     if os.access(io_db["path_in"], os.F_OK):
         os.remove(io_db["path_in"])
@@ -585,11 +589,6 @@ def build_fov_map(t):
         raise RuntimeError("Malloc error in build_fov_Map().")
 
 
-def log_help():
-    """Send quick usage info to log."""
-    log("LOG See README file for help.")
-
-
 def decrement_lifepoints(t):
     """Decrement t's lifepoints by 1, and if to zero, corpse it.
 
@@ -1140,6 +1139,15 @@ def id_setter(id, category, id_store=False, start_at_1=False):
     return id
 
 
+def command_plugin(str_plugin):
+    """Run code in plugins/[str_plugin]."""
+    if (str_plugin.replace("_", "").isalnum()
+        and os.access("plugins/" + str_plugin, os.F_OK)):
+        exec(open("plugins/" + str_plugin).read())
+        return
+    print("Bad plugin name:", str_plugin)
+
+
 def command_ping():
     """Send PONG line to server output file."""
     strong_write(io_db["file_out"], "PONG\n")
@@ -1279,7 +1287,6 @@ def command_makeworld(seed_string):
     according to ThingTypes' TT_START_NUMBERS, with Thing of ID 0 to ThingType
     of ID = world["PLAYER_TYPE"]. Place Things randomly, and actors not on each
     other. Init player's memory map. Write "NEW_WORLD" line to out file.
-    Call log_help().
     """
 
     def free_pos():
@@ -1342,7 +1349,6 @@ def command_makeworld(seed_string):
                 id = id_setter(-1, "Things")
                 world_db["Things"][id] = new_Thing(type, free_pos())
     strong_write(io_db["file_out"], "NEW_WORLD\n")
-    log_help()
 
 
 def command_maplength(maplength_string):
@@ -1362,7 +1368,6 @@ def command_worldactive(worldactive_string):
     An active world can always be set inactive. An inactive world can only be
     set active with a "wait" ThingAction, and a player Thing (of ID 0), and a
     map. On activation, rebuild all Things' FOVs, and the player's map memory.
-    Also call log_help().
     """
     val = integer_test(worldactive_string, 0, 1)
     if None != val:
@@ -1392,7 +1397,6 @@ def command_worldactive(worldactive_string):
                     empty_fovmap = bytearray(b" " * world_db["MAP_LENGTH"] ** 2)
                     world_db["Things"][0]["fovmap"] = empty_fovmap
                 world_db["WORLD_ACTIVE"] = 1
-                log_help()
             else:
                 print("Ignoring: Not all conditions for world activation met.")
 
@@ -1664,6 +1668,7 @@ be ignored in replay mode if read from server input file), and ([2]) a function
 to be called on it.
 """
 commands_db = {
+    "PLUGIN": (1, True, command_plugin),
     "QUIT": (0, True, command_quit),
     "PING": (0, True, command_ping),
     "THINGS_HERE": (2, True, command_thingshere),
@@ -1711,37 +1716,6 @@ commands_db = {
 # TODO: Unhandled cases: (Un-)killing animates (esp. player!) with T_LIFEPOINTS.
 
 
-"""World state database. With sane default values. (Randomness is in rand.)"""
-world_db = {
-    "TURN": 0,
-    "MAP_LENGTH": 64,
-    "PLAYER_TYPE": 0,
-    "WORLD_ACTIVE": 0,
-    "MAP": False,
-    "ThingActions": {},
-    "ThingTypes": {},
-    "Things": {}
-}
-
-"""Mapping of direction names to internal direction chars."""
-directions_db = {"east": "d", "south-east": "c", "south-west": "x",
-                 "west": "s", "north-west": "w", "north-east": "e"}
-
-"""File IO database."""
-io_db = {
-    "path_save": "save",
-    "path_record": "record_save",
-    "path_worldconf": "confserver/world",
-    "path_server": "server/",
-    "path_in": "server/in",
-    "path_out": "server/out",
-    "path_worldstate": "server/worldstate",
-    "tmp_suffix": "_tmp",
-    "kicked_by_rival": False,
-    "worldstate_updateable": False
-}
-
-
 try:
     libpr = prep_library()
     rand = RandomnessIO()