From c4537454f9519b68be11d0dde80cd8daa1a14123 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Tue, 4 Oct 2022 10:02:39 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=B5=9C=EB=8C=80=20=EC=9E=84=EA=B4=80?= =?UTF-8?q?=EB=85=84=EB=8F=84=20=EC=88=98=20=EA=B3=84=EC=82=B0=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=9E=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/func.php | 2 +- hwe/sammo/Command/General/che_등용수락.php | 2 +- hwe/sammo/Command/General/che_하야.php | 2 +- hwe/sammo/InheritancePointManager.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hwe/func.php b/hwe/func.php index aab6aadf..c08fd628 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -1828,7 +1828,7 @@ function deleteNation(General $lord, bool $applyDB): array InheritanceKey::max_belong->value, max( $general->getVar('belong'), - ($general->getInheritancePoint(InheritanceKey::max_belong) ?? 0) / 10 + $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0 ) ); } diff --git a/hwe/sammo/Command/General/che_등용수락.php b/hwe/sammo/Command/General/che_등용수락.php index 47a4e4dd..6c47e2a3 100644 --- a/hwe/sammo/Command/General/che_등용수락.php +++ b/hwe/sammo/Command/General/che_등용수락.php @@ -184,7 +184,7 @@ class che_등용수락 extends Command\GeneralCommand{ InheritanceKey::max_belong->value, max( $general->getVar('belong'), - ($general->getInheritancePoint(InheritanceKey::max_belong) ?? 0) / 10 + $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0 ) ); } diff --git a/hwe/sammo/Command/General/che_하야.php b/hwe/sammo/Command/General/che_하야.php index 69223596..0b1f7b10 100644 --- a/hwe/sammo/Command/General/che_하야.php +++ b/hwe/sammo/Command/General/che_하야.php @@ -118,7 +118,7 @@ class che_하야 extends Command\GeneralCommand{ InheritanceKey::max_belong->value, max( $general->getVar('belong'), - ($general->getInheritancePoint(InheritanceKey::max_belong) ?? 0) / 10 + $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0 ) ); } diff --git a/hwe/sammo/InheritancePointManager.php b/hwe/sammo/InheritancePointManager.php index 1e120997..40cd97de 100644 --- a/hwe/sammo/InheritancePointManager.php +++ b/hwe/sammo/InheritancePointManager.php @@ -172,7 +172,7 @@ class InheritancePointManager break; case InheritanceKey::max_belong: $extractFn = function () use ($general, $multiplier) { - $maxBelong = max($general->getVar('belong'), ($general->getAuxVar(InheritanceKey::max_belong->value) ?? 0) / 10); + $maxBelong = max($general->getVar('belong'), $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0); return [$maxBelong * $multiplier, null]; }; break;