home · contact · privacy
Simplify hunger() with Python's built-in abs().
[plomrogue] / roguelike-server
index 2f95b2ca7880f1fdf2dd91cd5ddb8233ac88b011..41506c0800e22f2e115d4a86c3d5936188ddba3c 100755 (executable)
@@ -212,12 +212,10 @@ def save_world():
     string = ""
     for key in world_db:
         if (dict != type(world_db[key])
-           and key != "ALTAR"   # #
-           and key != "MAP" and key != "WORLD_ACTIVE"):
+            and key != "altar"  # #
+            and key != "MAP" and key != "WORLD_ACTIVE"):
             string = string + key + " " + str(world_db[key]) + "\n"
     string = string + mapsetter("MAP")()
-    string = (string + "ALTAR " + str(world_db["ALTAR"][0]) + " "  # #
-                                + str(world_db["ALTAR"][1]) + "\n")  # #
     string = string + helper("ThingActions", "TA_ID")
     string = string + helper("ThingTypes", "TT_ID", {"TT_CORPSE_ID": False})
     for id in world_db["ThingTypes"]:
@@ -310,21 +308,6 @@ def try_worldstate_update():
     """Write worldstate file if io_db["worldstate_updateable"] is set."""
     if io_db["worldstate_updateable"]:
 
-        def draw_visible_Things(map, run):
-            for id in world_db["Things"]:
-                type = world_db["Things"][id]["T_TYPE"]
-                consumable = world_db["ThingTypes"][type]["TT_CONSUMABLE"]
-                alive = world_db["ThingTypes"][type]["TT_LIFEPOINTS"]
-                if (0 == run and not consumable and not alive) \
-                   or (1 == run and consumable and not alive) \
-                   or (2 == run and alive):
-                    y = world_db["Things"][id]["T_POSY"]
-                    x = world_db["Things"][id]["T_POSX"]
-                    fovflag = world_db["Things"][0]["fovmap"][(y * length) + x]
-                    if 'v' == chr(fovflag):
-                        c = world_db["ThingTypes"][type]["TT_SYMBOL"]
-                        map[(y * length) + x] = ord(c)
-
         def write_map(string, map):
             for i in range(length):
                 line = map[i * length:(i * length) + length].decode()
@@ -339,7 +322,7 @@ def try_worldstate_update():
                 type_id = world_db["Things"][id]["T_TYPE"]
                 name = world_db["ThingTypes"][type_id]["TT_NAME"]
                 inventory = inventory + name + "\n"
-        # 7DRL additions:  GOD_MOOD, GOD_FAVOR
+        # 7DRL additions:  GOD_MOOD, GOD_FAVOR
         string = str(world_db["TURN"]) + "\n" + \
                  str(world_db["GOD_MOOD"]) + "\n" + \
                  str(world_db["GOD_FAVOR"]) + "\n" + \
@@ -350,21 +333,79 @@ def try_worldstate_update():
                  str(world_db["Things"][0]["T_POSX"]) + "\n" + \
                  str(world_db["MAP_LENGTH"]) + "\n"
         length = world_db["MAP_LENGTH"]
+
         fov = bytearray(b' ' * (length ** 2))
-        for pos in range(length ** 2):
-            if 'v' == chr(world_db["Things"][0]["fovmap"][pos]):
-                fov[pos] = world_db["MAP"][pos]
-        for i in range(3):
-            draw_visible_Things(fov, i)
+        ord_v = ord("v")
+        for pos in [pos for pos in range(length ** 2)
+                        if ord_v == world_db["Things"][0]["fovmap"][pos]]:
+            fov[pos] = world_db["MAP"][pos]
+        for id in [id for tid in reversed(sorted(list(world_db["ThingTypes"])))
+                      for id in world_db["Things"]
+                      if not world_db["Things"][id]["carried"]
+                      if world_db["Things"][id]["T_TYPE"] == tid
+                      if world_db["Things"][0]["fovmap"][
+                           world_db["Things"][id]["T_POSY"] * length
+                           + world_db["Things"][id]["T_POSX"]] == ord_v]:
+            type = world_db["Things"][id]["T_TYPE"]
+            c = ord(world_db["ThingTypes"][type]["TT_SYMBOL"])
+            fov[world_db["Things"][id]["T_POSY"] * length
+                + world_db["Things"][id]["T_POSX"]] = c
         string = write_map(string, fov)
+
         mem = world_db["Things"][0]["T_MEMMAP"][:]
-        for i in range(2):
-            for mt in world_db["Things"][0]["T_MEMTHING"]:
-                consumable = world_db["ThingTypes"][mt[0]]["TT_CONSUMABLE"]
-                if (i == 0 and not consumable) or (i == 1 and consumable):
-                    c = world_db["ThingTypes"][mt[0]]["TT_SYMBOL"]
-                    mem[(mt[1] * length) + mt[2]] = ord(c)
+        for mt in [mt for tid in reversed(sorted(list(world_db["ThingTypes"])))
+                      for mt in world_db["Things"][0]["T_MEMTHING"]
+                      if mt[0] == tid]:
+             c = world_db["ThingTypes"][mt[0]]["TT_SYMBOL"]
+             mem[(mt[1] * length) + mt[2]] = ord(c)
         string = write_map(string, mem)
