From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 9 Mar 2016 21:57:04 +0000 (+0100)
Subject: TCE: Add drinking, bladder.
X-Git-Tag: tce~60
X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/%7B%7Bprefix%7D%7D/task?a=commitdiff_plain;h=5cb6d71f5a8d7fecfde60351f6b767754ce3f092;p=plomrogue

TCE: Add drinking, bladder.
---

diff --git a/confserver/TheCrawlingEater b/confserver/TheCrawlingEater
index 0bd3ccc..60b33bf 100644
--- a/confserver/TheCrawlingEater
+++ b/confserver/TheCrawlingEater
@@ -12,6 +12,9 @@ TA_NAME move
 TA_ID 3
 TA_NAME drop
 
+TA_ID 4
+TA_NAME drink
+
 TT_ID 0
 TT_START_NUMBER 1
 TT_LIFEPOINTS 1
diff --git a/plugins/client/TheCrawlingEater.py b/plugins/client/TheCrawlingEater.py
index 106fc5b..6996daf 100644
--- a/plugins/client/TheCrawlingEater.py
+++ b/plugins/client/TheCrawlingEater.py
@@ -3,6 +3,16 @@
 # see the file NOTICE in the root directory of the PlomRogue source package.
 
 
+def win_bladder(self):
+    winmap = []
+    curses.init_pair(79, curses.COLOR_WHITE, curses.COLOR_BLUE)
+    for i in range(world_data["bladder"]):
+        winmap += [("~", curses.color_pair(79))]
+    winmap_size = [1, len(winmap)]
+    offset = [0, 0]
+    return offset, winmap_size, winmap
+
+
 def win_stomach(self):
     winmap = []
     curses.init_pair(80, curses.COLOR_YELLOW, curses.COLOR_RED)
@@ -85,17 +95,21 @@ def win_map(self):
 
 from client.config.world_data import world_data
 world_data["stomach"] = 0
+world_data["bladder"] = 0
 from client.config.io import io
 io["worldstate_read_order"] += [["stomach", "int"]]
+io["worldstate_read_order"] += [["bladder", "int"]]
 from client.config.windows import windows_config
 from client.windows import win_log
 windows_config[:] = [
     {"config": [0, -34], "func": win_map, "title": "The Crawling Eater"},
     {"config": [1, 33], "func": win_stomach, "title": "stomach"},
-    {"config": [-2, 33], "func": win_log, "title": "log"}
+    {"config": [1, 33], "func": win_bladder, "title": "bladder"},
+    {"config": [-4, 33], "func": win_log, "title": "log"}
 ]
 from client.window_management import set_windows
 set_windows()
 from client.commands import command_sender
 from client.config.commands import commands
-commands["D"] = (command_sender("drop"),)
+commands["S"] = (command_sender("drop"),)
+commands["D"] = (command_sender("drink"),)
diff --git a/plugins/server/TheCrawlingEater.py b/plugins/server/TheCrawlingEater.py
index 355b025..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:
@@ -223,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
@@ -235,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")