t["T_POSY"] = move_result[1]
t["T_POSX"] = move_result[2]
t["pos"] = move_result[1] * world_db["MAP_LENGTH"] + move_result[2]
- #if t != world_db["Things"][0]:
- # world_db["Things"][0]["T_MEMMAP"][t["pos"]] = ord("?")
+ world_db["soundmap"][t["pos"]] = ord("9")
elif t == world_db["Things"][0]:
log("You try to MOVE there, but fail.")
world_db["wetmap"][pos] += 1
positions_to_wet.remove(pos)
world_db["HUMIDITY"] -= 1
+ for pos in range(world_db["MAP_LENGTH"] ** 2):
+ if world_db["soundmap"][pos] > ord("0"):
+ world_db["soundmap"][pos] -= 1
world_db["TURN"] += 1
io_db["worldstate_updateable"] = True
try_worldstate_update()
world_db["set_command"]("wait")
-def save_wetmap():
+def save_maps():
length = world_db["MAP_LENGTH"]
string = ""
for i in range(length):
line = world_db["wetmap"][i * length:(i * length) + length].decode()
string = string + "WETMAP" + " " + str(i) + " " + line + "\n"
+ for i in range(length):
+ line = world_db["soundmap"][i * length:(i * length) + length].decode()
+ string = string + "SOUNDMAP" + " " + str(i) + " " + line + "\n"
return string
+def soundmapset(str_int, mapline):
+ def valid_map_line(str_int, mapline):
+ from server.utils import integer_test
+ val = integer_test(str_int, 0, 255)
+ if None != val:
+ if val >= world_db["MAP_LENGTH"]:
+ print("Illegal value for map line number.")
+ elif len(mapline) != world_db["MAP_LENGTH"]:
+ print("Map line length is unequal map width.")
+ else:
+ return val
+ return None
+ val = valid_map_line(str_int, mapline)
+ if None != val:
+ length = world_db["MAP_LENGTH"]
+ if not world_db["soundmap"]:
+ m = bytearray(b' ' * (length ** 2))
+ else:
+ m = world_db["soundmap"]
+ m[val * length:(val * length) + length] = mapline.encode()
+ if not world_db["soundmap"]:
+ world_db["soundmap"] = m
+
+
def wetmapset(str_int, mapline):
def valid_map_line(str_int, mapline):
from server.utils import integer_test
if not world_db["wetmap"]:
world_db["wetmap"] = m
+
+def write_soundmap():
+ from server.worldstate_write_helpers import write_map
+ length = world_db["MAP_LENGTH"]
+ return write_map(world_db["soundmap"], world_db["MAP_LENGTH"])
+
+
def write_wetmap():
from server.worldstate_write_helpers import write_map
length = world_db["MAP_LENGTH"]
raise RuntimeError("No score map allocated for set_map_score().")
def set_movement_cost_map():
- memmap = c_pointer_to_bytearray(t["T_MEMMAP"])
+ copy_memmap = t["T_MEMMAP"][:]
+ copy_memmap.replace(b' ', b'4')
+ memmap = c_pointer_to_bytearray(copy_memmap)
if libpr.TCE_set_movement_cost_map(memmap):
raise RuntimeError("No movement cost map allocated for "
"set_movement_cost_map().")
def animates_in_fov(maplength):
return [Thing for Thing in world_db["Things"].values()
- if Thing["T_LIFEPOINTS"] if 118 == t["fovmap"][Thing["pos"]]
- if not Thing == t]
+ if Thing["T_LIFEPOINTS"] and 118 == t["fovmap"][Thing["pos"]]
+ and (not Thing == t)]
def seeing_thing():
def exists(gen):
return exists(pos for pos in range(mapsize)
if t["T_MEMMAP"][pos] == ord("0")
if t["fovmap"] != ord("v"))
- elif target == "space" and t["T_MEMMAP"] and t["fovmap"]:
+ elif target == "space_big" and t["T_MEMMAP"] and t["fovmap"]:
return exists(pos for pos in range(mapsize)
if ord("0") <= t["T_MEMMAP"][pos] <= ord("2")
if (t["fovmap"] != ord("v")
or world_db["terrain_fullness"](pos) < 5))
- elif target == "flee" and t["fovmap"]:
+ elif target in {"hunt", "flee"} and t["fovmap"]:
return exists(Thing for
- Thing in animates_in_fov(world_db["MAP_LENGTH"]))
+ Thing in animates_in_fov(world_db["MAP_LENGTH"])) \
+ or exists(pos for pos in range(mapsize)
+ if world_db["soundmap"][pos] > ord("0")
+ if t["fovmap"][pos] != ord("v"))
return False
def init_score_map():
- test = libpr.init_score_map()
- set_movement_cost_map()
mapsize = world_db["MAP_LENGTH"] ** 2
+ test = libpr.TCE_init_score_map()
+ [set_map_score(pos, 65535) for pos in range(mapsize)
+ if chr(t["T_MEMMAP"][pos]) in "5-"]
+ set_movement_cost_map()
if test:
raise RuntimeError("Malloc error in init_score_map().")
if target == "food" and t["T_MEMMAP"]:
or world_db["terrain_fullness"](pos) < 5)]
elif target == "search":
zero_score_map_where_char_on_memdepthmap(mem_depth_c[0])
- elif target == "flee":
+ elif target in {"hunt", "flee"}:
[set_map_score(Thing["pos"], 0) for
Thing in animates_in_fov(world_db["MAP_LENGTH"])]
+ [set_map_score(pos, 0) for pos in range(mapsize)
+ if world_db["soundmap"][pos] > ord("0")
+ if t["fovmap"][pos] != ord("v")]
def rand_target_dir(neighbors, cmp, dirs):
candidates = []
return
elif need[0] in {"safe_pee", "safe_drop"}:
action_name = need[0][len("safe_"):]
- if world_db["terrain_fullness"](t["pos"]) < 4:
+ if world_db["terrain_fullness"](t["pos"]) <= 3:
t["T_COMMAND"] = thing_action_id(action_name)
return
- else:
- test = world_db["get_dir_to_target"](t, "space")
- if test[0]:
- if (not test[1] < 5) and \
- world_db["terrain_fullness"](t["pos"]) < 5:
- t["T_COMMAND"] = thing_action_id(action_name)
- return
- if t["T_STOMACH"] < 32 and \
- world_db["get_dir_to_target"](t, "food")[0]:
+ test = world_db["get_dir_to_target"](t, "space")
+ if test[0]:
+ if test[1] < 5:
return
+ elif world["terrain_fullness"](t["pos"]) < 5:
+ t["T_COMMAND"] = thing_action_id(action_name)
+ return
+ if t["T_STOMACH"] < 32 and \
+ world_db["get_dir_to_target"](t, "food")[0]:
+ return
continue
- if world_db["get_dir_to_target"](t, need[0])[0]:
- return
- elif t["T_STOMACH"] < 32 and \
- need[0] in {"fluid_certain", "fluid_potential"} and \
- world_db["get_dir_to_target"](t, "food")[0]:
+ if need[0] in {"fluid_certain", "fluid_potential", "food"}:
+ if world_db["get_dir_to_target"](t, need[0])[0]:
+ return
+ elif world_db["get_dir_to_target"](t, "hunt")[0]:
+ return
+ elif need[0] != "food" and t["T_STOMACH"] < 32 and \
+ world_db["get_dir_to_target"](t, "food")[0]:
+ return
+ elif world_db["get_dir_to_target"](t, need[0])[0]:
return
world_db["ai"] = ai
io_db["worldstate_write_order"] += [["T_BOWEL", "player_int"]]
io_db["worldstate_write_order"] += [["T_BLADDER", "player_int"]]
io_db["worldstate_write_order"] += [[write_wetmap, "func"]]
+io_db["worldstate_write_order"] += [[write_soundmap, "func"]]
import server.config.world_data
server.config.world_data.symbols_hide = "345"
server.config.world_data.symbols_passable = "012-"
server.config.world_data.thing_defaults["T_BOWEL"] = 0
server.config.world_data.thing_defaults["T_KIDNEY"] = 16
server.config.world_data.thing_defaults["T_BLADDER"] = 0
+world_db["soundmap"] = bytearray(b"0" * world_db["MAP_LENGTH"] ** 2)
world_db["wetmap"] = bytearray(b"0" * world_db["MAP_LENGTH"] ** 2)
if not "NEW_SPAWN" in world_db:
world_db["NEW_SPAWN"] = 0
if not "HUMIDITY" in world_db:
world_db["HUMIDITY"] = 0
-io_db["hook_save"] = save_wetmap
+io_db["hook_save"] = save_maps
import server.config.make_world_helpers
server.config.make_world_helpers.make_map = make_map
from server.config.commands import commands_db
commands_db["T_BOWEL"] = (1, False, setter("Thing", "T_BOWEL", 0, 255))
commands_db["T_BLADDER"] = (1, False, setter("Thing", "T_BLADDER", 0, 255))
commands_db["WETMAP"] = (2, False, wetmapset)
+commands_db["SOUNDMAP"] = (2, False, soundmapset)
from server.actions import actor_wait
import server.config.actions
server.config.actions.action_db = {
projects / plomrogue / blobdiff