+
+        metamapA = bytearray(b'0' * (length ** 2))  # #
+        for id in [id for id in world_db["Things"]  # #
+                      if not world_db["Things"][id]["carried"]  # #
+                      if world_db["Things"][id]["T_LIFEPOINTS"]  # #
+                      if world_db["Things"][0]["fovmap"][  # #
+                           world_db["Things"][id]["T_POSY"] * length  # #
+                           + world_db["Things"][id]["T_POSX"]] == ord_v]:  # #
+            pos = (world_db["Things"][id]["T_POSY"] * length  # #
+                  + world_db["Things"][id]["T_POSX"])  # #
+            if id == 0 or world_db["EMPATHY"]:  # #
+                type = world_db["Things"][id]["T_TYPE"]  # #
+                max_hp = world_db["ThingTypes"][type]["TT_LIFEPOINTS"]  # #
+                third_of_hp = max_hp / 3  # #
+                hp = world_db["Things"][id]["T_LIFEPOINTS"]  # #
+                add = 0  # #
+                if hp > 2 * third_of_hp:  # #
+                     add = 2  # #
+                elif hp > third_of_hp:  # #
+                    add = 1  # #
+                metamapA[pos] = ord('a') + add # #
+            else:  # #
+                metamapA[pos] = ord('X')  # #
+        for mt in world_db["Things"][0]["T_MEMTHING"]:  # #
+            pos = mt[1] * length + mt[2]  # #
+            if metamapA[pos] < ord('2'):  # #
+                metamapA[pos] += 1  # #
+        string = write_map(string, metamapA)  # #
+        
+        metamapB = bytearray(b' ' * (length ** 2))  # #
+        for id in [id for id in world_db["Things"]  # #
+                      if not world_db["Things"][id]["carried"]  # #
+                      if world_db["Things"][id]["T_LIFEPOINTS"]  # #
+                      if world_db["Things"][0]["fovmap"][  # #
+                           world_db["Things"][id]["T_POSY"] * length  # #
+                           + world_db["Things"][id]["T_POSX"]] == ord_v]:  # #
+            pos = (world_db["Things"][id]["T_POSY"] * length  # #
+                  + world_db["Things"][id]["T_POSX"])  # #
+            if id == 0 or world_db["EMPATHY"]:  # #
+                action = world_db["Things"][id]["T_COMMAND"]  # #
+                if 0 != action:  # #
+                    name = world_db["ThingActions"][action]["TA_NAME"]  # #
+                else:  # #
+                    name = " "  # #
+                metamapB[pos] = ord(name[0]) # #
+        string = write_map(string, metamapB)  # #
+
         atomic_write(io_db["path_worldstate"], string, delete=False)
         strong_write(io_db["file_out"], "WORLD_UPDATED\n")
         io_db["worldstate_updateable"] = False
@@ -430,7 +471,7 @@ def make_map():
     to land. The cycle ends when a land cell is due to be created at the map's
     border. Then put some trees on the map (TODO: more precise algorithm desc).
     """
-    # 7DRL: Also add some ":" cells as land to which plants may proliferate.
+    # 7DRL: Also add some ":" cells, and (not surrounded by trees!) "_" altar.
 
     def is_neighbor(coordinates, type):
         y = coordinates[0]
@@ -490,6 +531,17 @@ def make_map():
           and ((not single_allowed) or is_neighbor((y, x), ":"))):  # #
             world_db["MAP"][pos] = ord(":")  # #
             i_colons += 1  # #
+    altar_placed = False  # #
+    while not altar_placed:  # #
+        y = rand.next() % length  # #
+        x = rand.next() % length  # #
+        pos = (y * length) + x  # #
+        if (("." == chr(world_db["MAP"][pos]  # #
+             or ":" == chr(world_db["MAP"][pos]))
+            and not is_neighbor((y, x), "X"))):  # #
+            world_db["MAP"][pos] = ord("_")  # #
+            world_db["altar"] = (y, x)  # #
+            altar_placed = True  # #
 
 
 def update_map_memory(t, age_map=True):
@@ -521,8 +573,7 @@ def update_map_memory(t, age_map=True):
     for pos in [pos for pos in range(world_db["MAP_LENGTH"] ** 2)
                 if ord_v == t["fovmap"][pos]]:
         t["T_MEMDEPTHMAP"][pos] = ord_0
-        if ord_space == t["T_MEMMAP"][pos]:
-            t["T_MEMMAP"][pos] = world_db["MAP"][pos]
+        t["T_MEMMAP"][pos] = world_db["MAP"][pos]
     if age_map:
         age_some_memdepthmap_on_nonfov_cells()
     t["T_MEMTHING"] = [mt for mt in t["T_MEMTHING"]
@@ -597,6 +648,24 @@ def build_fov_map(t):
         raise RuntimeError("Malloc error in build_fov_Map().")
 
 
+def log_help():
+    """Send quick usage info to log."""
+    strong_write(io_db["file_out"], "LOG "
+                 + "Use 'w'/'e'/'s'/'d'/'x'/'c' to move, and 'w' to wait.\n")
+    strong_write(io_db["file_out"], "LOG "
+                 + "Use 'p' to pick up objects, and 'D' to drop them.\n")
+    strong_write(io_db["file_out"], "LOG "
+                 + "Some objects can be used (such as: eaten) by 'u' if "
+                 + "they are in your inventory. "
+                 + "Use 'Up'/'Down' to navigate the inventory.\n")
+    strong_write(io_db["file_out"], "LOG "
+                 + "Use 'l' to toggle 'look' mode (move an exploration cursor "
+                 + "instead of the player over the map).\n")
+    strong_write(io_db["file_out"], "LOG "
+                 + "Use 'PgUp'/PgDn' to scroll the 'Things here' window.\n")
+    strong_write(io_db["file_out"], "LOG See README file for more details.\n")
+
+
 def decrement_lifepoints(t):
     """Decrement t's lifepoints by 1, and if to zero, corpse it.
 
