From 40ecca544082e18c15797e3ab9151f307925ce83 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sat, 24 Feb 2024 11:28:38 +0000 Subject: [PATCH] =?UTF-8?q?game,=20feat:=20=EC=BB=A4=EB=A7=A8=EB=93=9C?= =?UTF-8?q?=EB=A7=88=EB=8B=A4=20=EB=8B=A4=EB=A5=B8=20=EB=9E=9C=EB=8D=A4?= =?UTF-8?q?=EA=B0=92=EC=9C=BC=EB=A1=9C=20=EC=9C=A0=EB=8B=88=ED=81=AC=20?= =?UTF-8?q?=EC=8B=9C=EB=8F=84=20-=20=EC=82=AC=EC=A0=84=20=EA=B1=B0?= =?UTF-8?q?=EB=B3=91=20=ED=9B=84=20=EA=B0=9C=EC=9D=B8=20=ED=84=B4=EC=9D=BC?= =?UTF-8?q?=20=EB=95=8C,=20=EC=9C=A0=EB=8B=88=ED=81=AC=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=EC=9D=B4=20=EB=B0=9C=EC=83=9D=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=EA=B0=80=20=EC=9E=88=EC=97=88=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/func_gamerule.php | 17 ++++++++++++++--- hwe/sammo/Command/General/che_강행.php | 2 +- hwe/sammo/Command/General/che_거병.php | 2 +- hwe/sammo/Command/General/che_건국.php | 2 +- hwe/sammo/Command/General/che_견문.php | 2 +- hwe/sammo/Command/General/che_군량매매.php | 2 +- hwe/sammo/Command/General/che_귀환.php | 2 +- hwe/sammo/Command/General/che_기술연구.php | 2 +- hwe/sammo/Command/General/che_단련.php | 2 +- hwe/sammo/Command/General/che_등용.php | 2 +- hwe/sammo/Command/General/che_랜덤임관.php | 2 +- hwe/sammo/Command/General/che_무작위건국.php | 2 +- hwe/sammo/Command/General/che_물자조달.php | 2 +- hwe/sammo/Command/General/che_사기진작.php | 2 +- hwe/sammo/Command/General/che_상업투자.php | 2 +- hwe/sammo/Command/General/che_숙련전환.php | 2 +- hwe/sammo/Command/General/che_은퇴.php | 2 +- hwe/sammo/Command/General/che_이동.php | 2 +- hwe/sammo/Command/General/che_인재탐색.php | 4 ++-- hwe/sammo/Command/General/che_임관.php | 2 +- hwe/sammo/Command/General/che_장비매매.php | 2 +- hwe/sammo/Command/General/che_장수대상임관.php | 2 +- hwe/sammo/Command/General/che_전투태세.php | 2 +- .../Command/General/che_전투특기초기화.php | 2 +- hwe/sammo/Command/General/che_정착장려.php | 2 +- hwe/sammo/Command/General/che_주민선정.php | 2 +- hwe/sammo/Command/General/che_증여.php | 2 +- hwe/sammo/Command/General/che_집합.php | 2 +- hwe/sammo/Command/General/che_징병.php | 2 +- hwe/sammo/Command/General/che_출병.php | 2 +- hwe/sammo/Command/General/che_헌납.php | 2 +- hwe/sammo/Command/General/che_훈련.php | 2 +- hwe/sammo/Command/General/cr_건국.php | 2 +- hwe/sammo/Command/General/cr_맹훈련.php | 2 +- 34 files changed, 48 insertions(+), 37 deletions(-) diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index 462c2048..ed2dca4d 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -951,8 +951,19 @@ function updateMaxDomesticCritical(General $general, $score) } } -function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil +function genGenericUniqueRNG(int $year, int $month, int $generalID, ?string $reason = null): RandUtil { + if($reason){ + return new RandUtil(new LiteHashDRBG(Util::simpleSerialize( + UniqueConst::$hiddenSeed, + 'unique', + $year, + $month, + $generalID, + $reason + ))); + } + return new RandUtil(new LiteHashDRBG(Util::simpleSerialize( UniqueConst::$hiddenSeed, 'unique', @@ -962,7 +973,7 @@ function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil ))); } -function genGenericUniqueRNGFromGeneral(General $general): RandUtil +function genGenericUniqueRNGFromGeneral(General $general, string $reason): RandUtil { $logger = $general->getLogger(); if (!$logger) { @@ -971,5 +982,5 @@ function genGenericUniqueRNGFromGeneral(General $general): RandUtil $year = $logger->getYear(); $month = $logger->getMonth(); $generalID = $general->getID(); - return genGenericUniqueRNG($year, $month, $generalID); + return genGenericUniqueRNG($year, $month, $generalID, $reason); } diff --git a/hwe/sammo/Command/General/che_강행.php b/hwe/sammo/Command/General/che_강행.php index 2ac36f5a..4ae55969 100644 --- a/hwe/sammo/Command/General/che_강행.php +++ b/hwe/sammo/Command/General/che_강행.php @@ -158,7 +158,7 @@ class che_강행 extends Command\GeneralCommand $general->increaseVar('leadership_exp', 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); diff --git a/hwe/sammo/Command/General/che_거병.php b/hwe/sammo/Command/General/che_거병.php index 2914f430..74ad94a0 100644 --- a/hwe/sammo/Command/General/che_거병.php +++ b/hwe/sammo/Command/General/che_거병.php @@ -174,7 +174,7 @@ class che_거병 extends Command\GeneralCommand{ $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); diff --git a/hwe/sammo/Command/General/che_건국.php b/hwe/sammo/Command/General/che_건국.php index 1e6747c1..6603ca99 100644 --- a/hwe/sammo/Command/General/che_건국.php +++ b/hwe/sammo/Command/General/che_건국.php @@ -201,7 +201,7 @@ class che_건국 extends Command\GeneralCommand $general->increaseInheritancePoint(InheritanceKey::active_action, 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '건국'); + tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국'); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_견문.php b/hwe/sammo/Command/General/che_견문.php index 1af237da..3f5871d3 100644 --- a/hwe/sammo/Command/General/che_견문.php +++ b/hwe/sammo/Command/General/che_견문.php @@ -112,7 +112,7 @@ class che_견문 extends Command\GeneralCommand{ $general->addExperience($exp); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); diff --git a/hwe/sammo/Command/General/che_군량매매.php b/hwe/sammo/Command/General/che_군량매매.php index 1bdad1a1..ee49479e 100644 --- a/hwe/sammo/Command/General/che_군량매매.php +++ b/hwe/sammo/Command/General/che_군량매매.php @@ -178,7 +178,7 @@ class che_군량매매 extends Command\GeneralCommand{ $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); diff --git a/hwe/sammo/Command/General/che_귀환.php b/hwe/sammo/Command/General/che_귀환.php index 30096673..bef962c4 100644 --- a/hwe/sammo/Command/General/che_귀환.php +++ b/hwe/sammo/Command/General/che_귀환.php @@ -95,7 +95,7 @@ class che_귀환 extends Command\GeneralCommand{ $general->increaseVar('leadership_exp', 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); diff --git a/hwe/sammo/Command/General/che_기술연구.php b/hwe/sammo/Command/General/che_기술연구.php index 6bb824b3..7e416f39 100644 --- a/hwe/sammo/Command/General/che_기술연구.php +++ b/hwe/sammo/Command/General/che_기술연구.php @@ -134,7 +134,7 @@ class che_기술연구 extends che_상업투자{ $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_단련.php b/hwe/sammo/Command/General/che_단련.php index b4d18345..af20f289 100644 --- a/hwe/sammo/Command/General/che_단련.php +++ b/hwe/sammo/Command/General/che_단련.php @@ -126,7 +126,7 @@ class che_단련 extends Command\GeneralCommand{ $general->increaseVar($incStat, 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_등용.php b/hwe/sammo/Command/General/che_등용.php index d8216008..58db248c 100644 --- a/hwe/sammo/Command/General/che_등용.php +++ b/hwe/sammo/Command/General/che_등용.php @@ -169,7 +169,7 @@ class che_등용 extends Command\GeneralCommand $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); diff --git a/hwe/sammo/Command/General/che_랜덤임관.php b/hwe/sammo/Command/General/che_랜덤임관.php index e35548a3..15243598 100644 --- a/hwe/sammo/Command/General/che_랜덤임관.php +++ b/hwe/sammo/Command/General/che_랜덤임관.php @@ -281,7 +281,7 @@ class che_랜덤임관 extends Command\GeneralCommand $general->addExperience($exp); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '랜덤 임관'); + tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '랜덤 임관'); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_무작위건국.php b/hwe/sammo/Command/General/che_무작위건국.php index 02dc8327..1406ec41 100644 --- a/hwe/sammo/Command/General/che_무작위건국.php +++ b/hwe/sammo/Command/General/che_무작위건국.php @@ -216,7 +216,7 @@ class che_무작위건국 extends Command\GeneralCommand $general->increaseInheritancePoint(InheritanceKey::active_action, 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '건국'); + tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국'); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_물자조달.php b/hwe/sammo/Command/General/che_물자조달.php index 37d4479b..4f2e994c 100644 --- a/hwe/sammo/Command/General/che_물자조달.php +++ b/hwe/sammo/Command/General/che_물자조달.php @@ -148,7 +148,7 @@ class che_물자조달 extends Command\GeneralCommand{ $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); diff --git a/hwe/sammo/Command/General/che_사기진작.php b/hwe/sammo/Command/General/che_사기진작.php index 62c1757f..20b15165 100644 --- a/hwe/sammo/Command/General/che_사기진작.php +++ b/hwe/sammo/Command/General/che_사기진작.php @@ -106,7 +106,7 @@ class che_사기진작 extends Command\GeneralCommand{ $general->increaseVar('leadership_exp', 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_상업투자.php b/hwe/sammo/Command/General/che_상업투자.php index 2efab27c..090945cc 100644 --- a/hwe/sammo/Command/General/che_상업투자.php +++ b/hwe/sammo/Command/General/che_상업투자.php @@ -218,7 +218,7 @@ class che_상업투자 extends Command\GeneralCommand{ $general->increaseVar(static::$statKey.'_exp', 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_숙련전환.php b/hwe/sammo/Command/General/che_숙련전환.php index b5a5a2fa..e775f932 100644 --- a/hwe/sammo/Command/General/che_숙련전환.php +++ b/hwe/sammo/Command/General/che_숙련전환.php @@ -179,7 +179,7 @@ class che_숙련전환 extends Command\GeneralCommand $general->increaseVar('leadership_exp', 2); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_은퇴.php b/hwe/sammo/Command/General/che_은퇴.php index fad5a7a1..f134e5b8 100644 --- a/hwe/sammo/Command/General/che_은퇴.php +++ b/hwe/sammo/Command/General/che_은퇴.php @@ -75,7 +75,7 @@ class che_은퇴 extends Command\GeneralCommand{ $logger->pushGeneralActionLog("은퇴하였습니다. <1>$date"); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_이동.php b/hwe/sammo/Command/General/che_이동.php index edbd88eb..8301f313 100644 --- a/hwe/sammo/Command/General/che_이동.php +++ b/hwe/sammo/Command/General/che_이동.php @@ -164,7 +164,7 @@ class che_이동 extends Command\GeneralCommand $general->increaseVar('leadership_exp', 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); diff --git a/hwe/sammo/Command/General/che_인재탐색.php b/hwe/sammo/Command/General/che_인재탐색.php index 6d1a33c1..9daf78cc 100644 --- a/hwe/sammo/Command/General/che_인재탐색.php +++ b/hwe/sammo/Command/General/che_인재탐색.php @@ -152,7 +152,7 @@ class che_인재탐색 extends Command\GeneralCommand $general->increaseVar($incStat, 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; } @@ -218,7 +218,7 @@ class che_인재탐색 extends Command\GeneralCommand $general->increaseVar($incStat, 3); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; } diff --git a/hwe/sammo/Command/General/che_임관.php b/hwe/sammo/Command/General/che_임관.php index 06c7f229..5be02ea0 100644 --- a/hwe/sammo/Command/General/che_임관.php +++ b/hwe/sammo/Command/General/che_임관.php @@ -172,7 +172,7 @@ class che_임관 extends Command\GeneralCommand $general->addExperience($exp); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_장비매매.php b/hwe/sammo/Command/General/che_장비매매.php index a786c8d2..6bf64fc2 100644 --- a/hwe/sammo/Command/General/che_장비매매.php +++ b/hwe/sammo/Command/General/che_장비매매.php @@ -196,7 +196,7 @@ class che_장비매매 extends Command\GeneralCommand $general->addExperience($exp); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_장수대상임관.php b/hwe/sammo/Command/General/che_장수대상임관.php index 5f97b9c9..0f766b91 100644 --- a/hwe/sammo/Command/General/che_장수대상임관.php +++ b/hwe/sammo/Command/General/che_장수대상임관.php @@ -170,7 +170,7 @@ class che_장수대상임관 extends Command\GeneralCommand{ $general->addExperience($exp); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_전투태세.php b/hwe/sammo/Command/General/che_전투태세.php index bd96e9ba..fcd97842 100644 --- a/hwe/sammo/Command/General/che_전투태세.php +++ b/hwe/sammo/Command/General/che_전투태세.php @@ -121,7 +121,7 @@ class che_전투태세 extends Command\GeneralCommand{ $general->increaseVar('leadership_exp', 3); $this->setResultTurn($turnResult); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_전투특기초기화.php b/hwe/sammo/Command/General/che_전투특기초기화.php index 93b8117d..00f692d9 100644 --- a/hwe/sammo/Command/General/che_전투특기초기화.php +++ b/hwe/sammo/Command/General/che_전투특기초기화.php @@ -103,7 +103,7 @@ class che_전투특기초기화 extends Command\GeneralCommand{ $logger->pushGeneralActionLog("새로운 {$specialName}를 가질 준비가 되었습니다. <1>$date"); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_정착장려.php b/hwe/sammo/Command/General/che_정착장려.php index 6df6de64..c5fafc12 100644 --- a/hwe/sammo/Command/General/che_정착장려.php +++ b/hwe/sammo/Command/General/che_정착장려.php @@ -188,7 +188,7 @@ class che_정착장려 extends Command\GeneralCommand{ $general->increaseVar(static::$statKey.'_exp', 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_주민선정.php b/hwe/sammo/Command/General/che_주민선정.php index af8f7009..4d68704d 100644 --- a/hwe/sammo/Command/General/che_주민선정.php +++ b/hwe/sammo/Command/General/che_주민선정.php @@ -188,7 +188,7 @@ class che_주민선정 extends Command\GeneralCommand{ $general->increaseVar(static::$statKey.'_exp', 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_증여.php b/hwe/sammo/Command/General/che_증여.php index e6e2e6f9..5e788e01 100644 --- a/hwe/sammo/Command/General/che_증여.php +++ b/hwe/sammo/Command/General/che_증여.php @@ -170,7 +170,7 @@ class che_증여 extends Command\GeneralCommand $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); $destGeneral->applyDB($db); diff --git a/hwe/sammo/Command/General/che_집합.php b/hwe/sammo/Command/General/che_집합.php index 2e7ef85e..5ab7cb9b 100644 --- a/hwe/sammo/Command/General/che_집합.php +++ b/hwe/sammo/Command/General/che_집합.php @@ -103,7 +103,7 @@ class che_집합 extends Command\GeneralCommand{ $general->increaseVar('leadership_exp', 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_징병.php b/hwe/sammo/Command/General/che_징병.php index e733dcce..d7c50b3f 100644 --- a/hwe/sammo/Command/General/che_징병.php +++ b/hwe/sammo/Command/General/che_징병.php @@ -227,7 +227,7 @@ class che_징병 extends Command\GeneralCommand $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); $general->setAuxVar('armType', $reqCrewType->armType); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_출병.php b/hwe/sammo/Command/General/che_출병.php index 7cfcacf7..afcd262b 100644 --- a/hwe/sammo/Command/General/che_출병.php +++ b/hwe/sammo/Command/General/che_출병.php @@ -253,7 +253,7 @@ class che_출병 extends Command\GeneralCommand processWar($warRngSeed, $general, $this->nation, $this->destCity); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_헌납.php b/hwe/sammo/Command/General/che_헌납.php index c95f6912..7bf0581c 100644 --- a/hwe/sammo/Command/General/che_헌납.php +++ b/hwe/sammo/Command/General/che_헌납.php @@ -146,7 +146,7 @@ class che_헌납 extends Command\GeneralCommand $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/che_훈련.php b/hwe/sammo/Command/General/che_훈련.php index 528f23e9..fc4c0234 100644 --- a/hwe/sammo/Command/General/che_훈련.php +++ b/hwe/sammo/Command/General/che_훈련.php @@ -107,7 +107,7 @@ class che_훈련 extends Command\GeneralCommand{ $general->increaseVar('leadership_exp', 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/cr_건국.php b/hwe/sammo/Command/General/cr_건국.php index aff4d3a5..17293789 100644 --- a/hwe/sammo/Command/General/cr_건국.php +++ b/hwe/sammo/Command/General/cr_건국.php @@ -201,7 +201,7 @@ class cr_건국 extends Command\GeneralCommand $general->increaseInheritancePoint(InheritanceKey::active_action, 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '건국'); + tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국'); $general->applyDB($db); return true; diff --git a/hwe/sammo/Command/General/cr_맹훈련.php b/hwe/sammo/Command/General/cr_맹훈련.php index 58d5ed60..d44ff127 100644 --- a/hwe/sammo/Command/General/cr_맹훈련.php +++ b/hwe/sammo/Command/General/cr_맹훈련.php @@ -105,7 +105,7 @@ class cr_맹훈련 extends Command\GeneralCommand{ $general->increaseVar('leadership_exp', 1); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $general->checkStatChange(); - tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general); + tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general); $general->applyDB($db); return true;