From b76fa38e0919707c697d267f44be7ec71dd3b7ec Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 4 Sep 2018 01:30:06 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EA=B5=90=20=EC=BB=A4=EB=A7=A8?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=8B=9D=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/processing.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hwe/processing.php b/hwe/processing.php
index 3deddf26..4c50be74 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -1609,11 +1609,11 @@ function command_53($turn, $command) {
     $result = MYDB_query($query, $connect) or Error("command_53 ".MYDB_error($connect),"");
     $me = MYDB_fetch_array($result);
 
-    $query = "select round(avg(power)) as power,round(avg(gennum)) as gennum from nation where level>=1";
+    $query = "select avg(power) as power,avg(gennum) as gennum from nation where level>=1";
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
     $avgNation = MYDB_fetch_array($result);
 
-    $query = "select round(std(power)) as power,round(std(gennum)) as gennum from nation where level>=1";
+    $query = "select std(power) as power,std(gennum) as gennum from nation where level>=1";
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
     $stdNation = MYDB_fetch_array($result);
     
@@ -1633,8 +1633,8 @@ function command_53($turn, $command) {
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
     $count = MYDB_num_rows($result);
 
-    $cond1 = $avgNation['power']+$stdNation['power'];
-    $cond2 = $avgNation['gennum']+$stdNation['gennum'];
+    $cond1 = round((-0.25 * $stdNation['power']) + $avgNation['power'], 2);
+    $cond2 = round((-0.67 * $stdNation['gennum']) + $avgNation['gennum'], 2);
     
     for($i=1; $i <= $count; $i++) {
         $nation = MYDB_fetch_array($result);
@@ -1661,8 +1661,8 @@ function command_53($turn, $command) {
 제한 조건<br>
 - 인접 국가<br>
 - 양국 모두 외교제한 없음<br>
-- 양국 국력의 합이 평균+표준편차(현재 {$cond1}) 이하<br>
-- 양국 장수수의 합이 평균+표준편차(현재 {$cond2}) 이하<br>
+- 두 국가의 국력 평균이 상위 60%(현재 {$cond1}) 이하.<br>
+- 두 국가의 장수수 평균이 상위 75%(현재 {$cond2} 이하.<br>
 ";
     ender(1);
 }