diff --git a/hwe/js/select_npc.js b/hwe/js/select_npc.js
index b41713ff..4393193d 100644
--- a/hwe/js/select_npc.js
+++ b/hwe/js/select_npc.js
@@ -3,11 +3,19 @@ var templateGeneralCard =
<%name%>
\

\
<%leader%> / <%power%> / <%intel%>
\
- <%special%> / <%special2%>
\
+ <%specialText%> / <%special2Text%>\
\
\
';
+var templateSpecial =
+'<%text%>\
+ \
+ <%info%>\
+ \
+\
+';
+
function pickGeneral(){
$btn = $(this);
@@ -85,12 +93,38 @@ function printGenerals(value){
$.each(pick, function(idx, cardData){
cardData.iconPath = getIconPath(cardData.imgsvr, cardData.picture);
+ if(cardData.special in specialInfo){
+ cardData.specialText = TemplateEngine(templateSpecial, {
+ text:cardData.special,
+ info:specialInfo[cardData.special]
+ });
+ }
+ else{
+ cardData.specialText = special;
+ }
+
+ if(cardData.special2 in specialInfo){
+ cardData.special2Text = TemplateEngine(templateSpecial, {
+ text:cardData.special2,
+ info:specialInfo[cardData.special2]
+ });
+ }
+ else{
+ cardData.special2Text = cardData.special2;
+ }
+
var $card = $(TemplateEngine(templateGeneralCard, cardData));
console.log($card);
$('.card_holder').append($card);
$card.find('.select_btn').click(pickGeneral);
+ $card.find('.obj_tooltip').tooltip({
+ title:function(){
+ return $(this).find('.tooltiptext').html();
+ },
+ html:true
+ });
});
updatePickMoreTimer();
diff --git a/hwe/select_npc.php b/hwe/select_npc.php
index 442fc840..cabafc1a 100644
--- a/hwe/select_npc.php
+++ b/hwe/select_npc.php
@@ -27,15 +27,35 @@ $nationList = $db->query('SELECT nation,`name`,color,scout,scoutmsg FROM nation
-=WebUtil::printCSS('css/normalize.css')?>
+=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
=WebUtil::printCSS('../d_shared/common.css')?>
=WebUtil::printCSS('../css/config.css')?>
=WebUtil::printCSS('css/common.css')?>
=WebUtil::printCSS('css/select_npc.css')?>
+
+
=WebUtil::printJS('../d_shared/common_path.js')?>
=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-=WebUtil::printJS('../js/common.js')?>
+=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+=WebUtil::printJS('js/common.js')?>
=WebUtil::printJS('js/select_npc.js')?>