home · contact · privacy
7DRL: Some population balancing.
[plomrogue] / roguelike-server
index 33545c8440434c66b9bccb95c4d0ef2eefcfa8bc..38da4a804a738967be8096acabd11bd1029d0666 100755 (executable)
@@ -688,6 +688,7 @@ def log_help():
     log("Use 'l' to toggle 'look' mode (move an exploration cursor instead of "
         + "the player over the map).")
     log("Use 'PgUp'/PgDn' to scroll the 'Things here' window.")
+    log("The stats window: T=TURN, H=HEALTH, S=SATIATION, G=GOD'S FAVOR.")
     log("See README file for more details.")
 
 
@@ -698,7 +699,7 @@ def decrement_lifepoints(t):
     still display memory data. On non-player things, erase fovmap and memory.
     Dying actors drop all their things.
     """
-    # 7DRL: Return 1 if death, else 0.
+    # 7DRL: Return TT_LIFEPOINTS if death, else 0.
     # 7DRL: Re-spawn died-out species.
     t["T_LIFEPOINTS"] -= 1
     live_type = t["T_TYPE"] # 7DRL
@@ -721,14 +722,21 @@ def decrement_lifepoints(t):
             n_species = len([id for id in world_db["Things"]  # #
                              if world_db["Things"][id]["T_TYPE"] == live_type])
             if 0 == n_species:  # #
-                id = id_setter(-1, "Things")
-                world_db["Things"][id] = new_Thing(live_type,
-                                                   world_db["altar"])
-                log("Species "
-                    + world_db["ThingTypes"][live_type]["TT_NAME"]
-                    + " has temporarily died out. "
-                    + "One new-born is spawned at the altar.")
-        return world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]  # #
+                if world_db["FAVOR_STAGE"] >= 3 and \
+                    live_type == world_db["ANIMAL_0"]:
+                    world_db["GOD_FAVOR"] += 3000
+                    log("CONGRATULATIONS! The "
+                        + world_db["ThingTypes"][live_type]["TT_NAME"]
+                        + " species has died out. The Island God is pleased.")
+                else:
+                    id = id_setter(-1, "Things")
+                    world_db["Things"][id] = new_Thing(live_type,
+                                                       world_db["altar"])
+                    log("The "
+                        + world_db["ThingTypes"][live_type]["TT_NAME"]
+                        + " species has temporarily died out. "
+                        + "One new-born is spawned at the altar.")
+        return world_db["ThingTypes"][live_type]["TT_LIFEPOINTS"]  # #
     return 0  # #
 
 
@@ -742,68 +750,109 @@ def mv_yx_in_dir_legal(dir, y, x):
 
 
 def enter_altar():  # #
-     """What happens when the player enters the altar."""
-     if world_db["FAVOR_STAGE"] > 9000:
-        log("You step on a soul-less slab of stone.")
-        return
-     log("YOU ENTER SACRED GROUND.")
-     if world_db["FAVOR_STAGE"] == 0:
-         world_db["FAVOR_STAGE"] = 1
-         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.\"")
-     elif world_db["FAVOR_STAGE"] == 1 and world_db["GOD_FAVOR"] >= 100:
-         world_db["FAVOR_STAGE"] = 2
-         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 may be helpful.\"")
-         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"]]):
-         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.\"")
-         id = id_setter(-1, "Things")
-         world_db["Things"][id] = new_Thing(world_db["PLANT_1"],
-                                            world_db["altar"])
-         world_db["GOD_FAVOR"] -= 250
-     elif world_db["GOD_FAVOR"] > 9000:
-         world_db["FAVOR_STAGE"] = 9001
-         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.)\"")
-         id = id_setter(-1, "Things")
-         world_db["Things"][id] = new_Thing(world_db["SLIPPERS"],
-                                            world_db["altar"])
+    """What happens when the player enters the altar."""
+    if world_db["FAVOR_STAGE"] > 9000:
+       log("You step on a soul-less slab of stone.")
+       return
+    log("YOU ENTER SACRED GROUND.")
+    if world_db["FAVOR_STAGE"] == 0:
+        world_db["FAVOR_STAGE"] = 1
+        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.\"")
+    elif world_db["FAVOR_STAGE"] == 1 and world_db["GOD_FAVOR"] < 100:
+        log("The Island God will talk again when it favors you to >=100 "
+             +" points.")
+    elif world_db["FAVOR_STAGE"] == 1 and world_db["GOD_FAVOR"] >= 100:
+        world_db["FAVOR_STAGE"] = 2
+        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 may be helpful.\"")
+        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"]]):
+        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 when planting it.\"")
+        id = id_setter(-1, "Things")
+        world_db["Things"][id] = new_Thing(world_db["PLANT_1"],
+                                           world_db["altar"])
+        world_db["GOD_FAVOR"] -= 250
+    elif world_db["FAVOR_STAGE"] == 2 and world_db["GOD_FAVOR"] < 500:
+        log("The Island God will talk again when it favors you to >=500 "
+             +" points.")
+    elif world_db["FAVOR_STAGE"] == 2 and world_db["GOD_FAVOR"] >= 500:
+        world_db["FAVOR_STAGE"] = 3
+        log("The Island God speaks to you: \"The "
+            + world_db["ThingTypes"][world_db["ANIMAL_0"]]["TT_NAME"]
+            + " has lately become a pest. These creatures do not please me "
+            + "as much as they used to do. Exterminate them all. I will count "
+            + "each kill to your favor. To help you with the hunting, I grant "
+            + "you the empathy and knowledge to read animals.\"")
+        log("You will now see animals' health bars, and activities (\"m\": "
+            + "moving (maybe for an attack), \"u\": eating, \"p\": picking "
+            + "something up; no letter: waiting).")
+        world_db["EMPATHY"] = 1
+    elif world_db["FAVOR_STAGE"] == 3 and world_db["GOD_FAVOR"] < 5000:
+        log("The Island God will talk again when it favors you to >=5000 "
+             +" points.")
+    elif world_db["FAVOR_STAGE"] == 3 and world_db["GOD_FAVOR"] >= 5000:
+        world_db["FAVOR_STAGE"] = 4
+        log("The Island God speaks to you: \"You know what animal I find the "
+             + "cutest? The "
+             + world_db["ThingTypes"][world_db["ANIMAL_1"]]["TT_NAME"]
+             + "! I think what this islands clearly needs more of is " 
+             + world_db["ThingTypes"][world_db["ANIMAL_1"]]["TT_NAME"]
+             + "s. Why don't you help? Support thm. Make sure they are well, "
+             + "and they will multiply faster. From now on, I will "
+             + "count each new-born "
+             + world_db["ThingTypes"][world_db["ANIMAL_1"]]["TT_NAME"]
+             + " (not spawned by me due to undo an extinction event) "
+             + "greatly to your favor. To help you with the feeding, here is "
+             + "something to make the ground bear more consumables.")
+        id = id_setter(-1, "Things")
+        world_db["Things"][id] = new_Thing(world_db["TOOL_1"],
+                                           world_db["altar"])
+    elif world_db["GOD_FAVOR"] < 20000:
+        log("The Island God will talk again when it favors you to >=20000 "
+             +" points.")
+    elif world_db["GOD_FAVOR"] >= 20000:
+        world_db["FAVOR_STAGE"] = 9001
+        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.)\"")
+        id = id_setter(-1, "Things")
+        world_db["Things"][id] = new_Thing(world_db["SLIPPERS"],
+                                           world_db["altar"])
 
 
 def actor_wait(t):
@@ -829,17 +878,20 @@ def actor_move(t):
                   if world_db["Things"][id]["T_POSX"] == move_result[2]]
         if len(hitted):
             hit_id = hitted[0]
+            hitted_type = world_db["Things"][hit_id]["T_TYPE"]
             if t == world_db["Things"][0]:
-                hitted_type = world_db["Things"][hit_id]["T_TYPE"]
                 hitted_name = world_db["ThingTypes"][hitted_type]["TT_NAME"]
-                log("You wound " + hitted_name + ".")
-                world_db["GOD_FAVOR"] -= -1  # #
+                log("You WOUND " + hitted_name + ".")
+                world_db["GOD_FAVOR"] -= 1  # #
             elif 0 == hit_id:
                 hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
-                log(hitter_name +" wounds you.")
+                log(hitter_name +" WOUNDS you.")
             test = decrement_lifepoints(world_db["Things"][hit_id])  # #(test=)
-            if test and t == world_db["Things"][0]:  # #
-                world_db["GOD_FAVOR"] -test  # #
+            if test and world_db["FAVOR_STAGE"] >= 3 and \
+               hitted_type == world_db["ANIMAL_0"]:  # #
+                world_db["GOD_FAVOR"] += 125
+            elif test and t == world_db["Things"][0]:  # #
+                world_db["GOD_FAVOR"] -= 2 * test  # #
             return
         if (ord("X") == world_db["MAP"][pos]  # #
             or ord("|") == world_db["MAP"][pos]):  # #
@@ -863,9 +915,9 @@ def actor_move(t):
                     or (not case_X and  # #
                              0 == int(rand.next() / (3 * chop_power))))):  # #
                     if t == world_db["Things"][0]:  # #
-                        log("You chop it down.")  # #
+                        log("You chop it DOWN.")  # #
                     if world_db["MAP"][pos] == ord("X"):  # #
-                        world_db["GOD_FAVOR"] = -10  # #
+                        world_db["GOD_FAVOR"] -= 10  # #
                     world_db["MAP"][pos] = ord(".")   # #
                     i = 3 if case_X else 1  # #
                     for i in range(i):  # #
@@ -893,7 +945,7 @@ def actor_move(t):
                 move_result[2] == world_db["altar"][1]):  # #
                 enter_altar()  # #
     elif t == world_db["Things"][0]:
-        log("You fail to move " + dir + ".")
+        log("You FAIL to move " + dir + ".")
 
 
 def actor_pick_up(t):
@@ -932,11 +984,11 @@ def actor_pick_up(t):
                 world_db["Things"][id]["T_PLAYERDROP"] = 0  # #
             t["T_CARRIES"].append(id)
             if t == world_db["Things"][0]:
-                log("You pick up an object.")
+                log("You PICK UP an object.")
         elif t == world_db["Things"][0]:
             log("You try to pick up an object, but there is none.")
     elif t == world_db["Things"][0]: # #
-        log("Can't pick up object: No storage room to carry more.") # #
+        log("CAN'T pick up object: No storage room to carry more.") # #
 
 
 def actor_drop(t):
@@ -947,10 +999,10 @@ def actor_drop(t):
         t["T_CARRIES"].remove(id)
         world_db["Things"][id]["carried"] = False
         if t == world_db["Things"][0]:
-            log("You drop an object.")
+            log("You DROP an object.")
             world_db["Things"][id]["T_PLAYERDROP"] = 1  # #
     elif t == world_db["Things"][0]:
-       log("You try to drop an object, but you own none.")
+       log("You try to drop an object, but you own NONE.")
 
 
 def actor_use(t):
@@ -976,14 +1028,14 @@ def actor_use(t):
             pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"]
             if (world_db["MAP"][pos] == ord("X")  # #
                 or world_db["MAP"][pos] == ord("|")):  # #
-                log("Can't build when standing on barrier.")  # #
+                log("CAN'T build when standing on barrier.")  # #
                 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"]]:
-                 log("Can't build when standing objects.")  # #
+                 log("CAN'T build when standing objects.")  # #
                  return
             for id in t["T_CARRIES"]:  # #
                 type_tool = world_db["Things"][id]["T_TYPE"]  # #
@@ -1003,30 +1055,30 @@ def actor_use(t):
                 world_db["MAP"][pos] = ord("|")  # #
                 log("With your "  # #
                     + world_db["ThingTypes"][type_tool]["TT_NAME"]  # #
-                    + " you build a wooden barrier from your "  # #
+                    + " you build a WOODEN BARRIER from your "  # #
                     + world_db["ThingTypes"][type_material]["TT_NAME"]  # #
                     + ".")  # #
             else:  # #
-                log("You can't use a "  # #
+                log("You CAN'T use a "  # #
                     + world_db["ThingTypes"][type_tool]["TT_NAME"]  # #
                     + " without some wood in your inventory.")  # #
         elif world_db["ThingTypes"][type]["TT_TOOL"] == "fertilizer":  # #
             pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"]
             if world_db["MAP"][pos] == ord("."):
-                log("You create soil.")
+                log("You create SOIL.")
                 world_db["MAP"][pos] = ord(":")
             else:
-                log("Can only make soil out of non-soil earth.")
+                log("Can only make soil out of NON-SOIL earth.")
         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_TOOLPOWER"]
             if t == world_db["Things"][0]:
-                log("You consume this object.")
+                log("You eat this thing.")
         elif t == world_db["Things"][0]:
-            log("You try to use this object, but fail.")
+            log("You try to use this object, but FAIL.")
     elif t == world_db["Things"][0]:
-        log("You try to use an object, but you own none.")
+        log("You try to use an object, but you own NONE.")
 
 
 def thingproliferation(t, prol_map):
@@ -1038,8 +1090,14 @@ def thingproliferation(t, prol_map):
     """
     # 7DRL: success increments God's mood
     # 7DRL: Plants (no TT_LIFEPOINTS) proliferate only on ":" ground.
