home · contact · privacy
New client: Add quick help text to log start.
[plomrogue] / client_prototype.py
index 19ac3fd20ae2a8cca1e323e5a6b2714bb0ae9ebc..9458cffef76a744bc69822ea186d5f9bcced5694 100644 (file)
@@ -101,7 +101,6 @@ def draw_screen():
                 j = win["start"][int(k == 0)] - sep_size
                 if (j >= 0 and j < screen_size[int(k == 0)]):
                     start = win["start"][k]
-                    # start = start if start >= 0 else 0
                     end = win["start"][k] + win["size"][k]
                     end = end if end < screen_size[k] else screen_size[k]
                     if k:
@@ -126,8 +125,24 @@ 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.
+
+            The individuall cell of a winmap is interpreted as either a single
+            character element, or as a tuple of character and attribute,
+            depending on the size len(cell) spits out.
+            """
             stop = [0, 0]
             for i in range(2):
                 stop[i] = win["size"][i] + offset[i]
@@ -180,6 +195,7 @@ def draw_screen():
     stdscr.erase()
     draw_window_border_lines()
     draw_window_border_corners()
+    draw_window_titles()
     draw_window_contents()
     stdscr.refresh()
 
@@ -229,12 +245,31 @@ read_worldstate.last_checked_mtime = -1
 
 def read_message_queue():
     while (len(message_queue["messages"]) > 1
-        or (len(message_queue["messages"]) == 0
+        or (len(message_queue["messages"]) == 1
             and not message_queue["open_end"])):
         message = message_queue["messages"].pop(0)
-        if message[0:4] == "LOG ":
+        if message == "THINGS_HERE START":
+            read_message_queue.parse_thingshere = True
+            world_data["look"] = []
+        elif message == "THINGS_HERE END":
+            read_message_queue.parse_thingshere = False
+            if world_data["look"] == []:
+                world_data["look"] = ["(none known)"]
+            cursed_main.redraw = True
+        elif read_message_queue.parse_thingshere:
+            world_data["look"] += [message]
+        elif message[0:4] == "LOG ":
             world_data["log"] += [message[4:]]
             cursed_main.redraw = True
+        elif message == "WORLD_UPDATED":
+            query_mapcell()
+read_message_queue.parse_thingshere = False
+
+
+def query_mapcell():
+   command_sender("THINGS_HERE " + str(world_data["map_center"][0]) + " "
+        + str(world_data["map_center"][1]))()
+   world_data["look"] = ["(polling)"]
 
 
 def cursed_main(stdscr):
@@ -269,14 +304,13 @@ def cursed_main(stdscr):
 
     curses.noecho()
     curses.curs_set(False)
-    # stdscr.keypad(True)
     signal.signal(signal.SIGWINCH,
         lambda ignore_1, ignore_2: set_window_geometries())
     set_window_geometries()
     delay = 1
     while True:
-        stdscr.timeout(delay)
-        delay = delay * 2 if delay < 1000 else delay
+        stdscr.timeout(int(delay))
+        delay = delay * 1.1 if delay < 1000 else delay
         if cursed_main.redraw:
             delay = 1
             draw_screen()
@@ -298,14 +332,6 @@ def cursed_main(stdscr):
         read_message_queue()
 
 
-def win_foo():
-    winmap = [('.', 0), ('o', 0), ('.', 0), ('o', 0), ('O', 0), ('o', 0),
-        ('.', 0), ('o', 0), ('.', 0), ('x', 0), ('y', 0), ('x', 0)]
-    winmap_size = [4, 3]
-    offset = [0, 0]
-    return offset, winmap_size, winmap
-
-
 def win_map():
     win_size = next(win["size"] for win in windows if win["func"] == win_map)
     offset = [0, 0]
@@ -346,16 +372,46 @@ def win_map():
 
 
 def win_inventory():
-    winmap = ""
-    winmap_size = [0, 0]
+    win_size = next(win["size"] for win in windows
+                                if win["func"] == win_inventory)
+    winmap = []
+    winmap_size = [0, win_size[1]]
     for line in world_data["inventory"]:
         winmap_size[1] = winmap_size[1] if len(line) <= winmap_size[1] \
             else len(line)
+    count = 0
     for line in world_data["inventory"]:
         padding_size = winmap_size[1] - len(line)
-        winmap += line + (" " * padding_size)
+        line += (" " * padding_size)
+        if count == world_data["inventory_selection"]:
+            line_new = []
+            for x in range(len(line)):
+                line_new += [(line[x], curses.A_REVERSE)]
+            line = line_new
+        winmap += line
         winmap_size[0] = winmap_size[0] + 1
+        count += 1
     offset = [0, 0]
+    if world_data["inventory_selection"] > win_size[0]/2:
+        if world_data["inventory_selection"] < len(world_data["inventory"]) \
+            - win_size[0]/2:
+            offset[0] = world_data["inventory_selection"] - int(win_size[0]/2)
+        else:
+            offset[0] = len(world_data["inventory"]) - win_size[0]
+    return offset, winmap_size, winmap
+
+
+def win_look():
+    winmap = ""
+    winmap_size = [0, 0]
+    for line in world_data["look"]:
+        winmap_size[1] = winmap_size[1] if len(line) <= winmap_size[1] \
+            else len(line)
+    for line in world_data["look"]:
+        padding_size = winmap_size[1] - len(line)
+        winmap += line + (" " * padding_size)
+        winmap_size[0] = winmap_size[0] + 1
+    offset = [world_data["look_scroll"], 0]
     return offset, winmap_size, winmap
 
 
@@ -397,11 +453,15 @@ def command_toggle_look_mode():
     else:
         world_data["look_mode"] = False
         world_data["map_center"] = world_data["avatar_position"]
+        query_mapcell()
 
 
-def command_sender(string):
+def command_sender(string, int_field=None):
     def command_send():
-        io["file_out"].write(string + "\n")
+        int_string = ""
+        if int_field:
+            int_string = " " + str(world_data[int_field])
+        io["file_out"].write(string + int_string + "\n")
         io["file_out"].flush()
     return command_send
 
@@ -435,15 +495,38 @@ def command_looker(string):
                         < world_data["map_size"] - 1:
                     world_data["map_center"][0] += 1
                     world_data["map_center"][1] += y_unevenness
+        query_mapcell()
     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():
+        if string == "up" and world_data["inventory_selection"] > 0:
+            world_data["inventory_selection"] -= 1
+        elif string == "down" and world_data["inventory_selection"] \
+                < len(world_data["inventory"]) - 1:
+            world_data["inventory_selection"] += 1
+    return command_inventory_select
+
+
 windows = [
-    {"config": [1, 33], "func": win_info},
-    {"config": [-7, 33], "func": win_log},
-    {"config": [4, 16], "func": win_inventory},
-    {"config": [4, 16], "func": win_foo},
-    {"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",
@@ -451,10 +534,19 @@ io = {
     "path_worldstate": "server/worldstate"
 }
 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"),),
+    "W": (command_sender("wait"),),
     "c": (command_sender("move south-east"), command_looker("south-east")),
     "d": (command_sender("move east"), command_looker("east")),
     "e": (command_sender("move north-east"), command_looker("north-east")),
+    "j": (command_inventory_selector("down"),),
+    "k": (command_inventory_selector("up"),),
     "l": (command_toggle_look_mode,),
     "s": (command_sender("move west"), command_looker("west")),
     "w": (command_sender("move north-west"), command_looker("north-west")),
@@ -468,9 +560,26 @@ world_data = {
     "avatar_position": [-1, -1],
     "fov_map": "",
     "inventory": [],
+    "inventory_selection": 0,
     "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": "",