X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=server%2Fcommands.py;h=536e330522a6c98e2c8a8d26856049da79db43a9;hb=5cdce6d500080008b097435e2891674c16fde208;hp=a3b68bcc62dfc810e22035e06d3b3a5eb0fe8771;hpb=3cfb2d131e570c546d8ed514b0930248a89db41b;p=plomrogue diff --git a/server/commands.py b/server/commands.py index a3b68bc..536e330 100644 --- a/server/commands.py +++ b/server/commands.py @@ -7,16 +7,18 @@ from server.config.world_data import world_db from server.config.io import io_db from server.io import log, strong_write from server.utils import integer_test, id_setter -from server.world import build_fov_map, update_map_memory, set_world_inactive,\ - turn_over +from server.world import set_world_inactive, turn_over +from server.update_map_memory import update_map_memory +from server.build_fov_map import build_fov_map def command_plugin(str_plugin): """Run code in plugins/[str_plugin].""" import os if (str_plugin.replace("_", "").isalnum() - and os.access("plugins/server/" + str_plugin, os.F_OK)): - exec(open("plugins/server/" + str_plugin).read()) + and os.access("plugins/server/" + str_plugin + ".py", os.F_OK)): + exec(open("plugins/server/" + str_plugin + ".py").read()) + world_db["PLUGIN"] += [str_plugin] return print("Bad plugin name:", str_plugin) @@ -47,13 +49,15 @@ def command_thingshere(str_y, str_x): 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") + terrain = chr(world_db["Things"][0]["T_MEMMAP"][pos]) + terrain_name = world_db["terrain_names"][terrain] + strong_write(io_db["file_out"], "terrain: " + terrain_name + "\n") if "v" == chr(world_db["Things"][0]["fovmap"][pos]): for id in [id for tid in sorted(list(world_db["ThingTypes"])) for id in world_db["Things"] if not world_db["Things"][id]["carried"] if world_db["Things"][id]["T_TYPE"] == tid - if y == world_db["Things"][id]["T_POSY"] - if x == world_db["Things"][id]["T_POSX"]]: + if pos == world_db["Things"][id]["pos"]]: type = world_db["Things"][id]["T_TYPE"] name = world_db["ThingTypes"][type]["TT_NAME"] strong_write(io_db["file_out"], name + "\n") @@ -82,7 +86,7 @@ def command_makeworld(seed_string): """Call make_world().""" val = integer_test(seed_string, 0, 4294967295) if None != val: - from server.world import make_world + from server.make_world import make_world make_world(val) @@ -113,28 +117,33 @@ def command_worldactive(worldactive_string): else: print("World already active.") elif 0 == world_db["WORLD_ACTIVE"]: - wait_exists = False for ThingAction in world_db["ThingActions"]: if "wait" == world_db["ThingActions"][ThingAction]["TA_NAME"]: - wait_exists = True break - player_exists = False + else: + print("Ignored: No wait action defined for world to activate.") + return for Thing in world_db["Things"]: if 0 == Thing: - player_exists = True break - if wait_exists and player_exists and world_db["MAP"]: - for id in world_db["Things"]: - if world_db["Things"][id]["T_LIFEPOINTS"]: - build_fov_map(world_db["Things"][id]) - if 0 == id: - update_map_memory(world_db["Things"][id], False) - if not world_db["Things"][0]["T_LIFEPOINTS"]: - empty_fovmap = bytearray(b" " * world_db["MAP_LENGTH"] ** 2) - world_db["Things"][0]["fovmap"] = empty_fovmap - world_db["WORLD_ACTIVE"] = 1 else: - print("Ignoring: Not all conditions for world activation met.") + print("Ignored: No player defined for world to activate.") + return + if not world_db["MAP"]: + print("Ignoring: No map defined for world to activate.") + return + from server.config.commands import command_worldactive_test_hook + if not command_worldactive_test_hook(): + return + for tid in world_db["Things"]: + if world_db["Things"][tid]["T_LIFEPOINTS"]: + build_fov_map(world_db["Things"][tid]) + if 0 == tid: + update_map_memory(world_db["Things"][tid], False) + if not world_db["Things"][0]["T_LIFEPOINTS"]: + empty_fovmap = bytearray(b" " * world_db["MAP_LENGTH"] ** 2) + world_db["Things"][0]["fovmap"] = empty_fovmap + world_db["WORLD_ACTIVE"] = 1 def command_tid(id_string): @@ -142,34 +151,28 @@ def command_tid(id_string): Default new Thing's type to the first available ThingType, others: zero. """ - id = id_setter(id_string, "Things", command_tid) - if None != id: + tid = id_setter(id_string, "Things", command_tid) + if None != tid: if world_db["ThingTypes"] == {}: print("Ignoring: No ThingType to settle new Thing in.") return - type = list(world_db["ThingTypes"].keys())[0] - from server.world import new_Thing - world_db["Things"][id] = new_Thing(type) + ty = list(world_db["ThingTypes"].keys())[0] + from server.new_thing import new_Thing + world_db["Things"][tid] = new_Thing(ty) def command_ttid(id_string): """Set ID of ThingType to manipulate. ID unused? Create new one. - Default new ThingType's TT_SYMBOL to "?", TT_CORPSE_ID to self, TT_TOOL to - "", others: 0. + Set new type's TT_CORPSE_ID to self, other fields to thingtype_defaults. """ - id = id_setter(id_string, "ThingTypes", command_ttid) - if None != id: - world_db["ThingTypes"][id] = { - "TT_NAME": "(none)", - "TT_TOOLPOWER": 0, - "TT_LIFEPOINTS": 0, - "TT_PROLIFERATE": 0, - "TT_START_NUMBER": 0, - "TT_SYMBOL": "?", - "TT_CORPSE_ID": id, - "TT_TOOL": "" - } + ttid = id_setter(id_string, "ThingTypes", command_ttid) + if None != ttid: + from server.config.world_data import thingtype_defaults + world_db["ThingTypes"][ttid] = {} + for key in thingtype_defaults: + world_db["ThingTypes"][ttid][key] = thingtype_defaults[key] + world_db["ThingTypes"][ttid]["TT_CORPSE_ID"] = ttid def command_taid(id_string): @@ -177,9 +180,9 @@ def command_taid(id_string): Default new ThingAction's TA_EFFORT to 1, its TA_NAME to "wait". """ - id = id_setter(id_string, "ThingActions", command_taid, True) - if None != id: - world_db["ThingActions"][id] = { + taid = id_setter(id_string, "ThingActions", command_taid, True) + if None != taid: + world_db["ThingActions"][taid] = { "TA_EFFORT": 1, "TA_NAME": "wait" } @@ -308,16 +311,13 @@ def command_taname(name): or name == "pickup": world_db["ThingActions"][command_taid.id]["TA_NAME"] = name if 1 == world_db["WORLD_ACTIVE"]: - wait_defined = False for id in world_db["ThingActions"]: if "wait" == world_db["ThingActions"][id]["TA_NAME"]: - wait_defined = True break - if not wait_defined: + else: set_world_inactive() else: print("Ignoring: Invalid action name.") - # In contrast to the original,naming won't map a function to a ThingAction. def setter(category, key, min, max=None): @@ -402,7 +402,9 @@ def setter_tpos(axis): val = integer_test(str_int, 0, 255) if None != val: if val < world_db["MAP_LENGTH"]: - world_db["Things"][command_tid.id]["T_POS" + axis] = val + t = world_db["Things"][command_tid.id] + t["T_POS" + axis] = val + t["pos"] = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"] if world_db["WORLD_ACTIVE"] \ and world_db["Things"][command_tid.id]["T_LIFEPOINTS"]: build_fov_map(world_db["Things"][command_tid.id]) @@ -439,13 +441,13 @@ def play_pickup(): """Try "pickup" as player's T_COMMAND".""" if action_exists("pickup"): t = world_db["Things"][0] - ids = [id for id in world_db["Things"] if id - 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"]] + ids = [tid for tid in world_db["Things"] if tid + if not world_db["Things"][tid]["carried"] + if world_db["Things"][tid]["pos"] == t["pos"]] + from server.config.commands import play_pickup_attempt_hook if not len(ids): log("NOTHING to pick up.") - else: + elif play_pickup_attempt_hook(t): set_command("pickup") @@ -473,10 +475,13 @@ def play_use(str_arg): else: val = integer_test(str_arg, 0, 255) if None != val and val < len(t["T_CARRIES"]): - id = t["T_CARRIES"][val] - type = world_db["Things"][id]["T_TYPE"] - if not world_db["ThingTypes"][type]["TT_TOOL"] == "food": - log("You CAN'T consume this thing.") + tid = t["T_CARRIES"][val] + tt = world_db["ThingTypes"][world_db["Things"][tid]["T_TYPE"]] + from server.config.commands import play_use_attempt_hook + hook_test = play_use_attempt_hook(t, tt) + if not (tt["TT_TOOL"] == "food" or hook_test): + if hook_test != False: + log("You CAN'T use this thing.") return world_db["Things"][0]["T_ARGUMENT"] = val set_command("use") @@ -487,18 +492,24 @@ def play_use(str_arg): def play_move(str_arg): """Try "move" as player's T_COMMAND, str_arg as T_ARGUMENT / direction.""" if action_exists("move"): - from server.config.world_data import directions_db + from server.config.world_data import directions_db, symbols_passable t = world_db["Things"][0] if not str_arg in directions_db: print("Illegal move direction string.") return - dir = ord(directions_db[str_arg]) + d = ord(directions_db[str_arg]) from server.utils import mv_yx_in_dir_legal - move_result = mv_yx_in_dir_legal(chr(dir), t["T_POSY"], t["T_POSX"]) + move_result = mv_yx_in_dir_legal(chr(d), t["T_POSY"], t["T_POSX"]) if 1 == move_result[0]: pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2] - if ord(".") == world_db["MAP"][pos]: - world_db["Things"][0]["T_ARGUMENT"] = dir + if ord("~") == world_db["MAP"][pos]: + log("You can't SWIM.") + return + from server.config.commands import play_move_attempt_hook + if play_move_attempt_hook(t, d, pos): + return + if chr(world_db["MAP"][pos]) in symbols_passable: + world_db["Things"][0]["T_ARGUMENT"] = d set_command("move") return log("You CAN'T move there.")