Server/py: Use RuntimeError for truly exceptional errors.

[plomrogue] / plomrogue-server.py

diff --git a/plomrogue-server.py b/plomrogue-server.py
index 2faf15ce64d8f06e9f8e2e4f6781a1fce03d618b..9eee167dee3d9bb1faada199c53a2ec48f931082 100755 (executable)
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -485,7 +485,7 @@ def update_map_memory(t):
         type = world_db["Things"][id]["T_TYPE"]
         if not world_db["ThingTypes"][type]["TT_LIFEPOINTS"]:
             y = world_db["Things"][id]["T_POSY"]
-            x = world_db["Things"][id]["T_POSY"]
+            x = world_db["Things"][id]["T_POSX"]
             if "v" == chr(t["fovmap"][(y * world_db["MAP_LENGTH"]) + x]):
                 t["T_MEMTHING"].append((type, y, x))
 
@@ -545,7 +545,7 @@ def build_fov_map(t):
                                maptype.from_buffer(t["fovmap"]),
                                maptype.from_buffer(world_db["MAP"]))
     if test:
-        raise SystemExit("Malloc error in build_fov_Map().")
+        raise RuntimeError("Malloc error in build_fov_Map().")
 
 
 def decrement_lifepoints(t):
@@ -573,7 +573,7 @@ def mv_yx_in_dir_legal(dir, y, x):
     dir_c = dir.encode("ascii")[0]
     test = libpr.mv_yx_in_dir_legal_wrap(dir_c, y, x)
     if -1 == test:
-        raise SystemExit("Too much wrapping in mv_yx_in_dir_legal_wrap()!")
+        raise RuntimeError("Too much wrapping in mv_yx_in_dir_legal_wrap()!")
     return (test, libpr.result_y(), libpr.result_x())
 
 
@@ -705,6 +705,24 @@ def thingproliferation(t):
             world_db["Things"][id] = newT
 
 
+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 t == world_db["Things"][0]:
+            strong_write(io_db["file_out"], "LOG You suffer from hunger.\n")
+        else:
+            name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"]
+            strong_write(io_db["file_out"], "LOG " + name + \
+                                            " suffers from hunger.\n")
+        decrement_lifepoints(t)
+
+
 def turn_over():
     """Run game world and its inhabitants until new player input expected."""
     id = 0
@@ -729,7 +747,7 @@ def turn_over():
                     eval("actor_" + ThingAction["TA_NAME"])(Thing)
                     Thing["T_COMMAND"] = 0
                     Thing["T_PROGRESS"] = 0
-                # DUMMY: hunger
+                hunger(Thing)
             thingproliferation(Thing)
         if whilebreaker:
             break
@@ -824,7 +842,7 @@ def command_thingshere(str_y, str_x):
                 for id in world_db["Things"]:
                     write_thing_if_here()
             else:
-                for id in world_db["Things"]["T_MEMTHING"]:
+                for id in world_db["Things"][id]["T_MEMTHING"]:
                     write_thing_if_here()
             strong_write(io_db["file_out"], "THINGS_HERE END\n")
         else: