home · contact · privacy
Improve try_healing() chance.
[plomrogue] / roguelike-server
index ff799fb74a36d86eedaf6cb51b5cebaa2e0c8444..462a3428331d01a1f58f7f23659e0e1e371c8eab 100755 (executable)
@@ -12,6 +12,7 @@ import shlex
 import shutil
 import time
 import ctypes
+import math
 
 
 class RandomnessIO:
@@ -306,21 +307,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_TOOL"] == "food"
-                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()
@@ -344,19 +330,29 @@ def try_worldstate_update():
             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]
+        length = world_db["MAP_LENGTH"]
+        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_TOOL"] == "food"
-                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)
         atomic_write(io_db["path_worldstate"], string, delete=False)
         strong_write(io_db["file_out"], "WORLD_UPDATED\n")
@@ -498,12 +494,10 @@ def update_map_memory(t, age_map=True):
         t["T_MEMDEPTHMAP"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
     ord_v = ord("v")
     ord_0 = ord("0")
-    ord_space = ord(" ")
     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"]
@@ -632,7 +626,6 @@ def actor_move(t):
                                      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])
         hitted = [id for id in world_db["Things"]
                   if world_db["Things"][id] != t
                   if world_db["Things"][id]["T_LIFEPOINTS"]
@@ -651,6 +644,7 @@ def actor_move(t):
                                                 " wounds you.\n")
             decrement_lifepoints(world_db["Things"][hit_id])
             return
+        passable = "." == chr(world_db["MAP"][pos])
     dir = [dir for dir in directions_db
            if directions_db[dir] == chr(t["T_ARGUMENT"])][0]
     if passable:
@@ -667,23 +661,23 @@ def actor_move(t):
 
 
 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.
+    """
     ids = [id for id in world_db["Things"] if 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"]]
     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_TOOL"] == "food" \
-            and world_db["ThingTypes"][type]["TT_TOOLPOWER"] > nutritious:
-                nutritious = world_db["ThingTypes"][type]["TT_TOOLPOWER"]
-                highest_id = id
-        world_db["Things"][highest_id]["carried"] = True
-        t["T_CARRIES"].append(highest_id)
+        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
+        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]:
@@ -736,7 +730,7 @@ def thingproliferation(t, prol_map):
     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]:
+        for dir in [directions_db[key] for key in sorted(directions_db.keys())]:
             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]
                                                       * world_db["MAP_LENGTH"]
@@ -750,34 +744,30 @@ def thingproliferation(t, prol_map):
 
 
 def try_healing(t):
-    """Grow t's HP to a 1/32 chance if < HP max, satiation > 0, and waiting.
-
-    On success, decrease satiation score by 32.
-    """
-    if t["T_SATIATION"] > 0 \
-       and t["T_LIFEPOINTS"] < \
-        world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"] \
-       and 0 == (rand.next() % 31) \
-       and t["T_COMMAND"] == [id for id in world_db["ThingActions"]
-                              if world_db["ThingActions"][id]["TA_NAME"] ==
-                              "wait"][0]:
-        t["T_LIFEPOINTS"] += 1
-        t["T_SATIATION"] -= 32
-        if t == world_db["Things"][0]:
-            strong_write(io_db["file_out"], "LOG You heal.\n")
-
+    """If t's HP < max, increment them if well-nourished, maybe waiting."""
+    if t["T_LIFEPOINTS"] < \
+       world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]:
+        wait_id = [id for id in world_db["ThingActions"]
+                      if world_db["ThingActions"][id]["TA_NAME"] == "wait"][0]
+        wait_divider = 8 if t["T_COMMAND"] == wait_id else 1
+        testval = int(abs(t["T_SATIATION"]) / wait_divider)
+        if (testval <= 1 or 1 == (rand.next() % testval)):
+            t["T_LIFEPOINTS"] += 1
+            if t == world_db["Things"][0]:
+                strong_write(io_db["file_out"], "LOG You heal.\n")
 
 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)):
+        max_hp = world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]
+        t["T_SATIATION"] -= int(math.sqrt(max_hp))
+    if 0 != t["T_SATIATION"] and 0 == int(rand.next() / abs(t["T_SATIATION"])):
         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)
 
 
@@ -1148,18 +1138,21 @@ def command_thingshere(str_y, str_x):
             pos = (y * world_db["MAP_LENGTH"]) + x
             strong_write(io_db["file_out"], "THINGS_HERE START\n")
             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")
             strong_write(io_db["file_out"], "THINGS_HERE END\n")
         else:
             print("Ignoring: Invalid map coordinates.")