Define stack order by thing type id order (highest = lowest type id).

diff --git a/confserver/world b/confserver/world
index df551dcb3f17738a20ca6867e576639f5f57426e..386f760461dbece573499ad62e67f6e629a00721 100644 (file)
--- a/confserver/world
+++ b/confserver/world
@@ -30,13 +30,6 @@ TT_TOOLPOWER 0
 TT_STORAGE 4
 
 TT_ID 1
-TT_START_NUMBER 0
-TT_LIFEPOINTS 0
-TT_SYMBOL 0
-TT_NAME GLOBE
-TT_TOOLPOWER 9001
-
-TT_ID 2
 TT_START_NUMBER 27
 TT_LIFEPOINTS 6
 TT_SYMBOL a
@@ -44,7 +37,7 @@ TT_NAME ANT
 TT_TOOLPOWER 0
 TT_STORAGE 1
 
-TT_ID 3
+TT_ID 2
 TT_START_NUMBER 9
 TT_LIFEPOINTS 18
 TT_SYMBOL d
@@ -52,7 +45,7 @@ TT_NAME DOG
 TT_TOOLPOWER 0
 TT_STORAGE 1
 
-TT_ID 4
+TT_ID 3
 TT_START_NUMBER 3
 TT_LIFEPOINTS 54
 TT_SYMBOL b
@@ -60,14 +53,34 @@ TT_NAME BEAR
 TT_TOOLPOWER 0
 TT_STORAGE 3
 
-TT_ID 5
-TT_START_NUMBER 9
+TT_ID 4
+TT_START_NUMBER 0
 TT_LIFEPOINTS 0
-TT_SYMBOL $
-TT_NAME DIRT
-TT_TOOLPOWER 0
+TT_SYMBOL 0
+TT_NAME GLOBE
+TT_TOOLPOWER 9001
+
+TT_ID 5
+TT_TOOL axe
+TT_SYMBOL /
+TT_NAME AXE
+TT_TOOLPOWER 5000
+TT_START_NUMBER 1
 
 TT_ID 6
+TT_TOOL carpentry
+TT_SYMBOL -
+TT_NAME 'CARPENTRY TOOL'
+TT_TOOLPOWER 5000
+TT_START_NUMBER 0
+
+TT_ID 7
+TT_TOOL wood
+TT_START_NUMBER 0
+TT_SYMBOL =
+TT_NAME WOOD
+
+TT_ID 8
 TT_START_NUMBER 5
 TT_LIFEPOINTS 0
 TT_SYMBOL m
@@ -76,15 +89,23 @@ TT_TOOLPOWER 1024
 TT_PROLIFERATE 0
 TT_TOOL food
 
-TT_ID 7
-TT_START_NUMBER 10
+TT_ID 9
+TT_START_NUMBER 9
 TT_LIFEPOINTS 0
-TT_SYMBOL '#'
-TT_NAME 'UNKRAUT'
+TT_SYMBOL $
+TT_NAME DIRT
 TT_TOOLPOWER 0
+
+TT_ID 10
+TT_START_NUMBER 0
+TT_LIFEPOINTS 0
+TT_SYMBOL *
+TT_NAME 'PLANT #2'
+TT_TOOLPOWER 512
 TT_PROLIFERATE 192
+TT_TOOL food
 
-TT_ID 8
+TT_ID 11
 TT_START_NUMBER 3
 TT_LIFEPOINTS 0
 TT_SYMBOL %
@@ -92,34 +113,13 @@ TT_NAME 'PLANT #1'
 TT_TOOLPOWER 0
 TT_PROLIFERATE 1024
 
-TT_ID 9
-TT_TOOL axe
-TT_SYMBOL /
-TT_NAME AXE
-TT_TOOLPOWER 5000
-TT_START_NUMBER 1
-
-TT_ID 10
-TT_TOOL wood
-TT_START_NUMBER 0
-TT_SYMBOL =
-TT_NAME WOOD
-
-TT_ID 11
-TT_TOOL carpentry
-TT_SYMBOL -
-TT_NAME 'CARPENTRY TOOL'
-TT_TOOLPOWER 5000
-TT_START_NUMBER 0
-
 TT_ID 12
-TT_START_NUMBER 0
+TT_START_NUMBER 10
 TT_LIFEPOINTS 0
-TT_SYMBOL *
-TT_NAME 'PLANT #2'
-TT_TOOLPOWER 512
+TT_SYMBOL '#'
+TT_NAME 'UNKRAUT'
+TT_TOOLPOWER 0
 TT_PROLIFERATE 192
-TT_TOOL food
 
 TT_ID 0
 TT_CORPSE_ID 6
@@ -143,8 +143,8 @@ TT_ID 9
 TT_CORPSE_ID 5
 
 FAVOR_STAGE 0
-SLIPPERS 1
-PLANT_0 8
-PLANT_1 12
-LUMBER 10
-TOOL_0 11 
+SLIPPERS 4
+PLANT_0 11
+PLANT_1 10
+LUMBER 7
+TOOL_0 6

diff --git a/roguelike-server b/roguelike-server
index 959d769ea899e0eb6cfbae6315cc7af0f9d6df5e..7ccfafe8b828db833d5b4262e155f67446cd35d4 100755 (executable)
--- a/roguelike-server
+++ b/roguelike-server
@@ -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()
@@ -349,19 +334,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")
@@ -855,8 +850,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"]: # #
@@ -865,23 +862,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]:
@@ -1436,6 +1431,22 @@ def command_thingshere(str_y, str_x):
             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 [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 [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("."):  # #
@@ -1448,20 +1459,9 @@ def command_thingshere(str_y, str_x):
                 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")  # #
-            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")
-            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")
             strong_write(io_db["file_out"], "THINGS_HERE END\n")
         else:
             print("Ignoring: Invalid map coordinates.")