From d9beabbbbc8b4129506f2b4c94a6bd9c69521bc5 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sun, 10 Jul 2022 21:58:30 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=B0=9C=EB=A0=B9=EC=8B=9C=20=EC=9E=A5?= =?UTF-8?q?=EC=88=98=20=EB=AA=A9=EB=A1=9D=EC=97=90=20=EB=B6=80=EB=8C=80?= =?UTF-8?q?=EC=9E=A5=20=EC=B6=94=EA=B0=80=20=ED=91=9C=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/ts/processing/Nation/che_발령.vue | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/hwe/ts/processing/Nation/che_발령.vue b/hwe/ts/processing/Nation/che_발령.vue index 40f3d5d8..99f373da 100644 --- a/hwe/ts/processing/Nation/che_발령.vue +++ b/hwe/ts/processing/Nation/che_발령.vue @@ -142,7 +142,23 @@ const troops = procRes.troops; const selectedGeneralID = ref(generalList[0].no); function textHelpGeneral(gen: procGeneralItem): string { - const troops = !gen.troopID ? "" : `,${procRes.troops[gen.troopID].name}`; + const troops = (()=>{ + if(!gen.troopID){ + return ""; + } + + const troopInfo = procRes.troops[gen.troopID]; + if(!troopInfo){ + return ""; + } + const troopName = troopInfo.name; + + if(gen.no !== gen.troopID){ + return `,${troopName}`; + } + + return `,${troopName}`; + })(); const nameColor = getNpcColor(gen.npc); const name = nameColor ? `${gen.name}` : gen.name; return `${name} [${citiesMap.value.get(unwrap(gen.cityID))?.name}${troops}] (${gen.leadership}/${gen.strength}/${