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

Merge branch 'devel' of ssh://storage.hided.net:2525/devsam/core into devel

Browse Source
This commit is contained in:
Hide_D
2019-10-03 15:12:35 +09:00
parent 78ff016def 30d8324a0a
commit fedc7e5ef5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_npc.php
+2 -2
View File
@@ -346,7 +346,7 @@ function processAI($no, &$reduce_turn) {
$allowedAction = new AIAllowedAction($general['npc'], $autorun_user['options']??[]); $allowedAction = new AIAllowedAction($general['npc'], $autorun_user['options']??[]);
if($general['troop'] && $allowedAction->warp){ if($general['troop'] && $allowedAction->warp){
$troopLeader = $db->query( $troopLeader = $db->queryFirstRow(
'SELECT general.no,general.name,general.city,turn0,troop,general.nation, city.nation AS city_nation FROM general JOIN city ON city.city = general.city WHERE troop = %i', $general['troop'] 'SELECT general.no,general.name,general.city,turn0,troop,general.nation, city.nation AS city_nation FROM general JOIN city ON city.city = general.city WHERE troop = %i', $general['troop']
); );
@@ -801,7 +801,7 @@ function processAI($no, &$reduce_turn) {
if($targetCity['nation'] == 0) { $target[] = $targetCity['city']; } if($targetCity['nation'] == 0) { $target[] = $targetCity['city']; }
} }
if(count($target) == 0 || $isStart == 1 || $nation['war'] == 1) { $command = EncodeCommand(0, 0, 0, 1); } //공격 가능도시가 없으면 내정 if(count($target) == 0 || $isStart == 1 || $nation['war'] == 1) { $command = EncodeCommand(0, 0, 0, 1); } //공격 가능도시가 없으면 내정
else if ($general['crew'] >= 1000) { $command = EncodeCommand(0, 0, $target[rand()%count($target)], 16); } //있으면 공격 else { $command = EncodeCommand(0, 0, $target[rand()%count($target)], 16); } //있으면 공격
} else { } else {
//전방 아니면 내정 //전방 아니면 내정
$command = EncodeCommand(0, 0, 0, 1); $command = EncodeCommand(0, 0, 0, 1);