X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=2faf15ce64d8f06e9f8e2e4f6781a1fce03d618b;hb=a502fc715d081cb95b03a684d42a66485c5039cb;hp=3234c4aeaa222f8ba22728112e49831ab71f6ffc;hpb=b745286c163a4a50789e0620eeac0555a940954c;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index 3234c4a..2faf15c 100755 --- a/plomrogue-server.py +++ b/plomrogue-server.py @@ -36,6 +36,12 @@ def prep_library(): 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 return libpr @@ -266,7 +272,7 @@ def read_command(): Keep building return string until a newline is encountered. Pause between unsuccessful reads, and after too much waiting, run server_test(). """ - wait_on_fail = 1 + wait_on_fail = 0.03333 max_wait = 5 now = time.time() command = "" @@ -472,7 +478,7 @@ def update_map_memory(t): # TODO: Aging of MEMDEPTHMAP. for memthing in t["T_MEMTHING"]: y = world_db["Things"][memthing[0]]["T_POSY"] - x = world_db["Things"][memthing[1]]["T_POSY"] + x = world_db["Things"][memthing[0]]["T_POSX"] if "v" == chr(t["fovmap"][(y * world_db["MAP_LENGTH"]) + x]): t["T_MEMTHING"].remove(memthing) for id in world_db["Things"]: @@ -534,7 +540,41 @@ def setter(category, key, min, max): def build_fov_map(t): """Build Thing's FOV map.""" t["fovmap"] = bytearray(b'v' * (world_db["MAP_LENGTH"] ** 2)) - # DUMMY so far. Just builds an all-visible map. + maptype = ctypes.c_char * len(world_db["MAP"]) + test = libpr.build_fov_map(t["T_POSY"], t["T_POSX"], + maptype.from_buffer(t["fovmap"]), + maptype.from_buffer(world_db["MAP"])) + if test: + raise SystemExit("Malloc error in build_fov_Map().") + + +def decrement_lifepoints(t): + """Decrement t's lifepoints by 1, and if to zero, corpse it. + + If t is the player avatar, only blank its fovmap, so that the client may + still display memory data. On non-player things, erase fovmap and memory. + """ + t["T_LIFEPOINTS"] -= 1 + if 0 == t["T_LIFEPOINTS"]: + t["T_TYPE"] = world_db["ThingTypes"][t["T_TYPE"]]["TT_CORPSE_ID"] + if world_db["Things"][0] == t: + t["fovmap"] = bytearray(b' ' * (world_db["MAP_LENGTH"] ** 2)) + strong_write(io_db["file_out"], "LOG You die.\n") + else: + t["fovmap"] = False + t["T_MEMMAP"] = False + t["T_MEMDEPTHMAP"] = False + t["T_MEMTHING"] = [] + strong_write(io_db["file_out"], "LOG It dies.\n") + + +def mv_yx_in_dir_legal(dir, y, x): + """Wrapper around libpr.mv_yx_in_dir_legal to simplify its use.""" + dir_c = dir.encode("ascii")[0] + test = libpr.mv_yx_in_dir_legal_wrap(dir_c, y, x) + if -1 == test: + raise SystemExit("Too much wrapping in mv_yx_in_dir_legal_wrap()!") + return (test, libpr.result_y(), libpr.result_x()) def actor_wait(t): @@ -544,7 +584,41 @@ def actor_wait(t): def actor_move(t): - pass + """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"]) + if 1 == move_result[0]: + pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2] + passable = "." == chr(world_db["MAP"][pos]) + hitted = [id for id in world_db["Things"] + if world_db["Things"][id] != t + if world_db["Things"][id]["T_LIFEPOINTS"] + if world_db["Things"][id]["T_POSY"] == move_result[1] + if world_db["Things"][id]["T_POSX"] == move_result[2]] + if len(hitted): + hit_id = hitted[0] + hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"] + hitter = "You" if t == world_db["Things"][0] else hitter_name + hitted_type = world_db["Things"][hit_id]["T_TYPE"] + hitted_name = world_db["ThingTypes"][hitted_type]["TT_NAME"] + hitted = "you" if hit_id == 0 else hitted_name + verb = " wound " if hitter == "You" else " wounds " + strong_write(io_db["file_out"], "LOG " + hitter + verb + hitted + \ + ".\n") + decrement_lifepoints(world_db["Things"][hit_id]) + return + dir = [dir for dir in directions_db + if directions_db[dir] == t["T_ARGUMENT"]][0] + if passable: + t["T_POSY"] = move_result[1] + t["T_POSX"] = move_result[2] + for id in t["T_CARRIES"]: + 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: + strong_write(io_db["file_out"], "LOG You fail to move " + dir + ".\n") def actor_pick_up(t): @@ -598,13 +672,45 @@ def actor_use(t): "you own none.\n") +def thingproliferation(t): + """To chance of 1/TT_PROLIFERATE, create t offspring in neighbor cell. + + Naturally only works with TT_PROLIFERATE > 0. The neighbor cell must be + passable and not be inhabited by a Thing of the same type, or, if Thing is + animate, any other animate Thing. If there are several map cell candidates, + one is selected randomly. + """ + def test_cell(t, y, x): + if "." == chr(world_db["MAP"][(y * world_db["MAP_LENGTH"]) + x]): + for id in [id for id in world_db["Things"] + if y == world_db["Things"][id]["T_POSY"] + if x == world_db["Things"][id]["T_POSX"] + if (t["T_TYPE"] == world_db["Things"][id]["T_TYPE"]) + or (t["T_LIFEPOINTS"] and + world_db["Things"][id]["T_LIFEPOINTS"])]: + return False + return True + return False + prolscore = world_db["ThingTypes"][t["T_TYPE"]]["TT_PROLIFERATE"] + if prolscore and (1 == prolscore or 1 == (rand.next() % prolscore)): + candidates = [] + for dir in [directions_db[key] for key in directions_db]: + mv_result = mv_yx_in_dir_legal(dir, t["T_POSY"], t["T_POSX"]) + if mv_result[0] and test_cell(t, mv_result[1], mv_result[2]): + candidates.append((mv_result[1], mv_result[2])) + if len(candidates): + i = rand.next() % len(candidates) + id = id_setter(-1, "Things") + newT = new_Thing(t["T_TYPE"], (candidates[i][0], candidates[i][1])) + world_db["Things"][id] = newT + + def turn_over(): """Run game world and its inhabitants until new player input expected.""" id = 0 whilebreaker = False while world_db["Things"][0]["T_LIFEPOINTS"]: - for id in [id for id in world_db["Things"] - if world_db["Things"][id]["T_LIFEPOINTS"]]: + for id in [id for id in world_db["Things"]]: Thing = world_db["Things"][id] if Thing["T_LIFEPOINTS"]: if not Thing["T_COMMAND"]: @@ -624,7 +730,7 @@ def turn_over(): Thing["T_COMMAND"] = 0 Thing["T_PROGRESS"] = 0 # DUMMY: hunger - # DUMMY: thingproliferation + thingproliferation(Thing) if whilebreaker: break world_db["TURN"] += 1 @@ -746,10 +852,8 @@ def play_commander(action, args=False): set_command() def set_command_and_argument_movestring(str_arg): - dirs = {"east": "d", "south-east": "c", "south-west": "x", - "west": "s", "north-west": "w", "north-east": "e"} - if str_arg in dirs: - world_db["Things"][0]["T_ARGUMENT"] = dirs[str_arg] + if str_arg in directions_db: + world_db["Things"][0]["T_ARGUMENT"] = directions_db[str_arg] set_command() else: print("Ignoring: Argument must be valid direction string.") @@ -850,12 +954,12 @@ def command_makeworld(seed_string): def command_maplength(maplength_string): """Redefine map length. Invalidate map, therefore lose all things on it.""" - val = integer_test(val_string, 1, 256) + val = integer_test(maplength_string, 1, 256) if None != val: world_db["MAP_LENGTH"] = val set_world_inactive() world_db["Things"] = {} - libpr.set_maplength = val + libpr.set_maplength(val) def command_worldactive(worldactive_string): @@ -1182,6 +1286,9 @@ world_db = { "Things": {} } +"""Mapping of direction names to internal direction chars.""" +directions_db = {"east": "d", "south-east": "c", "south-west": "x", + "west": "s", "north-west": "w", "north-east": "e"} """File IO database.""" io_db = {