@@ -604,8 +673,8 @@ def decrement_lifepoints(t):
     still display memory data. On non-player things, erase fovmap and memory.
     Dying actors drop all their things.
     """
-    # # 7DRL: also decrements God's mood; deaths heavily so
-    # # 7DRL: return 1 if death, else 0
+    # 7DRL: Also decrements God's mood; deaths heavily so.
+    # 7DRL: Return 1 if death, else 0.
     t["T_LIFEPOINTS"] -= 1
     world_db["GOD_MOOD"] -= 1  # #
     if 0 == t["T_LIFEPOINTS"]:
@@ -620,6 +689,8 @@ def decrement_lifepoints(t):
         if world_db["Things"][0] == t:
             t["fovmap"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
             strong_write(io_db["file_out"], "LOG You die.\n")
+            strong_write(io_db["file_out"],
+                         "LOG See README on how to start over.\n")
         else:
             t["fovmap"] = False
             t["T_MEMMAP"] = False
@@ -658,6 +729,79 @@ def mv_yx_in_dir_legal(dir, y, x):
     return (test, libpr.result_y(), libpr.result_x())
 
 
+def enter_altar():  # #
+     """What happens when the player enters the altar."""
+     if world_db["FAVOR_STAGE"] > 9000:
+        strong_write(io_db["file_out"],
+                     "LOG You step on a soul-less slab of stone.\n")
+        return
+     strong_write(io_db["file_out"], "LOG YOU ENTER SACRED GROUND.\n")
+     if world_db["FAVOR_STAGE"] == 0:
+         world_db["FAVOR_STAGE"] = 1
+         strong_write(io_db["file_out"], "LOG The Island God speaks to you: "
+                      + "\"I don't trust you. You intrude on the island's "
+                      + "affairs. I think you're a nuisance at best, and a "
+                      + "danger to my children at worst. I will give you a "
+                      + "chance to lighten my mood, however: For a while now, "
+                      + "I've been trying to spread the plant "
+                      + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_NAME"]
+                      + " (\""
+                      + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_SYMBOL"]
+                      + "\"). I have not been very successful so far. Maybe "
+                      + "you can make yourself useful there. I will count "
+                      + "each further "
+                      + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_NAME"]
+                      + " that grows to your favor.\n")
+     elif world_db["FAVOR_STAGE"] == 1 and world_db["GOD_FAVOR"] >= 100:
+         world_db["FAVOR_STAGE"] = 2
+         strong_write(io_db["file_out"], "LOG The Island God speaks to you: "
+                      + "\"You could have done worse so far. Maybe you are not "
+                      + "the worst to happen to this island since the metal "
+                      + "birds threw the great lightning ball. Maybe you can "
+                      + "help me spread another plant. It multiplies faster, "
+                      + "and it is highly nutritious: "
+                      + world_db["ThingTypes"][world_db["PLANT_1"]]["TT_NAME"]
+                      + " (\""
+                      + world_db["ThingTypes"][world_db["PLANT_1"]]["TT_SYMBOL"]
+                      + "\"). It is new. I give you the only example. Be very "
+                      + "careful with it! I also give you another tool that "
+                      + "might be helpful.\n")
+         id = id_setter(-1, "Things")
+         world_db["Things"][id] = new_Thing(world_db["PLANT_1"],
+                                            world_db["altar"])
+         id = id_setter(-1, "Things")
+         world_db["Things"][id] = new_Thing(world_db["TOOL_0"],
+                                            world_db["altar"])
+     elif world_db["FAVOR_STAGE"] == 2 and \
+          0 == len([id for id in world_db["Things"]
+                   if world_db["Things"][id]["T_TYPE"]
+                      == world_db["PLANT_1"]]):
+         strong_write(io_db["file_out"], "LOG The Island God speaks to you: "
+                      + "\"I am greatly disappointed that you lost all "
+                      + world_db["ThingTypes"][world_db["PLANT_1"]]["TT_NAME"]
+                      + " this island had. Here is another one. It cost me "
+                      + " great work. Be more careful this time.\n")
+         id = id_setter(-1, "Things")
+         world_db["Things"][id] = new_Thing(world_db["PLANT_1"],
+                                            world_db["altar"])
+         add_gods_favor(-250)
+     elif world_db["GOD_FAVOR"] > 9000:
+         world_db["FAVOR_STAGE"] = 9001
+         strong_write(io_db["file_out"], "LOG The Island God speaks to you: "
+                      + "\"You have proven yourself worthy of my respect. "
+                      + "You were a good citizen to the island, and sometimes "
+                      + "a better steward to its inhabitants than me. The "
+                      + "island shall miss you when you leave. But you have "
+                      + "earned the right to do so. Take this "
+                      + world_db["ThingTypes"][world_db["SLIPPERS"]]["TT_NAME"]
+                      + " and USE it when you please. It will take you to "
+                      + "where you came from. (But do feel free to stay here "
+                      + "as long as you like.)\"\n")
+         id = id_setter(-1, "Things")
+         world_db["Things"][id] = new_Thing(world_db["SLIPPERS"],
+                                            world_db["altar"])
+
+
 def actor_wait(t):
     """Make t do nothing (but loudly, if player avatar)."""
     if t == world_db["Things"][0]:
@@ -666,14 +810,14 @@ def actor_wait(t):
 
 def actor_move(t):
     """If passable, move/collide(=attack) thing into T_ARGUMENT's direction."""
-    # # 7DRL: Player wounding (worse: killing) others will lower God's favor.
+    # 7DRL: Player wounding (worse: killing) others will lower God's favor.
+    # 7DRL: Player entering the altar triggers enter_altar().
+    # 7DRL: Player with axe chops down trees.
     passable = False
     move_result = mv_yx_in_dir_legal(chr(t["T_ARGUMENT"]),
                                      t["T_POSY"], t["T_POSX"])
     if 1 == move_result[0]:
         pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2]
