X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=roguelike-server;h=773a2fa4a5827fb6639974ff9cc2ef03637b9fc5;hb=fa1580196b809e6f14e59e59fe92d36664b49f27;hp=6272b53f030d48ade9bd0e1657539f36d7d226e6;hpb=7afd130c2f85eb46bdad2eee652c7e1ce71ca5bc;p=plomrogue

diff --git a/roguelike-server b/roguelike-server
index 6272b53..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
@@ -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.
 
@@ -1288,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():
@@ -1351,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):
@@ -1371,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:
@@ -1401,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.")
 
@@ -1721,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()