7DRL: Make "Things here" window scrollable.

[plomrogue] / roguelike-server

diff --git a/roguelike-server b/roguelike-server
index 231348818557752327f3fd562ee401940b6a877b..959d769ea899e0eb6cfbae6315cc7af0f9d6df5e 100755 (executable)
--- a/roguelike-server
+++ b/roguelike-server
@@ -614,12 +614,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):
@@ -1426,6 +1427,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)
@@ -1433,6 +1435,20 @@ 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 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)"  # #
+            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"] \