home · contact · privacy
TCE: Fix bug of T_STOMACH, T_KIDNEY overwritten by T_BOWEL, T_BLADDER.
[plomrogue] / plugins / server / TheCrawlingEater.py
index 1c7a76dace33613d51a2e1c3349de1e9ae508c14..658d57db264707c5b114d116b52354e43a1f7786 100644 (file)
@@ -13,7 +13,7 @@ def play_drink():
                 and world_db["wetmap"][pos] > ord("0")):
             log("NOTHING to drink here.")
             return
-        elif world_db["Things"][0]["T_BLADDER"] >= 32:
+        elif world_db["Things"][0]["T_KIDNEY"] >= 32:
             log("You're too FULL to drink more.")
             return
         world_db["set_command"]("drink")
@@ -22,9 +22,9 @@ def play_drink():
 def actor_drink(t):
     pos = world_db["Things"][0]["pos"]
     if chr(world_db["MAP"][pos]) == "0" and \
-                world_db["wetmap"][pos] > ord("0") and t["T_BLADDER"] < 32:
+                world_db["wetmap"][pos] > ord("0") and t["T_KIDNEY"] < 32:
         log("You DRINK.")
-        t["T_BLADDER"] += 1
+        t["T_KIDNEY"] += 1
         world_db["wetmap"][pos] -= 1
         if world_db["wetmap"][pos] == ord("0"):
             world_db["MAP"][pos] = ord("0")
@@ -43,7 +43,7 @@ def actor_pee(t):
         return
     if t == world_db["Things"][0]:
         log("You LOSE fluid.")
-    if not world_db["catch_air"](t):
+    if not world_db["test_air"](t):
         return
     t["T_BLADDER"] -= 1
     world_db["wetmap"][t["pos"]] += 1
@@ -62,7 +62,7 @@ def actor_drop(t):
         return
     if t == world_db["Things"][0]:
         log("You DROP waste.")
-    if not world_db["catch_air"](t):
+    if not world_db["test_air"](t):
         return
     world_db["MAP"][t["pos"]] += 1
     t["T_BOWEL"] -= 1
@@ -82,12 +82,12 @@ def play_move(str_arg):
         if 1 == move_result[0]:
             pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2]
             if chr(world_db["MAP"][pos]) in "34":
-                if t["T_BOWEL"] >= 32:
+                if t["T_STOMACH"] >= 32:
                     if t == world_db["Things"][0]:
                         log("You're too FULL to eat.")
                     return
                 world_db["Things"][0]["T_ARGUMENT"] = d
-                world_db["set_command"]("move")
+                world_db["set_command"]("eat")
                 return
             if chr(world_db["MAP"][pos]) in symbols_passable:
                 world_db["Things"][0]["T_ARGUMENT"] = d
@@ -96,66 +96,103 @@ def play_move(str_arg):
         log("You CAN'T eat your way through there.")
 
 
+def actor_eat(t):
+    from server.utils import mv_yx_in_dir_legal, rand
+    from server.config.world_data import symbols_passable
+    passable = False
+    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]
+        #hitted = [tid for tid in world_db["Things"]
+        #          if world_db["Things"][tid] != t
+        #          if world_db["Things"][tid]["T_LIFEPOINTS"]
+        #          if world_db["Things"][tid]["T_POSY"] == move_result[1]
+        #          if world_db["Things"][tid]["T_POSX"] == move_result[2]]
+        #if len(hitted):
+        #    hit_id = hitted[0]
+        #    hitted_tid = world_db["Things"][hit_id]["T_TYPE"]
+        #    if t == world_db["Things"][0]:
+        #        hitted_name = world_db["ThingTypes"][hitted_tid]["TT_NAME"]
+        #        log("You BUMP into " + hitted_name + ".")
+        #    elif 0 == hit_id:
+        #        hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
+        #        log(hitter_name +" BUMPS into you.")
+        #    return
+        passable = chr(world_db["MAP"][pos]) in symbols_passable
+    if passable:
+        log("You try to EAT, but fail.")
+    else:
+        height = world_db["MAP"][pos] - ord("0")
+        if t["T_STOMACH"] >= 32 or height == 5:
+            return
+        t["T_STOMACH"] += 1
+        log("You EAT.")
+        eaten = (height == 3 and 0 == int(rand.next() % 2)) or \
+                (height == 4 and 0 == int(rand.next() % 5))
+        if eaten:
+            world_db["MAP"][pos] = ord("0")
+            if t["T_STOMACH"] > 32:
+                t["T_STOMACH"] = 32
+
+
 def actor_move(t):
     from server.build_fov_map import build_fov_map
     from server.utils import mv_yx_in_dir_legal, rand
