From bf630b5f7d2f152fb56da55441c4c2062d25ee29 Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 4 Oct 2018 01:57:56 +0900 Subject: [PATCH] =?UTF-8?q?=ED=84=B4=20=EC=9A=94=EC=95=BD=20=EC=9C=84?= =?UTF-8?q?=ED=95=B4=20getBrief=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/Command/BaseCommand.php | 9 ++++++--- hwe/sammo/Command/General/che_기술연구.php | 6 +++--- hwe/sammo/Command/General/che_농지개간.php | 10 +++++----- hwe/sammo/Command/General/che_상업투자.php | 10 +++++----- hwe/sammo/Command/General/che_성벽보수.php | 10 +++++----- hwe/sammo/Command/General/che_수비강화.php | 10 +++++----- hwe/sammo/Command/General/che_정착장려.php | 8 ++++---- hwe/sammo/Command/General/che_주민선정.php | 8 ++++---- hwe/sammo/Command/General/che_치안강화.php | 10 +++++----- hwe/sammo/Command/General/휴식.php | 2 ++ hwe/sammo/Command/Nation/휴식.php | 2 ++ 11 files changed, 46 insertions(+), 39 deletions(-) diff --git a/hwe/sammo/Command/BaseCommand.php b/hwe/sammo/Command/BaseCommand.php index 5fe3b5c3..aa37546b 100644 --- a/hwe/sammo/Command/BaseCommand.php +++ b/hwe/sammo/Command/BaseCommand.php @@ -14,8 +14,7 @@ abstract class BaseCommand{ * @var General|null $generalObj * @var array|null $destGeneral */ - protected $id = 0; - protected $name = 'CommandName'; + static protected $actionName = 'CommandName'; protected $generalObj = null; protected $city = null; @@ -126,9 +125,13 @@ abstract class BaseCommand{ abstract protected function init(); abstract protected function argTest():bool; + + public function getBrief():string{ + return $this->getName(); + } public function getName():string { - return static::$name; + return static::$actionName; } public function getLogger():ActionLogger{ diff --git a/hwe/sammo/Command/General/che_기술연구.php b/hwe/sammo/Command/General/che_기술연구.php index 99426e1f..72dc501e 100644 --- a/hwe/sammo/Command/General/che_기술연구.php +++ b/hwe/sammo/Command/General/che_기술연구.php @@ -19,9 +19,9 @@ use function sammo\getGeneralLeadership; class che_기술연구 extends che_상업투자{ - static $statKey = 'intel'; - static $actionKey = '기술'; - static $actionName = '기술 연구'; + static protected $statKey = 'intel'; + static protected $actionKey = '기술'; + static protected $actionName = '기술 연구'; protected function init(){ diff --git a/hwe/sammo/Command/General/che_농지개간.php b/hwe/sammo/Command/General/che_농지개간.php index f91a0189..6821fa52 100644 --- a/hwe/sammo/Command/General/che_농지개간.php +++ b/hwe/sammo/Command/General/che_농지개간.php @@ -5,9 +5,9 @@ use \sammo\Util; use \sammo\JosaUtil; class che_농지개간 extends che_상업투자{ - static $cityKey = 'agri'; - static $statKey = 'intel'; - static $actionKey = '농업'; - static $actionName = '농지 개간'; - static $debuffFront = 0.5; + static protected $cityKey = 'agri'; + static protected $statKey = 'intel'; + static protected $actionKey = '농업'; + static protected $actionName = '농지 개간'; + static protected $debuffFront = 0.5; } \ No newline at end of file diff --git a/hwe/sammo/Command/General/che_상업투자.php b/hwe/sammo/Command/General/che_상업투자.php index 9af0a4a2..174e68d3 100644 --- a/hwe/sammo/Command/General/che_상업투자.php +++ b/hwe/sammo/Command/General/che_상업투자.php @@ -19,11 +19,11 @@ use function sammo\getGeneralLeadership; class che_상업투자 extends Command\GeneralCommand{ - static $cityKey = 'comm'; - static $statKey = 'intel'; - static $actionKey = '상업'; - static $actionName = '상업 투자'; - static $debuffFront = 0.5; + static protected $cityKey = 'comm'; + static protected $statKey = 'intel'; + static protected $actionKey = '상업'; + static protected $actionName = '상업 투자'; + static protected $debuffFront = 0.5; protected function init(){ diff --git a/hwe/sammo/Command/General/che_성벽보수.php b/hwe/sammo/Command/General/che_성벽보수.php index 221e3720..5c14165d 100644 --- a/hwe/sammo/Command/General/che_성벽보수.php +++ b/hwe/sammo/Command/General/che_성벽보수.php @@ -5,9 +5,9 @@ use \sammo\Util; use \sammo\JosaUtil; class che_성벽보수 extends che_상업투자{ - static $cityKey = 'wall'; - static $statKey = 'power'; - static $actionKey = '성벽'; - static $actionName = '성벽 보수'; - static $debuffFront = 0.25; + static protected $cityKey = 'wall'; + static protected $statKey = 'power'; + static protected $actionKey = '성벽'; + static protected $actionName = '성벽 보수'; + static protected $debuffFront = 0.25; } \ No newline at end of file diff --git a/hwe/sammo/Command/General/che_수비강화.php b/hwe/sammo/Command/General/che_수비강화.php index aabb156d..f1f94fc3 100644 --- a/hwe/sammo/Command/General/che_수비강화.php +++ b/hwe/sammo/Command/General/che_수비강화.php @@ -5,9 +5,9 @@ use \sammo\Util; use \sammo\JosaUtil; class che_수비강화 extends che_상업투자{ - static $cityKey = 'def'; - static $statKey = 'power'; - static $actionKey = '수비'; - static $actionName = '수비 강화'; - static $debuffFront = 0.5; + static protected $cityKey = 'def'; + static protected $statKey = 'power'; + static protected $actionKey = '수비'; + static protected $actionName = '수비 강화'; + static protected $debuffFront = 0.5; } \ No newline at end of file diff --git a/hwe/sammo/Command/General/che_정착장려.php b/hwe/sammo/Command/General/che_정착장려.php index 8a8b4789..17d2f79e 100644 --- a/hwe/sammo/Command/General/che_정착장려.php +++ b/hwe/sammo/Command/General/che_정착장려.php @@ -19,10 +19,10 @@ use function sammo\getGeneralLeadership; class che_정착장려 extends Command\GeneralCommand{ - static $cityKey = 'pop'; - static $statKey = 'leader'; - static $actionKey = '인구'; - static $actionName = '정착 장려'; + static protected $cityKey = 'pop'; + static protected $statKey = 'leader'; + static protected $actionKey = '인구'; + static protected $actionName = '정착 장려'; protected function init(){ diff --git a/hwe/sammo/Command/General/che_주민선정.php b/hwe/sammo/Command/General/che_주민선정.php index c2a7f36d..212824e8 100644 --- a/hwe/sammo/Command/General/che_주민선정.php +++ b/hwe/sammo/Command/General/che_주민선정.php @@ -19,10 +19,10 @@ use function sammo\getGeneralLeadership; class che_주민선정 extends Command\GeneralCommand{ - static $cityKey = 'trust'; - static $statKey = 'leader'; - static $actionKey = '민심'; - static $actionName = '주민 선정'; + static protected $cityKey = 'trust'; + static protected $statKey = 'leader'; + static protected $actionKey = '민심'; + static protected $actionName = '주민 선정'; protected function init(){ diff --git a/hwe/sammo/Command/General/che_치안강화.php b/hwe/sammo/Command/General/che_치안강화.php index c2736552..1a5567d3 100644 --- a/hwe/sammo/Command/General/che_치안강화.php +++ b/hwe/sammo/Command/General/che_치안강화.php @@ -5,9 +5,9 @@ use \sammo\Util; use \sammo\JosaUtil; class che_치안강화 extends che_상업투자{ - static $cityKey = 'secu'; - static $statKey = 'power'; - static $actionKey = '치안'; - static $actionName = '치안 강화'; - static $debuffFront = 1; + static protected $cityKey = 'secu'; + static protected $statKey = 'power'; + static protected $actionKey = '치안'; + static protected $actionName = '치안 강화'; + static protected $debuffFront = 1; } \ No newline at end of file diff --git a/hwe/sammo/Command/General/휴식.php b/hwe/sammo/Command/General/휴식.php index dc8d7065..97d6a11c 100644 --- a/hwe/sammo/Command/General/휴식.php +++ b/hwe/sammo/Command/General/휴식.php @@ -6,6 +6,8 @@ use \sammo\Util; use \sammo\JosaUtil; class 휴식 extends Command\GeneralCommand{ + static protected $actionName = '휴식'; + protected function init(){ //아무것도 하지 않음 } diff --git a/hwe/sammo/Command/Nation/휴식.php b/hwe/sammo/Command/Nation/휴식.php index 54981391..472f467c 100644 --- a/hwe/sammo/Command/Nation/휴식.php +++ b/hwe/sammo/Command/Nation/휴식.php @@ -7,6 +7,8 @@ use \sammo\JosaUtil; use sammo\LastTurn; class 휴식 extends Command\NationCommand{ + static protected $actionName = '휴식'; + protected function init(){ //아무것도 하지 않음 }