diff --git a/hwe/process_war.php b/hwe/process_war.php index 23aee66d..993e3d20 100644 --- a/hwe/process_war.php +++ b/hwe/process_war.php @@ -637,14 +637,11 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) { } } - $general['atmos'] *= 1.1; //사기 증가 - if($general['atmos'] > GameConst::$maxAtmosByWar) { $general['atmos'] = GameConst::$maxAtmosByWar; } - $conquerNation = getConquerNation($city); if($conquerNation == $general['nation']) { - // 이동 및 사기 변경 - $query = "update general set city='{$city['city']}',atmos='{$general['atmos']}',killnum=killnum+1 where no='{$general['no']}'"; + // 이동 + $query = "update general set city='{$city['city']}' where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); if($city['level'] > 3) { // 도시 소속 변경, 태수,군사,시중 초기화 @@ -662,17 +659,12 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) { $query = "select name,nation from nation where nation='$conquerNation'"; $conquerResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $conquerNationArray = MYDB_fetch_array($conquerResult); - - $josaUl = JosaUtil::pick($city['name'], '을'); $josaYi = JosaUtil::pick($conquerNationArray['name'], '이'); $history[] = "●{$year}년 {$month}월:【분쟁협상】{$conquerNationArray['name']}{$josaYi} 영토분쟁에서 우위를 점하여 {$city['name']}{$josaUl} 양도받았습니다."; pushNationHistory($nation, "●{$year}년 {$month}월:{$city['name']}{$josaUl} {$conquerNationArray['name']}양도"); pushNationHistory($conquerNationArray, "●{$year}년 {$month}월:{$nation['name']}에서 {$city['name']}{$josaUl} 양도 받음"); - // 이동X 및 사기 변경 - $query = "update general set atmos='{$general['atmos']}',killnum=killnum+1 where no='{$general['no']}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $query = [ 'supply'=>1,