X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plugins%2Fserver%2FTheCrawlingEater.py;h=355b025c846a441613b6520efc9b37679bddd242;hb=4327b756a48f0187574ad21ae78c852f04c057bf;hp=6ff50d7cf41d3102c7b3352a789d4dcbccc1f5f8;hpb=c0ea3e0d5c4e333c390c2f421e927db7f3d1a0d0;p=plomrogue

diff --git a/plugins/server/TheCrawlingEater.py b/plugins/server/TheCrawlingEater.py
index 6ff50d7..355b025 100644
--- a/plugins/server/TheCrawlingEater.py
+++ b/plugins/server/TheCrawlingEater.py
@@ -102,11 +102,13 @@ def actor_move(t):
         elif ord("%") == world_db["MAP"][pos] and 0 == int(rand.next() % 2):
             log("You EAT.")
             world_db["MAP"][pos] = ord("_")
-            t["T_STOMACH"] += 1
+            t["T_STOMACH"] += 3
         elif ord("#") == world_db["MAP"][pos] and 0 == int(rand.next() % 5):
             log("You EAT.")
             world_db["MAP"][pos] = ord("_")
-            t["T_STOMACH"] += 2
+            t["T_STOMACH"] += 4
+        if t["T_STOMACH"] > 32:
+            t["T_STOMACH"] = 32
 
 
 def make_map():
@@ -122,21 +124,45 @@ def make_map():
             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):
+    n_ground = int((length ** 2) / 16)
+    i_ground = 0
+    while (i_ground <= n_ground):
         single_allowed = rand.next() % 32
         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_trees += 1
+            i_ground += 1
+    n_water = int((length ** 2) / 64)
+    i_water = 0
+    while (i_water <= n_water):
+        single_allowed = rand.next() % 32
+        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_water += 1
+
+
+def calc_effort(ta, t):
+    from server.utils import mv_yx_in_dir_legal
+    if ta["TA_NAME"] == "move":
+        move_result = mv_yx_in_dir_legal(chr(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]
+            terrain = chr(world_db["MAP"][pos])
+            if terrain == ".":
+                return 2
+            elif terrain == ":":
+                return 4
+    return 1
+world_db["calc_effort"] = calc_effort
 
 
 def turn_over():
     from server.ai import ai
     from server.config.actions import action_db
-    from server.config.misc import calc_effort
     from server.update_map_memory import update_map_memory
     from server.io import try_worldstate_update
     from server.config.io import io_db
@@ -157,8 +183,8 @@ def turn_over():
                     taid = [a for a in world_db["ThingActions"]
                               if a == Thing["T_COMMAND"]][0]
                     ThingAction = world_db["ThingActions"][taid]
-                    effort = calc_effort(ThingAction, Thing)
-                    if Thing["T_PROGRESS"] == effort:
+                    effort = world_db["calc_effort"](ThingAction, Thing)
+                    if Thing["T_PROGRESS"] >= effort:
                         action = action_db["actor_" + ThingAction["TA_NAME"]]
                         action(Thing)
                         Thing["T_COMMAND"] = 0