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'), [