-        passable = "." == chr(world_db["MAP"][pos]) or \
-                   ":" == chr(world_db["MAP"][pos])  # #
         hitted = [id for id in world_db["Things"]
                   if world_db["Things"][id] != t
                   if world_db["Things"][id]["T_LIFEPOINTS"]
@@ -695,6 +839,46 @@ def actor_move(t):
             if test and t == world_db["Things"][0]:  # #
                 add_gods_favor(-test)  # #
             return
+        if (ord("X") == world_db["MAP"][pos]  # #
+            or ord("|") == world_db["MAP"][pos]):  # #
+            carries_axe = False  # #
+            for id in t["T_CARRIES"]:  # # 
+                type = world_db["Things"][id]["T_TYPE"]  # #
+                if world_db["ThingTypes"][type]["TT_TOOL"] == "axe":  # #
+                    carries_axe = True  # #
+                    break  # #
+            if carries_axe:  # #
+                axe_name = world_db["ThingTypes"][type]["TT_NAME"]  # #
+                if t == world_db["Things"][0]:  # #
+                    strong_write(io_db["file_out"], "LOG With your "  # #
+                                                    + axe_name  # #
+                                                    + ", you chop!\n")  # #
+                    if ord("X") == world_db["MAP"][pos]:  # #
+                        add_gods_favor(-1)  # #
+                chop_power = world_db["ThingTypes"][type]["TT_TOOLPOWER"]
+                case_X = world_db["MAP"][pos] == ord("X")  # #
+                if (chop_power > 0  # #
+                    and ((case_X and  # #
+                          0 == int(rand.next() / chop_power))  # #
+                    or (not case_X and  # #
+                             0 == int(rand.next() / (3 * chop_power))))):  # #
+                    if t == world_db["Things"][0]:  # #
+                        strong_write(io_db["file_out"],  # #
+                                     "LOG You chop it down.\n")  # #
+                    if world_db["MAP"][pos] == ord("X"):  # #
+                        add_gods_favor(-10)  # #
+                    world_db["MAP"][pos] = ord(".")   # #
+                    i = 3 if case_X else 1  # #
+                    for i in range(i):  # #
+                        id = id_setter(-1, "Things")  # #
+                        world_db["Things"][id] = \
+                          new_Thing(world_db["LUMBER"],  # #
+                                    (move_result[1], move_result[2]))  # # 
+                    build_fov_map(t)  # #
+                return   # #
+        passable = ("." == chr(world_db["MAP"][pos]) or
+                    ":" == chr(world_db["MAP"][pos]) or # #
+                    "_" == chr(world_db["MAP"][pos])) # #
     dir = [dir for dir in directions_db
            if directions_db[dir] == chr(t["T_ARGUMENT"])][0]
     if passable:
@@ -706,13 +890,18 @@ def actor_move(t):
         build_fov_map(t)
         if t == world_db["Things"][0]:
             strong_write(io_db["file_out"], "LOG You move " + dir + ".\n")
+            if (move_result[1] == world_db["altar"][0] and  # #
+                move_result[2] == world_db["altar"][1]):  # #
+                enter_altar()  # #
     elif t == world_db["Things"][0]:
         strong_write(io_db["file_out"], "LOG You fail to move " + dir + ".\n")
 
 
 def actor_pick_up(t):
-    """Make t pick up (topmost?) Thing from ground into inventory."""
-    # Topmostness is actually not defined so far. Picks most nutritious Thing.
+    """Make t pick up (topmost?) Thing from ground into inventory.
+
+    Define topmostness by how low the thing's type ID is.
+    """
     # 7DRL: Non-player picking up player-dropped consumable -> GOD_FAVOR gain.
     used_slots = len(t["T_CARRIES"]) # #
     if used_slots < world_db["ThingTypes"][t["T_TYPE"]]["TT_STORAGE"]: # #
@@ -721,21 +910,21 @@ def actor_pick_up(t):
                if world_db["Things"][id]["T_POSY"] == t["T_POSY"]
                if world_db["Things"][id]["T_POSX"] == t["T_POSX"]]
         if len(ids):
-            highest_id = ids[0]
-            nutritious = 0
-            for id in ids:
-                type = world_db["Things"][id]["T_TYPE"]
-                if world_db["ThingTypes"][type]["TT_CONSUMABLE"] > nutritious:
-                    nutritious = world_db["ThingTypes"][type]["TT_CONSUMABLE"]
-                    highest_id = id
-            world_db["Things"][highest_id]["carried"] = True
-            if (t != world_db["Things"][0] and  # #
-                world_db["Things"][highest_id]["T_PLAYERDROP"]):  # #
-                x = world_db["Things"][highest_id]["T_TYPE"]
-                score = world_db["ThingTypes"][x]["TT_CONSUMABLE"] / 32  # #
+            lowest_tid = -1
+            for iid in ids:
+                tid = world_db["Things"][iid]["T_TYPE"] 
+                if lowest_tid == -1 or tid < lowest_tid:
+                    id = iid
+                    lowest_tid = tid
+            world_db["Things"][id]["carried"] = True
+            type = world_db["Things"][id]["T_TYPE"]  # #
+            if (t != world_db["Things"][0] # #
+                and world_db["Things"][id]["T_PLAYERDROP"]  # #
+                and world_db["ThingTypes"][type]["TT_TOOL"] == "food"):  # #
+                score = world_db["ThingTypes"][type]["TT_TOOLPOWER"] / 32  # #
                 add_gods_favor(score)  # #
-                world_db["Things"][highest_id]["T_PLAYERDROP"] = 0  # #
-            t["T_CARRIES"].append(highest_id)
+                world_db["Things"][id]["T_PLAYERDROP"] = 0  # #
+            t["T_CARRIES"].append(id)
             if t == world_db["Things"][0]:
                 strong_write(io_db["file_out"], "LOG You pick up an object.\n")
         elif t == world_db["Things"][0]:
@@ -764,13 +953,70 @@ def actor_drop(t):
 def actor_use(t):
     """Make t use (for now: consume) T_ARGUMENT-indexed Thing in inventory."""
     # TODO: Handle case where T_ARGUMENT matches nothing.
+    # 7DLR: Handle SLIPPERS-type Thing use.
     if len(t["T_CARRIES"]):
         id = t["T_CARRIES"][t["T_ARGUMENT"]]
         type = world_db["Things"][id]["T_TYPE"]
