From a576d723358e773d926e9dcbd01e1c3df0ccc593 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Fri, 21 Jun 2019 09:51:39 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EB=B6=80=EB=8C=80=20=EC=9D=B4=EB=A6=84=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EB=B3=B4=EC=A1=B0=EC=A0=95=EB=B3=B4=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index cf1541a1..b4141530 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -867,8 +867,6 @@ function generalInfo($no) {
         $lbonus = "";
     }
 
-    $troop = getTroop($general['troop']);
-
     $level = getLevel($general['level'], $nation['level']);
     if($general['level'] == 2)     {
         $query = "select name from city where gen3='{$general['no']}'";
@@ -936,7 +934,23 @@ function generalInfo($no) {
         default:
             $train = "{$general['train']}"; break;
     }
-    if($general['troop'] == 0)    { $troop['name'] = "-"; }
+    if($general['troop'] == 0){
+        $troopInfo = '-';
+    }
+    else{
+        $troop = getTroop($general['troop']);
+        $troopLeader = $db->queryFirstRow('SELECT city,turn0 FROM general WHERE no=%i', $troop['no']);
+        $troopInfo = $troop['name'];
+
+        if(DecodeCommand($troopLeader['turn0'])[0] != 26){
+            $troopInfo = "<strike style='color:gray;'>{$troopInfo}</strike>";
+        }
+        else if($troopLeader['city'] != $general['city']){
+            $troopCityName = CityConst::byID($troopLeader['city'])->name;
+            $troopInfo = "<span style='color:orange;'>{$troopInfo}({$troopCityName})</span>";
+        }
+        
+    }
     if($general['mode'] == 2)     { $general['mode'] = "<font color=limegreen>수비 함(훈사80)</font>"; }
     elseif($general['mode'] == 1) { $general['mode'] = "<font color=limegreen>수비 함(훈사60)</font>"; }
     else                        { $general['mode'] = "<font color=red>수비 안함</font>"; }
@@ -1010,7 +1024,7 @@ function generalInfo($no) {
     </tr>
     <tr height=20>
         <td style='text-align:center;' class='bg1'><b>부대</b></td>
-        <td style='text-align:center;' colspan=3>{$troop['name']}</td>
+        <td style='text-align:center;' colspan=3>{$troopInfo}</td>
         <td style='text-align:center;' class='bg1'><b>벌점</b></td>
         <td style='text-align:center;' colspan=5>".getConnect($general['connect'])." {$general['connect']}({$general['con']})</td>
     </tr>