This commit is contained in:
33333-33333 2026-06-28 13:40:41 +09:00
commit f500279abd
93 changed files with 1893 additions and 1198 deletions

View file

@ -170,6 +170,12 @@ function familyDeathReasonLabel(rawReason, entity = null) {
const text = String(rawReason || "");
if (!text) return "";
if (entity?.briefDeathReason) return entity.briefDeathReason(text);
const collisionText = text.replace(/\u3067\u8870\u5f31.*$/, "");
const collisionWith = collisionText.match(/([^\u3001\u3002\s]+?)(?:\u306b|\u3068\u306e)\u885d\u7a81/);
if (collisionWith) {
const label = `${collisionWith[1]}\u3068\u306e\u885d\u7a81${text.includes("\u3067\u8870\u5f31") ? "\u3067\u8870\u5f31" : ""}`;
return label.length > 14 ? `${label.slice(0, 14)}\u2026` : label;
}
if (text.includes("\u3067\u8870\u5f31")) return text.length > 12 ? `${text.slice(0, 12)}\u2026` : text;
if (/\u55a7\u5629|fight/.test(text)) return "\u55a7\u5629";
if (/\u7206\u7af9|firecracker|explosion/.test(text)) return "\u7206\u7af9";