X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=client_prototype.py;h=9458cffef76a744bc69822ea186d5f9bcced5694;hb=3a308dfb8b0ede5ab0a23d867cdf33394825538e;hp=2b8719922fd5ba4bdccf3a3921d8e8b125cba17b;hpb=a845dce5a0f8a11ce9f8483c071a98f8d2fe9d55;p=plomrogue

diff --git a/client_prototype.py b/client_prototype.py
index 2b87199..9458cff 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -125,6 +125,16 @@ def draw_screen():
                 if (right >= 0 and right < screen_size[1]):
                     healthy_addch(down, right, '+')
 
+    def draw_window_titles():
+        for win in windows:
+            title = " " + win["title"] + " "
+            if len(title) <= win["size"][1]:
+                y = win["start"][0] - 1
+                start_x = win["start"][1] + int((win["size"][1] \
+                    - len(title))/2)
+                for x in range(len(title)):
+                    healthy_addch(y, start_x + x, title[x])
+
     def draw_window_contents():
         def draw_winmap():
             """Draw winmap in area delimited by offset, winmap_size.
@@ -185,6 +195,7 @@ def draw_screen():
     stdscr.erase()
     draw_window_border_lines()
     draw_window_border_corners()
+    draw_window_titles()
     draw_window_contents()
     stdscr.refresh()
 
@@ -400,7 +411,7 @@ def win_look():
         padding_size = winmap_size[1] - len(line)
         winmap += line + (" " * padding_size)
         winmap_size[0] = winmap_size[0] + 1
-    offset = [0, 0]
+    offset = [world_data["look_scroll"], 0]
     return offset, winmap_size, winmap
 
 
@@ -488,11 +499,20 @@ def command_looker(string):
     return command_look
 
 
+def command_look_scroller(string):
+    def command_look_scroll():
+        win_size = next(win["size"] for win in windows
+                                    if win["func"] == win_look)
+        if string == "up" and world_data["look_scroll"] > 0:
+            world_data["look_scroll"] -= 1
+        elif string == "down" and world_data["look_scroll"] \
+                < len(world_data["look"]) - win_size[0]:
+            world_data["look_scroll"] += 1
+    return command_look_scroll
+
+
 def command_inventory_selector(string):
     def command_inventory_select():
-        logfile = open("logfile", "a")
-        logfile.write(string + "\n")
-        logfile.close()
         if string == "up" and world_data["inventory_selection"] > 0:
             world_data["inventory_selection"] -= 1
         elif string == "down" and world_data["inventory_selection"] \
@@ -502,11 +522,11 @@ def command_inventory_selector(string):
 
 
 windows = [
-    {"config": [1, 33], "func": win_info},
-    {"config": [-7, 33], "func": win_log},
-    {"config": [4, 16], "func": win_inventory},
-    {"config": [4, 16], "func": win_look},
-    {"config": [0, -34], "func": win_map}
+    {"config": [1, 33], "func": win_info, "title": "Info"},
+    {"config": [-7, 33], "func": win_log, "title": "Log"},
+    {"config": [4, 16], "func": win_inventory, "title": "Inventory"},
+    {"config": [4, 16], "func": win_look, "title": "Things here"},
+    {"config": [0, -34], "func": win_map, "title": "Map"}
 ]
 io = {
     "path_out": "server/in",
@@ -516,6 +536,8 @@ io = {
 commands = {
     "A": (command_sender("ai"),),
     "D": (command_sender("drop", "inventory_selection"),),
+    "J": (command_look_scroller("down"),),
+    "K": (command_look_scroller("up"),),
     "P": (command_sender("pick_up"),),
     "Q": (command_quit,),
     "U": (command_sender("use", "inventory_selection"),),
@@ -542,7 +564,22 @@ world_data = {
     "lifepoints": -1,
     "look": [],
     "look_mode": False,
-    "log": [],
+    "look_scroll": 0,
+    "log": [
+"QUICK COMMAND OVERVIEW: "
+"Move through map with 'w', 'e', 's', 'd', 'x', 'c'. "
+"Pick up things with 'P', drop a thing selected from the inventory with 'D' "
+"or use it with 'P'. "
+"Move through inventory selection with 'j' and 'k'. "
+"Toggle looking around mode with 'l'. "
+"Scroll 'Things here' window with 'J' and 'K'. "
+"Let AI decide next move with 'A'. "
+"Quit with 'Q'. ",
+"STATS OVERVIEW: "
+"'T': Turn; 'H': Health (the higher, the better); "
+"'S': Satiation (the closer to zero, the better).",
+"See README file for more help."
+],
     "map_center": [-1, -1],
     "map_size": 0,
     "mem_map": "",