From 82fb532e4b01efecd856b7d0e536b8adfb7af5aa Mon Sep 17 00:00:00 2001 From: Hide_D Date: Tue, 6 Jun 2023 16:51:42 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=A1=B0=EC=82=AC=20(=EC=9C=BC)?= =?UTF-8?q?=EB=A1=9C=20=EB=AF=B8=20=EB=B0=98=EC=98=81=EB=B6=80=EB=B6=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/process_war.php | 5 +++-- hwe/sammo/Command/Nation/che_불가침제의.php | 3 ++- hwe/sammo/Command/Nation/che_불가침파기제의.php | 3 ++- hwe/sammo/Command/Nation/che_종전제의.php | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hwe/process_war.php b/hwe/process_war.php index 15984bd8..4f497991 100644 --- a/hwe/process_war.php +++ b/hwe/process_war.php @@ -695,11 +695,12 @@ function ConquerCity(array $admin, General $general, array $city) $minCity = findNextCapital($cityID, $defenderNationID); $minCityName = CityConst::byID($minCity)->name; + $josaRo = JosaUtil::pick($minCityName, '로'); $josaYi = JosaUtil::pick($defenderNationName, '이'); - $attackerLogger->pushGlobalHistoryLog("【긴급천도】{$defenderNationName}{$josaYi} 수도가 함락되어 $minCityName으로 긴급천도하였습니다."); + $attackerLogger->pushGlobalHistoryLog("【긴급천도】{$defenderNationName}{$josaYi} 수도가 함락되어 $minCityName{$josaRo} 긴급천도하였습니다."); - $moveLog = "수도가 함락되어 $minCityName으로 긴급천도합니다."; + $moveLog = "수도가 함락되어 $minCityName{$josaRo} 긴급천도합니다."; //아국 수뇌부에게 로그 전달 foreach ($db->queryFirstColumn( 'SELECT no FROM general WHERE nation=%i AND officer_level>=5', diff --git a/hwe/sammo/Command/Nation/che_불가침제의.php b/hwe/sammo/Command/Nation/che_불가침제의.php index 33232e30..f39f32fd 100644 --- a/hwe/sammo/Command/Nation/che_불가침제의.php +++ b/hwe/sammo/Command/Nation/che_불가침제의.php @@ -165,6 +165,7 @@ class che_불가침제의 extends Command\NationCommand $nation = $this->nation; $nationID = $nation['nation']; $nationName = $nation['name']; + $josaRo = JosaUtil::pick($nationName, '로'); $destNation = $this->destNation; $destNationID = $destNation['nation']; @@ -176,7 +177,7 @@ class che_불가침제의 extends Command\NationCommand $logger = $general->getLogger(); $destLogger = new ActionLogger(0, $destNationID, $env['year'], $env['month']); - $logger->pushGeneralActionLog("{$destNationName}으로 불가침 제의 서신을 보냈습니다.<1>$date"); + $logger->pushGeneralActionLog("{$destNationName}{$josaRo} 불가침 제의 서신을 보냈습니다.<1>$date"); // 상대에게 발송 $src = new MessageTarget( diff --git a/hwe/sammo/Command/Nation/che_불가침파기제의.php b/hwe/sammo/Command/Nation/che_불가침파기제의.php index eff76fb0..a1749775 100644 --- a/hwe/sammo/Command/Nation/che_불가침파기제의.php +++ b/hwe/sammo/Command/Nation/che_불가침파기제의.php @@ -122,11 +122,12 @@ class che_불가침파기제의 extends Command\NationCommand{ $destNation = $this->destNation; $destNationID = $destNation['nation']; $destNationName = $destNation['name']; + $josaRo = JosaUtil::pick($destNationName, '로'); $logger = $general->getLogger(); $destLogger = new ActionLogger(0, $destNationID, $env['year'], $env['month']); - $logger->pushGeneralActionLog("{$destNationName}으로 불가침 파기 제의 서신을 보냈습니다.<1>$date"); + $logger->pushGeneralActionLog("{$destNationName}{$josaRo} 불가침 파기 제의 서신을 보냈습니다.<1>$date"); // 상대에게 발송 $src = new MessageTarget( diff --git a/hwe/sammo/Command/Nation/che_종전제의.php b/hwe/sammo/Command/Nation/che_종전제의.php index f3462239..dc33f544 100644 --- a/hwe/sammo/Command/Nation/che_종전제의.php +++ b/hwe/sammo/Command/Nation/che_종전제의.php @@ -120,11 +120,12 @@ class che_종전제의 extends Command\NationCommand{ $destNation = $this->destNation; $destNationID = $destNation['nation']; $destNationName = $destNation['name']; + $josaRo = JosaUtil::pick($destNationName, '로'); $logger = $general->getLogger(); $destLogger = new ActionLogger(0, $destNationID, $env['year'], $env['month']); - $logger->pushGeneralActionLog("{$destNationName}으로 종전 제의 서신을 보냈습니다.<1>$date"); + $logger->pushGeneralActionLog("{$destNationName}{$josaRo} 종전 제의 서신을 보냈습니다.<1>$date"); // 상대에게 발송 $src = new MessageTarget(