diff --git a/hwe/func.php b/hwe/func.php index a4d2fbfd..c674297a 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -2579,7 +2579,7 @@ function searchDistance(int $from, int $maxDist=99, bool $distForm = false) { } } -function isClose(int $nation1, int $nation2, bool $includeNoSupply=true) { +function isNeighbor(int $nation1, int $nation2, bool $includeNoSupply=true) { $db = DB::db(); $nation1Cities = []; diff --git a/hwe/func_npc.php b/hwe/func_npc.php index 1ca72088..1dedf5fd 100644 --- a/hwe/func_npc.php +++ b/hwe/func_npc.php @@ -479,7 +479,7 @@ function processAI($no) { for($i=0; $i < $nationCount; $i++) { $youNation = MYDB_fetch_array($result); - if(isClose($general['nation'], $youNation['nation'])) { + if(isNeighbor($general['nation'], $youNation['nation'])) { $command = EncodeCommand(0, 0, $youNation['nation'], 62); $query = "update nation set l12turn0='$command' where nation='{$general['nation']}'"; MYDB_query($query, $connect) or Error("processAI09 ".MYDB_error($connect),""); diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php index 7eb84dda..b26315a5 100644 --- a/hwe/func_process_chief.php +++ b/hwe/func_process_chief.php @@ -744,7 +744,7 @@ function process_62(&$general) { $log[] = "●{$admin['month']}월:아국과 불가침중입니다. 선포 실패. <1>$date"; } elseif($dipcount != 0) { $log[] = "●{$admin['month']}월:상대국이 외교 진행중입니다. 선포 실패. <1>$date"; - } elseif(!isClose($nation['nation'], $younation['nation'])) { + } elseif(!isNeighbor($nation['nation'], $younation['nation'])) { $log[] = "●{$admin['month']}월:인접하지 않았습니다. 선포 실패. <1>$date"; } elseif($admin['year'] <= $admin['startyear']) { $log[] = "●{$admin['month']}월:초반제한 해제 2년전부터 가능합니다. 선포 실패. <1>$date"; diff --git a/hwe/processing.php b/hwe/processing.php index d80b2215..0fde94b7 100644 --- a/hwe/processing.php +++ b/hwe/processing.php @@ -1785,7 +1785,7 @@ function command_51($turn, $command) { for($i=1; $i <= $count; $i++) { $nation = MYDB_fetch_array($result); - if($myNation['power'] <= $nation['power'] * 3 || !isClose($me['nation'], $nation['nation'])) { + if($myNation['power'] <= $nation['power'] * 3 || !isNeighbor($me['nation'], $nation['nation'])) { echo ""; } else { echo ""; @@ -1929,7 +1929,7 @@ function command_53($turn, $command) { for($i=1; $i <= $count; $i++) { $nation = MYDB_fetch_array($result); - if($myNation['power']+$nation['power'] > $cond1 || $myNation['gennum']+$nation['gennum'] > $cond2 || !isClose($me['nation'], $nation['nation'])) { + if($myNation['power']+$nation['power'] > $cond1 || $myNation['gennum']+$nation['gennum'] > $cond2 || !isNeighbor($me['nation'], $nation['nation'])) { echo ""; } else { echo ""; diff --git a/hwe/sammo/Engine/Diplomacy.php b/hwe/sammo/Engine/Diplomacy.php index 22646381..ebe5508f 100644 --- a/hwe/sammo/Engine/Diplomacy.php +++ b/hwe/sammo/Engine/Diplomacy.php @@ -148,7 +148,7 @@ class Diplomacy{ return $prev; } - if(!\sammo\isClose($this->srcNation['nation'], $this->destNation['nation'], false)){ + if(!\sammo\isNeighbor($this->srcNation['nation'], $this->destNation['nation'], false)){ return [DiplomaticMessage::DECLINED, '상대국의 도시들과 보급선이 이어지지 않았습니다.']; } @@ -160,7 +160,7 @@ class Diplomacy{ return $prev; } - if(!\sammo\isClose($this->srcNation['nation'], $this->destNation['nation'], true)){ + if(!\sammo\isNeighbor($this->srcNation['nation'], $this->destNation['nation'], true)){ return [DiplomaticMessage::DECLINED, '상대국의 도시와 인접하지 않았습니다.']; }