diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php index 923ba986..e34d6aa9 100644 --- a/hwe/b_myPage.php +++ b/hwe/b_myPage.php @@ -37,7 +37,8 @@ $lastRefresh = $db->queryFirstField( 'SELECT %b FROM %b WHERE %b = %i', GeneralAccessLogColumn::lastRefresh->value, TableName::generalAccessLog->value, - GeneralAccessLogColumn::generalID->value, $generalID + GeneralAccessLogColumn::generalID->value, + $generalID ); $targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart); @@ -50,13 +51,19 @@ if ($gameStor->turntime <= $gameStor->opentime) { } } - if($me->getNationID() == 0){ + if ($me->getNationID() == 0) { $showBuildNationCandidateBtn = true; } } $use_treatment = $me->getAuxVar('use_treatment') ?? 10; $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1; + +$changeDefence999Train = -3; +$changeDefence999Atmos = -6; +$changeDefence999Train = $me->onCalcDomestic('changeDefenceTrain', "train999", $changeDefence999Train); +$changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $changeDefence999Atmos); + ?> @@ -128,7 +135,10 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1; - +

id='set_my_setting' name=btn style=background-color:;color:white;width:160px;height:30px;font-size:14px; value=설정저장>
@@ -183,7 +193,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
getItems() as $itemKey => $item) : ?> - +
diff --git a/hwe/j_set_my_setting.php b/hwe/j_set_my_setting.php index 422b6670..647f0504 100644 --- a/hwe/j_set_my_setting.php +++ b/hwe/j_set_my_setting.php @@ -43,8 +43,12 @@ if($defence_train !== $me->getVar('defence_train')){ if($defence_train == 999){ $me->increaseVar('myset', -1); $me->setVar('defence_train', $defence_train); - $me->increaseVarWithLimit('train', -3, 20); - $me->increaseVarWithLimit('atmos', -6, 20); + $affectedTrain = -3; + $affectedAtmos = -6; + $affectedTrain = $me->onCalcDomestic('changeDefenceTrain', "train{$defence_train}", $affectedTrain); + $affectedAtmos = $me->onCalcDomestic('changeDefenceTrain', "atmos{$defence_atmos}", $affectedAtmos); + $me->increaseVarWithLimit('train', $affectedTrain, 20, GameConst::$maxTrainByWar); + $me->increaseVarWithLimit('atmos', $affectedAtmos, 20, GameConst::$maxAtmosByWar); } else{ $me->increaseVar('myset', -1); diff --git a/hwe/sammo/ActionScenarioEffect/event_StrongAttacker.php b/hwe/sammo/ActionScenarioEffect/event_StrongAttacker.php index ceeae8b6..5841727e 100644 --- a/hwe/sammo/ActionScenarioEffect/event_StrongAttacker.php +++ b/hwe/sammo/ActionScenarioEffect/event_StrongAttacker.php @@ -24,4 +24,12 @@ class event_StrongAttacker implements iAction } return [1, 1]; } + + public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float + { + if ($turnType == 'changeDefenceTrain') { + return 0; + } + return $value; + } }