draw_winmap()
draw_scroll_hints()
- stdscr.clear()
+ stdscr.erase()
draw_window_border_lines()
draw_window_border_corners()
draw_window_contents()
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"]):
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()
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["position"][i] * (i + 1) > win_size[i] / 2:
- if world_data["position"][i] * (i + 1) \
+ 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["position"][i] * (i + 1) \
+ offset[i] = world_data["map_center"][i] * (i + 1) \
- int(win_size[i] / 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.A_REVERSE
+ attribute = curses.color_pair(1) if char == " " \
+ else curses.color_pair(2)
winmap += [(char, attribute), (" ", attribute)]
else:
winmap += char + " "
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"]
+
+
+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
+ return command_look
+
+
windows = [
{"config": [1, 33], "func": win_info},
{"config": [-7, 33], "func": win_log},
"path_worldstate": "server/worldstate"
}
commands = {
- "Q": command_quit
+ "Q": (command_quit,),
+ "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_mode": False,
"log": [],
+ "map_center": [-1, -1],
"map_size": 0,
"mem_map": "",
- "position": [-1, -1],
"satiation": -1,
"turn": -1
}
projects / plomrogue / blobdiff