From 0df12931396479099f785eac75d0a6e68f64005f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 21:46:26 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B2=B4=EA=B2=B0=20=EB=A9=94=EC=8B=9C?=
 =?UTF-8?q?=EC=A7=80=EC=97=90=EB=8F=84=20=EB=85=84=EB=8F=84=20=EB=9C=A8?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/DiplomaticMessage.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php
index 86f16628..b60494f9 100644
--- a/hwe/sammo/DiplomaticMessage.php
+++ b/hwe/sammo/DiplomaticMessage.php
@@ -16,6 +16,7 @@ class DiplomaticMessage extends Message{
 
     protected $diplomaticType = '';
     protected $diplomacyName = '';
+    protected $diplomacyDetail = '';
     protected $validDiplomacy = true;
 
     public function __construct(
@@ -77,6 +78,8 @@ class DiplomaticMessage extends Message{
             return [self::INVALID, '올바르지 않은 불가침 서신입니다.'];
         }
 
+        $this->diplomacyDetail = "{$year}년";
+
         $helper = new Engine\Diplomacy($this->src->nationID, $this->dest->nationID);
         $chk = $helper->noAggression($year, $option);
         if($chk[0] !== self::ACCEPTED){
@@ -294,7 +297,7 @@ class DiplomaticMessage extends Message{
             self::MSGTYPE_NATIONAL, 
             $this->dest, 
             $this->src, 
-            "【외교】{$year}년 {$month}월: {$this->src->nationName}이 {$this->dest->nationName}에게 제안한 {$this->diplomacyName} 동의.",
+            "【외교】{$year}년 {$month}월: {$this->src->nationName}이 {$this->dest->nationName}에게 제안한 {$this->diplomacyDetail}{$this->diplomacyName} 동의.",
             new \DateTime(),
             new \DateTime('9999-12-31'),
             [