X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/copy_free?a=blobdiff_plain;f=client_prototype.py;h=5bcfee5f641937450155aa63f198d7fc45963112;hb=90dbaff8a39af44f8e1ed4f0268009bf36775e95;hp=1fd3061a23b62bc468b14a702d9a0188835f9318;hpb=3d023370bff381684e545b1fd232401d69ff9968;p=plomrogue
diff --git a/client_prototype.py b/client_prototype.py
index 1fd3061..5bcfee5 100644
--- a/client_prototype.py
+++ b/client_prototype.py
@@ -86,7 +86,7 @@ def set_window_geometries():
def draw_screen():
def healthy_addch(y, x, char, attr=0):
- """Bizarre workaround for ."""
+ """Workaround for ."""
if y == screen_size[0] - 1 and x == screen_size[1] - 1:
char_before = stdscr.inch(y, x - 1)
stdscr.addch(y, x - 1, char, attr)
@@ -136,11 +136,15 @@ def draw_screen():
for y in range(offset[0], stop[0]):
for x in range(offset[1], stop[1]):
cell = winmap[y * winmap_size[1] + x]
+ attr = 0
+ if len(cell) > 1:
+ attr = cell[1]
+ cell = cell[0]
y_in_screen = win["start"][0] + (y - offset[0])
x_in_screen = win["start"][1] + (x - offset[1])
if (y_in_screen < screen_size[0]
and x_in_screen < screen_size[1]):
- healthy_addch(y_in_screen, x_in_screen, cell)
+ healthy_addch(y_in_screen, x_in_screen, cell, attr)
def draw_scroll_hints():
def draw_scroll_string(n_lines_outside):
hint = ' ' + str(n_lines_outside + 1) + ' more ' + unit + ' '
@@ -173,7 +177,7 @@ def draw_screen():
draw_winmap()
draw_scroll_hints()
- stdscr.clear()
+ stdscr.erase()
draw_window_border_lines()
draw_window_border_corners()
draw_window_contents()
@@ -205,21 +209,51 @@ def read_worldstate():
if line == '%':
break
world_data["inventory"] += [line]
- world_data["position"][0] = int(worldstate_file.readline())
- world_data["position"][1] = int(worldstate_file.readline())
+ world_data["avatar_position"][0] = int(worldstate_file.readline())
+ world_data["avatar_position"][1] = int(worldstate_file.readline())
+ if not world_data["look_mode"]:
+ world_data["map_center"][0] = world_data["avatar_position"][0]
+ world_data["map_center"][1] = world_data["avatar_position"][1]
world_data["map_size"] = int(worldstate_file.readline())
+ world_data["fov_map"] = ""
+ for i in range(world_data["map_size"]):
+ line = worldstate_file.readline().replace("\n", "")
+ world_data["fov_map"] += line
+ world_data["mem_map"] = ""
+ for i in range(world_data["map_size"]):
+ line = worldstate_file.readline().replace("\n", "")
+ world_data["mem_map"] += line
worldstate_file.close()
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):
@@ -260,16 +294,22 @@ def cursed_main(stdscr):
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()
cursed_main.redraw = False
char = stdscr.getch()
- if char >= 0 and chr(char) in commands:
- commands[chr(char)]()
- cursed_main.redraw = True
+ if char >= 0:
+ char = chr(char)
+ if char in commands:
+ if len(commands[char]) == 1 or not world_data["look_mode"]:
+ commands[char][0]()
+ cursed_main.redraw = True
+ else:
+ commands[char][1]()
+ cursed_main.redraw = True
new_data_from_server = io["file_in"].read()
ping_test()
read_into_message_queue()
@@ -277,10 +317,42 @@ def cursed_main(stdscr):
read_message_queue()
-def win_foo():
- winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
- winmap_size = [4, 3]
+def win_map():
+ win_size = next(win["size"] for win in windows if win["func"] == win_map)
offset = [0, 0]
+ for i in range(2):
+ if world_data["map_center"][i] * (i + 1) > win_size[i] / 2:
+ if world_data["map_center"][i] * (i + 1) \
+ < world_data["map_size"] * (i + 1) - win_size[i] / 2:
+ offset[i] = world_data["map_center"][i] * (i + 1) \
+ - int(win_size[i] / 2)
+ if i == 1:
+ offset[1] = offset[1] + world_data["map_center"][0] % 2
+ else:
+ offset[i] = world_data["map_size"] * (i + 1) - win_size[i] + i
+ winmap_size = [world_data["map_size"], world_data["map_size"] * 2 + 1]
+ winmap = []
+ curses.init_pair(1, curses.COLOR_WHITE, curses.COLOR_BLUE)
+ curses.init_pair(2, curses.COLOR_BLUE, curses.COLOR_BLACK)
+ for y in range(world_data["map_size"]):
+ for x in range(world_data["map_size"]):
+ char = world_data["fov_map"][y * world_data["map_size"] + x]
+ if world_data["look_mode"] and y == world_data["map_center"][0] \
+ and x == world_data["map_center"][1]:
+ if char == " ":
+ char = \
+ world_data["mem_map"][y * world_data["map_size"] + x]
+ winmap += [(char, curses.A_REVERSE), (" ", curses.A_REVERSE)]
+ continue
+ if char == " ":
+ char = world_data["mem_map"][y * world_data["map_size"] + x]
+ attribute = curses.color_pair(1) if char == " " \
+ else curses.color_pair(2)
+ winmap += [(char, attribute), (" ", attribute)]
+ else:
+ winmap += char + " "
+ if y % 2 == 0:
+ winmap += " "
return offset, winmap_size, winmap
@@ -298,6 +370,20 @@ def win_inventory():
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 = [0, 0]
+ return offset, winmap_size, winmap
+
+
def win_info():
winmap = "T: " + str(world_data["turn"]) \
+ " H: " + str(world_data["lifepoints"]) \
@@ -326,17 +412,65 @@ def win_log():
def command_quit():
- io["file_out"].write("QUIT\n")
- io["file_out"].flush()
+ command_sender("QUIT")()
raise SystemExit("Received QUIT command, forwarded to server, leaving.")
+def command_toggle_look_mode():
+ if not world_data["look_mode"]:
+ world_data["look_mode"] = True
+ else:
+ world_data["look_mode"] = False
+ world_data["map_center"] = world_data["avatar_position"]
+ query_mapcell()
+
+
+def command_sender(string):
+ def command_send():
+ io["file_out"].write(string + "\n")
+ io["file_out"].flush()
+ return command_send
+
+
+def command_looker(string):
+ def command_look():
+ if string == "west" \
+ and world_data["map_center"][1] > 0:
+ world_data["map_center"][1] -= 1
+ elif string == "east" \
+ and world_data["map_center"][1] < world_data["map_size"] - 1:
+ world_data["map_center"][1] += 1
+ else:
+ y_unevenness = world_data["map_center"][0] % 2
+ y_evenness = int(not(y_unevenness))
+ if string[6:] == "west" and \
+ world_data["map_center"][1] > -y_unevenness:
+ if string[:5] == "north" and world_data["map_center"][0] > 0:
+ world_data["map_center"][0] -= 1
+ world_data["map_center"][1] -= y_evenness
+ if string[:5] == "south" and world_data["map_center"][0] \
+ < world_data["map_size"] - 1:
+ world_data["map_center"][0] += 1
+ world_data["map_center"][1] -= y_evenness
+ elif string[6:] == "east" and world_data["map_center"][1] \
+ < world_data["map_size"] - y_unevenness:
+ if string[:5] == "north" and world_data["map_center"][0] > 0:
+ world_data["map_center"][0] -= 1
+ world_data["map_center"][1] += y_unevenness
+ if string[:5] == "south" and world_data["map_center"][0] \
+ < world_data["map_size"] - 1:
+ world_data["map_center"][0] += 1
+ world_data["map_center"][1] += y_unevenness
+ query_mapcell()
+ return command_look
+
+
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_foo}
+ {"config": [4, 16], "func": win_look},
+ {"config": [0, -34], "func": win_map}
]
io = {
"path_out": "server/in",
@@ -344,18 +478,32 @@ io = {
"path_worldstate": "server/worldstate"
}
commands = {
- "Q": command_quit
+ "P": (command_sender("pick_up"),),
+ "Q": (command_quit,),
+ "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")),
+ "l": (command_toggle_look_mode,),
+ "s": (command_sender("move west"), command_looker("west")),
+ "w": (command_sender("move north-west"), command_looker("north-west")),
+ "x": (command_sender("move south-west"), command_looker("south-west")),
}
message_queue = {
"open_end": False,
"messages": []
}
world_data = {
+ "avatar_position": [-1, -1],
+ "fov_map": "",
"inventory": [],
"lifepoints": -1,
+ "look": [],
+ "look_mode": False,
"log": [],
- "map_size": -1,
- "position": [-1, -1],
+ "map_center": [-1, -1],
+ "map_size": 0,
+ "mem_map": "",
"satiation": -1,
"turn": -1
}