home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New client: Remove duplicate code.
[plomrogue]
/
client_prototype.py
diff --git
a/client_prototype.py
b/client_prototype.py
index 70b6649f1c0f5d9cc15796d5131b5fba5996f9ae..5bcfee5f641937450155aa63f198d7fc45963112 100644
(file)
--- a/
client_prototype.py
+++ b/
client_prototype.py
@@
-177,7
+177,7
@@
def draw_screen():
draw_winmap()
draw_scroll_hints()
draw_winmap()
draw_scroll_hints()
- stdscr.
clear
()
+ stdscr.
erase
()
draw_window_border_lines()
draw_window_border_corners()
draw_window_contents()
draw_window_border_lines()
draw_window_border_corners()
draw_window_contents()
@@
-229,12
+229,31
@@
read_worldstate.last_checked_mtime = -1
def read_message_queue():
while (len(message_queue["messages"]) > 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)
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
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):
def cursed_main(stdscr):
@@
-275,8
+294,8
@@
def cursed_main(stdscr):
set_window_geometries()
delay = 1
while True:
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()
if cursed_main.redraw:
delay = 1
draw_screen()
@@
-298,14
+317,6
@@
def cursed_main(stdscr):
read_message_queue()
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]
def win_map():
win_size = next(win["size"] for win in windows if win["func"] == win_map)
offset = [0, 0]
@@
-315,6
+326,8
@@
def win_map():
< world_data["map_size"] * (i + 1) - win_size[i] / 2:
offset[i] = world_data["map_center"][i] * (i + 1) \
- int(win_size[i] / 2)
< 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]
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]
@@
-325,7
+338,7
@@
def win_map():
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] \
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]:
+
and x == world_data["map_center"][1]:
if char == " ":
char = \
world_data["mem_map"][y * world_data["map_size"] + x]
if char == " ":
char = \
world_data["mem_map"][y * world_data["map_size"] + x]
@@
-357,6
+370,20
@@
def win_inventory():
return offset, winmap_size, winmap
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"]) \
def win_info():
winmap = "T: " + str(world_data["turn"]) \
+ " H: " + str(world_data["lifepoints"]) \
@@
-395,6
+422,7
@@
def command_toggle_look_mode():
else:
world_data["look_mode"] = False
world_data["map_center"] = world_data["avatar_position"]
else:
world_data["look_mode"] = False
world_data["map_center"] = world_data["avatar_position"]
+ query_mapcell()
def command_sender(string):
def command_sender(string):
@@
-433,6
+461,7
@@
def command_looker(string):
< world_data["map_size"] - 1:
world_data["map_center"][0] += 1
world_data["map_center"][1] += y_unevenness
< world_data["map_size"] - 1:
world_data["map_center"][0] += 1
world_data["map_center"][1] += y_unevenness
+ query_mapcell()
return command_look
return command_look
@@
-440,7
+469,7
@@
windows = [
{"config": [1, 33], "func": win_info},
{"config": [-7, 33], "func": win_log},
{"config": [4, 16], "func": win_inventory},
{"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": [4, 16], "func": win_
look
},
{"config": [0, -34], "func": win_map}
]
io = {
{"config": [0, -34], "func": win_map}
]
io = {
@@
-449,7
+478,9
@@
io = {
"path_worldstate": "server/worldstate"
}
commands = {
"path_worldstate": "server/worldstate"
}
commands = {
+ "P": (command_sender("pick_up"),),
"Q": (command_quit,),
"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")),
"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")),
@@
-467,6
+498,7
@@
world_data = {
"fov_map": "",
"inventory": [],
"lifepoints": -1,
"fov_map": "",
"inventory": [],
"lifepoints": -1,
+ "look": [],
"look_mode": False,
"log": [],
"map_center": [-1, -1],
"look_mode": False,
"log": [],
"map_center": [-1, -1],