From de09a66d6f740cf3bb671263f5a28dfdc1e5fd85 Mon Sep 17 00:00:00 2001 From: hided62 Date: Fri, 24 Jan 2025 10:07:56 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B3=91=EC=A2=85=20=EC=97=B0=EA=B5=AC?= =?UTF-8?q?=20=EC=BB=A4=EB=A7=A8=EB=93=9C=EC=97=90=EC=84=9C=20=EA=B8=88?= =?UTF-8?q?=EC=8C=80=20=EA=B2=80=EC=83=88=20=EC=95=88=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/Command/Nation/event_극병연구.php | 5 +++++ hwe/sammo/Command/Nation/event_대검병연구.php | 4 ++++ hwe/sammo/Command/Nation/event_무희연구.php | 4 ++++ hwe/sammo/Command/Nation/event_산저병연구.php | 4 ++++ hwe/sammo/Command/Nation/event_상병연구.php | 4 ++++ hwe/sammo/Command/Nation/event_원융노병연구.php | 4 ++++ hwe/sammo/Command/Nation/event_음귀병연구.php | 4 ++++ hwe/sammo/Command/Nation/event_화륜차연구.php | 4 ++++ hwe/sammo/Command/Nation/event_화시병연구.php | 4 ++++ 9 files changed, 37 insertions(+) diff --git a/hwe/sammo/Command/Nation/event_극병연구.php b/hwe/sammo/Command/Nation/event_극병연구.php index 590bb52d..c8d30d7e 100644 --- a/hwe/sammo/Command/Nation/event_극병연구.php +++ b/hwe/sammo/Command/Nation/event_극병연구.php @@ -11,6 +11,7 @@ use \sammo\JosaUtil; use sammo\Json; use sammo\LastTurn; use sammo\StaticEventHandler; +use sammo\GameConst; class event_극병연구 extends Command\NationCommand{ static protected $actionName = '극병 연구'; @@ -27,10 +28,14 @@ class event_극병연구 extends Command\NationCommand{ $name = static::$actionName; + [$reqGold, $reqRice] = $this->getCost(); + $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."), + ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold), + ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice), ]; $this->fullConditionConstraints = $this->minConditionConstraints; diff --git a/hwe/sammo/Command/Nation/event_대검병연구.php b/hwe/sammo/Command/Nation/event_대검병연구.php index 794379c5..2e3c8bf9 100644 --- a/hwe/sammo/Command/Nation/event_대검병연구.php +++ b/hwe/sammo/Command/Nation/event_대검병연구.php @@ -11,6 +11,7 @@ use \sammo\JosaUtil; use sammo\Json; use sammo\LastTurn; use sammo\StaticEventHandler; +use sammo\GameConst; class event_대검병연구 extends Command\NationCommand{ static protected $actionName = '대검병 연구'; @@ -27,10 +28,13 @@ class event_대검병연구 extends Command\NationCommand{ $name = static::$actionName; + [$reqGold, $reqRice] = $this->getCost(); $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."), + ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold), + ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice), ]; $this->fullConditionConstraints = $this->minConditionConstraints; diff --git a/hwe/sammo/Command/Nation/event_무희연구.php b/hwe/sammo/Command/Nation/event_무희연구.php index 911f6260..c38351ee 100644 --- a/hwe/sammo/Command/Nation/event_무희연구.php +++ b/hwe/sammo/Command/Nation/event_무희연구.php @@ -11,6 +11,7 @@ use \sammo\JosaUtil; use sammo\Json; use sammo\LastTurn; use sammo\StaticEventHandler; +use sammo\GameConst; class event_무희연구 extends Command\NationCommand{ static protected $actionName = '무희 연구'; @@ -27,10 +28,13 @@ class event_무희연구 extends Command\NationCommand{ $name = static::$actionName; + [$reqGold, $reqRice] = $this->getCost(); $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."), + ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold), + ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice), ]; $this->fullConditionConstraints = $this->minConditionConstraints; diff --git a/hwe/sammo/Command/Nation/event_산저병연구.php b/hwe/sammo/Command/Nation/event_산저병연구.php index c3ec12ca..21ece11f 100644 --- a/hwe/sammo/Command/Nation/event_산저병연구.php +++ b/hwe/sammo/Command/Nation/event_산저병연구.php @@ -11,6 +11,7 @@ use \sammo\JosaUtil; use sammo\Json; use sammo\LastTurn; use sammo\StaticEventHandler; +use sammo\GameConst; class event_산저병연구 extends Command\NationCommand{ static protected $actionName = '산저병 연구'; @@ -27,10 +28,13 @@ class event_산저병연구 extends Command\NationCommand{ $name = static::$actionName; + [$reqGold, $reqRice] = $this->getCost(); $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."), + ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold), + ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice), ]; $this->fullConditionConstraints = $this->minConditionConstraints; diff --git a/hwe/sammo/Command/Nation/event_상병연구.php b/hwe/sammo/Command/Nation/event_상병연구.php index 4cbc72e0..9bbc5d6e 100644 --- a/hwe/sammo/Command/Nation/event_상병연구.php +++ b/hwe/sammo/Command/Nation/event_상병연구.php @@ -11,6 +11,7 @@ use \sammo\JosaUtil; use sammo\Json; use sammo\LastTurn; use sammo\StaticEventHandler; +use sammo\GameConst; class event_상병연구 extends Command\NationCommand{ static protected $actionName = '상병 연구'; @@ -27,10 +28,13 @@ class event_상병연구 extends Command\NationCommand{ $name = static::$actionName; + [$reqGold, $reqRice] = $this->getCost(); $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."), + ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold), + ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice), ]; $this->fullConditionConstraints = $this->minConditionConstraints; diff --git a/hwe/sammo/Command/Nation/event_원융노병연구.php b/hwe/sammo/Command/Nation/event_원융노병연구.php index 9bbfa19b..9ab70fe3 100644 --- a/hwe/sammo/Command/Nation/event_원융노병연구.php +++ b/hwe/sammo/Command/Nation/event_원융노병연구.php @@ -11,6 +11,7 @@ use \sammo\JosaUtil; use sammo\Json; use sammo\LastTurn; use sammo\StaticEventHandler; +use sammo\GameConst; class event_원융노병연구 extends Command\NationCommand{ static protected $actionName = '원융노병 연구'; @@ -27,10 +28,13 @@ class event_원융노병연구 extends Command\NationCommand{ $name = static::$actionName; + [$reqGold, $reqRice] = $this->getCost(); $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."), + ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold), + ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice), ]; $this->fullConditionConstraints = $this->minConditionConstraints; diff --git a/hwe/sammo/Command/Nation/event_음귀병연구.php b/hwe/sammo/Command/Nation/event_음귀병연구.php index 2636c114..63808979 100644 --- a/hwe/sammo/Command/Nation/event_음귀병연구.php +++ b/hwe/sammo/Command/Nation/event_음귀병연구.php @@ -11,6 +11,7 @@ use \sammo\JosaUtil; use sammo\Json; use sammo\LastTurn; use sammo\StaticEventHandler; +use sammo\GameConst; class event_음귀병연구 extends Command\NationCommand{ static protected $actionName = '음귀병 연구'; @@ -27,10 +28,13 @@ class event_음귀병연구 extends Command\NationCommand{ $name = static::$actionName; + [$reqGold, $reqRice] = $this->getCost(); $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."), + ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold), + ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice), ]; $this->fullConditionConstraints = $this->minConditionConstraints; diff --git a/hwe/sammo/Command/Nation/event_화륜차연구.php b/hwe/sammo/Command/Nation/event_화륜차연구.php index 0b303c80..e595962b 100644 --- a/hwe/sammo/Command/Nation/event_화륜차연구.php +++ b/hwe/sammo/Command/Nation/event_화륜차연구.php @@ -11,6 +11,7 @@ use \sammo\JosaUtil; use sammo\Json; use sammo\LastTurn; use sammo\StaticEventHandler; +use sammo\GameConst; class event_화륜차연구 extends Command\NationCommand{ static protected $actionName = '화륜차 연구'; @@ -27,10 +28,13 @@ class event_화륜차연구 extends Command\NationCommand{ $name = static::$actionName; + [$reqGold, $reqRice] = $this->getCost(); $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."), + ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold), + ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice), ]; $this->fullConditionConstraints = $this->minConditionConstraints; diff --git a/hwe/sammo/Command/Nation/event_화시병연구.php b/hwe/sammo/Command/Nation/event_화시병연구.php index 96b29e5e..4e2fbee4 100644 --- a/hwe/sammo/Command/Nation/event_화시병연구.php +++ b/hwe/sammo/Command/Nation/event_화시병연구.php @@ -11,6 +11,7 @@ use \sammo\JosaUtil; use sammo\Json; use sammo\LastTurn; use sammo\StaticEventHandler; +use sammo\GameConst; class event_화시병연구 extends Command\NationCommand{ static protected $actionName = '화시병 연구'; @@ -27,10 +28,13 @@ class event_화시병연구 extends Command\NationCommand{ $name = static::$actionName; + [$reqGold, $reqRice] = $this->getCost(); $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."), + ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold), + ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice), ]; $this->fullConditionConstraints = $this->minConditionConstraints;