+    # 7DRL: Animals only proliferate when >= 0.9 their max HP.
     prolscore = world_db["ThingTypes"][t["T_TYPE"]]["TT_PROLIFERATE"]
-    if prolscore and (1 == prolscore or 1 == (rand.next() % prolscore)):
+    if prolscore and \
+      (world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"] == 0 or  # #
+       t["T_LIFEPOINTS"] >= 0.9 *  # #
+                        world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]) \
+       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"])
@@ -1062,6 +1120,10 @@ def thingproliferation(t, prol_map):
                 world_db["GOD_FAVOR"] += 5  # #
             elif t["T_TYPE"] == world_db["PLANT_1"]:  # #
                 world_db["GOD_FAVOR"] += 25  # #
+            elif world_db["FAVOR_STAGE"] >= 4 and \
+                 t["T_TYPE"] == world_db["ANIMAL_1"]:
+                log("The Island God SMILES upon a new-born bear baby.")
+                world_db["GOD_FAVOR"] += 750
 
 
 def try_healing(t):
@@ -1076,7 +1138,7 @@ def try_healing(t):
         if (testval <= 1 or 1 == (rand.next() % testval)):
             t["T_LIFEPOINTS"] += 1
             if t == world_db["Things"][0]:
-                log("You heal.")
+                log("You HEAL.")
 
 
 def hunger_per_turn(type_id):
