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

관직 임명 보정

Browse Source
This commit is contained in:
Hide_D
2020-04-26 04:48:31 +09:00
parent baf4d3aa98
commit 2bb6ef8efb
2 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/a_kingdomList.php
+1 -1
View File
@@ -99,7 +99,7 @@ foreach ($nations as $nation) {
<td width=80 align=center id=bg1>국 력</td> <td width=80 align=center id=bg1>국 력</td>
<td width=170 align=center>{$nation['power']}</td> <td width=170 align=center>{$nation['power']}</td>
<td width=80 align=center id=bg1>장수 / 속령</td> <td width=80 align=center id=bg1>장수 / 속령</td>
<td width=170 align=center>".count($generals)." / ".count($nation['cities'])."</td> <td width=170 align=center>".count($generals??[])." / ".count($nation['cities']??[])."</td>
"; ";
for($chiefLevel = 12; $chiefLevel >= 5; $chiefLevel--){ for($chiefLevel = 12; $chiefLevel >= 5; $chiefLevel--){
if($chiefLevel % 4 == 0){ if($chiefLevel % 4 == 0){
hwe/sammo/GeneralAI.php
+30 -12
View File
@@ -3048,19 +3048,21 @@ class GeneralAI
$this->categorizeNationCities(); $this->categorizeNationCities();
$month = $this->env['month']; $month = $this->env['month'];
if($npcType >= 2 && $general->getVar('officer_level') == 12){ if($npcType >= 2){
if (in_array($month, [1, 4, 7, 10])) { if($general->getVar('officer_level') == 12){
$this->choosePromotion(); if (in_array($month, [1, 4, 7, 10])) {
} else if ($month == 12) { $this->choosePromotion();
$this->chooseTexRate(); } else if ($month == 12) {
$this->chooseGoldBillRate(); $this->chooseTexRate();
} else if ($month == 6) { $this->chooseGoldBillRate();
$this->chooseTexRate(); } else if ($month == 6) {
$this->chooseRiceBillRate(); $this->chooseTexRate();
$this->chooseRiceBillRate();
}
}
else if(in_array($month, [3, 6, 9, 12])){
$this->chooseNonLordPromotion();
} }
}
else if(in_array($month, [3, 6, 9, 12])){
$this->chooseNonLordPromotion();
} }
if(!($reservedCommand instanceof Command\Nation\휴식) && $reservedCommand->isRunnable()){ if(!($reservedCommand instanceof Command\Nation\휴식) && $reservedCommand->isRunnable()){
@@ -3383,6 +3385,7 @@ class GeneralAI
$general->setVar('officer_city', 0); $general->setVar('officer_city', 0);
$nation['l11set'] = true; $nation['l11set'] = true;
$updatedNationVar['l11set'] = 1; $updatedNationVar['l11set'] = 1;
$userChiefCnt += 1;
break; break;
} }
} }
@@ -3408,6 +3411,13 @@ class GeneralAI
if($this->general->getVar('officer_level') === $chiefLevel){ if($this->general->getVar('officer_level') === $chiefLevel){
continue; continue;
} }
if(key_exists($chiefLevel, $this->chiefGenerals)){
$oldChief = $this->chiefGenerals[$chiefLevel];
if($oldChief->getVar('npc') < 2 && $oldChief->getVar('killturn') >= $minChiefLevel){
continue;
}
}
if(!key_exists($chiefLevel, $this->chiefGenerals) && !key_exists($chiefLevel, $nextChiefs)){ if(!key_exists($chiefLevel, $this->chiefGenerals) && !key_exists($chiefLevel, $nextChiefs)){
$newChiefProb = 1; $newChiefProb = 1;
@@ -3442,6 +3452,10 @@ class GeneralAI
continue; continue;
} }
if($general->getVar('npc') < 2 && $userChiefCnt >= 3){
continue;
}
$newChief = $general; $newChief = $general;
break; break;
} }
@@ -3450,6 +3464,10 @@ class GeneralAI
continue; continue;
} }
if($newChief->getVar('npc') < 2){
$userChiefCnt += 1;
}
$nextChiefs[$chiefLevel] = $newChief; $nextChiefs[$chiefLevel] = $newChief;
$newChief->setVar('officer_level', $chiefLevel); $newChief->setVar('officer_level', $chiefLevel);
$newChief->setVar('officer_city', 0); $newChief->setVar('officer_city', 0);