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

isClose의 함수이름을 isNeighbor로 변경

Browse Source
This commit is contained in:
Hide_D
2018-05-12 02:04:21 +09:00
parent dcfb49d927
commit ae24d18adb
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func.php
+1 -1
View File
@@ -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 = [];
hwe/func_npc.php
+1 -1
View File
@@ -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),"");
hwe/func_process_chief.php
+1 -1
View File
@@ -744,7 +744,7 @@ function process_62(&$general) {
$log[] = "<C>●</>{$admin['month']}월:아국과 불가침중입니다. 선포 실패. <1>$date</>";
} elseif($dipcount != 0) {
$log[] = "<C>●</>{$admin['month']}월:상대국이 외교 진행중입니다. 선포 실패. <1>$date</>";
} elseif(!isClose($nation['nation'], $younation['nation'])) {
} elseif(!isNeighbor($nation['nation'], $younation['nation'])) {
$log[] = "<C>●</>{$admin['month']}월:인접하지 않았습니다. 선포 실패. <1>$date</>";
} elseif($admin['year'] <= $admin['startyear']) {
$log[] = "<C>●</>{$admin['month']}월:초반제한 해제 2년전부터 가능합니다. 선포 실패. <1>$date</>";
hwe/processing.php
+2 -2
View File
@@ -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 "<option style=color:{$nation['color']};background-color:red; value={$nation['nation']}>【 {$nation['name']} 】</option>";
} else {
echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";
@@ -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 "<option style=color:{$nation['color']};background-color:red; value={$nation['nation']}>【 {$nation['name']} 】</option>";
} else {
echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";
hwe/sammo/Engine/Diplomacy.php
+2 -2
View File
@@ -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, '상대국의 도시와 인접하지 않았습니다.'];
}