@@ -1087,14 +1149,13 @@ def hunger_per_turn(type_id):
 def hunger(t):
     """Decrement t's satiation,dependent on it trigger lifepoint dec chance."""
     if t["T_SATIATION"] > -32768:
-        #max_hp = world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]
-        t["T_SATIATION"] -= hunger_per_turn(t["T_TYPE"]) # int(math.sqrt(max_hp))
+        t["T_SATIATION"] -= hunger_per_turn(t["T_TYPE"])
     if 0 != t["T_SATIATION"] and 0 == int(rand.next() / abs(t["T_SATIATION"])):
         if t == world_db["Things"][0]:
             if t["T_SATIATION"] < 0:
-                log("You suffer from hunger.")
+                log("You SUFFER from hunger.")
             else:
-                log("You suffer from over-eating.")
+                log("You SUFFER from over-eating.")
         decrement_lifepoints(t)
 
 
@@ -1555,7 +1616,7 @@ def play_commander(action, args=False):
         if action == "drop":
             t = world_db["Things"][0]
             if 0 == len(t["T_CARRIES"]):
-                log("You have nothing to drop in your inventory.")
+                log("You have NOTHING to drop in your inventory.")
                 return
 
         elif action == "pick_up":
@@ -1565,12 +1626,12 @@ def play_commander(action, args=False):
                    if world_db["Things"][id]["T_POSY"] == t["T_POSY"]
                    if world_db["Things"][id]["T_POSX"] == t["T_POSX"]]
             if not len(ids):
