X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plugins%2Fserver%2FPleaseTheIslandGod.py;h=d126c41c0e46bc215be45431ff58f4fd6bd86320;hb=9daa8b8d01b9b2f9295dc51e94ceb524c278fe68;hp=5c89394205cd4288aafff438e794341284b7886b;hpb=ced67d16fe54c1c916a556c47837173cec0d29b6;p=plomrogue

diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py
index 5c89394..d126c41 100644
--- a/plugins/server/PleaseTheIslandGod.py
+++ b/plugins/server/PleaseTheIslandGod.py
@@ -65,7 +65,7 @@ def make_world(seed):
             print("Ignoring: No valid " + name + " set.")
             return
     world_db["Things"] = {}
-    make_map()
+    make_map_func()
     world_db["WORLD_ACTIVE"] = 1
     world_db["TURN"] = 1
     for i in range(world_db["ThingTypes"][playertype]["TT_START_NUMBER"]):
@@ -85,7 +85,7 @@ def make_world(seed):
 
 def thingproliferation(t, prol_map):
     from server.new_thing import new_Thing
-    global directions_db, mv_yx_in_dir_legal
+    global directions_db, mv_yx_in_dir_legal, rand
     prolscore = world_db["ThingTypes"][t["T_TYPE"]]["TT_PROLIFERATE"]
     if prolscore and \
       (world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"] == 0 or
@@ -118,70 +118,22 @@ def thingproliferation(t, prol_map):
                 world_db["GOD_FAVOR"] += 750
 
 def make_map():
+    from server.make_map import make_map, is_neighbor, new_pos
     global rand
-
-    def is_neighbor(coordinates, type):
-        y = coordinates[0]
-        x = coordinates[1]
-        length = world_db["MAP_LENGTH"]
-        ind = y % 2
-        diag_west = x + (ind > 0)
-        diag_east = x + (ind < (length - 1))
-        pos = (y * length) + x
-        if (y > 0 and diag_east
-            and type == chr(world_db["MAP"][pos - length + ind])) \
-           or (x < (length - 1)
-               and type == chr(world_db["MAP"][pos + 1])) \
-           or (y < (length - 1) and diag_east
-               and type == chr(world_db["MAP"][pos + length + ind])) \
-           or (y > 0 and diag_west
-               and type == chr(world_db["MAP"][pos - length - (not ind)])) \
-           or (x > 0
-               and type == chr(world_db["MAP"][pos - 1])) \
-           or (y < (length - 1) and diag_west
-               and type == chr(world_db["MAP"][pos + length - (not ind)])):
-            return True
-        return False
-
-    world_db["MAP"] = bytearray(b'~' * (world_db["MAP_LENGTH"] ** 2))
+    make_map()
     length = world_db["MAP_LENGTH"]
-    add_half_width = (not (length % 2)) * int(length / 2)
-    world_db["MAP"][int((length ** 2) / 2) + add_half_width] = ord(".")
-    while (1):
-        y = rand.next() % length
-        x = rand.next() % length
-        pos = (y * length) + x
-        if "~" == chr(world_db["MAP"][pos]) and is_neighbor((y, x), "."):
-            if y == 0 or y == (length - 1) or x == 0 or x == (length - 1):
-                break
-            world_db["MAP"][pos] = ord(".")
-    n_trees = int((length ** 2) / 16)
-    i_trees = 0
-    while (i_trees <= n_trees):
-        single_allowed = rand.next() % 32
-        y = rand.next() % length
-        x = rand.next() % length
-        pos = (y * length) + x
-        if "." == chr(world_db["MAP"][pos]) \
-          and ((not single_allowed) or is_neighbor((y, x), "X")):
-            world_db["MAP"][pos] = ord("X")
-            i_trees += 1
     n_colons = int((length ** 2) / 16)
     i_colons = 0
     while (i_colons <= n_colons):
         single_allowed = rand.next() % 256
-        y = rand.next() % length
-        x = rand.next() % length
-        pos = (y * length) + x
+        y, x, pos = new_pos()
         if ("." == chr(world_db["MAP"][pos])
           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
+        y, x, pos = new_pos()
         if (("." == chr(world_db["MAP"][pos]
              or ":" == chr(world_db["MAP"][pos]))
             and not is_neighbor((y, x), "X"))):
@@ -795,33 +747,21 @@ def play_pickup():
 
 strong_write(io_db["file_out"], "PLUGIN PleaseTheIslandGod\n")
 
-if not "GOD_FAVOR" in world_db:
-    world_db["GOD_FAVOR"] = 0
-if not "FAVOR_STAGE" in world_db:
-    world_db["FAVOR_STAGE"] = 0
-if not "SLIPPERS" in world_db:
-    world_db["SLIPPERS"] = 0
-if not "PLANT_0" in world_db:
-    world_db["PLANT_0"] = 0
-if not "PLANT_1" in world_db:
-    world_db["PLANT_1"] = 0
-if not "ANIMAL_0" in world_db:
-    world_db["ANIMAL_0"] = 0
-if not "ANIMAL_1" in world_db:
-    world_db["ANIMAL_1"] = 0
-if not "TOOL_0" in world_db:
-    world_db["TOOL_0"] = 0
-if not "TOOL_1" in world_db:
-    world_db["TOOL_1"] = 0
-if not "LUMBER" in world_db:
-    world_db["LUMBER"] = 0
-if not "EMPATHY" in world_db:
-    world_db["EMPATHY"] = 0
+def set_zero_if_undefined(key):
+    if not key in world_db:
+        world_db[key] = 0
+
+set_zero_if_undefined("GOD_FAVOR")
+set_zero_if_undefined("FAVOR_STAGE")
+set_zero_if_undefined("EMPATHY")
+world_db["specials"] = ["SLIPPERS", "PLANT_0", "PLANT_1", "TOOL_0", "TOOL_1",
+    "LUMBER", "ANIMAL_0", "ANIMAL_1"]
+for key in world_db["specials"]:
+    set_zero_if_undefined(key)
+
 world_db["terrain_names"][":"] = "SOIL"
 world_db["terrain_names"]["|"] = "WALL"
 world_db["terrain_names"]["_"] = "ALTAR"
-world_db["specials"] = ["SLIPPERS", "PLANT_0", "PLANT_1", "TOOL_0", "TOOL_1",
-    "LUMBER", "ANIMAL_0", "ANIMAL_1"]
 io_db["worldstate_write_order"] += [["GOD_FAVOR", "world_int"]]
 io_db["worldstate_write_order"] += [[write_metamap_A, "func"]]
 io_db["worldstate_write_order"] += [[write_metamap_B, "func"]]