7DRL: Move altar positioning from server command to map generation.

[plomrogue] / roguelike-server

diff --git a/roguelike-server b/roguelike-server
index d4e1cd10a636b709a258749a65260f26bad6a4de..7389374d2d42182e6a509e2d754cce702cfb2fb9 100755 (executable)
--- a/roguelike-server
+++ b/roguelike-server
@@ -212,12 +212,9 @@ def save_world():
     string = ""
     for key in world_db:
         if (dict != type(world_db[key])
-           and key != "ALTAR"   # #
-           and key != "MAP" and key != "WORLD_ACTIVE"):
+            and key != "MAP" and key != "WORLD_ACTIVE"):
             string = string + key + " " + str(world_db[key]) + "\n"
     string = string + mapsetter("MAP")()
-    string = (string + "ALTAR " + str(world_db["ALTAR"][0]) + " "  # #
-                                + str(world_db["ALTAR"][1]) + "\n")  # #
     string = string + helper("ThingActions", "TA_ID")
     string = string + helper("ThingTypes", "TT_ID", {"TT_CORPSE_ID": False})
     for id in world_db["ThingTypes"]:
@@ -430,7 +427,7 @@ def make_map():
     to land. The cycle ends when a land cell is due to be created at the map's
     border. Then put some trees on the map (TODO: more precise algorithm desc).
     """
-    # 7DRL: Also add some ":" cells as land to which plants may proliferate.
+    # 7DRL: Also add some ":" cells, and (not surrounded by trees!) "_" altar.
 
     def is_neighbor(coordinates, type):
         y = coordinates[0]
@@ -490,6 +487,17 @@ def make_map():
           and ((not single_allowed) or is_neighbor((y, x), ":"))):  # #
             world_db["MAP"][pos] = ord(":")  # #
             i_colons += 1  # #
+    altar_placed = False  # #
+    while not altar_placed:  # #
+        y = rand.next() % length  # #
+        x = rand.next() % length  # #
+        pos = (y * length) + x  # #
+        if (("." == chr(world_db["MAP"][pos]  # #
+             or ":" == chr(world_db["MAP"][pos]))
+            and not is_neighbor((y, x), 'X'))):  # #
+            world_db["MAP"][pos] = ord("_")  # #
+            world_db["altar"] = (y, x)  # #
+            altar_placed = True  # #
 
 
 def update_map_memory(t, age_map=True):
@@ -679,7 +687,7 @@ def enter_altar():  # #
                       + "as long as you like.)\"\n")
          id = id_setter(-1, "Things")
          world_db["Things"][id] = new_Thing(world_db["SLIPPERS"],
-                                            world_db["ALTAR"])
+                                            world_db["altar"])
 
 
 def actor_wait(t):
@@ -732,8 +740,8 @@ def actor_move(t):
         build_fov_map(t)
         if t == world_db["Things"][0]:
             strong_write(io_db["file_out"], "LOG You move " + dir + ".\n")
-            if (move_result[1] == world_db["ALTAR"][0] and  # #
-                move_result[2] == world_db["ALTAR"][1]):  # #
+            if (move_result[1] == world_db["altar"][0] and  # #
+                move_result[2] == world_db["altar"][1]):  # #
                 enter_altar()  # #
     elif t == world_db["Things"][0]:
         strong_write(io_db["file_out"], "LOG You fail to move " + dir + ".\n")
@@ -1379,9 +1387,6 @@ def command_makeworld(seed_string):
         return  # #
     world_db["Things"] = {}
     make_map()
-    world_db["ALTAR"] = free_pos()  # #
-    world_db["MAP"][world_db["ALTAR"][0] * world_db["MAP_LENGTH"]  # #
-                    + world_db["ALTAR"][1]] = ord("_")  # #
     world_db["WORLD_ACTIVE"] = 1
     world_db["TURN"] = 1
     for i in range(world_db["ThingTypes"][playertype]["TT_START_NUMBER"]):
@@ -1400,18 +1405,6 @@ def command_makeworld(seed_string):
     strong_write(io_db["file_out"], "NEW_WORLD\n")
 
 
-def command_altar(str_y, str_x):  # #
-    """Set position of Island God's altar."""
-    y = integer_test(str_y, 0, 255)
-    x = integer_test(str_x, 0, 255)
-    if None != y and None != x:
-        if y < world_db["MAP_LENGTH"] and x < world_db["MAP_LENGTH"]:
-            world_db["ALTAR"] = (y, x)
-            world_db["MAP"][y * world_db["MAP_LENGTH"] + x] = ord("_")
-        else:
-            print("Ignoring: Position is outside of map.")
-
-
 def command_maplength(maplength_string):
     """Redefine map length. Invalidate map, therefore lose all things on it."""
     val = integer_test(maplength_string, 1, 256)
@@ -1430,7 +1423,8 @@ def command_worldactive(worldactive_string):
     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.
     """
-    # 7DRL: ALTAR position and (valid) SLIPPERS must be set for world activation.
+    # 7DRL: altar must be on map, and (valid) SLIPPERS must be set for world
+    # activation.
     val = integer_test(worldactive_string, 0, 1)
     if None != val:
         if 0 != world_db["WORLD_ACTIVE"]:
@@ -1450,8 +1444,16 @@ def command_worldactive(worldactive_string):
                     player_exists = True
                     break
             valid_slippers = world_db["SLIPPERS"] in world_db["ThingTypes"]  # #
+            altar_found = False  # #
+            if world_db["MAP"]:  # #
+                pos = world_db["MAP"].find(b'_')  # #
+                if pos > 0:  # #
+                    y = int(pos / world_db["MAP_LENGTH"])  # #
+                    x = pos % world_db["MAP_LENGTH"]  # #
+                    world_db["altar"] = (y, x)  # #
+                    altar_found = True  # #
             if wait_exists and player_exists and world_db["MAP"] \
-                and  world_db["ALTAR"] and valid_slippers:  # #
+                and altar_found and valid_slippers:  # #
                 for id in world_db["Things"]:
                     if world_db["Things"][id]["T_LIFEPOINTS"]:
                         build_fov_map(world_db["Things"][id])
@@ -1749,7 +1751,6 @@ commands_db = {
     "MAP_LENGTH": (1, False, command_maplength),
     "WORLD_ACTIVE": (1, False, command_worldactive),
     "MAP": (2, False, setter_map("MAP")),
-    "ALTAR": (2, False, command_altar),  # #
     "GAME_WON": (1, False, setter(None, "GAME_WON", 0, 1)),  # #
     "SLIPPERS": (1, False, command_slippers),  # #
     "TA_ID": (1, False, command_taid),
@@ -1800,7 +1801,6 @@ world_db = {
     "GOD_MOOD": 0,  # #
     "GOD_FAVOR": 0,  # #
     "MAP": False,
-    "ALTAR": False,  # #
     "GAME_WON": 0,  # #
     "SLIPPERS": 0,  # #
     "ThingActions": {},