X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=plomrogue-server.py;h=a7cee78262f7b3ac5515c926206087d6dc93aaaa;hb=8bf4e35ebe159f9cf051c8dbfc0909d7fe5d3399;hp=de1bd420cd2a54650c1b036798e1686081ec5505;hpb=f6a542cec9e972c780eba7ed59ba1c2dc913e06f;p=plomrogue
diff --git a/plomrogue-server.py b/plomrogue-server.py
index de1bd42..a7cee78 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -42,6 +42,16 @@ def prep_library():
libpr.build_fov_map.argtypes = [ctypes.c_uint8, ctypes.c_uint8,
ctypes.c_char_p, ctypes.c_char_p]
libpr.build_fov_map.restype = ctypes.c_uint8
+ libpr.init_score_map.restype = ctypes.c_uint8
+ libpr.set_map_score.argtypes = [ctypes.c_uint16, ctypes.c_uint16]
+ libpr.set_map_score.restype = ctypes.c_uint8
+ libpr.get_map_score.argtypes = [ctypes.c_uint16]
+ libpr.get_map_score.restype = ctypes.c_int32
+ libpr.get_neighbor_score.argtypes = [ctypes.c_uint8]
+ libpr.get_neighbor_score.restype = ctypes.c_uint16
+ libpr.ready_neighbor_scores.argtpes = [ctypes.c_uint16]
+ libpr.ready_neighbor_scores.restype = ctypes.c_uint8
+ libpr.dijkstra_map.restype = ctypes.c_uint8
return libpr
@@ -204,8 +214,10 @@ def save_world():
string = ""
for key in world_db:
- if dict != type(world_db[key]) and key != "MAP":
+ if dict != type(world_db[key]) and key != "MAP" and \
+ key != "WORLD_ACTIVE" and key != "SEED_MAP":
string = string + key + " " + str(world_db[key]) + "\n"
+ string = string + "SEED_MAP " + str(world_db["SEED_MAP"]) + "\n"
string = string + helper("ThingActions", "TA_ID")
string = string + helper("ThingTypes", "TT_ID", {"TT_CORPSE_ID": False})
for id in world_db["ThingTypes"]:
@@ -463,7 +475,7 @@ def remake_map():
# This all-too-precise replica of the original C code misses iter_limit().
-def update_map_memory(t):
+def update_map_memory(t, age_map=True):
"""Update t's T_MEMMAP with what's in its FOV now,age its T_MEMMEPTHMAP."""
if not t["T_MEMMAP"]:
t["T_MEMMAP"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2))
@@ -475,15 +487,16 @@ def update_map_memory(t):
if " " == chr(t["T_MEMMAP"][pos]):
t["T_MEMMAP"][pos] = world_db["MAP"][pos]
continue
- if ord('0') <= t["T_MEMDEPTHMAP"][pos] \
- and ord('9') >= t["T_MEMDEPTHMAP"][pos] \
+ if age_map and ord('0') <= t["T_MEMDEPTHMAP"][pos] \
+ and ord('9') > t["T_MEMDEPTHMAP"][pos] \
and not rand.next() % (2 ** (t["T_MEMDEPTHMAP"][pos] - 48)):
t["T_MEMDEPTHMAP"][pos] += 1
for mt in [mt for mt in t["T_MEMTHING"]
if "v" == chr(t["fovmap"][(mt[1] * world_db["MAP_LENGTH"])
+ mt[2]])]:
t["T_MEMTHING"].remove(mt)
- for id in world_db["Things"]:
+ for id in [id for id in world_db["Things"]
+ if not world_db["Things"][id]["carried"]]:
type = world_db["Things"][id]["T_TYPE"]
if not world_db["ThingTypes"][type]["TT_LIFEPOINTS"]:
y = world_db["Things"][id]["T_POSY"]
@@ -588,7 +601,8 @@ def actor_wait(t):
def actor_move(t):
"""If passable, move/collide(=attack) thing into T_ARGUMENT's direction."""
passable = False
- move_result = mv_yx_in_dir_legal(t["T_ARGUMENT"], t["T_POSY"], t["T_POSX"])
+ move_result = mv_yx_in_dir_legal(chr(t["T_ARGUMENT"]),
+ t["T_POSY"], t["T_POSX"])
if 1 == move_result[0]:
pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2]
passable = "." == chr(world_db["MAP"][pos])
@@ -610,7 +624,7 @@ def actor_move(t):
decrement_lifepoints(world_db["Things"][hit_id])
return
dir = [dir for dir in directions_db
- if directions_db[dir] == t["T_ARGUMENT"]][0]
+ if directions_db[dir] == chr(t["T_ARGUMENT"])][0]
if passable:
t["T_POSY"] = move_result[1]
t["T_POSX"] = move_result[2]
@@ -618,21 +632,26 @@ def actor_move(t):
world_db["Things"][id]["T_POSY"] = move_result[1]
world_db["Things"][id]["T_POSX"] = move_result[2]
build_fov_map(t)
- strong_write(io_db["file_out"], "LOG You move " + dir + ".\n")
- else:
+ if t == world_db["Things"][0]:
+ strong_write(io_db["file_out"], "LOG You move " + dir + ".\n")
+ elif t == world_db["Things"][0]:
strong_write(io_db["file_out"], "LOG You fail to move " + dir + ".\n")
def actor_pick_up(t):
"""Make t pick up (topmost?) Thing from ground into inventory."""
- # Topmostness is actually not defined so far.
+ # Topmostness is actually not defined so far. Picks Thing with highest ID.
ids = [id for id in world_db["Things"] if world_db["Things"][id] != t
if not world_db["Things"][id]["carried"]
if world_db["Things"][id]["T_POSY"] == t["T_POSY"]
if world_db["Things"][id]["T_POSX"] == t["T_POSX"]]
if len(ids):
- world_db["Things"][ids[0]]["carried"] = True
- t["T_CARRIES"].append(ids[0])
+ highest_id = 0
+ for id in ids:
+ if id > highest_id:
+ highest_id = id
+ world_db["Things"][highest_id]["carried"] = True
+ t["T_CARRIES"].append(highest_id)
if t == world_db["Things"][0]:
strong_write(io_db["file_out"], "LOG You pick up an object.\n")
elif t == world_db["Things"][0]:
@@ -664,15 +683,15 @@ def actor_use(t):
t["T_CARRIES"].remove(id)
del world_db["Things"][id]
t["T_SATIATION"] += world_db["ThingTypes"][type]["TT_CONSUMABLE"]
- t["T_LIFEPOINTS"] += 1
- # Wrongly increment HPs is a replica of the original code.
- strong_write(io_db["file_out"], "LOG You consume this object.\n")
- else:
- strong_write(io_db["file_out"], "LOG You try to use this object," +
- "but fail.\n")
- else:
- strong_write(io_db["file_out"], "LOG You try to use an object, but " +
- "you own none.\n")
+ if t == world_db["Things"][0]:
+ strong_write(io_db["file_out"],
+ "LOG You consume this object.\n")
+ elif t == world_db["Things"][0]:
+ strong_write(io_db["file_out"],
+ "LOG You try to use this object, but fail.\n")
+ elif t == world_db["Things"][0]:
+ strong_write(io_db["file_out"],
+ "LOG You try to use an object, but you own none.\n")
def thingproliferation(t):
@@ -747,9 +766,178 @@ def hunger(t):
decrement_lifepoints(t)
-def get_dir_to_nearest_target(t, c):
- # Dummy
- return False
+def get_dir_to_target(t, filter):
+ """Try to set T_COMMAND/T_ARGUMENT for move to "filter"-determined target.
+
+ The path-wise nearest target is chosen, via the shortest available path.
+ Target must not be t. On succcess, return positive value, else False.
+ Filters:
+ "a": Thing in FOV is below a certain distance, animate, but of ThingType
+ that is not t's, and starts out weaker than t is; build path as
+ avoiding things of t's ThingType
+ "f": neighbor cell (not inhabited by any animate Thing) further away from
+ animate Thing not further than x steps away and in FOV and of a
+ ThingType that is not t's, and starts out stronger or as strong as t
+ is currently; or (cornered), if no such flight cell, but Thing of
+ above criteria is too near,1 a cell closer to it, or, if less near,
+ just wait
+ "c": Thing in memorized map is consumable
+ "s": memory map cell with greatest-reachable degree of unexploredness
+ """
+
+ def set_map_score(pos, score):
+ test = libpr.set_map_score(pos, score)
+ if test:
+ raise RuntimeError("No score map allocated for set_map_score().")
+
+ def get_map_score(pos):
+ result = libpr.get_map_score(pos)
+ if result < 0:
+ raise RuntimeError("No score map allocated for get_map_score().")
+ return result
+
+ def seeing_thing():
+ if t["fovmap"] and ("a" == filter or "f" == filter):
+ for id in world_db["Things"]:
+ Thing = world_db["Things"][id]
+ if Thing != t and Thing["T_LIFEPOINTS"] and \
+ t["T_TYPE"] != Thing["T_TYPE"] and \
+ 'v' == chr(t["fovmap"][(Thing["T_POSY"]
+ * world_db["MAP_LENGTH"])
+ + Thing["T_POSX"]]):
+ ThingType = world_db["ThingTypes"][Thing["T_TYPE"]]
+ if ("f" == filter and ThingType["TT_LIFEPOINTS"] >=
+ t["T_LIFEPOINTS"]) \
+ or ("a" == filter and ThingType["TT_LIFEPOINTS"] <
+ t["T_LIFEPOINTS"]):
+ return True
+ elif t["T_MEMMAP"] and "c" == filter:
+ for mt in t["T_MEMTHING"]:
+ if ' ' != chr(t["T_MEMMAP"][(mt[1] * world_db["MAP_LENGTH"])
+ + mt[2]]) \
+ and world_db["ThingTypes"][mt[0]]["TT_CONSUMABLE"]:
+ return True
+ return False
+
+ def init_score_map():
+ test = libpr.init_score_map()
+ if test:
+ raise RuntimeError("Malloc error in init_score_map().")
+ for i in [i for i in range(world_db["MAP_LENGTH"] ** 2)
+ if '.' == chr(t["T_MEMMAP"][i])]:
+ set_map_score(i, 65535 - 1)
+ if "a" == filter:
+ for id in world_db["Things"]:
+ Thing = world_db["Things"][id]
+ pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] + Thing["T_POSX"]
+ if t != Thing and Thing["T_LIFEPOINTS"] and \
+ t["T_TYPE"] != Thing["T_TYPE"] and \
+ 'v' == chr(t["fovmap"][pos]) and \
+ t["T_LIFEPOINTS"] > \
+ world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]:
+ set_map_score(pos, 0)
+ elif t["T_TYPE"] == Thing["T_TYPE"]:
+ set_map_score(pos, 65535)
+ elif "f" == filter:
+ for id in [id for id in world_db["Things"]
+ if world_db["Things"][id]["T_LIFEPOINTS"]]:
+ Thing = world_db["Things"][id]
+ pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] + Thing["T_POSX"]
+ if t["T_TYPE"] != Thing["T_TYPE"] and \
+ 'v' == chr(t["fovmap"][pos]) and \
+ t["T_LIFEPOINTS"] <= \
+ world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]:
+ set_map_score(pos, 0)
+ elif "c" == filter:
+ for mt in [mt for mt in t["T_MEMTHING"]
+ if ' ' != chr(t["T_MEMMAP"][mt[1]
+ * world_db["MAP_LENGTH"]
+ + mt[2]])
+ if world_db["ThingTypes"][mt[0]]["TT_CONSUMABLE"]]:
+ set_map_score(mt[1] * world_db["MAP_LENGTH"] + mt[2], 0)
+ elif "s" == filter:
+ for i in [i for i in range(world_db["MAP_LENGTH"] ** 2)
+ if t["T_MEMDEPTHMAP"][i] == mem_depth_c[0]]:
+ set_map_score(i, 0)
+
+ def rand_target_dir(neighbors, cmp, dirs):
+ candidates = []
+ n_candidates = 0
+ for i in range(len(dirs)):
+ if cmp == neighbors[i]:
+ candidates.append(dirs[i])
+ n_candidates += 1
+ return candidates[rand.next() % n_candidates] if n_candidates else 0
+
+ def get_neighbor_scores(dirs, eye_pos):
+ scores = []
+ if libpr.ready_neighbor_scores(eye_pos):
+ raise RuntimeError("No score map allocated for " +
+ "ready_neighbor_scores.()")
+ for i in range(len(dirs)):
+ scores.append(libpr.get_neighbor_score(i))
+ return scores
+
+ def get_dir_from_neighbors():
+ dir_to_target = False
+ dirs = "edcxsw"
+ eye_pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"]
+ neighbors = get_neighbor_scores(dirs, eye_pos)
+ if "f" == filter:
+ inhabited = [world_db["Things"][id]["T_POSY"]
+ * world_db["MAP_LENGTH"]
+ + world_db["Things"][id]["T_POSX"]
+ for id in world_db["Things"]
+ if world_db["Things"][id]["T_LIFEPOINTS"]]
+ for i in range(len(dirs)):
+ mv_yx_in_dir_legal(dirs[i], t["T_POSY"], t["T_POSX"])
+ pos_cmp = libpr.result_y() * world_db["MAP_LENGTH"] \
+ + libpr.result_x()
+ for pos in [pos for pos in inhabited if pos == pos_cmp]:
+ neighbors[i] = 65535
+ break
+ minmax_start = 0 if "f" == filter else 65535 - 1
+ minmax_neighbor = minmax_start
+ for i in range(len(dirs)):
+ if ("f" == filter and get_map_score(eye_pos) < neighbors[i] and
+ minmax_neighbor < neighbors[i] and 65535 != neighbors[i]) \
+ or ("f" != filter and minmax_neighbor > neighbors[i]):
+ minmax_neighbor = neighbors[i]
+ if minmax_neighbor != minmax_start:
+ dir_to_target = rand_target_dir(neighbors, minmax_neighbor, dirs)
+ if "f" == filter:
+ if not dir_to_target:
+ if 1 == get_map_score(eye_pos):
+ dir_to_target = rand_target_dir(neighbors, 0, dirs)
+ elif 3 >= get_map_score(eye_pos):
+ t["T_COMMAND"] = [id for id in world_db["ThingActions"]
+ if world_db["ThingActions"][id]["TA_NAME"]
+ == "wait"][0]
+ return 1;
+ elif dir_to_target and 3 < get_map_score(eye_pos):
+ dir_to_target = 0
+ elif "a" == filter and 10 <= get_map_score(eye_pos):
+ dir_to_target = 0
+ return dir_to_target
+
+ dir_to_target = False
+ mem_depth_c = b' '
+ run_i = 9 + 1 if "s" == filter else 1
+ while run_i and not dir_to_target and ("s" == filter or seeing_thing()):
+ run_i -= 1
+ init_score_map()
+ mem_depth_c = b'9' if b' ' == mem_depth_c \
+ else bytes([mem_depth_c[0] - 1])
+ if libpr.dijkstra_map():
+ raise RuntimeError("No score map allocated for dijkstra_map().")
+ dir_to_target = get_dir_from_neighbors()
+ libpr.free_score_map()
+ if dir_to_target and str == type(dir_to_target):
+ t["T_COMMAND"] = [id for id in world_db["ThingActions"]
+ if world_db["ThingActions"][id]["TA_NAME"]
+ == "move"][0]
+ t["T_ARGUMENT"] = ord(dir_to_target)
+ return dir_to_target
def standing_on_consumable(t):
@@ -790,7 +978,7 @@ def ai(t):
"""
t["T_COMMAND"] = [id for id in world_db["ThingActions"]
if world_db["ThingActions"][id]["TA_NAME"] == "wait"][0]
- if not get_dir_to_nearest_target(t, "f"):
+ if not get_dir_to_target(t, "f"):
sel = get_inventory_slot_to_consume(t)
if -1 != sel:
t["T_COMMAND"] = [id for id in world_db["ThingActions"]
@@ -801,9 +989,9 @@ def ai(t):
t["T_COMMAND"] = [id for id in world_db["ThingActions"]
if world_db["ThingActions"][id]["TA_NAME"]
== "pick_up"][0]
- elif (not get_dir_to_nearest_target(t, "c")) and \
- (not get_dir_to_nearest_target(t, "a")):
- get_dir_to_nearest_target(t, "s")
+ elif (not get_dir_to_target(t, "c")) and \
+ (not get_dir_to_target(t, "a")):
+ get_dir_to_target(t, "s")
def turn_over():
@@ -811,9 +999,10 @@ def turn_over():
id = 0
whilebreaker = False
while world_db["Things"][0]["T_LIFEPOINTS"]:
- for id in [id for id in world_db["Things"]]:
- if not id in world_db["Things"]: # Thing may have been consumed
- continue # during turn â¦
+ for id in [id for id in world_db["Things"]]: # Only what is from start!
+ if not id in world_db["Things"] or \
+ world_db["Things"][id]["carried"]:# Thing may have been consumed
+ continue # or picked up during turn â¦
Thing = world_db["Things"][id]
if Thing["T_LIFEPOINTS"]:
if not Thing["T_COMMAND"]:
@@ -822,7 +1011,6 @@ def turn_over():
whilebreaker = True
break
ai(Thing)
- Thing["T_COMMAND"] = 1
try_healing(Thing)
Thing["T_PROGRESS"] += 1
taid = [a for a in world_db["ThingActions"]
@@ -909,13 +1097,6 @@ def command_quit():
def command_thingshere(str_y, str_x):
"""Write to out file list of Things known to player at coordinate y, x."""
- def write_thing_if_here():
- if y == world_db["Things"][id]["T_POSY"] \
- and x == world_db["Things"][id]["T_POSX"] \
- and not world_db["Things"][id]["carried"]:
- type = world_db["Things"][id]["T_TYPE"]
- name = world_db["ThingTypes"][type]["TT_NAME"]
- strong_write(io_db["file_out"], name + "\n")
if world_db["WORLD_ACTIVE"]:
y = integer_test(str_y, 0, 255)
x = integer_test(str_x, 0, 255)
@@ -925,10 +1106,17 @@ def command_thingshere(str_y, str_x):
strong_write(io_db["file_out"], "THINGS_HERE START\n")
if "v" == chr(world_db["Things"][0]["fovmap"][pos]):
for id in world_db["Things"]:
- write_thing_if_here()
+ if y == world_db["Things"][id]["T_POSY"] \
+ and x == world_db["Things"][id]["T_POSX"] \
+ and not world_db["Things"][id]["carried"]:
+ type = world_db["Things"][id]["T_TYPE"]
+ name = world_db["ThingTypes"][type]["TT_NAME"]
+ strong_write(io_db["file_out"], name + "\n")
else:
- for id in world_db["Things"][0]["T_MEMTHING"]:
- write_thing_if_here()
+ for mt in world_db["Things"][0]["T_MEMTHING"]:
+ if y == mt[1] and x == mt[2]:
+ name = world_db["ThingTypes"][mt[0]]["TT_NAME"]
+ strong_write(io_db["file_out"], name + "\n")
strong_write(io_db["file_out"], "THINGS_HERE END\n")
else:
print("Ignoring: Invalid map coordinates.")
@@ -956,7 +1144,7 @@ def play_commander(action, args=False):
def set_command_and_argument_movestring(str_arg):
if str_arg in directions_db:
- world_db["Things"][0]["T_ARGUMENT"] = directions_db[str_arg]
+ world_db["Things"][0]["T_ARGUMENT"] = ord(directions_db[str_arg])
set_command()
else:
print("Ignoring: Argument must be valid direction string.")
@@ -1096,7 +1284,7 @@ def command_worldactive(worldactive_string):
if world_db["Things"][id]["T_LIFEPOINTS"]:
build_fov_map(world_db["Things"][id])
if 0 == id:
- update_map_memory(world_db["Things"][id])
+ update_map_memory(world_db["Things"][id], False)
world_db["WORLD_ACTIVE"] = 1
@@ -1387,9 +1575,9 @@ commands_db = {
"""World state database. With sane default values. (Randomness is in rand.)"""
world_db = {
"TURN": 0,
+ "MAP_LENGTH": 64,
"SEED_MAP": 0,
"PLAYER_TYPE": 0,
- "MAP_LENGTH": 64,
"WORLD_ACTIVE": 0,
"ThingActions": {},
"ThingTypes": {},