X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plugins%2Fserver%2FTheCrawlingEater.py;h=867f05c0f3b7f5cb940e9fb63f06e3acdb86caaf;hb=fa6fec4689b183dc3a4c1528ced578e4fcd6348c;hp=4e8a3f8ad0e0d36dce8a4c9189440d22beec366f;hpb=2720886a8dc03b0408694d5fdc40d9f6507902ac;p=plomrogue

diff --git a/plugins/server/TheCrawlingEater.py b/plugins/server/TheCrawlingEater.py
index 4e8a3f8..867f05c 100644
--- a/plugins/server/TheCrawlingEater.py
+++ b/plugins/server/TheCrawlingEater.py
@@ -8,16 +8,26 @@ 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"]]:
+        pos = world_db["Things"][0]["pos"]
+        if not (chr(world_db["MAP"][pos]) == "0"
+                and world_db["wetmap"][pos] > ord("0")):
             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]) == "0" and \
+                world_db["wetmap"][pos] > ord("0") and t["T_BLADDER"] < 32:
         log("You DRINK.")
         t["T_BLADDER"] += 1
+        world_db["wetmap"][pos] -= 1
+        if world_db["wetmap"][pos] == ord("0"):
+            world_db["MAP"][pos] = ord("0")
 
 
 def play_pee():
@@ -33,8 +43,10 @@ def actor_pee(t):
         return
     if t == world_db["Things"][0]:
         log("You LOSE fluid.")
-    terrain = world_db["MAP"][t["pos"]]
+    if not world_db["catch_air"](t):
+        return
     t["T_BLADDER"] -= 1
+    world_db["wetmap"][t["pos"]] += 1
 
 
 def play_drop():
@@ -50,23 +62,10 @@ def actor_drop(t):
         return
     if t == world_db["Things"][0]:
         log("You DROP waste.")
-    terrain = world_db["MAP"][t["pos"]]
+    if not world_db["catch_air"](t):
+        return
+    world_db["MAP"][t["pos"]] += 1
     t["T_BOWEL"] -= 1
