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

AI 천도 안하는 버그 수정

Browse Source
This commit is contained in:
Hide_D
2020-04-30 05:41:42 +09:00
parent b4262eb34b
commit 11c928bf30
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func.php
+1 -1
View File
@@ -1878,7 +1878,7 @@ function searchAllDistanceByCityList(array $cityIDList):array {
$distanceList = []; $distanceList = [];
foreach($cityIDList as $cityID){ foreach($cityIDList as $cityID){
$nearList = [$cityID=>0]; $nearList = [$cityID=>0];
foreach(CityConst::byID($cityID)->path as $nextCityID){ foreach(array_keys(CityConst::byID($cityID)->path) as $nextCityID){
if(!key_exists($nextCityID, $cityList)){ if(!key_exists($nextCityID, $cityList)){
continue; continue;
} }
hwe/sammo/GeneralAI.php
+10 -8
View File
@@ -311,7 +311,7 @@ class GeneralAI
while(!key_exists($targetCityID, $this->frontCities)){ while(!key_exists($targetCityID, $this->frontCities)){
$distance = $this->warRoute[$targetCityID][$toCityID]; $distance = $this->warRoute[$targetCityID][$toCityID];
$nextCityCandidate = []; $nextCityCandidate = [];
foreach(CityConst::byID($targetCityID)->path as $nearCityID){ foreach(array_keys(CityConst::byID($targetCityID)->path) as $nearCityID){
if(!key_exists($nearCityID, $this->warRoute) || !key_exists($toCityID, $this->warRoute[$nearCityID])){ if(!key_exists($nearCityID, $this->warRoute) || !key_exists($toCityID, $this->warRoute[$nearCityID])){
continue; continue;
} }
@@ -1636,7 +1636,7 @@ class GeneralAI
$turnTerm = $this->env['turnterm']; $turnTerm = $this->env['turnterm'];
//천도를 한턴 넣었다면 계속 넣는다. //천도를 한턴 넣었다면 계속 넣는다.
if($lastTurn->getCommand() === 'che_천도'){ if($lastTurn->getCommand() === '천도' && $lastTurn->getArg()['destCityID'] != $this->nation['capital']){
$cmd = buildNationCommandClass('che_천도', $this->general, $this->env, $lastTurn, $lastTurn->getArg()); $cmd = buildNationCommandClass('che_천도', $this->general, $this->env, $lastTurn, $lastTurn->getArg());
if($cmd->isRunnable()){ if($cmd->isRunnable()){
$nationStor->setValue("last천도Trial_{$this->nation['nation']}", [$general->getVar('officer_level'), $general->getTurnTime()]); $nationStor->setValue("last천도Trial_{$this->nation['nation']}", [$general->getVar('officer_level'), $general->getTurnTime()]);
@@ -1689,14 +1689,14 @@ class GeneralAI
while(!$queue->isEmpty()){ while(!$queue->isEmpty()){
$cityID = $queue->dequeue(); $cityID = $queue->dequeue();
foreach(CityConst::byID($cityID)->path as $nextCityID){ foreach(array_keys(CityConst::byID($cityID)->path) as $nextCityID){
if(!key_exists($cityID, $nationCityIDList)){ if(!key_exists($nextCityID, $nationCityIDList)){
continue; continue;
} }
if(key_exists($cityID, $cityList)){ if(key_exists($nextCityID, $cityList)){
continue; continue;
} }
$cityList[$cityID] = 0; $cityList[$nextCityID] = 0;
$queue->enqueue($nextCityID); $queue->enqueue($nextCityID);
} }
} }
@@ -1730,7 +1730,8 @@ class GeneralAI
if($idx > $enoughLimit){ if($idx > $enoughLimit){
break; break;
} }
if($idx === $capital){ if($cityID === $capital){
LogText('천도', "{$this->nation['name']}, {$general->getName()}, 수도가 충분히 가까움");
return null; return null;
} }
} }
@@ -1740,7 +1741,7 @@ class GeneralAI
$targetCityID = $finalCityID; $targetCityID = $finalCityID;
if($dist > 1){ if($dist > 1){
$candidates = []; $candidates = [];
foreach(CityConst::byID($capital)->path as $stopID){ foreach(array_keys(CityConst::byID($capital)->path) as $stopID){
if(!key_exists($stopID, $distanceList)){ if(!key_exists($stopID, $distanceList)){
continue; continue;
} }
@@ -1756,6 +1757,7 @@ class GeneralAI
]); ]);
if(!$cmd->isRunnable()){ if(!$cmd->isRunnable()){
LogText('천도', "{$this->nation['name']}, {$general->getName()}, 천도 턴 실행 불가, {$this->nation['capital']} => {$targetCityID}");
return null; return null;
} }