devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

체결 메시지에도 년도 뜨도록 수정

Browse Source
This commit is contained in:
Hide_D
2018-04-18 21:46:26 +09:00
parent 9bcd18c42e
commit 0df1293139
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/DiplomaticMessage.php
+4 -1
View File
@@ -16,6 +16,7 @@ class DiplomaticMessage extends Message{
protected $diplomaticType = ''; protected $diplomaticType = '';
protected $diplomacyName = ''; protected $diplomacyName = '';
protected $diplomacyDetail = '';
protected $validDiplomacy = true; protected $validDiplomacy = true;
public function __construct( public function __construct(
@@ -77,6 +78,8 @@ class DiplomaticMessage extends Message{
return [self::INVALID, '올바르지 않은 불가침 서신입니다.']; return [self::INVALID, '올바르지 않은 불가침 서신입니다.'];
} }
$this->diplomacyDetail = "{$year}년";
$helper = new Engine\Diplomacy($this->src->nationID, $this->dest->nationID); $helper = new Engine\Diplomacy($this->src->nationID, $this->dest->nationID);
$chk = $helper->noAggression($year, $option); $chk = $helper->noAggression($year, $option);
if($chk[0] !== self::ACCEPTED){ if($chk[0] !== self::ACCEPTED){
@@ -294,7 +297,7 @@ class DiplomaticMessage extends Message{
self::MSGTYPE_NATIONAL, self::MSGTYPE_NATIONAL,
$this->dest, $this->dest,
$this->src, $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(),
new \DateTime('9999-12-31'), new \DateTime('9999-12-31'),
[ [