-                log("No object to pick up.")
+                log("NOTHING to pick up.")
                 return
             used_slots = len(t["T_CARRIES"]) # #
             if used_slots >= world_db["ThingTypes"][t["T_TYPE"]] \
                 ["TT_STORAGE"]: # #
-                log("Can't pick up: No storage room to carry anything more.")
+                log("CAN'T pick up: No storage room to carry anything more.")
                 return
 
         elif action == "move":
@@ -1580,6 +1641,9 @@ def play_commander(action, args=False):
                                              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]:
+                    log("You can't SWIM.")
+                    return
                 if (ord("X") == world_db["MAP"][pos]  # #
                     or ord("|") == world_db["MAP"][pos]):  # #
                     carries_axe = False  # #
@@ -1589,10 +1653,10 @@ def play_commander(action, args=False):
                             carries_axe = True  # #
                             break  # #
                     if not carries_axe:  # #
-                        log("You can't move there.")
+                        log("You CAN'T move there.")
                         return
             else:
-                log("You can't move there.")
+                log("You CAN'T move there.")
                 return
 
         elif action == "use":
@@ -1608,14 +1672,14 @@ def play_commander(action, args=False):
                     pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"]
                     if (world_db["MAP"][pos] == ord("X")  # #
                         or world_db["MAP"][pos] == ord("|")):  # #