-        if world_db["ThingTypes"][type]["TT_CONSUMABLE"]:
+        if type == world_db["SLIPPERS"]:  # #
+            if t == world_db["Things"][0]:  # #
+                strong_write(io_db["file_out"], "LOG You use the "  # #
+                             + world_db["ThingTypes"][type]["TT_NAME"]  # #
+                             + ". It glows in wondrous colors, and emits "  # #
+                             + "a sound as if from a dying cat. The "  # #
+                             + "Island God laughs.\n")  # #
+            t["T_LIFEPOINTS"] = 1  # #
+            decrement_lifepoints(t)  # #
+        elif (world_db["ThingTypes"][type]["TT_TOOL"] == "axe"  # #
+              and t == world_db["Things"][0]):  # #
+                strong_write(io_db["file_out"],  # #
+                             "LOG To use this item for chopping, move "  # #
+                             "towards a tree while carrying it in "  # #
+                             "your inventory.\n")  # #
+        elif (world_db["ThingTypes"][type]["TT_TOOL"] == "carpentry"):  # #
+            pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"]
+            if (world_db["MAP"][pos] == ord("X")  # #
+                or world_db["MAP"][pos] == ord("|")):  # #
+                strong_write(io_db["file_out"],  # #
+                             "LOG Can't build when standing on barrier.\n")  # #
+                return
+            for id in [id for id in world_db["Things"]
+                       if not world_db["Things"][id] == t
+                       if not world_db["Things"][id]["carried"]
+                       if world_db["Things"][id]["T_POSY"] == t["T_POSY"]
+                       if world_db["Things"][id]["T_POSX"] == t["T_POSX"]]:
+                 strong_write(io_db["file_out"],
+                              "LOG Can't build when standing objects.\n")  # #
+                 return
+            for id in t["T_CARRIES"]:  # #
+                type_tool = world_db["Things"][id]["T_TYPE"]  # #
+                if (world_db["ThingTypes"][type_tool]["TT_TOOL"]  # #
+                    == "carpentry"):  # #
+                    break  # #
+            wood_id = None  # #
+            for id in t["T_CARRIES"]:  # #
+                type_material = world_db["Things"][id]["T_TYPE"]  # #
+                if (world_db["ThingTypes"][type_material]["TT_TOOL"]  # #
+                    == "wood"):  # #
+                    wood_id = id  # #
+                    break  # #
+            if wood_id != None:  # #
+                t["T_CARRIES"].remove(wood_id)  # #
+                del world_db["Things"][wood_id]  # #
+                world_db["MAP"][pos] = ord("|")  # #
+                strong_write(io_db["file_out"], "LOG With your "  # #
+                             + world_db["ThingTypes"][type_tool]["TT_NAME"]  # #
+                             + " you build a wooden barrier from your "  # #
+                             + world_db["ThingTypes"][type_material]  # #
+                               ["TT_NAME"]  # #
+                             + ".\n")  # #
+            else:  # #
+                strong_write(io_db["file_out"], "LOG You can't use a "  # #
+                             + world_db["ThingTypes"][type_tool]["TT_NAME"]  # #
+                             + " without some wood in your inventory.\n")  # #
+        elif world_db["ThingTypes"][type]["TT_TOOL"] == "food":
             t["T_CARRIES"].remove(id)
             del world_db["Things"][id]
-            t["T_SATIATION"] += world_db["ThingTypes"][type]["TT_CONSUMABLE"]
+            t["T_SATIATION"] += world_db["ThingTypes"][type]["TT_TOOLPOWER"]
             if t == world_db["Things"][0]:
                 strong_write(io_db["file_out"],
                              "LOG You consume this object.\n")
@@ -783,30 +1029,43 @@ def actor_use(t):
 
 
 def thingproliferation(t, prol_map):
-    """To chance of 1/TT_PROLIFERATE,create  t offspring in open neighbor cell.
+    """To chance of 1/TT_PROLIFERATE, create t offspring in open neighbor cell.
 
     Naturally only works with TT_PROLIFERATE > 0. The neighbor cell must be be
     marked "." in prol_map. If there are several map cell candidates, one is
     selected randomly.
     """
-    # 7DRL: success increments God's mood
-    # # 7DRL: Things proliferate only on ":" ground.
+    # 7DRL: success increments God's mood
+    # 7DRL: Plants (no TT_LIFEPOINTS) proliferate only on ":" ground.
     prolscore = world_db["ThingTypes"][t["T_TYPE"]]["TT_PROLIFERATE"]
     if prolscore and (1 == prolscore or 1 == (rand.next() % prolscore)):
         candidates = []
         for dir in [directions_db[key] for key in directions_db]:
             mv_result = mv_yx_in_dir_legal(dir, t["T_POSY"], t["T_POSX"])
-            if mv_result[0] and ord(":") == prol_map[mv_result[1]  # #
+            pos = mv_result[1] * world_db["MAP_LENGTH"] + mv_result[2]
+            if mv_result[0] and \
+               (ord(":") == prol_map[pos]  # #
+                or (world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]  # #
+                    and ord(".") == prol_map[pos])):
             # if mv_result[0] and ord(".") == prol_map[mv_result[1]
-                                                     * world_db["MAP_LENGTH"]
-                                                     + mv_result[2]]:
+                                                     * world_db["MAP_LENGTH"]
+                                                     + mv_result[2]]:
                 candidates.append((mv_result[1], mv_result[2]))
         if len(candidates):
             i = rand.next() % len(candidates)
             id = id_setter(-1, "Things")
             newT = new_Thing(t["T_TYPE"], (candidates[i][0], candidates[i][1]))
             world_db["Things"][id] = newT
-            world_db["GOD_MOOD"] += 1  # #
+            animacy = world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]  # #
+            if animacy:  # #
+                world_db["GOD_MOOD"] += animacy  # #
+            else:  # #
+                world_db["GOD_MOOD"] += 1  # #
+            if (world_db["FAVOR_STAGE"] > 0  # #
+                and t["T_TYPE"] == world_db["PLANT_0"]):  # #
+                world_db["GOD_FAVOR"] += 5  # #
+            elif t["T_TYPE"] == world_db["PLANT_1"]:  # #
+                world_db["GOD_FAVOR"] += 25  # #
 
 
 def try_healing(t):
@@ -814,7 +1073,7 @@ def try_healing(t):
 
     On success, decrease satiation score by 32.
     """
-    # 7DRL: Successful heals increment God's mood.
+    # 7DRL: Successful heals increment God's mood.
     if t["T_SATIATION"] > 0 \
        and t["T_LIFEPOINTS"] < \
            world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"] \
@@ -833,13 +1092,17 @@ def hunger(t):
     """Decrement t's satiation,dependent on it trigger lifepoint dec chance."""
     if t["T_SATIATION"] > -32768:
         t["T_SATIATION"] -= 1
