X-Git-Url: https://plomlompom.com/repos/?p=plomrogue;a=blobdiff_plain;f=plugins%2Fserver%2FPleaseTheIslandGod.py;h=a4238e555d36dcabe034cd6e8663c7bdacad3429;hp=e54e32257b7bc1eeacf7644ee79dee69aa17d93f;hb=65c57618b95b9111b07f8fbc4c38c99d942a272a;hpb=0ba8f0d73efe88bb1d99d973fdbec420465e447c diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py index e54e322..a4238e5 100644 --- a/plugins/server/PleaseTheIslandGod.py +++ b/plugins/server/PleaseTheIslandGod.py @@ -110,12 +110,12 @@ def thingproliferation(t, prol_map): if (world_db["FAVOR_STAGE"] > 0 and t["T_TYPE"] == world_db["PLANT_0"]): world_db["GOD_FAVOR"] += 5 - #elif t["T_TYPE"] == world_db["PLANT_1"]; - # world_db["GOD_FAVOR"] += 25 - #elif world_db["FAVOR_STAGE"] >= 4 and \ - # t["T_TYPE"] == world_db["ANIMAL_1"]: - # log("The Island God SMILES upon a new-born bear baby.") - # world_db["GOD_FAVOR"] += 750 + elif t["T_TYPE"] == world_db["PLANT_1"]: + world_db["GOD_FAVOR"] += 25 + elif world_db["FAVOR_STAGE"] >= 4 and \ + t["T_TYPE"] == world_db["ANIMAL_1"]: + log("The Island God SMILES upon a new-born bear baby.") + world_db["GOD_FAVOR"] += 750 def make_map(): global rand @@ -252,7 +252,7 @@ def actor_pickup(t): if t == world_db["Things"][0]: log("You PICK UP an object.") elif t == world_db["Things"][0]: - log("Can't pick up object: No storage room to carry more.") + log("CAN'T pick up object: No storage room to carry more.") def actor_drop(t): @@ -272,9 +272,9 @@ def actor_use(t): type = world_db["Things"][id]["T_TYPE"] if type == world_db["SLIPPERS"]: if t == world_db["Things"][0]: - log("You use the " + world_db["ThingTypes"][type]["TT_NAME"] - + ". It glows in wondrous colors, and emits a sound as if " - + "from a dying cat. The Island God laughs.\n") + log("You use the " + world_db["ThingTypes"][type]["TT_NAME"] + + ". It glows in wondrous colors, and emits a sound as if fr" + "om a dying cat. The Island God laughs.\n") t["T_LIFEPOINTS"] = 1 from server.config.misc import decrement_lifepoints_func decrement_lifepoints_func(t) @@ -301,22 +301,27 @@ def actor_use(t): del world_db["Things"][wood_id] world_db["MAP"][pos] = ord("|") log("With your " + world_db["ThingTypes"][type]["TT_NAME"] - + " you build a wooden barrier from your " + + " you build a WOODEN BARRIER from your " + world_db["ThingTypes"][type_material]["TT_NAME"] + ".") + elif world_db["ThingTypes"][type]["TT_TOOL"] == "fertilizer": + pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"] + if world_db["MAP"][pos] == ord("."): + log("You create SOIL.") + world_db["MAP"][pos] = ord(":") elif world_db["ThingTypes"][type]["TT_TOOL"] == "food": t["T_CARRIES"].remove(id) del world_db["Things"][id] t["T_SATIATION"] += world_db["ThingTypes"][type]["TT_TOOLPOWER"] if t == world_db["Things"][0]: - log("You CONSUME this object.") + log("You CONSUME this thing.") elif t == world_db["Things"][0]: log("You try to use this object, but FAIL.") def decrement_lifepoints(t): t["T_LIFEPOINTS"] -= 1 + live_type = t["T_TYPE"] _id = [_id for _id in world_db["Things"] if world_db["Things"][_id] == t][0] if 0 == t["T_LIFEPOINTS"]: - sadness = world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"] for id in t["T_CARRIES"]: t["T_CARRIES"].remove(id) world_db["Things"][id]["T_POSY"] = t["T_POSY"] @@ -332,11 +337,90 @@ def decrement_lifepoints(t): t["T_MEMMAP"] = False t["T_MEMDEPTHMAP"] = False t["T_MEMTHING"] = [] - return sadness + n_species = len([id for id in world_db["Things"] + if world_db["Things"][id]["T_TYPE"] == live_type]) + if 0 == n_species: + from server.new_thing import new_Thing + if world_db["FAVOR_STAGE"] >= 3 and \ + live_type == world_db["ANIMAL_0"]: + world_db["GOD_FAVOR"] += 3000 + log("CONGRATULATIONS! The " + + world_db["ThingTypes"][live_type]["TT_NAME"] + + " species has died out. The Island God is pleased.") + else: + id = id_setter(-1, "Things") + world_db["Things"][id] = new_Thing(live_type, + world_db["altar"]) + log("The " + + world_db["ThingTypes"][live_type]["TT_NAME"] + + " species has temporarily died out. " + + "One new-born is spawned at the altar.") + return world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"] return 0 def actor_move(t): + def altar_msg_wait(limit): + log("The Island God will talk again when it favors you to >=" + + str(limit) + " points.") + + altar_msg_0 = "The Island God speaks to you: \"I don't trust you. You in" \ + "trude on the island's affairs. I think you're a nuisance at best, and a" \ + " danger to my children at worst. I will give you a chance to lighten my" \ + " mood, however: For a while now, I've been trying to spread the plant " \ + + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_NAME"] + " (\"" + \ + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_SYMBOL"] + "\"). I have " \ + "not been very successful so far. Maybe you can make yourself useful the" \ + "re. I will count each further " + \ + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_NAME"] + " that grows to" \ + " your favor.\"" + + altar_msg_1 = "The Island God speaks to you: \"You could have done worse" \ + " so far. Maybe you are not the worst to happen to this island since the" \ + " metal birds threw the great lightning ball. Maybe you can help me spre" \ + "ad another plant. It multiplies faster,and it is highly nutritious: " + \ + world_db["ThingTypes"][world_db["PLANT_1"]]["TT_NAME"] + " (\"" + \ + world_db["ThingTypes"][world_db["PLANT_1"]]["TT_SYMBOL"] + "\"). It is n" \ + "ew. I give you the only example. Be very careful with it! I also give y" \ + "ou another tool that may be helpful.\"" + + altar_msg_2 = "The Island God speaks to you: \"I am greatly disappointed" \ + " that you lost all " + \ + world_db["ThingTypes"][world_db["PLANT_1"]]["TT_NAME"] + " this island h" \ + "ad. Here is another one. It cost me great work. Be more careful this ti" \ + "me when planting it.\"" + + altar_msg_3 = "The Island God speaks to you: \"The " + \ + world_db["ThingTypes"][world_db["ANIMAL_0"]]["TT_NAME"] + " has lately b" \ + "ecome a pest. These creatures do not please me as much as they used to " \ + "do. Exterminate them all. I will count each kill to your favor. To help" \ + " you with the hunting, I grant you the empathy and knowledge to read an" \ + "imals.\"" + + altar_msg_4 = "You will now see animals' health bars, and activities (\"" \ + "m\": moving (maybe for an attack), \"u\": eating, \"p\": picking someth" \ + "ing up; no letter: waiting)." + + altar_msg_5 = "The Island God speaks to you: \"You know what animal I fi" \ + "nd the cutest? The " + \ + world_db["ThingTypes"][world_db["ANIMAL_1"]]["TT_NAME"] + "! I think wha" \ + "t this islands clearly needs more of is " + \ + world_db["ThingTypes"][world_db["ANIMAL_1"]]["TT_NAME"] + "s. Why don't " \ + "you help? Support them. Make sure they are well, and they will multiply" \ + " faster. From now on, I will count each new-born " + \ + world_db["ThingTypes"][world_db["ANIMAL_1"]]["TT_NAME"] + \ + " (not spawned by me due to undo an extinction event) greatly to your fa" \ + "vor. To help you with the feeding, here is something to make the ground" \ + " bear more consumables." + + altar_msg_6 = "The Island God speaks to you: \"You have proven yourself " \ + "worthy of my respect. You were a good citizen to the island, and someti" \ + "mes a better steward to its inhabitants than me. The island shall miss " \ + "you when you leave. But you have earned the right to do so. Take this" + \ + world_db["ThingTypes"][world_db["SLIPPERS"]]["TT_NAME"] + " and USE it w" \ + "hen you please. It will take you to where you came from. (But do feel f" \ + "ree to stay here as long as you like.)\"" + def enter_altar(): from server.new_thing import new_Thing if world_db["FAVOR_STAGE"] > 9000: @@ -345,29 +429,47 @@ def actor_move(t): log("YOU ENTER SACRED GROUND.") if world_db["FAVOR_STAGE"] == 0: world_db["FAVOR_STAGE"] = 1 - log("The Island God speaks to you: \"I don't trust you. You intrud" - + "e on the island's affairs. I think you're a nuisance at be" - + "st, and a danger to my children at worst. I will give you " - + "a chance to lighten my mood, however: For a while now, I'v" - + "e been trying to spread the plant " - + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_NAME"] - + " (\"" - + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_SYMBOL"] - + "\"). I have not been very successful so far. Maybe you can" - + " make yourself useful there. I will count each further " - + world_db["ThingTypes"][world_db["PLANT_0"]]["TT_NAME"] - + " that grows to your favor.\"") - elif world_db["GOD_FAVOR"] > 150: + log(altar_msg_0) + elif world_db["FAVOR_STAGE"] == 1 and world_db["GOD_FAVOR"] < 100: + altar_msg_wait(100) + elif world_db["FAVOR_STAGE"] == 1 and world_db["GOD_FAVOR"] >= 100: + world_db["FAVOR_STAGE"] = 2 + log(altar_msg_2) + id = id_setter(-1, "Things") + world_db["Things"][id] = new_Thing(world_db["PLANT_1"], + world_db["altar"]) + id = id_setter(-1, "Things") + world_db["Things"][id] = new_Thing(world_db["TOOL_0"], + world_db["altar"]) + elif world_db["FAVOR_STAGE"] == 2 and \ + 0 == len([id for id in world_db["Things"] + if world_db["Things"][id]["T_TYPE"] + == world_db["PLANT_1"]]): + log(altar_msg_2) + id = id_setter(-1, "Things") + world_db["Things"][id] = new_Thing(world_db["PLANT_1"], + world_db["altar"]) + world_db["GOD_FAVOR"] -= 250 + elif world_db["FAVOR_STAGE"] == 2 and world_db["GOD_FAVOR"] < 500: + altar_msg_wait(500) + elif world_db["FAVOR_STAGE"] == 2 and world_db["GOD_FAVOR"] >= 500: + world_db["FAVOR_STAGE"] = 3 + log(altar_msg_3) + log(altar_msg_4) + world_db["EMPATHY"] = 1 + elif world_db["FAVOR_STAGE"] == 3 and world_db["GOD_FAVOR"] < 5000: + altar_msg_wait(5000) + elif world_db["FAVOR_STAGE"] == 3 and world_db["GOD_FAVOR"] >= 5000: + world_db["FAVOR_STAGE"] = 4 + log(altar_msg_5) + id = id_setter(-1, "Things") + world_db["Things"][id] = new_Thing(world_db["TOOL_1"], + world_db["altar"]) + elif world_db["GOD_FAVOR"] < 20000: + altar_msg_wait(20000) + elif world_db["GOD_FAVOR"] > 20000: world_db["FAVOR_STAGE"] = 9001 - log("The Island God speaks to you: \"You have proven yourself wort" - + "hy of my respect. You were a good citizen to the island, a" - + "nd sometimes a better steward to its inhabitants than me. " - + "The island shall miss you when you leave. But you have ear" - + "ned the right to do so. Take this " - + world_db["ThingTypes"][world_db["SLIPPERS"]]["TT_NAME"] - + " and USE it when you please. It will take you to where you" - + " came from. (But do feel free to stay here as long as you " - + "like.)\"") + log(altar_msg_6) id = id_setter(-1, "Things") world_db["Things"][id] = new_Thing(world_db["SLIPPERS"], world_db["altar"]) @@ -388,8 +490,8 @@ def actor_move(t): if world_db["Things"][id]["T_POSX"] == move_result[2]] if len(hitted): hit_id = hitted[0] + hitted_type = world_db["Things"][hit_id]["T_TYPE"] if t == world_db["Things"][0]: - hitted_type = world_db["Things"][hit_id]["T_TYPE"] hitted_name = world_db["ThingTypes"][hitted_type]["TT_NAME"] log("You WOUND " + hitted_name + ".") world_db["GOD_FAVOR"] -= 1 @@ -397,8 +499,11 @@ def actor_move(t): hitter_name = world_db["ThingTypes"][t["T_TYPE"]]["TT_NAME"] log(hitter_name +" WOUNDS you.") test = decrement_lifepoints_func(world_db["Things"][hit_id]) - if test and t == world_db["Things"][0]: - world_db["GOD_FAVOR"] -= test + if test and world_db["FAVOR_STAGE"] >= 3 and \ + hitted_type == world_db["ANIMAL_0"]: + world_db["GOD_FAVOR"] += 125 + elif test and t == world_db["Things"][0]: + world_db["GOD_FAVOR"] -= 2 * test return if (ord("X") == world_db["MAP"][pos] or ord("|") == world_db["MAP"][pos]): @@ -424,7 +529,8 @@ def actor_move(t): 0 == int(rand.next() / (3 * chop_power))))): if t == world_db["Things"][0]: log("You chop it DOWN.") - world_db["GOD_FAVOR"] -= 10 + if ord("X") == world_db["MAP"][pos]: + world_db["GOD_FAVOR"] -= 10 world_db["MAP"][pos] = ord(".") i = 3 if case_X else 1 for i in range(i): @@ -474,41 +580,44 @@ 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 - altar_found = False + 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) - altar_found = True - specials_set = True + else: + print("Ignored: No altar defined for world to activate.") + return + 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"]: - specials_set = False - if altar_found and wait_exists and player_exists and \ - world_db["MAP"] and specials_set: - 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: 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 def play_move(str_arg): if action_exists("move"): @@ -553,20 +662,20 @@ def play_use(str_arg): if (world_db["ThingTypes"][type]["TT_TOOL"] == "axe" and t == world_db["Things"][0]): log("To use this item for chopping, move towards a tree " - + "while carrying it in your inventory.") + "while carrying it in your inventory.") return elif (world_db["ThingTypes"][type]["TT_TOOL"] == "carpentry"): pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"] if (world_db["MAP"][pos] == ord("X") or world_db["MAP"][pos] == ord("|")): - log("Can't build when standing on barrier.") + log("CAN'T build when standing on barrier.") return for id in [id for id in world_db["Things"] if not world_db["Things"][id] == t 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"]]: - log("Can't build when standing objects.") + log("CAN'T build when standing objects.") return wood_id = None for id in t["T_CARRIES"]: @@ -576,10 +685,18 @@ def play_use(str_arg): wood_id = id break if wood_id == None: - log("You can't use a " + log("You CAN'T use a " + world_db["ThingTypes"][type]["TT_NAME"] + " without some wood in your inventory.") return + elif world_db["ThingTypes"][type]["TT_TOOL"] == "fertilizer": + pos = t["T_POSY"] * world_db["MAP_LENGTH"] + t["T_POSX"] + if not world_db["MAP"][pos] == ord("."): + log("Can only make soil out of NON-SOIL earth.") + return + elif world_db["ThingTypes"][type]["TT_TOOL"] == "wood": + log("To use wood, you NEED a carpentry tool.") + return elif type != world_db["SLIPPERS"] and not \ world_db["ThingTypes"][type]["TT_TOOL"] == "food": log("You CAN'T consume this thing.") @@ -589,7 +706,7 @@ def play_use(str_arg): else: print("Illegal inventory index.") -def specialtypesetter(name): # # +def specialtypesetter(name): def helper(str_int): val = integer_test(str_int, 0) if None != val: @@ -600,6 +717,86 @@ def specialtypesetter(name): # # print(name + " fits no known ThingType, deactivating world.") return helper +def write_metamap_A(): + from server.worldstate_write_helpers import write_map + ord_v = ord("v") + length = world_db["MAP_LENGTH"] + metamapA = bytearray(b'0' * (length ** 2)) + for id in [id for id in world_db["Things"] + if not world_db["Things"][id]["carried"] + if world_db["Things"][id]["T_LIFEPOINTS"] + if world_db["Things"][0]["fovmap"][ + world_db["Things"][id]["T_POSY"] * length + + world_db["Things"][id]["T_POSX"]] == ord_v]: + pos = (world_db["Things"][id]["T_POSY"] * length + + world_db["Things"][id]["T_POSX"]) + if id == 0 or world_db["EMPATHY"]: + type = world_db["Things"][id]["T_TYPE"] + max_hp = world_db["ThingTypes"][type]["TT_LIFEPOINTS"] + third_of_hp = max_hp / 3 + hp = world_db["Things"][id]["T_LIFEPOINTS"] + add = 0 + if hp > 2 * third_of_hp: + add = 2 + elif hp > third_of_hp: + add = 1 + metamapA[pos] = ord('a') + add + else: + metamapA[pos] = ord('X') + for mt in world_db["Things"][0]["T_MEMTHING"]: + pos = mt[1] * length + mt[2] + if metamapA[pos] < ord('2'): + metamapA[pos] += 1 + return write_map(metamapA, length) + +def write_metamap_B(): + from server.worldstate_write_helpers import write_map + ord_v = ord("v") + length = world_db["MAP_LENGTH"] + metamapB = bytearray(b' ' * (length ** 2)) + for id in [id for id in world_db["Things"] + if not world_db["Things"][id]["carried"] + if world_db["Things"][id]["T_LIFEPOINTS"] + if world_db["Things"][0]["fovmap"][ + world_db["Things"][id]["T_POSY"] * length + + world_db["Things"][id]["T_POSX"]] == ord_v]: + pos = (world_db["Things"][id]["T_POSY"] * length + + world_db["Things"][id]["T_POSX"]) + if id == 0 or world_db["EMPATHY"]: + action = world_db["Things"][id]["T_COMMAND"] + if 0 != action: + name = world_db["ThingActions"][action]["TA_NAME"] + else: + name = " " + metamapB[pos] = ord(name[0]) + return write_map(metamapB, length) + +def calc_effort(thing_action, thing): + from math import sqrt + effort = thing_action["TA_EFFORT"] + if thing_action["TA_NAME"] == "move": + typ = thing["T_TYPE"] + max_hp = (world_db["ThingTypes"][typ]["TT_LIFEPOINTS"]) + effort = int(effort / sqrt(max_hp)) + effort = 1 if effort == 0 else effort + return effort + +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"]] + if not len(ids): + log("NOTHING to pick up.") + elif len(t["T_CARRIES"]) >= world_db["ThingTypes"][t["T_TYPE"]] \ + ["TT_STORAGE"]: + log("CAN'T pick up: No storage room to carry anything more.") + else: + set_command("pickup") + strong_write(io_db["file_out"], "PLUGIN PleaseTheIslandGod\n") if not "GOD_FAVOR" in world_db: @@ -610,10 +807,28 @@ if not "SLIPPERS" in world_db: world_db["SLIPPERS"] = 0 if not "PLANT_0" in world_db: world_db["PLANT_0"] = 0 +if not "PLANT_1" in world_db: + world_db["PLANT_1"] = 0 +if not "ANIMAL_0" in world_db: + world_db["ANIMAL_0"] = 0 +if not "ANIMAL_1" in world_db: + world_db["ANIMAL_1"] = 0 +if not "TOOL_0" in world_db: + world_db["TOOL_0"] = 0 +if not "TOOL_1" in world_db: + world_db["TOOL_1"] = 0 if not "LUMBER" in world_db: world_db["LUMBER"] = 0 -world_db["specials"] = ["SLIPPERS", "PLANT_0", "LUMBER"] +if not "EMPATHY" in world_db: + world_db["EMPATHY"] = 0 +world_db["terrain_names"][":"] = "SOIL" +world_db["terrain_names"]["|"] = "WALL" +world_db["terrain_names"]["_"] = "ALTAR" +world_db["specials"] = ["SLIPPERS", "PLANT_0", "PLANT_1", "TOOL_0", "TOOL_1", + "LUMBER", "ANIMAL_0", "ANIMAL_1"] io_db["worldstate_write_order"] += [["GOD_FAVOR", "world_int"]] +io_db["worldstate_write_order"] += [[write_metamap_A, "func"]] +io_db["worldstate_write_order"] += [[write_metamap_B, "func"]] import server.config.world_data server.config.world_data.symbols_passable += ":_" @@ -636,13 +851,21 @@ 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")) +commands_db["TOOL_1"] = (1, False, specialtypesetter("TOOL_1")) +commands_db["ANIMAL_0"] = (1, False, specialtypesetter("ANIMAL_0")) +commands_db["ANIMAL_1"] = (1, False, specialtypesetter("ANIMAL_1")) commands_db["PLANT_0"] = (1, False, specialtypesetter("PLANT_0")) +commands_db["PLANT_1"] = (1, False, specialtypesetter("PLANT_1")) commands_db["LUMBER"] = (1, False, specialtypesetter("LUMBER")) +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.misc server.config.misc.make_map_func = make_map server.config.misc.thingproliferation_func = thingproliferation server.config.misc.make_world = make_world -server.config.decrement_lifepoints_func = decrement_lifepoints +server.config.misc.decrement_lifepoints_func = decrement_lifepoints +server.config.misc.calc_effort_func = calc_effort