Make log messages more expressive, remove never-called ones.

diff --git a/roguelike-server b/roguelike-server
index c727b66f2d18f45f3681bd6766688c47be9375ff..9d53bd0d2e08ade07eb41480bf27da00aa5f00b5 100755 (executable)
--- a/roguelike-server
+++ b/roguelike-server
@@ -648,10 +648,10 @@ def actor_move(t):
             if t == world_db["Things"][0]:
                 hitted_type = world_db["Things"][hit_id]["T_TYPE"]
                 hitted_name = world_db["ThingTypes"][hitted_type]["TT_NAME"]
             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 + ".")
+                log("You WOUND" + hitted_name + ".")

             elif 0 == hit_id:
                 hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
             elif 0 == hit_id:
                 hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]

-                log(hitter_name +" wounds you.")
+                log(hitter_name +" WOUNDS you.")

             decrement_lifepoints(world_db["Things"][hit_id])
             return
         passable = "." == chr(world_db["MAP"][pos])
             decrement_lifepoints(world_db["Things"][hit_id])
             return
         passable = "." == chr(world_db["MAP"][pos])


@@ -665,9 +665,7 @@ def actor_move(t):
             world_db["Things"][id]["T_POSX"] = move_result[2]
         build_fov_map(t)
         if t == world_db["Things"][0]:
             world_db["Things"][id]["T_POSX"] = move_result[2]
         build_fov_map(t)
         if t == world_db["Things"][0]:

-            log("You move " + dir + ".")
-    elif t == world_db["Things"][0]:
-        log("You fail to move " + dir + ".")
+            log("You MOVE " + dir + ".")

 
 
 def actor_pick_up(t):
 
 
 def actor_pick_up(t):


@@ -689,9 +687,7 @@ def actor_pick_up(t):
         world_db["Things"][id]["carried"] = True
         t["T_CARRIES"].append(id)
         if t == world_db["Things"][0]:
         world_db["Things"][id]["carried"] = True
         t["T_CARRIES"].append(id)
         if t == world_db["Things"][0]:

-                log("You pick up an object.")
-    elif t == world_db["Things"][0]:
-            log("You try to pick up an object, but there is none.")
+                log("You PICK UP an object.")

 
 
 def actor_drop(t):
 
 
 def actor_drop(t):


@@ -702,9 +698,7 @@ def actor_drop(t):
         t["T_CARRIES"].remove(id)
         world_db["Things"][id]["carried"] = False
         if t == world_db["Things"][0]:
         t["T_CARRIES"].remove(id)
         world_db["Things"][id]["carried"] = False
         if t == world_db["Things"][0]:

-            log("You drop an object.")
-    elif t == world_db["Things"][0]:
-       log("You try to drop an object, but you own none.")
+            log("You DROP an object.")

 
 
 def actor_use(t):
 
 
 def actor_use(t):


@@ -718,11 +712,9 @@ def actor_use(t):
             del world_db["Things"][id]
             t["T_SATIATION"] += world_db["ThingTypes"][type]["TT_TOOLPOWER"]
             if t == world_db["Things"][0]:
             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 CONSUME this object.")

         elif t == world_db["Things"][0]:
         elif t == world_db["Things"][0]:

-            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 this object, but FAIL.")

 
 
 def thingproliferation(t, prol_map):
 
 
 def thingproliferation(t, prol_map):


@@ -759,7 +751,7 @@ def try_healing(t):
         if (testval <= 1 or 1 == (rand.next() % testval)):
             t["T_LIFEPOINTS"] += 1
             if t == world_db["Things"][0]:
         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):
 
 
 def hunger_per_turn(type_id):


@@ -774,9 +766,9 @@ def hunger(t):
     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:
     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:
             else:

-                log("You suffer from over-eating.")
+                log("You SUFFER from over-eating.")

         decrement_lifepoints(t)
 
 
         decrement_lifepoints(t)
 
 


@@ -1215,7 +1207,7 @@ def play_pickup():
            if world_db["Things"][id]["T_POSY"] == t["T_POSY"]
            if world_db["Things"][id]["T_POSX"] == t["T_POSX"]]
     if not len(ids):
            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("Nothing to pick up.")
+         log("NOTHING to pick up.")

     else:
         set_command("pick_up")
 
     else:
         set_command("pick_up")
 


@@ -1224,7 +1216,7 @@ def play_drop(str_arg):
     """Try "drop" as player's T_COMMAND, int(str_arg) as T_ARGUMENT / slot."""
     t = world_db["Things"][0]
     if 0 == len(t["T_CARRIES"]):
     """Try "drop" as player's T_COMMAND, int(str_arg) as T_ARGUMENT / slot."""
     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.")

     else:
         val = integer_test(str_arg, 0, 255)
         if None != val and val < len(t["T_CARRIES"]):
     else:
         val = integer_test(str_arg, 0, 255)
         if None != val and val < len(t["T_CARRIES"]):


@@ -1238,14 +1230,14 @@ def play_use(str_arg):
     """Try "use" as player's T_COMMAND, int(str_arg) as T_ARGUMENT / slot."""
     t = world_db["Things"][0]
     if 0 == len(t["T_CARRIES"]):
     """Try "use" as player's T_COMMAND, int(str_arg) as T_ARGUMENT / slot."""
     t = world_db["Things"][0]
     if 0 == len(t["T_CARRIES"]):

-        log("You have nothing to use in your inventory.")
+        log("You have NOTHING to use in your inventory.")

     else:
         val = integer_test(str_arg, 0, 255)
         if None != val and val < len(t["T_CARRIES"]):
             id = t["T_CARRIES"][val]
             type = world_db["Things"][id]["T_TYPE"]
             if not world_db["ThingTypes"][type]["TT_TOOL"] == "food":
     else:
         val = integer_test(str_arg, 0, 255)
         if None != val and val < len(t["T_CARRIES"]):
             id = t["T_CARRIES"][val]
             type = world_db["Things"][id]["T_TYPE"]
             if not world_db["ThingTypes"][type]["TT_TOOL"] == "food":

-                log("You can't consume this thing.")
+                log("You CAN'T consume this thing.")

                 return
             world_db["Things"][0]["T_ARGUMENT"] = val
             set_command("use")
                 return
             world_db["Things"][0]["T_ARGUMENT"] = val
             set_command("use")


@@ -1267,7 +1259,7 @@ def play_move(str_arg):
             world_db["Things"][0]["T_ARGUMENT"] = dir
             set_command("move")
             return
             world_db["Things"][0]["T_ARGUMENT"] = dir
             set_command("move")
             return

-    log("You can't move there.")
+    log("You CAN'T move there.")

 
 
 def command_seedrandomness(seed_string):
 
 
 def command_seedrandomness(seed_string):