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

diff --git a/plugins/server/TheCrawlingEater.py b/plugins/server/TheCrawlingEater.py
index e23f00f..04d36d5 100644
--- a/plugins/server/TheCrawlingEater.py
+++ b/plugins/server/TheCrawlingEater.py
@@ -6,6 +6,20 @@
 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.")
+            return
+        world_db["set_command"]("drink")
+
+
+def actor_drink(t):
+    if ord("~") == world_db["MAP"][world_db["Things"][0]["pos"]]:
+        log("You DRINK.")
+        t["T_BLADDER"] += 1
+
+
 def play_drop():
     if action_exists("drop") and world_db["WORLD_ACTIVE"]:
         if world_db["Things"][0]["T_STOMACH"] < 1:
@@ -124,15 +138,24 @@ 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):
@@ -214,10 +237,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_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.symbols_passable = "_.:~"
 server.config.world_data.thing_defaults["T_STOMACH"] = 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
 from server.config.commands import commands_db
@@ -226,15 +251,18 @@ commands_db["ai"] = (0, False, command_ai)
 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["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_BLADDER"] = (1, False, setter("Thing", "T_BLADDER", 0, 255))
 from server.actions import actor_wait
 import server.config.actions
 server.config.actions.action_db = {
     "actor_wait": actor_wait,
     "actor_move": actor_move,
-    "actor_drop": actor_drop
+    "actor_drop": actor_drop,
+    "actor_drink": actor_drink,
 }
 
 strong_write(io_db["file_out"], "PLUGIN TheCrawlingEater\n")