X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plugins%2Fserver%2FTheCrawlingEater.py;h=609331135f9dcb57789b121d6f7824b1da96d51c;hb=346f6a011bf2749fe7dadcb514983980b66dc3d3;hp=04d36d5f8a553c5ef52a13f5bf8ac9ab96e56468;hpb=5cb6d71f5a8d7fecfde60351f6b767754ce3f092;p=plomrogue

diff --git a/plugins/server/TheCrawlingEater.py b/plugins/server/TheCrawlingEater.py
index 04d36d5..6093311 100644
--- a/plugins/server/TheCrawlingEater.py
+++ b/plugins/server/TheCrawlingEater.py
@@ -8,44 +8,143 @@ from server.config.world_data import world_db
 
 def play_drink():
     if action_exists("drink") and world_db["WORLD_ACTIVE"]:
-        if ord("~") != world_db["MAP"][world_db["Things"][0]["pos"]]:
-            log("Nothing to drink here.")
+        if not chr(world_db["MAP"][world_db["Things"][0]["pos"]]) in "~LO":
+            log("NOTHING to drink here.")
+            return
+        elif world_db["Things"][0]["T_BLADDER"] >= 32:
+            log("You're too FULL to drink more.")
             return
         world_db["set_command"]("drink")
 
 
 def actor_drink(t):
-    if ord("~") == world_db["MAP"][world_db["Things"][0]["pos"]]:
+    pos = world_db["Things"][0]["pos"]
+    if chr(world_db["MAP"][pos]) in "~LO" and \
+            t["T_BLADDER"] < 32:
         log("You DRINK.")
         t["T_BLADDER"] += 1
