From 5dd5933390484c96d963bb11d8639d3ea7768ee8 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 13 May 2020 02:11:25 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_npc_control.php     | 13 +++++++++----
 hwe/j_set_npc_control.php |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/hwe/b_npc_control.php b/hwe/b_npc_control.php
index cb804316..90bf50cf 100644
--- a/hwe/b_npc_control.php
+++ b/hwe/b_npc_control.php
@@ -110,12 +110,17 @@ $currentGeneralActionPriority = $rawNationGeneralPolicy['priority'] ?? $defaultG
                             <input type="number" class="form-control" data-type="integer" id="reqNationGold" min="0" value="0">
                         </div>
                     </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">이 보다 많으면 포상, 적으면 몰수합니다.(긴급포상 제외)</small></div>
+                    <div style='text-align:right;'><small class="form-text text-muted">이 보다 많으면 포상, 적으면 몰수/헌납합니다.(긴급포상 제외)</small></div>
                 </div>
 
-                <label for="reqNationRice" class="col-sm-3 col-form-label">국가 권장 쌀</label>
-                <div class="col-sm-3">
-                    <input type="number" class="form-control" data-type="integer" id="reqNationRice" min="0" value="0">
+                <div class="col-sm-6">
+                    <div class="row">
+                        <label for="reqNationRice" class="col-sm-6 col-form-label">국가 권장 쌀</label>
+                        <div class="col-sm-6">
+                            <input type="number" class="form-control" data-type="integer" id="reqNationRice" min="0" value="0">
+                        </div>
+                    </div>
+                    <div style='text-align:right;'><small class="form-text text-muted">이 보다 많으면 포상, 적으면 몰수/헌납합니다.(긴급포상 제외)</small></div>
                 </div>
             </div>
             <div class="form-group row">
diff --git a/hwe/j_set_npc_control.php b/hwe/j_set_npc_control.php
index 794c09b2..2fb3ea94 100644
--- a/hwe/j_set_npc_control.php
+++ b/hwe/j_set_npc_control.php
@@ -27,7 +27,7 @@ if(!in_array($type, $availableTypes)){
     ]);
 }
 
-$data =  JSON::decode($data);
+$data =  Json::decode($data);
 if(!$data || !is_array($data)){
     Json::die([
         'result'=>false,