This commit is contained in:
33333-33333 2026-07-03 20:57:02 +09:00
commit 88f618cadf
55 changed files with 1299 additions and 447 deletions

View file

@ -156,7 +156,9 @@ function familyStatusText(n) {
function familyDeathReasonLabel(rawReason, entity = null) {
const text = String(rawReason || "");
if (!text) return "";
if (entity?.briefDeathReason) return entity.briefDeathReason(text);
// The event log already records the normalized final death reason. Use the
// same stored value here so the family tree and event UI cannot diverge.
return text;
const collisionText = text.replace(/\u3067\u8870\u5f31.*$/, "");
const collisionWith = collisionText.match(/([^\u3001\u3002\s]+?)(?:\u306b|\u3068\u306e)\u885d\u7a81/);
if (collisionWith) {