+        if chr(world_db["MAP"][pos]) == "~":
+            world_db["MAP"][pos] = ord("_")
+        elif chr(world_db["MAP"][pos]) == "L":
+            world_db["MAP"][pos] = ord("~")
+        elif chr(world_db["MAP"][pos]) == "O":
+            world_db["MAP"][pos] = ord("L")
+
+
+def play_pee():
+    if action_exists("pee") and world_db["WORLD_ACTIVE"]:
+        if world_db["Things"][0]["T_BLADDER"] < 1:
+            log("Nothing to drop from empty bladder.")
+            return
+        world_db["set_command"]("pee")
+
+
+def actor_pee(t):
+    if t["T_BLADDER"] < 1:
+        return
+    if t == world_db["Things"][0]:
+        log("You LOSE fluid.")
+    t["T_BLADDER"] -= 1
+    terrain = world_db["MAP"][t["pos"]]
+    if terrain == ord("_"):
+        world_db["MAP"][t["pos"]] = ord("~")
+    elif terrain == ord("~"):
+        world_db["MAP"][t["pos"]] = ord("L")
+    elif terrain == ord("L"):
+        world_db["MAP"][t["pos"]] = ord("L") + 3
+    elif terrain == ord("."):
+        world_db["MAP"][t["pos"]] = ord("J")
+    elif terrain == ord("J"):
+        world_db["MAP"][t["pos"]] = ord("J") + 3
+    elif terrain == ord("J") + 3:
+        world_db["MAP"][t["pos"]] = ord("J") + 6
+    elif terrain == ord(":"):
+        world_db["MAP"][t["pos"]] = ord("K")
+    elif terrain == ord("K"):
+        world_db["MAP"][t["pos"]] = ord("K") + 3
+    elif terrain == ord("K") + 3:
+        world_db["MAP"][t["pos"]] = ord("K") + 6
+    elif terrain == ord("%"):
+        world_db["MAP"][t["pos"]] = ord("A")
+    elif terrain == ord("A"):
+        world_db["MAP"][t["pos"]] = ord("A") + 3
+    elif terrain == ord("A") + 3:
+        world_db["MAP"][t["pos"]] = ord("A") + 6
+    elif terrain == ord("#"):
+        world_db["MAP"][t["pos"]] = ord("B")
+    elif terrain == ord("B"):
+        world_db["MAP"][t["pos"]] = ord("B") + 3
+    elif terrain == ord("B") + 3:
+        world_db["MAP"][t["pos"]] = ord("B") + 6
+    elif terrain == ord("X"):
+        world_db["MAP"][t["pos"]] = ord("C")
+    elif terrain == ord("C"):
+        world_db["MAP"][t["pos"]] = ord("C") + 3
+    elif terrain == ord("C") + 3:
+        world_db["MAP"][t["pos"]] = ord("C") + 6
+    elif chr(terrain) in "GHIOPQ":
+        t["T_LIFEPOINTS"] = 0
+        if t == world_db["Things"][0]:
+            t["fovmap"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
+            log("You DROWN.")
 
 
 def play_drop():
     if action_exists("drop") and world_db["WORLD_ACTIVE"]:
-        if world_db["Things"][0]["T_STOMACH"] < 1:
-            log("Nothing to drop from empty stomach.")
+        if world_db["Things"][0]["T_BOWEL"] < 1:
+            log("Nothing to drop from empty bowel.")
             return
         world_db["set_command"]("drop")
 
 
 def actor_drop(t):
-    if t["T_STOMACH"] < 1:
+    if t["T_BOWEL"] < 1:
         return
     if t == world_db["Things"][0]:
-        log("You DEFECATE.")
+        log("You DROP waste.")
     terrain = world_db["MAP"][t["pos"]]
-    t["T_STOMACH"] -= 1
-    if chr(terrain) == "_":
+    t["T_BOWEL"] -= 1
+    if terrain == ord("_"):
         world_db["MAP"][t["pos"]] = ord(".")
-    elif chr(terrain) == ".":
+    elif terrain == ord("~"):
+        world_db["MAP"][t["pos"]] = ord("J")
+    elif terrain == ord("L") :
+        world_db["MAP"][t["pos"]] = ord("J") + 3
+    elif terrain == ord("L") + 3:
+        world_db["MAP"][t["pos"]] = ord("J") + 6
+    elif terrain == ord("."):
         world_db["MAP"][t["pos"]] = ord(":")
-    elif chr(terrain) == ":":
+    elif terrain == ord("J"):
+        world_db["MAP"][t["pos"]] = ord("K")
+    elif terrain == ord("J") + 3:
+        world_db["MAP"][t["pos"]] = ord("K") + 3
+    elif terrain == ord("J") + 6:
+        world_db["MAP"][t["pos"]] = ord("K") + 6
+    elif terrain == ord(":"):
         world_db["MAP"][t["pos"]] = ord("%")
-    elif chr(terrain) == "%":
+    elif terrain == ord("K"):
+        world_db["MAP"][t["pos"]] = ord("A")
+    elif terrain == ord("K") + 3:
+        world_db["MAP"][t["pos"]] = ord("A") + 3
+    elif terrain == ord("K") + 6:
+        world_db["MAP"][t["pos"]] = ord("A") + 6
+    elif terrain == ord("%"):
         world_db["MAP"][t["pos"]] = ord("#")
-    elif chr(terrain) == "#":
+    elif terrain == ord("A"):
+        world_db["MAP"][t["pos"]] = ord("B")
+    elif terrain == ord("A") + 3:
+        world_db["MAP"][t["pos"]] = ord("B") + 3
+    elif terrain == ord("A") + 6:
+        world_db["MAP"][t["pos"]] = ord("B") + 6
+    elif terrain == ord("#"):
         world_db["MAP"][t["pos"]] = ord("X")
-    elif chr(terrain) == "X":
+    elif terrain == ord("B"):
+        world_db["MAP"][t["pos"]] = ord("C")
+    elif terrain == ord("B") + 3:
+        world_db["MAP"][t["pos"]] = ord("C") + 3
+    elif terrain == ord("B") + 6:
+        world_db["MAP"][t["pos"]] = ord("C") + 6
+    elif chr(terrain) in "XCFI":
         t["T_LIFEPOINTS"] = 0
         if t == world_db["Things"][0]:
             t["fovmap"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
@@ -65,8 +164,11 @@ def play_move(str_arg):
         move_result = mv_yx_in_dir_legal(chr(d), t["T_POSY"], t["T_POSX"])
         if 1 == move_result[0]:
             pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2]
-            if ord("%") == world_db["MAP"][pos] or \
-                    ord("#") == world_db["MAP"][pos]:
+            if chr(world_db["MAP"][pos]) in "%#ABDEGH":
+                if t["T_BOWEL"] >= 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")
                 return
@@ -110,19 +212,32 @@ def actor_move(t):
         t["pos"] = move_result[1] * world_db["MAP_LENGTH"] + move_result[2]
         build_fov_map(t)
     else:
-        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):
+        if t["T_BOWEL"] >= 32:
+            return
+        elif chr(world_db["MAP"][pos]) in "%ADG" and 0 == int(rand.next() % 2):
             log("You EAT.")
