From e731371ab11e6d608401d77265f1d0e2752dc1fa Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 4 May 2019 20:41:27 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=99=EC=9D=98=20=EC=84=A0=ED=83=9D=20?=
 =?UTF-8?q?=EC=8B=9C=20=EC=84=B1=EA=B2=A9=EA=B3=BC=20=EA=B5=AD=EA=B0=80=20?=
 =?UTF-8?q?=ED=91=9C=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_get_select_npc_token.php |  4 +++-
 hwe/js/select_npc.js           | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/hwe/j_get_select_npc_token.php b/hwe/j_get_select_npc_token.php
index 7944cf70..f83f973c 100644
--- a/hwe/j_get_select_npc_token.php
+++ b/hwe/j_get_select_npc_token.php
@@ -90,9 +90,11 @@ if($token && !$refresh){
 $candidates = [];
 
 $weight = [];
-foreach($db->query('SELECT `no`, `name`, leader, power, intel, imgsvr, picture, special, special2 FROM general WHERE npc=2') as $general){
+foreach($db->query('SELECT `no`, `name`, leader, power, nation, personal, intel, imgsvr, picture, special, special2 FROM general WHERE npc=2') as $general){
     $general['special'] = \sammo\SpecialityConst::DOMESTIC[$general['special']][0]??'-';
     $general['special2'] = \sammo\SpecialityConst::WAR[$general['special2']][0]??'-';
+    $general['personal'] = getGenChar($general['personal']);
+    $general['nation'] = getNationStaticInfo($general['nation'])['name'];
     $candidates[$general['no']] = $general + ['keepCnt'=>KEEP_CNT];
     $allStat = $general['leader'] + $general['power'] + $general['intel'];
     $weight[$general['no']] = pow($allStat, 1.5);
diff --git a/hwe/js/select_npc.js b/hwe/js/select_npc.js
index a3e07b1f..b563a755 100644
--- a/hwe/js/select_npc.js
+++ b/hwe/js/select_npc.js
@@ -3,6 +3,8 @@ var templateGeneralCard =
     <h4 class="bg1 with_border"><%name%></h4>\
     <h4><img src="<%iconPath%>" height=64 width=64></h4>\
     <p><%leader%> / <%power%> / <%intel%><br>\
+    <%nation%><br>\
+    <%personalText%><br>\
     <%specialText%> / <%special2Text%></p>\
     <button type="subject" class="with_skin with_border select_btn" data-name="<%name%>" value="<%no%>" name="pick">빙의하기</button>\
     <label><input <%keepCnt?"":disabled="disabled"%> type="checkbox" value="<%no%>" name="keep[]" class="keep_select">보관(<%keepCnt%>회)</label>\
@@ -135,6 +137,16 @@ function printGenerals(value){
         else{
             cardData.special2Text = cardData.special2;
         }
+
+        if(cardData.personal in characterInfo){
+            cardData.personalText = TemplateEngine(templateSpecial, {
+                text:cardData.personal,
+                info:characterInfo[cardData.personal]
+            });
+        }
+        else{
+            cardData.personalText = cardData.personal;
+        }
         
 
         var $card = $(TemplateEngine(templateGeneralCard, cardData));