X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=772277c8b3916de15234d838004589a9dff210de;hb=7bedc1d4ffc9c3b623c4195c484539ba7adb2dfd;hp=9d4b0994a5710c050318d5ca4760695666ba8f2f;hpb=c89e7df6e7b6b64037b5b964e10a63ad38f86eb5;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index 9d4b099..772277c 100755 --- a/plomrogue-server.py +++ b/plomrogue-server.py @@ -36,30 +36,7 @@ def prep_library(): raise SystemExit("No library " + libpath + ", run ./compile-server.sh first?") libpr = ctypes.cdll.LoadLibrary(libpath) - libpr.seed_rrand.argtypes = [ctypes.c_uint8, ctypes.c_uint32] libpr.seed_rrand.restype = ctypes.c_uint32 - libpr.rrand.argtypes = [] - libpr.rrand.restype = ctypes.c_uint16 - libpr.set_maplength.argtypes = [ctypes.c_uint16] - libpr.mv_yx_in_dir_legal_wrap.argtypes = [ctypes.c_char, ctypes.c_uint8, - ctypes.c_uint8] - libpr.mv_yx_in_dir_legal_wrap.restype = ctypes.c_uint8 - libpr.result_y.restype = ctypes.c_uint8 - libpr.result_x.restype = ctypes.c_uint8 - libpr.set_maplength(world_db["MAP_LENGTH"]) - 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 @@ -503,13 +480,10 @@ def update_map_memory(t, age_map=True): if ord_space == t["T_MEMMAP"][pos]: t["T_MEMMAP"][pos] = world_db["MAP"][pos] if age_map: - for pos in [pos for pos in range(world_db["MAP_LENGTH"] ** 2) - if not ord_v == t["fovmap"][pos] - if ord_0 <= t["T_MEMDEPTHMAP"][pos] - if ord_9 > t["T_MEMDEPTHMAP"][pos] - if not rand.next() % (2 ** - (t["T_MEMDEPTHMAP"][pos] - 48))]: - t["T_MEMDEPTHMAP"][pos] += 1 + maptype = ctypes.c_char * len(t["T_MEMDEPTHMAP"]) + memdepthmap = maptype.from_buffer(t["T_MEMDEPTHMAP"]) + fovmap = maptype.from_buffer(t["fovmap"]) + libpr.age_some_memdepthmap_on_nonfov_cells(memdepthmap, fovmap) for mt in [mt for mt in t["T_MEMTHING"] if "v" == chr(t["fovmap"][(mt[1] * world_db["MAP_LENGTH"]) + mt[2]])]: @@ -532,20 +506,23 @@ def set_world_inactive(): world_db["WORLD_ACTIVE"] = 0 -def integer_test(val_string, min, max): - """Return val_string if possible integer >= min and <= max, else None.""" +def integer_test(val_string, min, max=None): + """Return val_string if integer >= min & (if max set) <= max, else None.""" try: val = int(val_string) - if val < min or val > max: + if val < min or (max != None and val > max): raise ValueError return val except ValueError: - print("Ignoring: Please use integer >= " + str(min) + " and <= " + - str(max) + ".") + msg = "Ignoring: Please use integer >= " + str(min) + if max != None: + msg += " and <= " + str(max) + msg += "." + print(msg) return None -def setter(category, key, min, max): +def setter(category, key, min, max=None): """Build setter for world_db([category + "s"][id])[key] to >=min/<=max.""" if category is None: def f(val_string): @@ -804,6 +781,14 @@ def get_dir_to_target(t, filter): "s": memory map cell with greatest-reachable degree of unexploredness """ + def zero_score_map_where_char_on_memdepthmap(c): + maptype = ctypes.c_char * len(t["T_MEMDEPTHMAP"]) + map = maptype.from_buffer(t["T_MEMDEPTHMAP"]) + test = libpr.zero_score_map_where_char_on_memdepthmap(c, map) + if test: + raise RuntimeError("No score map allocated for " + "zero_score_map_where_char_on_memdepthmap().") + def set_map_score(pos, score): test = libpr.set_map_score(pos, score) if test: @@ -880,9 +865,7 @@ def get_dir_to_target(t, filter): 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) + zero_score_map_where_char_on_memdepthmap(mem_depth_c[0]) def rand_target_dir(neighbors, cmp, dirs): candidates = [] @@ -1077,17 +1060,14 @@ def new_Thing(type, pos=(0, 0)): def id_setter(id, category, id_store=False, start_at_1=False): """Set ID of object of category to manipulate ID unused? Create new one. - The ID is stored as id_store.id (if id_store is set). If the integer of the - input is valid (if start_at_1, >= 0 and <= 255, else >= -32768 and <= - 32767), but <0 or (if start_at_1) <1, calculate new ID: lowest unused ID - >=0 or (if start_at_1) >= 1, and <= 255. None is always returned when no - new object is created, otherwise the new object's ID. + input is valid (if start_at_1, >= 0, else >= -1), but <0 or (if start_at_1) + <1, calculate new ID: lowest unused ID >=0 or (if start_at_1) >= 1. None is + always returned when no new object is created, else the new object's ID. """ - min = 0 if start_at_1 else -32768 - max = 255 if start_at_1 else 32767 + min = 0 if start_at_1 else -1 if str == type(id): - id = integer_test(id, min, max) + id = integer_test(id, min) if None != id: if id in world_db[category]: if id_store: @@ -1095,15 +1075,12 @@ def id_setter(id, category, id_store=False, start_at_1=False): return None else: if (start_at_1 and 0 == id) \ - or ((not start_at_1) and (id < 0 or id > 255)): - id = -1 + or ((not start_at_1) and (id < 0)): + id = 0 if start_at_1 else -1 while 1: id = id + 1 if id not in world_db[category]: break - if id > 255: - print("Ignoring: " - "No unused ID available to add to ID list.") return None if id_store: id_store.id = id @@ -1348,7 +1325,7 @@ test_Thing_id = test_for_id_maker(command_tid, "Thing") @test_Thing_id def command_tcommand(str_int): """Set T_COMMAND of selected Thing.""" - val = integer_test(str_int, 0, 255) + val = integer_test(str_int, 0) if None != val: if 0 == val or val in world_db["ThingActions"]: world_db["Things"][command_tid.id]["T_COMMAND"] = val @@ -1359,7 +1336,7 @@ def command_tcommand(str_int): @test_Thing_id def command_ttype(str_int): """Set T_TYPE of selected Thing.""" - val = integer_test(str_int, 0, 255) + val = integer_test(str_int, 0) if None != val: if val in world_db["ThingTypes"]: world_db["Things"][command_tid.id]["T_TYPE"] = val @@ -1374,7 +1351,7 @@ def command_tcarries(str_int): The ID int(str_int) must not be of the selected Thing, and must belong to a Thing with unset "carried" flag. Its "carried" flag will be set on owning. """ - val = integer_test(str_int, 0, 255) + val = integer_test(str_int, 0) if None != val: if val == command_tid.id: print("Ignoring: Thing cannot carry itself.") @@ -1395,7 +1372,7 @@ def command_tmemthing(str_t, str_y, str_x): The type must fit to an existing ThingType, and the position into the map. """ - type = integer_test(str_t, 0, 255) + type = integer_test(str_t, 0) posy = integer_test(str_y, 0, 255) posx = integer_test(str_x, 0, 255) if None != type and None != posy and None != posx: @@ -1492,7 +1469,7 @@ def command_ttsymbol(char): @test_ThingType_id def command_ttcorpseid(str_int): """Set TT_CORPSE_ID of selected ThingType.""" - val = integer_test(str_int, 0, 255) + val = integer_test(str_int, 0) if None != val: if val in world_db["ThingTypes"]: world_db["ThingTypes"][command_ttid.id]["TT_CORPSE_ID"] = val @@ -1560,7 +1537,7 @@ commands_db = { "SEED_MAP": (1, False, command_seedmap), "SEED_RANDOMNESS": (1, False, command_seedrandomness), "TURN": (1, False, setter(None, "TURN", 0, 65535)), - "PLAYER_TYPE": (1, False, setter(None, "PLAYER_TYPE", 0, 255)), + "PLAYER_TYPE": (1, False, setter(None, "PLAYER_TYPE", 0)), "MAP_LENGTH": (1, False, command_maplength), "WORLD_ACTIVE": (1, False, command_worldactive), "TA_ID": (1, False, command_taid),