-    from server.config.world_data import directions_db, symbols_passable
+    from server.config.world_data import symbols_passable
     passable = False
     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]
-        hitted = [tid for tid in world_db["Things"]
-                  if world_db["Things"][tid] != t
-                  if world_db["Things"][tid]["T_LIFEPOINTS"]
-                  if world_db["Things"][tid]["T_POSY"] == move_result[1]
-                  if world_db["Things"][tid]["T_POSX"] == move_result[2]]
-        if len(hitted):
-            hit_id = hitted[0]
-            hitted_tid = world_db["Things"][hit_id]["T_TYPE"]
-            if t == world_db["Things"][0]:
-                hitted_name = world_db["ThingTypes"][hitted_tid]["TT_NAME"]
-                log("You BUMP into " + hitted_name + ".")
-            elif 0 == hit_id:
-                hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
-                log(hitter_name +" BUMPS into you.")
-            return
+        #hitted = [tid for tid in world_db["Things"]
+        #          if world_db["Things"][tid] != t
+        #          if world_db["Things"][tid]["T_LIFEPOINTS"]
+        #          if world_db["Things"][tid]["T_POSY"] == move_result[1]
+        #          if world_db["Things"][tid]["T_POSX"] == move_result[2]]
+        #if len(hitted):
+        #    hit_id = hitted[0]
+        #    hitted_tid = world_db["Things"][hit_id]["T_TYPE"]
+        #    if t == world_db["Things"][0]:
+        #        hitted_name = world_db["ThingTypes"][hitted_tid]["TT_NAME"]
+        #        log("You BUMP into " + hitted_name + ".")
+        #    elif 0 == hit_id:
+        #        hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
+        #        log(hitter_name +" BUMPS into you.")
+        #    return
         passable = chr(world_db["MAP"][pos]) in symbols_passable
-    direction = [direction for direction in directions_db
-                 if directions_db[direction] == chr(t["T_ARGUMENT"])][0]
     if passable:
         t["T_POSY"] = move_result[1]
         t["T_POSX"] = move_result[2]
         t["pos"] = move_result[1] * world_db["MAP_LENGTH"] + move_result[2]
         build_fov_map(t)
     else:
-        if t["T_BOWEL"] >= 32 or chr(world_db["MAP"][pos]) == "5":
-            return
-        eaten = False
-        if chr(world_db["MAP"][pos]) == "3" and 0 == int(rand.next() % 2):
-            t["T_BOWEL"] += 3
-            eaten = True
-        elif chr(world_db["MAP"][pos]) == "4" and 0 == int(rand.next() % 5):
-            t["T_BOWEL"] += 4
-            eaten = True
-        log("You EAT.")
-        if eaten:
-            world_db["MAP"][pos] = ord("0")
-            if t["T_BOWEL"] > 32:
-                t["T_BOWEL"] = 32
+        log("You try to MOVE there, but fail.")
 
 
+def test_hole(t):
+    if world_db["MAP"][t["pos"]] == ord("-"):
+        world_db["die"](t, "You FALL in a hole, and die.")
+        return False
+    return True
+world_db["test_hole"] = test_hole
 
-def catch_air(t):
+
+def test_air(t):
     if (world_db["wetmap"][t["pos"]] - ord("0")) \