-            world_db["MAP"][pos] = ord("_")
-            t["T_STOMACH"] += 3
-        elif ord("#") == world_db["MAP"][pos] and 0 == int(rand.next() % 5):
+            if world_db["MAP"][pos] == ord("%"):
+                world_db["MAP"][pos] = ord("_")
+            elif world_db["MAP"][pos] == ord("A"):
+                world_db["MAP"][pos] = ord("~")
+            elif world_db["MAP"][pos] == ord("A") + 3:
+                world_db["MAP"][pos] = ord("L")
+            elif world_db["MAP"][pos] == ord("A") + 6:
+                world_db["MAP"][pos] = ord("L") + 3
+            t["T_BOWEL"] += 3
+        elif chr(world_db["MAP"][pos]) in "#BEH" and 0 == int(rand.next() % 5):
             log("You EAT.")
-            world_db["MAP"][pos] = ord("_")
-            t["T_STOMACH"] += 4
-        if t["T_STOMACH"] > 32:
-            t["T_STOMACH"] = 32
+            if world_db["MAP"][pos] == ord("#"):
+                world_db["MAP"][pos] = ord("_")
+            elif world_db["MAP"][pos] == ord("B"):
+                world_db["MAP"][pos] = ord("~")
+            elif world_db["MAP"][pos] == ord("B") + 3:
+                world_db["MAP"][pos] = ord("L")
+            elif world_db["MAP"][pos] == ord("B") + 6:
+                world_db["MAP"][pos] = ord("L") + 3
+            t["T_BOWEL"] += 4
+        if t["T_BOWEL"] > 32:
+            t["T_BOWEL"] = 32
 
 
 def make_map():
@@ -153,8 +268,8 @@ def make_map():
         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("~")
+                and ((not single_allowed) or is_neighbor((y, x), "O")):
+            world_db["MAP"][pos] = ord("O")
             i_water += 1
 
 
@@ -203,9 +318,12 @@ def turn_over():
                         action(Thing)
                         Thing["T_COMMAND"] = 0
                         Thing["T_PROGRESS"] = 0
-                    if Thing["T_STOMACH"] > 16:
-                        if 0 == (rand.next() % (33 - Thing["T_STOMACH"])):
+                    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)
         world_db["TURN"] += 1
         io_db["worldstate_updateable"] = True
         try_worldstate_update()
@@ -236,12 +354,12 @@ def play_wait():
 
 
 from server.config.io import io_db
-io_db["worldstate_write_order"] += [["T_STOMACH", "player_int"]]
+io_db["worldstate_write_order"] += [["T_BOWEL", "player_int"]]
 io_db["worldstate_write_order"] += [["T_BLADDER", "player_int"]]
 import server.config.world_data
-server.config.world_data.symbols_hide = "%#X"
-server.config.world_data.symbols_passable = "_.:~"
-server.config.world_data.thing_defaults["T_STOMACH"] = 0
+server.config.world_data.symbols_hide = "%#X" + "ABC" + "DEF" + "GHI"
+server.config.world_data.symbols_passable = "_.:" + "~JK" + "LMN" + "OPQ"
+server.config.world_data.thing_defaults["T_BOWEL"] = 0
 server.config.world_data.thing_defaults["T_BLADDER"] = 0
 import server.config.make_world_helpers
 server.config.make_world_helpers.make_map = make_map
@@ -252,9 +370,10 @@ commands_db["move"] = (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_BOWEL"] = (1, False, setter("Thing", "T_BOWEL", 0, 255))
 commands_db["T_BLADDER"] = (1, False, setter("Thing", "T_BLADDER", 0, 255))
 from server.actions import actor_wait
 import server.config.actions
@@ -263,6 +382,7 @@ server.config.actions.action_db = {
     "actor_move": actor_move,
     "actor_drop": actor_drop,
     "actor_drink": actor_drink,
+    "actor_pee": actor_pee,
 }
 
 strong_write(io_db["file_out"], "PLUGIN TheCrawlingEater\n")