-    testbase = t["T_SATIATION"] if t["T_SATIATION"] >= 0 else -t["T_SATIATION"]
     if not world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]:
         raise RuntimeError("A thing that should not hunger is hungering.")
     stomach = int(32767 / world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"])
-    if int(int(testbase / stomach) / ((rand.next() % stomach) + 1)):
+    if int(int(abs(t["T_SATIATION"]) / stomach)
+           / ((rand.next() % stomach) + 1)):
         if t == world_db["Things"][0]:
-            strong_write(io_db["file_out"], "LOG You suffer from hunger.\n")
+            if t["T_SATIATION"] < 0:
+                strong_write(io_db["file_out"], "LOG You suffer from hunger.\n")
+            else:
+                strong_write(io_db["file_out"],
+                             "LOG You suffer from over-eating.\n")
         decrement_lifepoints(t)
 
 
@@ -902,7 +1165,7 @@ def get_dir_to_target(t, filter):
             for mt in t["T_MEMTHING"]:
                 if ' ' != chr(t["T_MEMMAP"][(mt[1] * world_db["MAP_LENGTH"])
                                          + mt[2]]) \
-                   and world_db["ThingTypes"][mt[0]]["TT_CONSUMABLE"]:
+                   and world_db["ThingTypes"][mt[0]]["TT_TOOL"] == "food":
                     return True
         return False
 
@@ -954,7 +1217,7 @@ def get_dir_to_target(t, filter):
                        if ord_blank != t["T_MEMMAP"][mt[1]
                                                     * world_db["MAP_LENGTH"]
                                                     + mt[2]]
-                       if world_db["ThingTypes"][mt[0]]["TT_CONSUMABLE"]]:
+                       if world_db["ThingTypes"][mt[0]]["TT_TOOL"] == "food"]:
                 set_map_score(mt[1] * world_db["MAP_LENGTH"] + mt[2], 0)
         elif "s" == filter:
             zero_score_map_where_char_on_memdepthmap(mem_depth_c[0])
@@ -1040,26 +1303,27 @@ def get_dir_to_target(t, filter):
     return dir_to_target
 
 
-def standing_on_consumable(t):
+def standing_on_food(t):
     """Return True/False whether t is standing on a consumable."""
     for id in [id for id in world_db["Things"] if world_db["Things"][id] != t
                if world_db["Things"][id]["T_POSY"] == t["T_POSY"]
                if world_db["Things"][id]["T_POSX"] == t["T_POSX"]
                if world_db["ThingTypes"][world_db["Things"][id]["T_TYPE"]]
-                          ["TT_CONSUMABLE"]]:
+                  ["TT_TOOL"] == "food"]:
         return True
     return False
 
 
 def get_inventory_slot_to_consume(t):
     """Return slot Id of strongest consumable in t's inventory, else -1."""
-    cmp_consumability = 0
+    cmp_food = 0
     selection = -1
     i = 0
     for id in t["T_CARRIES"]:
         type = world_db["Things"][id]["T_TYPE"]
-        if world_db["ThingTypes"][type]["TT_CONSUMABLE"] > cmp_consumability:
-            cmp_consumability = world_db["ThingTypes"][type]["TT_CONSUMABLE"]
+        if world_db["ThingTypes"][type]["TT_TOOL"] == "food" \
+           and world_db["ThingTypes"][type]["TT_TOOLPOWER"] > cmp_food:
+            cmp_food = world_db["ThingTypes"][type]["TT_TOOLPOWER"]
             selection = i
         i += 1
     return selection
