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 =

<%name%>

\

\

<%leader%> / <%power%> / <%intel%>
\ + <%nation%>
\ + <%personalText%>
\ <%specialText%> / <%special2Text%>

\ \ \ @@ -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));