From 75c0c375d138b40c3b3f8bc51e4edca3e23c4e18 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 27 Jul 2018 03:03:25 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=A5=EC=88=98=20=ED=98=B8=EC=B9=AD=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_converter.php      | 40 +++++++++++++++++++++++--------------
 hwe/js/ext.kingdoms.js      |  2 +-
 hwe/sammo/GameConstBase.php |  2 ++
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/hwe/func_converter.php b/hwe/func_converter.php
index 8742506d..ba2e7ed1 100644
--- a/hwe/func_converter.php
+++ b/hwe/func_converter.php
@@ -355,22 +355,32 @@ function getLevel($level, $nlevel=8) {
 
 function getCall($leader, $power, $intel) {
     $call = '평범';
-    if($leader >= GameConst::$chiefStatMin && $power >= GameConst::$chiefStatMin && $intel >= GameConst::$chiefStatMin) {
-        $call = '만능';
-    } elseif($leader >= GameConst::$chiefStatMin && $power >= GameConst::$chiefStatMin) {
-        $call = '용장';
-    } elseif($leader >= GameConst::$chiefStatMin && $intel >= GameConst::$chiefStatMin) {
-        $call = '지장';
-    } elseif($power >= GameConst::$chiefStatMin && $intel >= GameConst::$chiefStatMin) {
-        $call = '명장';
-    } elseif($leader >= GameConst::$chiefStatMin) {
-        $call = '명사';
-    } elseif($power >= GameConst::$chiefStatMin) {
-        $call = '용맹';
-    } elseif($intel >= GameConst::$chiefStatMin) {
-        $call = '현명';
+
+    if($leader < 40){
+        if($power + $intel < $leader){
+            return '아둔';
+        }
+        if($intel >= GameConst::$chiefStatMin && $power < $intel * 0.8){
+            return '학자';
+        }
+        if($power >= GameConst::$chiefStatMin && $intel < $power * 0.8){
+            return '장사';
+        }
+        return '명사';
     }
-    return $call;
+
+    $maxStat = max($leader, $power, $intel);
+    $sum2Stat = min($leader+$power, $power+$intel, $intel+$leader);
+    if($maxStat >= GameConst::$chiefStatMin + GameConst::$statGradeLevel && $sum2Stat >= $maxStat * 1.7){
+        return '만능';
+    }
+    if($power >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $intel < $power * 0.8){
+        return '용장';
+    }
+    if($intel >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $power < $intel * 0.8){
+        return '명장';
+    }
+    return '평범';
 }
 
 function getDed($dedication) {
diff --git a/hwe/js/ext.kingdoms.js b/hwe/js/ext.kingdoms.js
index d322e4c1..92775896 100644
--- a/hwe/js/ext.kingdoms.js
+++ b/hwe/js/ext.kingdoms.js
@@ -18,7 +18,7 @@ $(function(){
 
         var 최대능력치 = Math.max(통, 무, 지);
         var 능력치2합 = Math.min(통+무, 무+지, 지+통);
-        if(최대능력치 >= 70 && 능력치2합 >= 최대능력치 * 1.6){
+        if(최대능력치 >= 70 && 능력치2합 >= 최대능력치 * 1.7){
             return "만능";
         }
 
diff --git a/hwe/sammo/GameConstBase.php b/hwe/sammo/GameConstBase.php
index 164a7e74..d35a8253 100644
--- a/hwe/sammo/GameConstBase.php
+++ b/hwe/sammo/GameConstBase.php
@@ -84,4 +84,6 @@ class GameConstBase
 
     /** @var int 최대 턴(현재는 DB상 24턴으로 고정) */
     public static $maxTurn = 24;
+
+    public static $statGradeLevel = 5;
 }