-                        log("Can't build when standing on barrier.")  # #
+                        log("CAN'T build when standing on barrier.")  # #
                         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"]]:
-                         log("Can't build when standing objects.")  # #
+                         log("CAN'T build when standing objects.")  # #
                          return
                     for id in t["T_CARRIES"]:  # #
                         type_tool = world_db["Things"][id]["T_TYPE"]  # #
@@ -1630,20 +1694,20 @@ def play_commander(action, args=False):
                             wood_id = id  # #
                             break  # #
                     if wood_id == None:  # #
-                        log("You can't use a "  # #
+                        log("You CAN'T use a "  # #
                             + world_db["ThingTypes"][type_tool]["TT_NAME"]  # #
                             + " without some wood in your inventory.")  # #
                         return
                 elif world_db["ThingTypes"][type]["TT_TOOL"] == "fertilizer":  # #
                     pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"]
                     if not world_db["MAP"][pos] == ord("."):
-                        log("Can only make soil out of non-soil earth.")
+                        log("Can only make soil out of NON-SOIL earth.")
                         return
                 elif world_db["ThingTypes"][type]["TT_TOOL"] == "wood":  # #
-                        log("To use wood, you need a carpentry tool.")  # #
+                        log("To use wood, you NEED a carpentry tool.")  # #
                         return
             else:
-                log("You have nothing to use in your inventory.")
+                log("You have NOTHING to use in your inventory.")
                 return
 
 
@@ -2128,6 +2192,8 @@ commands_db = {
     "LUMBER": (1, False, specialtypesetter("LUMBER")),  # #
     "TOOL_0": (1, False, specialtypesetter("TOOL_0")),  # #
     "TOOL_1": (1, False, specialtypesetter("TOOL_1")),  # #
+    "ANIMAL_0": (1, False, specialtypesetter("ANIMAL_0")),  # #
+    "ANIMAL_1": (1, False, specialtypesetter("ANIMAL_1")),  # #
     "EMPATHY": (1, False, setter(None, "EMPATHY", 0, 1)),  # #
     "TA_ID": (1, False, command_taid),
     "TA_EFFORT": (1, False, setter("ThingAction", "TA_EFFORT", 0, 255)),
@@ -2180,10 +2246,12 @@ world_db = {
     "SLIPPERS": 0,  # #
     "PLANT_0": 0,  # #
     "PLANT_1": 0,  # #
+    "ANIMAL_0": 0,  # #
+    "ANIMAL_1": 0,  # #
     "LUMBER": 0,  # #
     "TOOL_0": 0,  # #
     "TOOL_1": 0,  # #
-    "EMPATHY": 1,  # #
+    "EMPATHY": 0,  # #
     "ThingActions": {},
     "ThingTypes": {},
     "Things": {}
@@ -2191,7 +2259,8 @@ world_db = {
 
 # 7DRL-specific!
 """Special type settings."""
-specials = ["SLIPPERS", "PLANT_0", "PLANT_1", "LUMBER", "TOOL_0", "TOOL_1"]  # #
+specials = ["SLIPPERS", "PLANT_0", "PLANT_1", "LUMBER", "TOOL_0", "TOOL_1",
+            "ANIMAL_0", "ANIMAL_1"]
 
 """Mapping of direction names to internal direction chars."""
 directions_db = {"east": "d", "south-east": "c", "south-west": "x",