@@ -1076,7 +1340,7 @@ def ai(t):
     none, they will explore parts of the map unseen since ever or for at least
     one turn; if there is nothing to explore, they will simply wait.
     """
-    # 7DRL add: Don't pick up or search things when inventory is full.
+    # 7DRL add: Don't pick up or search things when inventory is full.
     t["T_COMMAND"] = [id for id in world_db["ThingActions"]
                       if world_db["ThingActions"][id]["TA_NAME"] == "wait"][0]
     if not get_dir_to_target(t, "f"):
@@ -1086,7 +1350,7 @@ def ai(t):
                               if world_db["ThingActions"][id]["TA_NAME"]
                                  == "use"][0]
             t["T_ARGUMENT"] = sel
-        elif standing_on_consumable(t) \
+        elif standing_on_food(t) \
              and (len(t["T_CARRIES"]) < # #
                  world_db["ThingTypes"][t["T_TYPE"]]["TT_STORAGE"]): # #
             t["T_COMMAND"] = [id for id in world_db["ThingActions"]
@@ -1110,7 +1374,7 @@ def turn_over():
                    if not world_db["Things"][id]["carried"]]:
             y = world_db["Things"][id]["T_POSY"]
             x = world_db["Things"][id]["T_POSX"]
-            proliferable_map[y * world_db["MAP_LENGTH"] + x] = ord('X')
+            proliferable_map[y * world_db["MAP_LENGTH"] + x] = ord("X")
         for id in [id for id in world_db["Things"]]:  # Only what's from start!
             if not id in world_db["Things"] or \
                world_db["Things"][id]["carried"]:   # May have been consumed or
@@ -1124,15 +1388,16 @@ def turn_over():
                         break
                     ai(Thing)
                 try_healing(Thing)
-                Thing["T_PROGRESS"] += 1
-                taid = [a for a in world_db["ThingActions"]
-                          if a == Thing["T_COMMAND"]][0]
-                ThingAction = world_db["ThingActions"][taid]
-                if Thing["T_PROGRESS"] == ThingAction["TA_EFFORT"]:
-                    eval("actor_" + ThingAction["TA_NAME"])(Thing)
-                    Thing["T_COMMAND"] = 0
-                    Thing["T_PROGRESS"] = 0
                 hunger(Thing)
+                if Thing["T_LIFEPOINTS"]:
+                    Thing["T_PROGRESS"] += 1
+                    taid = [a for a in world_db["ThingActions"]
+                              if a == Thing["T_COMMAND"]][0]
+                    ThingAction = world_db["ThingActions"][taid]
+                    if Thing["T_PROGRESS"] == ThingAction["TA_EFFORT"]:
+                        eval("actor_" + ThingAction["TA_NAME"])(Thing)
+                        Thing["T_COMMAND"] = 0
+                        Thing["T_PROGRESS"] = 0
             thingproliferation(Thing, proliferable_map)
         if whilebreaker:
             break
@@ -1209,6 +1474,7 @@ def command_quit():
 
 def command_thingshere(str_y, str_x):
     """Write to out file list of Things known to player at coordinate y, x."""
+    # 7DRL: terrain, too
     if world_db["WORLD_ACTIVE"]:
         y = integer_test(str_y, 0, 255)
         x = integer_test(str_x, 0, 255)
@@ -1216,19 +1482,38 @@ def command_thingshere(str_y, str_x):
         if None != y and None != x and y < length and x < length:
             pos = (y * world_db["MAP_LENGTH"]) + x
             strong_write(io_db["file_out"], "THINGS_HERE START\n")
+            pos = y * world_db["MAP_LENGTH"] + x;  # #
             if "v" == chr(world_db["Things"][0]["fovmap"][pos]):
-                for id in world_db["Things"]:
-                    if y == world_db["Things"][id]["T_POSY"] \
-                       and x == world_db["Things"][id]["T_POSX"] \
-                       and not world_db["Things"][id]["carried"]:
-                        type = world_db["Things"][id]["T_TYPE"]
-                        name = world_db["ThingTypes"][type]["TT_NAME"]
-                        strong_write(io_db["file_out"], name + "\n")
+                for id in [id for tid in sorted(list(world_db["ThingTypes"]))
+                              for id in world_db["Things"]
+                              if not world_db["Things"][id]["carried"]
+                              if world_db["Things"][id]["T_TYPE"] == tid
+                              if y == world_db["Things"][id]["T_POSY"]
+                              if x == world_db["Things"][id]["T_POSX"]]:
+                    type = world_db["Things"][id]["T_TYPE"]
+                    name = world_db["ThingTypes"][type]["TT_NAME"]
+                    strong_write(io_db["file_out"], name + "\n")
             else:
-                for mt in world_db["Things"][0]["T_MEMTHING"]:
-                    if y == mt[1] and x == mt[2]:
-                        name = world_db["ThingTypes"][mt[0]]["TT_NAME"]
-                        strong_write(io_db["file_out"], name + "\n")
+                for mt in [mt for tid in sorted(list(world_db["ThingTypes"]))
+                              for mt in world_db["Things"][0]["T_MEMTHING"]
+                              if mt[0] == tid if y == mt[1] if x == mt[2]]:
+                    name = world_db["ThingTypes"][mt[0]]["TT_NAME"]
+                    strong_write(io_db["file_out"], name + "\n")
+            if world_db["Things"][0]["T_MEMMAP"][pos] == ord("~"):  # #
+                name = "(terrain: SEA)"  # #
+            elif world_db["Things"][0]["T_MEMMAP"][pos] == ord("."):  # #
+                name = "(terrain: EARTH)"  # #
+            elif world_db["Things"][0]["T_MEMMAP"][pos] == ord(":"):  # #
+                name = "(terrain: SOIL)"  # #
+            elif world_db["Things"][0]["T_MEMMAP"][pos] == ord("X"):  # #
+                name = "(terrain: TREE)"  # #
+            elif world_db["Things"][0]["T_MEMMAP"][pos] == ord("|"):  # #
+                name = "(terrain: WALL)"  # #
+            elif world_db["Things"][0]["T_MEMMAP"][pos] == ord("_"):  # #
+                name = "(terrain: ALTAR)"  # #
+            else:  # #
+                name = "(?)"  # #
+            strong_write(io_db["file_out"], name + "\n")  # #
             strong_write(io_db["file_out"], "THINGS_HERE END\n")
         else:
             print("Ignoring: Invalid map coordinates.")
@@ -1286,6 +1571,7 @@ def command_makeworld(seed_string):
     according to ThingTypes' TT_START_NUMBERS, with Thing of ID 0 to ThingType
     of ID = world["PLAYER_TYPE"]. Place Things randomly, and actors not on each
     other. Init player's memory map. Write "NEW_WORLD" line to out file.
+    Call log_help().
     """
 
     # def free_pos(plant=False):
@@ -1334,6 +1620,10 @@ def command_makeworld(seed_string):
     if not wait_action:
         print("Ignoring: No thing action with name 'wait' defined.")
         return
+    for name in specials:  # #
+        if world_db[name] not in world_db["ThingTypes"]:  # #
+            print("Ignoring: No valid " + name + " set.")  # #
+            return  # #
     world_db["Things"] = {}
     make_map()
     world_db["WORLD_ACTIVE"] = 1
@@ -1351,19 +1641,8 @@ def command_makeworld(seed_string):
                 id = id_setter(-1, "Things")
                 plantness = world_db["ThingTypes"][type]["TT_PROLIFERATE"]  # #
                 world_db["Things"][id] = new_Thing(type, free_pos(plantness))
-    world_db["ALTAR"] = free_pos()  # #
     strong_write(io_db["file_out"], "NEW_WORLD\n")
-
-
-def command_altar(str_y, str_x):  # #
-    """Set position of Island God's altar."""
-    y = integer_test(str_y, 0, 255)
-    x = integer_test(str_x, 0, 255)
-    if None != y and None != x:
-        if y < world_db["MAP_LENGTH"] and x < world_db["MAP_LENGTH"]:
-            world_db["ALTAR"] = (y, x)
-        else:
-            print("Ignoring: Position is outside of map.")
+    log_help()
 
 
 def command_maplength(maplength_string):
@@ -1383,8 +1662,9 @@ def command_worldactive(worldactive_string):
     An active world can always be set inactive. An inactive world can only be
     set active with a "wait" ThingAction, and a player Thing (of ID 0), and a
     map. On activation, rebuild all Things' FOVs, and the player's map memory.
