home · contact · privacy
7DRL: Exclude map cells with actors in FOV on them from stack depth map.
[plomrogue] / roguelike-server
index 792b7c4f47db887b5593b49c256b37b55d1b4ef8..cb6b3dd0c97f142392a9c46544f9c9319a705de6 100755 (executable)
@@ -308,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_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()
@@ -348,21 +333,58 @@ 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_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)
+
+        stacksmap = 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"])  # #
+            stacksmap[pos] = ord('X')  # #
+        for id in [id for id in world_db["Things"]  # #
+                      if not world_db["Things"][id]["carried"]  # #
+                      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 stacksmap[pos] < ord('2'):  # #
+                stacksmap[pos] += 1  # #
+        for mt in world_db["Things"][0]["T_MEMTHING"]:  # #
+            pos = mt[1] * length + mt[2]  # #
+            if stacksmap[pos] < ord('2'):  # #
+                stacksmap[pos] += 1  # #
+        string = write_map(string, stacksmap)  # #
+        
         atomic_write(io_db["path_worldstate"], string, delete=False)
         strong_write(io_db["file_out"], "WORLD_UPDATED\n")
         io_db["worldstate_updateable"] = False
@@ -614,12 +636,13 @@ def log_help():
     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")
+                 + "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")
-    strong_write(io_db["file_out"], "LOG \n")
 
 
 def decrement_lifepoints(t):
@@ -809,7 +832,8 @@ def actor_move(t):
                     strong_write(io_db["file_out"], "LOG With your "  # #
                                                     + axe_name  # #
                                                     + ", you chop!\n")  # #
-                    add_gods_favor(-1)  # #
+                    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  # #
@@ -820,7 +844,8 @@ def actor_move(t):
                     if t == world_db["Things"][0]:  # #
                         strong_write(io_db["file_out"],  # #
                                      "LOG You chop it down.\n")  # #
-                    add_gods_favor(-10)  # #
+                    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):  # #
@@ -852,8 +877,10 @@ 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.
+    """
     # 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"]: # #
@@ -862,23 +889,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_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
-            type = world_db["Things"][highest_id]["T_TYPE"]  # #
+            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"][highest_id]["T_PLAYERDROP"]  # #
+                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]:
@@ -990,23 +1015,31 @@ def thingproliferation(t, prol_map):
     selected randomly.
     """
     # 7DRL: success increments God's mood
-    # 7DRL: Things proliferate only on ":" ground.
+    # 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  # #
@@ -1416,6 +1449,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)
@@ -1423,19 +1457,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.")