diff --git a/docs/command-log-checklist.md b/docs/command-log-checklist.md index 4010b2f..f277e7e 100644 --- a/docs/command-log-checklist.md +++ b/docs/command-log-checklist.md @@ -33,9 +33,6 @@ TS only: 인재 ${}${} 발견했습니다. - [ ] General/che_임관 PHP only: ${}에 임관했습니다. TS only: 임관을 신청했습니다. (국가 ${}) -- [ ] General/che_전투특기초기화 -PHP only: 새로운 ${}를 가질 준비가 되었습니다. -TS only: 새로운 전투 특기를 가질 준비가 되었습니다. - [ ] General/che_정착장려 PHP only: ${}${} 실패하여 주민이 ${}명 증가했습니다. | ${}${} 성공하여 주민이 ${}명 증가했습니다. | ${}${} 하여 주민이 ${}명 증가했습니다. TS only: 인구가 ${} 증가했습니다. @@ -53,9 +50,6 @@ TS only: 경로에 도달할 방법이 없습니다. | ${}${} 가는 도 - [ ] Nation/che_국호변경 PHP only: 이미 같은 국호를 가진 곳이 있습니다. ${} 실패 | 국호를 ${}${} 변경합니다. TS only: 국호를 ${}로 변경하였습니다. -- [ ] Nation/che_급습 -PHP only: ${} 발동! -TS only: 급습 발동! - [ ] Nation/che_몰수 PHP only: {${}->getName()}에게서 ${} ${}${} 몰수했습니다. TS only: ${}에게서 몰수할 ${}이 없습니다. | ${}에게서 ${} ${}${} 몰수했습니다. @@ -69,17 +63,11 @@ TS only: 불가침 제의을 준비했습니다. (국가 ${}) - [ ] Nation/che_불가침파기제의 PHP only: ${}${} 불가침 파기 제의 서신을 보냈습니다. TS only: 불가침 파기 제의을 준비했습니다. (국가 ${}) -- [ ] Nation/che_의병모집 -PHP only: ${} 발동! -TS only: 의병모집 발동! -- [ ] Nation/che_이호경식 -PHP only: ${} 발동! -TS only: 이호경식 발동! - [ ] Nation/che_포상 PHP only: {${}->getName()}에게 ${} ${}${} 수여했습니다. TS only: ${}에게 ${} ${}${} 수여했습니다. - [ ] Nation/che_피장파장 PHP only: {${}->getName()} 전략의 ${} 발동! -TS only: ${} 전략의 피장파장 발동! +TS only: ${} 전략의 ${} 발동! - [ ] Nation/cr_인구이동 TS only: 이동할 인구가 부족합니다. diff --git a/packages/logic/src/actions/turn/general/che_전투특기초기화.ts b/packages/logic/src/actions/turn/general/che_전투특기초기화.ts index 1f287f4..44e9d5e 100644 --- a/packages/logic/src/actions/turn/general/che_전투특기초기화.ts +++ b/packages/logic/src/actions/turn/general/che_전투특기초기화.ts @@ -54,7 +54,8 @@ export class ActionDefinition< const general = context.general; general.role.specialWar = null; setMetaNumber(general.meta, 'specAge2', general.age + 1); - context.addLog('새로운 전투 특기를 가질 준비가 되었습니다.'); + const specialName = ACTION_NAME.replace(' 초기화', ''); + context.addLog(`새로운 ${specialName}를 가질 준비가 되었습니다.`); tryApplyUniqueLottery(context, { acquireType: '아이템', reason: ACTION_NAME }); return { effects: [] }; } diff --git a/packages/logic/src/actions/turn/nation/che_급습.ts b/packages/logic/src/actions/turn/nation/che_급습.ts index 0742bef..ac755ac 100644 --- a/packages/logic/src/actions/turn/nation/che_급습.ts +++ b/packages/logic/src/actions/turn/nation/che_급습.ts @@ -80,14 +80,15 @@ export class ActionResolver< const generalJosa = JosaUtil.pick(generalName, '이'); const nationName = nation?.name ?? '아국'; const destNationName = context.destNation.name; - const actionJosa = JosaUtil.pick(ACTION_NAME, '을'); + const actionName = ACTION_NAME; + const actionJosa = JosaUtil.pick(actionName, '을'); const broadcastMessage = `${generalName}${generalJosa} ${destNationName}${ACTION_NAME}${actionJosa} 발동하였습니다.`; general.experience += EXP_DED_GAIN; general.dedication += EXP_DED_GAIN; - context.addLog(`${ACTION_NAME} 발동!`, { format: LogFormat.MONTH }); - context.addLog(`${destNationName}${ACTION_NAME}${actionJosa} 발동`, { + context.addLog(`${actionName} 발동!`, { format: LogFormat.MONTH }); + context.addLog(`${destNationName}${actionName}${actionJosa} 발동`, { category: LogCategory.HISTORY, format: LogFormat.YEAR_MONTH, }); diff --git a/packages/logic/src/actions/turn/nation/che_의병모집.ts b/packages/logic/src/actions/turn/nation/che_의병모집.ts index 0508bf3..16b9651 100644 --- a/packages/logic/src/actions/turn/nation/che_의병모집.ts +++ b/packages/logic/src/actions/turn/nation/che_의병모집.ts @@ -236,8 +236,9 @@ export class ActionResolver< general.experience += expGain; general.dedication += dedGain; - context.addLog(`${ACTION_NAME} 발동!`); - context.addLog(`${ACTION_NAME} 발동`, { + const actionName = ACTION_NAME; + context.addLog(`${actionName} 발동!`); + context.addLog(`${actionName} 발동`, { category: LogCategory.HISTORY, format: LogFormat.YEAR_MONTH, }); @@ -245,8 +246,8 @@ export class ActionResolver< if (nation) { const generalName = general.name; const generalJosa = JosaUtil.pick(generalName, '이'); - const actionJosa = JosaUtil.pick(ACTION_NAME, '을'); - context.addLog(`${generalName}${generalJosa} ${ACTION_NAME}${actionJosa} 발동했습니다.`, { + const actionJosa = JosaUtil.pick(actionName, '을'); + context.addLog(`${generalName}${generalJosa} ${actionName}${actionJosa} 발동했습니다.`, { scope: LogScope.NATION, category: LogCategory.HISTORY, nationId: nation.id, diff --git a/packages/logic/src/actions/turn/nation/che_이호경식.ts b/packages/logic/src/actions/turn/nation/che_이호경식.ts index 1cbde62..cb36e02 100644 --- a/packages/logic/src/actions/turn/nation/che_이호경식.ts +++ b/packages/logic/src/actions/turn/nation/che_이호경식.ts @@ -85,14 +85,15 @@ export class ActionResolver< const nationName = nation?.name ?? '아국'; const nationJosa = JosaUtil.pick(nationName, '이'); const destNationName = context.destNation.name; - const actionJosa = JosaUtil.pick(ACTION_NAME, '을'); + const actionName = ACTION_NAME; + const actionJosa = JosaUtil.pick(actionName, '을'); const broadcastMessage = `${generalName}${generalJosa} ${destNationName}${ACTION_NAME}${actionJosa} 발동하였습니다.`; general.experience += EXP_DED_GAIN; general.dedication += EXP_DED_GAIN; - context.addLog(`${ACTION_NAME} 발동!`, { format: LogFormat.MONTH }); - context.addLog(`${destNationName}${ACTION_NAME}${actionJosa} 발동`, { + context.addLog(`${actionName} 발동!`, { format: LogFormat.MONTH }); + context.addLog(`${destNationName}${actionName}${actionJosa} 발동`, { category: LogCategory.HISTORY, format: LogFormat.YEAR_MONTH, }); diff --git a/packages/logic/src/actions/turn/nation/che_피장파장.ts b/packages/logic/src/actions/turn/nation/che_피장파장.ts index 719abe4..747e585 100644 --- a/packages/logic/src/actions/turn/nation/che_피장파장.ts +++ b/packages/logic/src/actions/turn/nation/che_피장파장.ts @@ -105,12 +105,13 @@ export class ActionResolver< const nationName = nation?.name ?? '아국'; const destNationName = destNation.name; const targetCommandName = STRATEGIC_COMMANDS[args.commandType] ?? args.commandType; - const actionJosa = JosaUtil.pick(ACTION_NAME, '을'); + const actionName = ACTION_NAME; + const actionJosa = JosaUtil.pick(actionName, '을'); general.experience += EXP_DED_GAIN; general.dedication += EXP_DED_GAIN; - context.addLog(`${targetCommandName} 전략의 ${ACTION_NAME} 발동!`, { + context.addLog(`${targetCommandName} 전략의 ${actionName} 발동!`, { format: LogFormat.MONTH, }); context.addLog(