-            + (world_db["MAP"][t["pos"]] - ord("0")) > 4:
-        t["T_LIFEPOINTS"] = 0
-        if t == world_db["Things"][0]:
-            t["fovmap"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
-            log("You SUFFOCATE.")
+            + (world_db["MAP"][t["pos"]] - ord("0")) > 5:
+        world_db["die"](t, "You SUFFOCATE")
         return False
     return True
-world_db["catch_air"] = catch_air
+world_db["test_air"] = test_air
+
+
+def die(t, message):
+    t["T_LIFEPOINTS"] = 0
+    if t == world_db["Things"][0]:
+        t["fovmap"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
+        log(message)
+world_db["die"] = die
 
 
 def make_map():
@@ -197,11 +234,8 @@ def calc_effort(ta, t):
                                          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 == "1":
-                return 2
-            elif terrain == "2":
-                return 4
+            narrowness = world_db["MAP"][pos] - ord("0")
+            return 2 ** narrowness
     return 1
 world_db["calc_effort"] = calc_effort
 
@@ -217,42 +251,59 @@ def turn_over():
         for tid in [tid for tid in world_db["Things"]]:
             if not tid in world_db["Things"]:
                 continue
-            Thing = world_db["Things"][tid]
-            if Thing["T_LIFEPOINTS"]:
-                if not Thing["T_COMMAND"]:
-                    update_map_memory(Thing)
+            t = world_db["Things"][tid]
+            if t["T_LIFEPOINTS"]:
+                if not (world_db["test_air"](t) and world_db["test_hole"](t)):
+                    continue
+                if not t["T_COMMAND"]:
+                    update_map_memory(t)
                     if 0 == tid:
                         return
-                    ai(Thing)
-                if Thing["T_LIFEPOINTS"]:
-                    Thing["T_PROGRESS"] += 1
+                    ai(t)
+                if t["T_LIFEPOINTS"]:
+                    t["T_PROGRESS"] += 1
                     taid = [a for a in world_db["ThingActions"]
-                              if a == Thing["T_COMMAND"]][0]
+                              if a == t["T_COMMAND"]][0]
                     ThingAction = world_db["ThingActions"][taid]
-                    effort = world_db["calc_effort"](ThingAction, Thing)
-                    if Thing["T_PROGRESS"] >= effort:
+                    effort = world_db["calc_effort"](ThingAction, t)
+                    if t["T_PROGRESS"] >= effort:
                         action = action_db["actor_" + ThingAction["TA_NAME"]]
-                        action(Thing)
-                        Thing["T_COMMAND"] = 0
-                        Thing["T_PROGRESS"] = 0
-                    if Thing["T_BOWEL"] > 16:
-                        if 0 == (rand.next() % (33 - Thing["T_BOWEL"])):
-                            action_db["actor_drop"](Thing)
-                    if Thing["T_BLADDER"] > 16:
-                        if 0 == (rand.next() % (33 - Thing["T_BLADDER"])):
-                            action_db["actor_pee"](Thing)
+                        action(t)
+                        t["T_COMMAND"] = 0
+                        t["T_PROGRESS"] = 0
+                    if t["T_BOWEL"] > 16:
+                        if 0 == (rand.next() % (33 - t["T_BOWEL"])):
+                            action_db["actor_drop"](t)
+                    if t["T_BLADDER"] > 16:
+                        if 0 == (rand.next() % (33 - t["T_BLADDER"])):
+                            action_db["actor_pee"](t)
+                    if 0 == world_db["TURN"] % 5:
+                        t["T_STOMACH"] -= 1
+                        t["T_BOWEL"] += 1
+                        t["T_KIDNEY"] -= 1
+                        t["T_BLADDER"] += 1
+                        if t["T_STOMACH"] == 0:
+                            world_db["die"](t, "You DIE of hunger.")
+                        elif t["T_KIDNEY"] == 0:
+                            world_db["die"](t, "You DIE of dehydration.")
         water = 0
         positions_to_wet = []
-        for i in range(world_db["MAP_LENGTH"] ** 2):
-            if world_db["MAP"][i] == ord("0") \
-                    and world_db["wetmap"][i] < ord("5"):
-                positions_to_wet += [i]
+        for pos in range(world_db["MAP_LENGTH"] ** 2):
+            if world_db["MAP"][pos] == ord("0") \
+                    and world_db["wetmap"][pos] < ord("5"):
+                positions_to_wet += [pos]
         i_positions_to_wet = len(positions_to_wet)
         for pos in range(world_db["MAP_LENGTH"] ** 2):
-            if 0 == rand.next() % 5 \
-                    and ((world_db["wetmap"][pos] > ord("0")
-                          and not world_db["MAP"][pos] == ord("0"))
-                         or world_db["wetmap"][pos] > ord("1")):
+            wetness = world_db["wetmap"][pos] - ord("0")
+            height = world_db["MAP"][pos] - ord("0")
+            if height == 0 and wetness > 0 \
+                    and 0 == rand.next() % ((2 ** 13) / (2 ** wetness)):
+                world_db["MAP"][pos] = ord("-")
+                if pos in positions_to_wet:
+                    positions_to_wet.remove(pos)
+                    i_positions_to_wet -= 1
+            if ((wetness > 0 and height != 0) or wetness > 1) \
+                and 0 == rand.next() % 5:
                 world_db["wetmap"][pos] -= 1
                 water += 1
                 i_positions_to_wet -= 1
@@ -337,13 +388,17 @@ def write_wetmap():
 
 
 from server.config.io import io_db
+io_db["worldstate_write_order"] += [["T_STOMACH", "player_int"]]
+io_db["worldstate_write_order"] += [["T_KIDNEY", "player_int"]]
 io_db["worldstate_write_order"] += [["T_BOWEL", "player_int"]]
 io_db["worldstate_write_order"] += [["T_BLADDER", "player_int"]]
 io_db["worldstate_write_order"] += [[write_wetmap, "func"]]
 import server.config.world_data
 server.config.world_data.symbols_hide = "345"
-server.config.world_data.symbols_passable = "012"
+server.config.world_data.symbols_passable = "012-"
+server.config.world_data.thing_defaults["T_STOMACH"] = 16
 server.config.world_data.thing_defaults["T_BOWEL"] = 0
+server.config.world_data.thing_defaults["T_KIDNEY"] = 16
 server.config.world_data.thing_defaults["T_BLADDER"] = 0
 world_db["wetmap"] = bytearray(b"0" * world_db["MAP_LENGTH"] ** 2)
 io_db["hook_save"] = save_wetmap
@@ -353,12 +408,15 @@ from server.config.commands import commands_db
 commands_db["THINGS_HERE"] = (2, True, lambda x, y: None)
 commands_db["ai"] = (0, False, command_ai)
 commands_db["move"] = (1, False, play_move)
+commands_db["eat"] = (1, False, play_move)
 commands_db["wait"] = (0, False, play_wait)
 commands_db["drop"] = (0, False, play_drop)
 commands_db["drink"] = (0, False, play_drink)
 commands_db["pee"] = (0, False, play_pee)
 commands_db["use"] = (1, False, lambda x: None)
 commands_db["pickup"] = (0, False, lambda: None)
+commands_db["T_STOMACH"] = (1, False, setter("Thing", "T_STOMACH", 0, 255))
+commands_db["T_KIDNEY"] = (1, False, setter("Thing", "T_KIDNEY", 0, 255))
 commands_db["T_BOWEL"] = (1, False, setter("Thing", "T_BOWEL", 0, 255))
 commands_db["T_BLADDER"] = (1, False, setter("Thing", "T_BLADDER", 0, 255))
 commands_db["WETMAP"] = (2, False, wetmapset)
@@ -370,6 +428,7 @@ server.config.actions.action_db = {
     "actor_drop": actor_drop,
     "actor_drink": actor_drink,
     "actor_pee": actor_pee,
+    "actor_eat": actor_eat,
 }
 
 strong_write(io_db["file_out"], "PLUGIN TheCrawlingEater\n")