From: Christian Heller Date: Sat, 27 Feb 2016 10:50:42 +0000 (+0100) Subject: Server, plugin: Refactor thingproliferation (plugin integration). X-Git-Tag: tce~130 X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/pick_tasks?a=commitdiff_plain;h=c94c0575b191d0162d8a1cbbbe4e59cca2e40324;p=plomrogue Server, plugin: Refactor thingproliferation (plugin integration). --- diff --git a/plugins/server/PleaseTheIslandGod.py b/plugins/server/PleaseTheIslandGod.py index 93e6981..e4ca0b3 100644 --- a/plugins/server/PleaseTheIslandGod.py +++ b/plugins/server/PleaseTheIslandGod.py @@ -4,10 +4,9 @@ from server.io import log, strong_write -from server.config.world_data import world_db, symbols_passable, directions_db +from server.config.world_data import world_db, directions_db from server.utils import mv_yx_in_dir_legal, rand, id_setter from server.config.io import io_db -from server.new_thing import new_Thing def pos_test(type, y, x): pos = y * world_db["MAP_LENGTH"] + x; @@ -47,39 +46,24 @@ def make_map(): world_db["altar"] = (y, x) altar_placed = True -def thingproliferation(t, prol_map): - from server.new_thing import new_Thing - global directions_db, mv_yx_in_dir_legal, rand - prolscore = world_db["ThingTypes"][t["T_TYPE"]]["TT_PROLIFERATE"] - if prolscore and \ - (world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"] == 0 or - t["T_LIFEPOINTS"] >= 0.9 * - world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"]) \ - and \ - (1 == prolscore or 1 == (rand.next() % prolscore)): - candidates = [] - for dir in [directions_db[key] for key in directions_db]: - mv_result = mv_yx_in_dir_legal(dir, t["T_POSY"], t["T_POSX"]) - pos = mv_result[1] * world_db["MAP_LENGTH"] + mv_result[2] - if mv_result[0] and \ - (ord(":") == prol_map[pos] - or (world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"] - and ord(".") == prol_map[pos])): - candidates.append((mv_result[1], mv_result[2])) - if len(candidates): - i = rand.next() % len(candidates) - id = id_setter(-1, "Things") - newT = new_Thing(t["T_TYPE"], (candidates[i][0], candidates[i][1])) - world_db["Things"][id] = newT - 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 +def field_spreadable(c, t): + return ":" == c or (world_db["ThingTypes"][t["T_TYPE"]]["TT_LIFEPOINTS"] + and "." == c) + +def thingprol_plugin_conditions(t): + tt = world_db["ThingTypes"][t["T_TYPE"]] + return (tt["TT_LIFEPOINTS"] == 0 or \ + t["T_LIFEPOINTS"] >= 0.9 * tt["TT_LIFEPOINTS"]) + +def thingprol_plugin_post_create_hook(t): + tt = world_db["ThingTypes"][t["T_TYPE"]] + 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 def ai(t): from server.ai import get_dir_to_target, get_inventory_slot_to_consume, \ @@ -370,6 +354,7 @@ def actor_move(t): from server.build_fov_map import build_fov_map from server.config.misc import decrement_lifepoints_func from server.new_thing import new_Thing + global mv_yx_in_dir_legal passable = False move_result = mv_yx_in_dir_legal(chr(t["T_ARGUMENT"]), t["T_POSY"], t["T_POSX"]) @@ -429,6 +414,7 @@ def actor_move(t): build_fov_map(t) return passable = chr(world_db["MAP"][pos]) in symbols_passable + global directions_db dir = [dir for dir in directions_db if directions_db[dir] == chr(t["T_ARGUMENT"])][0] if passable: @@ -515,7 +501,7 @@ def play_move(str_arg): print("Illegal move direction string.") return dir = ord(directions_db[str_arg]) - from server.utils import mv_yx_in_dir_legal + global mv_yx_in_dir_legal move_result = mv_yx_in_dir_legal(chr(dir), t["T_POSY"], t["T_POSX"]) if 1 == move_result[0]: pos = (move_result[1] * world_db["MAP_LENGTH"]) + move_result[2] @@ -741,7 +727,6 @@ 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.decrement_lifepoints_func = decrement_lifepoints server.config.misc.calc_effort_func = calc_effort @@ -749,3 +734,10 @@ import server.config.make_world_helpers server.config.make_world_helpers.pos_test_func = pos_test server.config.make_world_helpers.world_makable_func = world_makable server.config.make_world_helpers.make_map_func = make_map + +import server.config.thingproliferation +server.config.thingproliferation.field_spreadable = field_spreadable +server.config.thingproliferation.thingprol_plugin_conditions = \ + thingprol_plugin_conditions +server.config.thingproliferation.thingprol_plugin_post_create_hook = \ + thingprol_plugin_post_create_hook diff --git a/server/config/misc.py b/server/config/misc.py index 05fbe50..905041e 100644 --- a/server/config/misc.py +++ b/server/config/misc.py @@ -7,5 +7,4 @@ from server.decrement_lifepoints import decrement_lifepoints from server.calc_effort import calc_effort decrement_lifepoints_func = decrement_lifepoints -thingproliferation_func = thingproliferation calc_effort_func = calc_effort diff --git a/server/config/thingproliferation.py b/server/config/thingproliferation.py new file mode 100644 index 0000000..6074f36 --- /dev/null +++ b/server/config/thingproliferation.py @@ -0,0 +1,13 @@ +# This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 +# or any later version. For details on its copyright, license, and warranties, +# see the file NOTICE in the root directory of the PlomRogue source package. + + +import server.thingproliferation_helpers + + +field_spreadable = server.thingproliferation_helpers.field_spreadable +thingprol_plugin_conditions = \ + server.thingproliferation_helpers.thingprol_plugin_conditions +thingprol_plugin_post_create_hook = \ + server.thingproliferation_helpers.thingprol_plugin_post_create_hook diff --git a/server/thingproliferation.py b/server/thingproliferation.py index 801ee29..ad55b3f 100644 --- a/server/thingproliferation.py +++ b/server/thingproliferation.py @@ -7,23 +7,27 @@ def thingproliferation(t, prol_map): """To chance of 1/TT_PROLIFERATE, create t offspring in open neighbor cell. Naturally only works with TT_PROLIFERATE > 0. The neighbor cell must be be - marked "." in prol_map. If there are several map cell candidates, one is - selected randomly. + marked passable in prol_map. If there are several map cell candidates, one + is selected randomly. """ - from server.config.world_data import directions_db, symbols_passable,\ - world_db + from server.config.world_data import directions_db, world_db + from server.config.thingproliferation import field_spreadable, \ + thingprol_plugin_conditions, thingprol_plugin_post_create_hook from server.utils import mv_yx_in_dir_legal, rand from server.new_thing import new_Thing prolscore = world_db["ThingTypes"][t["T_TYPE"]]["TT_PROLIFERATE"] - if prolscore and (1 == prolscore or 1 == (rand.next() % prolscore)): + if prolscore and (1 == prolscore or 1 == (rand.next() % prolscore)) and \ + thingprol_plugin_conditions(t): candidates = [] for dir in [directions_db[key] for key in sorted(directions_db.keys())]: mv_result = mv_yx_in_dir_legal(dir, t["T_POSY"], t["T_POSX"]) - c = prol_map[mv_result[1] + world_db["MAP_LENGTH"] + mv_result[2]] - if mv_result[0] and str(c) in symbols_passable: + c = str(prol_map[mv_result[1] + world_db["MAP_LENGTH"] + + mv_result[2]]) + if mv_result[0] and field_spreadable(c, t): candidates.append((mv_result[1], mv_result[2])) if len(candidates): i = rand.next() % len(candidates) id = id_setter(-1, "Things") newT = new_Thing(t["T_TYPE"], (candidates[i][0], candidates[i][1])) world_db["Things"][id] = newT + thingprol_plugin_post_create_hook(t) diff --git a/server/thingproliferation_helpers.py b/server/thingproliferation_helpers.py new file mode 100644 index 0000000..f784340 --- /dev/null +++ b/server/thingproliferation_helpers.py @@ -0,0 +1,16 @@ +# This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 +# or any later version. For details on its copyright, license, and warranties, +# see the file NOTICE in the root directory of the PlomRogue source package. + + +from server.config.world_data import symbols_passable + + +def field_spreadable(field_type, ignore): + return field_type in symbols_passable + +def thingprol_plugin_conditions(ignore): + return True + +def thingprol_plugin_post_create_hook(ignore): + pass diff --git a/server/world.py b/server/world.py index 8c85d15..b9f9114 100644 --- a/server/world.py +++ b/server/world.py @@ -52,8 +52,9 @@ def set_world_inactive(): def turn_over(): """Run game world and its inhabitants until new player input expected.""" from server.config.actions import action_db, ai_func - from server.config.misc import thingproliferation_func, calc_effort_func + from server.config.misc import calc_effort_func from server.update_map_memory import update_map_memory + from server.thingproliferation import thingproliferation id = 0 while world_db["Things"][0]["T_LIFEPOINTS"]: proliferable_map = world_db["MAP"][:] @@ -86,5 +87,5 @@ def turn_over(): action(Thing) Thing["T_COMMAND"] = 0 Thing["T_PROGRESS"] = 0 - thingproliferation_func(Thing, proliferable_map) + thingproliferation(Thing, proliferable_map) world_db["TURN"] += 1