From fba966177dbe5caa48d5db25831fee58a8111ccd Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sat, 25 Jan 2025 19:52:28 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B3=A0=EA=B8=89=EB=AA=A8=EB=93=9C=20?= =?UTF-8?q?=20=EC=97=B0=EA=B5=AC=ED=84=B4=20=EC=BB=A4=EB=A7=A8=EB=93=9C=20?= =?UTF-8?q?=EC=B0=BD=20=EB=84=98=EC=B9=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/Command/Nation/event_극병연구.php | 8 +++++--- hwe/sammo/Command/Nation/event_대검병연구.php | 8 +++++--- hwe/sammo/Command/Nation/event_무희연구.php | 8 +++++--- hwe/sammo/Command/Nation/event_산저병연구.php | 8 +++++--- hwe/sammo/Command/Nation/event_상병연구.php | 8 +++++--- hwe/sammo/Command/Nation/event_원융노병연구.php | 8 +++++--- hwe/sammo/Command/Nation/event_음귀병연구.php | 8 +++++--- hwe/sammo/Command/Nation/event_화륜차연구.php | 8 +++++--- hwe/sammo/Command/Nation/event_화시병연구.php | 8 +++++--- 9 files changed, 45 insertions(+), 27 deletions(-) diff --git a/hwe/sammo/Command/Nation/event_극병연구.php b/hwe/sammo/Command/Nation/event_극병연구.php index c8d30d7e..307e9d6d 100644 --- a/hwe/sammo/Command/Nation/event_극병연구.php +++ b/hwe/sammo/Command/Nation/event_극병연구.php @@ -44,11 +44,13 @@ class event_극병연구 extends Command\NationCommand{ public function getCommandDetailTitle():string{ $name = $this->getName(); - [$reqGold, $reqRice] = array_map('number_format', $this->getCost()); - $amount = number_format($this->env['develcost'] * 5); + [$reqGold, $reqRice] = $this->getCost(); $reqTurn = $this->getPreReqTurn()+1; - return "{$name}/{$reqTurn}턴(금 {$reqGold}, 쌀 {$reqRice})"; + $reqGoldD5 = number_format($reqGold / 10000); + $reqRiceD5 = number_format($reqRice / 10000); + + return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)"; } public function getPreReqTurn():int{ diff --git a/hwe/sammo/Command/Nation/event_대검병연구.php b/hwe/sammo/Command/Nation/event_대검병연구.php index 2e3c8bf9..b36945b2 100644 --- a/hwe/sammo/Command/Nation/event_대검병연구.php +++ b/hwe/sammo/Command/Nation/event_대검병연구.php @@ -43,11 +43,13 @@ class event_대검병연구 extends Command\NationCommand{ public function getCommandDetailTitle():string{ $name = $this->getName(); - [$reqGold, $reqRice] = array_map('number_format', $this->getCost()); - $amount = number_format($this->env['develcost'] * 5); + [$reqGold, $reqRice] = $this->getCost(); $reqTurn = $this->getPreReqTurn()+1; - return "{$name}/{$reqTurn}턴(금 {$reqGold}, 쌀 {$reqRice})"; + $reqGoldD5 = number_format($reqGold / 10000); + $reqRiceD5 = number_format($reqRice / 10000); + + return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)"; } public function getPreReqTurn():int{ diff --git a/hwe/sammo/Command/Nation/event_무희연구.php b/hwe/sammo/Command/Nation/event_무희연구.php index c38351ee..c1661a21 100644 --- a/hwe/sammo/Command/Nation/event_무희연구.php +++ b/hwe/sammo/Command/Nation/event_무희연구.php @@ -43,11 +43,13 @@ class event_무희연구 extends Command\NationCommand{ public function getCommandDetailTitle():string{ $name = $this->getName(); - [$reqGold, $reqRice] = array_map('number_format', $this->getCost()); - $amount = number_format($this->env['develcost'] * 5); + [$reqGold, $reqRice] = $this->getCost(); $reqTurn = $this->getPreReqTurn()+1; - return "{$name}/{$reqTurn}턴(금 {$reqGold}, 쌀 {$reqRice})"; + $reqGoldD5 = number_format($reqGold / 10000); + $reqRiceD5 = number_format($reqRice / 10000); + + return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)"; } public function getPreReqTurn():int{ diff --git a/hwe/sammo/Command/Nation/event_산저병연구.php b/hwe/sammo/Command/Nation/event_산저병연구.php index 21ece11f..ca48f193 100644 --- a/hwe/sammo/Command/Nation/event_산저병연구.php +++ b/hwe/sammo/Command/Nation/event_산저병연구.php @@ -43,11 +43,13 @@ class event_산저병연구 extends Command\NationCommand{ public function getCommandDetailTitle():string{ $name = $this->getName(); - [$reqGold, $reqRice] = array_map('number_format', $this->getCost()); - $amount = number_format($this->env['develcost'] * 5); + [$reqGold, $reqRice] = $this->getCost(); $reqTurn = $this->getPreReqTurn()+1; - return "{$name}/{$reqTurn}턴(금 {$reqGold}, 쌀 {$reqRice})"; + $reqGoldD5 = number_format($reqGold / 10000); + $reqRiceD5 = number_format($reqRice / 10000); + + return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)"; } public function getPreReqTurn():int{ diff --git a/hwe/sammo/Command/Nation/event_상병연구.php b/hwe/sammo/Command/Nation/event_상병연구.php index 9bbc5d6e..cdec88a6 100644 --- a/hwe/sammo/Command/Nation/event_상병연구.php +++ b/hwe/sammo/Command/Nation/event_상병연구.php @@ -43,11 +43,13 @@ class event_상병연구 extends Command\NationCommand{ public function getCommandDetailTitle():string{ $name = $this->getName(); - [$reqGold, $reqRice] = array_map('number_format', $this->getCost()); - $amount = number_format($this->env['develcost'] * 5); + [$reqGold, $reqRice] = $this->getCost(); $reqTurn = $this->getPreReqTurn()+1; - return "{$name}/{$reqTurn}턴(금 {$reqGold}, 쌀 {$reqRice})"; + $reqGoldD5 = number_format($reqGold / 10000); + $reqRiceD5 = number_format($reqRice / 10000); + + return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)"; } public function getPreReqTurn():int{ diff --git a/hwe/sammo/Command/Nation/event_원융노병연구.php b/hwe/sammo/Command/Nation/event_원융노병연구.php index 9ab70fe3..70882266 100644 --- a/hwe/sammo/Command/Nation/event_원융노병연구.php +++ b/hwe/sammo/Command/Nation/event_원융노병연구.php @@ -43,11 +43,13 @@ class event_원융노병연구 extends Command\NationCommand{ public function getCommandDetailTitle():string{ $name = $this->getName(); - [$reqGold, $reqRice] = array_map('number_format', $this->getCost()); - $amount = number_format($this->env['develcost'] * 5); + [$reqGold, $reqRice] = $this->getCost(); $reqTurn = $this->getPreReqTurn()+1; - return "{$name}/{$reqTurn}턴(금 {$reqGold}, 쌀 {$reqRice})"; + $reqGoldD5 = number_format($reqGold / 10000); + $reqRiceD5 = number_format($reqRice / 10000); + + return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)"; } public function getPreReqTurn():int{ diff --git a/hwe/sammo/Command/Nation/event_음귀병연구.php b/hwe/sammo/Command/Nation/event_음귀병연구.php index 63808979..6dea1ca6 100644 --- a/hwe/sammo/Command/Nation/event_음귀병연구.php +++ b/hwe/sammo/Command/Nation/event_음귀병연구.php @@ -43,11 +43,13 @@ class event_음귀병연구 extends Command\NationCommand{ public function getCommandDetailTitle():string{ $name = $this->getName(); - [$reqGold, $reqRice] = array_map('number_format', $this->getCost()); - $amount = number_format($this->env['develcost'] * 5); + [$reqGold, $reqRice] = $this->getCost(); $reqTurn = $this->getPreReqTurn()+1; - return "{$name}/{$reqTurn}턴(금 {$reqGold}, 쌀 {$reqRice})"; + $reqGoldD5 = number_format($reqGold / 10000); + $reqRiceD5 = number_format($reqRice / 10000); + + return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)"; } public function getPreReqTurn():int{ diff --git a/hwe/sammo/Command/Nation/event_화륜차연구.php b/hwe/sammo/Command/Nation/event_화륜차연구.php index e595962b..f372fac3 100644 --- a/hwe/sammo/Command/Nation/event_화륜차연구.php +++ b/hwe/sammo/Command/Nation/event_화륜차연구.php @@ -43,11 +43,13 @@ class event_화륜차연구 extends Command\NationCommand{ public function getCommandDetailTitle():string{ $name = $this->getName(); - [$reqGold, $reqRice] = array_map('number_format', $this->getCost()); - $amount = number_format($this->env['develcost'] * 5); + [$reqGold, $reqRice] = $this->getCost(); $reqTurn = $this->getPreReqTurn()+1; - return "{$name}/{$reqTurn}턴(금 {$reqGold}, 쌀 {$reqRice})"; + $reqGoldD5 = number_format($reqGold / 10000); + $reqRiceD5 = number_format($reqRice / 10000); + + return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)"; } public function getPreReqTurn():int{ diff --git a/hwe/sammo/Command/Nation/event_화시병연구.php b/hwe/sammo/Command/Nation/event_화시병연구.php index 4e2fbee4..15268935 100644 --- a/hwe/sammo/Command/Nation/event_화시병연구.php +++ b/hwe/sammo/Command/Nation/event_화시병연구.php @@ -43,11 +43,13 @@ class event_화시병연구 extends Command\NationCommand{ public function getCommandDetailTitle():string{ $name = $this->getName(); - [$reqGold, $reqRice] = array_map('number_format', $this->getCost()); - $amount = number_format($this->env['develcost'] * 5); + [$reqGold, $reqRice] = $this->getCost(); $reqTurn = $this->getPreReqTurn()+1; - return "{$name}/{$reqTurn}턴(금 {$reqGold}, 쌀 {$reqRice})"; + $reqGoldD5 = number_format($reqGold / 10000); + $reqRiceD5 = number_format($reqRice / 10000); + + return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)"; } public function getPreReqTurn():int{