home
·
contact
·
privacy
projects
/
plomrogue
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d02337
)
New client: Add (ugly) pov and memory map display.
author
Christian Heller
<c.heller@plomlompom.de>
Sat, 28 Nov 2015 14:32:42 +0000
(15:32 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Sat, 28 Nov 2015 14:32:42 +0000
(15:32 +0100)
client_prototype.py
patch
|
blob
|
history
diff --git
a/client_prototype.py
b/client_prototype.py
index 1fd3061a23b62bc468b14a702d9a0188835f9318..582df073688bd4a9a7f43314a30ae820cc51768a 100644
(file)
--- a/
client_prototype.py
+++ b/
client_prototype.py
@@
-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]
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]):
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 + ' '
def draw_scroll_hints():
def draw_scroll_string(n_lines_outside):
hint = ' ' + str(n_lines_outside + 1) + ' more ' + unit + ' '
@@
-208,6
+212,14
@@
def read_worldstate():
world_data["position"][0] = int(worldstate_file.readline())
world_data["position"][1] = int(worldstate_file.readline())
world_data["map_size"] = int(worldstate_file.readline())
world_data["position"][0] = int(worldstate_file.readline())
world_data["position"][1] = int(worldstate_file.readline())
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
worldstate_file.close()
read_worldstate.last_checked_mtime = -1
@@
-278,12
+290,31
@@
def cursed_main(stdscr):
def win_foo():
def win_foo():
- winmap = ['.', 'o', '.', 'o', 'O', 'o', '.', 'o', '.', 'x', 'y', 'x']
+ 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
winmap_size = [4, 3]
offset = [0, 0]
return offset, winmap_size, winmap
+def win_map():
+ offset = [0, 0]
+ winmap_size = [world_data["map_size"], world_data["map_size"] * 2 + 1]
+ winmap = []
+ 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 char == " ":
+ char = world_data["mem_map"][y * world_data["map_size"] + x]
+ attribute = curses.A_REVERSE
+ winmap += [(char, attribute), (" ", attribute)]
+ else:
+ winmap += char + " "
+ if y % 2 == 0:
+ winmap += " "
+ return offset, winmap_size, winmap
+
+
def win_inventory():
winmap = ""
winmap_size = [0, 0]
def win_inventory():
winmap = ""
winmap_size = [0, 0]
@@
-336,7
+367,7
@@
windows = [
{"config": [-7, 33], "func": win_log},
{"config": [4, 16], "func": win_inventory},
{"config": [4, 16], "func": win_foo},
{"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": [0, -34], "func": win_
map
}
]
io = {
"path_out": "server/in",
]
io = {
"path_out": "server/in",
@@
-351,10
+382,12
@@
message_queue = {
"messages": []
}
world_data = {
"messages": []
}
world_data = {
+ "fov_map": "",
"inventory": [],
"lifepoints": -1,
"log": [],
"inventory": [],
"lifepoints": -1,
"log": [],
- "map_size": -1,
+ "map_size": 0,
+ "mem_map": "",
"position": [-1, -1],
"satiation": -1,
"turn": -1
"position": [-1, -1],
"satiation": -1,
"turn": -1