From e62eb36cc2810b357b3c54cc64dd1cfe8e199162 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Wed, 22 Jan 2025 18:53:08 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20event=20=EC=97=B0=EA=B5=AC=20=EC=BB=A4?= =?UTF-8?q?=EB=A7=A8=EB=93=9C=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/Nation/event_극병연구.php | 1 + hwe/sammo/Command/Nation/event_대검병연구.php | 1 + hwe/sammo/Command/Nation/event_무희연구.php | 1 + hwe/sammo/Command/Nation/event_산저병연구.php | 1 + hwe/sammo/Command/Nation/event_상병연구.php | 1 + .../Command/Nation/event_원융노병연구.php | 1 + hwe/sammo/Command/Nation/event_음귀병연구.php | 1 + hwe/sammo/Command/Nation/event_화륜차연구.php | 1 + hwe/sammo/Command/Nation/event_화시병연구.php | 1 + hwe/sammo/Enums/NationAuxKey.php | 1 - hwe/sammo/GameUnitConstraint/ReqNationAux.php | 4 +- hwe/scenario/scenario_912.json | 49 +++++++++++++++++++ 12 files changed, 60 insertions(+), 3 deletions(-) diff --git a/hwe/sammo/Command/Nation/event_극병연구.php b/hwe/sammo/Command/Nation/event_극병연구.php index fd67938b..c641b2eb 100644 --- a/hwe/sammo/Command/Nation/event_극병연구.php +++ b/hwe/sammo/Command/Nation/event_극병연구.php @@ -21,6 +21,7 @@ class event_극병연구 extends Command\NationCommand{ } protected function init(){ + $this->setCity(); $this->setNation(['gold','rice','aux']); $this->fullConditionConstraints=[]; diff --git a/hwe/sammo/Command/Nation/event_대검병연구.php b/hwe/sammo/Command/Nation/event_대검병연구.php index b8c9bd05..39205759 100644 --- a/hwe/sammo/Command/Nation/event_대검병연구.php +++ b/hwe/sammo/Command/Nation/event_대검병연구.php @@ -21,6 +21,7 @@ class event_대검병연구 extends Command\NationCommand{ } protected function init(){ + $this->setCity(); $this->setNation(['gold','rice','aux']); $this->fullConditionConstraints=[]; diff --git a/hwe/sammo/Command/Nation/event_무희연구.php b/hwe/sammo/Command/Nation/event_무희연구.php index fe543599..f179dbb7 100644 --- a/hwe/sammo/Command/Nation/event_무희연구.php +++ b/hwe/sammo/Command/Nation/event_무희연구.php @@ -21,6 +21,7 @@ class event_무희연구 extends Command\NationCommand{ } protected function init(){ + $this->setCity(); $this->setNation(['gold','rice','aux']); $this->fullConditionConstraints=[]; diff --git a/hwe/sammo/Command/Nation/event_산저병연구.php b/hwe/sammo/Command/Nation/event_산저병연구.php index 1efb37aa..713c38f1 100644 --- a/hwe/sammo/Command/Nation/event_산저병연구.php +++ b/hwe/sammo/Command/Nation/event_산저병연구.php @@ -21,6 +21,7 @@ class event_산저병연구 extends Command\NationCommand{ } protected function init(){ + $this->setCity(); $this->setNation(['gold','rice','aux']); $this->fullConditionConstraints=[]; diff --git a/hwe/sammo/Command/Nation/event_상병연구.php b/hwe/sammo/Command/Nation/event_상병연구.php index e6af1aea..e8bae555 100644 --- a/hwe/sammo/Command/Nation/event_상병연구.php +++ b/hwe/sammo/Command/Nation/event_상병연구.php @@ -21,6 +21,7 @@ class event_상병연구 extends Command\NationCommand{ } protected function init(){ + $this->setCity(); $this->setNation(['gold','rice','aux']); $this->fullConditionConstraints=[]; diff --git a/hwe/sammo/Command/Nation/event_원융노병연구.php b/hwe/sammo/Command/Nation/event_원융노병연구.php index e9d17ed9..aa80cba3 100644 --- a/hwe/sammo/Command/Nation/event_원융노병연구.php +++ b/hwe/sammo/Command/Nation/event_원융노병연구.php @@ -21,6 +21,7 @@ class event_원융노병연구 extends Command\NationCommand{ } protected function init(){ + $this->setCity(); $this->setNation(['gold','rice','aux']); $this->fullConditionConstraints=[]; diff --git a/hwe/sammo/Command/Nation/event_음귀병연구.php b/hwe/sammo/Command/Nation/event_음귀병연구.php index bd405a97..f40c605f 100644 --- a/hwe/sammo/Command/Nation/event_음귀병연구.php +++ b/hwe/sammo/Command/Nation/event_음귀병연구.php @@ -21,6 +21,7 @@ class event_음귀병연구 extends Command\NationCommand{ } protected function init(){ + $this->setCity(); $this->setNation(['gold','rice','aux']); $this->fullConditionConstraints=[]; diff --git a/hwe/sammo/Command/Nation/event_화륜차연구.php b/hwe/sammo/Command/Nation/event_화륜차연구.php index ad8eb54b..0e7a4459 100644 --- a/hwe/sammo/Command/Nation/event_화륜차연구.php +++ b/hwe/sammo/Command/Nation/event_화륜차연구.php @@ -21,6 +21,7 @@ class event_화륜차연구 extends Command\NationCommand{ } protected function init(){ + $this->setCity(); $this->setNation(['gold','rice','aux']); $this->fullConditionConstraints=[]; diff --git a/hwe/sammo/Command/Nation/event_화시병연구.php b/hwe/sammo/Command/Nation/event_화시병연구.php index 45cc4323..f69b9da4 100644 --- a/hwe/sammo/Command/Nation/event_화시병연구.php +++ b/hwe/sammo/Command/Nation/event_화시병연구.php @@ -21,6 +21,7 @@ class event_화시병연구 extends Command\NationCommand{ } protected function init(){ + $this->setCity(); $this->setNation(['gold','rice','aux']); $this->fullConditionConstraints=[]; diff --git a/hwe/sammo/Enums/NationAuxKey.php b/hwe/sammo/Enums/NationAuxKey.php index 33345298..8dcae0cf 100644 --- a/hwe/sammo/Enums/NationAuxKey.php +++ b/hwe/sammo/Enums/NationAuxKey.php @@ -22,6 +22,5 @@ enum NationAuxKey: string case can_상병사용 = 'can_상병사용'; case can_음귀병사용 = 'can_음귀병사용'; case can_무희사용 = 'can_무희사용'; - case can_흑병사용 = 'can_흑병사용'; case can_화륜차사용 = 'can_화륜차사용'; } \ No newline at end of file diff --git a/hwe/sammo/GameUnitConstraint/ReqNationAux.php b/hwe/sammo/GameUnitConstraint/ReqNationAux.php index f6b2eca2..97a8d1e9 100644 --- a/hwe/sammo/GameUnitConstraint/ReqNationAux.php +++ b/hwe/sammo/GameUnitConstraint/ReqNationAux.php @@ -87,8 +87,8 @@ class ReqNationAux extends BaseGameUnitConstraint case NationAuxKey::can_무희사용: if ($this->cmp == "==" && $this->value == 1) return "무희 연구 시 가능"; break; - case NationAuxKey::can_흑병사용: - if ($this->cmp == "==" && $this->value == 1) return "흑병 연구 시 가능"; + case NationAuxKey::can_화륜차사용: + if ($this->cmp == "==" && $this->value == 1) return "화륜차 연구 시 가능"; break; case NationAuxKey::did_특성초토화: if ($this->cmp == ">=" && $this->value == 1) return "특성 초토화 시 가능"; diff --git a/hwe/scenario/scenario_912.json b/hwe/scenario/scenario_912.json index 133583f5..ac31c07e 100644 --- a/hwe/scenario/scenario_912.json +++ b/hwe/scenario/scenario_912.json @@ -16,6 +16,55 @@ "che_돌격", "che_무쌍", "che_위압", "che_저격", "che_필살", "che_징병", "che_의술", "che_격노", "che_척사" ], + "availableChiefCommand":{ + "휴식" : [ + "휴식" + ], + "인사" : [ + "che_발령", + "che_포상", + "che_몰수", + "che_부대탈퇴지시" + ], + "외교" : [ + "che_물자원조", + "che_불가침제의", + "che_선전포고", + "che_종전제의", + "che_불가침파기제의" + ], + "특수" : [ + "che_초토화", + "che_천도", + "che_증축", + "che_감축" + ], + "전략" : [ + "che_필사즉생", + "che_백성동원", + "che_수몰", + "che_허보", + "che_의병모집", + "che_이호경식", + "che_급습", + "che_피장파장" + ], + "기타" : [ + "che_국기변경", + "che_국호변경" + ], + "연구": [ + "event_대검병연구", + "event_극병연구", + "event_화시병연구", + "event_원융노병연구", + "event_산저병연구", + "event_음귀병연구", + "event_무희연구", + "event_상병연구", + "event_화륜차연구" + ] + }, "allItems":{ "horse":{ "che_명마_01_노기":0, "che_명마_02_조랑":0, "che_명마_03_노새":0,