+    Also call log_help().
     """
-    # 7DRL: Altar position must also be set for world activation.
+    # 7DRL: altar must be on map, and specials must be set for active world.
     val = integer_test(worldactive_string, 0, 1)
     if None != val:
         if 0 != world_db["WORLD_ACTIVE"]:
@@ -1403,8 +1683,20 @@ def command_worldactive(worldactive_string):
                 if 0 == Thing:
                     player_exists = True
                     break
+            specials_set = True  # #
+            for name in specials:  # #
+                if world_db[name] not in world_db["ThingTypes"]:  # #
+                    specials_set = False  # #
+            altar_found = False  # #
+            if world_db["MAP"]:  # #
+                pos = world_db["MAP"].find(b'_')  # #
+                if pos > 0:  # #
+                    y = int(pos / world_db["MAP_LENGTH"])  # #
+                    x = pos % world_db["MAP_LENGTH"]  # #
+                    world_db["altar"] = (y, x)  # #
+                    altar_found = True  # #
             if wait_exists and player_exists and world_db["MAP"] \
-                and  world_db["ALTAR"]:  # #
+               and specials_set:  # #
                 for id in world_db["Things"]:
                     if world_db["Things"][id]["T_LIFEPOINTS"]:
                         build_fov_map(world_db["Things"][id])
@@ -1414,10 +1706,24 @@ def command_worldactive(worldactive_string):
                     empty_fovmap = bytearray(b" " * world_db["MAP_LENGTH"] ** 2)
                     world_db["Things"][0]["fovmap"] = empty_fovmap
                 world_db["WORLD_ACTIVE"] = 1
+                log_help()
             else:
                 print("Ignoring: Not all conditions for world activation met.")
 
 
+def specialtypesetter(name):  # #
+    """Setter world_db[name], deactivating world if set int no ThingType."""
+    def helper(str_int):
+        val = integer_test(str_int, 0)
+        if None != val:
+            world_db[name] = val
+            if world_db["WORLD_ACTIVE"] \
+               and world_db[name] not in world_db["ThingTypes"]:
+                world_db["WORLD_ACTIVE"] = 0
+                print(name + " fits no known ThingType, deactivating world.")
+    return helper
+
+
 def test_for_id_maker(object, category):
     """Return decorator testing for object having "id" attribute."""
     def decorator(f):
@@ -1579,19 +1885,21 @@ def setter_tpos(axis):
 def command_ttid(id_string):
     """Set ID of ThingType to manipulate. ID unused? Create new one.
 
-    Default new ThingType's TT_SYMBOL to "?", TT_CORPSE_ID to self, others: 0.
+    Default new ThingType's TT_SYMBOL to "?", TT_CORPSE_ID to self, TT_TOOL to
+    "", others: 0.
     """
     id = id_setter(id_string, "ThingTypes", command_ttid)
     if None != id:
         world_db["ThingTypes"][id] = {
             "TT_NAME": "(none)",
-            "TT_CONSUMABLE": 0,
+            "TT_TOOLPOWER": 0,
             "TT_LIFEPOINTS": 0,
             "TT_PROLIFERATE": 0,
             "TT_START_NUMBER": 0,
             "TT_STORAGE": 0, # #
             "TT_SYMBOL": "?",
-            "TT_CORPSE_ID": id
+            "TT_CORPSE_ID": id,
+            "TT_TOOL": ""
         }
 
 
@@ -1604,6 +1912,12 @@ def command_ttname(name):
     world_db["ThingTypes"][command_ttid.id]["TT_NAME"] = name
 
 
+@test_ThingType_id
+def command_tttool(name):
+    """Set TT_TOOL of selected ThingType."""
+    world_db["ThingTypes"][command_ttid.id]["TT_TOOL"] = name
+
+
 @test_ThingType_id
 def command_ttsymbol(char):
     """Set TT_SYMBOL of selected ThingType. """
@@ -1689,20 +2003,26 @@ commands_db = {
     "MAP_LENGTH": (1, False, command_maplength),
     "WORLD_ACTIVE": (1, False, command_worldactive),
     "MAP": (2, False, setter_map("MAP")),
-    "ALTAR": (2, False, command_altar),  # #
+    "FAVOR_STAGE": (1, False, setter(None, "FAVOR_STAGE", 0, 65535)),  # #
+    "SLIPPERS": (1, False, specialtypesetter("SLIPPERS")),  # #
+    "PLANT_0": (1, False, specialtypesetter("PLANT_0")),  # #
+    "PLANT_1": (1, False, specialtypesetter("PLANT_1")),  # #
+    "LUMBER": (1, False, specialtypesetter("LUMBER")),  # #
+    "TOOL_0": (1, False, specialtypesetter("TOOL_0")),  # #
+    "EMPATHY": (1, False, setter(None, "EMPATHY", 0, 1)),  # #
     "TA_ID": (1, False, command_taid),
     "TA_EFFORT": (1, False, setter("ThingAction", "TA_EFFORT", 0, 255)),
     "TA_NAME": (1, False, command_taname),
     "TT_ID": (1, False, command_ttid),
     "TT_NAME": (1, False, command_ttname),
+    "TT_TOOL": (1, False, command_tttool),
     "TT_SYMBOL": (1, False, command_ttsymbol),
     "TT_CORPSE_ID": (1, False, command_ttcorpseid),
-    "TT_CONSUMABLE": (1, False, setter("ThingType", "TT_CONSUMABLE",
-                                       0, 65535)),
+    "TT_TOOLPOWER": (1, False, setter("ThingType", "TT_TOOLPOWER", 0, 65535)),
     "TT_START_NUMBER": (1, False, setter("ThingType", "TT_START_NUMBER",
                                          0, 255)),
     "TT_PROLIFERATE": (1, False, setter("ThingType", "TT_PROLIFERATE",
-                                        0, 255)),
+                                        0, 65535)),
     "TT_LIFEPOINTS": (1, False, setter("ThingType", "TT_LIFEPOINTS", 0, 255)),
     "TT_STORAGE": (1, False, setter("ThingType", "TT_STORAGE", 0, 255)),  # #
     "T_ID": (1, False, command_tid),
@@ -1738,12 +2058,22 @@ world_db = {
     "GOD_MOOD": 0,  # #
     "GOD_FAVOR": 0,  # #
     "MAP": False,
-    "ALTAR": False,
+    "FAVOR_STAGE": 0,  # #
+    "SLIPPERS": 0,  # #
+    "PLANT_0": 0,  # #
+    "PLANT_1": 0,  # #
+    "LUMBER": 0,  # #
+    "TOOL_0": 0,  # #
+    "EMPATHY": 1,  # #
     "ThingActions": {},
     "ThingTypes": {},
     "Things": {}
 }
 
+# 7DRL-specific!
+"""Special type settings."""
+specials = ["SLIPPERS", "PLANT_0", "PLANT_1", "LUMBER", "TOOL_0"]  # #
+
 """Mapping of direction names to internal direction chars."""
 directions_db = {"east": "d", "south-east": "c", "south-west": "x",
                  "west": "s", "north-west": "w", "north-east": "e"}