devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

fix: 최대 임관 년도 수 제어 규약 우회

Browse Source
This commit is contained in:
Hide_D
2022-09-22 11:54:47 +09:00
parent 9ad3dbba90
commit c1f06b4ce5
3 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func.php
+10 -7
View File
@@ -1823,13 +1823,16 @@ function deleteNation(General $lord, bool $applyDB): array
// 전 장수 재야로 // 전 장수 재야로
foreach ($nationGeneralList as $general) { foreach ($nationGeneralList as $general) {
$general->setInheritancePoint( if($general->getNPCType() < 2){
InheritanceKey::max_belong, $general->setAuxVar(
max( InheritanceKey::max_belong->value,
$general->getVar('belong'), max(
$general->getInheritancePoint(InheritanceKey::max_belong) ?? 0 $general->getVar('belong'),
) $general->getInheritancePoint(InheritanceKey::max_belong) ?? 0
); )
);
}
$general->setVar('belong', 0); $general->setVar('belong', 0);
$general->setVar('troop', 0); $general->setVar('troop', 0);
$general->setVar('officer_level', 0); $general->setVar('officer_level', 0);
hwe/sammo/Command/General/che_등용수락.php
+9 -7
View File
@@ -179,13 +179,15 @@ class che_등용수락 extends Command\GeneralCommand{
$db->update('nation', $setScoutNationValues, 'nation=%i', $destNationID); $db->update('nation', $setScoutNationValues, 'nation=%i', $destNationID);
$general->increaseInheritancePoint(InheritanceKey::active_action, 1); $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
$general->setInheritancePoint( if($general->getNPCType() < 2){
InheritanceKey::max_belong, $general->setAuxVar(
max( InheritanceKey::max_belong->value,
$general->getVar('belong'), max(
$general->getInheritancePoint(InheritanceKey::max_belong) ?? 0 $general->getVar('belong'),
) $general->getInheritancePoint(InheritanceKey::max_belong) ?? 0
); )
);
}
$general->setVar('permission', 'normal'); $general->setVar('permission', 'normal');
$general->setVar('belong', 1); $general->setVar('belong', 1);
$general->setVar('officer_level', 1); $general->setVar('officer_level', 1);
hwe/sammo/Command/General/che_하야.php
+9 -7
View File
@@ -113,13 +113,15 @@ class che_하야 extends Command\GeneralCommand{
$general->setVar('troop', 0); $general->setVar('troop', 0);
$general->increaseInheritancePoint(InheritanceKey::active_action, 1); $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
$general->setInheritancePoint( if($general->getNPCType() < 2){
InheritanceKey::max_belong, $general->setAuxVar(
max( InheritanceKey::max_belong->value,
$general->getVar('belong'), max(
$general->getInheritancePoint(InheritanceKey::max_belong) ?? 0 $general->getVar('belong'),
) $general->getInheritancePoint(InheritanceKey::max_belong) ?? 0
); )
);
}
$this->setResultTurn(new LastTurn(static::getName(), $this->arg)); $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
$general->checkStatChange(); $general->checkStatChange();