From 6b54797aecfa3c1ff2ca9229b110c7171ffe3f4c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 25 Apr 2020 05:28:43 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B5=B0=EB=9F=89=EB=A7=A4=EB=A7=A4=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_battleCenter.php                     | 10 +++++-----
 hwe/sammo/Command/General/che_군량매매.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hwe/b_battleCenter.php b/hwe/b_battleCenter.php
index 6d25f6ec..c9ca2df8 100644
--- a/hwe/b_battleCenter.php
+++ b/hwe/b_battleCenter.php
@@ -82,13 +82,13 @@ if ($btn == '정렬하기') {
 
 [$queryTypeText, $reqArgType, $comp] = $queryMap[$reqQueryType];
 if($reqArgType===0){
-    $generalBasicList = $db->query('SELECT no, name, npc, turntime FROM general WHERE nation = %i', $nationID);
+    $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level FROM general WHERE nation = %i', $nationID);
 }
 else if($reqArgType===1){
-    $generalBasicList = $db->query('SELECT no, name, npc, turntime, %b FROM general WHERE nation = %i', $reqQueryType, $nationID);
+    $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, %b FROM general WHERE nation = %i', $reqQueryType, $nationID);
 }
 else if($reqArgType===2){
-    $generalBasicList = $db->query('SELECT no, name, npc, turntime, value as %b 
+    $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, value as %b 
         FROM general LEFT JOIN rank_data 
         ON general.no = rank_data.general_id 
         WHERE rank_data.type = %b AND general.nation = %i', 
@@ -99,7 +99,7 @@ else if($reqArgType===3){
     $generalBasicList = array_map(function($arr){
         $arr['aux'] = Json::decode($arr['aux']);
         return $arr;
-    }, $db->query('SELECT no, name, npc, turntime, aux FROM general WHERE nation = %i', $nationID));
+    }, $db->query('SELECT no, name, npc, turntime, officer_level, aux FROM general WHERE nation = %i', $nationID));
 }
 else{
     throw new \sammo\MustNotBeReachedException();
@@ -145,7 +145,7 @@ $showGeneral = General::createGeneralObjFromDB($gen);
         대상장수 :
         <select name=gen size=1>
 <?php foreach($generalBasicList as $general): ?>
-    <option <?=$gen==$general['no']?'selected':''?> value='<?=$general['no']?>'><?=$general['name']?> (<?=substr($general['turntime'], 14, 5)?>)</option>
+    <option <?=$gen==$general['no']?'selected':''?> value='<?=$general['no']?>'><?=$general['officer_level']>4?"*{$general['name']}*":$general['name']?> (<?=substr($general['turntime'], 14, 5)?>)</option>
 <?php endforeach; ?>
         </select>
         <input type=submit name=btn value='조회하기'>
diff --git a/hwe/sammo/Command/General/che_군량매매.php b/hwe/sammo/Command/General/che_군량매매.php
index f5ba8650..e9769caf 100644
--- a/hwe/sammo/Command/General/che_군량매매.php
+++ b/hwe/sammo/Command/General/che_군량매매.php
@@ -148,7 +148,7 @@ class che_군량매매 extends Command\GeneralCommand{
         }
         
         $general->increaseVar($buyKey, $buyAmount);
-        $general->increaseVarWithLimit($sellKey, $sellAmount, 0);
+        $general->increaseVarWithLimit($sellKey, -$sellAmount, 0);
 
         $db->update('nation', [
             'gold'=>$db->sqleval('gold + %i', $tax)