diff --git a/hwe/sammo/Command/General/che_강행.php b/hwe/sammo/Command/General/che_강행.php index f1c05cc9..0035a62e 100644 --- a/hwe/sammo/Command/General/che_강행.php +++ b/hwe/sammo/Command/General/che_강행.php @@ -59,6 +59,21 @@ class che_강행 extends Command\GeneralCommand{ ConstraintHelper::ReqGeneralRice($reqRice), ]; } + + public function getCommandDetailTitle():string{ + $name = $this->getName(); + [$reqGold, $reqRice] = $this->getCost(); + + $title = "{$name}(통솔경험"; + if($reqGold > 0){ + $title .= ", 자금{$reqGold}"; + } + if($reqRice > 0){ + $title .= ", 군량{$reqRice}"; + } + $title .= ', 병력,훈련,사기↓)'; + return $title; + } public function getCost():array{ $env = $this->env; diff --git a/hwe/sammo/Command/General/che_견문.php b/hwe/sammo/Command/General/che_견문.php index c074d3d2..22208bd2 100644 --- a/hwe/sammo/Command/General/che_견문.php +++ b/hwe/sammo/Command/General/che_견문.php @@ -37,6 +37,11 @@ class che_견문 extends Command\GeneralCommand{ } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + return "{$name}(자금?, 군량?, 경험치?)"; + } + public function getCost():array{ return [0, 0]; } diff --git a/hwe/sammo/Command/General/che_귀환.php b/hwe/sammo/Command/General/che_귀환.php index 432be379..68b892f7 100644 --- a/hwe/sammo/Command/General/che_귀환.php +++ b/hwe/sammo/Command/General/che_귀환.php @@ -45,6 +45,11 @@ class che_귀환 extends Command\GeneralCommand{ ]; } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + return "{$name}(통솔경험)"; + } + public function getCost():array{ return [0, 0]; } diff --git a/hwe/sammo/Command/General/che_단련.php b/hwe/sammo/Command/General/che_단련.php index a001e082..825e6bea 100644 --- a/hwe/sammo/Command/General/che_단련.php +++ b/hwe/sammo/Command/General/che_단련.php @@ -48,6 +48,21 @@ class che_단련 extends Command\GeneralCommand{ } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + [$reqGold, $reqRice] = $this->getCost(); + + $title = "{$name}(병종숙련"; + if($reqGold > 0){ + $title .= ", 자금{$reqGold}"; + } + if($reqRice > 0){ + $title .= ", 군량{$reqRice}"; + } + $title .= ')'; + return $title; + } + public function getCost():array{ $env = $this->env; return [$env['develcost'], $env['develcost']]; diff --git a/hwe/sammo/Command/General/che_모병.php b/hwe/sammo/Command/General/che_모병.php index ca644bc5..ddc0e414 100644 --- a/hwe/sammo/Command/General/che_모병.php +++ b/hwe/sammo/Command/General/che_모병.php @@ -15,6 +15,9 @@ class che_모병 extends che_징병{ static protected $actionName = '모병'; static protected $costOffset = 2; + static protected $defaultTrain; + static protected $defaultAtmos; + static protected $isInitStatic = false; protected static function initStatic() { @@ -22,4 +25,8 @@ class che_모병 extends che_징병{ static::$defaultAtmos = GameConst::$defaultAtmosHigh; } + public function getCommandDetailTitle():string{ + return "{$this->getName()}(통솔경험, 자금×2)"; + } + } \ No newline at end of file diff --git a/hwe/sammo/Command/General/che_물자조달.php b/hwe/sammo/Command/General/che_물자조달.php index c5b93991..f0123a65 100644 --- a/hwe/sammo/Command/General/che_물자조달.php +++ b/hwe/sammo/Command/General/che_물자조달.php @@ -46,6 +46,10 @@ class che_물자조달 extends Command\GeneralCommand{ } + public function getCommandDetailTitle():string{ + return "{$this->getName()}(랜덤경험)"; + } + public function getCost():array{ return [0, 0]; } diff --git a/hwe/sammo/Command/General/che_사기진작.php b/hwe/sammo/Command/General/che_사기진작.php index 37ebbce1..319e9c66 100644 --- a/hwe/sammo/Command/General/che_사기진작.php +++ b/hwe/sammo/Command/General/che_사기진작.php @@ -48,6 +48,13 @@ class che_사기진작 extends Command\GeneralCommand{ } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + //[$reqGold, $reqRice] = $this->getCost(); + + return "{$name}(통솔경험, 자금↓)"; + } + public function getCost():array{ $general = $this->generalObj; return [Util::round($general->getVar('crew')/100), 0]; diff --git a/hwe/sammo/Command/General/che_상업투자.php b/hwe/sammo/Command/General/che_상업투자.php index 128c7142..d233afbd 100644 --- a/hwe/sammo/Command/General/che_상업투자.php +++ b/hwe/sammo/Command/General/che_상업투자.php @@ -29,27 +29,6 @@ class che_상업투자 extends Command\GeneralCommand{ static protected $actionName = '상업 투자'; static protected $debuffFront = 0.5; - public function getCommandDetailTitle():string{ - $name = $this->getName(); - $statTypeBase = [ - 'leadership'=>'통솔경험', - 'strength'=>'무력경험', - 'intel'=>'지력경험', - ]; - $statType = $statTypeBase[static::$statKey]; - [$reqGold, $reqRice] = $this->getCost(); - - $title = "{$name}({$statType}"; - if($reqGold > 0){ - $title .= ", 자금{$reqGold}"; - } - if($reqRice > 0){ - $title .= ", 군량{$reqRice}"; - } - $title .= ')'; - return $title; - } - protected function argTest():bool{ $this->arg = null; return true; @@ -77,6 +56,27 @@ class che_상업투자 extends Command\GeneralCommand{ $this->reqGold = $reqGold; } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + $statTypeBase = [ + 'leadership'=>'통솔경험', + 'strength'=>'무력경험', + 'intel'=>'지력경험', + ]; + $statType = $statTypeBase[static::$statKey]; + [$reqGold, $reqRice] = $this->getCost(); + + $title = "{$name}({$statType}"; + if($reqGold > 0){ + $title .= ", 자금{$reqGold}"; + } + if($reqRice > 0){ + $title .= ", 군량{$reqRice}"; + } + $title .= ')'; + return $title; + } + public function getCost():array{ $develCost = $this->env['develcost']; $reqGold = Util::round($this->generalObj->onCalcDomestic(static::$actionKey, 'cost', $develCost)); diff --git a/hwe/sammo/Command/General/che_소집해제.php b/hwe/sammo/Command/General/che_소집해제.php index 4cb95fe7..db14b2f6 100644 --- a/hwe/sammo/Command/General/che_소집해제.php +++ b/hwe/sammo/Command/General/che_소집해제.php @@ -39,6 +39,12 @@ class che_소집해제 extends Command\GeneralCommand{ } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + + return "{$name}(병사↓, 인구↑)"; + } + public function getCost():array{ return [0, 0]; } diff --git a/hwe/sammo/Command/General/che_이동.php b/hwe/sammo/Command/General/che_이동.php index e899c9f7..c7bfefa8 100644 --- a/hwe/sammo/Command/General/che_이동.php +++ b/hwe/sammo/Command/General/che_이동.php @@ -60,6 +60,21 @@ class che_이동 extends Command\GeneralCommand{ ]; } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + [$reqGold, $reqRice] = $this->getCost(); + + $title = "{$name}(통솔경험"; + if($reqGold > 0){ + $title .= ", 자금{$reqGold}"; + } + if($reqRice > 0){ + $title .= ", 군량{$reqRice}"; + } + $title .= ', 사기↓)'; + return $title; + } + public function getCost():array{ $env = $this->env; return [$env['develcost'], 0]; diff --git a/hwe/sammo/Command/General/che_인재탐색.php b/hwe/sammo/Command/General/che_인재탐색.php index a12596d4..f4681938 100644 --- a/hwe/sammo/Command/General/che_인재탐색.php +++ b/hwe/sammo/Command/General/che_인재탐색.php @@ -55,6 +55,21 @@ class che_인재탐색 extends Command\GeneralCommand{ } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + [$reqGold, $reqRice] = $this->getCost(); + + $title = "{$name}(랜덤경험"; + if($reqGold > 0){ + $title .= ", 자금{$reqGold}"; + } + if($reqRice > 0){ + $title .= ", 군량{$reqRice}"; + } + $title .= ')'; + return $title; + } + public function getCost():array{ return [$this->env['develcost'], 0]; } diff --git a/hwe/sammo/Command/General/che_정착장려.php b/hwe/sammo/Command/General/che_정착장려.php index 5d5eceaf..6d0238a0 100644 --- a/hwe/sammo/Command/General/che_정착장려.php +++ b/hwe/sammo/Command/General/che_정착장려.php @@ -55,6 +55,27 @@ class che_정착장려 extends Command\GeneralCommand{ $this->reqRice = $reqRice; } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + $statTypeBase = [ + 'leadership'=>'통솔경험', + 'strength'=>'무력경험', + 'intel'=>'지력경험', + ]; + $statType = $statTypeBase[static::$statKey]; + [$reqGold, $reqRice] = $this->getCost(); + + $title = "{$name}({$statType}"; + if($reqGold > 0){ + $title .= ", 자금{$reqGold}"; + } + if($reqRice > 0){ + $title .= ", 군량{$reqRice}"; + } + $title .= ')'; + return $title; + } + public function getCost():array{ $develCost = $this->env['develcost'] * 2; $reqGold = 0; diff --git a/hwe/sammo/Command/General/che_주민선정.php b/hwe/sammo/Command/General/che_주민선정.php index 25dec0c5..6f4bb7a2 100644 --- a/hwe/sammo/Command/General/che_주민선정.php +++ b/hwe/sammo/Command/General/che_주민선정.php @@ -55,12 +55,33 @@ class che_주민선정 extends Command\GeneralCommand{ $this->reqRice = $reqRice; } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + $statTypeBase = [ + 'leadership'=>'통솔경험', + 'strength'=>'무력경험', + 'intel'=>'지력경험', + ]; + $statType = $statTypeBase[static::$statKey]; + [$reqGold, $reqRice] = $this->getCost(); + + $title = "{$name}({$statType}"; + if($reqGold > 0){ + $title .= ", 자금{$reqGold}"; + } + if($reqRice > 0){ + $title .= ", 군량{$reqRice}"; + } + $title .= ')'; + return $title; + } + public function getCost():array{ $develCost = $this->env['develcost'] * 2; $reqGold = 0; $reqRice = $this->generalObj->onCalcDomestic(static::$actionKey, 'cost', $develCost); - return [$reqGold, $reqRice]; + return [$reqGold, Util::round($reqRice)]; } public function getCompensationStyle():?int{ diff --git a/hwe/sammo/Command/General/che_증여.php b/hwe/sammo/Command/General/che_증여.php index b8810321..00818955 100644 --- a/hwe/sammo/Command/General/che_증여.php +++ b/hwe/sammo/Command/General/che_증여.php @@ -93,6 +93,11 @@ class che_증여 extends Command\GeneralCommand{ } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + return "{$name}(통솔경험)"; + } + public function getCost():array{ return [0, 0]; } diff --git a/hwe/sammo/Command/General/che_집합.php b/hwe/sammo/Command/General/che_집합.php index ac081c91..8bbea466 100644 --- a/hwe/sammo/Command/General/che_집합.php +++ b/hwe/sammo/Command/General/che_집합.php @@ -47,6 +47,11 @@ class che_집합 extends Command\GeneralCommand{ ]; } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + return "{$name}(통솔경험)"; + } + public function getCost():array{ return [0, 0]; } diff --git a/hwe/sammo/Command/General/che_징병.php b/hwe/sammo/Command/General/che_징병.php index de695ddd..d1a0e8f6 100644 --- a/hwe/sammo/Command/General/che_징병.php +++ b/hwe/sammo/Command/General/che_징병.php @@ -111,6 +111,10 @@ class che_징병 extends Command\GeneralCommand{ } + public function getCommandDetailTitle():string{ + return "{$this->getName()}(통솔경험)"; + } + public function getCost():array{ if(!$this->isArgValid){ return [0, 0]; diff --git a/hwe/sammo/Command/General/che_첩보.php b/hwe/sammo/Command/General/che_첩보.php index dc90e0b4..4d93a97d 100644 --- a/hwe/sammo/Command/General/che_첩보.php +++ b/hwe/sammo/Command/General/che_첩보.php @@ -61,6 +61,21 @@ class che_첩보 extends Command\GeneralCommand{ ]; } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + [$reqGold, $reqRice] = $this->getCost(); + + $title = "{$name}(통솔경험"; + if($reqGold > 0){ + $title .= ", 자금{$reqGold}"; + } + if($reqRice > 0){ + $title .= ", 군량{$reqRice}"; + } + $title .= ')'; + return $title; + } + public function getCost():array{ $env = $this->env; return [$env['develcost'], $env['develcost']]; diff --git a/hwe/sammo/Command/General/che_출병.php b/hwe/sammo/Command/General/che_출병.php index 401090e5..fd08f0e4 100644 --- a/hwe/sammo/Command/General/che_출병.php +++ b/hwe/sammo/Command/General/che_출병.php @@ -65,6 +65,13 @@ class che_출병 extends Command\GeneralCommand{ ]; } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + //[$reqGold, $reqRice] = $this->getCost(); + + return "{$name}(통솔경험, 병종숙련, 군량↓)"; + } + public function getCost():array{ return [0, Util::round($this->generalObj->getVar('crew')/100)]; } diff --git a/hwe/sammo/Command/General/che_헌납.php b/hwe/sammo/Command/General/che_헌납.php index 76081093..1a233bad 100644 --- a/hwe/sammo/Command/General/che_헌납.php +++ b/hwe/sammo/Command/General/che_헌납.php @@ -73,6 +73,11 @@ class che_헌납 extends Command\GeneralCommand{ } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + return "{$name}(통솔경험)"; + } + public function getCost():array{ return [0, 0]; } diff --git a/hwe/sammo/Command/General/che_화계.php b/hwe/sammo/Command/General/che_화계.php index e2412e17..46014e66 100644 --- a/hwe/sammo/Command/General/che_화계.php +++ b/hwe/sammo/Command/General/che_화계.php @@ -127,6 +127,27 @@ class che_화계 extends Command\GeneralCommand{ ]; } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + $statTypeBase = [ + 'leadership'=>'통솔경험', + 'strength'=>'무력경험', + 'intel'=>'지력경험', + ]; + $statType = $statTypeBase[static::$statType]; + [$reqGold, $reqRice] = $this->getCost(); + + $title = "{$name}({$statType}"; + if($reqGold > 0){ + $title .= ", 자금{$reqGold}"; + } + if($reqRice > 0){ + $title .= ", 군량{$reqRice}"; + } + $title .= ')'; + return $title; + } + public function getCost():array{ $env = $this->env; $cost = $env['develcost'] * 5; diff --git a/hwe/sammo/Command/General/che_훈련.php b/hwe/sammo/Command/General/che_훈련.php index 2f5aa367..65e7a5a4 100644 --- a/hwe/sammo/Command/General/che_훈련.php +++ b/hwe/sammo/Command/General/che_훈련.php @@ -45,6 +45,21 @@ class che_훈련 extends Command\GeneralCommand{ } + public function getCommandDetailTitle():string{ + $name = $this->getName(); + [$reqGold, $reqRice] = $this->getCost(); + + $title = "{$name}(통솔경험"; + if($reqGold > 0){ + $title .= ", 자금{$reqGold}"; + } + if($reqRice > 0){ + $title .= ", 군량{$reqRice}"; + } + $title .= ')'; + return $title; + } + public function getCost():array{ return [0, 0]; }