TCE: Make sure stomach is never fuller than 32.

[plomrogue] / plugins / server / TheCrawlingEater.py

diff --git a/plugins/server/TheCrawlingEater.py b/plugins/server/TheCrawlingEater.py
index a06f07cc64da2f9ba63ba30b24675f6b955aaeb8..e23f00f2cb893e4350d413a37b864b4fd70dd86b 100644 (file)
--- a/plugins/server/TheCrawlingEater.py
+++ b/plugins/server/TheCrawlingEater.py
@@ -53,7 +53,6 @@ def play_move(str_arg):
             pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2]
             if ord("%") == world_db["MAP"][pos] or \
                     ord("#") == world_db["MAP"][pos]:
-                log("You EAT.")
                 world_db["Things"][0]["T_ARGUMENT"] = d
                 world_db["set_command"]("move")
                 return
@@ -97,12 +96,19 @@ def actor_move(t):
         t["pos"] = move_result[1] * world_db["MAP_LENGTH"] + move_result[2]
         build_fov_map(t)
     else:
-        if ord("%") == world_db["MAP"][pos] and 0 == int(rand.next() % 2):
+        if t["T_STOMACH"] >= 32:
+            if t == world_db["Things"][0]:
+                log("You're too FULL to eat.")
+        elif ord("%") == world_db["MAP"][pos] and 0 == int(rand.next() % 2):
+            log("You EAT.")
             world_db["MAP"][pos] = ord("_")
-            t["T_STOMACH"] += 1
-        if ord("#") == world_db["MAP"][pos] and 0 == int(rand.next() % 5):
+            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():
@@ -129,13 +135,29 @@ def make_map():
             i_trees += 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
+    from server.utils import rand
     while world_db["Things"][0]["T_LIFEPOINTS"]:
         for tid in [tid for tid in world_db["Things"]]:
             if not tid in world_db["Things"]:
@@ -152,12 +174,15 @@ 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
                         Thing["T_PROGRESS"] = 0
+                    if Thing["T_STOMACH"] > 16:
+                        if 0 == (rand.next() % (33 - Thing["T_STOMACH"])):
+                            action_db["actor_drop"](Thing)
         world_db["TURN"] += 1
         io_db["worldstate_updateable"] = True
         try_worldstate_update()