TCE: Improvements to language, symbols.

diff --git a/confserver/TheCrawlingEater b/confserver/TheCrawlingEater
index 60b33bf8996a985c6c28becd20a7f543edf3efa7..5338708b75f1bb59b77f93ec0b6b3e60b63b07f6 100644 (file)
--- a/confserver/TheCrawlingEater
+++ b/confserver/TheCrawlingEater
@@ -18,7 +18,7 @@ TA_NAME drink
 TT_ID 0
 TT_START_NUMBER 1
 TT_LIFEPOINTS 1
-TT_SYMBOL o
+TT_SYMBOL @
 
 TT_ID 5
 TT_SYMBOL %

diff --git a/plugins/client/TheCrawlingEater.py b/plugins/client/TheCrawlingEater.py
index 6996daf1ef4d25bfe611984c33cb2e4bc665bf25..e5559c54ff2185d0d76beaefbfb4cb892d65c7da 100644 (file)
--- a/plugins/client/TheCrawlingEater.py
+++ b/plugins/client/TheCrawlingEater.py
@@ -13,10 +13,10 @@ def win_bladder(self):
     return offset, winmap_size, winmap
 
 
-def win_stomach(self):
+def win_bowel(self):
     winmap = []
     curses.init_pair(80, curses.COLOR_YELLOW, curses.COLOR_RED)
-    for i in range(world_data["stomach"]):
+    for i in range(world_data["bowel"]):
         winmap += [("#", curses.color_pair(80))]
     winmap_size = [1, len(winmap)]
     offset = [0, 0]
@@ -85,7 +85,7 @@ def win_map(self):
                     attribute = col_dirt
                 elif char == "~":
                     attribute = col_water
-                elif char == "o":
+                elif char == "@":
                     attribute = col_player
                     bonus = (char, attribute)
                 winmap += [(char, attribute), bonus]
@@ -94,16 +94,16 @@ def win_map(self):
     return offset, winmap_size, winmap
 
 from client.config.world_data import world_data
-world_data["stomach"] = 0
+world_data["bowel"] = 0
 world_data["bladder"] = 0
 from client.config.io import io
-io["worldstate_read_order"] += [["stomach", "int"]]
+io["worldstate_read_order"] += [["bowel", "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": [1, 33], "func": win_bowel, "title": "bowel"},
     {"config": [1, 33], "func": win_bladder, "title": "bladder"},
     {"config": [-4, 33], "func": win_log, "title": "log"}
 ]

diff --git a/plugins/server/TheCrawlingEater.py b/plugins/server/TheCrawlingEater.py
index 04d36d5f8a553c5ef52a13f5bf8ac9ab96e56468..210356a1753e267b730502237270b7cb4c9d6c70 100644 (file)
--- a/plugins/server/TheCrawlingEater.py
+++ b/plugins/server/TheCrawlingEater.py
@@ -9,7 +9,7 @@ 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.")
+            log("NOTHING to drink here.")
             return
         world_db["set_command"]("drink")
 
@@ -22,19 +22,19 @@ def actor_drink(t):
 
 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
+    t["T_BOWEL"] -= 1
     if chr(terrain) == "_":
         world_db["MAP"][t["pos"]] = ord(".")
     elif chr(terrain) == ".":
@@ -110,19 +110,19 @@ 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["T_BOWEL"] >= 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):
             log("You EAT.")
             world_db["MAP"][pos] = ord("_")
-            t["T_STOMACH"] += 3
+            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_STOMACH"] += 4
-        if t["T_STOMACH"] > 32:
-            t["T_STOMACH"] = 32
+            t["T_BOWEL"] += 4
+        if t["T_BOWEL"] > 32:
+            t["T_BOWEL"] = 32
 
 
 def make_map():
@@ -203,8 +203,8 @@ 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)
         world_db["TURN"] += 1
         io_db["worldstate_updateable"] = True
@@ -236,12 +236,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.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
@@ -254,7 +254,7 @@ 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_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