diff --git a/hwe/sammo/ActionNationType/che_종횡가.php b/hwe/sammo/ActionNationType/che_종횡가.php index 344895df..359360ea 100644 --- a/hwe/sammo/ActionNationType/che_종횡가.php +++ b/hwe/sammo/ActionNationType/che_종횡가.php @@ -1,42 +1,45 @@ -minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()), + ConstraintHelper::AvailableStrategicCommand(), ]; } @@ -89,7 +89,7 @@ class che_급습 extends Command\NationCommand 12, '선포 12개월 이상인 상대국에만 가능합니다.' ), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()), + ConstraintHelper::AvailableStrategicCommand(), ]; } @@ -193,7 +193,7 @@ class che_급습 extends Command\NationCommand $logger->pushNationalHistoryLog("{$generalName}{$josaYi} {$destNationName}{$commandName}{$josaUl} 발동"); $db->update('nation', [ - 'strategic_cmd_limit' => $this->getPostReqTurn() + 'strategic_cmd_limit' => $this->generalObj->onCalcStrategic($this->getName(), 'globalDelay', 9) ], 'nation=%i', $nationID); $db->update('diplomacy', [ 'term' => $db->sqleval('`term` - %i', 3), diff --git a/hwe/sammo/Command/Nation/che_백성동원.php b/hwe/sammo/Command/Nation/che_백성동원.php index 9d2d83ff..5e5a1ed7 100644 --- a/hwe/sammo/Command/Nation/che_백성동원.php +++ b/hwe/sammo/Command/Nation/che_백성동원.php @@ -60,7 +60,7 @@ class che_백성동원 extends Command\NationCommand{ $this->minConditionConstraints=[ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()) + ConstraintHelper::AvailableStrategicCommand() ]; } @@ -73,7 +73,7 @@ class che_백성동원 extends Command\NationCommand{ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), ConstraintHelper::OccupiedDestCity(), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()) + ConstraintHelper::AvailableStrategicCommand() ]; } @@ -158,7 +158,7 @@ class che_백성동원 extends Command\NationCommand{ $logger->pushNationalHistoryLog("【전략】{$nationName}{$josaYiNation} {$destCityName}백성동원을 하였습니다."); $db->update('nation', [ - 'strategic_cmd_limit' => 12 + 'strategic_cmd_limit' => $this->generalObj->onCalcStrategic($this->getName(), 'globalDelay', 9) ], 'nation=%i', $nationID); $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0)); diff --git a/hwe/sammo/Command/Nation/che_수몰.php b/hwe/sammo/Command/Nation/che_수몰.php index 6722b82f..5101bde4 100644 --- a/hwe/sammo/Command/Nation/che_수몰.php +++ b/hwe/sammo/Command/Nation/che_수몰.php @@ -60,7 +60,7 @@ class che_수몰 extends Command\NationCommand{ $this->minConditionConstraints=[ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()), + ConstraintHelper::AvailableStrategicCommand(), ]; } @@ -75,7 +75,7 @@ class che_수몰 extends Command\NationCommand{ ConstraintHelper::NotNeutralDestCity(), ConstraintHelper::NotOccupiedDestCity(), ConstraintHelper::BattleGroundCity(), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()), + ConstraintHelper::AvailableStrategicCommand(), ]; } @@ -179,7 +179,7 @@ class che_수몰 extends Command\NationCommand{ $logger->pushNationalHistoryLog("{$generalName}{$josaYi} {$destCityName}수몰을 발동"); $db->update('nation', [ - 'strategic_cmd_limit' => 12 + 'strategic_cmd_limit' => $this->generalObj->onCalcStrategic($this->getName(), 'globalDelay', 9) ], 'nation=%i', $nationID); $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0)); diff --git a/hwe/sammo/Command/Nation/che_의병모집.php b/hwe/sammo/Command/Nation/che_의병모집.php index a8e21357..95658894 100644 --- a/hwe/sammo/Command/Nation/che_의병모집.php +++ b/hwe/sammo/Command/Nation/che_의병모집.php @@ -50,7 +50,7 @@ class che_의병모집 extends Command\NationCommand ConstraintHelper::BeChief(), ConstraintHelper::NotBeNeutral(), ConstraintHelper::OccupiedCity(), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()), + ConstraintHelper::AvailableStrategicCommand(), ConstraintHelper::NotOpeningPart($relYear), ]; } @@ -232,7 +232,7 @@ class che_의병모집 extends Command\NationCommand $gameStor->npccount = $lastCreatGenIdx; $db->update('nation', [ 'gennum' => $db->sqleval('gennum + %i', $createGenCnt), - 'strategic_cmd_limit' => 12 + 'strategic_cmd_limit' => $this->generalObj->onCalcStrategic($this->getName(), 'globalDelay', 9) ], 'nation=%i', $nationID); $this->setResultTurn(new LastTurn(static::getName(), $this->arg)); diff --git a/hwe/sammo/Command/Nation/che_이호경식.php b/hwe/sammo/Command/Nation/che_이호경식.php index e377bc3d..4a741cca 100644 --- a/hwe/sammo/Command/Nation/che_이호경식.php +++ b/hwe/sammo/Command/Nation/che_이호경식.php @@ -70,7 +70,7 @@ class che_이호경식 extends Command\NationCommand $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()), + ConstraintHelper::AvailableStrategicCommand(), ]; } @@ -86,7 +86,7 @@ class che_이호경식 extends Command\NationCommand [0, 1], '선포, 전쟁중인 상대국에게만 가능합니다.' ), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()), + ConstraintHelper::AvailableStrategicCommand(), ]; } @@ -190,7 +190,7 @@ class che_이호경식 extends Command\NationCommand $logger->pushNationalHistoryLog("{$generalName}{$josaYi} {$destNationName}{$commandName}{$josaUl} 발동"); $db->update('nation', [ - 'strategic_cmd_limit' => 12 + 'strategic_cmd_limit' => $this->generalObj->onCalcStrategic($this->getName(), 'globalDelay', 9) ], 'nation=%i', $nationID); $db->update('diplomacy', [ 'term' => $db->sqleval('IF(`state`=0, %i, `term`+ %i)', 3, 3), diff --git a/hwe/sammo/Command/Nation/che_필사즉생.php b/hwe/sammo/Command/Nation/che_필사즉생.php index 3149a9ac..b6fae39b 100644 --- a/hwe/sammo/Command/Nation/che_필사즉생.php +++ b/hwe/sammo/Command/Nation/che_필사즉생.php @@ -47,7 +47,7 @@ class che_필사즉생 extends Command\NationCommand{ ConstraintHelper::AllowDiplomacyStatus($this->generalObj->getNationID(), [ 0 ], '전쟁중이 아닙니다.'), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()) + ConstraintHelper::AvailableStrategicCommand() ]; } @@ -123,7 +123,7 @@ class che_필사즉생 extends Command\NationCommand{ $logger->pushNationalHistoryLog("{$generalName}{$josaYi} 필사즉생을 발동"); $db->update('nation', [ - 'strategic_cmd_limit' => $this->getPostReqTurn() + 'strategic_cmd_limit' => $this->generalObj->onCalcStrategic($this->getName(), 'globalDelay', 9) ], 'nation=%i', $nationID); $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0)); diff --git a/hwe/sammo/Command/Nation/che_허보.php b/hwe/sammo/Command/Nation/che_허보.php index 1ac8ddc7..11fecc64 100644 --- a/hwe/sammo/Command/Nation/che_허보.php +++ b/hwe/sammo/Command/Nation/che_허보.php @@ -67,7 +67,7 @@ class che_허보 extends Command\NationCommand $this->minConditionConstraints = [ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()), + ConstraintHelper::AvailableStrategicCommand(), ]; } @@ -85,7 +85,7 @@ class che_허보 extends Command\NationCommand [0, 1], '선포, 전쟁중인 상대국에게만 가능합니다.' ), - ConstraintHelper::AvailableStrategicCommand($this->getPreReqTurn()), + ConstraintHelper::AvailableStrategicCommand(), ]; } @@ -204,7 +204,7 @@ class che_허보 extends Command\NationCommand $logger->pushNationalHistoryLog("{$generalName}{$josaYi} {$destCityName}허보를 발동"); $db->update('nation', [ - 'strategic_cmd_limit' => $this->getPostReqTurn() + 'strategic_cmd_limit' => $this->generalObj->onCalcStrategic($this->getName(), 'globalDelay', 9) ], 'nation=%i', $nationID); $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));