X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/ledger2?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fserver%2FPleaseTheIslandGod.py;h=25ac15377ed63461bc94d851c29fa525154d429d;hb=b7ec06b0a6df7b13abf3233abf0f3ecb0d7e3777;hp=a22d433cb6f2053a1c0082dcdbc14caca7744ee7;hpb=bcde084982583d1cc81b1192ae759bf98b734d9a;p=plomrogue diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py index a22d433..25ac153 100644 --- a/plugins/server/PleaseTheIslandGod.py +++ b/plugins/server/PleaseTheIslandGod.py @@ -66,6 +66,9 @@ def make_world(seed): if not world_db["PLANT_0"] in world_db["ThingTypes"]: print("Ignoring: No valid PLANT_0 set.") return + if not world_db["LUMBER"] in world_db["ThingTypes"]: + print("Ignoring: No valid LUMBER set.") + return #for name in specials: # if world_db[name] not in world_db["ThingTypes"]: # print("Ignoring: No valid " + name + " set.") @@ -284,6 +287,31 @@ def actor_use(t): t["T_LIFEPOINTS"] = 1 from server.config.misc import decrement_lifepoints_func decrement_lifepoints_func(t) + 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("|")): + 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"]]: + return + wood_id = None + for id in t["T_CARRIES"]: + type_material = world_db["Things"][id]["T_TYPE"] + if (world_db["ThingTypes"][type_material]["TT_TOOL"] + == "wood"): + wood_id = id + break + if wood_id != None: + t["T_CARRIES"].remove(wood_id) + 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 " + + world_db["ThingTypes"][type_material]["TT_NAME"] + ".") elif world_db["ThingTypes"][type]["TT_TOOL"] == "food": t["T_CARRIES"].remove(id) del world_db["Things"][id] @@ -356,6 +384,7 @@ def actor_move(t): from server.config.world_data import symbols_passable from server.build_fov_map import build_fov_map from server.config.misc import decrement_lifepoints_func + from server.new_thing import new_Thing passable = False move_result = mv_yx_in_dir_legal(chr(t["T_ARGUMENT"]), t["T_POSY"], t["T_POSX"]) @@ -395,11 +424,23 @@ def actor_move(t): if ord("X") == world_db["MAP"][pos]: world_db["GOD_FAVOR"] -= 1 chop_power = world_db["ThingTypes"][type]["TT_TOOLPOWER"] - if (chop_power > 0 and 0 == int(rand.next() / chop_power)): + + case_X = world_db["MAP"][pos] == ord("X") + if (chop_power > 0 + and ((case_X and + 0 == int(rand.next() / chop_power)) + or (not case_X and + 0 == int(rand.next() / (3 * chop_power))))): if t == world_db["Things"][0]: log("You chop it DOWN.") world_db["GOD_FAVOR"] -= 10 world_db["MAP"][pos] = ord(".") + i = 3 if case_X else 1 + for i in range(i): + id = id_setter(-1, "Things") + world_db["Things"][id] = \ + new_Thing(world_db["LUMBER"], + (move_result[1], move_result[2])) build_fov_map(t) return passable = chr(world_db["MAP"][pos]) in symbols_passable @@ -462,8 +503,10 @@ def command_worldactive(worldactive_string): altar_found = True valid_slippers = world_db["SLIPPERS"] in world_db["ThingTypes"] valid_plant0 = world_db["PLANT_0"] in world_db["ThingTypes"] + valid_lumber = world_db["LUMBER"] in world_db["ThingTypes"] if altar_found and wait_exists and player_exists and \ - world_db["MAP"] and valid_slippers and valid_plant0: + world_db["MAP"] and valid_slippers and valid_plant0 and \ + valid_lumber: for id in world_db["Things"]: if world_db["Things"][id]["T_LIFEPOINTS"]: build_fov_map(world_db["Things"][id]) @@ -538,6 +581,32 @@ def play_use(str_arg): and t == world_db["Things"][0]): log("To use this item for chopping, move towards a tree " + "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.") + 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.") + return + wood_id = None + for id in t["T_CARRIES"]: + type_material = world_db["Things"][id]["T_TYPE"] + if (world_db["ThingTypes"][type_material]["TT_TOOL"] + == "wood"): + wood_id = id + break + if wood_id == None: + log("You can't use a " + + world_db["ThingTypes"][type]["TT_NAME"] + + " without some wood in your inventory.") + return elif type != world_db["SLIPPERS"] and not \ world_db["ThingTypes"][type]["TT_TOOL"] == "food": log("You CAN'T consume this thing.") @@ -547,6 +616,15 @@ def play_use(str_arg): else: print("Illegal inventory index.") +def command_lumber(str_int): # # + val = integer_test(str_int, 0) + if None != val: + world_db["LUMBER"] = val + if world_db["WORLD_ACTIVE"] and \ + world_db["LUMBER"] not in world_db["ThingTypes"]: + world_db["WORLD_ACTIVE"] = 0 + print("LUMBER matches no known ThingTypes, deactivating world.") + strong_write(io_db["file_out"], "PLUGIN PleaseTheIslandGod\n") if not "GOD_FAVOR" in world_db: @@ -557,6 +635,8 @@ if not "SLIPPERS" in world_db: world_db["SLIPPERS"] = 0 if not "PLANT_0" in world_db: world_db["PLANT_0"] = 0 +if not "LUMBER" in world_db: + world_db["LUMBER"] = 0 io_db["worldstate_write_order"] += [["GOD_FAVOR", "world_int"]] import server.config.world_data @@ -581,6 +661,7 @@ 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, command_slippers) commands_db["PLANT_0"] = (1, False, command_plant0) +commands_db["LUMBER"] = (1, False, command_lumber) commands_db["use"] = (1, False, play_use) commands_db["move"] = (1, False, play_move)