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/form?a=blobdiff_plain;ds=sidebyside;f=plomrogue-server.py;h=bd89f8b02bff3e64a965add1e57a4af2cb3ec38e;hb=b366e1f88c64e11f4e6e0cc088b89dd7ffcab25b;hp=8167000dc0adc63b4e2355dea1f208b580e8f762;hpb=9a22493f49178876cd221df066fb8e2645e46309;p=plomrogue

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 8167000..bd89f8b 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -485,7 +485,7 @@ def update_map_memory(t):
         type = world_db["Things"][id]["T_TYPE"]
         if not world_db["ThingTypes"][type]["TT_LIFEPOINTS"]:
             y = world_db["Things"][id]["T_POSY"]
-            x = world_db["Things"][id]["T_POSY"]
+            x = world_db["Things"][id]["T_POSX"]
             if "v" == chr(t["fovmap"][(y * world_db["MAP_LENGTH"]) + x]):
                 t["T_MEMTHING"].append((type, y, x))
 
@@ -585,11 +585,7 @@ def actor_wait(t):
 
 def actor_move(t):
     """If passable, move/collide(=attack) thing into T_ARGUMENT's direction."""
-    # dir_c = t["T_ARGUMENT"].encode("ascii")[0]
-    # legal_move = libpr.mv_yx_in_dir_legal_wrap(dir_c, t["T_POSY"], t["T_POSX"])
     passable = False
-    # if -1 == legal_move:
-    #    raise SystemExit("Too much wrapping in mv_yx_in_dir_legal_wrap()!")
     move_result = mv_yx_in_dir_legal(t["T_ARGUMENT"], t["T_POSY"], t["T_POSX"])
     if 1 == move_result[0]:
         pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2]
@@ -676,13 +672,45 @@ def actor_use(t):
                                         "you own none.\n")
 
 
+def thingproliferation(t):
+    """To chance of 1/TT_PROLIFERATE, create t offspring in neighbor cell.
+
+    Naturally only works with TT_PROLIFERATE > 0. The neighbor cell must be
+    passable and not be inhabited by a Thing of the same type, or, if Thing is
+    animate, any other animate Thing. If there are several map cell candidates,
+    one is selected randomly.
+    """
+    def test_cell(t, y, x):
+        if "." == chr(world_db["MAP"][(y * world_db["MAP_LENGTH"]) + x]):
+            for id in [id for id in world_db["Things"]
+                       if y == world_db["Things"][id]["T_POSY"]
+                       if x == world_db["Things"][id]["T_POSX"]
+                       if (t["T_TYPE"] == world_db["Things"][id]["T_TYPE"])
+                       or (t["T_LIFEPOINTS"] and 
+                           world_db["Things"][id]["T_LIFEPOINTS"])]:
+                return False
+            return True
+        return False
+    prolscore = world_db["ThingTypes"][t["T_TYPE"]]["TT_PROLIFERATE"]
+    if prolscore and (1 == prolscore or 1 == (rand.next() % prolscore)):
+        candidates = []
+        for dir in [directions_db[key] for key in directions_db]:
+            mv_result = mv_yx_in_dir_legal(dir, t["T_POSY"], t["T_POSX"])
+            if mv_result[0] and test_cell(t, mv_result[1], mv_result[2]):
+                candidates.append((mv_result[1], mv_result[2]))
+        if len(candidates):
+            i = rand.next() % len(candidates)
+            id = id_setter(-1, "Things")
+            newT = new_Thing(t["T_TYPE"], (candidates[i][0], candidates[i][1]))
+            world_db["Things"][id] = newT
+
+
 def turn_over():
     """Run game world and its inhabitants until new player input expected."""
     id = 0
     whilebreaker = False
     while world_db["Things"][0]["T_LIFEPOINTS"]:
-        for id in [id for id in world_db["Things"]
-                   if world_db["Things"][id]["T_LIFEPOINTS"]]:
+        for id in [id for id in world_db["Things"]]:
             Thing = world_db["Things"][id]
             if Thing["T_LIFEPOINTS"]:
                 if not Thing["T_COMMAND"]:
@@ -702,7 +730,7 @@ def turn_over():
                     Thing["T_COMMAND"] = 0
                     Thing["T_PROGRESS"] = 0
                 # DUMMY: hunger
-            # DUMMY: thingproliferation
+            thingproliferation(Thing)
         if whilebreaker:
             break
         world_db["TURN"] += 1
@@ -796,7 +824,7 @@ def command_thingshere(str_y, str_x):
                 for id in world_db["Things"]:
                     write_thing_if_here()
             else:
-                for id in world_db["Things"]["T_MEMTHING"]:
+                for id in world_db["Things"][id]["T_MEMTHING"]:
                     write_thing_if_here()
             strong_write(io_db["file_out"], "THINGS_HERE END\n")
         else: