log("CAN'T pick up object: No storage room to carry more.")
def actor_pickup_test_hook(t, tid):
- from server.ai import eat_vs_hunger_threshold
tt = world_db["ThingTypes"][tid]
return not (t != world_db["Things"][0] and (tt["TT_TOOL"] != "food" or
- (tt["TT_TOOLPOWER"] <= eat_vs_hunger_threshold(t["T_TYPE"]))))
+ (tt["TT_TOOLPOWER"] <=
+ world_db["ThingTypes"][t["T_TYPE"]]["eat_vs_hunger_threshold"])))
def actor_drop(t):
from server.actions import actor_drop
from server.config.world_data import world_db
-def eat_vs_hunger_threshold(thingtype):
- """Return satiation cost of eating for type. Good food for it must be >."""
- from server.world import hunger_per_turn
- hunger_unit = hunger_per_turn(thingtype)
- actiontype = [id for id in world_db["ThingActions"]
- if world_db["ThingActions"][id]["TA_NAME"] == "use"][0]
- return world_db["ThingActions"][actiontype]["TA_EFFORT"] * hunger_unit
-
-
def get_dir_to_target(t, filter):
"""Try to set T_COMMAND/T_ARGUMENT for move to "filter"-determined target.
"""
from server.utils import rand, libpr, c_pointer_to_bytearray
from server.config.world_data import symbols_passable
+ tt = world_db["ThingTypes"][t["T_TYPE"]]
def zero_score_map_where_char_on_memdepthmap(c):
# OUTSOURCED FOR PERFORMANCE REASONS TO libplomrogue.so:
def animates_in_fov(maplength):
return [Thing for Thing in world_db["Things"].values()
if Thing["T_LIFEPOINTS"] and not Thing["carried"]
- and 118 == t["fovmap"][Thing["pos"]] and not Thing == t]
+ and 118 == t["fovmap"][Thing["pos"]] and not Thing == t]
def good_attack_target(v):
- eat_cost = eat_vs_hunger_threshold(t["T_TYPE"])
+ eat_cost = tt["eat_vs_hunger_threshold"]
ty = world_db["ThingTypes"][v["T_TYPE"]]
type_corpse = world_db["ThingTypes"][ty["TT_CORPSE_ID"]]
if t["T_LIFEPOINTS"] > ty["TT_LIFEPOINTS"] \
else corpse_type["TT_TOOLPOWER"]
type = world_db["ThingTypes"][m["T_TYPE"]]
if t["T_LIFEPOINTS"] < type["TT_LIFEPOINTS"] \
- and targetness > eat_vs_hunger_threshold(m["T_TYPE"]):
+ and targetness > type["eat_vs_hunger_threshold"]:
return True
return False
return exists(Thing for Thing in animates_in_fov(maplength)
if good_flee_target(Thing))
elif t["T_MEMMAP"] and "c" == filter:
- eat_cost = eat_vs_hunger_threshold(t["T_TYPE"])
+ eat_cost = tt["eat_vs_hunger_threshold"]
ord_blank = ord(" ")
map_len = world_db["MAP_LENGTH"]
return exists(mt for mt in t["T_MEMTHING"]
[set_map_score(Thing["pos"], 0) for
Thing in animates_in_fov(maplen) if good_flee_target(Thing)]
elif "c" == filter:
- eat_cost = eat_vs_hunger_threshold(t["T_TYPE"])
+ eat_cost = tt["eat_vs_hunger_threshold"]
ord_blank = ord(" ")
[set_map_score(mt[1] * maplen + mt[2], 0)
for mt in t["T_MEMTHING"]
def standing_on_food(t):
"""Return True/False whether t is standing on healthy consumable."""
- eat_cost = eat_vs_hunger_threshold(t["T_TYPE"])
+ tt = world_db["ThingTypes"][t["T_TYPE"]]
+ eat_cost = tt["eat_vs_hunger_threshold"]
for id in [id for id in world_db["Things"] if world_db["Things"][id] != t
if not world_db["Things"][id]["carried"]
if world_db["Things"][id]["pos"] == t["pos"]
cmp_food = -1
selection = -1
i = 0
- eat_cost = eat_vs_hunger_threshold(t["T_TYPE"])
+ tt = world_db["ThingTypes"][t["T_TYPE"]]
+ eat_cost = tt["eat_vs_hunger_threshold"]
for id in t["T_CARRIES"]:
type = world_db["Things"][id]["T_TYPE"]
if world_db["ThingTypes"][type]["TT_TOOL"] == "food" \
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 set_world_inactive, turn_over
+from server.world import set_world_inactive, turn_over, eat_vs_hunger_threshold
from server.update_map_memory import update_map_memory
from server.build_fov_map import build_fov_map
print("Ignoring: Corpse ID belongs to no known ThignType.")
+@test_ThingType_id
+def command_ttlifepoints(val_string):
+ setter("ThingType", "TT_LIFEPOINTS", 0, 255)(val_string)
+ tt = world_db["ThingTypes"][command_ttid.id]
+ tt["eat_vs_hunger_threshold"] = eat_vs_hunger_threshold(command_ttid.id)
+
+
@test_ThingAction_id
def command_taname(name):
"""Set TA_NAME of selected ThingAction.
print("Ignoring: Invalid action name.")
+@test_ThingAction_id
+def command_taeffort(val_string):
+ setter("ThingAction", "TA_EFFORT", 0, 255)(val_string)
+ if world_db["ThingActions"][command_taid.id]["TA_NAME"] == "use":
+ for ttid in world_db["ThingTypes"]:
+ tt = world_db["ThingTypes"][ttid]
+ tt["eat_vs_hunger_threshold"] = eat_vs_hunger_threshold(ttid)
+
+
def setter(category, key, min, max=None):
"""Build setter for world_db([category + "s"][id])[key] to >=min/<=max."""
if category is None:
command_taname, command_ttid, command_ttname, command_tttool, \
command_ttsymbol, command_ttcorpseid, command_tid, command_tcommand, \
command_ttype, command_tcarries, command_tmemthing, setter_tpos, \
- play_wait, play_move, play_pickup, play_drop, play_use, command_ai
+ play_wait, play_move, play_pickup, play_drop, play_use, command_ai, \
+ command_ttlifepoints, command_taeffort
"""Commands database.
"WORLD_ACTIVE": (1, False, command_worldactive),
"MAP": (2, False, setter_map("MAP")),
"TA_ID": (1, False, command_taid),
- "TA_EFFORT": (1, False, setter("ThingAction", "TA_EFFORT", 0, 255)),
+ "TA_EFFORT": (1, False, command_taeffort),
"TA_NAME": (1, False, command_taname),
"TT_ID": (1, False, command_ttid),
"TT_NAME": (1, False, command_ttname),
0, 255)),
"TT_PROLIFERATE": (1, False, setter("ThingType", "TT_PROLIFERATE",
0, 65535)),
- "TT_LIFEPOINTS": (1, False, setter("ThingType", "TT_LIFEPOINTS", 0, 255)),
+ "TT_LIFEPOINTS": (1, False, command_ttlifepoints),
"T_ID": (1, False, command_tid),
"T_ARGUMENT": (1, False, setter("Thing", "T_ARGUMENT", 0, 255)),
"T_PROGRESS": (1, False, setter("Thing", "T_PROGRESS", 0, 255)),
for _id in sorted(world_db[category].keys()):
string = string + id_string + " " + str(_id) + "\n"
for key in sorted(world_db[category][_id].keys()):
- if not key in special_keys:
+ if key.isupper() and not key in special_keys:
x = world_db[category][_id][key]
argument = quote_escape(x) if str == type(x) else str(x)
string = string + key + " " + argument + "\n"
decrement_lifepoints(t)
+def eat_vs_hunger_threshold(thingtype):
+ """Return satiation cost of eating for type. Good food for it must be >."""
+ hunger_unit = hunger_per_turn(thingtype)
+ try:
+ actiontype = next(taid for taid in world_db["ThingActions"] if
+ world_db["ThingActions"][taid]["TA_NAME"] == "use")
+ except StopIteration:
+ return 0
+ return world_db["ThingActions"][actiontype]["TA_EFFORT"] * hunger_unit
+
+
def set_world_inactive():
"""Set world_db["WORLD_ACTIVE"] to 0 and remove worldstate file."""
from server.io import safely_remove_worldstate_file
projects / plomrogue / commitdiff