X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plugins%2Fserver%2FPleaseTheIslandGod.py;h=7f785ddfd2f02e144af122a2841f3487fd34be17;hb=96ae4658e929cddfb36549484c532674a2867f0e;hp=2779847b831a3fe0e60c44f01e8a921d64265865;hpb=8187ea4f2fb0c07fd141886a418e3b985f663035;p=plomrogue diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py index 2779847..7f785dd 100644 --- a/plugins/server/PleaseTheIslandGod.py +++ b/plugins/server/PleaseTheIslandGod.py @@ -103,8 +103,8 @@ def actor_use_attempts_hook(t, ty): "It glows in wondrous colors, and emits a sound as if from a d" "ying cat. The Island God laughs.\n") t["T_LIFEPOINTS"] = 1 - from server.config.misc import decrement_lifepoints_func - decrement_lifepoints_func(t) + from server.config.misc import decrement_lifepoints + decrement_lifepoints(t) elif (world_db["ThingTypes"][ty]["TT_TOOL"] == "carpentry"): pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"] if (world_db["MAP"][pos] == ord("X") @@ -300,108 +300,43 @@ def actor_move_attempts_hook(t, move_result, pos): return False def decrement_lifepoints(t): - t["T_LIFEPOINTS"] -= 1 + from server.decrement_lifepoints import decrement_lifepoints live_tid = t["T_TYPE"] - _id = [_id for _id in world_db["Things"] if world_db["Things"][_id] == t][0] - if 0 == t["T_LIFEPOINTS"]: - for id in t["T_CARRIES"]: - t["T_CARRIES"].remove(id) - world_db["Things"][id]["T_POSY"] = t["T_POSY"] - world_db["Things"][id]["T_POSX"] = t["T_POSX"] - world_db["Things"][id]["carried"] = False - 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)) - log("You die.") - log("See README on how to start over.") - else: - t["fovmap"] = False - t["T_MEMMAP"] = False - t["T_MEMDEPTHMAP"] = False - t["T_MEMTHING"] = [] - n_species = len([id for id in world_db["Things"] - if world_db["Things"][id]["T_TYPE"] == live_tid]) - if 0 == n_species: - from server.new_thing import new_Thing - if world_db["FAVOR_STAGE"] >= 3 and \ + test = decrement_lifepoints(t) + if test > 0 and t != world_db["Things"][0]: + n_species = len([tid for tid in world_db["Things"] + if world_db["Things"][tid]["T_TYPE"] == live_tid]) + if 0 == n_species: + from server.new_thing import new_Thing + if world_db["FAVOR_STAGE"] >= 3 and \ live_tid == world_db["ANIMAL_0"]: - world_db["GOD_FAVOR"] += 3000 - log("CONGRATULATIONS! The " - + world_db["ThingTypes"][live_tid]["TT_NAME"] - + " species has died out. The Island God is pleased.") - else: - id = id_setter(-1, "Things") - world_db["Things"][id] = new_Thing(live_tid, - world_db["altar"]) - log("The " - + world_db["ThingTypes"][live_tid]["TT_NAME"] - + " species has temporarily died out. " - + "One new-born is spawned at the altar.") - return world_db["ThingTypes"][live_tid]["TT_LIFEPOINTS"] - return 0 - -def command_ttid(id_string): - 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_STORAGE": 0, - "TT_SYMBOL": "?", - "TT_CORPSE_ID": id, - "TT_TOOL": "" - } - -def command_worldactive(worldactive_string): - val = integer_test(worldactive_string, 0, 1) - if None != val: - if 0 != world_db["WORLD_ACTIVE"]: - if 0 == val: - set_world_inactive() - else: - print("World already active.") - elif 0 == world_db["WORLD_ACTIVE"]: - for ThingAction in world_db["ThingActions"]: - if "wait" == world_db["ThingActions"][ThingAction]["TA_NAME"]: - break - else: - print("Ignored: No wait action defined for world to activate.") - return - for Thing in world_db["Things"]: - if 0 == Thing: - break - else: - print("Ignored: No player defined for world to activate.") - return - if world_db["MAP"]: - pos = world_db["MAP"].find(b'_') - if pos > 0: - y = int(pos / world_db["MAP_LENGTH"]) - x = pos % world_db["MAP_LENGTH"] - world_db["altar"] = (y, x) - else: - print("Ignored: No altar defined for world to activate.") - return + world_db["GOD_FAVOR"] += 3000 + log("CONGRATULATIONS! The " + + world_db["ThingTypes"][live_tid]["TT_NAME"] + + " species has died out. The Island God is pleased.") else: - print("Ignored: No map defined for world to activate.") - return - for name in world_db["specials"]: - if world_db[name] not in world_db["ThingTypes"]: - print("Ignored: Not all specials set for world to " - "activate.") - return - 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 + tid = id_setter(-1, "Things") + world_db["Things"][tid] = new_Thing(live_tid, + world_db["altar"]) + log("The " + world_db["ThingTypes"][live_tid]["TT_NAME"] + " s" + "pecies has temporarily died out. One new-born is spawned " + "at the altar.") + return test + +def command_worldactive_test_hook(): + pos = world_db["MAP"].find(b'_') + if pos > 0: + y = int(pos / world_db["MAP_LENGTH"]) + x = pos % world_db["MAP_LENGTH"] + world_db["altar"] = (y, x) + else: + print("Ignored: No altar defined for world to activate.") + return False + for name in world_db["specials"]: + if world_db[name] not in world_db["ThingTypes"]: + print("Ignored: Not all specials set for world to activate.") + return False + return True def play_move(str_arg): if action_exists("move"): @@ -605,8 +540,9 @@ io_db["worldstate_write_order"] += [[write_metamap_B, "func"]] import server.config.world_data server.config.world_data.symbols_passable += ":_" -from server.config.world_data import thing_defaults +from server.config.world_data import thing_defaults, thingtype_defaults thing_defaults["T_PLAYERDROP"] = 0 +thingtype_defaults["TT_STORAGE"] = 0 import server.config.actions server.config.actions.action_db["actor_move"] = actor_move @@ -617,11 +553,9 @@ server.config.actions.actor_use_attempts_hook = actor_use_attempts_hook server.config.actions.actor_move_attempts_hook = actor_move_attempts_hook from server.config.commands import commands_db -commands_db["TT_ID"] = (1, False, command_ttid) commands_db["GOD_FAVOR"] = (1, False, setter(None, "GOD_FAVOR", -32768, 32767)) commands_db["TT_STORAGE"] = (1, False, setter("ThingType", "TT_STORAGE", 0, 255)) commands_db["T_PLAYERDROP"] = (1, False, setter("Thing", "T_PLAYERDROP", 0, 1)) -commands_db["WORLD_ACTIVE"] = (1, False, command_worldactive) commands_db["FAVOR_STAGE"] = (1, False, setter(None, "FAVOR_STAGE", 0, 1)) commands_db["SLIPPERS"] = (1, False, specialtypesetter("SLIPPERS")) commands_db["TOOL_0"] = (1, False, specialtypesetter("TOOL_0")) @@ -635,10 +569,13 @@ commands_db["EMPATHY"] = (1, False, setter(None, "EMPATHY", 0, 1)) commands_db["use"] = (1, False, play_use) commands_db["move"] = (1, False, play_move) commands_db["pickup"] = (0, False, play_pickup) +import server.config.commands +server.config.commands.command_worldactive_test_hook = \ + command_worldactive_test_hook import server.config.misc server.config.misc.make_map_func = make_map -server.config.misc.decrement_lifepoints_func = decrement_lifepoints +server.config.misc.decrement_lifepoints = decrement_lifepoints server.config.misc.calc_effort_func = calc_effort import server.config.make_world_helpers