From 5aab373d20fbd7f5eede49537eb498e5963ab2eb Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Fri, 21 Jun 2019 09:29:33 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=9C=EB=A0=B9,=20=ED=8F=AC=EC=83=81,=20?=
 =?UTF-8?q?=EB=AA=B0=EC=88=98=EC=97=90=EC=84=9C=20=EB=B3=B4=EC=A1=B0=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/processing.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/hwe/processing.php b/hwe/processing.php
index 3e2d2170..a1862638 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -536,7 +536,7 @@ function command_23($turn, $command) {
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
 
-    $query = "select no,name,level,npc from general where nation='{$general['nation']}' and no!='{$general['no']}' order by npc,binary(name)";
+    $query = "select no,name,level,gold,rice,npc from general where nation='{$general['nation']}' and no!='{$general['no']}' order by npc,binary(name)";
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
     $gencount = MYDB_num_rows($result);
 
@@ -552,10 +552,10 @@ function command_23($turn, $command) {
         else                       { $style = ""; }
         if($general['level'] >= 5) {
             echo "
-    <option value={$general['no']} {$style}>*{$general['name']}*</option>";
+    <option value={$general['no']} {$style}>*{$general['name']}*(금:{$general['gold']}, 쌀:{$general['rice']})</option>";
         } else {
             echo "
-    <option value={$general['no']} {$style}>{$general['name']}</option>";
+    <option value={$general['no']} {$style}>{$general['name']}(금:{$general['gold']}, 쌀:{$general['rice']})</option>";
         }
     }
 
@@ -613,7 +613,7 @@ function command_24($turn, $command) {
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
 
-    $query = "select no,name,level,npc from general where nation='{$general['nation']}' and no!='{$general['no']}' order by npc,binary(name)";
+    $query = "select no,name,level,gold,rice,npc from general where nation='{$general['nation']}' and no!='{$general['no']}' order by npc,binary(name)";
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
     $gencount = MYDB_num_rows($result);
 
@@ -629,11 +629,9 @@ function command_24($turn, $command) {
         elseif($general['npc'] == 1) { $style = "style=color:skyblue;"; }
         else                       { $style = ""; }
         if($general['level'] >= 5) {
-            echo "
-    <option value={$general['no']} {$style}>*{$general['name']}*</option>";
+            echo "<option value={$general['no']} {$style}>*{$general['name']}*(금:{$general['gold']}, 쌀:{$general['rice']})</option>";
         } else {
-            echo "
-    <option value={$general['no']} {$style}>{$general['name']}</option>";
+            echo "<option value={$general['no']} {$style}>{$general['name']}(금:{$general['gold']}, 쌀:{$general['rice']})</option>";
         }
     }
 
@@ -770,7 +768,7 @@ function command_27($turn, $command) {
     $result = MYDB_query($query, $connect) or Error("command_27 ".MYDB_error($connect),"");
     $me = MYDB_fetch_array($result);
 
-    $query = "select no,name,level,npc from general where nation='{$me['nation']}' and no!='{$me['no']}' order by npc,binary(name)";
+    $query = "select no,name,city,level,npc from general where nation='{$me['nation']}' and no!='{$me['no']}' order by npc,binary(name)";
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
     $gencount = MYDB_num_rows($result);
 
@@ -784,15 +782,16 @@ function command_27($turn, $command) {
 
     for($i=0; $i < $gencount; $i++) {
         $general = MYDB_fetch_array($result);
+        $cityName = CityConst::byID($general['city'])->name;
         if    ($general['npc'] >= 2) { $style = "style=color:cyan;"; }
         elseif($general['npc'] == 1) { $style = "style=color:skyblue;"; }
         else                       { $style = ""; }
         if($general['level'] >= 5) {
             echo "
-    <option value={$general['no']} {$style}>*{$general['name']}*</option>";
+    <option value={$general['no']} {$style}>*{$general['name']}*({$cityName})</option>";
         } else {
             echo "
-    <option value={$general['no']} {$style}>{$general['name']}</option>";
+    <option value={$general['no']} {$style}>{$general['name']}({$cityName})</option>";
         }
     }