X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=2121c75ad2cf15988c240544b10da159e37d0d0c;hb=c19590f615bb7c2482e1e9da91e46f6d1f50fc1a;hp=929edbb94d511322ba755dd0d95ab05532dd2e34;hpb=c7d95b42690e63d02f62cd3be52edd744ccad29c;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index 929edbb..2121c75 100755 --- a/plomrogue-server.py +++ b/plomrogue-server.py @@ -138,8 +138,8 @@ def save_world(): length = world_db["MAP_LENGTH"] for i in range(length): line = map[i * length:(i * length) + length].decode() - string = string + key + " " + str(i) + " " + quote(line) + \ - "\n" + string = string + key + " " + str(i) + " " + quote(line) \ + + "\n" return string return helper @@ -294,20 +294,19 @@ def try_worldstate_update(): length = world_db["MAP_LENGTH"] fov = bytearray(b' ' * (length ** 2)) for pos in range(length ** 2): - fovflag = world_db["Things"][0]["fovmap"][pos] - if 'v' == chr(fovflag): + if 'v' == chr(world_db["Things"][0]["fovmap"][pos]): fov[pos] = world_db["MAP"][pos] for i in range(3): draw_visible_Things(fov, i) string = write_map(string, fov) mem = world_db["Things"][0]["T_MEMMAP"][:] for i in range(2): - for id in world_db["Things"][0]["T_MEMTHING"]: - type = world_db["Things"][id]["T_TYPE"] + for memthing in world_db["Things"][0]["T_MEMTHING"]: + type = world_db["Things"][memthing[0]]["T_TYPE"] consumable = world_db["ThingTypes"][type]["TT_CONSUMABLE"] if (i == 0 and not consumable) or (i == 1 and consumable): - c = world_db["ThingTypes"][type]["TT_SYMBOL"] - mem[(y * length) + x] = ord(c) + c = world_db["ThingTypes"][type]["TT_SYMBOL"] + mem[(memthing[1] * length) + memthing[2]] = ord(c) string = write_map(string, mem) atomic_write(io_db["path_worldstate"], string) strong_write(io_db["file_out"], "WORLD_UPDATED\n") @@ -383,18 +382,18 @@ def update_map_memory(t): t["T_MEMMAP"][pos] = world_db["MAP"][pos] continue # TODO: Aging of MEMDEPTHMAP. - for id in t["T_MEMTHING"]: - y = world_db["Things"][id]["T_POSY"] - x = world_db["Things"][id]["T_POSY"] + for memthing in t["T_MEMTHING"]: + y = world_db["Things"][memthing[0]]["T_POSY"] + x = world_db["Things"][memthing[1]]["T_POSY"] if "v" == chr(t["fovmap"][(y * world_db["MAP_LENGTH"]) + x]): - t["T_MEMTHING"].remove(id) + t["T_MEMTHING"].remove(memthing) for id in world_db["Things"]: type = world_db["Things"][id]["T_TYPE"] if not world_db["ThingTypes"][type]["TT_LIFEPOINTS"]: y = world_db["Things"][id]["T_POSY"] x = world_db["Things"][id]["T_POSY"] if "v" == chr(t["fovmap"][(y * world_db["MAP_LENGTH"]) + x]): - t["T_MEMTHING"] = (type, y, x) + t["T_MEMTHING"].append((type, y, x)) def set_world_inactive(): @@ -450,6 +449,47 @@ def build_fov_map(t): # DUMMY so far. Just builds an all-visible map. +def turn_over(): + """Run game world and its inhabitants until new player input expected.""" + id = 0 + print("turning over") + whilebreaker = False + while world_db["Things"][0]["T_LIFEPOINTS"]: + for id in [id for id in world_db["Things"] + if not world_db["Things"][id]["carried"] + if world_db["Things"][id]["T_LIFEPOINTS"]]: + print(str(id)) + Thing = world_db["Things"][id] + if Thing["T_LIFEPOINTS"]: + print(" evaluating thing") + if not Thing["T_COMMAND"]: + print(" thing needs new command") + update_map_memory(Thing) + if 0 == id: + whilebreaker = True + break + # DUMMY: ai(thing) + print(" run AI") + Thing["T_COMMAND"] = 1 + # DUMMY: try_healing + Thing["T_PROGRESS"] += 1 + taid = [a for a in world_db["ThingActions"] + if a == Thing["T_COMMAND"]][0] + ThingAction = world_db["ThingActions"][taid] + if Thing["T_PROGRESS"] == ThingAction["TA_EFFORT"]: + print(" running thing action") + # run_thing_action(action["TA_NAME"]) + Thing["T_COMMAND"] = 0 + Thing["T_PROGRESS"] = 0 + # DUMMY: hunger + # DUMMY: thingproliferation + if whilebreaker: + break + print(" turn finished") + world_db["TURN"] += 1 + print(" new turn " + str(world_db["TURN"])) + + def new_Thing(type): """Return Thing of type T_TYPE, with fovmap if alive and world active.""" thing = { @@ -518,9 +558,70 @@ def command_quit(): raise SystemExit("received QUIT command") -def command_thingshere(y, x): - # DUMMY - print("Ignoring not-yet implemented THINGS_HERE command.") +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"]: + 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) + length = world_db["MAP_LENGTH"] + if None != y and None != x and y < length and x < length: + pos = (y * world_db["MAP_LENGTH"]) + 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() + else: + for id in world_db["Things"]["T_MEMTHING"]: + write_thing_if_here() + strong_write(io_db["file_out"], "THINGS_HERE END\n") + else: + print("Ignoring: Invalid map coordinates.") + else: + print("Ignoring: Command only works on existing worlds.") + + +def play_commander(action, args=False): + """Setter for player's T_COMMAND and T_ARGUMENT, then calling turn_over(). + + T_ARGUMENT is set to direction char if action=="wait",or 8-bit int if args. + """ + + def set_command(): + id = [x for x in world_db["ThingActions"] + if world_db["ThingActions"][x]["TA_NAME"] == action][0] + world_db["Things"][0]["T_COMMAND"] = id + turn_over() + # TODO: call turn_over() + + def set_command_and_argument_int(str_arg): + val = integer_test(str_arg, 0, 255) + if None != val: + world_db["Things"][0]["T_ARGUMENT"] = val + set_command() + else: + print("Ignoring: Argument must be integer >= 0 <=255.") + + 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] + set_command() + else: + print("Ignoring: Argument must be valid direction string.") + + if action == "move": + return set_command_and_argument_movestring + elif args: + return set_command_and_argument_int + else: + return set_command def command_seedmap(seed_string): @@ -572,8 +673,9 @@ def command_makeworld(seed_string): update_map_memory(world_db["Things"][0]) for type in world_db["ThingTypes"]: for i in range(world_db["ThingTypes"][type]["TT_START_NUMBER"]): - id = id_setter(-1, "Things") - world_db["Things"][id] = new_Thing(playertype) + if type != playertype: + id = id_setter(-1, "Things") + world_db["Things"][id] = new_Thing(type) # TODO: Positioning. strong_write(io_db["file_out"], "NEW_WORLD\n") @@ -750,7 +852,7 @@ def setter_tpos(axis): world_db["Things"][command_tid.id]["T_POS" + axis] = val if world_db["WORLD_ACTIVE"] \ and world_db["Things"][command_tid.id]["T_LIFEPOINTS"]: - build_fov_map( world_db["Things"][command_tid.id]) + build_fov_map(world_db["Things"][command_tid.id]) if 0 == command_tid.id: update_map_memory(world_db["Things"][command_tid.id]) else: @@ -890,6 +992,11 @@ commands_db = { "T_MEMTHING": (3, False, command_tmemthing), "T_POSY": (1, False, setter_tpos("Y")), "T_POSX": (1, False, setter_tpos("X")), + "wait": (0, False, play_commander("wait")), + "move": (1, False, play_commander("move")), + "pick_up": (0, False, play_commander("pick_up")), + "drop": (1, False, play_commander("drop", True)), + "use": (1, False, play_commander("use", True)), } @@ -925,7 +1032,6 @@ io_db = { try: opts = parse_command_line_arguments() setup_server_io() - # print("DUMMY: Run game.") if None != opts.replay: replay_game() else: @@ -937,4 +1043,3 @@ except: raise finally: cleanup_server_io() - # print("DUMMY: (Clean up C heap.)")