This commit is contained in:
33333-33333 2026-06-30 13:40:36 +09:00
commit ad2cc76429
34 changed files with 616 additions and 365 deletions

View file

@ -25,7 +25,7 @@ function effectiveFoodRoleMatches(item, role) {
if (!type) return false;
if (role === "food") return ["sweet", "food", "grass", "ant_corpse", "zunchi"].includes(type) || (isServingFoodType(type));
if (role === "drink") return type === "water" || type === "zunda_juice";
if (role === "medicine") return type === "sweet" || type === "water" || type === "zunda_juice" || type === "sleep_drug" || (isParamEffectItemType(type));
if (role === "medicine") return type === "sweet" || type === "water" || type === "zunda_juice" || ["sleep_drug", "slave_chain", "golden_crown"].includes(type) || (isParamEffectItemType(type));
return false;
}
@ -146,7 +146,7 @@ function foodRoleSearchTypes(role = "") {
} else if (role === "drink") {
for (const type of ["water", "zunda_juice", "duplicator"]) set.add(type);
} else if (role === "medicine") {
for (const type of ["sweet", "water", "zunda_juice", "sleep_drug", "love_mochi", "fight_mochi", "laxative", "protein", "niteropu", "ammo", "mystery_drug", "mercury", "giant_drug", "dwarf_drug", "duplicator"]) set.add(type);
for (const type of ["sweet", "water", "zunda_juice", "sleep_drug", "love_mochi", "fight_mochi", "laxative", "protein", "niteropu", "ammo", "mystery_drug", "mercury", "giant_drug", "dwarf_drug", "slave_chain", "golden_crown", "duplicator"]) set.add(type);
if (typeof PARAM_EFFECT_ITEM_TYPES !== "undefined") for (const type of PARAM_EFFECT_ITEM_TYPES) set.add(type);
}
return set;
@ -301,7 +301,7 @@ function evaluateConflictUrge(tarinai, world, maxDist = 96) {
};
}
}
return best && best.score > (best.forced ? 4 : 8) ? best : null;
return best && best.score >= (best.forced ? 4 : 7) ? best : null;
}
function conflictTargetFor(tarinai, world, minScore = 34) {