-    if chr(terrain) == "_":
-        world_db["MAP"][t["pos"]] = ord(".")
-    elif chr(terrain) == ".":
-        world_db["MAP"][t["pos"]] = ord(":")
-    elif chr(terrain) == ":":
-        world_db["MAP"][t["pos"]] = ord("%")
-    elif chr(terrain) == "%":
-        world_db["MAP"][t["pos"]] = ord("#")
-    elif chr(terrain) == "#":
-        world_db["MAP"][t["pos"]] = ord("X")
-    elif chr(terrain) == "X":
-        t["T_LIFEPOINTS"] = 0
-        if t == world_db["Things"][0]:
-            t["fovmap"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
-            log("You SUFFOCATE.")
 
 
 def play_move(str_arg):
@@ -82,8 +81,7 @@ 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 "34":
                 if t["T_BOWEL"] >= 32:
                     if t == world_db["Things"][0]:
                         log("You're too FULL to eat.")
@@ -129,52 +127,75 @@ def actor_move(t):
         t["T_POSY"] = move_result[1]
         t["T_POSX"] = move_result[2]
         t["pos"] = move_result[1] * world_db["MAP_LENGTH"] + move_result[2]
+        if world_db["MAP"][t["pos"]] == ord("-"):
+            world_db["die"](t, "You FALL in a hole, and die.")
+            return
         build_fov_map(t)
     else:
-        if t["T_BOWEL"] >= 32:
+        height = world_db["MAP"][pos] - ord("0")
+        if t["T_BOWEL"] >= 32 or height == 5:
             return
-        elif ord("%") == world_db["MAP"][pos] and 0 == int(rand.next() % 2):
-            log("You EAT.")
-            world_db["MAP"][pos] = ord("_")
-            t["T_BOWEL"] += 3
-        elif ord("#") == world_db["MAP"][pos] and 0 == int(rand.next() % 5):
-            log("You EAT.")
-            world_db["MAP"][pos] = ord("_")
-            t["T_BOWEL"] += 4
-        if t["T_BOWEL"] > 32:
-            t["T_BOWEL"] = 32
+        eaten = False
+        if height == 3 and 0 == int(rand.next() % 2):
+            t["T_BOWEL"] += height
+            eaten = True
+        elif height == 4 and 0 == int(rand.next() % 5):
+            t["T_BOWEL"] += height
+            eaten = True
+        log("You EAT.")
+        if eaten:
+            world_db["MAP"][pos] = ord("0")
+            if t["T_BOWEL"] > 32:
+                t["T_BOWEL"] = 32
+
+
+
+def catch_air(t):
+    if (world_db["wetmap"][t["pos"]] - ord("0")) \
+            + (world_db["MAP"][t["pos"]] - ord("0")) > 4:
+        world_db["die"](t, "You SUFFOCATE")
+        return False
+    return True
+world_db["catch_air"] = catch_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():
     from server.make_map import new_pos, is_neighbor
     from server.utils import rand
-    world_db["MAP"] = bytearray(b'X' * (world_db["MAP_LENGTH"] ** 2))
+    world_db["MAP"] = bytearray(b'5' * (world_db["MAP_LENGTH"] ** 2))
     length = world_db["MAP_LENGTH"]
     add_half_width = (not (length % 2)) * int(length / 2)
-    world_db["MAP"][int((length ** 2) / 2) + add_half_width] = ord("#")
+    world_db["MAP"][int((length ** 2) / 2) + add_half_width] = ord("4")
     while (1):
         y, x, pos = new_pos()
-        if "X" == chr(world_db["MAP"][pos]) and is_neighbor((y, x), "#"):
+        if "5" == chr(world_db["MAP"][pos]) and is_neighbor((y, x), "4"):
             if y == 0 or y == (length - 1) or x == 0 or x == (length - 1):
                 break
-            world_db["MAP"][pos] = ord("#")
+            world_db["MAP"][pos] = ord("4")
     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("_")
+        if "4" == chr(world_db["MAP"][pos]) \
+                and ((not single_allowed) or is_neighbor((y, x), "0")):
+            world_db["MAP"][pos] = ord("0")
             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("~")
+        if ord("0") == world_db["MAP"][pos] and \
+                ord("0") == world_db["wetmap"][pos]:
+            world_db["wetmap"][pos] = ord("3")
             i_water += 1
 
 
@@ -185,11 +206,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 == ".":
-                return 2
-            elif terrain == ":":
-                return 4
+            narrowness = world_db["MAP"][pos] - ord("0")
+            return 2 ** narrowness
     return 1
 world_db["calc_effort"] = calc_effort
 
@@ -229,6 +247,36 @@ def turn_over():
                     if Thing["T_BLADDER"] > 16:
                         if 0 == (rand.next() % (33 - Thing["T_BLADDER"])):
                             action_db["actor_pee"](Thing)
+        water = 0
+        positions_to_wet = []
+        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):
+            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 ** 16) / (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
+            if i_positions_to_wet == 0:
+                break
+        if water > 0:
+            while water > 0:
+                select = rand.next() % len(positions_to_wet)
+                pos = positions_to_wet[select]
+                world_db["wetmap"][pos] += 1
+                positions_to_wet.remove(pos)
+                water -= 1
         world_db["TURN"] += 1
         io_db["worldstate_updateable"] = True
         try_worldstate_update()
@@ -258,14 +306,59 @@ def play_wait():
         world_db["set_command"]("wait")
 
 
+def save_wetmap():
+    length = world_db["MAP_LENGTH"]
+    string = ""
+    for i in range(length):
+        line = world_db["wetmap"][i * length:(i * length) + length].decode()
+        string = string + "WETMAP" + " "  + str(i) + " " + line + "\n"
+    return string
+
+
+def wetmapset(str_int, mapline):
+    def valid_map_line(str_int, mapline):
+        from server.utils import integer_test
+        val = integer_test(str_int, 0, 255)
+        if None != val:
+            if val >= world_db["MAP_LENGTH"]:
+                print("Illegal value for map line number.")
+            elif len(mapline) != world_db["MAP_LENGTH"]:
+                print("Map line length is unequal map width.")
+            else:
+                return val
+        return None
+    val = valid_map_line(str_int, mapline)
+    if None != val:
+        length = world_db["MAP_LENGTH"]
+        if not world_db["wetmap"]:
+            m = bytearray(b' ' * (length ** 2))
+        else:
+            m = world_db["wetmap"]
+        m[val * length:(val * length) + length] = mapline.encode()
+        if not world_db["wetmap"]:
+            world_db["wetmap"] = m
+
+def write_wetmap():
+    from server.worldstate_write_helpers import write_map
+    length = world_db["MAP_LENGTH"]
+    visible_wetmap = bytearray(b' ' * (length ** 2))
+    for i in range(length ** 2):
+        if world_db["Things"][0]["fovmap"][i] == ord('v'):
+            visible_wetmap[i] = world_db["wetmap"][i]
+    return write_map(visible_wetmap, world_db["MAP_LENGTH"])
+
+
 from server.config.io import io_db
 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 = "%#X"
-server.config.world_data.symbols_passable = "_.:~"
+server.config.world_data.symbols_hide = "345"
+server.config.world_data.symbols_passable = "012-"
 server.config.world_data.thing_defaults["T_BOWEL"] = 0
 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
 import server.config.make_world_helpers
 server.config.make_world_helpers.make_map = make_map
 from server.config.commands import commands_db
@@ -280,6 +373,7 @@ commands_db["use"] = (1, False, lambda x: None)
 commands_db["pickup"] = (0, False, lambda: None)
 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)
 from server.actions import actor_wait
 import server.config.actions
 server.config.actions.action_db = {