fix: 세력일람 확장에서 NPC 색상이 고정되는 버그 수정

hwe/a_genList.php

@@ -172,6 +172,7 @@ if ($gameStor->isunited) {
         data-general-strength='{$general['strength']}'
         data-general-intel='{$general['intel']}'
         data-is-npc='" . ($general['npc'] >= 2 ? 'true' : 'false') . "'
+        data-npc-type='{$general['npc']}'
     >
         <td align=center><img class='generalIcon' width='64' height='64' src='{$imageTemp}/{$general['picture']}'></img></td>
         <td align=center>$name</td>

hwe/b_currentCity.php

@@ -337,6 +337,7 @@ $templates = new \League\Plates\Engine('templates');
                                     'ourGeneral' => $ourGeneral,
                                     'iconPath' => GetImageURL($general['imgsvr']) . '/' . $general['picture'],
                                     'isNPC' => $isNPC,
+                                    'npc' => $general['npc'],
                                     'wounded' => $wounded,
                                     'name' => $name,
                                     'nameText' => $nameText,

hwe/templates/cityGeneral.php

@@ -1,6 +1,7 @@
 <tr
     data-is-our-general="<?=$ourGeneral?'true':'false'?>"
     data-is-npc="<?=$isNPC?'true':'false'?>"
+    data-npc-type="<?=$npc?>"
     data-general-wounded="<?=$wounded?>"
     data-general-name="<?=$this->e($name)?>"
     data-general-leadership="<?=$leadership?>"
@@ -33,7 +34,7 @@
     <td><?=$train?></td>
     <td><?=$atmos?></td>
     <?php if($isNPC): ?>
-    <td>NPC 장수</td>    
+    <td>NPC 장수</td>
     <?php else: ?>
     <td class="general_turn_text"><?=$turnText?></td>
     <?php endif; ?>
@@ -49,5 +50,5 @@
     <td>재 야</td>
     <?php endif; ?>
 <?php endif; ?>
-    
+
 </tr>

hwe/templates/generalList.php

@@ -22,6 +22,7 @@
 <tr class='general_id_<?=$general['no']?>'
     data-general-id="<?=$general['no']?>"
     data-is-npc="<?=$general['npc']>=2?'true':'false'?>"
+    data-npc-type='<?=$general['npc']?>'
     data-general-wounded="<?=$general['injury']?>"
     data-general-name="<?=$general['name']?>"
     data-general-leadership="<?=$general['leadership']?>"

hwe/ts/extKingdoms.ts

@@ -2,6 +2,7 @@ import $ from 'jquery';
 import { unwrap } from '@util/unwrap';
 import axios from 'axios';
 import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest';
+import { getNpcColor } from './common_legacy';
 
 declare const killturn: number;
 declare const autorun_user: undefined|null|{
@@ -20,7 +21,7 @@ type KingdomGeneral = {
     지: number,
     삭턴: number,
     종류: UserType,
-    NPC: boolean,
+    NPC: number,
 }
 
 type UserType = "통" | "무" | "지" | "만능" | "평범" | "무능" | "무지";
@@ -132,7 +133,7 @@ $(function () {
                     장수.지 = parseInt($this.data('general-intel'));
                     장수.삭턴 = parseInt($tds.eq(-2).text());
                     장수.종류 = getUserType(장수.통, 장수.무, 장수.지);
-                    장수.NPC = $this.data('is-npc');
+                    장수.NPC = $this.data('npc-type');
 
                     if (!(국가 in 국가별)) {
                         국가별[국가] = {
@@ -208,13 +209,13 @@ $(function () {
                         //const 종능 = val.통 + val.무 + val.지;
                         console.log(val);
                         if (종류명 != '무능' && 종류명 != '무지') {
-                            if (val.삭턴 >= realKillturn && !val.NPC) {
+                            if (val.삭턴 >= realKillturn && val.NPC < 2) {
                                 전투유저장수 += 1;
 
                                 통솔합 += val.통;
                             }
 
-                            if (val.삭턴 > 5 && val.NPC) {
+                            if (val.삭턴 > 5 && val.NPC >= 2) {
                                 전투N장수 += 1;
 
                                 N장통솔합 += val.통;
@@ -225,12 +226,13 @@ $(function () {
                         const $obj2 = $('<span></span>');
                         $obj.html(val.장수명);
 
-                        if (!val.NPC && val.삭턴 < realKillturn) {
+                        if (val.NPC < 2 && val.삭턴 < realKillturn) {
                             $obj.css('text-decoration', 'line-through');
                             삭턴장수 += 1;
                         }
-                        if (val.NPC) {
-                            $obj.css('color', 'cyan');
+                        const colorNPC = getNpcColor(val.NPC);
+                        if (colorNPC !== undefined) {
+                            $obj.css('color', colorNPC);
                         }
                         if (val.벌점 >= 1500) $obj.css('color', 'yellow');
                         else if (val.벌점 >= 200) $obj.css('color', 'lightgreen');