Merge branch 'devel' of ssh://storage.hided.net:2525/devsam/core into devel

- 3번 전멸하는 동안 필요한 금쌀을 모두 가지고 있을 경우 군량매매하지 않음

.eslintrc.cjs

@@ -3,23 +3,20 @@ module.exports = {
     parser: "vue-eslint-parser",
     "env": {
         "browser": true,
-        "es2021": true,
-        'vue/setup-compiler-macros': true
+        "es2021": true
     },
     ignorePatterns: ['*.test.ts', '.eslintrc.cjs', 'postcss.config.cjs', 'webpack.config.cjs', '*.js'],
     overrides: [{
         files: ['*.ts', '*.tsx', "*.vue"],
     }],
     plugins: [
-        "@typescript-eslint",
-        "prettier"
+        "@typescript-eslint"
     ],
 
     extends: [
         "eslint:recommended",
-        "plugin:vue/vue3-recommended",
-        "plugin:@typescript-eslint/recommended",
-        "prettier",
+        "plugin:vue/vue3-essential",
+        "plugin:@typescript-eslint/recommended"
     ],
     parserOptions: {
         "sourceType": "module",
@@ -30,15 +27,6 @@ module.exports = {
     },
     rules: {
         '@typescript-eslint/no-floating-promises': 'error',
-        'vue/script-setup-uses-vars': 'error',
-        'vue/max-attributes-per-line': [
-            'warn',
-            {
-                singleline: 4, //prettier와 싸우지 말자
-            },
-        ],
-        'vue/v-on-event-hyphenation': 'off', //vue3에선 필요없다고 생각
-        'vue/attribute-hyphenation': 'off', //vue3에선 필요없다고 생각
     },
     settings: {
         'import/resolver': {

.gitignore

@@ -42,7 +42,7 @@ d_setting/*.php
 */d_setting/templates/*.php
 !*.orig.php
 
-**/data/file_cache
+*/data/file_cache
 
 **/old/*
 test.*

.phan/config.php

@@ -101,7 +101,8 @@ return [
         'hwe/j_general_set_permission.php',
         'hwe/j_get_basic_general_list.php',
         'hwe/j_get_city_list.php',
-        'hwe/j_get_reserved_command.php',
+        'hwe/j_get_general_list.php',
+        'hwe/j_get_nation_general_list.php',
         'hwe/j_get_select_npc_token.php',
         'hwe/j_get_select_pool.php',
         'hwe/j_image_upload.php',

.prettierrc

@@ -1,5 +0,0 @@
-{
-  "tabWidth": 2,
-  "useTabs": false,
-  "printWidth": 120
-}

.vscode/settings.json

@@ -28,6 +28,5 @@
     "cSpell.words": [
         "josa",
         "sammo"
-    ],
-    "editor.tabSize": 2
+    ]
 }

api.php

@@ -8,9 +8,5 @@ require(__DIR__ . '/vendor/autoload.php');
 if (!class_exists('\\sammo\\RootDB')) {
     Json::dieWithReason('No DB');
 }
-$eParams = $_GET;
-if(key_exists('path', $eParams)){
-    unset($eParams['path']);
-}
 
-APIHelper::launch(dirname(__FILE__), $_GET['path']??'', $eParams, true);
+APIHelper::launch(dirname(__FILE__), $_GET['path']??null);

hwe/a_genList.php

@@ -172,7 +172,6 @@ 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/a_history.php

@@ -23,7 +23,7 @@ if ($serverID === UniqueConst::$serverID) {
     increaseRefresh("연감", 1);
 }
 
-$admin = $gameStor->getValues(['startyear', 'year', 'month']);
+$admin = $gameStor->getValues(['startyear', 'year', 'month', 'map_theme']);
 
 $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner = %i', $userID);
 
@@ -47,9 +47,9 @@ if ($s_year === null) {
 $e = Util::joinYearMonth($e_year, $e_month);
 
 if ($serverID !== UniqueConst::$serverID) {
-    $mapName = $db->queryFirstField('SELECT map FROM ng_games WHERE server_id=%s', $serverID) ?: 'che';
+    $mapTheme = $db->queryFirstField('SELECT map FROM ng_games WHERE server_id=%s', $serverID) ?: 'che';
 } else {
-    $mapName = GameConst::$mapName;
+    $mapTheme = $admin['map_theme'] ?? 'che';
 }
 
 //FIXME: $yearmonth가 올바르지 않을 경우에 처리가 필요.
@@ -104,26 +104,22 @@ $nations = $history['nations'];
     <meta name="viewport" content="width=1024" />
     <title><?= UniqueConst::$serverName ?>: 연감</title>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS("js/map/theme_{$mapName}.js") ?>
+    <?= WebUtil::printJS("js/map/theme_{$mapTheme}.js") ?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printCSS('css/map.css') ?>
     <?= WebUtil::printCSS('css/history.css') ?>
-    <?= WebUtil::printStaticValues([
-        'staticValues' => [
-            'startYear' => $s_year,
-            'startMonth' => $s_month,
-            'lastYear' => $e_year,
-            'lastMonth' => $e_month,
-            'selectYear' => $year,
-            'selectMonth' => $month,
-            'nations' => $nations ? $history['nations'] : [],
-            'serverNick' => DB::prefix(),
-            'serverID' => UniqueConst::$serverID,
-        ]
-    ])?>
     <?= WebUtil::printDist('ts', ['common', 'history']) ?>
 
+    <script>
+        var startYear = <?= $s_year ?>;
+        var startMonth = <?= $s_month ?>;
+        var lastYear = <?= $e_year ?>;
+        var lastMonth = <?= $e_month ?>;
+        var selectYear = <?= $year ?>;
+        var selectMonth = <?= $month ?>;
+        var nations = <?= $nations ? JSON::encode($history['nations']) : '{}' ?>;
+    </script>
 </head>
 
 <body>
@@ -155,7 +151,7 @@ $nations = $history['nations'];
         <tbody>
             <tr height=520>
                 <td width=698>
-                    <?= getMapHtml($mapName) ?>
+                    <?= getMapHtml($mapTheme) ?>
                 </td>
                 <td id='nation_list_frame'>
                     <table id='nation_list'>
@@ -208,6 +204,8 @@ $nations = $history['nations'];
         </tr>
     </table>
     <script>
+        window.serverNick = '<?= DB::prefix() ?>';
+        window.serverID = '<?= UniqueConst::$serverID ?>';
         <?php if($isCurrent): ?>
         reloadWorldMap({
             showMe: false,

hwe/a_kingdomList.php

@@ -111,7 +111,7 @@ if ($con >= 2) {
             }
             $chief = $chiefs[$chiefLevel] ?? ['name' => '-', 'npc' => 0];
             $officerLevelText = getOfficerLevelText($chiefLevel, $nation['level']);
-            $chiefText = formatName($chief['name'], $chief['npc']);
+            $chiefText = getColoredName($chief['name'], $chief['npc']);
             echo "<td class='center bg1'>{$officerLevelText}</td>
         <td class='center'>{$chiefText}</td>";
         }
@@ -178,7 +178,7 @@ if ($con >= 2) {
     <tr>
         <td colspan=5> 장수 일람 : ";
     foreach ($nations[0]['generals'] as $general) {
-        $generalText = formatName($general['name'], $general['npc']);
+        $generalText = getColoredName($general['name'], $general['npc']);
         echo "{$generalText}, ";
     }
     echo "

hwe/a_npcList.php

@@ -111,7 +111,7 @@ $sel[$type] = "selected";
         </tr>
         <?php foreach ($generalList as $general) : ?>
             <tr>
-                <td align=center><?= formatName($general['name'], $general['npc']) ?></td>
+                <td align=center><?= getColoredName($general['name'], $general['npc']) ?></td>
                 <td align=center><?= $general['owner_name'] ?></td>
                 <td align=center>Lv <?= $general['explevel'] ?></td>
                 <td align=center><?= $nationName[$general['nation']] ?></td>

hwe/api.php

@@ -5,9 +5,4 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 
-$eParams = $_GET;
-if(key_exists('path', $eParams)){
-    unset($eParams['path']);
-}
-
-APIHelper::launch(dirname(__FILE__), $_GET['path']??'', $eParams, true);
+APIHelper::launch(dirname(__FILE__), $_GET['path']??null);

hwe/b_battleCenter.php

@@ -133,7 +133,7 @@ $showGeneral = General::createGeneralObjFromDB($gen);
         </tr>
         <tr>
             <td>
-                <form name=form1 method=get>
+                <form name=form1 method=post>
                     정렬순서 :
                     <select name='query_type' size=1>
                         <?php foreach ($queryMap as $queryType => [$queryTypeText,]) : ?>

hwe/b_betting.php

@@ -38,25 +38,25 @@ if ($con >= 2) {
 switch ($admin['tnmt_type']) {
     default:
         throw new \RuntimeException('Invalid tnmt_type');
-    case convertTournamentType('전력전'):
+    case 0:
         $tnmt_type = "<font color=cyan>전력전</font>";
         $tp = "total";
         $tp2 = "종합";
         $tp3 = "total";
         break;
-    case convertTournamentType('통솔전'):
+    case 1:
         $tnmt_type = "<font color=cyan>통솔전</font>";
         $tp = "leadership";
         $tp2 = "통솔";
         $tp3 = "leadership";
         break;
-    case convertTournamentType('일기토'):
+    case 2:
         $tnmt_type = "<font color=cyan>일기토</font>";
         $tp = "strength";
         $tp2 = "무력";
         $tp3 = "strength";
         break;
-    case convertTournamentType('설전'):
+    case 3:
         $tnmt_type = "<font color=cyan>설전</font>";
         $tp = "intel";
         $tp2 = "지력";
@@ -273,7 +273,7 @@ if ($str3) {
             for ($i = 0; $i < 8; $i++) {
                 $cent[$i] = "<font color=white>";
             }
-            $generalList = $db->query('SELECT npc,name,win,leadership,strength,intel,leadership+strength+intel as total from tournament where grp>=20 order by grp, grp_no LIMIT 16');
+            $generalList = $db->query('SELECT npc,name,win from tournament where grp>=20 order by grp, grp_no LIMIT 16');
             while (count($generalList) < 16) {
                 $generalList[] = [
                     'name' => '-',
@@ -293,7 +293,6 @@ if ($str3) {
                     $line[$i] = "<font color=white>";
                 }
                 $gen[$i] = $general['name'];
-                $stat[$i] = $general[$tp];
             }
             for ($i = 0; $i < 8; $i++) {
                 $cent[$i] = $cent[$i] . "┻" . "</font>";
@@ -301,43 +300,40 @@ if ($str3) {
                 $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━┓" . "</font>";
                 echo "<td colspan=2>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
             }
-            ?>
+            echo "
     </tr>
-      <tr align=center>
-        <?php for ($i = 0; $i < 16; $i++) { ?>
-            <td width=70><?=$gen[$i]?></td>
-        <?php } ?>
-      </tr>
-      <tr align=center>
-        <?php for ($i = 0; $i < 16; $i++) { ?>
-            <td width=70 style="font-size: 14px"><?=$stat[$i]?></td>
-        <?php } ?>
-      </tr>
+    <tr align=center>";
+
+            for ($i = 0; $i < 16; $i++) {
+                echo "<td width=70>{$gen[$i]}</td>";
+            }
+
+            $bet = [];
+            $gold = [];
+
+            for ($i = 0; $i < 16; $i++) {
+                if ($globalBet[$i] == 0) {
+                    $bet[$i] = "∞";
+                } else {
+                    $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
+                }
+            }
+
+            for ($i = 0; $i < 16; $i++) {
+                if (!is_numeric($bet[$i])) {
+                    $gold[$i] = 0;
+                } else {
+                    $gold[$i] = Util::round($myBet[$i] * $bet[$i]);
+                }
+            }
+            ?>
+        </tr>
     </table>
-    <table align=center width=1120 style="table-layout: fixed" class='tb_layout bg0'>
+    <table align=center width=1120 class='tb_layout bg0'>
         <tr align=center>
             <td height=10 colspan=16></td>
         </tr>
         <?php
-
-          $bet = [];
-          $gold = [];
-
-          for ($i = 0; $i < 16; $i++) {
-              if ($globalBet[$i] == 0) {
-                  $bet[$i] = "∞";
-              } else {
-                  $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
-              }
-          }
-
-          for ($i = 0; $i < 16; $i++) {
-              if (!is_numeric($bet[$i])) {
-                  $gold[$i] = 0;
-              } else {
-                  $gold[$i] = Util::round($myBet[$i] * $bet[$i]);
-              }
-          }
         echo "
     <tr align=center>";
 

hwe/b_currentCity.php

@@ -337,7 +337,6 @@ $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,
@@ -365,7 +364,7 @@ $templates = new \League\Plates\Engine('templates');
                             }
 
                             $generalsName = array_map(function ($gen) {
-                                return formatName($gen['name'], $gen['npc']);
+                                return getColoredName($gen['name'], $gen['npc']);
                             }, $generals);
 
                             $enemyCrew = 0;

hwe/b_diplomacy.php

@@ -13,6 +13,8 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("중원정보", 1);
 
+$mapTheme = $gameStor->map_theme ?? 'che';
+
 $me = $db->queryFirstRow('SELECT no,nation FROM general WHERE owner=%i', $userID);
 $myNationID = $me['nation'];
 
@@ -95,15 +97,20 @@ $neutralStateCharMap = [
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printCSS('css/map.css') ?>
     <?= WebUtil::printCSS('css/history.css') ?>
-    <?= WebUtil::printStaticValues([
-        'staticValues' => [
-            'serverNick' => DB::prefix(),
-            'serverID' => UniqueConst::$serverID,
-            'unitSet' => GameConst::$unitSet,
-            'mapName' => GameConst::$mapName,
-        ],
-    ]) ?>
     <?= WebUtil::printDist('ts', ['common', 'map']) ?>
+    <script>
+        window.serverNick = '<?= DB::prefix() ?>';
+        window.serverID = '<?= UniqueConst::$serverID ?>';
+        $(function() {
+
+            reloadWorldMap({
+                neutralView: true,
+                showMe: true,
+                useCachedMap: true
+            });
+
+        });
+    </script>
 </head>
 
 <body>
@@ -187,7 +194,7 @@ $neutralStateCharMap = [
         </tr>
         <tr>
             <td width=698 height=420>
-                <?= getMapHtml() ?>
+                <?= getMapHtml($mapTheme) ?>
             </td>
             <td id='nation_list_frame'>
                 <table id='nation_list'>
@@ -224,13 +231,6 @@ $neutralStateCharMap = [
             <td><?= banner() ?></td>
         </tr>
     </table>
-    <script>
-        reloadWorldMap({
-            neutralView: true,
-            showMe: true,
-            useCachedMap: true
-        });
-    </script>
 </body>
 
 </html>

hwe/b_genList.php

@@ -172,7 +172,7 @@ $templates = new \League\Plates\Engine('templates');
 
         $general['expLevelText'] = getExpLevel($general['experience']);
 
-        $general['nameText'] = formatName($general['name'], $general['npc']);
+        $general['nameText'] = getColoredName($general['name'], $general['npc']);
 
         $general['modeText'] = formatDefenceTrain($general['defence_train']);
         $general['crewtypeText'] = GameUnitConst::byId($general['crewtype'])->name ?? '-';

hwe/b_myCityInfo.php

@@ -71,8 +71,7 @@ $sel = [$type => "selected"];
     </table>
     <?php
 
-    $nation = $db->queryFirstRow('SELECT nation, name, color, type, level, capital, gennum, `power`, `rate` from nation WHERE nation = %i', $nationID);  //국가정보
-    $nationTypeObj = buildNationTypeClass($nation['type']);
+    $nation = getNationStaticInfo($me['nation']);  //국가정보
 
     $officerList = [];
     foreach ($db->query('SELECT no,name,npc,city,officer_level,officer_city,belong FROM general WHERE nation = %i AND 2 <= officer_level AND officer_level <= 4', $nationID) as $officer) {
@@ -83,17 +82,6 @@ $sel = [$type => "selected"];
         $officerList[$officerCityID][$officer['officer_level']] = $officer;
     }
 
-    $generalList = $db->query('SELECT npc, name, city FROM general WHERE nation = %i', $me['nation']);
-    $cityGeneralList = [];
-    foreach ($generalList as $general) {
-        $cityID = $general['city'];
-        if (!key_exists($cityID, $cityGeneralList)) {
-            $cityGeneralList[$cityID] = [];
-        }
-
-        $cityGeneralList[$cityID][] = formatName($general['name'], $general['npc']);
-    }
-
 
     $cityList = $db->query('SELECT *,pop/pop_max as poprate from city where nation=%i', $nationID);
 
@@ -183,12 +171,8 @@ $sel = [$type => "selected"];
         ];
 
         $cityOfficerList = $officerList[$cityID] ?? [];
-        $effectiveOfficerCnt = 0;
         foreach ($cityOfficerList as $cityOfficer) {
-            if ($cityOfficer['city'] == $cityID) {
-                $effectiveOfficerCnt += 1;
-            }
-            $officerName[$cityOfficer['officer_level']] = formatName($cityOfficer['name'], $cityOfficer['npc']);
+            $officerName[$cityOfficer['officer_level']] = getColoredName($cityOfficer['name'], $cityOfficer['npc']);
         }
 
         if ($type == 10 && $city['region'] != $region) {
@@ -203,60 +187,62 @@ $sel = [$type => "selected"];
             $city['trade'] = "- ";
         }
 
-
-        $cityGoldIncome = $nation['rate'] / 20 * calcCityGoldIncome($city, $effectiveOfficerCnt, $nation['capital'] == $cityID, $nation['level'], $nationTypeObj);
-        $cityRiceIncome = $nation['rate'] / 20 * calcCityRiceIncome($city, $effectiveOfficerCnt, $nation['capital'] == $cityID, $nation['level'], $nationTypeObj);
-        $cityWallIncome = $nation['rate'] / 20 * calcCityWallRiceIncome($city, $effectiveOfficerCnt, $nation['capital'] == $cityID, $nation['level'], $nationTypeObj);
-
+        echo "
+<table align=center width=1000 class='tb_layout bg2'>
+    <tr>
+        <td colspan=12 style=color:" . newColor($nation['color']) . "; bgcolor={$nation['color']}><font size=2>【 " . CityConst::$regionMap[$city['region']] . " | " . CityConst::$levelMap[$city['level']] . " 】 {$city['name']}</font></td>
+    </tr>
+    <tr>
+        <td align=center width=46 class='bg1'>주민</td>
+        <td align=center width=140>{$city['pop']}/{$city['pop_max']}</td>
+        <td align=center width=46 class='bg1'>농업</td>
+        <td align=center width=140>{$city['agri']}/{$city['agri_max']}</td>
+        <td align=center width=46 class='bg1'>상업</td>
+        <td align=center width=140>{$city['comm']}/{$city['comm_max']}</td>
+        <td align=center width=46 class='bg1'>치안</td>
+        <td align=center width=140>{$city['secu']}/{$city['secu_max']}</td>
+        <td align=center width=46 class='bg1'>수비</td>
+        <td align=center width=140>{$city['def']}/{$city['def_max']}</td>
+        <td align=center width=46 class='bg1'>성벽</td>
+        <td align=center width=140>{$city['wall']}/{$city['wall_max']}</td>
+    </tr>
+    <tr>
+        <td align=center class='bg1'>민심</td>
+        <td align=center>" . round($city['trust'], 1) . "</td>
+        <td align=center class='bg1'>시세</td>
+        <td align=center>{$city['trade']}%</td>
+        <td align=center class='bg1'>인구</td>
+        <td align=center>" . round($city['pop'] / $city['pop_max'] * 100, 2) . " %</td>
+        <td align=center class='bg1'>태수</td>
+        <td align=center>";
+        echo $officerName[4];
+        echo "</td>
+        <td align=center class='bg1'>군사</td>
+        <td align=center>";
+        echo $officerName[3];
+        echo "</td>
+        <td align=center class='bg1'>종사</td>
+        <td align=center>";
+        echo $officerName[2];
+        echo "</td>
+    </tr>
+    <tr>
+        <td align=center class='bg1'>장수</td>
+        <td colspan=11>";
+        $generalList = $db->query('SELECT npc, name FROM general WHERE city = %i AND nation = %i', $city['city'], $me['nation']);
+        if (!$generalList) {
+            echo "-";
+        }
+        foreach ($generalList as $general) {
+            echo getColoredName($general['name'], $general['npc']) . ', ';
+        }
+        echo "
+        </td>
+    </tr>
+</table>
+";
+    }
     ?>
-        <table align=center width=1000 class='tb_layout bg2'>
-            <tr>
-                <td colspan=10 style="color:<?= newColor($nation['color']) ?>; background-color:<?= $nation['color'] ?>;">
-                    <font size=2>【 <?= CityConst::$regionMap[$city['region']] ?> | <?= CityConst::$levelMap[$city['level']] ?> 】 <?= $city['name'] ?></font>
-                </td>
-            </tr>
-            <tr style='text-align:center;'>
-                <td width=60 class='bg1'>주민</td>
-                <td width=140 class='pop-value'><?= $city['pop'] ?>/<?= $city['pop_max'] ?></td>
-                <td width=60 class='bg1'>인구율</td>
-                <td width=140 class='pop-prop-value'><?= round($city['pop'] / $city['pop_max'] * 100, 2) ?>%</td>
-                <td width=60 class='bg1'>자금 수입</td>
-                <td width=140 class='gold-income'><?= number_format($cityGoldIncome) ?></td>
-                <td width=60 class='bg1'>군량 수입</td>
-                <td width=140 class='rice-income'><?= number_format($cityRiceIncome) ?></td>
-                <td width=60 class='bg1'>둔전 수입</td>
-                <td width=140 class='wall-income'><?= number_format($cityWallIncome) ?></td>
-            </tr>
-            <tr style='text-align:center;'>
-                <td class='bg1'>농업</td>
-                <td class='agri-value'><?= $city['agri'] ?>/<?= $city['agri_max'] ?></td>
-                <td class='bg1'>상업</td>
-                <td class='comm-value'><?= $city['comm'] ?>/<?= $city['comm_max'] ?></td>
-                <td class='bg1'>치안</td>
-                <td class='secu-value'><?= $city['secu'] ?>/<?= $city['secu_max'] ?></td>
-                <td class='bg1'>수비</td>
-                <td class='def-value'><?= $city['def'] ?>/<?= $city['def_max'] ?></td>
-                <td class='bg1'>성벽</td>
-                <td class='wall-value'><?= $city['wall'] ?>/<?= $city['wall_max'] ?></td>
-            </tr>
-            <tr style='text-align:center;'>
-                <td class='bg1'>민심</td>
-                <td class='trust-value'><?= round($city['trust'], 1) ?></td>
-                <td class='bg1'>시세</td>
-                <td class='trade-value'><?= $city['trade'] ?>%</td>
-                <td class='bg1'>태수</td>
-                <td class='officer-4-value'><?= $officerName[4] ?></td>
-                <td class='bg1'>군사</td>
-                <td class='officer-3-value'><?= $officerName[3] ?></td>
-                <td class='bg1'>종사</td>
-                <td class='officer-2-value'><?= $officerName[2] ?></td>
-            </tr>
-            <tr>
-                <td style='text-align:center;' class='bg1'>장수</td>
-                <td colspan=9 class='city-generals'><?= key_exists($cityID, $cityGeneralList) ? join(', ', $cityGeneralList[$cityID]) : '-' ?></td>
-            </tr>
-        </table>
-    <?php } ?>
 
     <table align=center width=1000 class='tb_layout bg0 anchor'>
         <tr>
@@ -266,7 +252,7 @@ $sel = [$type => "selected"];
             <td><?= banner() ?></td>
         </tr>
     </table>
-    <div id="helper_genlist" style="display:none;"></div>
 </body>
+<div id="helper_genlist" style="display:none;"></div>
 
 </html>

hwe/c_tournament.php

@@ -98,8 +98,8 @@ if($btn == '참가') {
         ], 'no=%i', $general['no']);
     }
 
-    $grpCount = $db->queryFirstColumn('SELECT count(grp) FROM tournament where grp<10 GROUP BY grp;');
-    if(min($grpCount) >= 8) {
+    $grpCount = $db->queryFirstField('SELECT count(*) FROM tournament where grp<10 GROUP BY grp HAVING count(*)=8');
+    if($grpCount >= 8) {
         $gameStor->tournament = 2;
         $gameStor->phase = 0;
     }

hwe/func.php

@@ -171,7 +171,7 @@ function cityInfo(General $generalObj)
     ];
 
     foreach ($db->query('SELECT `officer_level`, `name`, npc, no FROM general WHERE officer_city = %i', $cityID) as $officer) {
-        $officerName[$officer['officer_level']] = formatName($officer['name'], $officer['npc']);
+        $officerName[$officer['officer_level']] = getColoredName($officer['name'], $officer['npc']);
     }
 
     $city['officerName'] = $officerName;
@@ -199,8 +199,8 @@ function myNationInfo(General $generalObj)
 
     $topChiefs = Util::convertArrayToDict($db->query('SELECT officer_level, no, name, npc FROM general WHERE nation = %i AND officer_level >= 11', $nationID), 'officer_level');
 
-    $level12Name = key_exists(12, $topChiefs) ? formatName($topChiefs[12]['name'], $topChiefs[12]['npc']) : '-';
-    $level11Name = key_exists(11, $topChiefs) ? formatName($topChiefs[11]['name'], $topChiefs[11]['npc']) : '-';
+    $level12Name = key_exists(12, $topChiefs) ? getColoredName($topChiefs[12]['name'], $topChiefs[12]['npc']) : '-';
+    $level11Name = key_exists(11, $topChiefs) ? getColoredName($topChiefs[11]['name'], $topChiefs[11]['npc']) : '-';
 
     $impossibleStrategicCommandLists = [];
     $strategicCommandLists = GameConst::$availableChiefCommand['전략'];

hwe/func_command.php

@@ -393,7 +393,6 @@ function setGeneralCommand(int $generalID, array $rawTurnList, string $command,
     _setGeneralCommand($commandObj, $turnList);
     return [
         'result'=>true,
-        'brief'=>$commandObj->getBrief(),
         'reason'=>'success'
     ];
 }
@@ -475,7 +474,6 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
     _setNationCommand($commandObj, $turnList);
     return [
         'result'=>true,
-        'brief'=>$commandObj->getBrief(),
         'arg_test'=>true,
         'reason'=>'success'
     ];

hwe/func_converter.php

@@ -64,15 +64,6 @@ function getNationLevel(int $level) {
     ][$level];
 }
 
-function convertTournamentType(string $type){
-  return[
-    '전력전'=>0,
-    '통솔전'=>1,
-    '일기토'=>2,
-    '설전'=>3,
-  ][$type]??-1;
-}
-
 function getGenChar(?string $type) {
     if($type === null){
         return '-';
@@ -701,35 +692,21 @@ function isConsumable(?string $item) : bool{
     return $itemClass->isConsumable();
 }
 
-function getNPCColor(int $npc): ?string{
-    if ($npc == 1) {
-        return 'skyblue';
-    }
-    if ($npc == 4){
-        return 'deepskyblue';
-    }
-    if ($npc == 5){
-        return 'darkcyan';
-    }
-    if ($npc == 6){
-        return 'mediumaquamarine';
-    }
-
-    if ($npc > 1) {
+function getNameColor(int $npcType):?string{
+    if($npcType >= 2){
         return 'cyan';
     }
-
+    if($npcType == 1){
+        return 'skyblue';
+    }
     return null;
 }
-
-function formatName(string $name, int $npc): string
-{
-    $color = getNPCColor($npc);
+function getColoredName(string $name, int $npcType):string{
+    $color = getNameColor($npcType);
     if($color === null){
         return $name;
     }
-
-    return "<span style='color:{$color}'>$name</span>";
+    return "<span style='color:{$color}'>{$name}</span>";
 }
 
 function ConvertLog(?string $str, $type=1) : string {

hwe/func_gamerule.php

@@ -371,7 +371,7 @@ function postUpdateMonthly()
                 sum(pop)*sum(pop+agri+comm+secu+wall+def)/sum(pop_max+agri_max+comm_max+secu_max+wall_max+def_max)/100
             ) from city where nation=A.nation and supply=1
         ))
-        +(select SUM((ra.value + 1000)/(rb.value + 1000)*(CASE WHEN g.`npc` < 2 THEN 1.2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)*2 + (SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/2)
+        +(select SUM((ra.value + 1000)/(rb.value + 1000)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)*2 + (SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/2)
                 FROM general AS g
                 LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = \'killcrew_person\'
                 LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = \'deathcrew_person\'

hwe/func_template.php

@@ -168,7 +168,7 @@ function commandButton(array $opts = [])
     $showSecret = false;
     $permission = checkSecretPermission($me);
     $btnClassForTournament = $opts['btnClass'];
-    if ($opts['isTournamentApplicationOpen']) {
+    if ($opts['isTournamentActive']) {
       if ($btnClassForTournament != 'dropdown-item') {
         $btnClassForTournament = 'toolbarButton2';
       }
@@ -231,23 +231,57 @@ function formatLeadershipBonus(int $value): string
     return "<font color=cyan>+{$value}</font>";
 }
 
+function getNPCColor(int $npc): ?string{
+    if ($npc == 1) {
+        return 'skyblue';
+    }
+    if ($npc == 4){
+        return 'deepskyblue';
+    }
+    if ($npc == 5){
+        return 'darkcyan';
+    }
+    if ($npc == 6){
+        return 'mediumaquamarine';
+    }
 
+    if ($npc > 1) {
+        return 'cyan';
+    }
+
+    return null;
+}
+
+function formatName(string $name, int $npc): string
+{
+    $color = getNPCColor($npc);
+    if($color === null){
+        return $name;
+    }
+
+    return "<span style='color:{$color}'>$name</span>";
+}
 
 function getMapTheme(): string
 {
-    return GameConst::$mapName;
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $mapTheme = $gameStor->map_theme ?? 'che';
+    return $mapTheme;
 }
 
-function getMapHtml(?string $mapName = null)
+function getMapHtml(?string $mapTheme = null)
 {
     $templates = new \League\Plates\Engine(__DIR__ . '/templates');
 
-    if($mapName === null){
-        $mapName = GameConst::$mapName;
+    if ($mapTheme === null) {
+        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $mapTheme = $gameStor->map_theme ?? 'che';
     }
 
     return $templates->render('map', [
-        'mapName' => $mapName
+        'mapTheme' => $mapTheme
     ]);
 }
 

hwe/func_time_event.php

@@ -4,12 +4,14 @@ namespace sammo;
  * 시간 단위로 일어나는 이벤트들에 대한 함수 모음
  */
 
-
+ 
 //1월마다 실행
 function processSpring() {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
+    //인구 증가
+    popIncrease();
     // 1월엔 무조건 내정 1% 감소
     $db->update('city',[
         'dead'=>0,
@@ -20,9 +22,6 @@ function processSpring() {
         'wall'=>$db->sqleval('wall * 0.99'),
     ],true);
 
-    //인구 증가
-    popIncrease();
-
     // > 10000 유지비 3%, > 1000 유지비 1%
     // 유지비 1%
     $db->update('general', [
@@ -101,7 +100,7 @@ function processGoldIncome() {
             $generalObj = new General($rawGeneral, null, null, null, $year, $month, false);
             $gold = Util::round(getBill($generalObj->getVar('dedication'))*$ratio);
             $generalObj->increaseVar('gold', $gold);
-
+            
             $logger = $generalObj->getLogger();
             if($generalObj->getVar('officer_level') > 4){
                 $logger->pushGeneralActionLog($incomeLog, $logger::PLAIN);
@@ -122,9 +121,9 @@ function processGoldIncome() {
 
 function popIncrease() {
     $db = DB::db();
-
+    
     $nationList = $db->queryAllLists('SELECT nation,rate_tmp,type FROM nation');
-
+    
     // 인구 및 민심
 
     $db->update('city', [
@@ -139,7 +138,7 @@ function popIncrease() {
     foreach($nationList as [$nationID, $taxRate, $nationType]){
         $nationTypeObj = buildNationTypeClass($nationType);
 
-
+        
         $popRatio = (30 - $taxRate)/200;  // 20일때 5% 5일때 12.5% 50일때 -10%
         $popRatio = $nationTypeObj->onCalcNationalIncome('pop', $popRatio);
 
@@ -247,7 +246,7 @@ function getGoldIncome(int $nationID, int $nationLevel, float $taxRate, int $cap
     }
 
     $cityIncome *= ($taxRate / 20);
-
+    
     return $cityIncome;
 }
 
@@ -291,6 +290,9 @@ function getWarGoldIncome(string $nationType, array $cityList){
 function processFall() {
     $db = DB::db();
 
+    //인구 증가
+    popIncrease();
+    
     // 7월엔 무조건 내정 1% 감소
     $db->update('city',[
         'dead'=>0,
@@ -301,8 +303,6 @@ function processFall() {
         'wall'=>$db->sqleval('wall * 0.99'),
     ],true);
 
-    //인구 증가
-    popIncrease();
 
     // > 10000 유지비 3%, > 1000 유지비 1%
     // 유지비 1%
@@ -378,7 +378,7 @@ function processRiceIncome() {
             $generalObj = new General($rawGeneral, null, null, null, $year, $month, false);
             $rice = Util::round(getBill($generalObj->getVar('dedication'))*$ratio);
             $generalObj->increaseVar('rice', $rice);
-
+            
             $logger = $generalObj->getLogger();
             if($generalObj->getVar('officer_level') > 4){
                 $logger->pushGeneralActionLog($incomeLog, $logger::PLAIN);
@@ -418,7 +418,7 @@ function getRiceIncome(int $nationID, int $nationLevel, float $taxRate, int $cap
     }
 
     $cityIncome *= ($taxRate / 20);
-
+    
     return $cityIncome;
 }
 
@@ -439,12 +439,12 @@ function getWallIncome(int $nationID, int $nationLevel, float $taxRate, int $cap
     $cityIncome = 0;
     foreach($cityList as $rawCity){
         $cityID = $rawCity['city'];
-
+        
         $cityIncome += calcCityWallRiceIncome($rawCity, $officersCnt[$cityID]??0, $capitalID == $cityID, $nationLevel, $nationTypeObj);
     }
 
     $cityIncome *= ($taxRate / 20);
-
+    
     return $cityIncome;
 }
 
@@ -520,7 +520,7 @@ function disaster() {
         }
         else {
             $raiseProp = 0.06 - ($city['secu'] / $city['secu_max']) * 0.05; // 1 ~ 6%
-        }
+        }    
 
         if(Util::randBool($raiseProp)) {
             $targetCityList[] = $city;
@@ -592,11 +592,11 @@ function disaster() {
                 'def'=>$db->sqleval('def * %d', $affectRatio),
                 'wall'=>$db->sqleval('wall * %d', $affectRatio),
             ], 'city = %i', $city['city']);
-
+            
             $generalList = array_map(
                 function($rawGeneral) use ($city, $year, $month){
                     return new General($rawGeneral, null, $city, null, $year, $month, false);
-                },
+                }, 
                 $generalListByCity[$city['city']]??[]
             );
 
@@ -619,7 +619,7 @@ function disaster() {
                 'wall'=>$db->sqleval('least(wall * %d, wall_max)', $affectRatio),
             ], 'city = %i', $city['city']);
 
-
+            
         }
     }
 

hwe/index.php

@@ -83,12 +83,12 @@ if ($gameStor->npcmode == 0) {
     $npcmode = "선택 생성";
 }
 $color = "cyan";
+$mapTheme = $gameStor->map_theme;
 $serverName = UniqueConst::$serverName;
 $serverCnt = $gameStor->server_cnt;
 
 $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
 $isTournamentActive = $gameStor->tournament > 0;
-$isTournamentApplicationOpen = $gameStor->tournament == 1;
 $isBettingActive = $gameStor->tournament == 6;
 
 $myNationStatic = getNationStaticInfo($generalObj->getNationID());
@@ -125,34 +125,19 @@ if (!$otherTextInfo) {
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printCSS('css/map.css') ?>
     <?= WebUtil::printStaticValues([
-        //deprecated, staticValues를 이용할 것
         'serverName' => $serverName,
         'serverCnt' => $serverCnt,
         'serverNick' => DB::prefix(),
         'serverID' => UniqueConst::$serverID,
         'maxTurn' => GameConst::$maxTurn,
         'maxPushTurn' => 12,
+        'commandList' => getCommandTable($generalObj),
         'serverNow' => TimeUtil::now(false),
+        'baseColor2' => GameConst::$basecolor2,
         'lastExecuted' => $gameStor->turntime,
         'isLocked' => $plock,
         'isTournamentActive' => $isTournamentActive,
-        'isBettingActive' => $isBettingActive,
-        'staticValues' => [
-            'serverName' => $serverName,
-            'serverCnt' => $serverCnt,
-            'serverNick' => DB::prefix(),
-            'serverID' => UniqueConst::$serverID,
-            'maxTurn' => GameConst::$maxTurn,
-            'maxPushTurn' => 12,
-            'commandList' => getCommandTable($generalObj),
-            'serverNow' => TimeUtil::now(false),
-            'lastExecuted' => $gameStor->turntime,
-            'isLocked' => $plock,
-            'isTournamentActive' => $isTournamentActive,
-            'isBettingActive' => $isBettingActive,
-            'mapName' => GameConst::$mapName,
-            'unitSet' => GameConst::$unitSet,
-        ]
+        'isBettingActive' => $isBettingActive
     ]) ?>
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
 </head>
@@ -256,7 +241,7 @@ if (!$otherTextInfo) {
                 </div>
             <?php endif; ?>
             <div id="map_view" class="gx-0">
-                <div id="mapZone" class="view-item"><?= getMapHtml() ?></div>
+                <div id="mapZone" class="view-item"><?= getMapHtml($mapTheme) ?></div>
                 <div class="view-item" id="reservedCommandZone">
                     <div id="reservedCommandList"></div>
                     <div id="actionMiniPlate" class="gx-0 row">
@@ -272,7 +257,7 @@ if (!$otherTextInfo) {
                 <div id="nation-position"><?php myNationInfo($generalObj); ?></div>
                 <div id="general-position"><?php generalInfo($generalObj); ?></div>
                 <div id="generalCommandButton" class="row gx-0">
-                    <div class="buttonPlate bg2"><?= commandButton(['btnClass' => 'btn btn-sammo-nation', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?></div>
+                    <div class="buttonPlate bg2"><?= commandButton(['btnClass' => 'btn btn-sammo-nation', 'isTournamentActive' => $isTournamentActive, 'isBettingActive' => $isBettingActive]) ?></div>
                 </div>
             </div>
         </div>
@@ -372,7 +357,7 @@ if (!$otherTextInfo) {
                             국가 메뉴
                         </div>
                         <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
-                            <?= commandButton(['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?>
+                            <?= commandButton(['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item', 'isTournamentActive' => $isTournamentActive, 'isBettingActive' => $isBettingActive]) ?>
                         </ul>
                     </li>
                     <li class="nav-item dropup">

hwe/j_diplomacy_rollback_letter.php

@@ -41,6 +41,8 @@ if ($permission < 4) {
     ]);
 }
 
+$reason = trim($reason);
+
 $letter = $db->queryFirstRow('SELECT * FROM ng_diplomacy WHERE no=%i AND src_nation_id = %i AND state = \'proposed\'', $letterNo, $me['nation']);
 if(!$letter){
     Json::die([
@@ -64,7 +66,7 @@ $unlimited = new \DateTime('9999-12-31');
 $aux['reason'] = [
     'who'=>$me['no'],
     'action'=>'cancelled',
-    'reason'=>'회수',
+    'reason'=>$reason
 ];
 $db->update('ng_diplomacy', [
     'state'=>'cancelled',

hwe/j_get_general_list.php

@@ -0,0 +1,109 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+
+//로그인 검사
+$session = Session::requireLogin([]);
+$userID = Session::getUserID();
+
+$db = DB::db();
+$withToken = Util::getPost('with_token', 'bool', false);
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+if($session->isGameLoggedIn()){
+    increaseRefresh("장수일람", 2);
+
+    $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
+    $con = checkLimit($me['con']);
+    if ($con >= 2) {
+        Json::die([
+            'result'=>false,
+            'reason'=>'접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.'
+        ]);
+    }
+}
+else{
+    $availableNextCall = $session->availableNextCallGetGeneralList??'2000-01-01 00:00:00';
+    $now = new \DateTimeImmutable();
+
+    if($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 5){
+        Json::die([
+            'result'=>false,
+            'reason'=>"장수 리스트는 10초에 한번 갱신 가능합니다.\n다음 시간 : ".$availableNextCall
+        ]);
+    }
+    
+    $availableNextCall = $now->add(new \DateInterval('PT10S'))->format('Y-m-d H:i:s');
+    $session->availableNextCallGetGeneralList = $availableNextCall;
+}
+
+$session->setReadOnly();
+
+$rawGeneralList = $db->queryAllLists('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,owner_name as ownerName,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect from general');
+
+$ownerNameList = [];
+if($gameStor->isunited){
+    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
+
+$generalList = [];
+foreach($rawGeneralList as $rawGeneral){
+    [$owner,$no,$picture,$imgsvr,$npc,$age,$nation,$special,$special2,$personal,$name,$ownerName,$injury,$leadership,$strength,$intel,$experience,$dedication,$officerLevel,$killturn,$connectCnt] = $rawGeneral;
+
+    if(key_exists($owner, $ownerNameList)){
+        $ownerName = $ownerNameList[$owner];
+    }
+
+    $nationArr = getNationStaticInfo($nation);
+    $lbonus = calcLeadershipBonus($officerLevel, $nationArr['level']);
+
+    $generalList[] = [
+        $no,
+        $picture,
+        $imgsvr,
+        $npc,
+        $age,
+        $nationArr['name'],
+        getGeneralSpecialDomesticName($special),
+        getGeneralSpecialWarName($special2),
+        getGenChar($personal),
+        $name,
+        $npc==1?$ownerName:null,
+        $injury,
+        $leadership,
+        $lbonus,
+        $strength,
+        $intel,
+        getExpLevel($experience),
+        getHonor($experience),
+        getDed($dedication),
+        getOfficerLevelText($officerLevel, $nationArr['level']),
+        $killturn,
+        $connectCnt
+    ];
+}
+
+$result = [
+    'result'=>'true',
+    'list'=>$generalList,
+];
+
+if($withToken){
+    $now = (new \DateTimeImmutable())->format('Y-m-d H:i:s');
+    $tokens = [];
+    foreach($db->query('SELECT * FROM select_npc_token WHERE `valid_until`>=%s', $now) as $token){
+        $validUntil = $token['valid_until'];
+
+        foreach(Json::decode($token['pick_result']) as $pickResult){
+            $tokens[$pickResult['no']]=$pickResult['keepCnt'];
+        }
+    }
+    $result['token'] = $tokens;
+}
+
+Json::die($result);

hwe/j_get_nation_general_list.php

@@ -0,0 +1,184 @@
+<?php
+
+namespace sammo;
+
+//통합 세력장수&암행부 viewer
+
+include "lib.php";
+include "func.php";
+
+//로그인 검사
+$session = Session::requireGameLogin([])->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+$reqType = Util::getReq('req', 'int', 1);
+$reqForce = Util::getReq('force', 'bool', false);
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+increaseRefresh("세력장수", 1);
+
+$me = $db->queryFirstRow('SELECT con, turntime, belong, nation, officer_level, permission, penalty FROM general WHERE owner=%i', $userID);
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result' => false,
+        'reason' => '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.'
+    ]);
+}
+
+$nationID = $me['nation'];
+$permission = checkSecretPermission($me, true);
+if ($reqForce && $reqType > $permission) {
+    Json::die([
+        'result' => false,
+        'reason' => '권한이 부족합니다.'
+    ]);
+}
+$permission = min($reqType, $permission);
+$nationArr = getNationStaticInfo($nationID);
+$viewColumns = [
+    'no' => 0,
+    'name' => 0,
+    'owner_name' => 9,
+    'nation' => 0,
+    'city' => 1,
+    'officer_level' => 2,
+    'officer_city' => 2,
+    'npc' => 0,
+    'defence_train' => 2,
+    'troop' => 2,
+    'injury' => 0,
+    'leadership' => 0,
+    'strength' => 0,
+    'intel' => 0,
+    'experience' => 1,
+    'explevel' => 0,
+    'dedication' => 1,
+    'dedlevel' => 0,
+    'gold' => 0,
+    'rice' => 0,
+    'crewtype' => 2,
+    'crew' => 2,
+    'train' => 2,
+    'atmos' => 2,
+    'killturn' => 0,
+    'turntime' => 2,
+    'picture' => 0,
+    'imgsvr' => 0,
+    'age' => 0,
+    'special' => 0,
+    'special2' => 0,
+    'personal' => 0,
+    'belong' => 0,
+    'horse' => 2,
+    'weapon' => 2,
+    'book' => 2,
+    'item' => 2,
+    'connect' => 0
+];
+
+$customViewColumns = [
+    'officerLevel' => 0,
+    'officerLevelText' => 0,
+    'lbonus' => 0,
+    'ownerName' => 0,
+    'honorText' => 0
+];
+
+function getOfficerLevel($rawGeneral)
+{
+    global $permission;
+    $level = $rawGeneral['officer_level'];
+    if ($level >= 5) {
+        return $level;
+    }
+    if ($permission > 1) {
+        return $level;
+    }
+    return 1;
+}
+
+$specialViewFilter = [
+    'officerLevel' => function ($rawGeneral){
+        return getOfficerLevel($rawGeneral);
+    },
+    'special' => function ($rawGeneral) {
+        return getGeneralSpecialDomesticName($rawGeneral['special']);
+    },
+    'special2' => function ($rawGeneral) {
+        return getGeneralSpecialWarName($rawGeneral['special2']);
+    },
+    'personal' => function ($rawGeneral) {
+        return getGenChar($rawGeneral['personal']);
+    },
+    'lbonus' => function ($rawGeneral) use ($nationArr) {
+        return calcLeadershipBonus($rawGeneral['officer_level'], $nationArr['level']);
+    },
+    'ownerName' => function ($rawGeneral) {
+        if ($rawGeneral['npc'] != 1) {
+            return null;
+        }
+        return $rawGeneral['owner_name'];
+    },
+    'officerLevelText' => function ($rawGeneral) use ($nationArr) {
+        $level = getOfficerLevel($rawGeneral);
+        return getOfficerLevelText($level, $nationArr['level']);
+    },
+    'honorText' => function ($rawGeneral) {
+        return getHonor($rawGeneral['experience']);
+    },
+    'dedLevelText' => function ($rawGeneral) {
+        return getDedLevelText($rawGeneral['dedLevel']);
+    },
+    'turntime' => function ($rawGeneral) {
+        //'0000-00-00 11:23';
+        return substr($rawGeneral['turntime'], 11, 5);
+    }
+
+];
+
+[$queryColumns, $rankColumns] = General::mergeQueryColumn(array_keys($viewColumns), 1);
+
+$rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE nation = %i', Util::formatListOfBackticks($queryColumns), $nationID), 'no');
+
+$resultColumns = [];
+foreach ($viewColumns as $column => $reqPermission) {
+    if ($reqPermission > $permission) {
+        continue;
+    }
+    $resultColumns[] = $column;
+}
+
+foreach ($customViewColumns as $column => $reqPermission) {
+    if ($reqPermission > $permission) {
+        continue;
+    }
+    $resultColumns[] = $column;
+}
+
+$generalList = [];
+foreach ($rawGeneralList as $rawGeneral) {
+    //General 생성?
+
+    $item = [];
+    foreach ($resultColumns as $column) {
+        if (key_exists($column, $specialViewFilter)) {
+            $value = $specialViewFilter[$column]($rawGeneral);
+        }
+        else{
+            $value = $rawGeneral[$column];
+        }
+        $item[] = $value;
+    }
+
+    $generalList[] = $item;
+}
+
+$result = [
+    'result' => true,
+    'column' => $resultColumns,
+    'list' => $generalList,
+];
+
+Json::die($result);

hwe/j_map_recent.php

@@ -31,12 +31,17 @@ $now = time();
 if($mapInfo && ($now - $mapInfo['timestamp'] < 600)){
 	$mapEtag = $mapInfo['etag'];
 	$mapModified = $mapInfo['timestamp'];
-    WebUtil::setCacheHeader(new APICacheResult(TimeUtil::secondsToDateTime($mapModified), $mapEtag));
-    $reqMapEtag = WebUtil::parseETag();
-    $reqModifiedSince = WebUtil::parseLastModified();
-    if($mapEtag === $reqMapEtag || $mapModified === $reqModifiedSince){
-        WebUtil::dieWithNotModified();
-    }
+	
+    header("Last-Modified: ".gmdate("D, d M Y H:i:s", $mapModified)." GMT"); 
+    header("Etag: $mapEtag"); 
+
+    if (
+		strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']??'2000-01-01') === $mapModified || 
+		trim($_SERVER['HTTP_IF_NONE_MATCH']??'') === $mapEtag
+	) { 
+        header("HTTP/1.1 304 Not Modified"); 
+		die();
+	}
 
 	Json::die($mapInfo['data'], 0);
 }
@@ -60,9 +65,10 @@ $rawMap = getWorldMap([
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
+$mapTheme = $gameStor->map_theme ?? 'che';
 
 $rawMap['history'] = $history;
-$rawMap['theme'] = GameConst::$mapName;
+$rawMap['theme'] = $mapTheme;
 
 $etag = hash('sha256', $serverID.$now);
 $map = [
@@ -71,6 +77,7 @@ $map = [
 	'data'=>$rawMap,
 ];
 $cache->save("recent_map", $map);
-WebUtil::setCacheHeader(new APICacheResult(TimeUtil::secondsToDateTime($now), $etag));
+header("Last-Modified: ".gmdate("D, d M Y H:i:s", $now)." GMT"); 
+header("Etag: $etag"); 
 
 Json::die($map['data'], 0);

hwe/process_war.php

@@ -231,10 +231,7 @@ function processWar_NG(
     $logger->pushGlobalActionLog("<D><b>{$attacker->getNationVar('name')}</b></>의 <Y>{$attacker->getName()}</>{$josaYi} <G><b>{$city->getName()}</b></>{$josaRo} 진격합니다.");
     $logger->pushGeneralActionLog("<G><b>{$city->getName()}</b></>{$josaRo} <M>진격</>합니다. <1>$date</>");
 
-    $logWritten = false;
-
-    while($attacker->getPhase() < $attacker->getMaxPhase()){
-        $logWritten = false;
+    for ($currPhase = 0; $currPhase < $attacker->getMaxPhase(); $currPhase += 1) {
         if ($defender === null) {
             $defender = $city;
 
@@ -259,8 +256,8 @@ function processWar_NG(
             }
         }
 
-        if ($defender->getPhase() == 0 && $defender->getOppose() == null) {
-            $defender->setPrePhase($attacker->getPhase());
+        if ($defender->getPhase() == 0) {
+            $defender->setPrePhase($currPhase);
 
             $attacker->addTrain(1);
             $defender->addTrain(1);
@@ -350,22 +347,15 @@ function processWar_NG(
         $attacker->increaseKilled($deadDefender);
         $defender->increaseKilled($deadAttacker);
 
-        if($defender->getPhase() < 0){
-            $phaseNickname = '先';
-        }
-        else{
-            $currPhase = $attacker->getPhase() + 1;
-            $phaseNickname = "{$currPhase} ";
-        }
-
+        $phaseNickname = $currPhase + 1;
 
         if ($deadAttacker > 0 || $deadDefender > 0) {
             $attacker->getLogger()->pushGeneralBattleDetailLog(
-                "$phaseNickname: <Y1>【{$attacker->getName()}】</> <C>{$attacker->getHP()} (-$deadAttacker)</> VS <C>{$defender->getHP()} (-$deadDefender)</> <Y1>【{$defender->getName()}】</>"
+                "$phaseNickname : <Y1>【{$attacker->getName()}】</> <C>{$attacker->getHP()} (-$deadAttacker)</> VS <C>{$defender->getHP()} (-$deadDefender)</> <Y1>【{$defender->getName()}】</>"
             );
 
             $defender->getLogger()->pushGeneralBattleDetailLog(
-                "$phaseNickname: <Y1>【{$defender->getName()}】</> <C>{$defender->getHP()} (-$deadDefender)</> VS <C>{$attacker->getHP()} (-$deadAttacker)</> <Y1>【{$attacker->getName()}】</>"
+                "$phaseNickname : <Y1>【{$defender->getName()}】</> <C>{$defender->getHP()} (-$deadDefender)</> VS <C>{$attacker->getHP()} (-$deadAttacker)</> <Y1>【{$attacker->getName()}】</>"
             );
         }
 
@@ -374,8 +364,6 @@ function processWar_NG(
         $defender->addPhase();
 
         if (!$attacker->continueWar($noRice)) {
-            $logWritten = true;
-
             $attacker->logBattleResult();
             $defender->logBattleResult();
 
@@ -398,7 +386,6 @@ function processWar_NG(
         }
 
         if (!$defender->continueWar($noRice)) {
-            $logWritten = true;
 
             $attacker->logBattleResult();
             $defender->logBattleResult();
@@ -427,7 +414,7 @@ function processWar_NG(
                 $defender->getLogger()->pushGeneralActionLog("전멸했습니다.", ActionLogger::PLAIN);
             }
 
-            if ($attacker->getPhase() >= $attacker->getMaxPhase()) {
+            if ($currPhase + 1 == $attacker->getMaxPhase()) {
                 break;
             }
 
@@ -440,7 +427,7 @@ function processWar_NG(
         }
     }
 
-    if (!$logWritten) {
+    if ($currPhase == $attacker->getMaxPhase()) {
         //마지막 페이즈의 전투 마무리
         $attacker->logBattleResult();
         $defender->logBattleResult();

hwe/recent_map.php

@@ -16,10 +16,8 @@ include "func.php";
     <title>최근 지도</title>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
     <?= WebUtil::printStaticValues([
-        'staticValues' => [
-            'serverNick' => DB::prefix(),
-            'serverID' => UniqueConst::$serverID
-        ],
+        'serverNick' => DB::prefix(),
+        'serverID' => UniqueConst::$serverID
     ]) ?>
     <?= WebUtil::printJS('d_shared/base_map.js') ?>
 

hwe/sammo/API/Command/ReserveBulkCommand.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace sammo\API\Command;
-
-use sammo\Session;
-use DateTimeInterface;
-use sammo\GameConst;
-use sammo\Util;
-use sammo\Validator;
-
-use function sammo\setGeneralCommand;
-
-class ReserveBulkCommand extends \sammo\BaseAPI
-{
-    public function validateArgs(): ?string
-    {
-        foreach ($this->args as $idx => $turn) {
-            $v = new Validator($turn);
-            $v->rule('required', [
-                'action',
-                'turnList'
-            ])
-                ->rule('lengthMin', 'action', 1)
-                ->rule('integerArray', 'turnList');
-
-            if (!$v->validate()) {
-                return "{$idx}:{$v->errorStr()}";
-            }
-        }
-
-        return null;
-    }
-
-    public function getRequiredSessionMode(): int
-    {
-        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
-    }
-
-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
-    {
-        $briefList = [];
-        foreach ($this->args as $idx => $turn) {
-            $action = $turn['action'];
-            $turnList = $turn['turnList'];
-            $arg = $turn['arg'] ?? [];
-
-            if (!$turnList) {
-                return "{$idx}: 턴이 입력되지 않았습니다";
-            }
-
-            if (!in_array($action, Util::array_flatten(GameConst::$availableGeneralCommand))) {
-                return "{$idx}: 사용할 수 없는 커맨드입니다.";
-            }
-
-            if (!is_array($arg)) {
-                return "{$idx}: 올바른 arg 형태가 아닙니다.";
-            }
-            $partialResult = setGeneralCommand($session->generalID, $turnList, $action, $arg);
-            if(!$partialResult['result']){
-                return [
-                    'result' => false,
-                    'briefList' => $briefList,
-                    'errorIdx' => $idx,
-                    'reason' => $partialResult['reason']
-                ];
-            }
-            $briefList[$idx] = $partialResult['brief'];
-        }
-
-        return [
-            'result' => true,
-            'briefList' => $briefList,
-            'reason' => 'success'
-        ];
-    }
-}

hwe/sammo/API/Global/GeneralList.php

@@ -1,165 +0,0 @@
-<?php
-
-namespace sammo\API\List\Nation;
-
-use sammo\DB;
-use sammo\General;
-use sammo\Json;
-use sammo\KVStorage;
-use sammo\RootDB;
-use sammo\Session;
-use sammo\Util;
-use sammo\Validator;
-
-use function sammo\calcLeadershipBonus;
-use function sammo\checkLimit;
-use function sammo\checkSecretPermission;
-use function sammo\getDed;
-use function sammo\getDedLevelText;
-use function sammo\getExpLevel;
-use function sammo\getGenChar;
-use function sammo\getGeneralSpecialDomesticName;
-use function sammo\getGeneralSpecialWarName;
-use function sammo\getHonor;
-use function sammo\getNationStaticInfo;
-use function sammo\getOfficerLevelText;
-use function sammo\increaseRefresh;
-
-class GeneralList extends \sammo\BaseAPI
-{
-    public function validateArgs(): ?string
-    {
-        $v = new Validator($this->args);
-        $v
-            ->rule('boolean', 'with_token');
-        if (!$v->validate()) {
-            return $v->errorStr();
-        }
-        return null;
-    }
-
-    public function getRequiredSessionMode(): int
-    {
-        return static::REQ_LOGIN;
-    }
-
-    public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag)
-    {
-        $db = DB::db();
-        $withToken = $this->args['with_token']??false;
-        $gameStor = KVStorage::getStorage($db, 'game_env');
-
-        $userID = $session->userID;
-        if ($session->isGameLoggedIn()) {
-            increaseRefresh("장수일람", 2);
-            $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
-            $con = checkLimit($me['con']);
-            if ($con >= 2) {
-                return '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.';
-            }
-        } else {
-            $availableNextCall = $session->availableNextCallGetGeneralList ?? '2000-01-01 00:00:00';
-            $now = new \DateTimeImmutable();
-
-            if ($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 5) {
-                return "장수 리스트는 10초에 한번 갱신 가능합니다.\n다음 시간 : " . $availableNextCall;
-            }
-
-            $availableNextCall = $now->add(new \DateInterval('PT10S'))->format('Y-m-d H:i:s');
-            $session->availableNextCallGetGeneralList = $availableNextCall;
-        }
-
-        $session->setReadOnly();
-
-
-        $rawGeneralList = $db->queryAllLists('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,owner_name as ownerName,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect from general');
-
-        $ownerNameList = [];
-        if ($gameStor->isunited) {
-            foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
-                $ownerNameList[$ownerID] = $ownerName;
-            }
-        }
-
-        $generalList = [];
-        foreach ($rawGeneralList as $rawGeneral) {
-            [$owner, $no, $picture, $imgsvr, $npc, $age, $nation, $special, $special2, $personal, $name, $ownerName, $injury, $leadership, $strength, $intel, $experience, $dedication, $officerLevel, $killturn, $connectCnt] = $rawGeneral;
-
-            if (key_exists($owner, $ownerNameList)) {
-                $ownerName = $ownerNameList[$owner];
-            }
-
-            $nationArr = getNationStaticInfo($nation);
-            $lbonus = calcLeadershipBonus($officerLevel, $nationArr['level']);
-
-            $generalList[] = [
-                $no,
-                $picture,
-                $imgsvr,
-                $npc,
-                $age,
-                $nationArr['name'],
-                getGeneralSpecialDomesticName($special),
-                getGeneralSpecialWarName($special2),
-                getGenChar($personal),
-                $name,
-                $npc == 1 ? $ownerName : null,
-                $injury,
-                $leadership,
-                $lbonus,
-                $strength,
-                $intel,
-                getExpLevel($experience),
-                getHonor($experience),
-                getDed($dedication),
-                getOfficerLevelText($officerLevel, $nationArr['level']),
-                $killturn,
-                $connectCnt
-            ];
-        }
-
-        $resultColumns = [
-            'no',
-            'picture',
-            'imgsvr',
-            'npc',
-            'age',
-            'nationName',
-            'special',
-            'special2',
-            'personal',
-            'name',
-            'ownerName',
-            'injury',
-            'leadership',
-            'lbonus',
-            'strength',
-            'intel',
-            'explevel',
-            'honorText',
-            'dedLevelText',
-            'officerLevelText',
-        ];
-
-        $result = [
-            'result' => 'true',
-            'column' => $resultColumns,
-            'list' => $generalList,
-        ];
-
-
-        if ($withToken) {
-            $now = (new \DateTimeImmutable())->format('Y-m-d H:i:s');
-            $tokens = [];
-            foreach ($db->query('SELECT * FROM select_npc_token WHERE `valid_until`>=%s', $now) as $token) {
-                $validUntil = $token['valid_until'];
-
-                foreach (Json::decode($token['pick_result']) as $pickResult) {
-                    $tokens[$pickResult['no']] = $pickResult['keepCnt'];
-                }
-            }
-            $result['token'] = $tokens;
-        }
-        return $result;
-    }
-}

hwe/sammo/API/Global/GetConst.php

@@ -1,325 +0,0 @@
-<?php
-
-namespace sammo\API\Global;
-
-use sammo\Session;
-use DateTimeInterface;
-use sammo\VersionGit;
-use Nette\Caching\Cache;
-use RuntimeException;
-use sammo\APICacheResult;
-use sammo\CityConst;
-use sammo\GameConst;
-use sammo\GameUnitConst;
-use sammo\Json;
-use sammo\TimeUtil;
-use sammo\UniqueConst;
-
-use function sammo\prepareDir;
-
-class GetConst extends \sammo\BaseAPI
-{
-    /** 반환하는 StaticValues 타입이 달라지면 +1 */
-    const CONST_API_VERSION = 2;
-    const CACHE_KEY = 'JSConst';
-
-    private ?string $cacheKey = null;
-
-    public function __construct(string $rootPath, array $args)
-    {
-        parent::__construct($rootPath, $args);
-    }
-
-    public function validateArgs(): ?string
-    {
-        return null;
-    }
-
-    public function getRequiredSessionMode(): int
-    {
-        return static::REQ_LOGIN;
-    }
-
-    public function findLastModified(): ?int
-    {
-        $rawResult = explode("\n", shell_exec('git status -u -s --no-rename'));
-        $files = [];
-        foreach ($rawResult as $rawLine) {
-            if (strlen($rawLine) < 3) {
-                continue;
-            }
-            $filePath = trim(substr($rawLine, 3));
-            if ($filePath[0] == '"') {
-                $filePath = substr($filePath, 1, strlen($filePath) - 2);
-            }
-            if (!file_exists($filePath)) {
-                continue;
-            }
-            $files[] = $filePath;
-        }
-
-        $lastModified = null;
-        foreach ($files as $filePath) {
-            $fileModified = filemtime($filePath);
-            if ($fileModified === false) {
-                continue;
-            }
-            if ($lastModified === null) {
-                $lastModified = $fileModified;
-                continue;
-            }
-            if ($lastModified > $fileModified) {
-                continue;
-            }
-            $lastModified = $fileModified;
-        }
-        if ($lastModified === null) {
-            return null;
-        }
-        return $lastModified;
-    }
-
-    public function getCacheKey(): string
-    {
-        if ($this->cacheKey !== null) {
-            return $this->cacheKey;
-        }
-
-        if (is_subclass_of('\\sammo\\VersionGit', '\\sammo\VersionGitDynamic')) {
-            $lastModified = $this->findLastModified();
-            if ($lastModified !== null) {
-                $versionHash = "lt{$lastModified}";
-            } else {
-                $versionHash = VersionGit::getHash();
-            }
-        } else {
-            $versionHash = VersionGit::getHash();
-        }
-
-        $apiVersion = static::CONST_API_VERSION;
-        $serverID = UniqueConst::$serverID;
-
-
-        $cacheKey = "{$apiVersion}_{$serverID}_{$versionHash}";
-        $this->cacheKey = $cacheKey;
-
-        return $cacheKey;
-    }
-
-    public function tryCache(): ?APICacheResult
-    {
-        if (is_subclass_of('\\sammo\\VersionGit', '\\sammo\VersionGitDynamic')) {
-            return new APICacheResult(TimeUtil::secondsToDateTime($this->findLastModified()??\time(), true, true));
-        }
-
-        return new APICacheResult(null, $this->getCacheKey());
-    }
-
-    public function readCache(Cache $cache): null|string|array|int|float|bool
-    {
-        $rawJSONCache = $cache->load(static::CACHE_KEY);
-        if ($rawJSONCache === null) {
-            return null;
-        }
-        $jsonCache = Json::decode($rawJSONCache);
-        if (!key_exists('cacheKey', $jsonCache)) {
-            return null;
-        }
-
-        $jsonCacheKey = $jsonCache['cacheKey'];
-        if ($jsonCacheKey !== $this->getCacheKey()) {
-            return null;
-        }
-
-        return $jsonCache['data'] ?? null;
-    }
-
-    public function extractObjClassInfo(string $objKey, callable $callerFunction): array
-    {
-        /** @var \sammo\iAction */
-        $target = $callerFunction($objKey);
-        if (!($target instanceof \sammo\iAction)) {
-            throw new \RuntimeException("{$objKey}의 대상이 iAction이 아님");
-        }
-        return [
-            'value' => $objKey,
-            'name' => $target->getName(),
-            'info' => $target->getInfo(),
-        ];
-    }
-
-    public function extractObjClassInfoFromArray(array $constArray, callable $callerFunction): array
-    {
-        $result = [];
-        foreach ($constArray as $key => $target) {
-            if (is_string($target)) {
-                $actionInfo = $this->extractObjClassInfo($target, $callerFunction);
-                if (is_string($key)) {
-                    $result[$key] = $actionInfo;
-                } else {
-                    $result[$target] = $actionInfo;
-                }
-                continue;
-            }
-            if (is_array($target)) {
-                $result[$key] = $this->extractObjClassInfoFromArray($target, $callerFunction);
-                continue;
-            }
-            if(is_string($key) && is_int($target)){
-                //역전된 상황이다.
-                $result[$key] = $this->extractObjClassInfo($key, $callerFunction);
-                continue;
-            }
-            $result[$key] = $target;
-        }
-        return $result;
-    }
-
-    public function extractObjClassInfoFromGameConst(string $gameConstKey, callable $callerFunction): array
-    {
-        $gameConstKeyList = explode(".", $gameConstKey);
-        $target = (GameConst::${$gameConstKeyList[0]}) ?? [];
-        foreach(\array_slice($gameConstKeyList, 1) as $gameConstSubKey){
-            $target = $target[$gameConstSubKey] ?? [];
-        }
-
-        if (is_string($target)) {
-            return [$target => $this->extractObjClassInfo($target, $callerFunction)];
-        }
-
-        if (!is_array($target)) {
-            throw new \RuntimeException("GameConst::{$gameConstKey}의 값이 {$target}임");
-        }
-
-        return $this->extractObjClassInfoFromArray($target, $callerFunction);
-    }
-
-    public function genConstData()
-    {
-        $gameConstKeys = [
-            'nationType' => [
-                '\sammo\buildNationTypeClass',
-                ['availableNationType', 'neutralNationType']
-            ],
-            'specialDomestic' => [
-                '\sammo\buildGeneralSpecialDomesticClass',
-                ['defaultSpecialDomestic', 'availableSpecialDomestic', 'optionalSpecialDomestic']
-            ],
-            'specialWar' => [
-                '\sammo\buildGeneralSpecialWarClass',
-                ['defaultSpecialWar', 'availableSpecialWar', 'optionalSpecialWar']
-            ],
-            'personality' => [
-                '\sammo\buildPersonalityClass',
-                ['neutralPersonality', 'availablePersonality', 'optionalPersonality']
-            ],
-            'item' => [
-                '\sammo\buildItemClass',
-                ['allItems'],
-                1
-            ],
-        ];
-        //GameConst 중 BaseCommand는 시간 흐름, 장수에 따라 정보가 달라지므로 따로 처리해야함
-
-
-        $iActionInfo = [];
-        $iActionKeyMap = [];
-        foreach ($gameConstKeys as $mappedKey => $callerTarget) {
-            $flatLevel = 0;
-            if (is_array($callerTarget)) {
-                $callerFunction = $callerTarget[0];
-                $gameConstSubKey = $callerTarget[1];
-                if(count($callerTarget) > 2){
-                    /** @var int */
-                    $flatLevel = $callerTarget[2];
-                }
-            } else {
-                $gameConstSubKey = [$mappedKey];
-                $callerFunction = $callerTarget;
-            }
-
-            if (!is_callable($callerFunction)) {
-                throw new \RuntimeException("{$mappedKey} => {$callerFunction}이 callable이 아님");
-            }
-
-            $actionInfo = [];
-            foreach ($gameConstSubKey as $key) {
-                $appendInfo = $this->extractObjClassInfoFromGameConst($key, $callerFunction);
-                $actionInfo = array_merge($actionInfo, $appendInfo);
-                $iActionKeyMap[$key] = $mappedKey;
-            }
-
-            if($flatLevel > 0){
-                foreach(range(0, $flatLevel - 1) as $tryFlatLevel){
-                    $actionInfo = array_merge(...array_values($actionInfo));
-                }
-            }
-
-
-            $iActionInfo[$mappedKey] = $actionInfo;
-        }
-
-        $crewtypeMap = [];
-        foreach(GameUnitConst::all() as $crewtypeObj){
-            $crewtypeMap[$crewtypeObj->id] = [
-                'value'=>(string)$crewtypeObj->id,
-                'name'=>$crewtypeObj->name,
-                'info'=>$crewtypeObj->getInfo(),
-            ];
-        }
-        $iActionInfo['crewtype'] = $crewtypeMap;
-
-
-        return [
-            'gameConst' => get_class_vars('\sammo\GameConst'),
-            'gameUnitConst' => GameUnitConst::all(),
-            'cityConst' => CityConst::all(),
-            'cityConstMap' => [
-                'region' => CityConst::$regionMap,
-                'level' => CityConst::$levelMap,
-            ],
-            'iActionInfo' => $iActionInfo,
-            'iActionKeyMap' => $iActionKeyMap,
-        ];
-    }
-
-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
-    {
-        $cacheDir = $this->rootPath . '/data/file_cache';
-
-        if (!prepareDir($cacheDir)) {
-            throw new RuntimeException('cache 폴더 없음');
-        }
-        $storage = new \Nette\Caching\Storages\FileStorage($cacheDir);
-        $cache = new Cache($storage);
-
-        $currentCacheKey = $this->tryCache();
-        if($modifiedSince !== null && $currentCacheKey->lastModified == $modifiedSince){
-            return null;
-        }
-        if($reqEtag !== null && $currentCacheKey->etag == $reqEtag){
-            return null;
-        }
-
-        $constCache = $this->readCache($cache);
-        if ($constCache !== null) {
-            return [
-                'result' => true,
-                'cacheKey' => $this->getCacheKey(),
-                'data' => $constCache,
-            ];
-        }
-
-        $constCache = $this->genConstData();
-        $cache->save(static::CACHE_KEY, Json::encode([
-            'cacheKey' => $this->getCacheKey(),
-            'data' => $constCache
-        ]));
-
-        return [
-            'result' => true,
-            'cacheKey' => $this->getCacheKey(),
-            'data' => $constCache,
-        ];
-    }
-}

hwe/sammo/API/Nation/GeneralList.php

@@ -1,285 +0,0 @@
-<?php
-
-namespace sammo\API\Nation;
-
-use sammo\DB;
-use sammo\General;
-use sammo\Session;
-use sammo\Util;
-use sammo\Validator;
-
-use function sammo\calcLeadershipBonus;
-use function sammo\checkLimit;
-use function sammo\checkSecretPermission;
-use function sammo\getBillByLevel;
-use function sammo\getDedLevelText;
-use function sammo\getGenChar;
-use function sammo\getGeneralSpecialDomesticName;
-use function sammo\getGeneralSpecialWarName;
-use function sammo\getHonor;
-use function sammo\getNationStaticInfo;
-use function sammo\getOfficerLevelText;
-use function sammo\increaseRefresh;
-
-class GeneralList extends \sammo\BaseAPI
-{
-    private int $permission;
-
-    static $viewColumns = [
-        'no' => 0,
-        'name' => 0,
-        'nation' => 0,
-        'npc' => 0,
-        'injury' => 0,
-        'leadership' => 0,
-        'strength' => 0,
-        'intel' => 0,
-        'explevel' => 0,
-        'dedlevel' => 0,
-        'gold' => 0,
-        'rice' => 0,
-        'killturn' => 0,
-        'picture' => 0,
-        'imgsvr' => 0,
-        'age' => 0,
-        'special' => 0,
-        'special2' => 0,
-        'personal' => 0,
-        'belong' => 0,
-        'connect' => 0,
-
-
-        'city' => 1,
-        'experience' => 1,
-        'dedication' => 1,
-
-        'officer_level' => 2,
-        'officer_city' => 2,
-        'defence_train' => 2,
-        'troop' => 2,
-        'crewtype' => 2,
-        'crew' => 2,
-        'train' => 2,
-        'atmos' => 2,
-        'turntime' => 2,
-        'horse' => 2,
-        'weapon' => 2,
-        'book' => 2,
-        'item' => 2,
-        'recent_war' => 2,
-
-        'aux' => 2,
-
-
-        'owner_name' => 9,//안씀.
-
-        //RANK
-        'warnum' => 2,
-        'killnum' => 2,
-        'deathnum' => 2,
-        'killcrew' => 2,
-        'deathcrew' => 2,
-        'firenum' => 2,
-    ];
-
-    static $columnRemap = [
-        'special' => 'specialDomestic',
-        'special2' => 'specialWar',
-        'aux' => null,
-    ];
-
-    static $customViewColumns = [
-        'officerLevel' => 0,
-        'officerLevelText' => 0,
-        'lbonus' => 0,
-        'ownerName' => 0,
-        'honorText' => 0,
-        'dedLevelText' => 0,
-        'bill' => 0,
-        'reservedCommand' => 2,
-
-        'autorun_limit' => 2,
-    ];
-
-    public function validateArgs(): ?string
-    {
-        //TODO: 장기적으로는 요청에 따라 반환해야...
-        return null;
-    }
-
-    public function getRequiredSessionMode(): int
-    {
-        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
-    }
-
-    private function getOfficerLevel($rawGeneral)
-    {
-        $level = $rawGeneral['officer_level'];
-        if ($level >= 5) {
-            return $level;
-        }
-        if ($this->permission > 1) {
-            return $level;
-        }
-        return 1;
-    }
-
-    public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag)
-    {
-        increaseRefresh("세력장수", 1);
-
-        $db = DB::db();
-
-        $gameStor = \sammo\KVStorage::getStorage($db, 'game_env');
-        $env = $gameStor->getValues(['year', 'month', 'turntime', 'turnterm', 'autorun_user', 'killturn']);
-
-        $me = $db->queryFirstRow('SELECT con, turntime, belong, nation, officer_level, permission, penalty FROM general WHERE owner=%i', $session->getUserID());
-        $con = checkLimit($me['con']);
-        if ($con >= 2) {
-            return '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.';
-        }
-
-        $nationID = $me['nation'];
-        $this->permission = checkSecretPermission($me, true);
-
-        $nationArr = getNationStaticInfo($nationID);
-
-
-
-        [$queryColumns, $rankColumns] = General::mergeQueryColumn(array_keys(static::$viewColumns), 1);
-
-        $rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE nation = %i ORDER BY turntime ASC', Util::formatListOfBackticks($queryColumns), $nationID), 'no');
-
-        $reservedCommand = [];
-        if ($this->permission >= 2) {
-            $nonNPCGeneralIDList = [];
-            foreach ($rawGeneralList as $rawGeneral) {
-                if ($rawGeneral['npc'] < 2) {
-                    $nonNPCGeneralIDList[] = $rawGeneral['no'];
-                }
-            }
-
-            $rawTurnList = $db->query(
-                'SELECT general_id, turn_idx, action, arg, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id asc, turn_idx asc',
-                $nonNPCGeneralIDList
-            );
-
-            foreach ($rawTurnList as $rawTurn) {
-                [
-                    'general_id' => $generalID,
-                    'action' => $action,
-                    'arg' => $arg,
-                    'brief' => $brief,
-                ] = $rawTurn;
-                if (!key_exists($generalID, $reservedCommand)) {
-                    $reservedCommand[$generalID] = [];
-                }
-                $reservedCommand[$generalID][] = [
-                    'action' => $action,
-                    'arg' => $arg,
-                    'brief' => $brief
-                ];
-            }
-        }
-
-        $rankList = [];
-        if ($rankColumns) {
-            $rawRankList = $db->query('SELECT general_id, `type`, `value` FROM rank_data WHERE nation_id = %i AND `type` IN %ls', $nationID, $rankColumns);
-            foreach ($rawRankList as $rawRank) {
-                [
-                    'general_id' => $generalID,
-                    'type' => $type,
-                    'value' => $value
-                ] = $rawRank;
-
-                if (!key_exists($generalID, $rankList)) {
-                    $rankList[$generalID] = [];
-                }
-                $rankList[$generalID][$type] = $value;
-            }
-        }
-
-        $getRankVar = fn ($key) => (fn ($rawGeneral) => (($rankList[$rawGeneral['no']] ?? [])[$key] ?? 0));
-
-        $specialViewFilter = [
-            'officerLevel' => fn ($rawGeneral) => $this->getOfficerLevel($rawGeneral),
-            'officerLevelText' => fn ($rawGeneral) => getOfficerLevelText($this->getOfficerLevel($rawGeneral), $nationArr['level']),
-            'lbonus' => fn ($rawGeneral) => calcLeadershipBonus($rawGeneral['officer_level'], $nationArr['level']),
-            'ownerName' => fn ($rawGeneral) => ($rawGeneral['npc'] != 1) ? null : $rawGeneral['owner_name'],
-            'honorText' => fn ($rawGeneral) => getHonor($rawGeneral['experience']),
-            'dedLevelText' => fn ($rawGeneral) => getDedLevelText($rawGeneral['dedlevel']),
-            //'0000-00-00 11:23';
-            'turntime' => fn ($rawGeneral) => substr($rawGeneral['turntime'], 0, 19),
-            'recent_war' => fn ($rawGeneral) => substr($rawGeneral['recent_war'], 0, 19),
-            'bill' => fn ($rawGeneral) => getBillByLevel($rawGeneral['dedlevel']),
-            'reservedCommand' => fn ($rawGeneral) => $reservedCommand[$rawGeneral['no']] ?? null,
-            'autorun_limit' => fn ($rawGeneral) => ($rawGeneral['aux'] ?? [])['autorun_limit'] ?? 0,
-        ];
-
-        foreach ($rankColumns as $rankKey) {
-            $specialViewFilter[$rankKey] = $getRankVar($rankKey);
-        }
-
-
-        $resultColumns = [];
-        foreach (static::$viewColumns as $column => $reqPermission) {
-            if ($reqPermission > $this->permission) {
-                continue;
-            }
-            if (key_exists($column, static::$columnRemap)) {
-                $newColumn = static::$columnRemap[$column];
-                if($newColumn !== null){
-                    $resultColumns[$newColumn] = $column;
-                }
-            } else {
-                $resultColumns[$column] = $column;
-            }
-        }
-
-        foreach (static::$customViewColumns as $column => $reqPermission) {
-            if ($reqPermission > $this->permission) {
-                continue;
-            }
-            $resultColumns[$column] = $column;
-        }
-
-        $generalList = [];
-        foreach ($rawGeneralList as $rawGeneral) {
-            //General 생성?
-            if (key_exists('aux', $rawGeneral)) {
-                $rawGeneral['aux'] = \sammo\JSON::decode($rawGeneral['aux']);
-            }
-
-            $item = [];
-            foreach ($resultColumns as $column) {
-                if (key_exists($column, $specialViewFilter)) {
-                    $value = $specialViewFilter[$column]($rawGeneral);
-                } else {
-                    $value = $rawGeneral[$column];
-                }
-                $item[] = $value;
-            }
-
-            $generalList[] = $item;
-        }
-
-        if($this->permission >= 2){
-            $troops = $db->queryAllLists('SELECT troop_leader,name FROM troop WHERE nation = %i', $nationID);
-        }
-        else{
-            $troops = null;
-        }
-
-
-        $result = [
-            'result' => true,
-            'permission' => $this->permission,
-            'column' => array_keys($resultColumns),
-            'list' => $generalList,
-            'troops' => $troops,
-            'env' => $env,
-        ];
-
-        return $result;
-    }
-}

hwe/sammo/API/NationCommand/GetReservedCommand.php

@@ -117,8 +117,6 @@ class GetReservedCommand extends \sammo\BaseAPI
             'autorun_limit' => $generalObj->getAuxVar('autorun_limit'),
             'officerLevel' => $me['officer_level'],
             'commandList' => getChiefCommandTable($generalObj),
-            'mapName' => GameConst::$mapName,
-            'unitSet' => GameConst::$unitSet,
         ];
     }
 }

hwe/sammo/API/NationCommand/ReserveBulkCommand.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace sammo\API\NationCommand;
-
-use sammo\Session;
-use DateTimeInterface;
-use sammo\GameConst;
-use sammo\Util;
-use sammo\Validator;
-
-use function sammo\setNationCommand;
-
-class ReserveBulkCommand extends \sammo\BaseAPI
-{
-    public function validateArgs(): ?string
-    {
-        foreach ($this->args as $idx => $turn) {
-            $v = new Validator($turn);
-            $v->rule('required', [
-                'action',
-                'turnList'
-            ])
-                ->rule('lengthMin', 'action', 1)
-                ->rule('integerArray', 'turnList');
-
-            if (!$v->validate()) {
-                return "{$idx}:{$v->errorStr()}";
-            }
-        }
-
-        return null;
-    }
-
-    public function getRequiredSessionMode(): int
-    {
-        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
-    }
-
-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
-    {
-        $briefList = [];
-        foreach ($this->args as $idx => $turn) {
-            $action = $turn['action'];
-            $turnList = $turn['turnList'];
-            $arg = $turn['arg'] ?? [];
-
-            if (!$turnList) {
-                return "{$idx}: 턴이 입력되지 않았습니다";
-            }
-
-            if (!in_array($action, Util::array_flatten(GameConst::$availableChiefCommand))) {
-                return "{$idx}: 사용할 수 없는 커맨드입니다.";
-            }
-
-            if (!is_array($arg)) {
-                return "{$idx}: 올바른 arg 형태가 아닙니다.";
-            }
-            $partialResult = setNationCommand($session->generalID, $turnList, $action, $arg);
-            if(!$partialResult['result']){
-                return [
-                    'result' => false,
-                    'briefList' => $briefList,
-                    'errorIdx' => $idx,
-                    'reason' => $partialResult['reason']
-                ];
-            }
-            $briefList[$idx] = $partialResult['brief'];
-        }
-
-        return [
-            'result' => true,
-            'briefList' => $briefList,
-            'reason' => 'success'
-        ];
-    }
-}

hwe/sammo/ActionItem/che_보물_도기.php

@@ -13,7 +13,7 @@ class che_보물_도기 extends \sammo\BaseItem
 
     protected $rawName = '도기';
     protected $name = '도기(보물)';
-    protected $info = '[개인] 판매 시 장수 소지금과 국고에 금, 쌀 중 하나를 추가 (총 +10,000, 5년마다 +10,000)';
+    protected $info = '[개인] 판매 시 국고에 금, 쌀 중 하나를 추가 (+10,000, 5년마다 +10,000)';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -48,16 +48,15 @@ class che_보물_도기 extends \sammo\BaseItem
 
         if ($nationId != 0) {
           $db->update('nation', [
-            $resKey => $db->sqleval('%b + %i', $resKey, Util::toInt($score / 2))
+            $resKey => $db->sqleval('%b + %i', $resKey, $score)
           ], 'nation=%i', $nationId);
         }
-        $general->increaseVar($resKey, $score - Util::toInt($score / 2));
 
         $score = Util::round($score);
         $scoreText = number_format($score, 0);
 
         $logger = $general->getLogger();
-        $logger->pushGeneralActionLog("재산과 국고에 총 {$resName} <C>{$scoreText}</>을 보충합니다.");
+        $logger->pushGeneralActionLog("국고에 {$resName} <C>{$scoreText}</>을 보충합니다.");
         return $aux;
     }
 }

hwe/sammo/ActionItem/che_상성보정_과실주.php

@@ -10,7 +10,7 @@ class che_상성보정_과실주 extends \sammo\BaseItem{
 
     protected $rawName = '과실주';
     protected $name = '과실주(상성)';
-    protected $info = '[전투] 대등/유리한 병종 전투시 공격력 +10%, 피해 -10%';
+    protected $info = '[전투] 유리한 병종 전투시 공격력 +10%, 피해 -10%';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -18,7 +18,7 @@ class che_상성보정_과실주 extends \sammo\BaseItem{
     {
         $oppose = $unit->getOppose();
         $attackCoef = $unit->getCrewType()->getAttackCoef($oppose->getCrewType());
-        if($attackCoef < 1){
+        if($attackCoef <= 1){
             return null;
         }
         return new WarUnitTriggerCaller(

hwe/sammo/BaseNation.php

@@ -10,10 +10,4 @@ abstract class BaseNation implements iAction{
     protected $info = '';
     static $pros = '';
     static $cons = '';
-
-    public function getInfo(): string{
-        $pros = static::$pros;
-        $cons = static::$cons;
-        return "{$pros} {$cons}";
-    }
 }

hwe/sammo/Betting.php

@@ -26,7 +26,7 @@ class Betting
         return Json::encode($bettingType);
     }
 
-    public function purifyBettingKey(array $bettingType, bool $ignoreOver = false): array
+    public function purifyBettingKey(array $bettingType): array
     {
         $selectCnt = $this->info->selectCnt;
         sort($bettingType, SORT_NUMERIC);
@@ -39,7 +39,7 @@ class Betting
             throw new \InvalidArgumentException('올바르지 않은 값이 있습니다.(0 미만)' . print_r($bettingType, true));
         }
 
-        if (!$ignoreOver && Util::array_last($bettingType) >= count($this->info->candidates)) {
+        if (Util::array_last($bettingType) >= count($this->info->candidates)) {
             throw new \InvalidArgumentException('올바르지 않은 값이 있습니다.(초과)' . print_r($bettingType, true));
         }
 
@@ -155,19 +155,6 @@ class Betting
         }
 
         if ($subAmount == 0) {
-            $refundList = [];
-            //당첨자가 아무도 없다면 무효로 하자.
-            foreach ($db->queryAllLists(
-                'SELECT general_id, user_id, amount, betting_type FROM ng_betting WHERE betting_id = %i',
-                $this->bettingID
-            ) as [$generalID, $userID, $amount, $bettingTypeKey]) {
-                $refundList[] = [
-                    'generalID' => $generalID,
-                    'userID' => $userID,
-                    'amount' => $amount,
-                    'matchPoint' => 0,
-                ];
-            }
             return [];
         }
 
@@ -246,12 +233,8 @@ class Betting
         }
 
         $remainRewardAmount = $totalAmount;
-        $accumulatedRewardAmount = 0;
-        $givenRewardAmount = $totalAmount;
         $rewardAmount = [];
         foreach (Util::range($selectCnt, 0, -1) as $matchPoint) {
-            $givenRewardAmount /= 2;
-            $accumulatedRewardAmount += $givenRewardAmount;
             if (count($subWinners[$matchPoint]) == 0) {
                 continue;
             }
@@ -259,21 +242,17 @@ class Betting
                 continue;
             }
 
-            $rewardAmount[$matchPoint] = $accumulatedRewardAmount;
-            $remainRewardAmount -= $accumulatedRewardAmount;
-            $accumulatedRewardAmount = 0;
+            $givenRewardAmount = $remainRewardAmount / 2;
+            $rewardAmount[$matchPoint] = $givenRewardAmount;
+            $remainRewardAmount -= $givenRewardAmount; // /2가 아니라 다른 값이 될 경우를 대비..
         }
 
-        //남은 상금은 '당첨자'에게 몰아준다.
-        //당첨자가 아무도 없다면, 0개 맞춘 그룹에게 돌아간다.
-        if($rewardAmount){
-            foreach(Util::range($selectCnt, -1, -1) as $matchPoint){
-                if (!key_exists($matchPoint, $rewardAmount)) {
-                    continue;
-                }
-                $rewardAmount[$matchPoint] += $rewardAmount;
-                break;
+        foreach (Util::range(1, $selectCnt + 1) as $matchPoint) {
+            if (!key_exists($matchPoint, $rewardAmount)) {
+                continue;
             }
+            $rewardAmount[$matchPoint] += $remainRewardAmount;
+            break;
         }
 
         $result = [];

hwe/sammo/Command/General/che_강행.php

@@ -173,6 +173,7 @@ class che_강행 extends Command\GeneralCommand
     public function exportJSVars(): array
     {
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'cities' => \sammo\JSOptionsForCities(),
                 'distanceList' => \sammo\JSCitiesBasedOnDistance($this->generalObj->getCityID(), 3),

hwe/sammo/Command/General/che_랜덤임관.php

@@ -183,7 +183,7 @@ class che_랜덤임관 extends Command\GeneralCommand
             if ($notIn) {
 
                 $rawGeneralsCnt = $db->query(
-                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 1000)/(rb.value + 1000)*(CASE WHEN g.`npc` < 2 THEN 1.2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
+                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 1000)/(rb.value + 1000)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
                 FROM general AS g
                 LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = 'killcrew_person'
                 LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = 'deathcrew_person'
@@ -195,7 +195,7 @@ class che_랜덤임관 extends Command\GeneralCommand
                 );
             } else {
                 $rawGeneralsCnt = $db->query(
-                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 100)/(rb.value + 100)*(CASE WHEN g.`npc` < 2 THEN 1.2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
+                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 100)/(rb.value + 100)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
                 FROM general AS g
                 LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = 'killcrew_person'
                 LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = 'deathcrew_person'

hwe/sammo/Command/General/che_이동.php

@@ -181,6 +181,7 @@ class che_이동 extends Command\GeneralCommand
     public function exportJSVars(): array
     {
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'cities' => \sammo\JSOptionsForCities(),
                 'distanceList' => \sammo\JSCitiesBasedOnDistance($this->generalObj->getCityID(), 1),

hwe/sammo/Command/General/che_임관.php

@@ -162,7 +162,6 @@ class che_임관 extends Command\GeneralCommand
         $general->setVar('officer_level', 1);
         $general->setVar('officer_city', 0);
         $general->setVar('belong', 1);
-        $general->setVar('troop', 0);
 
         if ($this->destGeneralObj !== null) {
             $general->setVar('city', $this->destGeneralObj->getCityID());
@@ -201,7 +200,6 @@ class che_임관 extends Command\GeneralCommand
 
         $rawNationList = Util::convertArrayToDict($db->query('SELECT nation,`name`,color,gennum,`power` FROM nation'), 'nation');
         $scoutMsgs = KVStorage::getValuesFromInterNamespace($db, 'nation_env', 'scout_msg');
-        $nationList = [];
         foreach ($scoutMsgs as $destNationID => $scoutMsg) {
             $rawNationList[$destNationID]['scoutmsg'] = $scoutMsg;
         }
@@ -225,6 +223,7 @@ class che_임관 extends Command\GeneralCommand
             $nationList[] = $nationTarget;
         }
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'nationList' => $nationList,
                 'startYear' => $this->env['startyear'],

hwe/sammo/Command/General/che_장수대상임관.php

@@ -13,7 +13,7 @@ use \sammo\{
 };
 
 use function sammo\getAllNationStaticInfo;
-use function \sammo\formatName;
+use function \sammo\getColoredName;
 use function \sammo\tryUniqueItemLottery;
 use function \sammo\getInvitationList;
 use function \sammo\getNationStaticInfo;

hwe/sammo/Command/General/che_첩보.php

@@ -228,6 +228,7 @@ class che_첩보 extends Command\GeneralCommand
     public function exportJSVars(): array
     {
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'cities' => \sammo\JSOptionsForCities(),
                 'distanceList' => \sammo\JSCitiesBasedOnDistance($this->generalObj->getCityID(), 3),

hwe/sammo/Command/General/che_출병.php

@@ -244,6 +244,7 @@ class che_출병 extends Command\GeneralCommand
     public function exportJSVars(): array
     {
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'cities' => \sammo\JSOptionsForCities(),
                 'distanceList' => \sammo\JSCitiesBasedOnDistance($this->generalObj->getCityID(), 1),

hwe/sammo/Command/General/che_하야.php

@@ -62,7 +62,6 @@ class che_하야 extends Command\GeneralCommand{
 
         $general = $this->generalObj;
         $date = $general->getTurnTime($general::TURNTIME_HM);
-        $generalID = $general->getID();
         $generalName = $general->getName();
         $josaYi = JosaUtil::pick($generalName, '이');
 
@@ -102,17 +101,6 @@ class che_하야 extends Command\GeneralCommand{
         $general->setVar('officer_city', 0);
         $general->setVar('belong', 0);
         $general->setVar('makelimit', 12);
-
-        //부대장일 경우
-        if($general->getVar('troop') == $generalID){
-            // 모두 탈퇴
-            $db->update('general', [
-                'troop'=>0,
-            ], 'troop = %i', $generalID);
-            $db->delete('troop', 'troop_leader=%i', $generalID);
-        }
-        $general->setVar('troop', 0);
-
         $general->increaseInheritancePoint('active_action', 1);
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));

hwe/sammo/Command/General/che_화계.php

@@ -281,7 +281,6 @@ class che_화계 extends Command\GeneralCommand
 
         $prob = GameConst::$sabotageDefaultProb + $this->calcSabotageAttackProb() - $this->calcSabotageDefenceProb($destCityGeneralList);
         $prob /= $dist;
-        $prob = Util::valueFit($prob, 0, 0.5);
 
         if (!Util::randBool($prob)) {
             $josaYi = JosaUtil::pick($commandName, '이');
@@ -342,6 +341,7 @@ class che_화계 extends Command\GeneralCommand
     public function exportJSVars(): array
     {
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'cities' => \sammo\JSOptionsForCities(),
                 'distanceList' => \sammo\JSCitiesBasedOnDistance($this->generalObj->getCityID(), 3),

hwe/sammo/Command/Nation/che_급습.php

@@ -221,6 +221,7 @@ class che_급습 extends Command\NationCommand
             $nationList[] = $nationTarget;
         }
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'nationList' => $nationList,
                 'startYear' => $this->env['startyear'],

hwe/sammo/Command/Nation/che_물자원조.php

@@ -291,6 +291,7 @@ class che_물자원조 extends Command\NationCommand
         }
 
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'nationList' => $nationList,
                 'currentNationLevel' => $currentNationLevel,

hwe/sammo/Command/Nation/che_발령.php

@@ -177,6 +177,7 @@ class che_발령 extends Command\NationCommand
         $troops = Util::convertArrayToDict($db->query('SELECT * FROM troop WHERE nation=%i', $nationID), 'troop_leader');
         $destRawGenerals = $db->queryAllLists('SELECT no,name,officer_level,npc,gold,rice,leadership,strength,intel,city,crew,train,atmos,troop FROM general WHERE nation = %i ORDER BY npc,binary(name)', $nationID);
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'distanceList' => \sammo\JSCitiesBasedOnDistance($this->generalObj->getCityID(), 1),
                 'cities' => \sammo\JSOptionsForCities(),

hwe/sammo/Command/Nation/che_백성동원.php

@@ -156,8 +156,11 @@ class che_백성동원 extends Command\NationCommand
             'wall' => $db->sqleval('GREATEST(wall_max * 0.8, wall)'),
         ], 'city=%i', $destCityID);
 
+        $josaYiNation = JosaUtil::pick($nationName, '이');
+
+
         $logger->pushGeneralHistoryLog('<M>백성동원</>을 발동');
-        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <G><b>{$destCityName}</b></>에 <M>백성동원</>을 발동");
+        $logger->pushNationalHistoryLog("<L><b>【전략】</b></><D><b>{$nationName}</b></>{$josaYiNation} <G><b>{$destCityName}</b></>에 <M>백성동원</>을 하였습니다.");
 
         $db->update('nation', [
             'strategic_cmd_limit' => $this->generalObj->onCalcStrategic($this->getName(), 'globalDelay', 9)
@@ -172,6 +175,7 @@ class che_백성동원 extends Command\NationCommand
     public function exportJSVars(): array
     {
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'cities' => \sammo\JSOptionsForCities(),
                 'distanceList' => new \stdClass(),

hwe/sammo/Command/Nation/che_불가침제의.php

@@ -101,13 +101,13 @@ class che_불가침제의 extends Command\NationCommand
 
         $nationID = $this->nation['nation'];
 
-        if ($reqMonth < $currentMonth + 6) {
+        if ($reqMonth < $currentMonth + 12) {
             $this->permissionConstraints = [
-                ConstraintHelper::AlwaysFail('기한은 6개월 이상이어야 합니다.')
+                ConstraintHelper::AlwaysFail('기한은 1년 이상이어야 합니다.')
             ];
 
             $this->fullConditionConstraints = [
-                ConstraintHelper::AlwaysFail('기한은 6개월 이상이어야 합니다.')
+                ConstraintHelper::AlwaysFail('기한은 1년 이상이어야 합니다.')
             ];
             return;
         }
@@ -255,6 +255,7 @@ class che_불가침제의 extends Command\NationCommand
             $nationList[] = $nationTarget;
         }
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'nationList' => $nationList,
                 'startYear' => $this->env['startyear'],

hwe/sammo/Command/Nation/che_불가침파기제의.php

@@ -200,6 +200,7 @@ class che_불가침파기제의 extends Command\NationCommand{
             $nationList[] = $nationTarget;
         }
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'nationList' => $nationList,
                 'startYear' => $this->env['startyear'],

hwe/sammo/Command/Nation/che_선전포고.php

@@ -219,6 +219,7 @@ class che_선전포고 extends Command\NationCommand
             $nationList[] = $nationTarget;
         }
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'nationList' => $nationList,
                 'startYear' => $this->env['startyear'],

hwe/sammo/Command/Nation/che_수몰.php

@@ -199,6 +199,7 @@ class che_수몰 extends Command\NationCommand
     public function exportJSVars(): array
     {
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'cities' => \sammo\JSOptionsForCities(),
                 'distanceList' => new \stdClass(),

hwe/sammo/Command/Nation/che_이호경식.php

@@ -224,6 +224,7 @@ class che_이호경식 extends Command\NationCommand
             $nationList[] = $nationTarget;
         }
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'nationList' => $nationList,
                 'startYear' => $this->env['startyear'],

hwe/sammo/Command/Nation/che_종전제의.php

@@ -193,6 +193,7 @@ class che_종전제의 extends Command\NationCommand{
             $nationList[] = $nationTarget;
         }
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'nationList' => $nationList,
                 'startYear' => $this->env['startyear'],

hwe/sammo/Command/Nation/che_천도.php

@@ -233,6 +233,7 @@ class che_천도 extends Command\NationCommand
     public function exportJSVars(): array
     {
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'cities' => \sammo\JSOptionsForCities(),
                 'distanceList' => new \stdClass(),

hwe/sammo/Command/Nation/che_초토화.php

@@ -199,6 +199,7 @@ class che_초토화 extends Command\NationCommand{
     public function exportJSVars(): array
     {
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'cities' => \sammo\JSOptionsForCities(),
                 'distanceList' => new \stdClass(),

hwe/sammo/Command/Nation/che_피장파장.php

@@ -280,6 +280,7 @@ class che_피장파장 extends Command\NationCommand
         }
 
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'nationList' => $nationList,
                 'startYear' => $this->env['startyear'],

hwe/sammo/Command/Nation/che_허보.php

@@ -202,6 +202,7 @@ class che_허보 extends Command\NationCommand
     public function exportJSVars(): array
     {
         return [
+            'mapTheme' => \sammo\getMapTheme(),
             'procRes' => [
                 'cities' => \sammo\JSOptionsForCities(),
                 'distanceList' => new \stdClass(),

hwe/sammo/DummyGeneral.php

@@ -16,9 +16,6 @@ class DummyGeneral extends General{
             'dedication'=>0,
             'gold'=>0,
             'rice'=>0,
-            'leadership'=>10,
-            'strength'=>10,
-            'intel'=>10,
         ];
 
         $this->raw = $raw;

hwe/sammo/Event/Action/FinishNationBetting.php

@@ -49,20 +49,10 @@ class FinishNationBetting extends \sammo\Event\Action
         }
 
         $winnerTypes = [];
-
-        $notInBettingWinner = 0;
         foreach ($winnerNations as $winnerNationID) {
-            if(key_exists($winnerNationID, $nationIDMap)){
-                $winnerTypes[] = $nationIDMap[$winnerNationID];
-            }
-            else{
-                //혹시라도 베팅 시점 이후에 생성된 국가라 없을 수 있다.
-                $winnerTypes[] = count($nationIDMap) + $notInBettingWinner;
-                $notInBettingWinner += 1;
-            }
+            $winnerTypes[] = $nationIDMap[$winnerNationID];
         }
-
-        $winnerTypes = $bettingHelper->purifyBettingKey($winnerTypes, $notInBettingWinner > 0);
+        $winnerTypes = $bettingHelper->purifyBettingKey($winnerTypes);
 
         $bettingHelper->giveReward($winnerTypes);
         $logger = new ActionLogger(0, 0, $env['year'], $env['month']);

hwe/sammo/GameConstBase.php

@@ -275,17 +275,9 @@ class GameConstBase
 
     /** @var array 선택 가능한 커맨드 */
     public static $availableGeneralCommand = [
-        '개인' => [
+        '' => [
             '휴식',
-            'che_요양',
-            'che_단련',
-            'che_숙련전환',
-            'che_견문',
-            'che_은퇴',
-            'che_장비매매',
-            'che_군량매매',
-            'che_내정특기초기화',
-            'che_전투특기초기화',
+            'che_요양'
         ],
         '내정' => [
             'che_농지개간',
@@ -299,35 +291,43 @@ class GameConstBase
             'che_물자조달',
         ],
         '군사' => [
+            'che_소집해제',
+            'che_첩보',
             'che_징병',
             'che_모병',
             'che_훈련',
             'che_사기진작',
             'che_출병',
-            'che_집합',
-            'che_소집해제',
-            'che_첩보',
         ],
         '인사' => [
             'che_이동',
             'che_강행',
             'che_인재탐색',
             'che_등용',
+            'che_집합',
             'che_귀환',
             'che_임관',
             'che_랜덤임관',
             'che_장수대상임관',
         ],
         '계략' => [
-            'che_선동',
-            'che_탈취',
-            'che_파괴',
             'che_화계',
+            'che_파괴',
+            'che_탈취',
+            'che_선동',
         ],
-        '국가' => [
+        '개인' => [
+            'che_내정특기초기화',
+            'che_전투특기초기화',
+            'che_단련',
+            'che_숙련전환',
+            'che_견문',
+            'che_장비매매',
+            'che_군량매매',
             'che_증여',
             'che_헌납',
             'che_하야',
+            'che_은퇴',
             'che_거병',
             'che_건국',
             'che_선양',

hwe/sammo/GameUnitConstBase.php

@@ -110,48 +110,48 @@ class GameUnitConstBase{
 
         [
             1200, self::T_ARCHER, '궁병',
-            100, 100, 7, 10, 0,  10, 10,
+            100, 100, 7, 15, 0,  10, 10,
             0, null,     null,     0,
             [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
             [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
-            ['표준적인 궁병입니다.','궁병은 선제사격을 하는 병종입니다.'],
-            null, ['che_궁병선제사격']
+            ['표준적인 궁병입니다.','궁병은 회피특화입니다.'],
+            null, null
         ],
         [
             1201, self::T_ARCHER, '궁기병',
-            100, 100, 8, 20, 0,  11, 12,
+            100, 100, 8, 25, 0,  11, 12,
             1000, null,     ['동이'], 0,
             [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
             [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
             ['말을 타고 잘 피합니다.'],
-            null, ['che_궁병선제사격']
+            null, null
         ],
         [
             1202, self::T_ARCHER, '연노병',
-            150, 100, 8, 10, 0,  12, 11,
+            150, 100, 8, 15, 0,  12, 11,
             1000, null,     ['서촉'], 0,
             [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
             [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
             ['화살을 연사합니다.'],
-            null, ['che_궁병선제사격']
+            null, null
         ],
         [
             1203, self::T_ARCHER, '강궁병',
-            150, 150, 7, 10, 0,  13, 13,
+            150, 150, 7, 15, 0,  13, 13,
             3000, ['양양'], null,     0,
             [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
             [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
             ['강건한 궁병입니다.'],
-            null, ['che_궁병선제사격']
+            null, null
         ],
         [
             1204, self::T_ARCHER, '석궁병',
-            200, 100, 7, 10, 0,  13, 13,
+            200, 100, 7, 15, 0,  13, 13,
             3000, ['건업'], null,     0,
             [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
             [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
             ['강력한 화살을 쏩니다.'],
-            null, ['che_궁병선제사격']
+            null, null
         ],
 
         [

hwe/sammo/GeneralAI.php

@@ -4095,21 +4095,17 @@ class GeneralAI
             return 20;
         }
 
-        $nationGenerals = $this->nationGenerals;
-        $nationGenerals[] = $this->general;
-
         $dedicationList = array_map(function (General $general) {
             return $general->getRaw();
         }, array_filter($this->nationGenerals, function (General $rawGeneral) {
-            return $rawGeneral->getVar('npc') != 5;
+            return $rawGeneral->getVar('officer_level') != 5;
         }));
 
-
         $goldIncome  = getGoldIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
         $warIncome  = getWarGoldIncome($nation['type'], $cityList);
         $income = $goldIncome + $warIncome;
 
-        $outcome = Util::valueFit(getOutcome(100, $dedicationList), 1);
+        $outcome = getOutcome(100, $dedicationList);
 
         $bill = intval($income / $outcome * 90); // 수입의 90% 만 지급
         if ($nation['gold'] + $income - $outcome > $this->nationPolicy->reqNationGold * 2) {
@@ -4142,9 +4138,6 @@ class GeneralAI
             return 20;
         }
 
-        $nationGenerals = $this->nationGenerals;
-        $nationGenerals[] = $this->general;
-
         $dedicationList = array_map(function (General $general) {
             return $general->getRaw();
         }, array_filter($this->nationGenerals, function (General $rawGeneral) {

hwe/sammo/ResetHelper.php

@@ -250,7 +250,7 @@ class ResetHelper{
             'month'=> $month,
             'init_year'=> $year,
             'init_month'=>$month,
-            'map_theme' => $scenarioObj->getMapTheme(), //@deprecated
+            'map_theme' => $scenarioObj->getMapTheme(),
             'season'=>$seasonIdx,
             'msg'=>'공지사항',//TODO:공지사항
             'maxgeneral'=>GameConst::$defaultMaxGeneral,

hwe/sammo/TriggerOfficerLevel.php

@@ -47,8 +47,8 @@ class TriggerOfficerLevel implements iAction{
                 }
             }
         }
-
-
+        
+        
         return $value;
     }
 
@@ -58,30 +58,4 @@ class TriggerOfficerLevel implements iAction{
         }
         return $value;
     }
-
-    public function getWarPowerMultiplier(WarUnit $unit): array
-    {
-        $officerLevel = $this->officerLevel;
-        $warPowerMultiply = 1;
-        $opposeWarPowerMultiply = 1;
-        if ($officerLevel == 12) {
-            $warPowerMultiply = 1.07;
-            $opposeWarPowerMultiply = 0.93;
-        }
-        else if($officerLevel == 11){
-            $warPowerMultiply = 1.05;
-            $opposeWarPowerMultiply = 0.95;
-        }
-        else if(in_array($officerLevel, [10, 8, 6])){
-            $warPowerMultiply = 1.10;
-        }
-        else if(in_array($officerLevel, [9, 7, 5])){
-            $opposeWarPowerMultiply = 0.90;
-        }
-        else if(in_array($officerLevel, [4, 3, 2])){
-            $warPowerMultiply = 1.05;
-            $opposeWarPowerMultiply = 0.95;
-        }
-        return [$warPowerMultiply, $opposeWarPowerMultiply];
-    }
 }

hwe/sammo/WarUnit.php

@@ -1,9 +1,7 @@
 <?php
-
 namespace sammo;
 
-class WarUnit
-{
+class WarUnit{
 
     protected $general;
     protected $rawNation;
@@ -33,39 +31,32 @@ class WarUnit
     protected $logActivatedSkill = [];
     protected $isFinished = false;
 
-    private function __construct(General $general)
-    {
+    private function __construct(General $general){
         $this->general = $general;
     }
 
     /* XXX:Dirty wrapper */
-    function getRaw(): array
-    {
+    function getRaw():array{
         return $this->general->getRaw();
     }
 
-    function getVar(string $key)
-    {
+    function getVar(string $key){
         return $this->general->getVar($key);
     }
 
-    function touchVar(string $key): bool
-    {
+    function touchVar(string $key):bool{
         return $this->general->touchVar($key);
     }
 
-    function setVar(string $key, $value)
-    {
+    function setVar(string $key, $value){
         return $this->general->setVar($key, $value);
     }
 
-    function updateVar(string $key, $value)
-    {
+    function updateVar(string $key, $value){
         return $this->general->updateVar($key, $value);
     }
 
-    function updateVarWithLimit(string $key, $value, $min = null, $max = null)
-    {
+    function updateVarWithLimit(string $key, $value, $min = null, $max = null){
         return $this->general->updateVarWithLimit($key, $value, $min, $max);
     }
 
@@ -74,8 +65,7 @@ class WarUnit
         return $this->general->increaseVar($key, $value);
     }
 
-    function increaseVarWithLimit(string $key, $value, $min = null, $max = null)
-    {
+    function increaseVarWithLimit(string $key, $value, $min = null, $max = null){
         return $this->general->increaseVarWithLimit($key, $value, $min, $max);
     }
 
@@ -84,203 +74,170 @@ class WarUnit
         return $this->general->multiplyVar($key, $value);
     }
 
-    function multiplyVarWithLimit(string $key, $value, $min = null, $max = null)
-    {
+    function multiplyVarWithLimit(string $key, $value, $min = null, $max = null){
         return $this->general->multiplyVarWithLimit($key, $value, $min, $max);
     }
 
-    function getUpdatedValues(): array
-    {
+    function getUpdatedValues():array {
         return $this->general->getUpdatedValues();
     }
 
-    function flushUpdateValues(): void
-    {
+    function flushUpdateValues():void {
         $this->general->flushUpdateValues();
     }
-
-    protected function clearActivatedSkill()
-    {
-        foreach ($this->activatedSkill as $skillName => $state) {
-            if (!$state) {
+    
+    protected function clearActivatedSkill(){
+        foreach($this->activatedSkill as $skillName=>$state){
+            if(!$state){
                 continue;
             }
 
-            if (!key_exists($skillName, $this->logActivatedSkill)) {
+            if(!key_exists($skillName, $this->logActivatedSkill)){
                 $this->logActivatedSkill[$skillName] = 1;
-            } else {
+            }
+            else{
                 $this->logActivatedSkill[$skillName] += 1;
             }
         }
         $this->activatedSkill = [];
     }
 
-    function getActivatedSkillLog(): array
-    {
+    function getActivatedSkillLog():array{
         return $this->logActivatedSkill;
     }
 
-    function getRawNation(): array
-    {
+    function getRawNation():array{
         return $this->rawNation;
     }
 
-    function getNationVar(string $key)
-    {
+    function getNationVar(string $key){
         return $this->rawNation[$key];
     }
 
-    function getPhase(): int
-    {
+    function getPhase():int{
         return $this->currPhase;
     }
 
-    function getRealPhase(): int
-    {
+    function getRealPhase():int{
         return $this->prePhase + $this->currPhase;
     }
 
-    function getName(): string
-    {
+    function getName():string{
         return 'EMPTY';
     }
 
-    function isAttacker(): bool
-    {
+    function isAttacker():bool{
         return $this->isAttacker;
     }
 
-    function getCrewType(): GameUnitDetail
-    {
+    function getCrewType():GameUnitDetail{
         return $this->crewType;
     }
 
-    function getCrewTypeName(): string
-    {
+    function getCrewTypeName():string{
         return $this->getCrewType()->name;
     }
 
-    function getCrewTypeShortName(): string
-    {
+    function getCrewTypeShortName():string{
         return $this->getCrewType()->getShortName();
     }
 
-    function getLogger(): ActionLogger
-    {
+    function getLogger():ActionLogger{
         $logger = $this->getGeneral()->getLogger();
-        if ($logger === null) {
+        if($logger === null){
             throw new \RuntimeException();
         }
         return $logger;
     }
 
-    function getKilled(): int
-    {
+    function getKilled():int{
         return $this->killed;
     }
 
-    function getDead(): int
-    {
+    function getDead():int{
         return $this->dead;
     }
 
-    function getKilledCurrentBattle(): int
-    {
+    function getKilledCurrentBattle():int{
         return $this->killedCurr;
     }
 
-    function getDeadCurrentBattle(): int
-    {
+    function getDeadCurrentBattle():int{
         return $this->deadCurr;
     }
 
-    function getGeneral(): General
-    {
+    function getGeneral():General{
         return $this->general;
     }
 
-    function getMaxPhase(): int
-    {
+    function getMaxPhase():int{
         $phase = $this->getCrewType()->speed;
         return $phase + $this->bonusPhase;
     }
 
-    function setPrePhase(int $phase)
-    {
+    function setPrePhase(int $phase){
         $this->prePhase = $phase;
     }
 
-    function addPhase(int $phase = 1)
-    {
-        $this->currPhase += $phase;
+    function addPhase(){
+        $this->currPhase += 1;
     }
 
-    function addBonusPhase(int $cnt)
-    {
+    function addBonusPhase(int $cnt){
         $this->bonusPhase += $cnt;
     }
 
-    function setOppose(?WarUnit $oppose)
-    {
+    function setOppose(?WarUnit $oppose){
         $this->oppose = $oppose;
         $this->killedCurr = 0;
         $this->deadCurr = 0;
         $this->clearActivatedSkill();
     }
 
-    function getOppose(): ?WarUnit
-    {
+    function getOppose():?WarUnit{
         return $this->oppose;
     }
 
-    function getWarPower()
-    {
+    function getWarPower(){
         return $this->warPower * $this->warPowerMultiply;
     }
 
-    function getRawWarPower()
-    {
+    function getRawWarPower(){
         return $this->warPower;
     }
 
-    function getWarPowerMultiply()
-    {
+    function getWarPowerMultiply(){
         return $this->warPowerMultiply;
     }
-
-    function setWarPowerMultiply($multiply = 1.0)
-    {
+    
+    function setWarPowerMultiply($multiply = 1.0){
         $this->warPowerMultiply = $multiply;
     }
 
-    function multiplyWarPowerMultiply($multiply)
-    {
+    function multiplyWarPowerMultiply($multiply){
         $this->warPowerMultiply *= $multiply;
     }
 
-    function getComputedAttack()
-    {
+    function getComputedAttack(){
         return $this->getCrewType()->getComputedAttack($this->general, $this->getNationVar('tech'));
     }
 
-    function getComputedDefence()
-    {
+    function getComputedDefence(){
         return $this->getCrewType()->getComputedDefence($this->general, $this->getNationVar('tech'));
     }
 
-    function computeWarPower()
-    {
+    function computeWarPower(){
         $oppose = $this->getOppose();
         $general = $this->general;
         $opposeGeneral = $oppose->getGeneral();
 
         $myAtt = $this->getComputedAttack();
         $opDef = $oppose->getComputedDefence();
-        // 감소할 병사
+        // 감소할 병사 
         $warPower = GameConst::$armperphase + $myAtt - $opDef;
         $opposeWarPowerMultiply = 1.0;
 
-        if ($warPower < 100) {
+        if($warPower < 100){
             //최소 전투력 50 보장
             $warPower = max(0, $warPower);
             $warPower = ($warPower + 100) / 2;
@@ -291,11 +248,11 @@ class WarUnit
         $warPower /= $oppose->getComputedTrain();
 
         $genDexAtt = $this->getDex($this->getCrewType(), true);
-
+        
         $oppDexDef = $oppose->getDex($this->getCrewType(), false);
-
+        
         $warPower *= getDexLog($genDexAtt, $oppDexDef);
-
+        
         $warPower *= $this->getCrewType()->getAttackCoef($oppose->getCrewType());
         $opposeWarPowerMultiply *= $this->getCrewType()->getDefenceCoef($oppose->getCrewType());
 
@@ -305,143 +262,117 @@ class WarUnit
         return [$warPower, $opposeWarPowerMultiply];
     }
 
-    function addTrain(int $train)
-    {
+    function addTrain(int $train){
         return;
     }
 
-    function addAtmos(int $atmos)
-    {
+    function addAtmos(int $atmos){
         return;
     }
 
-    function addTrainBonus(int $trainBonus)
-    {
+    function addTrainBonus(int $trainBonus){
         $this->trainBonus += $trainBonus;
     }
 
-    function addAtmosBonus(int $atmosBonus)
-    {
+    function addAtmosBonus(int $atmosBonus){
         $this->atmosBonus += $atmosBonus;
     }
 
-    function getComputedTrain()
-    {
+    function getComputedTrain(){
         return GameConst::$maxTrainByCommand;
     }
 
-    function getComputedAtmos()
-    {
+    function getComputedAtmos(){
         return GameConst::$maxAtmosByCommand;
     }
 
-    function getComputedCriticalRatio(): float
-    {
+    function getComputedCriticalRatio():float{
         return $this->getCrewType()->getCriticalRatio($this->general);
     }
 
-    function getComputedAvoidRatio(): float
-    {
+    function getComputedAvoidRatio():float{
         return $this->getCrewType()->avoid / 100;
     }
 
-    function addWin()
-    {
+    function addWin(){
     }
 
-    function addLose()
-    {
+    function addLose(){
     }
 
-    function getDex(GameUnitDetail $crewType)
-    {
+    function getDex(GameUnitDetail $crewType){
         throw new NotInheritedMethodException();
     }
 
-    function finishBattle()
-    {
+    function finishBattle(){
         throw new NotInheritedMethodException();
     }
 
-    function beginPhase(): void
-    {
+    function beginPhase():void{
         $this->clearActivatedSkill();
         $this->computeWarPower();
     }
 
-    function hasActivatedSkill(string $skillName): bool
-    {
-        return $this->activatedSkill[$skillName] ?? false;
+    function hasActivatedSkill(string $skillName):bool{
+        return $this->activatedSkill[$skillName]??false;
     }
 
-    function hasActivatedSkillOnLog(string $skillName): int
-    {
-        return ($this->logActivatedSkill[$skillName] ?? 0) + ($this->hasActivatedSkill($skillName) ? 1 : 0);
+    function hasActivatedSkillOnLog(string $skillName):int{
+        return ($this->logActivatedSkill[$skillName]??0)+($this->hasActivatedSkill($skillName)?1:0);
     }
 
-    function activateSkill(...$skillNames)
-    {
-        foreach ($skillNames as $skillName) {
+    function activateSkill(... $skillNames){
+        foreach($skillNames as $skillName){
             $this->activatedSkill[$skillName] = true;
         }
     }
 
-    function deactivateSkill(...$skillNames)
-    {
-        foreach ($skillNames as $skillName) {
+    function deactivateSkill(... $skillNames){
+        foreach($skillNames as $skillName){
             $this->activatedSkill[$skillName] = false;
         }
     }
 
-    function getHP(): int
-    {
+    function getHP():int{
         throw new NotInheritedMethodException();
     }
 
-    function decreaseHP(int $damage): int
-    {
+    function decreaseHP(int $damage):int{
         $this->dead += $damage;
         throw new NotInheritedMethodException();
     }
 
-    function increaseKilled(int $damage): int
-    {
+    function increaseKilled(int $damage):int{
         $this->killed += $damage;
         throw new NotInheritedMethodException();
     }
 
-    function calcDamage(): int
-    {
+    function calcDamage():int{
         $warPower = $this->getWarPower();
         $warPower *= Util::randRange(0.9, 1.1);
         return Util::round($warPower);
     }
 
-    function tryWound(): bool
-    {
+    function tryWound():bool{
         return false;
     }
 
-    function continueWar(&$noRice): bool
-    {
+    function continueWar(&$noRice):bool{
         //전투가 가능하면 true
         $noRice = false;
         return false;
     }
 
-    function logBattleResult()
-    {
+    function logBattleResult(){
         $this->getLogger()->pushBattleResultTemplate($this, $this->getOppose());
     }
 
-    function criticalDamage(): float
-    {
+    function criticalDamage():float{
         //전특, 병종에 따라 필살 데미지가 달라질지도 모르므로 static 함수는 아닌 것으로
         return Util::randRange(1.3, 2.0);
     }
 
-    function applyDB(\MeekroDB $db): bool
-    {
+    function applyDB(\MeekroDB $db):bool{
         throw new MustNotBeReachedException('Must be WarUnitCity or WarUnitGeneral');
     }
-}
+}

hwe/sammo/WarUnitGeneral.php

@@ -209,6 +209,25 @@ class WarUnitGeneral extends WarUnit
         [$warPower, $opposeWarPowerMultiply] = parent::computeWarPower();
 
         $general = $this->general;
+        $cityID = $general->getCityID();
+        $officerLevel = $general->getVar('officer_level');
+        $officerCity = $general->getVar('officer_city');
+
+        if ($this->isAttacker) {
+            if ($officerLevel == 12) {
+                $warPower *= 1.10;
+            } else if ($officerLevel == 11 || $officerLevel == 10 || $officerLevel == 8 || $officerLevel == 6) {
+                $warPower *= 1.05;
+            }
+        } else {
+            if ($officerLevel == 12) {
+                $opposeWarPowerMultiply *= 0.90;
+            } else if ($officerLevel == 11 || $officerLevel == 9 || $officerLevel == 7 || $officerLevel == 5) {
+                $opposeWarPowerMultiply *= 0.95;
+            } else if (2 <= $officerLevel && $officerLevel <= 4 && $officerCity  == $cityID) {
+                $opposeWarPowerMultiply *= 0.95;
+            }
+        }
 
         $expLevel = $general->getVar('explevel');
 
@@ -219,6 +238,7 @@ class WarUnitGeneral extends WarUnit
             $opposeWarPowerMultiply *= max(0.01, 1 - $expLevel / 300);
         }
 
+
         [$specialMyWarPowerMultiply, $specialOpposeWarPowerMultiply] = $this->general->getWarPowerMultiplier($this);
         $warPower *= $specialMyWarPowerMultiply;
         $opposeWarPowerMultiply *= $specialOpposeWarPowerMultiply;

hwe/sammo/WarUnitTrigger/che_궁병선제사격.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace sammo\WarUnitTrigger;
-
-use sammo\ActionLogger;
-use sammo\BaseWarUnitTrigger;
-use sammo\GameUnitConst;
-use sammo\WarUnitGeneral;
-use sammo\WarUnitCity;
-use sammo\WarUnit;
-use sammo\GameUnitDetail;
-use sammo\Util;
-use sammo\ObjectTrigger;
-
-class che_궁병선제사격 extends BaseWarUnitTrigger
-{
-    protected $priority = ObjectTrigger::PRIORITY_BEGIN;
-
-    protected function actionWar(WarUnit $self, WarUnit $oppose, array &$selfEnv, array &$opposeEnv): bool
-    {
-        assert($self instanceof WarUnitGeneral, 'General만 발동 가능');
-        if ($self->getPhase() !== 0 && $oppose->getPhase() !== 0) {
-            return true;
-        }
-        if ($self->hasActivatedSkill('선제')) {
-            return true;
-        }
-        if ($self->hasActivatedSkillOnLog('선제')) {
-            return true;
-        }
-
-        $self->activateSkill('특수', '선제');
-        if (!$self->isAttacker()) {
-            $self->addPhase(-1);
-            $oppose->addPhase(-1);
-            if ($oppose->getCrewType()->armType == GameUnitConst::T_ARCHER) {
-                $oppose->multiplyWarPowerMultiply(0.5);
-            } else {
-                $oppose->multiplyWarPowerMultiply(0);
-                $self->activateSkill('회피불가', '필살불가', '계략불가');
-                $oppose->activateSkill('회피불가', '계략불가');
-            }
-        } else {
-            $oppose->multiplyWarPowerMultiply(0.5);
-        }
-
-        $oppose->getLogger()->pushGeneralBattleDetailLog('상대에게 <R>선제 사격</>을 받았다!</>', ActionLogger::PLAIN);
-        $self->getLogger()->pushGeneralBattleDetailLog('상대에게 <C>선제 사격</>을 했다!</>', ActionLogger::PLAIN);
-
-        return true;
-    }
-}

hwe/sammo/WarUnitTrigger/che_돌격지속.php

@@ -20,14 +20,11 @@ class che_돌격지속 extends BaseWarUnitTrigger{
         if(!$self->isAttacker()){
             return true;
         }
-        $attackCoef = $self->getCrewType()->getAttackCoef($oppose->getCrewType());
-        if($attackCoef < 1){
-            if($oppose->hasActivatedSkill('선제') && $self->getPhase() >= $self->getMaxPhase() - 2){
-                $self->addBonusPhase(-1);
-            }
+        if($self->getPhase() < $self->getMaxPhase() - 1){
             return true;
         }
-        if($self->getPhase() < $self->getMaxPhase() - 1){
+        $attackCoef = $self->getCrewType()->getAttackCoef($oppose->getCrewType());
+        if($attackCoef < 1){
             return true;
         }
         $self->addBonusPhase(1);

hwe/sammo/WarUnitTrigger/che_약탈발동.php

@@ -33,6 +33,9 @@ class che_약탈발동 extends BaseWarUnitTrigger
             return true;
         }
 
+
+        $general->increaseVarWithLimit('atmos', $selfEnv['addAtmos'], 0, GameConst::$maxAtmosByWar);
+
         $opposeGeneral = $oppose->getGeneral();
 
         $theftGold = $opposeGeneral->getVar('gold') * $selfEnv['theftRatio'];

hwe/scenario/scenario_2401.json

@@ -1,5 +1,5 @@
 {
-    "title": "【가상모드24-b】 유저무쌍 멀티 유니버스!(비급)",
+    "title": "【가상모드24-b】 유저무쌍 멀티 유니버스!(천지비급)",
     "startYear": 180,
     "history": [
         "<C>●</>180년 1월:<L><b>【가상모드24-b】</b>유저무쌍 멀티 유니버스!(비급)</>",

hwe/scenario/scenario_2500.json

@@ -1,734 +0,0 @@
-{
-    "title": "【가상모드25】 악질유저무쌍!",
-    "startYear": 180,
-    "history": [
-        "<C>●</>180년 1월:<L><b>【가상모드25】</b>악질유저무쌍!</>",
-        "<C>●</>180년 1월:<L><b>【이벤트】</b></>최고의 악질유저를 가려라!"
-    ],
-    "stat": {
-        "total": 310,
-        "min": 40,
-        "max": 140
-    },
-    "iconPath": ".",
-    "fiction": 1,
-    "nation":[
-
-    ],
-    "diplomacy":[],
-    "general":[
-        [0, "아회남", null, 0, null, 65, 74, 26, 0, 160, 300, null, null],
-        [0, "이적", null, 0, null, 40, 24, 84, 0, 160, 300, null, null],
-        [0, "윤상", null, 0, null, 51, 44, 62, 0, 160, 300, null, null],
-        [0, "윤묵", null, 0, null, 26, 15, 66, 0, 160, 300, null, null],
-        [0, "우금", null, 0, null, 85, 82, 62, 0, 160, 300, null, null],
-        [0, "위관", null, 0, null, 69, 46, 79, 0, 160, 300, null, null],
-        [0, "원윤", null, 0, null, 32, 14, 39, 0, 160, 300, null, null],
-        [0, "원희", null, 0, null, 66, 43, 63, 0, 160, 300, null, null],
-        [0, "염행", null, 0, null, 78, 90, 58, 0, 160, 300, null, null],
-        [0, "염유", null, 0, null, 71, 50, 71, 0, 160, 300, null, null],
-        [0, "원술", null, 0, null, 76, 55, 75, 0, 160, 300, null, null],
-        [0, "원상", null, 0, null, 63, 75, 42, 0, 160, 300, null, null],
-        [0, "원소", null, 0, null, 90, 62, 81, 0, 160, 300, null, null],
-        [0, "염상", null, 0, null, 40, 27, 71, 0, 160, 300, null, null],
-        [0, "원담", null, 0, null, 60, 78, 30, 0, 160, 300, null, null],
-        [0, "염포", null, 0, null, 40, 25, 82, 0, 160, 300, null, null],
-        [0, "왕위", null, 0, null, 60, 70, 48, 0, 160, 300, null, null],
-        [0, "왕윤", null, 0, null, 26, 6, 68, 0, 160, 300, null, null],
-        [0, "왕항", null, 0, null, 76, 43, 61, 0, 160, 300, null, null],
-        [0, "왕찬", null, 0, null, 15, 3, 79, 0, 160, 300, null, null],
-        [0, "왕수", null, 0, null, 54, 27, 77, 0, 160, 300, null, null],
-        [0, "왕숙", null, 0, null, 36, 22, 76, 0, 160, 300, null, null],
-        [0, "왕준", null, 0, null, 85, 64, 84, 0, 160, 300, null, null],
-        [0, "왕쌍", null, 0, null, 67, 88, 19, 0, 160, 300, null, null],
-        [0, "왕창", null, 0, null, 74, 57, 79, 0, 160, 300, null, null],
-        [0, "왕평", null, 0, null, 88, 81, 61, 0, 160, 300, null, null],
-        [0, "왕보", null, 0, null, 62, 41, 79, 0, 160, 300, null, null],
-        [0, "왕문", null, 0, null, 65, 64, 31, 0, 160, 300, null, null],
-        [0, "왕릉", null, 0, null, 74, 50, 71, 0, 160, 300, null, null],
-        [0, "왕루", null, 0, null, 28, 30, 79, 0, 160, 300, null, null],
-        [0, "왕랑", null, 0, null, 47, 35, 79, 0, 160, 300, null, null],
-        [0, "온회", null, 0, null, 62, 36, 74, 0, 160, 300, null, null],
-        [0, "하안", null, 0, null, 15, 30, 72, 0, 160, 300, null, null],
-        [0, "괴월", null, 0, null, 50, 38, 85, 0, 160, 300, null, null],
-        [0, "괴량", null, 0, null, 68, 33, 88, 0, 160, 300, null, null],
-        [0, "가화", null, 0, null, 49, 65, 41, 0, 160, 300, null, null],
-        [0, "가규", null, 0, null, 78, 61, 84, 0, 160, 300, null, null],
-        [0, "하의", null, 0, null, 56, 69, 36, 0, 160, 300, null, null],
-        [0, "화흠", null, 0, null, 51, 33, 88, 0, 160, 300, null, null],
-        [0, "가후", null, 0, null, 71, 40, 98, 0, 160, 300, null, null],
-        [0, "곽가", null, 0, null, 70, 41, 97, 0, 160, 300, null, null],
-        [0, "악환", null, 0, null, 65, 80, 42, 0, 160, 300, null, null],
-        [0, "곽사", null, 0, null, 64, 76, 13, 0, 160, 300, null, null],
-        [0, "악취", null, 0, null, 53, 66, 61, 0, 160, 300, null, null],
-        [0, "곽준", null, 0, null, 73, 52, 73, 0, 160, 300, null, null],
-        [0, "학소", null, 0, null, 88, 63, 83, 0, 160, 300, null, null],
-        [0, "악진", null, 0, null, 80, 85, 56, 0, 160, 300, null, null],
-        [0, "곽도", null, 0, null, 62, 50, 82, 0, 160, 300, null, null],
-        [0, "학맹", null, 0, null, 62, 67, 42, 0, 160, 300, null, null],
-        [0, "곽유지", null, 0, null, 28, 9, 69, 0, 160, 300, null, null],
-        [0, "곽익", null, 0, null, 73, 69, 69, 0, 160, 300, null, null],
-        [0, "곽회", null, 0, null, 90, 66, 85, 0, 160, 300, null, null],
-        [0, "하후위", null, 0, null, 71, 73, 49, 0, 160, 300, null, null],
-        [0, "하후연", null, 0, null, 95, 92, 72, 0, 160, 300, null, null],
-        [0, "하후은", null, 0, null, 63, 72, 53, 0, 160, 300, null, null],
-        [0, "하후화", null, 0, null, 48, 51, 71, 0, 160, 300, null, null],
-        [0, "하후혜", null, 0, null, 50, 44, 76, 0, 160, 300, null, null],
-        [0, "하후현", null, 0, null, 54, 39, 76, 0, 160, 300, null, null],
-        [0, "하후상", null, 0, null, 79, 55, 75, 0, 160, 300, null, null],
-        [0, "하후덕", null, 0, null, 69, 73, 32, 0, 160, 300, null, null],
-        [0, "하후돈", null, 0, null, 91, 88, 68, 0, 160, 300, null, null],
-        [0, "하후패", null, 0, null, 79, 85, 63, 0, 160, 300, null, null],
-        [0, "하후무", null, 0, null, 20, 7, 4, 0, 160, 300, null, null],
-        [0, "가충", null, 0, null, 54, 31, 89, 0, 160, 300, null, null],
-        [0, "하진", null, 0, null, 68, 54, 75, 0, 160, 300, null, null],
-        [0, "화웅", null, 0, null, 78, 90, 55, 0, 160, 300, null, null],
-        [0, "한윤", null, 0, null, 26, 29, 65, 0, 160, 300, null, null],
-        [0, "관우", null, 0, null, 96, 99, 76, 0, 160, 300, null, null],
-        [0, "환계", null, 0, null, 25, 26, 68, 0, 160, 300, null, null],
-        [0, "관해", null, 0, null, 70, 82, 10, 0, 160, 300, null, null],
-        [0, "관구검", null, 0, null, 84, 86, 62, 0, 160, 300, null, null],
-        [0, "한현", null, 0, null, 22, 33, 7, 0, 160, 300, null, null],
-        [0, "한호", null, 0, null, 73, 61, 84, 0, 160, 300, null, null],
-        [0, "관흥", null, 0, null, 76, 84, 62, 0, 160, 300, null, null],
-        [0, "관색", null, 0, null, 74, 83, 56, 0, 160, 300, null, null],
-        [0, "한수", null, 0, null, 78, 58, 79, 0, 160, 300, null, null],
-        [0, "한숭", null, 0, null, 25, 15, 71, 0, 160, 300, null, null],
-        [0, "관정", null, 0, null, 36, 52, 73, 0, 160, 300, null, null],
-        [0, "한섬", null, 0, null, 69, 66, 36, 0, 160, 300, null, null],
-        [0, "감택", null, 0, null, 51, 49, 83, 0, 160, 300, null, null],
-        [0, "한충", null, 0, null, 64, 67, 18, 0, 160, 300, null, null],
-        [0, "한당", null, 0, null, 76, 85, 61, 0, 160, 300, null, null],
-        [0, "한덕", null, 0, null, 63, 76, 25, 0, 160, 300, null, null],
-        [0, "감녕", null, 0, null, 92, 95, 74, 0, 160, 300, null, null],
-        [0, "한복", null, 0, null, 28, 3, 27, 0, 160, 300, null, null],
-        [0, "관평", null, 0, null, 78, 82, 60, 0, 160, 300, null, null],
-        [0, "간옹", null, 0, null, 20, 32, 75, 0, 160, 300, null, null],
-        [0, "안량", null, 0, null, 88, 96, 43, 0, 160, 300, null, null],
-        [0, "위연", null, 0, null, 91, 90, 70, 0, 160, 300, null, null],
-        [0, "국의", null, 0, null, 84, 78, 51, 0, 160, 300, null, null],
-        [0, "희지재", null, 0, null, 63, 35, 91, 0, 160, 300, null, null],
-        [0, "위속", null, 0, null, 67, 78, 31, 0, 160, 300, null, null],
-        [0, "위유", null, 0, null, 46, 29, 74, 0, 160, 300, null, null],
-        [0, "우금2", null, 0, null, 72, 79, 38, 0, 160, 300, null, null],
-        [0, "우보", null, 0, null, 38, 60, 21, 0, 160, 300, null, null],
-        [0, "강유", null, 0, null, 92, 72, 93, 0, 160, 300, null, null],
-        [0, "공지", null, 0, null, 43, 53, 62, 0, 160, 300, null, null],
-        [0, "교유", null, 0, null, 64, 69, 38, 0, 160, 300, null, null],
-        [0, "공도", null, 0, null, 59, 70, 23, 0, 160, 300, null, null],
-        [0, "허공", null, 0, null, 44, 66, 64, 0, 160, 300, null, null],
-        [0, "허정", null, 0, null, 23, 5, 68, 0, 160, 300, null, null],
-        [0, "허저", null, 0, null, 74, 97, 36, 0, 160, 300, null, null],
-        [0, "허유", null, 0, null, 36, 21, 80, 0, 160, 300, null, null],
-        [0, "기령", null, 0, null, 85, 84, 51, 0, 160, 300, null, null],
-        [0, "김의", null, 0, null, 32, 38, 65, 0, 160, 300, null, null],
-        [0, "김배삼결", null, 0, null, 64, 76, 19, 0, 160, 300, null, null],
-        [0, "김선", null, 0, null, 52, 68, 13, 0, 160, 300, null, null],
-        [0, "우번", null, 0, null, 46, 46, 87, 0, 160, 300, null, null],
-        [0, "형도영", null, 0, null, 69, 79, 41, 0, 160, 300, null, null],
-        [0, "엄안", null, 0, null, 82, 83, 62, 0, 160, 300, null, null],
-        [0, "엄망", null, 0, null, 68, 71, 40, 0, 160, 300, null, null],
-        [0, "엄준", null, 0, null, 41, 12, 71, 0, 160, 300, null, null],
-        [0, "엄정", null, 0, null, 50, 55, 39, 0, 160, 300, null, null],
-        [0, "엄백호", null, 0, null, 67, 70, 42, 0, 160, 300, null, null],
-        [0, "엄여", null, 0, null, 61, 78, 44, 0, 160, 300, null, null],
-        [0, "오의", null, 0, null, 79, 73, 53, 0, 160, 300, null, null],
-        [0, "황개", null, 0, null, 80, 86, 64, 0, 160, 300, null, null],
-        [0, "고간", null, 0, null, 74, 56, 38, 0, 160, 300, null, null],
-        [0, "황권", null, 0, null, 75, 59, 88, 0, 160, 300, null, null],
-        [0, "고유", null, 0, null, 57, 43, 72, 0, 160, 300, null, null],
-        [0, "고순", null, 0, null, 87, 89, 60, 0, 160, 300, null, null],
-        [0, "고상", null, 0, null, 68, 68, 53, 0, 160, 300, null, null],
-        [0, "고승", null, 0, null, 67, 73, 41, 0, 160, 300, null, null],
-        [0, "후성", null, 0, null, 74, 75, 54, 0, 160, 300, null, null],
-        [0, "후선", null, 0, null, 63, 66, 34, 0, 160, 300, null, null],
-        [0, "황조", null, 0, null, 81, 66, 48, 0, 160, 300, null, null],
-        [0, "공손월", null, 0, null, 74, 72, 47, 0, 160, 300, null, null],
-        [0, "공손연", null, 0, null, 65, 70, 49, 0, 160, 300, null, null],
-        [0, "공손공", null, 0, null, 39, 17, 69, 0, 160, 300, null, null],
-        [0, "공손강", null, 0, null, 72, 66, 46, 0, 160, 300, null, null],
-        [0, "공손찬", null, 0, null, 86, 82, 62, 0, 160, 300, null, null],
-        [0, "공손속", null, 0, null, 63, 68, 46, 0, 160, 300, null, null],
-        [0, "공손도", null, 0, null, 67, 71, 49, 0, 160, 300, null, null],
-        [0, "공손범", null, 0, null, 73, 69, 49, 0, 160, 300, null, null],
-        [0, "황충", null, 0, null, 88, 96, 65, 0, 160, 300, null, null],
-        [0, "고정", null, 0, null, 55, 63, 43, 0, 160, 300, null, null],
-        [0, "고패", null, 0, null, 66, 48, 69, 0, 160, 300, null, null],
-        [0, "황보숭", null, 0, null, 91, 61, 82, 0, 160, 300, null, null],
-        [0, "공융", null, 0, null, 30, 5, 73, 0, 160, 300, null, null],
-        [0, "고람", null, 0, null, 76, 82, 60, 0, 160, 300, null, null],
-        [0, "오경", null, 0, null, 69, 66, 45, 0, 160, 300, null, null],
-        [0, "호거아", null, 0, null, 70, 82, 41, 0, 160, 300, null, null],
-        [0, "호진", null, 0, null, 65, 74, 12, 0, 160, 300, null, null],
-        [0, "올돌골", null, 0, null, 79, 86, 11, 0, 160, 300, null, null],
-        [0, "호반", null, 0, null, 55, 55, 59, 0, 160, 300, null, null],
-        [0, "오반", null, 0, null, 74, 71, 50, 0, 160, 300, null, null],
-        [0, "고옹", null, 0, null, 52, 18, 81, 0, 160, 300, null, null],
-        [0, "오란", null, 0, null, 68, 80, 35, 0, 160, 300, null, null],
-        [0, "채화", null, 0, null, 39, 50, 1, 0, 160, 300, null, null],
-        [0, "채중", null, 0, null, 40, 54, 2, 0, 160, 300, null, null],
-        [0, "채모", null, 0, null, 70, 55, 77, 0, 160, 300, null, null],
-        [0, "착융", null, 0, null, 60, 69, 38, 0, 160, 300, null, null],
-        [0, "사마의", null, 0, null, 99, 63, 98, 0, 160, 300, null, null],
-        [0, "사마염", null, 0, null, 69, 59, 77, 0, 160, 300, null, null],
-        [0, "사마사", null, 0, null, 84, 64, 89, 0, 160, 300, null, null],
-        [0, "사마소", null, 0, null, 85, 57, 88, 0, 160, 300, null, null],
-        [0, "사마부", null, 0, null, 70, 37, 77, 0, 160, 300, null, null],
-        [0, "사마랑", null, 0, null, 20, 21, 72, 0, 160, 300, null, null],
-        [0, "사마가", null, 0, null, 66, 84, 25, 0, 160, 300, null, null],
-        [0, "주흔", null, 0, null, 65, 51, 73, 0, 160, 300, null, null],
-        [0, "주앙", null, 0, null, 74, 65, 48, 0, 160, 300, null, null],
-        [0, "주지", null, 0, null, 73, 85, 41, 0, 160, 300, null, null],
-        [0, "주창", null, 0, null, 68, 77, 42, 0, 160, 300, null, null],
-        [0, "주태", null, 0, null, 84, 90, 48, 0, 160, 300, null, null],
-        [0, "주방", null, 0, null, 52, 41, 80, 0, 160, 300, null, null],
-        [0, "주유", null, 0, null, 97, 71, 97, 0, 160, 300, null, null],
-        [0, "주환", null, 0, null, 87, 84, 64, 0, 160, 300, null, null],
-        [0, "주거", null, 0, null, 77, 57, 72, 0, 160, 300, null, null],
-        [0, "축융", null, 0, null, 72, 75, 35, 0, 160, 300, null, null],
-        [0, "주준", null, 0, null, 89, 57, 76, 0, 160, 300, null, null],
-        [0, "주연", null, 0, null, 86, 75, 57, 0, 160, 300, null, null],
-        [0, "주치", null, 0, null, 71, 56, 72, 0, 160, 300, null, null],
-        [0, "주포", null, 0, null, 68, 73, 34, 0, 160, 300, null, null],
-        [0, "주령", null, 0, null, 78, 73, 53, 0, 160, 300, null, null],
-        [0, "순욱", null, 0, null, 78, 38, 97, 0, 160, 300, null, null],
-        [0, "순우경", null, 0, null, 78, 66, 29, 0, 160, 300, null, null],
-        [0, "순심", null, 0, null, 45, 25, 78, 0, 160, 300, null, null],
-        [0, "순유", null, 0, null, 80, 35, 95, 0, 160, 300, null, null],
-        [0, "장완", null, 0, null, 78, 34, 89, 0, 160, 300, null, null],
-        [0, "종회", null, 0, null, 88, 62, 93, 0, 160, 300, null, null],
-        [0, "장간", null, 0, null, 19, 6, 66, 0, 160, 300, null, null],
-        [0, "장의거", null, 0, null, 71, 41, 59, 0, 160, 300, null, null],
-        [0, "장흠", null, 0, null, 78, 85, 54, 0, 160, 300, null, null],
-        [0, "장제3", null, 0, null, 62, 43, 85, 0, 160, 300, null, null],
-        [0, "초주", null, 0, null, 16, 3, 67, 0, 160, 300, null, null],
-        [0, "초촉", null, 0, null, 65, 76, 33, 0, 160, 300, null, null],
-        [0, "향총", null, 0, null, 76, 56, 77, 0, 160, 300, null, null],
-        [0, "종요", null, 0, null, 79, 24, 90, 0, 160, 300, null, null],
-        [0, "향랑", null, 0, null, 28, 18, 74, 0, 160, 300, null, null],
-        [0, "서영", null, 0, null, 92, 80, 62, 0, 160, 300, null, null],
-        [0, "제갈각", null, 0, null, 72, 47, 90, 0, 160, 300, null, null],
-        [0, "제갈근", null, 0, null, 75, 34, 85, 0, 160, 300, null, null],
-        [0, "제갈균", null, 0, null, 29, 25, 52, 0, 160, 300, null, null],
-        [0, "제갈탄", null, 0, null, 72, 54, 76, 0, 160, 300, null, null],
-        [0, "제갈량", null, 0, null, 98, 43, 100, 0, 160, 300, null, null],
-        [0, "서황", null, 0, null, 95, 94, 74, 0, 160, 300, null, null],
-        [0, "서서", null, 0, null, 85, 64, 94, 0, 160, 300, null, null],
-        [0, "서성", null, 0, null, 86, 81, 61, 0, 160, 300, null, null],
-        [0, "서막", null, 0, null, 55, 32, 68, 0, 160, 300, null, null],
-        [0, "신의", null, 0, null, 55, 59, 60, 0, 160, 300, null, null],
-        [0, "신탐", null, 0, null, 56, 62, 54, 0, 160, 300, null, null],
-        [0, "심배", null, 0, null, 80, 60, 84, 0, 160, 300, null, null],
-        [0, "신비", null, 0, null, 42, 24, 79, 0, 160, 300, null, null],
-        [0, "신평", null, 0, null, 69, 43, 77, 0, 160, 300, null, null],
-        [0, "진복", null, 0, null, 31, 7, 73, 0, 160, 300, null, null],
-        [0, "진랑", null, 0, null, 58, 70, 35, 0, 160, 300, null, null],
-        [0, "휴고", null, 0, null, 63, 71, 38, 0, 160, 300, null, null],
-        [0, "추단", null, 0, null, 61, 64, 34, 0, 160, 300, null, null],
-        [0, "성의", null, 0, null, 74, 72, 41, 0, 160, 300, null, null],
-        [0, "성공영", null, 0, null, 73, 58, 80, 0, 160, 300, null, null],
-        [0, "설종", null, 0, null, 34, 16, 73, 0, 160, 300, null, null],
-        [0, "단경", null, 0, null, 71, 68, 43, 0, 160, 300, null, null],
-        [0, "전종", null, 0, null, 78, 55, 75, 0, 160, 300, null, null],
-        [0, "조예", null, 0, null, 72, 52, 82, 0, 160, 300, null, null],
-        [0, "조휴", null, 0, null, 84, 78, 58, 0, 160, 300, null, null],
-        [0, "송헌", null, 0, null, 68, 77, 38, 0, 160, 300, null, null],
-        [0, "조앙", null, 0, null, 78, 50, 69, 0, 160, 300, null, null],
-        [0, "조홍", null, 0, null, 80, 75, 55, 0, 160, 300, null, null],
-        [0, "조순", null, 0, null, 85, 83, 63, 0, 160, 300, null, null],
-        [0, "조창", null, 0, null, 86, 91, 59, 0, 160, 300, null, null],
-        [0, "조식", null, 0, null, 45, 22, 86, 0, 160, 300, null, null],
-        [0, "조진", null, 0, null, 88, 74, 56, 0, 160, 300, null, null],
-        [0, "조인", null, 0, null, 94, 90, 70, 0, 160, 300, null, null],
-        [0, "조성", null, 0, null, 54, 74, 38, 0, 160, 300, null, null],
-        [0, "조조", null, 0, null, 100, 72, 96, 0, 160, 300, null, null],
-        [0, "조충", null, 0, null, 43, 21, 74, 0, 160, 300, null, null],
-        [0, "장패", null, 0, null, 78, 86, 53, 0, 160, 300, null, null],
-        [0, "조비", null, 0, null, 75, 64, 87, 0, 160, 300, null, null],
-        [0, "조표", null, 0, null, 54, 69, 32, 0, 160, 300, null, null],
-        [0, "저수", null, 0, null, 86, 46, 95, 0, 160, 300, null, null],
-        [0, "소비", null, 0, null, 69, 45, 66, 0, 160, 300, null, null],
-        [0, "조무", null, 0, null, 70, 71, 50, 0, 160, 300, null, null],
-        [0, "손환", null, 0, null, 82, 56, 76, 0, 160, 300, null, null],
-        [0, "손견", null, 0, null, 94, 95, 73, 0, 160, 300, null, null],
-        [0, "손건", null, 0, null, 44, 33, 79, 0, 160, 300, null, null],
-        [0, "손권", null, 0, null, 86, 61, 81, 0, 160, 300, null, null],
-        [0, "손교", null, 0, null, 77, 72, 52, 0, 160, 300, null, null],
-        [0, "손책", null, 0, null, 93, 94, 74, 0, 160, 300, null, null],
-        [0, "손소", null, 0, null, 82, 79, 59, 0, 160, 300, null, null],
-        [0, "손정", null, 0, null, 66, 53, 73, 0, 160, 300, null, null],
-        [0, "손중", null, 0, null, 62, 71, 36, 0, 160, 300, null, null],
-        [0, "손등", null, 0, null, 62, 37, 79, 0, 160, 300, null, null],
-        [0, "손유", null, 0, null, 77, 70, 51, 0, 160, 300, null, null],
-        [0, "손익", null, 0, null, 67, 83, 27, 0, 160, 300, null, null],
-        [0, "손례", null, 0, null, 78, 81, 59, 0, 160, 300, null, null],
-        [0, "태사자", null, 0, null, 94, 94, 72, 0, 160, 300, null, null],
-        [0, "대래동주", null, 0, null, 51, 53, 54, 0, 160, 300, null, null],
-        [0, "대릉", null, 0, null, 70, 75, 39, 0, 160, 300, null, null],
-        [0, "타사대왕", null, 0, null, 62, 48, 70, 0, 160, 300, null, null],
-        [0, "담웅", null, 0, null, 58, 73, 14, 0, 160, 300, null, null],
-        [0, "장윤", null, 0, null, 72, 67, 42, 0, 160, 300, null, null],
-        [0, "조운", null, 0, null, 90, 96, 75, 0, 160, 300, null, null],
-        [0, "장위", null, 0, null, 74, 66, 45, 0, 160, 300, null, null],
-        [0, "장영", null, 0, null, 75, 74, 41, 0, 160, 300, null, null],
-        [0, "장연", null, 0, null, 76, 81, 57, 0, 160, 300, null, null],
-        [0, "장횡", null, 0, null, 59, 70, 23, 0, 160, 300, null, null],
-        [0, "장온", null, 0, null, 32, 10, 72, 0, 160, 300, null, null],
-        [0, "장개", null, 0, null, 34, 66, 8, 0, 160, 300, null, null],
-        [0, "장각", null, 0, null, 87, 35, 90, 0, 160, 300, null, null],
-        [0, "장기", null, 0, null, 74, 35, 76, 0, 160, 300, null, null],
-        [0, "장의", null, 0, null, 79, 55, 75, 0, 160, 300, null, null],
-        [0, "장훈", null, 0, null, 72, 68, 41, 0, 160, 300, null, null],
-        [0, "장굉", null, 0, null, 24, 22, 86, 0, 160, 300, null, null],
-        [0, "장합", null, 0, null, 92, 89, 69, 0, 160, 300, null, null],
-        [0, "조홍2", null, 0, null, 66, 72, 28, 0, 160, 300, null, null],
-        [0, "장제2", null, 0, null, 70, 66, 46, 0, 160, 300, null, null],
-        [0, "장수", null, 0, null, 80, 73, 51, 0, 160, 300, null, null],
-        [0, "장소", null, 0, null, 41, 13, 87, 0, 160, 300, null, null],
-        [0, "장송", null, 0, null, 40, 6, 85, 0, 160, 300, null, null],
-        [0, "장임", null, 0, null, 85, 84, 64, 0, 160, 300, null, null],
-        [0, "장제", null, 0, null, 67, 43, 80, 0, 160, 300, null, null],
-        [0, "장막", null, 0, null, 52, 53, 71, 0, 160, 300, null, null],
-        [0, "조범", null, 0, null, 28, 21, 32, 0, 160, 300, null, null],
-        [0, "장비", null, 0, null, 87, 98, 72, 0, 160, 300, null, null],
-        [0, "장포", null, 0, null, 78, 84, 48, 0, 160, 300, null, null],
-        [0, "장보", null, 0, null, 83, 60, 81, 0, 160, 300, null, null],
-        [0, "장만성", null, 0, null, 75, 81, 45, 0, 160, 300, null, null],
-        [0, "장양", null, 0, null, 72, 70, 50, 0, 160, 300, null, null],
-        [0, "장익", null, 0, null, 75, 55, 76, 0, 160, 300, null, null],
-        [0, "장료", null, 0, null, 96, 94, 74, 0, 160, 300, null, null],
-        [0, "장량", null, 0, null, 78, 80, 59, 0, 160, 300, null, null],
-        [0, "조루", null, 0, null, 70, 43, 68, 0, 160, 300, null, null],
-        [0, "장로", null, 0, null, 65, 42, 81, 0, 160, 300, null, null],
-        [0, "진횡", null, 0, null, 64, 63, 26, 0, 160, 300, null, null],
-        [0, "진응", null, 0, null, 62, 72, 45, 0, 160, 300, null, null],
-        [0, "진기", null, 0, null, 58, 65, 43, 0, 160, 300, null, null],
-        [0, "진궁", null, 0, null, 84, 55, 90, 0, 160, 300, null, null],
-        [0, "진교", null, 0, null, 61, 27, 77, 0, 160, 300, null, null],
-        [0, "진군", null, 0, null, 32, 14, 75, 0, 160, 300, null, null],
-        [0, "진규", null, 0, null, 30, 4, 82, 0, 160, 300, null, null],
-        [0, "진식", null, 0, null, 70, 71, 25, 0, 160, 300, null, null],
-        [0, "진진", null, 0, null, 46, 46, 69, 0, 160, 300, null, null],
-        [0, "진태", null, 0, null, 86, 68, 89, 0, 160, 300, null, null],
-        [0, "진등", null, 0, null, 79, 59, 81, 0, 160, 300, null, null],
-        [0, "진도", null, 0, null, 82, 78, 58, 0, 160, 300, null, null],
-        [0, "진무", null, 0, null, 76, 87, 43, 0, 160, 300, null, null],
-        [0, "진란", null, 0, null, 66, 69, 40, 0, 160, 300, null, null],
-        [0, "진림", null, 0, null, 25, 9, 75, 0, 160, 300, null, null],
-        [0, "정욱", null, 0, null, 76, 49, 94, 0, 160, 300, null, null],
-        [0, "정원지", null, 0, null, 69, 74, 17, 0, 160, 300, null, null],
-        [0, "정은", null, 0, null, 69, 73, 40, 0, 160, 300, null, null],
-        [0, "정원", null, 0, null, 70, 76, 35, 0, 160, 300, null, null],
-        [0, "정보", null, 0, null, 84, 79, 59, 0, 160, 300, null, null],
-        [0, "정봉", null, 0, null, 81, 92, 69, 0, 160, 300, null, null],
-        [0, "전위", null, 0, null, 79, 98, 42, 0, 160, 300, null, null],
-        [0, "전해", null, 0, null, 68, 65, 45, 0, 160, 300, null, null],
-        [0, "전주", null, 0, null, 66, 51, 73, 0, 160, 300, null, null],
-        [0, "전풍", null, 0, null, 82, 43, 96, 0, 160, 300, null, null],
-        [0, "전예", null, 0, null, 93, 85, 66, 0, 160, 300, null, null],
-        [0, "동윤", null, 0, null, 47, 28, 79, 0, 160, 300, null, null],
-        [0, "동화", null, 0, null, 57, 34, 75, 0, 160, 300, null, null],
-        [0, "등애", null, 0, null, 92, 73, 94, 0, 160, 300, null, null],
-        [0, "도겸", null, 0, null, 51, 27, 64, 0, 160, 300, null, null],
-        [0, "등현", null, 0, null, 61, 73, 45, 0, 160, 300, null, null],
-        [0, "등지", null, 0, null, 73, 52, 81, 0, 160, 300, null, null],
-        [0, "동습", null, 0, null, 72, 85, 50, 0, 160, 300, null, null],
-        [0, "동승", null, 0, null, 56, 53, 65, 0, 160, 300, null, null],
-        [0, "동소", null, 0, null, 34, 25, 80, 0, 160, 300, null, null],
-        [0, "동탁", null, 0, null, 91, 87, 67, 0, 160, 300, null, null],
-        [0, "동도나", null, 0, null, 68, 73, 31, 0, 160, 300, null, null],
-        [0, "동민", null, 0, null, 49, 60, 25, 0, 160, 300, null, null],
-        [0, "등무", null, 0, null, 61, 75, 29, 0, 160, 300, null, null],
-        [0, "두기", null, 0, null, 74, 43, 78, 0, 160, 300, null, null],
-        [0, "두예", null, 0, null, 96, 69, 95, 0, 160, 300, null, null],
-        [0, "배원소", null, 0, null, 49, 65, 25, 0, 160, 300, null, null],
-        [0, "마완", null, 0, null, 71, 74, 16, 0, 160, 300, null, null],
-        [0, "마휴", null, 0, null, 68, 73, 48, 0, 160, 300, null, null],
-        [0, "파재", null, 0, null, 74, 74, 55, 0, 160, 300, null, null],
-        [0, "마준", null, 0, null, 38, 52, 31, 0, 160, 300, null, null],
-        [0, "마속", null, 0, null, 61, 59, 84, 0, 160, 300, null, null],
-        [0, "마대", null, 0, null, 79, 85, 62, 0, 160, 300, null, null],
-        [0, "마충", null, 0, null, 78, 72, 52, 0, 160, 300, null, null],
-        [0, "마초", null, 0, null, 86, 97, 44, 0, 160, 300, null, null],
-        [0, "마철", null, 0, null, 70, 62, 43, 0, 160, 300, null, null],
-        [0, "마등", null, 0, null, 85, 80, 52, 0, 160, 300, null, null],
-        [0, "마량", null, 0, null, 53, 23, 85, 0, 160, 300, null, null],
-        [0, "반준", null, 0, null, 61, 46, 82, 0, 160, 300, null, null],
-        [0, "반장", null, 0, null, 76, 80, 59, 0, 160, 300, null, null],
-        [0, "번조", null, 0, null, 66, 73, 31, 0, 160, 300, null, null],
-        [0, "번능", null, 0, null, 69, 61, 36, 0, 160, 300, null, null],
-        [0, "반봉", null, 0, null, 56, 77, 4, 0, 160, 300, null, null],
-        [0, "비의", null, 0, null, 82, 56, 88, 0, 160, 300, null, null],
-        [0, "비연", null, 0, null, 60, 66, 21, 0, 160, 300, null, null],
-        [0, "비시", null, 0, null, 18, 28, 65, 0, 160, 300, null, null],
-        [0, "미축", null, 0, null, 33, 29, 78, 0, 160, 300, null, null],
-        [0, "미방", null, 0, null, 54, 61, 32, 0, 160, 300, null, null],
-        [0, "비요", null, 0, null, 70, 52, 73, 0, 160, 300, null, null],
-        [0, "무안국", null, 0, null, 70, 79, 34, 0, 160, 300, null, null],
-        [0, "풍습", null, 0, null, 72, 71, 39, 0, 160, 300, null, null],
-        [0, "부사인", null, 0, null, 46, 63, 37, 0, 160, 300, null, null],
-        [0, "부첨", null, 0, null, 73, 85, 62, 0, 160, 300, null, null],
-        [0, "부손", null, 0, null, 29, 13, 70, 0, 160, 300, null, null],
-        [0, "문앙", null, 0, null, 76, 96, 65, 0, 160, 300, null, null],
-        [0, "문흠", null, 0, null, 74, 79, 43, 0, 160, 300, null, null],
-        [0, "문추", null, 0, null, 87, 95, 49, 0, 160, 300, null, null],
-        [0, "문빙", null, 0, null, 88, 85, 65, 0, 160, 300, null, null],
-        [0, "변희", null, 0, null, 56, 70, 62, 0, 160, 300, null, null],
-        [0, "망아장", null, 0, null, 45, 79, 3, 0, 160, 300, null, null],
-        [0, "봉기", null, 0, null, 56, 48, 84, 0, 160, 300, null, null],
-        [0, "방희", null, 0, null, 60, 38, 69, 0, 160, 300, null, null],
-        [0, "법정", null, 0, null, 82, 47, 94, 0, 160, 300, null, null],
-        [0, "방통", null, 0, null, 79, 34, 97, 0, 160, 300, null, null],
-        [0, "방덕", null, 0, null, 89, 94, 70, 0, 160, 300, null, null],
-        [0, "포륭", null, 0, null, 58, 76, 49, 0, 160, 300, null, null],
-        [0, "목순", null, 0, null, 52, 77, 11, 0, 160, 300, null, null],
-        [0, "목록대왕", null, 0, null, 65, 71, 39, 0, 160, 300, null, null],
-        [0, "보즐", null, 0, null, 83, 51, 81, 0, 160, 300, null, null],
-        [0, "만총", null, 0, null, 88, 64, 87, 0, 160, 300, null, null],
-        [0, "모개", null, 0, null, 63, 39, 60, 0, 160, 300, null, null],
-        [0, "맹획", null, 0, null, 81, 88, 42, 0, 160, 300, null, null],
-        [0, "맹체", null, 0, null, 75, 55, 75, 0, 160, 300, null, null],
-        [0, "맹우", null, 0, null, 50, 68, 22, 0, 160, 300, null, null],
-        [0, "유섭", null, 0, null, 62, 79, 24, 0, 160, 300, null, null],
-        [0, "양부", null, 0, null, 62, 48, 68, 0, 160, 300, null, null],
-        [0, "옹개", null, 0, null, 73, 75, 57, 0, 160, 300, null, null],
-        [0, "양의", null, 0, null, 68, 40, 82, 0, 160, 300, null, null],
-        [0, "양호", null, 0, null, 94, 69, 92, 0, 160, 300, null, null],
-        [0, "양홍", null, 0, null, 33, 15, 77, 0, 160, 300, null, null],
-        [0, "양앙", null, 0, null, 68, 72, 38, 0, 160, 300, null, null],
-        [0, "양추", null, 0, null, 52, 65, 40, 0, 160, 300, null, null],
-        [0, "양수", null, 0, null, 46, 23, 83, 0, 160, 300, null, null],
-        [0, "양추2", null, 0, null, 67, 64, 44, 0, 160, 300, null, null],
-        [0, "양송", null, 0, null, 17, 5, 28, 0, 160, 300, null, null],
-        [0, "양임", null, 0, null, 70, 78, 56, 0, 160, 300, null, null],
-        [0, "양조", null, 0, null, 53, 61, 36, 0, 160, 300, null, null],
-        [0, "양백", null, 0, null, 44, 45, 19, 0, 160, 300, null, null],
-        [0, "양부2", null, 0, null, 67, 50, 83, 0, 160, 300, null, null],
-        [0, "양봉", null, 0, null, 66, 65, 31, 0, 160, 300, null, null],
-        [0, "양봉2", null, 0, null, 54, 62, 53, 0, 160, 300, null, null],
-        [0, "뇌동", null, 0, null, 69, 78, 51, 0, 160, 300, null, null],
-        [0, "뇌박", null, 0, null, 62, 70, 36, 0, 160, 300, null, null],
-        [0, "이이", null, 0, null, 63, 77, 19, 0, 160, 300, null, null],
-        [0, "이회", null, 0, null, 79, 58, 79, 0, 160, 300, null, null],
-        [0, "이각", null, 0, null, 69, 72, 24, 0, 160, 300, null, null],
-        [0, "육항", null, 0, null, 94, 68, 93, 0, 160, 300, null, null],
-        [0, "육적", null, 0, null, 20, 7, 72, 0, 160, 300, null, null],
-        [0, "육손", null, 0, null, 95, 71, 96, 0, 160, 300, null, null],
-        [0, "이엄", null, 0, null, 83, 84, 63, 0, 160, 300, null, null],
-        [0, "이유", null, 0, null, 61, 26, 93, 0, 160, 300, null, null],
-        [0, "이숙", null, 0, null, 46, 69, 61, 0, 160, 300, null, null],
-        [0, "이통", null, 0, null, 73, 81, 62, 0, 160, 300, null, null],
-        [0, "이전", null, 0, null, 78, 80, 59, 0, 160, 300, null, null],
-        [0, "이풍", null, 0, null, 69, 74, 50, 0, 160, 300, null, null],
-        [0, "유언", null, 0, null, 61, 38, 80, 0, 160, 300, null, null],
-        [0, "유괴", null, 0, null, 71, 73, 52, 0, 160, 300, null, null],
-        [0, "유기", null, 0, null, 52, 12, 63, 0, 160, 300, null, null],
-        [0, "유우", null, 0, null, 62, 33, 75, 0, 160, 300, null, null],
-        [0, "유훈", null, 0, null, 47, 63, 35, 0, 160, 300, null, null],
-        [0, "유현", null, 0, null, 54, 66, 51, 0, 160, 300, null, null],
-        [0, "유순", null, 0, null, 63, 46, 28, 0, 160, 300, null, null],
-        [0, "유장", null, 0, null, 31, 5, 34, 0, 160, 300, null, null],
-        [0, "유심", null, 0, null, 60, 48, 70, 0, 160, 300, null, null],
-        [0, "유선", null, 0, null, 3, 5, 9, 0, 160, 300, null, null],
-        [0, "유종", null, 0, null, 24, 22, 65, 0, 160, 300, null, null],
-        [0, "유도", null, 0, null, 25, 23, 26, 0, 160, 300, null, null],
-        [0, "유파", null, 0, null, 29, 22, 75, 0, 160, 300, null, null],
-        [0, "유반", null, 0, null, 69, 76, 47, 0, 160, 300, null, null],
-        [0, "유비", null, 0, null, 88, 78, 59, 0, 160, 300, null, null],
-        [0, "유표", null, 0, null, 48, 31, 72, 0, 160, 300, null, null],
-        [0, "유복", null, 0, null, 64, 49, 74, 0, 160, 300, null, null],
-        [0, "유벽", null, 0, null, 70, 72, 47, 0, 160, 300, null, null],
-        [0, "유봉", null, 0, null, 75, 79, 44, 0, 160, 300, null, null],
-        [0, "유엽", null, 0, null, 56, 32, 92, 0, 160, 300, null, null],
-        [0, "유요", null, 0, null, 62, 67, 46, 0, 160, 300, null, null],
-        [0, "여위황", null, 0, null, 58, 63, 29, 0, 160, 300, null, null],
-        [0, "요화", null, 0, null, 73, 76, 54, 0, 160, 300, null, null],
-        [0, "양흥", null, 0, null, 61, 65, 19, 0, 160, 300, null, null],
-        [0, "양습", null, 0, null, 73, 40, 74, 0, 160, 300, null, null],
-        [0, "양서", null, 0, null, 56, 62, 66, 0, 160, 300, null, null],
-        [0, "능조", null, 0, null, 75, 81, 42, 0, 160, 300, null, null],
-        [0, "능통", null, 0, null, 83, 89, 60, 0, 160, 300, null, null],
-        [0, "여개", null, 0, null, 53, 30, 67, 0, 160, 300, null, null],
-        [0, "여건", null, 0, null, 57, 70, 62, 0, 160, 300, null, null],
-        [0, "여광", null, 0, null, 56, 70, 13, 0, 160, 300, null, null],
-        [0, "여상", null, 0, null, 54, 71, 12, 0, 160, 300, null, null],
-        [0, "여대", null, 0, null, 80, 71, 52, 0, 160, 300, null, null],
-        [0, "여범", null, 0, null, 73, 54, 75, 0, 160, 300, null, null],
-        [0, "여포", null, 0, null, 89, 100, 42, 0, 160, 300, null, null],
-        [0, "여몽", null, 0, null, 91, 69, 90, 0, 160, 300, null, null],
-        [0, "윤직", null, 0, null, 46, 42, 73, 0, 160, 300, null, null],
-        [0, "냉포", null, 0, null, 71, 82, 61, 0, 160, 300, null, null],
-        [0, "누규", null, 0, null, 52, 13, 87, 0, 160, 300, null, null],
-        [0, "노숙", null, 0, null, 89, 56, 93, 0, 160, 300, null, null],
-        [0, "노식", null, 0, null, 86, 63, 82, 0, 160, 300, null, null],
-        [0, "범강", null, 0, null, 49, 50, 36, 0, 160, 300, null, null],
-        [0, "장달", null, 0, null, 43, 56, 34, 0, 160, 300, null, null],
-        [0, "규람", null, 0, null, 55, 70, 58, 0, 160, 300, null, null],
-        [0, "대원", null, 0, null, 38, 32, 68, 0, 160, 300, null, null],
-        [0, "왕기", null, 0, null, 81, 64, 86, 0, 160, 300, null, null],
-        [0, "왕상", null, 0, null, 23, 19, 68, 0, 160, 300, null, null],
-        [0, "왕돈", null, 0, null, 60, 66, 46, 0, 160, 300, null, null],
-        [0, "악침", null, 0, null, 73, 75, 43, 0, 160, 300, null, null],
-        [0, "하제", null, 0, null, 83, 61, 82, 0, 160, 300, null, null],
-        [0, "환범", null, 0, null, 40, 11, 78, 0, 160, 300, null, null],
-        [0, "견초", null, 0, null, 72, 79, 57, 0, 160, 300, null, null],
-        [0, "고당륭", null, 0, null, 35, 24, 76, 0, 160, 300, null, null],
-        [0, "오찬", null, 0, null, 68, 41, 78, 0, 160, 300, null, null],
-        [0, "호질", null, 0, null, 73, 46, 74, 0, 160, 300, null, null],
-        [0, "오질", null, 0, null, 16, 29, 68, 0, 160, 300, null, null],
-        [0, "호준", null, 0, null, 79, 76, 55, 0, 160, 300, null, null],
-        [0, "고담", null, 0, null, 53, 23, 77, 0, 160, 300, null, null],
-        [0, "최림", null, 0, null, 32, 22, 66, 0, 160, 300, null, null],
-        [0, "사마망", null, 0, null, 78, 58, 83, 0, 160, 300, null, null],
-        [0, "주이", null, 0, null, 70, 73, 52, 0, 160, 300, null, null],
-        [0, "전단", null, 0, null, 67, 64, 39, 0, 160, 300, null, null],
-        [0, "조우", null, 0, null, 50, 43, 37, 0, 160, 300, null, null],
-        [0, "조상", null, 0, null, 39, 33, 30, 0, 160, 300, null, null],
-        [0, "조방", null, 0, null, 20, 14, 27, 0, 160, 300, null, null],
-        [0, "태사향", null, 0, null, 57, 66, 48, 0, 160, 300, null, null],
-        [0, "장휴", null, 0, null, 63, 27, 74, 0, 160, 300, null, null],
-        [0, "장호", null, 0, null, 75, 74, 51, 0, 160, 300, null, null],
-        [0, "조광", null, 0, null, 67, 71, 53, 0, 160, 300, null, null],
-        [0, "장집", null, 0, null, 76, 29, 80, 0, 160, 300, null, null],
-        [0, "장승", null, 0, null, 77, 55, 75, 0, 160, 300, null, null],
-        [0, "장소2", null, 0, null, 23, 56, 31, 0, 160, 300, null, null],
-        [0, "조통", null, 0, null, 68, 67, 46, 0, 160, 300, null, null],
-        [0, "진표", null, 0, null, 66, 42, 74, 0, 160, 300, null, null],
-        [0, "정무", null, 0, null, 56, 35, 75, 0, 160, 300, null, null],
-        [0, "정봉2", null, 0, null, 66, 66, 46, 0, 160, 300, null, null],
-        [0, "전만", null, 0, null, 51, 73, 39, 0, 160, 300, null, null],
-        [0, "마균", null, 0, null, 22, 17, 71, 0, 160, 300, null, null],
-        [0, "방회", null, 0, null, 69, 75, 49, 0, 160, 300, null, null],
-        [0, "낙통", null, 0, null, 76, 58, 75, 0, 160, 300, null, null],
-        [0, "육개", null, 0, null, 65, 61, 79, 0, 160, 300, null, null],
-        [0, "유찬", null, 0, null, 78, 81, 59, 0, 160, 300, null, null],
-        [0, "유소", null, 0, null, 68, 53, 74, 0, 160, 300, null, null],
-        [0, "요립", null, 0, null, 32, 15, 76, 0, 160, 300, null, null],
-        [0, "여거", null, 0, null, 78, 51, 71, 0, 160, 300, null, null],
-        [0, "제갈첨", null, 0, null, 70, 57, 76, 0, 160, 300, null, null],
-        [0, "손휴", null, 0, null, 57, 42, 78, 0, 160, 300, null, null],
-        [0, "극정", null, 0, null, 42, 23, 68, 0, 160, 300, null, null],
-        [0, "호분", null, 0, null, 71, 76, 50, 0, 160, 300, null, null],
-        [0, "손량", null, 0, null, 32, 26, 70, 0, 160, 300, null, null],
-        [0, "마막", null, 0, null, 34, 12, 44, 0, 160, 300, null, null],
-        [0, "손호", null, 0, null, 41, 73, 71, 0, 160, 300, null, null],
-        [0, "조모", null, 0, null, 54, 61, 59, 0, 160, 300, null, null],
-        [0, "조환", null, 0, null, 30, 28, 30, 0, 160, 300, null, null],
-        [0, "사마유", null, 0, null, 71, 54, 75, 0, 160, 300, null, null],
-        [0, "제갈상", null, 0, null, 64, 79, 62, 0, 160, 300, null, null],
-        [0, "손화", null, 0, null, 31, 39, 68, 0, 160, 300, null, null],
-        [0, "염우", null, 0, null, 52, 61, 51, 0, 160, 300, null, null],
-        [0, "왕경", null, 0, null, 67, 49, 71, 0, 160, 300, null, null],
-        [0, "왕혼", null, 0, null, 74, 71, 50, 0, 160, 300, null, null],
-        [0, "곽혁", null, 0, null, 33, 29, 70, 0, 160, 300, null, null],
-        [0, "가범", null, 0, null, 60, 50, 73, 0, 160, 300, null, null],
-        [0, "서질", null, 0, null, 68, 83, 24, 0, 160, 300, null, null],
-        [0, "손준", null, 0, null, 64, 70, 48, 0, 160, 300, null, null],
-        [0, "손침", null, 0, null, 58, 55, 65, 0, 160, 300, null, null],
-        [0, "우사", null, 0, null, 61, 34, 74, 0, 160, 300, null, null],
-        [0, "진건", null, 0, null, 72, 71, 50, 0, 160, 300, null, null],
-        [0, "동궐", null, 0, null, 65, 59, 76, 0, 160, 300, null, null],
-        [0, "당자", null, 0, null, 61, 71, 50, 0, 160, 300, null, null],
-        [0, "등충", null, 0, null, 76, 80, 59, 0, 160, 300, null, null],
-        [0, "황숭", null, 0, null, 67, 50, 72, 0, 160, 300, null, null],
-        [0, "화핵", null, 0, null, 20, 24, 71, 0, 160, 300, null, null],
-        [0, "허의", null, 0, null, 51, 74, 15, 0, 160, 300, null, null],
-        [0, "송겸", null, 0, null, 66, 78, 42, 0, 160, 300, null, null],
-        [0, "호제", null, 0, null, 57, 39, 68, 0, 160, 300, null, null],
-        [0, "나헌", null, 0, null, 86, 62, 82, 0, 160, 300, null, null],
-        [0, "노숙2", null, 0, null, 73, 53, 74, 0, 160, 300, null, null],
-        [0, "구성", null, 0, null, 63, 70, 38, 0, 160, 300, null, null],
-        [0, "어부라", null, 0, null, 72, 68, 21, 0, 160, 300, null, null],
-        [0, "아하소과", null, 0, null, 61, 76, 13, 0, 160, 300, null, null],
-        [0, "가비능", null, 0, null, 77, 69, 52, 0, 160, 300, null, null],
-        [0, "구력거", null, 0, null, 80, 68, 50, 0, 160, 300, null, null],
-        [0, "강단", null, 0, null, 65, 83, 48, 0, 160, 300, null, null],
-        [0, "황란", null, 0, null, 63, 75, 44, 0, 160, 300, null, null],
-        [0, "호주천", null, 0, null, 70, 71, 40, 0, 160, 300, null, null],
-        [0, "종리목", null, 0, null, 84, 61, 82, 0, 160, 300, null, null],
-        [0, "제갈교", null, 0, null, 62, 27, 75, 0, 160, 300, null, null],
-        [0, "답돈", null, 0, null, 84, 82, 61, 0, 160, 300, null, null],
-        [0, "반임", null, 0, null, 66, 79, 38, 0, 160, 300, null, null],
-        [0, "보도근", null, 0, null, 64, 73, 50, 0, 160, 300, null, null],
-        [0, "미당대왕", null, 0, null, 59, 69, 21, 0, 160, 300, null, null],
-        [0, "유표2", null, 0, null, 73, 74, 48, 0, 160, 300, null, null],
-        [0, "루반", null, 0, null, 65, 76, 39, 0, 160, 300, null, null],
-        [0, "손관", null, 0, null, 72, 78, 51, 0, 160, 300, null, null],
-        [0, "곽석", null, 0, null, 59, 71, 48, 0, 160, 300, null, null],
-        [0, "주조", null, 0, null, 63, 68, 26, 0, 160, 300, null, null],
-        [0, "장거", null, 0, null, 79, 75, 56, 0, 160, 300, null, null],
-        [0, "장순", null, 0, null, 73, 81, 60, 0, 160, 300, null, null],
-        [0, "철리길", null, 0, null, 77, 70, 52, 0, 160, 300, null, null],
-        [0, "주삭", null, 0, null, 54, 60, 50, 0, 160, 300, null, null],
-        [0, "황월영", null, 0, null, 46, 33, 78, 0, 160, 300, null, null],
-        [0, "채염", null, 0, null, 42, 26, 82, 0, 160, 300, null, null],
-        [0, "소교", null, 0, null, 23, 15, 78, 0, 160, 300, null, null],
-        [0, "신헌영", null, 0, null, 65, 35, 90, 0, 160, 300, null, null],
-        [0, "손상향", null, 0, null, 72, 79, 55, 0, 160, 300, null, null],
-        [0, "대교", null, 0, null, 22, 30, 78, 0, 160, 300, null, null],
-        [0, "초선", null, 0, null, 12, 22, 71, 0, 160, 300, null, null],
-        [0, "교모", null, 0, null, 54, 45, 69, 0, 160, 300, null, null],
-        [0, "관구수", null, 0, null, 58, 62, 33, 0, 160, 300, null, null],
-        [0, "관구전", null, 0, null, 63, 47, 69, 0, 160, 300, null, null],
-        [0, "원유", null, 0, null, 56, 40, 73, 0, 160, 300, null, null],
-        [0, "왕광", null, 0, null, 65, 41, 61, 0, 160, 300, null, null],
-        [0, "신창", null, 0, null, 50, 26, 42, 0, 160, 300, null, null],
-        [0, "사마주", null, 0, null, 61, 40, 61, 0, 160, 300, null, null],
-        [0, "양제", null, 0, null, 67, 49, 71, 0, 160, 300, null, null],
-        [0, "성만", null, 0, null, 61, 68, 46, 0, 160, 300, null, null],
-        [0, "오연", null, 0, null, 66, 73, 42, 0, 160, 300, null, null],
-        [0, "맹충", null, 0, null, 47, 28, 72, 0, 160, 300, null, null],
-        [0, "잠혼", null, 0, null, 1, 1, 22, 0, 160, 300, null, null],
-        [0, "사정", null, 0, null, 64, 76, 34, 0, 160, 300, null, null],
-        [0, "심영", null, 0, null, 70, 77, 55, 0, 160, 300, null, null],
-        [0, "도준", null, 0, null, 65, 66, 46, 0, 160, 300, null, null],
-        [0, "만욱", null, 0, null, 21, 25, 71, 0, 160, 300, null, null],
-        [0, "오언", null, 0, null, 76, 81, 59, 0, 160, 300, null, null],
-        [0, "위막", null, 0, null, 57, 62, 59, 0, 160, 300, null, null],
-        [0, "시삭", null, 0, null, 38, 65, 47, 0, 160, 300, null, null],
-        [0, "전속", null, 0, null, 47, 60, 55, 0, 160, 300, null, null],
-        [0, "장화", null, 0, null, 36, 27, 78, 0, 160, 300, null, null],
-        [0, "오거", null, 0, null, 49, 61, 23, 0, 160, 300, null, null],
-        [0, "추정", null, 0, null, 70, 46, 66, 0, 160, 300, null, null],
-        [0, "장특", null, 0, null, 73, 54, 75, 0, 160, 300, null, null],
-        [0, "곽마", null, 0, null, 68, 71, 47, 0, 160, 300, null, null],
-        [0, "석포", null, 0, null, 69, 71, 49, 0, 160, 300, null, null],
-        [0, "견홍", null, 0, null, 70, 74, 53, 0, 160, 300, null, null],
-        [0, "한거자", null, 0, null, 51, 59, 51, 0, 160, 300, null, null],
-        [0, "휴원진", null, 0, null, 52, 68, 45, 0, 160, 300, null, null],
-        [0, "곽원", null, 0, null, 66, 73, 36, 0, 160, 300, null, null],
-        [0, "계옹", null, 0, null, 63, 52, 33, 0, 160, 300, null, null],
-        [0, "이부", null, 0, null, 31, 36, 74, 0, 160, 300, null, null],
-        [0, "왕업", null, 0, null, 33, 6, 35, 0, 160, 300, null, null],
-        [0, "좌혁", null, 0, null, 62, 66, 51, 0, 160, 300, null, null],
-        [0, "화타", null, 0, null, 57, 25, 73, 0, 160, 300, null, null],
-        [0, "사마휘", null, 0, null, 55, 26, 82, 0, 160, 300, null, null],
-        [0, "우길", null, 0, null, 23, 15, 90, 0, 160, 300, null, null],
-        [0, "헌제", null, 0, null, 22, 18, 68, 0, 160, 300, null, null],
-        [0, "백기", null, 0, null, 100, 88, 69, 0, 160, 300, null, null],
-        [0, "한신", null, 0, null, 100, 74, 95, 0, 160, 300, null, null],
-        [0, "악비", null, 0, null, 99, 91, 71, 0, 160, 300, null, null],
-        [0, "항적", null, 0, null, 99, 100, 65, 0, 160, 300, null, null],
-        [0, "악의", null, 0, null, 98, 75, 96, 0, 160, 300, null, null],
-        [0, "영정", null, 0, null, 97, 55, 92, 0, 160, 300, null, null],
-        [0, "강상", null, 0, null, 94, 49, 100, 0, 160, 300, null, null],
-        [0, "전단2", null, 0, null, 96, 75, 95, 0, 160, 300, null, null],
-        [0, "이목", null, 0, null, 96, 69, 88, 0, 160, 300, null, null],
-        [0, "염파", null, 0, null, 97, 96, 75, 0, 160, 300, null, null],
-        [0, "왕전", null, 0, null, 94, 64, 83, 0, 160, 300, null, null],
-        [0, "오기", null, 0, null, 94, 66, 95, 0, 160, 300, null, null],
-        [0, "곽거병", null, 0, null, 93, 92, 53, 0, 160, 300, null, null],
-        [0, "영포", null, 0, null, 82, 91, 54, 0, 160, 300, null, null],
-        [0, "이신", null, 0, null, 81, 88, 63, 0, 160, 300, null, null],
-        [0, "몽념", null, 0, null, 87, 86, 65, 0, 160, 300, null, null],
-        [0, "전기", null, 0, null, 80, 85, 44, 0, 160, 300, null, null],
-        [0, "극신", null, 0, null, 76, 83, 42, 0, 160, 300, null, null],
-        [0, "항연", null, 0, null, 89, 80, 61, 0, 160, 300, null, null],
-        [0, "인상여", null, 0, null, 69, 38, 96, 0, 160, 300, null, null],
-        [0, "장자방", null, 0, null, 72, 40, 100, 0, 160, 300, null, null],
-        [0, "관이오", null, 0, null, 85, 64, 99, 0, 160, 300, null, null],
-        [0, "손빈", null, 0, null, 83, 22, 98, 0, 160, 300, null, null],
-        [0, "소진", null, 0, null, 90, 47, 96, 0, 160, 300, null, null],
-        [0, "범증", null, 0, null, 68, 24, 94, 0, 160, 300, null, null],
-        [0, "장의2", null, 0, null, 75, 23, 93, 0, 160, 300, null, null],
-        [0, "공구", null, 0, null, 68, 70, 91, 0, 160, 300, null, null],
-        [0, "소하", null, 0, null, 56, 27, 97, 0, 160, 300, null, null],
-        [0, "한비", null, 0, null, 49, 18, 97, 0, 160, 300, null, null],
-        [0, "이사", null, 0, null, 48, 24, 95, 0, 160, 300, null, null],
-        [0, "전문", null, 0, null, 79, 67, 89, 0, 160, 300, null, null],
-        [0, "황헐", null, 0, null, 81, 68, 88, 0, 160, 300, null, null],
-        [0, "방난", null, 0, null, 88, 95, 66, 0, 160, 300, null, null],
-        [0, "개섭", null, 0, null, 43, 97, 54, 0, 160, 300, null, null],
-        [0, "형가", null, 0, null, 42, 89, 43, 0, 160, 300, null, null],
-        [0, "유방", null, 0, null, 90, 66, 85, 0, 160, 300, null, null],
-        [0, "하리", null, 0, null, 95, 95, 65, 0, 160, 300, null, null],
-        [0, "헹이", null, 0, null, 95, 62, 90, 0, 160, 300, null, null],
-        [0, "나나", null, 0, null, 91, 52, 93, 0, 160, 300, null, null],
-        [0, "장임2", null, 0, null, 90, 92, 55, 0, 160, 300, null, null],
-        [0, "하야미", null, 0, null, 92, 57, 92, 0, 160, 300, null, null],
-        [0, "이시리스", null, 0, null, 93, 59, 92, 0, 160, 300, null, null],
-        [0, "연채홍", null, 0, null, 91, 52, 91, 0, 160, 300, null, null],
-        [0, "임사영", null, 0, null, 40, 40, 40, 0, 160, 300, null, null],
-        [0, "장군보", null, 0, null, 90, 90, 53, 0, 160, 300, null, null],
-        [0, "크렌스", null, 0, null, 91, 91, 56, 0, 160, 300, null, null],
-        [0, "콘", null, 0, null, 91, 92, 56, 0, 160, 300, null, null],
-        [0, "리즈나", null, 0, null, 90, 56, 90, 0, 160, 300, null, null],
-        [0, "오티누스", null, 0, null, 92, 91, 56, 0, 160, 300, null, null],
-        [0, "네시", null, 0, null, 91, 57, 93, 0, 160, 300, null, null, "안 자고 싸우면 이겨요"],
-        [0, "시뉴카린", null, 0, null, 95, 90, 52, 0, 160, 300, null, null, "피리피리~"],
-        [0, "Hide_D", null, 0, null, 92, 60, 95, 0, 160, 300, null, null],
-        [0, "Pray", null, 0, null, 90, 92, 54, 0, 160, 300, null, null],
-        [0, "사스케", null, 0, null, 91, 94, 54, 0, 160, 300, null, null],
-        [0, "SARS", null, 0, null, 91, 61, 92, 0, 160, 300, null, null],
-        [0, "마요이", null, 0, null, 92, 53, 93, 0, 160, 300, null, null, "로열방 없습니다"],
-        [0, "세정", null, 0, null, 90, 92, 60, 0, 160, 300, null, null],
-        [0, "김나영", null, 0, null, 93, 90, 60, 0, 160, 300, null, null],
-        [0, "독구", null, 0, null, 95, 91, 62, 0, 160, 300, null, null, "웃자 ^-^"],
-        [0, "천괴금", null, 0, null, 33, 66, 99, 0, 160, 300, null, null],
-        [0, "관지평", null, 0, null, 90, 91, 52, 0, 160, 300, null, null, "농장팬티강도소녀!"],
-        [0, "모니카", null, 0, null, 90, 60, 93, 0, 160, 300, null, null, "론조.."],
-        [0, "카리야", null, 0, null, 93, 58, 95, 0, 160, 300, null, null, "깡!"],
-        [0, "rwitch", null, 0, null, 90, 52, 90, 0, 160, 300, null, null],
-        [0, "카류", null, 0, null, 92, 53, 92, 0, 160, 300, null, null],
-        [0, "갈근", null, 0, null, 94, 54, 94, 0, 160, 300, null, null],
-        [0, "페이트", null, 0, null, 92, 59, 90, 0, 160, 300, null, null],
-        [0, "앵벌스", null, 0, null, 94, 91, 57, 0, 160, 300, null, null, "다람쥐는 위대하고 그 외에 다른 설치류는 없다"],
-        [0, "조밧", null, 0, null, 91, 93, 53, 0, 160, 300, null, null],
-        [0, "슬라임", null, 0, null, 90, 56, 93, 0, 160, 300, null, null],
-        [0, "제노에이지", null, 0, null, 93, 61, 93, 0, 160, 300, null, null],
-        [0, "평민킬러", null, 0, null, 95, 92, 55, 0, 160, 300, null, null],
-        [0, "아유", null, 0, null, 91, 54, 92, 0, 160, 300, null, null],
-        [0, "로리", null, 0, null, 92, 55, 92, 0, 160, 300, null, null],
-        [0, "n아텐 누", null, 0, null, 92, 55, 92, 0, 160, 300, null, null],
-        [0, "Card", null, 0, null, 91, 90, 59, 0, 160, 300, null, null],
-        [0, "Per", null, 0, null, 93, 57, 90, 0, 160, 300, null, null],
-        [0, "아쉐리트", null, 0, null, 94, 55, 90, 0, 160, 300, null, null],
-        [0, "외심장", null, 0, null, 91, 57, 92, 0, 160, 300, null, null],
-        [0, "카이스트", null, 0, null, 91, 53, 93, 0, 160, 300, null, null],
-        [0, "아키라", null, 0, null, 80, 50, 80, 0, 160, 300, null, null, "뻐끔뻐끔"],
-        [0, "카오스피닉스", null, 0, null, 93, 58, 92, 0, 160, 300, null, null, "=ㅁ="],
-        [0, "민트토끼", null, 0, null, 92, 54, 90, 0, 160, 300, null, null, "나 바보 아니다!"],
-        [0, "くま", null, 0, null, 90, 92, 57, 0, 160, 300, null, null],
-        [0, "북오더", null, 0, null, 91, 58, 92, 0, 160, 300, null, null],
-        [0, "이쓰미", null, 0, null, 92, 58, 91, 0, 160, 300, null, null],
-        [0, "개미호랑이", null, 0, null, 91, 55, 92, 0, 160, 300, null, null],
-        [0, "수장", null, 0, null, 93, 57, 91, 0, 160, 300, null, null],
-        [0, "이드", null, 0, null, 92, 93, 53, 0, 160, 300, null, null],
-        [0, "호무새", null, 0, null, 91, 53, 91, 0, 160, 300, null, null, "호우~"],
-        [0, "박일아", null, 0, null, 93, 59, 93, 0, 160, 300, null, null],
-        [0, "유기체", null, 0, null, 92, 56, 95, 0, 160, 300, null, null, "흠... 그렇다면 어쩔 수 없이 흉노로 가야겠군요..."],
-        [0, "황약사", null, 0, null, 92, 92, 60, 0, 160, 300, null, null],
-        [0, "하후연묘재", null, 0, null, 92, 52, 95, 0, 160, 300, null, null],
-        [0, "초절정미녀", null, 0, null, 95, 65, 95, 0, 160, 300, null, null],
-        [0, "제갈여포", null, 0, null, 92, 54, 91, 0, 160, 300, null, null],
-        [0, "온몸이근육", null, 0, null, 93, 93, 52, 0, 160, 300, null, null, "불끈불끈"],
-        [0, "네이미", null, 0, null, 91, 93, 56, 0, 160, 300, null, null],
-        [0, "ARES군주", null, 0, null, 90, 93, 55, 0, 160, 300, null, null],
-        [0, "중달", null, 0, null, 93, 92, 56, 0, 160, 300, null, null],
-        [0, "쿠레나이", null, 0, null, 90, 52, 90, 0, 160, 300, null, null],
-        [0, "만샘", null, 0, null, 92, 55, 92, 0, 160, 300, null, null],
-        [0, "우돌", null, 0, null, 93, 91, 53, 0, 160, 300, null, null],
-        [0, "아이린", null, 0, null, 93, 54, 90, 0, 160, 300, null, null],
-        [0, "유카", null, 0, null, 91, 92, 57, 0, 160, 300, null, null],
-        [0, "기", null, 0, null, 95, 90, 52, 0, 160, 300, null, null],
-        [0, "병리학적자세", null, 0, null, 91, 55, 93, 0, 160, 300, null, null],
-        [0, "료우기시키", null, 0, null, 92, 90, 53, 0, 160, 300, null, null],
-        [0, "Cure", null, 0, null, 92, 92, 55, 0, 160, 300, null, null],
-        [0, "40장로", null, 0, null, 85, 85, 85, 0, 160, 300, null, null]
-    ],
-    "initialEvents":[
-
-    ],
-    "events":[
-        [
-            "destroy_nation", 1000,
-            ["and",
-                ["Date", ">=", 183, 1],
-                ["RemainNation", "==", 1]
-            ],
-            ["BlockScoutAction"],
-            ["DeleteEvent"]
-        ]
-
-    ]
-}

hwe/scenario/scenario_2501.json

@@ -1,915 +0,0 @@
-{
-    "title": "【가상모드25-b】 악질유저무쌍!(비급)",
-    "startYear": 180,
-    "history": [
-        "<C>●</>180년 1월:<L><b>【가상모드25-b】</b>악질유저무쌍!(비급)</>",
-        "<C>●</>180년 1월:<L><b>【이벤트】</b></>최고의 악질유저를 가려라!"
-    ],
-    "stat": {
-        "total": 310,
-        "min": 40,
-        "max": 140
-    },
-    "iconPath": ".",
-    "fiction": 1,
-    "nation":[
-
-    ],
-    "diplomacy":[],
-    "const": {
-        "npcBanMessageProb":0,
-        "npcSeizureMessageProb":0,
-        "npcMessageFreqByDay":8,
-        "availableSpecialWar": [
-            "che_귀병", "che_신산", "che_환술", "che_집중", "che_신중", "che_반계",
-            "che_보병", "che_궁병", "che_기병", "che_공성",
-            "che_돌격", "che_무쌍", "che_견고", "che_위압",
-            "che_저격", "che_필살", "che_징병", "che_의술", "che_격노", "che_척사"
-        ],
-        "allItems": {
-            "horse": {
-                "che_명마_01_노기": 0,
-                "che_명마_02_조랑": 0,
-                "che_명마_03_노새": 0,
-                "che_명마_04_나귀": 0,
-                "che_명마_05_갈색마": 0,
-                "che_명마_06_흑색마": 0,
-
-                "che_명마_07_백마" : 2,
-                "che_명마_07_기주마" : 2,
-                "che_명마_07_오환마" : 2,
-                "che_명마_07_백상" : 2,
-                "che_명마_08_양주마" : 2,
-                "che_명마_08_흉노마" : 2,
-                "che_명마_09_과하마" : 2,
-                "che_명마_09_의남백마" : 2,
-                "che_명마_10_대완마" : 2,
-                "che_명마_10_옥추마" : 2,
-                "che_명마_11_서량마" : 2,
-                "che_명마_11_화종마" : 2,
-                "che_명마_12_사륜거" : 2,
-                "che_명마_12_옥란백용구": 2,
-                "che_명마_13_절영" : 2,
-                "che_명마_13_적로" : 2,
-                "che_명마_14_적란마" : 2,
-                "che_명마_14_조황비전" : 2,
-                "che_명마_15_한혈마" : 2,
-                "che_명마_15_적토마" : 2
-            },
-            "weapon": {
-                "che_무기_01_단도": 0,
-                "che_무기_02_단궁": 0,
-                "che_무기_03_단극": 0,
-                "che_무기_04_목검": 0,
-                "che_무기_05_죽창": 0,
-                "che_무기_06_소부": 0,
-
-                "che_무기_07_동추": 2,
-                "che_무기_07_철편": 2,
-                "che_무기_07_철쇄": 2,
-                "che_무기_07_맥궁": 2,
-                "che_무기_08_유성추": 2,
-                "che_무기_08_철질여골": 2,
-                "che_무기_09_쌍철극": 2,
-                "che_무기_09_동호비궁": 2,
-                "che_무기_10_삼첨도": 2,
-                "che_무기_10_대부": 2,
-                "che_무기_11_고정도": 2,
-                "che_무기_11_이광궁": 2,
-                "che_무기_12_철척사모": 2,
-                "che_무기_12_칠성검": 2,
-                "che_무기_13_사모": 2,
-                "che_무기_13_양유기궁": 2,
-                "che_무기_14_언월도": 2,
-                "che_무기_14_방천화극": 2,
-                "che_무기_15_청홍검": 2,
-                "che_무기_15_의천검": 2
-            },
-            "book": {
-                "che_서적_01_효경전": 0,
-                "che_서적_02_회남자": 0,
-                "che_서적_03_변도론": 0,
-                "che_서적_04_건상역주": 0,
-                "che_서적_05_여씨춘추": 0,
-                "che_서적_06_사민월령": 0,
-
-                "che_서적_07_위료자": 2,
-                "che_서적_07_사마법": 2,
-                "che_서적_07_한서": 2,
-                "che_서적_07_논어": 2,
-                "che_서적_08_전론": 2,
-                "che_서적_08_사기": 2,
-                "che_서적_09_장자": 2,
-                "che_서적_09_역경": 2,
-                "che_서적_10_시경": 2,
-                "che_서적_10_구국론": 2,
-                "che_서적_11_상군서": 2,
-                "che_서적_11_춘추전": 2,
-                "che_서적_12_산해경": 2,
-                "che_서적_12_맹덕신서": 2,
-                "che_서적_13_관자": 2,
-                "che_서적_13_병법24편": 2,
-                "che_서적_14_한비자": 2,
-                "che_서적_14_오자병법": 2,
-                "che_서적_15_노자": 2,
-                "che_서적_15_손자병법": 2
-            },
-            "item": {
-                "che_치료_환약": 0,
-                "che_저격_수극": 0,
-                "che_사기_탁주": 0,
-                "che_훈련_청주": 0,
-                "che_계략_이추": 0,
-                "che_계략_향낭": 0,
-
-                "event_전투특기_격노": 0,
-                "event_전투특기_견고": 0,
-                "event_전투특기_공성": 0,
-                "event_전투특기_궁병": 0,
-                "event_전투특기_귀병": 0,
-                "event_전투특기_기병": 0,
-                "event_전투특기_돌격": 0,
-                "event_전투특기_무쌍": 0,
-                "event_전투특기_반계": 0,
-                "event_전투특기_보병": 0,
-                "event_전투특기_신산": 0,
-                "event_전투특기_신중": 0,
-                "event_전투특기_위압": 0,
-                "event_전투특기_의술": 0,
-                "event_전투특기_저격": 0,
-                "event_전투특기_집중": 0,
-                "event_전투특기_징병": 0,
-                "event_전투특기_척사": 0,
-                "event_전투특기_필살": 0,
-                "event_전투특기_환술": 0
-            }
-        }
-    },
-    "general":[
-        [0, "아회남", null, 0, null, 65, 74, 26, 0, 160, 300, null, null],
-        [0, "이적", null, 0, null, 40, 24, 84, 0, 160, 300, null, null],
-        [0, "윤상", null, 0, null, 51, 44, 62, 0, 160, 300, null, null],
-        [0, "윤묵", null, 0, null, 26, 15, 66, 0, 160, 300, null, null],
-        [0, "우금", null, 0, null, 85, 82, 62, 0, 160, 300, null, null],
-        [0, "위관", null, 0, null, 69, 46, 79, 0, 160, 300, null, null],
-        [0, "원윤", null, 0, null, 32, 14, 39, 0, 160, 300, null, null],
-        [0, "원희", null, 0, null, 66, 43, 63, 0, 160, 300, null, null],
-        [0, "염행", null, 0, null, 78, 90, 58, 0, 160, 300, null, null],
-        [0, "염유", null, 0, null, 71, 50, 71, 0, 160, 300, null, null],
-        [0, "원술", null, 0, null, 76, 55, 75, 0, 160, 300, null, null],
-        [0, "원상", null, 0, null, 63, 75, 42, 0, 160, 300, null, null],
-        [0, "원소", null, 0, null, 90, 62, 81, 0, 160, 300, null, null],
-        [0, "염상", null, 0, null, 40, 27, 71, 0, 160, 300, null, null],
-        [0, "원담", null, 0, null, 60, 78, 30, 0, 160, 300, null, null],
-        [0, "염포", null, 0, null, 40, 25, 82, 0, 160, 300, null, null],
-        [0, "왕위", null, 0, null, 60, 70, 48, 0, 160, 300, null, null],
-        [0, "왕윤", null, 0, null, 26, 6, 68, 0, 160, 300, null, null],
-        [0, "왕항", null, 0, null, 76, 43, 61, 0, 160, 300, null, null],
-        [0, "왕찬", null, 0, null, 15, 3, 79, 0, 160, 300, null, null],
-        [0, "왕수", null, 0, null, 54, 27, 77, 0, 160, 300, null, null],
-        [0, "왕숙", null, 0, null, 36, 22, 76, 0, 160, 300, null, null],
-        [0, "왕준", null, 0, null, 85, 64, 84, 0, 160, 300, null, null],
-        [0, "왕쌍", null, 0, null, 67, 88, 19, 0, 160, 300, null, null],
-        [0, "왕창", null, 0, null, 74, 57, 79, 0, 160, 300, null, null],
-        [0, "왕평", null, 0, null, 88, 81, 61, 0, 160, 300, null, null],
-        [0, "왕보", null, 0, null, 62, 41, 79, 0, 160, 300, null, null],
-        [0, "왕문", null, 0, null, 65, 64, 31, 0, 160, 300, null, null],
-        [0, "왕릉", null, 0, null, 74, 50, 71, 0, 160, 300, null, null],
-        [0, "왕루", null, 0, null, 28, 30, 79, 0, 160, 300, null, null],
-        [0, "왕랑", null, 0, null, 47, 35, 79, 0, 160, 300, null, null],
-        [0, "온회", null, 0, null, 62, 36, 74, 0, 160, 300, null, null],
-        [0, "하안", null, 0, null, 15, 30, 72, 0, 160, 300, null, null],
-        [0, "괴월", null, 0, null, 50, 38, 85, 0, 160, 300, null, null],
-        [0, "괴량", null, 0, null, 68, 33, 88, 0, 160, 300, null, null],
-        [0, "가화", null, 0, null, 49, 65, 41, 0, 160, 300, null, null],
-        [0, "가규", null, 0, null, 78, 61, 84, 0, 160, 300, null, null],
-        [0, "하의", null, 0, null, 56, 69, 36, 0, 160, 300, null, null],
-        [0, "화흠", null, 0, null, 51, 33, 88, 0, 160, 300, null, null],
-        [0, "가후", null, 0, null, 71, 40, 98, 0, 160, 300, null, null],
-        [0, "곽가", null, 0, null, 70, 41, 97, 0, 160, 300, null, null],
-        [0, "악환", null, 0, null, 65, 80, 42, 0, 160, 300, null, null],
-        [0, "곽사", null, 0, null, 64, 76, 13, 0, 160, 300, null, null],
-        [0, "악취", null, 0, null, 53, 66, 61, 0, 160, 300, null, null],
-        [0, "곽준", null, 0, null, 73, 52, 73, 0, 160, 300, null, null],
-        [0, "학소", null, 0, null, 88, 63, 83, 0, 160, 300, null, null],
-        [0, "악진", null, 0, null, 80, 85, 56, 0, 160, 300, null, null],
-        [0, "곽도", null, 0, null, 62, 50, 82, 0, 160, 300, null, null],
-        [0, "학맹", null, 0, null, 62, 67, 42, 0, 160, 300, null, null],
-        [0, "곽유지", null, 0, null, 28, 9, 69, 0, 160, 300, null, null],
-        [0, "곽익", null, 0, null, 73, 69, 69, 0, 160, 300, null, null],
-        [0, "곽회", null, 0, null, 90, 66, 85, 0, 160, 300, null, null],
-        [0, "하후위", null, 0, null, 71, 73, 49, 0, 160, 300, null, null],
-        [0, "하후연", null, 0, null, 95, 92, 72, 0, 160, 300, null, null],
-        [0, "하후은", null, 0, null, 63, 72, 53, 0, 160, 300, null, null],
-        [0, "하후화", null, 0, null, 48, 51, 71, 0, 160, 300, null, null],
-        [0, "하후혜", null, 0, null, 50, 44, 76, 0, 160, 300, null, null],
-        [0, "하후현", null, 0, null, 54, 39, 76, 0, 160, 300, null, null],
-        [0, "하후상", null, 0, null, 79, 55, 75, 0, 160, 300, null, null],
-        [0, "하후덕", null, 0, null, 69, 73, 32, 0, 160, 300, null, null],
-        [0, "하후돈", null, 0, null, 91, 88, 68, 0, 160, 300, null, null],
-        [0, "하후패", null, 0, null, 79, 85, 63, 0, 160, 300, null, null],
-        [0, "하후무", null, 0, null, 20, 7, 4, 0, 160, 300, null, null],
-        [0, "가충", null, 0, null, 54, 31, 89, 0, 160, 300, null, null],
-        [0, "하진", null, 0, null, 68, 54, 75, 0, 160, 300, null, null],
-        [0, "화웅", null, 0, null, 78, 90, 55, 0, 160, 300, null, null],
-        [0, "한윤", null, 0, null, 26, 29, 65, 0, 160, 300, null, null],
-        [0, "관우", null, 0, null, 96, 99, 76, 0, 160, 300, null, null],
-        [0, "환계", null, 0, null, 25, 26, 68, 0, 160, 300, null, null],
-        [0, "관해", null, 0, null, 70, 82, 10, 0, 160, 300, null, null],
-        [0, "관구검", null, 0, null, 84, 86, 62, 0, 160, 300, null, null],
-        [0, "한현", null, 0, null, 22, 33, 7, 0, 160, 300, null, null],
-        [0, "한호", null, 0, null, 73, 61, 84, 0, 160, 300, null, null],
-        [0, "관흥", null, 0, null, 76, 84, 62, 0, 160, 300, null, null],
-        [0, "관색", null, 0, null, 74, 83, 56, 0, 160, 300, null, null],
-        [0, "한수", null, 0, null, 78, 58, 79, 0, 160, 300, null, null],
-        [0, "한숭", null, 0, null, 25, 15, 71, 0, 160, 300, null, null],
-        [0, "관정", null, 0, null, 36, 52, 73, 0, 160, 300, null, null],
-        [0, "한섬", null, 0, null, 69, 66, 36, 0, 160, 300, null, null],
-        [0, "감택", null, 0, null, 51, 49, 83, 0, 160, 300, null, null],
-        [0, "한충", null, 0, null, 64, 67, 18, 0, 160, 300, null, null],
-        [0, "한당", null, 0, null, 76, 85, 61, 0, 160, 300, null, null],
-        [0, "한덕", null, 0, null, 63, 76, 25, 0, 160, 300, null, null],
-        [0, "감녕", null, 0, null, 92, 95, 74, 0, 160, 300, null, null],
-        [0, "한복", null, 0, null, 28, 3, 27, 0, 160, 300, null, null],
-        [0, "관평", null, 0, null, 78, 82, 60, 0, 160, 300, null, null],
-        [0, "간옹", null, 0, null, 20, 32, 75, 0, 160, 300, null, null],
-        [0, "안량", null, 0, null, 88, 96, 43, 0, 160, 300, null, null],
-        [0, "위연", null, 0, null, 91, 90, 70, 0, 160, 300, null, null],
-        [0, "국의", null, 0, null, 84, 78, 51, 0, 160, 300, null, null],
-        [0, "희지재", null, 0, null, 63, 35, 91, 0, 160, 300, null, null],
-        [0, "위속", null, 0, null, 67, 78, 31, 0, 160, 300, null, null],
-        [0, "위유", null, 0, null, 46, 29, 74, 0, 160, 300, null, null],
-        [0, "우금2", null, 0, null, 72, 79, 38, 0, 160, 300, null, null],
-        [0, "우보", null, 0, null, 38, 60, 21, 0, 160, 300, null, null],
-        [0, "강유", null, 0, null, 92, 72, 93, 0, 160, 300, null, null],
-        [0, "공지", null, 0, null, 43, 53, 62, 0, 160, 300, null, null],
-        [0, "교유", null, 0, null, 64, 69, 38, 0, 160, 300, null, null],
-        [0, "공도", null, 0, null, 59, 70, 23, 0, 160, 300, null, null],
-        [0, "허공", null, 0, null, 44, 66, 64, 0, 160, 300, null, null],
-        [0, "허정", null, 0, null, 23, 5, 68, 0, 160, 300, null, null],
-        [0, "허저", null, 0, null, 74, 97, 36, 0, 160, 300, null, null],
-        [0, "허유", null, 0, null, 36, 21, 80, 0, 160, 300, null, null],
-        [0, "기령", null, 0, null, 85, 84, 51, 0, 160, 300, null, null],
-        [0, "김의", null, 0, null, 32, 38, 65, 0, 160, 300, null, null],
-        [0, "김배삼결", null, 0, null, 64, 76, 19, 0, 160, 300, null, null],
-        [0, "김선", null, 0, null, 52, 68, 13, 0, 160, 300, null, null],
-        [0, "우번", null, 0, null, 46, 46, 87, 0, 160, 300, null, null],
-        [0, "형도영", null, 0, null, 69, 79, 41, 0, 160, 300, null, null],
-        [0, "엄안", null, 0, null, 82, 83, 62, 0, 160, 300, null, null],
-        [0, "엄망", null, 0, null, 68, 71, 40, 0, 160, 300, null, null],
-        [0, "엄준", null, 0, null, 41, 12, 71, 0, 160, 300, null, null],
-        [0, "엄정", null, 0, null, 50, 55, 39, 0, 160, 300, null, null],
-        [0, "엄백호", null, 0, null, 67, 70, 42, 0, 160, 300, null, null],
-        [0, "엄여", null, 0, null, 61, 78, 44, 0, 160, 300, null, null],
-        [0, "오의", null, 0, null, 79, 73, 53, 0, 160, 300, null, null],
-        [0, "황개", null, 0, null, 80, 86, 64, 0, 160, 300, null, null],
-        [0, "고간", null, 0, null, 74, 56, 38, 0, 160, 300, null, null],
-        [0, "황권", null, 0, null, 75, 59, 88, 0, 160, 300, null, null],
-        [0, "고유", null, 0, null, 57, 43, 72, 0, 160, 300, null, null],
-        [0, "고순", null, 0, null, 87, 89, 60, 0, 160, 300, null, null],
-        [0, "고상", null, 0, null, 68, 68, 53, 0, 160, 300, null, null],
-        [0, "고승", null, 0, null, 67, 73, 41, 0, 160, 300, null, null],
-        [0, "후성", null, 0, null, 74, 75, 54, 0, 160, 300, null, null],
-        [0, "후선", null, 0, null, 63, 66, 34, 0, 160, 300, null, null],
-        [0, "황조", null, 0, null, 81, 66, 48, 0, 160, 300, null, null],
-        [0, "공손월", null, 0, null, 74, 72, 47, 0, 160, 300, null, null],
-        [0, "공손연", null, 0, null, 65, 70, 49, 0, 160, 300, null, null],
-        [0, "공손공", null, 0, null, 39, 17, 69, 0, 160, 300, null, null],
-        [0, "공손강", null, 0, null, 72, 66, 46, 0, 160, 300, null, null],
-        [0, "공손찬", null, 0, null, 86, 82, 62, 0, 160, 300, null, null],
-        [0, "공손속", null, 0, null, 63, 68, 46, 0, 160, 300, null, null],
-        [0, "공손도", null, 0, null, 67, 71, 49, 0, 160, 300, null, null],
-        [0, "공손범", null, 0, null, 73, 69, 49, 0, 160, 300, null, null],
-        [0, "황충", null, 0, null, 88, 96, 65, 0, 160, 300, null, null],
-        [0, "고정", null, 0, null, 55, 63, 43, 0, 160, 300, null, null],
-        [0, "고패", null, 0, null, 66, 48, 69, 0, 160, 300, null, null],
-        [0, "황보숭", null, 0, null, 91, 61, 82, 0, 160, 300, null, null],
-        [0, "공융", null, 0, null, 30, 5, 73, 0, 160, 300, null, null],
-        [0, "고람", null, 0, null, 76, 82, 60, 0, 160, 300, null, null],
-        [0, "오경", null, 0, null, 69, 66, 45, 0, 160, 300, null, null],
-        [0, "호거아", null, 0, null, 70, 82, 41, 0, 160, 300, null, null],
-        [0, "호진", null, 0, null, 65, 74, 12, 0, 160, 300, null, null],
-        [0, "올돌골", null, 0, null, 79, 86, 11, 0, 160, 300, null, null],
-        [0, "호반", null, 0, null, 55, 55, 59, 0, 160, 300, null, null],
-        [0, "오반", null, 0, null, 74, 71, 50, 0, 160, 300, null, null],
-        [0, "고옹", null, 0, null, 52, 18, 81, 0, 160, 300, null, null],
-        [0, "오란", null, 0, null, 68, 80, 35, 0, 160, 300, null, null],
-        [0, "채화", null, 0, null, 39, 50, 1, 0, 160, 300, null, null],
-        [0, "채중", null, 0, null, 40, 54, 2, 0, 160, 300, null, null],
-        [0, "채모", null, 0, null, 70, 55, 77, 0, 160, 300, null, null],
-        [0, "착융", null, 0, null, 60, 69, 38, 0, 160, 300, null, null],
-        [0, "사마의", null, 0, null, 99, 63, 98, 0, 160, 300, null, null],
-        [0, "사마염", null, 0, null, 69, 59, 77, 0, 160, 300, null, null],
-        [0, "사마사", null, 0, null, 84, 64, 89, 0, 160, 300, null, null],
-        [0, "사마소", null, 0, null, 85, 57, 88, 0, 160, 300, null, null],
-        [0, "사마부", null, 0, null, 70, 37, 77, 0, 160, 300, null, null],
-        [0, "사마랑", null, 0, null, 20, 21, 72, 0, 160, 300, null, null],
-        [0, "사마가", null, 0, null, 66, 84, 25, 0, 160, 300, null, null],
-        [0, "주흔", null, 0, null, 65, 51, 73, 0, 160, 300, null, null],
-        [0, "주앙", null, 0, null, 74, 65, 48, 0, 160, 300, null, null],
-        [0, "주지", null, 0, null, 73, 85, 41, 0, 160, 300, null, null],
-        [0, "주창", null, 0, null, 68, 77, 42, 0, 160, 300, null, null],
-        [0, "주태", null, 0, null, 84, 90, 48, 0, 160, 300, null, null],
-        [0, "주방", null, 0, null, 52, 41, 80, 0, 160, 300, null, null],
-        [0, "주유", null, 0, null, 97, 71, 97, 0, 160, 300, null, null],
-        [0, "주환", null, 0, null, 87, 84, 64, 0, 160, 300, null, null],
-        [0, "주거", null, 0, null, 77, 57, 72, 0, 160, 300, null, null],
-        [0, "축융", null, 0, null, 72, 75, 35, 0, 160, 300, null, null],
-        [0, "주준", null, 0, null, 89, 57, 76, 0, 160, 300, null, null],
-        [0, "주연", null, 0, null, 86, 75, 57, 0, 160, 300, null, null],
-        [0, "주치", null, 0, null, 71, 56, 72, 0, 160, 300, null, null],
-        [0, "주포", null, 0, null, 68, 73, 34, 0, 160, 300, null, null],
-        [0, "주령", null, 0, null, 78, 73, 53, 0, 160, 300, null, null],
-        [0, "순욱", null, 0, null, 78, 38, 97, 0, 160, 300, null, null],
-        [0, "순우경", null, 0, null, 78, 66, 29, 0, 160, 300, null, null],
-        [0, "순심", null, 0, null, 45, 25, 78, 0, 160, 300, null, null],
-        [0, "순유", null, 0, null, 80, 35, 95, 0, 160, 300, null, null],
-        [0, "장완", null, 0, null, 78, 34, 89, 0, 160, 300, null, null],
-        [0, "종회", null, 0, null, 88, 62, 93, 0, 160, 300, null, null],
-        [0, "장간", null, 0, null, 19, 6, 66, 0, 160, 300, null, null],
-        [0, "장의거", null, 0, null, 71, 41, 59, 0, 160, 300, null, null],
-        [0, "장흠", null, 0, null, 78, 85, 54, 0, 160, 300, null, null],
-        [0, "장제3", null, 0, null, 62, 43, 85, 0, 160, 300, null, null],
-        [0, "초주", null, 0, null, 16, 3, 67, 0, 160, 300, null, null],
-        [0, "초촉", null, 0, null, 65, 76, 33, 0, 160, 300, null, null],
-        [0, "향총", null, 0, null, 76, 56, 77, 0, 160, 300, null, null],
-        [0, "종요", null, 0, null, 79, 24, 90, 0, 160, 300, null, null],
-        [0, "향랑", null, 0, null, 28, 18, 74, 0, 160, 300, null, null],
-        [0, "서영", null, 0, null, 92, 80, 62, 0, 160, 300, null, null],
-        [0, "제갈각", null, 0, null, 72, 47, 90, 0, 160, 300, null, null],
-        [0, "제갈근", null, 0, null, 75, 34, 85, 0, 160, 300, null, null],
-        [0, "제갈균", null, 0, null, 29, 25, 52, 0, 160, 300, null, null],
-        [0, "제갈탄", null, 0, null, 72, 54, 76, 0, 160, 300, null, null],
-        [0, "제갈량", null, 0, null, 98, 43, 100, 0, 160, 300, null, null],
-        [0, "서황", null, 0, null, 95, 94, 74, 0, 160, 300, null, null],
-        [0, "서서", null, 0, null, 85, 64, 94, 0, 160, 300, null, null],
-        [0, "서성", null, 0, null, 86, 81, 61, 0, 160, 300, null, null],
-        [0, "서막", null, 0, null, 55, 32, 68, 0, 160, 300, null, null],
-        [0, "신의", null, 0, null, 55, 59, 60, 0, 160, 300, null, null],
-        [0, "신탐", null, 0, null, 56, 62, 54, 0, 160, 300, null, null],
-        [0, "심배", null, 0, null, 80, 60, 84, 0, 160, 300, null, null],
-        [0, "신비", null, 0, null, 42, 24, 79, 0, 160, 300, null, null],
-        [0, "신평", null, 0, null, 69, 43, 77, 0, 160, 300, null, null],
-        [0, "진복", null, 0, null, 31, 7, 73, 0, 160, 300, null, null],
-        [0, "진랑", null, 0, null, 58, 70, 35, 0, 160, 300, null, null],
-        [0, "휴고", null, 0, null, 63, 71, 38, 0, 160, 300, null, null],
-        [0, "추단", null, 0, null, 61, 64, 34, 0, 160, 300, null, null],
-        [0, "성의", null, 0, null, 74, 72, 41, 0, 160, 300, null, null],
-        [0, "성공영", null, 0, null, 73, 58, 80, 0, 160, 300, null, null],
-        [0, "설종", null, 0, null, 34, 16, 73, 0, 160, 300, null, null],
-        [0, "단경", null, 0, null, 71, 68, 43, 0, 160, 300, null, null],
-        [0, "전종", null, 0, null, 78, 55, 75, 0, 160, 300, null, null],
-        [0, "조예", null, 0, null, 72, 52, 82, 0, 160, 300, null, null],
-        [0, "조휴", null, 0, null, 84, 78, 58, 0, 160, 300, null, null],
-        [0, "송헌", null, 0, null, 68, 77, 38, 0, 160, 300, null, null],
-        [0, "조앙", null, 0, null, 78, 50, 69, 0, 160, 300, null, null],
-        [0, "조홍", null, 0, null, 80, 75, 55, 0, 160, 300, null, null],
-        [0, "조순", null, 0, null, 85, 83, 63, 0, 160, 300, null, null],
-        [0, "조창", null, 0, null, 86, 91, 59, 0, 160, 300, null, null],
-        [0, "조식", null, 0, null, 45, 22, 86, 0, 160, 300, null, null],
-        [0, "조진", null, 0, null, 88, 74, 56, 0, 160, 300, null, null],
-        [0, "조인", null, 0, null, 94, 90, 70, 0, 160, 300, null, null],
-        [0, "조성", null, 0, null, 54, 74, 38, 0, 160, 300, null, null],
-        [0, "조조", null, 0, null, 100, 72, 96, 0, 160, 300, null, null],
-        [0, "조충", null, 0, null, 43, 21, 74, 0, 160, 300, null, null],
-        [0, "장패", null, 0, null, 78, 86, 53, 0, 160, 300, null, null],
-        [0, "조비", null, 0, null, 75, 64, 87, 0, 160, 300, null, null],
-        [0, "조표", null, 0, null, 54, 69, 32, 0, 160, 300, null, null],
-        [0, "저수", null, 0, null, 86, 46, 95, 0, 160, 300, null, null],
-        [0, "소비", null, 0, null, 69, 45, 66, 0, 160, 300, null, null],
-        [0, "조무", null, 0, null, 70, 71, 50, 0, 160, 300, null, null],
-        [0, "손환", null, 0, null, 82, 56, 76, 0, 160, 300, null, null],
-        [0, "손견", null, 0, null, 94, 95, 73, 0, 160, 300, null, null],
-        [0, "손건", null, 0, null, 44, 33, 79, 0, 160, 300, null, null],
-        [0, "손권", null, 0, null, 86, 61, 81, 0, 160, 300, null, null],
-        [0, "손교", null, 0, null, 77, 72, 52, 0, 160, 300, null, null],
-        [0, "손책", null, 0, null, 93, 94, 74, 0, 160, 300, null, null],
-        [0, "손소", null, 0, null, 82, 79, 59, 0, 160, 300, null, null],
-        [0, "손정", null, 0, null, 66, 53, 73, 0, 160, 300, null, null],
-        [0, "손중", null, 0, null, 62, 71, 36, 0, 160, 300, null, null],
-        [0, "손등", null, 0, null, 62, 37, 79, 0, 160, 300, null, null],
-        [0, "손유", null, 0, null, 77, 70, 51, 0, 160, 300, null, null],
-        [0, "손익", null, 0, null, 67, 83, 27, 0, 160, 300, null, null],
-        [0, "손례", null, 0, null, 78, 81, 59, 0, 160, 300, null, null],
-        [0, "태사자", null, 0, null, 94, 94, 72, 0, 160, 300, null, null],
-        [0, "대래동주", null, 0, null, 51, 53, 54, 0, 160, 300, null, null],
-        [0, "대릉", null, 0, null, 70, 75, 39, 0, 160, 300, null, null],
-        [0, "타사대왕", null, 0, null, 62, 48, 70, 0, 160, 300, null, null],
-        [0, "담웅", null, 0, null, 58, 73, 14, 0, 160, 300, null, null],
-        [0, "장윤", null, 0, null, 72, 67, 42, 0, 160, 300, null, null],
-        [0, "조운", null, 0, null, 90, 96, 75, 0, 160, 300, null, null],
-        [0, "장위", null, 0, null, 74, 66, 45, 0, 160, 300, null, null],
-        [0, "장영", null, 0, null, 75, 74, 41, 0, 160, 300, null, null],
-        [0, "장연", null, 0, null, 76, 81, 57, 0, 160, 300, null, null],
-        [0, "장횡", null, 0, null, 59, 70, 23, 0, 160, 300, null, null],
-        [0, "장온", null, 0, null, 32, 10, 72, 0, 160, 300, null, null],
-        [0, "장개", null, 0, null, 34, 66, 8, 0, 160, 300, null, null],
-        [0, "장각", null, 0, null, 87, 35, 90, 0, 160, 300, null, null],
-        [0, "장기", null, 0, null, 74, 35, 76, 0, 160, 300, null, null],
-        [0, "장의", null, 0, null, 79, 55, 75, 0, 160, 300, null, null],
-        [0, "장훈", null, 0, null, 72, 68, 41, 0, 160, 300, null, null],
-        [0, "장굉", null, 0, null, 24, 22, 86, 0, 160, 300, null, null],
-        [0, "장합", null, 0, null, 92, 89, 69, 0, 160, 300, null, null],
-        [0, "조홍2", null, 0, null, 66, 72, 28, 0, 160, 300, null, null],
-        [0, "장제2", null, 0, null, 70, 66, 46, 0, 160, 300, null, null],
-        [0, "장수", null, 0, null, 80, 73, 51, 0, 160, 300, null, null],
-        [0, "장소", null, 0, null, 41, 13, 87, 0, 160, 300, null, null],
-        [0, "장송", null, 0, null, 40, 6, 85, 0, 160, 300, null, null],
-        [0, "장임", null, 0, null, 85, 84, 64, 0, 160, 300, null, null],
-        [0, "장제", null, 0, null, 67, 43, 80, 0, 160, 300, null, null],
-        [0, "장막", null, 0, null, 52, 53, 71, 0, 160, 300, null, null],
-        [0, "조범", null, 0, null, 28, 21, 32, 0, 160, 300, null, null],
-        [0, "장비", null, 0, null, 87, 98, 72, 0, 160, 300, null, null],
-        [0, "장포", null, 0, null, 78, 84, 48, 0, 160, 300, null, null],
-        [0, "장보", null, 0, null, 83, 60, 81, 0, 160, 300, null, null],
-        [0, "장만성", null, 0, null, 75, 81, 45, 0, 160, 300, null, null],
-        [0, "장양", null, 0, null, 72, 70, 50, 0, 160, 300, null, null],
-        [0, "장익", null, 0, null, 75, 55, 76, 0, 160, 300, null, null],
-        [0, "장료", null, 0, null, 96, 94, 74, 0, 160, 300, null, null],
-        [0, "장량", null, 0, null, 78, 80, 59, 0, 160, 300, null, null],
-        [0, "조루", null, 0, null, 70, 43, 68, 0, 160, 300, null, null],
-        [0, "장로", null, 0, null, 65, 42, 81, 0, 160, 300, null, null],
-        [0, "진횡", null, 0, null, 64, 63, 26, 0, 160, 300, null, null],
-        [0, "진응", null, 0, null, 62, 72, 45, 0, 160, 300, null, null],
-        [0, "진기", null, 0, null, 58, 65, 43, 0, 160, 300, null, null],
-        [0, "진궁", null, 0, null, 84, 55, 90, 0, 160, 300, null, null],
-        [0, "진교", null, 0, null, 61, 27, 77, 0, 160, 300, null, null],
-        [0, "진군", null, 0, null, 32, 14, 75, 0, 160, 300, null, null],
-        [0, "진규", null, 0, null, 30, 4, 82, 0, 160, 300, null, null],
-        [0, "진식", null, 0, null, 70, 71, 25, 0, 160, 300, null, null],
-        [0, "진진", null, 0, null, 46, 46, 69, 0, 160, 300, null, null],
-        [0, "진태", null, 0, null, 86, 68, 89, 0, 160, 300, null, null],
-        [0, "진등", null, 0, null, 79, 59, 81, 0, 160, 300, null, null],
-        [0, "진도", null, 0, null, 82, 78, 58, 0, 160, 300, null, null],
-        [0, "진무", null, 0, null, 76, 87, 43, 0, 160, 300, null, null],
-        [0, "진란", null, 0, null, 66, 69, 40, 0, 160, 300, null, null],
-        [0, "진림", null, 0, null, 25, 9, 75, 0, 160, 300, null, null],
-        [0, "정욱", null, 0, null, 76, 49, 94, 0, 160, 300, null, null],
-        [0, "정원지", null, 0, null, 69, 74, 17, 0, 160, 300, null, null],
-        [0, "정은", null, 0, null, 69, 73, 40, 0, 160, 300, null, null],
-        [0, "정원", null, 0, null, 70, 76, 35, 0, 160, 300, null, null],
-        [0, "정보", null, 0, null, 84, 79, 59, 0, 160, 300, null, null],
-        [0, "정봉", null, 0, null, 81, 92, 69, 0, 160, 300, null, null],
-        [0, "전위", null, 0, null, 79, 98, 42, 0, 160, 300, null, null],
-        [0, "전해", null, 0, null, 68, 65, 45, 0, 160, 300, null, null],
-        [0, "전주", null, 0, null, 66, 51, 73, 0, 160, 300, null, null],
-        [0, "전풍", null, 0, null, 82, 43, 96, 0, 160, 300, null, null],
-        [0, "전예", null, 0, null, 93, 85, 66, 0, 160, 300, null, null],
-        [0, "동윤", null, 0, null, 47, 28, 79, 0, 160, 300, null, null],
-        [0, "동화", null, 0, null, 57, 34, 75, 0, 160, 300, null, null],
-        [0, "등애", null, 0, null, 92, 73, 94, 0, 160, 300, null, null],
-        [0, "도겸", null, 0, null, 51, 27, 64, 0, 160, 300, null, null],
-        [0, "등현", null, 0, null, 61, 73, 45, 0, 160, 300, null, null],
-        [0, "등지", null, 0, null, 73, 52, 81, 0, 160, 300, null, null],
-        [0, "동습", null, 0, null, 72, 85, 50, 0, 160, 300, null, null],
-        [0, "동승", null, 0, null, 56, 53, 65, 0, 160, 300, null, null],
-        [0, "동소", null, 0, null, 34, 25, 80, 0, 160, 300, null, null],
-        [0, "동탁", null, 0, null, 91, 87, 67, 0, 160, 300, null, null],
-        [0, "동도나", null, 0, null, 68, 73, 31, 0, 160, 300, null, null],
-        [0, "동민", null, 0, null, 49, 60, 25, 0, 160, 300, null, null],
-        [0, "등무", null, 0, null, 61, 75, 29, 0, 160, 300, null, null],
-        [0, "두기", null, 0, null, 74, 43, 78, 0, 160, 300, null, null],
-        [0, "두예", null, 0, null, 96, 69, 95, 0, 160, 300, null, null],
-        [0, "배원소", null, 0, null, 49, 65, 25, 0, 160, 300, null, null],
-        [0, "마완", null, 0, null, 71, 74, 16, 0, 160, 300, null, null],
-        [0, "마휴", null, 0, null, 68, 73, 48, 0, 160, 300, null, null],
-        [0, "파재", null, 0, null, 74, 74, 55, 0, 160, 300, null, null],
-        [0, "마준", null, 0, null, 38, 52, 31, 0, 160, 300, null, null],
-        [0, "마속", null, 0, null, 61, 59, 84, 0, 160, 300, null, null],
-        [0, "마대", null, 0, null, 79, 85, 62, 0, 160, 300, null, null],
-        [0, "마충", null, 0, null, 78, 72, 52, 0, 160, 300, null, null],
-        [0, "마초", null, 0, null, 86, 97, 44, 0, 160, 300, null, null],
-        [0, "마철", null, 0, null, 70, 62, 43, 0, 160, 300, null, null],
-        [0, "마등", null, 0, null, 85, 80, 52, 0, 160, 300, null, null],
-        [0, "마량", null, 0, null, 53, 23, 85, 0, 160, 300, null, null],
-        [0, "반준", null, 0, null, 61, 46, 82, 0, 160, 300, null, null],
-        [0, "반장", null, 0, null, 76, 80, 59, 0, 160, 300, null, null],
-        [0, "번조", null, 0, null, 66, 73, 31, 0, 160, 300, null, null],
-        [0, "번능", null, 0, null, 69, 61, 36, 0, 160, 300, null, null],
-        [0, "반봉", null, 0, null, 56, 77, 4, 0, 160, 300, null, null],
-        [0, "비의", null, 0, null, 82, 56, 88, 0, 160, 300, null, null],
-        [0, "비연", null, 0, null, 60, 66, 21, 0, 160, 300, null, null],
-        [0, "비시", null, 0, null, 18, 28, 65, 0, 160, 300, null, null],
-        [0, "미축", null, 0, null, 33, 29, 78, 0, 160, 300, null, null],
-        [0, "미방", null, 0, null, 54, 61, 32, 0, 160, 300, null, null],
-        [0, "비요", null, 0, null, 70, 52, 73, 0, 160, 300, null, null],
-        [0, "무안국", null, 0, null, 70, 79, 34, 0, 160, 300, null, null],
-        [0, "풍습", null, 0, null, 72, 71, 39, 0, 160, 300, null, null],
-        [0, "부사인", null, 0, null, 46, 63, 37, 0, 160, 300, null, null],
-        [0, "부첨", null, 0, null, 73, 85, 62, 0, 160, 300, null, null],
-        [0, "부손", null, 0, null, 29, 13, 70, 0, 160, 300, null, null],
-        [0, "문앙", null, 0, null, 76, 96, 65, 0, 160, 300, null, null],
-        [0, "문흠", null, 0, null, 74, 79, 43, 0, 160, 300, null, null],
-        [0, "문추", null, 0, null, 87, 95, 49, 0, 160, 300, null, null],
-        [0, "문빙", null, 0, null, 88, 85, 65, 0, 160, 300, null, null],
-        [0, "변희", null, 0, null, 56, 70, 62, 0, 160, 300, null, null],
-        [0, "망아장", null, 0, null, 45, 79, 3, 0, 160, 300, null, null],
-        [0, "봉기", null, 0, null, 56, 48, 84, 0, 160, 300, null, null],
-        [0, "방희", null, 0, null, 60, 38, 69, 0, 160, 300, null, null],
-        [0, "법정", null, 0, null, 82, 47, 94, 0, 160, 300, null, null],
-        [0, "방통", null, 0, null, 79, 34, 97, 0, 160, 300, null, null],
-        [0, "방덕", null, 0, null, 89, 94, 70, 0, 160, 300, null, null],
-        [0, "포륭", null, 0, null, 58, 76, 49, 0, 160, 300, null, null],
-        [0, "목순", null, 0, null, 52, 77, 11, 0, 160, 300, null, null],
-        [0, "목록대왕", null, 0, null, 65, 71, 39, 0, 160, 300, null, null],
-        [0, "보즐", null, 0, null, 83, 51, 81, 0, 160, 300, null, null],
-        [0, "만총", null, 0, null, 88, 64, 87, 0, 160, 300, null, null],
-        [0, "모개", null, 0, null, 63, 39, 60, 0, 160, 300, null, null],
-        [0, "맹획", null, 0, null, 81, 88, 42, 0, 160, 300, null, null],
-        [0, "맹체", null, 0, null, 75, 55, 75, 0, 160, 300, null, null],
-        [0, "맹우", null, 0, null, 50, 68, 22, 0, 160, 300, null, null],
-        [0, "유섭", null, 0, null, 62, 79, 24, 0, 160, 300, null, null],
-        [0, "양부", null, 0, null, 62, 48, 68, 0, 160, 300, null, null],
-        [0, "옹개", null, 0, null, 73, 75, 57, 0, 160, 300, null, null],
-        [0, "양의", null, 0, null, 68, 40, 82, 0, 160, 300, null, null],
-        [0, "양호", null, 0, null, 94, 69, 92, 0, 160, 300, null, null],
-        [0, "양홍", null, 0, null, 33, 15, 77, 0, 160, 300, null, null],
-        [0, "양앙", null, 0, null, 68, 72, 38, 0, 160, 300, null, null],
-        [0, "양추", null, 0, null, 52, 65, 40, 0, 160, 300, null, null],
-        [0, "양수", null, 0, null, 46, 23, 83, 0, 160, 300, null, null],
-        [0, "양추2", null, 0, null, 67, 64, 44, 0, 160, 300, null, null],
-        [0, "양송", null, 0, null, 17, 5, 28, 0, 160, 300, null, null],
-        [0, "양임", null, 0, null, 70, 78, 56, 0, 160, 300, null, null],
-        [0, "양조", null, 0, null, 53, 61, 36, 0, 160, 300, null, null],
-        [0, "양백", null, 0, null, 44, 45, 19, 0, 160, 300, null, null],
-        [0, "양부2", null, 0, null, 67, 50, 83, 0, 160, 300, null, null],
-        [0, "양봉", null, 0, null, 66, 65, 31, 0, 160, 300, null, null],
-        [0, "양봉2", null, 0, null, 54, 62, 53, 0, 160, 300, null, null],
-        [0, "뇌동", null, 0, null, 69, 78, 51, 0, 160, 300, null, null],
-        [0, "뇌박", null, 0, null, 62, 70, 36, 0, 160, 300, null, null],
-        [0, "이이", null, 0, null, 63, 77, 19, 0, 160, 300, null, null],
-        [0, "이회", null, 0, null, 79, 58, 79, 0, 160, 300, null, null],
-        [0, "이각", null, 0, null, 69, 72, 24, 0, 160, 300, null, null],
-        [0, "육항", null, 0, null, 94, 68, 93, 0, 160, 300, null, null],
-        [0, "육적", null, 0, null, 20, 7, 72, 0, 160, 300, null, null],
-        [0, "육손", null, 0, null, 95, 71, 96, 0, 160, 300, null, null],
-        [0, "이엄", null, 0, null, 83, 84, 63, 0, 160, 300, null, null],
-        [0, "이유", null, 0, null, 61, 26, 93, 0, 160, 300, null, null],
-        [0, "이숙", null, 0, null, 46, 69, 61, 0, 160, 300, null, null],
-        [0, "이통", null, 0, null, 73, 81, 62, 0, 160, 300, null, null],
-        [0, "이전", null, 0, null, 78, 80, 59, 0, 160, 300, null, null],
-        [0, "이풍", null, 0, null, 69, 74, 50, 0, 160, 300, null, null],
-        [0, "유언", null, 0, null, 61, 38, 80, 0, 160, 300, null, null],
-        [0, "유괴", null, 0, null, 71, 73, 52, 0, 160, 300, null, null],
-        [0, "유기", null, 0, null, 52, 12, 63, 0, 160, 300, null, null],
-        [0, "유우", null, 0, null, 62, 33, 75, 0, 160, 300, null, null],
-        [0, "유훈", null, 0, null, 47, 63, 35, 0, 160, 300, null, null],
-        [0, "유현", null, 0, null, 54, 66, 51, 0, 160, 300, null, null],
-        [0, "유순", null, 0, null, 63, 46, 28, 0, 160, 300, null, null],
-        [0, "유장", null, 0, null, 31, 5, 34, 0, 160, 300, null, null],
-        [0, "유심", null, 0, null, 60, 48, 70, 0, 160, 300, null, null],
-        [0, "유선", null, 0, null, 3, 5, 9, 0, 160, 300, null, null],
-        [0, "유종", null, 0, null, 24, 22, 65, 0, 160, 300, null, null],
-        [0, "유도", null, 0, null, 25, 23, 26, 0, 160, 300, null, null],
-        [0, "유파", null, 0, null, 29, 22, 75, 0, 160, 300, null, null],
-        [0, "유반", null, 0, null, 69, 76, 47, 0, 160, 300, null, null],
-        [0, "유비", null, 0, null, 88, 78, 59, 0, 160, 300, null, null],
-        [0, "유표", null, 0, null, 48, 31, 72, 0, 160, 300, null, null],
-        [0, "유복", null, 0, null, 64, 49, 74, 0, 160, 300, null, null],
-        [0, "유벽", null, 0, null, 70, 72, 47, 0, 160, 300, null, null],
-        [0, "유봉", null, 0, null, 75, 79, 44, 0, 160, 300, null, null],
-        [0, "유엽", null, 0, null, 56, 32, 92, 0, 160, 300, null, null],
-        [0, "유요", null, 0, null, 62, 67, 46, 0, 160, 300, null, null],
-        [0, "여위황", null, 0, null, 58, 63, 29, 0, 160, 300, null, null],
-        [0, "요화", null, 0, null, 73, 76, 54, 0, 160, 300, null, null],
-        [0, "양흥", null, 0, null, 61, 65, 19, 0, 160, 300, null, null],
-        [0, "양습", null, 0, null, 73, 40, 74, 0, 160, 300, null, null],
-        [0, "양서", null, 0, null, 56, 62, 66, 0, 160, 300, null, null],
-        [0, "능조", null, 0, null, 75, 81, 42, 0, 160, 300, null, null],
-        [0, "능통", null, 0, null, 83, 89, 60, 0, 160, 300, null, null],
-        [0, "여개", null, 0, null, 53, 30, 67, 0, 160, 300, null, null],
-        [0, "여건", null, 0, null, 57, 70, 62, 0, 160, 300, null, null],
-        [0, "여광", null, 0, null, 56, 70, 13, 0, 160, 300, null, null],
-        [0, "여상", null, 0, null, 54, 71, 12, 0, 160, 300, null, null],
-        [0, "여대", null, 0, null, 80, 71, 52, 0, 160, 300, null, null],
-        [0, "여범", null, 0, null, 73, 54, 75, 0, 160, 300, null, null],
-        [0, "여포", null, 0, null, 89, 100, 42, 0, 160, 300, null, null],
-        [0, "여몽", null, 0, null, 91, 69, 90, 0, 160, 300, null, null],
-        [0, "윤직", null, 0, null, 46, 42, 73, 0, 160, 300, null, null],
-        [0, "냉포", null, 0, null, 71, 82, 61, 0, 160, 300, null, null],
-        [0, "누규", null, 0, null, 52, 13, 87, 0, 160, 300, null, null],
-        [0, "노숙", null, 0, null, 89, 56, 93, 0, 160, 300, null, null],
-        [0, "노식", null, 0, null, 86, 63, 82, 0, 160, 300, null, null],
-        [0, "범강", null, 0, null, 49, 50, 36, 0, 160, 300, null, null],
-        [0, "장달", null, 0, null, 43, 56, 34, 0, 160, 300, null, null],
-        [0, "규람", null, 0, null, 55, 70, 58, 0, 160, 300, null, null],
-        [0, "대원", null, 0, null, 38, 32, 68, 0, 160, 300, null, null],
-        [0, "왕기", null, 0, null, 81, 64, 86, 0, 160, 300, null, null],
-        [0, "왕상", null, 0, null, 23, 19, 68, 0, 160, 300, null, null],
-        [0, "왕돈", null, 0, null, 60, 66, 46, 0, 160, 300, null, null],
-        [0, "악침", null, 0, null, 73, 75, 43, 0, 160, 300, null, null],
-        [0, "하제", null, 0, null, 83, 61, 82, 0, 160, 300, null, null],
-        [0, "환범", null, 0, null, 40, 11, 78, 0, 160, 300, null, null],
-        [0, "견초", null, 0, null, 72, 79, 57, 0, 160, 300, null, null],
-        [0, "고당륭", null, 0, null, 35, 24, 76, 0, 160, 300, null, null],
-        [0, "오찬", null, 0, null, 68, 41, 78, 0, 160, 300, null, null],
-        [0, "호질", null, 0, null, 73, 46, 74, 0, 160, 300, null, null],
-        [0, "오질", null, 0, null, 16, 29, 68, 0, 160, 300, null, null],
-        [0, "호준", null, 0, null, 79, 76, 55, 0, 160, 300, null, null],
-        [0, "고담", null, 0, null, 53, 23, 77, 0, 160, 300, null, null],
-        [0, "최림", null, 0, null, 32, 22, 66, 0, 160, 300, null, null],
-        [0, "사마망", null, 0, null, 78, 58, 83, 0, 160, 300, null, null],
-        [0, "주이", null, 0, null, 70, 73, 52, 0, 160, 300, null, null],
-        [0, "전단", null, 0, null, 67, 64, 39, 0, 160, 300, null, null],
-        [0, "조우", null, 0, null, 50, 43, 37, 0, 160, 300, null, null],
-        [0, "조상", null, 0, null, 39, 33, 30, 0, 160, 300, null, null],
-        [0, "조방", null, 0, null, 20, 14, 27, 0, 160, 300, null, null],
-        [0, "태사향", null, 0, null, 57, 66, 48, 0, 160, 300, null, null],
-        [0, "장휴", null, 0, null, 63, 27, 74, 0, 160, 300, null, null],
-        [0, "장호", null, 0, null, 75, 74, 51, 0, 160, 300, null, null],
-        [0, "조광", null, 0, null, 67, 71, 53, 0, 160, 300, null, null],
-        [0, "장집", null, 0, null, 76, 29, 80, 0, 160, 300, null, null],
-        [0, "장승", null, 0, null, 77, 55, 75, 0, 160, 300, null, null],
-        [0, "장소2", null, 0, null, 23, 56, 31, 0, 160, 300, null, null],
-        [0, "조통", null, 0, null, 68, 67, 46, 0, 160, 300, null, null],
-        [0, "진표", null, 0, null, 66, 42, 74, 0, 160, 300, null, null],
-        [0, "정무", null, 0, null, 56, 35, 75, 0, 160, 300, null, null],
-        [0, "정봉2", null, 0, null, 66, 66, 46, 0, 160, 300, null, null],
-        [0, "전만", null, 0, null, 51, 73, 39, 0, 160, 300, null, null],
-        [0, "마균", null, 0, null, 22, 17, 71, 0, 160, 300, null, null],
-        [0, "방회", null, 0, null, 69, 75, 49, 0, 160, 300, null, null],
-        [0, "낙통", null, 0, null, 76, 58, 75, 0, 160, 300, null, null],
-        [0, "육개", null, 0, null, 65, 61, 79, 0, 160, 300, null, null],
-        [0, "유찬", null, 0, null, 78, 81, 59, 0, 160, 300, null, null],
-        [0, "유소", null, 0, null, 68, 53, 74, 0, 160, 300, null, null],
-        [0, "요립", null, 0, null, 32, 15, 76, 0, 160, 300, null, null],
-        [0, "여거", null, 0, null, 78, 51, 71, 0, 160, 300, null, null],
-        [0, "제갈첨", null, 0, null, 70, 57, 76, 0, 160, 300, null, null],
-        [0, "손휴", null, 0, null, 57, 42, 78, 0, 160, 300, null, null],
-        [0, "극정", null, 0, null, 42, 23, 68, 0, 160, 300, null, null],
-        [0, "호분", null, 0, null, 71, 76, 50, 0, 160, 300, null, null],
-        [0, "손량", null, 0, null, 32, 26, 70, 0, 160, 300, null, null],
-        [0, "마막", null, 0, null, 34, 12, 44, 0, 160, 300, null, null],
-        [0, "손호", null, 0, null, 41, 73, 71, 0, 160, 300, null, null],
-        [0, "조모", null, 0, null, 54, 61, 59, 0, 160, 300, null, null],
-        [0, "조환", null, 0, null, 30, 28, 30, 0, 160, 300, null, null],
-        [0, "사마유", null, 0, null, 71, 54, 75, 0, 160, 300, null, null],
-        [0, "제갈상", null, 0, null, 64, 79, 62, 0, 160, 300, null, null],
-        [0, "손화", null, 0, null, 31, 39, 68, 0, 160, 300, null, null],
-        [0, "염우", null, 0, null, 52, 61, 51, 0, 160, 300, null, null],
-        [0, "왕경", null, 0, null, 67, 49, 71, 0, 160, 300, null, null],
-        [0, "왕혼", null, 0, null, 74, 71, 50, 0, 160, 300, null, null],
-        [0, "곽혁", null, 0, null, 33, 29, 70, 0, 160, 300, null, null],
-        [0, "가범", null, 0, null, 60, 50, 73, 0, 160, 300, null, null],
-        [0, "서질", null, 0, null, 68, 83, 24, 0, 160, 300, null, null],
-        [0, "손준", null, 0, null, 64, 70, 48, 0, 160, 300, null, null],
-        [0, "손침", null, 0, null, 58, 55, 65, 0, 160, 300, null, null],
-        [0, "우사", null, 0, null, 61, 34, 74, 0, 160, 300, null, null],
-        [0, "진건", null, 0, null, 72, 71, 50, 0, 160, 300, null, null],
-        [0, "동궐", null, 0, null, 65, 59, 76, 0, 160, 300, null, null],
-        [0, "당자", null, 0, null, 61, 71, 50, 0, 160, 300, null, null],
-        [0, "등충", null, 0, null, 76, 80, 59, 0, 160, 300, null, null],
-        [0, "황숭", null, 0, null, 67, 50, 72, 0, 160, 300, null, null],
-        [0, "화핵", null, 0, null, 20, 24, 71, 0, 160, 300, null, null],
-        [0, "허의", null, 0, null, 51, 74, 15, 0, 160, 300, null, null],
-        [0, "송겸", null, 0, null, 66, 78, 42, 0, 160, 300, null, null],
-        [0, "호제", null, 0, null, 57, 39, 68, 0, 160, 300, null, null],
-        [0, "나헌", null, 0, null, 86, 62, 82, 0, 160, 300, null, null],
-        [0, "노숙2", null, 0, null, 73, 53, 74, 0, 160, 300, null, null],
-        [0, "구성", null, 0, null, 63, 70, 38, 0, 160, 300, null, null],
-        [0, "어부라", null, 0, null, 72, 68, 21, 0, 160, 300, null, null],
-        [0, "아하소과", null, 0, null, 61, 76, 13, 0, 160, 300, null, null],
-        [0, "가비능", null, 0, null, 77, 69, 52, 0, 160, 300, null, null],
-        [0, "구력거", null, 0, null, 80, 68, 50, 0, 160, 300, null, null],
-        [0, "강단", null, 0, null, 65, 83, 48, 0, 160, 300, null, null],
-        [0, "황란", null, 0, null, 63, 75, 44, 0, 160, 300, null, null],
-        [0, "호주천", null, 0, null, 70, 71, 40, 0, 160, 300, null, null],
-        [0, "종리목", null, 0, null, 84, 61, 82, 0, 160, 300, null, null],
-        [0, "제갈교", null, 0, null, 62, 27, 75, 0, 160, 300, null, null],
-        [0, "답돈", null, 0, null, 84, 82, 61, 0, 160, 300, null, null],
-        [0, "반임", null, 0, null, 66, 79, 38, 0, 160, 300, null, null],
-        [0, "보도근", null, 0, null, 64, 73, 50, 0, 160, 300, null, null],
-        [0, "미당대왕", null, 0, null, 59, 69, 21, 0, 160, 300, null, null],
-        [0, "유표2", null, 0, null, 73, 74, 48, 0, 160, 300, null, null],
-        [0, "루반", null, 0, null, 65, 76, 39, 0, 160, 300, null, null],
-        [0, "손관", null, 0, null, 72, 78, 51, 0, 160, 300, null, null],
-        [0, "곽석", null, 0, null, 59, 71, 48, 0, 160, 300, null, null],
-        [0, "주조", null, 0, null, 63, 68, 26, 0, 160, 300, null, null],
-        [0, "장거", null, 0, null, 79, 75, 56, 0, 160, 300, null, null],
-        [0, "장순", null, 0, null, 73, 81, 60, 0, 160, 300, null, null],
-        [0, "철리길", null, 0, null, 77, 70, 52, 0, 160, 300, null, null],
-        [0, "주삭", null, 0, null, 54, 60, 50, 0, 160, 300, null, null],
-        [0, "황월영", null, 0, null, 46, 33, 78, 0, 160, 300, null, null],
-        [0, "채염", null, 0, null, 42, 26, 82, 0, 160, 300, null, null],
-        [0, "소교", null, 0, null, 23, 15, 78, 0, 160, 300, null, null],
-        [0, "신헌영", null, 0, null, 65, 35, 90, 0, 160, 300, null, null],
-        [0, "손상향", null, 0, null, 72, 79, 55, 0, 160, 300, null, null],
-        [0, "대교", null, 0, null, 22, 30, 78, 0, 160, 300, null, null],
-        [0, "초선", null, 0, null, 12, 22, 71, 0, 160, 300, null, null],
-        [0, "교모", null, 0, null, 54, 45, 69, 0, 160, 300, null, null],
-        [0, "관구수", null, 0, null, 58, 62, 33, 0, 160, 300, null, null],
-        [0, "관구전", null, 0, null, 63, 47, 69, 0, 160, 300, null, null],
-        [0, "원유", null, 0, null, 56, 40, 73, 0, 160, 300, null, null],
-        [0, "왕광", null, 0, null, 65, 41, 61, 0, 160, 300, null, null],
-        [0, "신창", null, 0, null, 50, 26, 42, 0, 160, 300, null, null],
-        [0, "사마주", null, 0, null, 61, 40, 61, 0, 160, 300, null, null],
-        [0, "양제", null, 0, null, 67, 49, 71, 0, 160, 300, null, null],
-        [0, "성만", null, 0, null, 61, 68, 46, 0, 160, 300, null, null],
-        [0, "오연", null, 0, null, 66, 73, 42, 0, 160, 300, null, null],
-        [0, "맹충", null, 0, null, 47, 28, 72, 0, 160, 300, null, null],
-        [0, "잠혼", null, 0, null, 1, 1, 22, 0, 160, 300, null, null],
-        [0, "사정", null, 0, null, 64, 76, 34, 0, 160, 300, null, null],
-        [0, "심영", null, 0, null, 70, 77, 55, 0, 160, 300, null, null],
-        [0, "도준", null, 0, null, 65, 66, 46, 0, 160, 300, null, null],
-        [0, "만욱", null, 0, null, 21, 25, 71, 0, 160, 300, null, null],
-        [0, "오언", null, 0, null, 76, 81, 59, 0, 160, 300, null, null],
-        [0, "위막", null, 0, null, 57, 62, 59, 0, 160, 300, null, null],
-        [0, "시삭", null, 0, null, 38, 65, 47, 0, 160, 300, null, null],
-        [0, "전속", null, 0, null, 47, 60, 55, 0, 160, 300, null, null],
-        [0, "장화", null, 0, null, 36, 27, 78, 0, 160, 300, null, null],
-        [0, "오거", null, 0, null, 49, 61, 23, 0, 160, 300, null, null],
-        [0, "추정", null, 0, null, 70, 46, 66, 0, 160, 300, null, null],
-        [0, "장특", null, 0, null, 73, 54, 75, 0, 160, 300, null, null],
-        [0, "곽마", null, 0, null, 68, 71, 47, 0, 160, 300, null, null],
-        [0, "석포", null, 0, null, 69, 71, 49, 0, 160, 300, null, null],
-        [0, "견홍", null, 0, null, 70, 74, 53, 0, 160, 300, null, null],
-        [0, "한거자", null, 0, null, 51, 59, 51, 0, 160, 300, null, null],
-        [0, "휴원진", null, 0, null, 52, 68, 45, 0, 160, 300, null, null],
-        [0, "곽원", null, 0, null, 66, 73, 36, 0, 160, 300, null, null],
-        [0, "계옹", null, 0, null, 63, 52, 33, 0, 160, 300, null, null],
-        [0, "이부", null, 0, null, 31, 36, 74, 0, 160, 300, null, null],
-        [0, "왕업", null, 0, null, 33, 6, 35, 0, 160, 300, null, null],
-        [0, "좌혁", null, 0, null, 62, 66, 51, 0, 160, 300, null, null],
-        [0, "화타", null, 0, null, 57, 25, 73, 0, 160, 300, null, null],
-        [0, "사마휘", null, 0, null, 55, 26, 82, 0, 160, 300, null, null],
-        [0, "우길", null, 0, null, 23, 15, 90, 0, 160, 300, null, null],
-        [0, "헌제", null, 0, null, 22, 18, 68, 0, 160, 300, null, null],
-        [0, "백기", null, 0, null, 100, 88, 69, 0, 160, 300, null, null],
-        [0, "한신", null, 0, null, 100, 74, 95, 0, 160, 300, null, null],
-        [0, "악비", null, 0, null, 99, 91, 71, 0, 160, 300, null, null],
-        [0, "항적", null, 0, null, 99, 100, 65, 0, 160, 300, null, null],
-        [0, "악의", null, 0, null, 98, 75, 96, 0, 160, 300, null, null],
-        [0, "영정", null, 0, null, 97, 55, 92, 0, 160, 300, null, null],
-        [0, "강상", null, 0, null, 94, 49, 100, 0, 160, 300, null, null],
-        [0, "전단2", null, 0, null, 96, 75, 95, 0, 160, 300, null, null],
-        [0, "이목", null, 0, null, 96, 69, 88, 0, 160, 300, null, null],
-        [0, "염파", null, 0, null, 97, 96, 75, 0, 160, 300, null, null],
-        [0, "왕전", null, 0, null, 94, 64, 83, 0, 160, 300, null, null],
-        [0, "오기", null, 0, null, 94, 66, 95, 0, 160, 300, null, null],
-        [0, "곽거병", null, 0, null, 93, 92, 53, 0, 160, 300, null, null],
-        [0, "영포", null, 0, null, 82, 91, 54, 0, 160, 300, null, null],
-        [0, "이신", null, 0, null, 81, 88, 63, 0, 160, 300, null, null],
-        [0, "몽념", null, 0, null, 87, 86, 65, 0, 160, 300, null, null],
-        [0, "전기", null, 0, null, 80, 85, 44, 0, 160, 300, null, null],
-        [0, "극신", null, 0, null, 76, 83, 42, 0, 160, 300, null, null],
-        [0, "항연", null, 0, null, 89, 80, 61, 0, 160, 300, null, null],
-        [0, "인상여", null, 0, null, 69, 38, 96, 0, 160, 300, null, null],
-        [0, "장자방", null, 0, null, 72, 40, 100, 0, 160, 300, null, null],
-        [0, "관이오", null, 0, null, 85, 64, 99, 0, 160, 300, null, null],
-        [0, "손빈", null, 0, null, 83, 22, 98, 0, 160, 300, null, null],
-        [0, "소진", null, 0, null, 90, 47, 96, 0, 160, 300, null, null],
-        [0, "범증", null, 0, null, 68, 24, 94, 0, 160, 300, null, null],
-        [0, "장의2", null, 0, null, 75, 23, 93, 0, 160, 300, null, null],
-        [0, "공구", null, 0, null, 68, 70, 91, 0, 160, 300, null, null],
-        [0, "소하", null, 0, null, 56, 27, 97, 0, 160, 300, null, null],
-        [0, "한비", null, 0, null, 49, 18, 97, 0, 160, 300, null, null],
-        [0, "이사", null, 0, null, 48, 24, 95, 0, 160, 300, null, null],
-        [0, "전문", null, 0, null, 79, 67, 89, 0, 160, 300, null, null],
-        [0, "황헐", null, 0, null, 81, 68, 88, 0, 160, 300, null, null],
-        [0, "방난", null, 0, null, 88, 95, 66, 0, 160, 300, null, null],
-        [0, "개섭", null, 0, null, 43, 97, 54, 0, 160, 300, null, null],
-        [0, "형가", null, 0, null, 42, 89, 43, 0, 160, 300, null, null],
-        [0, "유방", null, 0, null, 90, 66, 85, 0, 160, 300, null, null],
-        [0, "하리", null, 0, null, 95, 95, 65, 0, 160, 300, null, null],
-        [0, "헹이", null, 0, null, 95, 62, 90, 0, 160, 300, null, null],
-        [0, "나나", null, 0, null, 91, 52, 93, 0, 160, 300, null, null],
-        [0, "장임2", null, 0, null, 90, 92, 55, 0, 160, 300, null, null],
-        [0, "하야미", null, 0, null, 92, 57, 92, 0, 160, 300, null, null],
-        [0, "이시리스", null, 0, null, 93, 59, 92, 0, 160, 300, null, null],
-        [0, "연채홍", null, 0, null, 91, 52, 91, 0, 160, 300, null, null],
-        [0, "임사영", null, 0, null, 40, 40, 40, 0, 160, 300, null, null],
-        [0, "장군보", null, 0, null, 90, 90, 53, 0, 160, 300, null, null],
-        [0, "크렌스", null, 0, null, 91, 91, 56, 0, 160, 300, null, null],
-        [0, "콘", null, 0, null, 91, 92, 56, 0, 160, 300, null, null],
-        [0, "리즈나", null, 0, null, 90, 56, 90, 0, 160, 300, null, null],
-        [0, "오티누스", null, 0, null, 92, 91, 56, 0, 160, 300, null, null],
-        [0, "네시", null, 0, null, 91, 57, 93, 0, 160, 300, null, null, "안 자고 싸우면 이겨요"],
-        [0, "시뉴카린", null, 0, null, 95, 90, 52, 0, 160, 300, null, null, "피리피리~"],
-        [0, "Hide_D", null, 0, null, 92, 60, 95, 0, 160, 300, null, null],
-        [0, "Pray", null, 0, null, 90, 92, 54, 0, 160, 300, null, null],
-        [0, "사스케", null, 0, null, 91, 94, 54, 0, 160, 300, null, null],
-        [0, "SARS", null, 0, null, 91, 61, 92, 0, 160, 300, null, null],
-        [0, "마요이", null, 0, null, 92, 53, 93, 0, 160, 300, null, null, "로열방 없습니다"],
-        [0, "세정", null, 0, null, 90, 92, 60, 0, 160, 300, null, null],
-        [0, "김나영", null, 0, null, 93, 90, 60, 0, 160, 300, null, null],
-        [0, "독구", null, 0, null, 95, 91, 62, 0, 160, 300, null, null, "웃자 ^-^"],
-        [0, "천괴금", null, 0, null, 33, 66, 99, 0, 160, 300, null, null],
-        [0, "관지평", null, 0, null, 90, 91, 52, 0, 160, 300, null, null, "농장팬티강도소녀!"],
-        [0, "모니카", null, 0, null, 90, 60, 93, 0, 160, 300, null, null, "론조.."],
-        [0, "카리야", null, 0, null, 93, 58, 95, 0, 160, 300, null, null, "깡!"],
-        [0, "rwitch", null, 0, null, 90, 52, 90, 0, 160, 300, null, null],
-        [0, "카류", null, 0, null, 92, 53, 92, 0, 160, 300, null, null],
-        [0, "갈근", null, 0, null, 94, 54, 94, 0, 160, 300, null, null],
-        [0, "페이트", null, 0, null, 92, 59, 90, 0, 160, 300, null, null],
-        [0, "앵벌스", null, 0, null, 94, 91, 57, 0, 160, 300, null, null, "다람쥐는 위대하고 그 외에 다른 설치류는 없다"],
-        [0, "조밧", null, 0, null, 91, 93, 53, 0, 160, 300, null, null],
-        [0, "슬라임", null, 0, null, 90, 56, 93, 0, 160, 300, null, null],
-        [0, "제노에이지", null, 0, null, 93, 61, 93, 0, 160, 300, null, null],
-        [0, "평민킬러", null, 0, null, 95, 92, 55, 0, 160, 300, null, null],
-        [0, "아유", null, 0, null, 91, 54, 92, 0, 160, 300, null, null],
-        [0, "로리", null, 0, null, 92, 55, 92, 0, 160, 300, null, null],
-        [0, "n아텐 누", null, 0, null, 92, 55, 92, 0, 160, 300, null, null],
-        [0, "Card", null, 0, null, 91, 90, 59, 0, 160, 300, null, null],
-        [0, "Per", null, 0, null, 93, 57, 90, 0, 160, 300, null, null],
-        [0, "아쉐리트", null, 0, null, 94, 55, 90, 0, 160, 300, null, null],
-        [0, "외심장", null, 0, null, 91, 57, 92, 0, 160, 300, null, null],
-        [0, "카이스트", null, 0, null, 91, 53, 93, 0, 160, 300, null, null],
-        [0, "아키라", null, 0, null, 80, 50, 80, 0, 160, 300, null, null, "뻐끔뻐끔"],
-        [0, "카오스피닉스", null, 0, null, 93, 58, 92, 0, 160, 300, null, null, "=ㅁ="],
-        [0, "민트토끼", null, 0, null, 92, 54, 90, 0, 160, 300, null, null, "나 바보 아니다!"],
-        [0, "くま", null, 0, null, 90, 92, 57, 0, 160, 300, null, null],
-        [0, "북오더", null, 0, null, 91, 58, 92, 0, 160, 300, null, null],
-        [0, "이쓰미", null, 0, null, 92, 58, 91, 0, 160, 300, null, null],
-        [0, "개미호랑이", null, 0, null, 91, 55, 92, 0, 160, 300, null, null],
-        [0, "수장", null, 0, null, 93, 57, 91, 0, 160, 300, null, null],
-        [0, "이드", null, 0, null, 92, 93, 53, 0, 160, 300, null, null],
-        [0, "호무새", null, 0, null, 91, 53, 91, 0, 160, 300, null, null, "호우~"],
-        [0, "박일아", null, 0, null, 93, 59, 93, 0, 160, 300, null, null],
-        [0, "유기체", null, 0, null, 92, 56, 95, 0, 160, 300, null, null, "흠... 그렇다면 어쩔 수 없이 흉노로 가야겠군요..."],
-        [0, "황약사", null, 0, null, 92, 92, 60, 0, 160, 300, null, null],
-        [0, "하후연묘재", null, 0, null, 92, 52, 95, 0, 160, 300, null, null],
-        [0, "초절정미녀", null, 0, null, 95, 65, 95, 0, 160, 300, null, null],
-        [0, "제갈여포", null, 0, null, 92, 54, 91, 0, 160, 300, null, null],
-        [0, "온몸이근육", null, 0, null, 93, 93, 52, 0, 160, 300, null, null, "불끈불끈"],
-        [0, "네이미", null, 0, null, 91, 93, 56, 0, 160, 300, null, null],
-        [0, "ARES군주", null, 0, null, 90, 93, 55, 0, 160, 300, null, null],
-        [0, "중달", null, 0, null, 93, 92, 56, 0, 160, 300, null, null],
-        [0, "쿠레나이", null, 0, null, 90, 52, 90, 0, 160, 300, null, null],
-        [0, "만샘", null, 0, null, 92, 55, 92, 0, 160, 300, null, null],
-        [0, "우돌", null, 0, null, 93, 91, 53, 0, 160, 300, null, null],
-        [0, "아이린", null, 0, null, 93, 54, 90, 0, 160, 300, null, null],
-        [0, "유카", null, 0, null, 91, 92, 57, 0, 160, 300, null, null],
-        [0, "기", null, 0, null, 95, 90, 52, 0, 160, 300, null, null],
-        [0, "병리학적자세", null, 0, null, 91, 55, 93, 0, 160, 300, null, null],
-        [0, "료우기시키", null, 0, null, 92, 90, 53, 0, 160, 300, null, null],
-        [0, "Cure", null, 0, null, 92, 92, 55, 0, 160, 300, null, null],
-        [0, "40장로", null, 0, null, 85, 85, 85, 0, 160, 300, null, null]
-    ],
-    "initialEvents":[
-        [
-            true,
-            ["ChangeCity", "all", {
-                "trade":100
-            }]
-        ]
-    ],
-    "events":[
-        [
-            "month", 1000,
-            ["Date", "==", 180, 1],
-            ["ChangeCity", "all", {
-                "trade":100
-            }],
-            ["DeleteEvent"]
-        ],
-        [
-            "month", 1000,
-            ["Date", "==", 180, 7],
-            ["ChangeCity", "all", {
-                "trade":100
-            }],
-            ["DeleteEvent"]
-        ],
-        [
-            "month", 1000,
-            ["Date", "==", 181, 1],
-            ["ChangeCity", "all", {
-                "trade":100
-            }],
-            ["DeleteEvent"]
-        ],
-        [
-            "month", 1000,
-            ["Date", "==", 181, 7],
-            ["ChangeCity", "all", {
-                "trade":100
-            }],
-            ["DeleteEvent"]
-        ],
-        [
-            "month", 1000,
-            ["Date", "==", 182, 1],
-            ["ChangeCity", "all", {
-                "trade":100
-            }],
-            ["DeleteEvent"]
-        ],
-        [
-            "month", 1000,
-            ["Date", "==", 182, 7],
-            ["ChangeCity", "all", {
-                "trade":100
-            }],
-            ["DeleteEvent"]
-        ],
-        [
-            "destroy_nation", 1000,
-            ["and",
-                ["Date", ">=", 183, 1],
-                ["RemainNation", "==", 1]
-            ],
-            ["BlockScoutAction"],
-            ["DeleteEvent"]
-        ]
-    ]
-}

hwe/scenario/scenario_904.json

@@ -1,27 +1,19 @@
 {
-    "title": "【이벤트】 대리전",
-    "startYear": 180,
-    "map": {
-        "mapName": "miniche_b"
+    "title":"【이벤트】 대리전",
+    "startYear":180,
+    "map":{
+        "mapName":"miniche_b"
     },
-    "history": [
+    "history":[
         "<C>●</>180년 1월:<L><b>【이벤트】</b></>NPC 군주 뒤에 플레이해보는 이벤트 깃수"
     ],
     "const": {
-        "joinRuinedNPCProp": 0,
-        "npcBanMessageProb": 1,
+        "joinRuinedNPCProp":0,
+        "npcBanMessageProb":1,
         "availableGeneralCommand": {
-            "개인": [
+            "": [
                 "휴식",
-                "che_요양",
-                "che_단련",
-                "che_숙련전환",
-                "che_견문",
-                "che_은퇴",
-                "che_장비매매",
-                "che_군량매매",
-                "che_내정특기초기화",
-                "che_전투특기초기화"
+                "che_요양"
             ],
             "내정": [
                 "che_농지개간",
@@ -35,29 +27,36 @@
                 "che_물자조달"
             ],
             "군사": [
+                "che_소집해제",
+                "che_첩보",
                 "che_징병",
                 "che_모병",
                 "che_훈련",
                 "che_사기진작",
-                "che_출병",
-                "che_집합",
-                "che_소집해제",
-                "che_첩보"
+                "che_출병"
             ],
             "인사": [
                 "che_이동",
                 "che_강행",
                 "che_인재탐색",
+                "che_집합",
                 "che_귀환",
                 "che_랜덤임관"
             ],
             "계략": [
-                "che_선동",
-                "che_탈취",
+                "che_화계",
                 "che_파괴",
-                "che_화계"
+                "che_탈취",
+                "che_선동"
             ],
-            "국가": [
+            "개인": [
+                "che_내정특기초기화",
+                "che_전투특기초기화",
+                "che_단련",
+                "che_숙련전환",
+                "che_견문",
+                "che_장비매매",
+                "che_군량매매",
                 "che_증여",
                 "che_헌납",
                 "che_하야"
@@ -94,755 +93,102 @@
             ]
         }
     },
-    "nation": [
-        [
-            "엄백호",
-            "#800080",
-            10000,
-            10000,
-            "엄백호",
-            500,
-            "che_덕가",
-            1,
-            [
-                "건안"
-            ]
-        ],
-        [
-            "맹획",
-            "#A0522D",
-            10000,
-            10000,
-            "맹획",
-            500,
-            "che_덕가",
-            1,
-            [
-                "월수"
-            ]
-        ],
-        [
-            "유표",
-            "#E0FFFF",
-            10000,
-            10000,
-            "유표",
-            500,
-            "che_도가",
-            1,
-            [
-                "영릉"
-            ]
-        ],
-        [
-            "올돌골",
-            "#800000",
-            10000,
-            10000,
-            "올돌골",
-            500,
-            "che_도적",
-            1,
-            [
-                "남해"
-            ]
-        ],
-        [
-            "동탁",
-            "#A9A9A9",
-            10000,
-            10000,
-            "동탁",
-            500,
-            "che_도적",
-            1,
-            [
-                "안정"
-            ]
-        ],
-        [
-            "유비",
-            "#008000",
-            10000,
-            10000,
-            "유비",
-            500,
-            "che_명가",
-            1,
-            [
-                "평원"
-            ]
-        ],
-        [
-            "유기",
-            "#008080",
-            10000,
-            10000,
-            "유기",
-            500,
-            "che_명가",
-            1,
-            [
-                "강하"
-            ]
-        ],
-        [
-            "유장",
-            "#483D8B",
-            10000,
-            10000,
-            "유장",
-            500,
-            "che_묵가",
-            1,
-            [
-                "덕양"
-            ]
-        ],
-        [
-            "조조",
-            "#000080",
-            10000,
-            10000,
-            "조조",
-            500,
-            "che_법가",
-            1,
-            [
-                "진류"
-            ]
-        ],
-        [
-            "원소",
-            "#FF00FF",
-            10000,
-            10000,
-            "원소",
-            500,
-            "che_병가",
-            1,
-            [
-                "거록"
-            ]
-        ],
-        [
-            "공손찬",
-            "#87CEEB",
-            10000,
-            10000,
-            "공손찬",
-            500,
-            "che_병가",
-            1,
-            [
-                "계"
-            ]
-        ],
-        [
-            "신라",
-            "#FFA500",
-            10000,
-            10000,
-            "신라",
-            500,
-            "che_불가",
-            1,
-            [
-                "계림"
-            ]
-        ],
-        [
-            "고구려",
-            "#FF6347",
-            10000,
-            10000,
-            "고구려",
-            500,
-            "che_불가",
-            1,
-            [
-                "국내"
-            ]
-        ],
-        [
-            "장로",
-            "#20B2AA",
-            10000,
-            10000,
-            "장로",
-            500,
-            "che_오두미도",
-            1,
-            [
-                "상용"
-            ]
-        ],
-        [
-            "도겸",
-            "#00FF00",
-            10000,
-            10000,
-            "도겸",
-            500,
-            "che_오두미도",
-            1,
-            [
-                "하비"
-            ]
-        ],
-        [
-            "손권",
-            "#FF0000",
-            10000,
-            10000,
-            "손권",
-            500,
-            "che_유가",
-            1,
-            [
-                "오"
-            ]
-        ],
-        [
-            "헌제",
-            "#BA55D3",
-            10000,
-            10000,
-            "헌제",
-            500,
-            "che_유가",
-            1,
-            [
-                "홍농"
-            ]
-        ],
-        [
-            "원술",
-            "#FFC0CB",
-            10000,
-            10000,
-            "원술",
-            500,
-            "che_음양가",
-            1,
-            [
-                "여남"
-            ]
-        ],
-        [
-            "마등",
-            "#808000",
-            10000,
-            10000,
-            "마등",
-            500,
-            "che_종횡가",
-            1,
-            [
-                "무도"
-            ]
-        ],
-        [
-            "목록대왕",
-            "#7CFC00",
-            10000,
-            10000,
-            "목록대왕",
-            500,
-            "che_종횡가",
-            1,
-            [
-                "건녕"
-            ]
-        ],
-        [
-            "장량",
-            "#FFD700",
-            10000,
-            10000,
-            "장량",
-            500,
-            "che_태평도",
-            1,
-            [
-                "하내"
-            ]
-        ]
+    "nation":[
+        ["엄백호",   "#800080", 10000, 10000, "엄백호",   500, "che_덕가",     1, ["건안"]],
+        ["맹획",     "#A0522D", 10000, 10000, "맹획",     500, "che_덕가",     1, ["월수"]],
+        ["유표",     "#E0FFFF", 10000, 10000, "유표",     500, "che_도가",     1, ["영릉"]],
+        ["올돌골",   "#800000", 10000, 10000, "올돌골",   500, "che_도적",     1, ["남해"]],
+        ["동탁",     "#A9A9A9", 10000, 10000, "동탁",     500, "che_도적",     1, ["안정"]],
+        ["유비",     "#008000", 10000, 10000, "유비",     500, "che_명가",     1, ["평원"]],
+        ["유기",     "#008080", 10000, 10000, "유기",     500, "che_명가",     1, ["강하"]],
+        ["유장",     "#483D8B", 10000, 10000, "유장",     500, "che_묵가",     1, ["덕양"]],
+        ["조조",     "#000080", 10000, 10000, "조조",     500, "che_법가",     1, ["진류"]],
+        ["원소",     "#FF00FF", 10000, 10000, "원소",     500, "che_병가",     1, ["거록"]],
+        ["공손찬",   "#87CEEB", 10000, 10000, "공손찬",   500, "che_병가",     1, ["계"]],
+        ["신라",     "#FFA500", 10000, 10000, "신라",     500, "che_불가",     1, ["계림"]],
+        ["고구려",   "#FF6347", 10000, 10000, "고구려",   500, "che_불가",     1, ["국내"]],
+        ["장로",     "#20B2AA", 10000, 10000, "장로",     500, "che_오두미도", 1, ["상용"]],
+        ["도겸",     "#00FF00", 10000, 10000, "도겸",     500, "che_오두미도", 1, ["하비"]],
+        ["손권",     "#FF0000", 10000, 10000, "손권",     500, "che_유가",     1, ["오"]],
+        ["헌제",     "#BA55D3", 10000, 10000, "헌제",     500, "che_유가",     1, ["홍농"]],
+        ["원술",     "#FFC0CB", 10000, 10000, "원술",     500, "che_음양가",   1, ["여남"]],
+        ["마등",     "#808000", 10000, 10000, "마등",     500, "che_종횡가",   1, ["무도"]],
+        ["목록대왕", "#7CFC00", 10000, 10000, "목록대왕", 500, "che_종횡가",   1, ["건녕"]],
+        ["장량",     "#FFD700", 10000, 10000, "장량",     500, "che_태평도",   1, ["하내"]]
     ],
-    "general": [
-        [
-            999,
-            "엄백호",
-            1217,
-            1,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "맹획",
-            1108,
-            2,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "유표",
-            1293,
-            3,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "올돌골",
-            1241,
-            4,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "동탁",
-            1083,
-            5,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "유비",
-            1281,
-            6,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "유기",
-            1276,
-            7,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "유장",
-            1290,
-            8,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "조조",
-            1392,
-            9,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "원소",
-            1268,
-            10,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "공손찬",
-            1033,
-            11,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "석벌휴",
-            null,
-            12,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "고남무",
-            null,
-            13,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "장로",
-            1319,
-            14,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "도겸",
-            1074,
-            15,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "손권",
-            1169,
-            16,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "헌제",
-            1002,
-            17,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "원술",
-            1269,
-            18,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "마등",
-            1094,
-            19,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "목록대왕",
-            1110,
-            20,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ],
-        [
-            999,
-            "장량",
-            1318,
-            21,
-            null,
-            85,
-            85,
-            85,
-            12,
-            150,
-            250,
-            null,
-            null
-        ]
+    "general":[
+        [999, "엄백호",   1217,  1, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "맹획",     1108,  2, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "유표",     1293,  3, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "올돌골",   1241,  4, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "동탁",     1083,  5, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "유비",     1281,  6, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "유기",     1276,  7, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "유장",     1290,  8, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "조조",     1392,  9, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "원소",     1268, 10, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "공손찬",   1033, 11, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "석벌휴",   null, 12, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "고남무",   null, 13, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "장로",     1319, 14, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "도겸",     1074, 15, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "손권",     1169, 16, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "헌제",     1002, 17, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "원술",     1269, 18, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "마등",     1094, 19, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "목록대왕", 1110, 20, null, 85, 85, 85, 12, 150, 250, null, null],
+        [999, "장량",     1318, 21, null, 85, 85, 85, 12, 150, 250, null, null]
     ],
-    "events": [
+    "events":[
         [
-            "month",
-            1000,
-            [
-                "or",
-                [
-                    "Date",
-                    "==",
-                    null,
-                    12
-                ],
-                [
-                    "Date",
-                    "==",
-                    null,
-                    6
-                ]
-            ],
-            [
-                "CreateManyNPC",
-                10,
-                10
-            ],
-            [
-                "DeleteEvent"
-            ]
+            "month", 1000,
+            ["or", ["Date", "==", null, 12], ["Date", "==", null, 6]],
+            ["CreateManyNPC", 10, 10],
+            ["DeleteEvent"]
         ],
         [
-            "month",
-            1000,
-            [
-                "Date",
-                "==",
-                181,
-                1
-            ],
-            [
-                "OpenNationBetting",
-                4,
-                1000
-            ],
-            [
-                "OpenNationBetting",
-                1,
-                1000
-            ],
-            [
-                "DeleteEvent"
-            ]
+            "month", 1000,
+            ["Date", "==", 181, 1],
+            ["OpenNationBetting", 4, 1000],
+            ["OpenNationBetting", 1, 1000],
+            ["DeleteEvent"]
         ],
         [
-            "month",
-            1000,
-            [
-                "and",
-                [
-                    "Date",
-                    ">=",
-                    183,
-                    1
-                ],
-                [
-                    "RemainNation",
-                    "<=",
-                    16
-                ]
+            "month", 1000,
+            ["and",
+                ["Date", ">=", 183, 1],
+                ["RemainNation", "<=", 16]
             ],
-            [
-                "OpenNationBetting",
-                4,
-                1000
-            ],
-            [
-                "OpenNationBetting",
-                1,
-                1000
-            ],
-            [
-                "DeleteEvent"
-            ]
+            ["OpenNationBetting", 4, 1000],
+            ["OpenNationBetting", 1, 1000],
+            ["DeleteEvent"]
         ],
         [
-            "month",
-            1000,
-            [
-                "and",
-                [
-                    "Date",
-                    ">=",
-                    183,
-                    1
-                ],
-                [
-                    "RemainNation",
-                    "<=",
-                    8
-                ]
+            "month", 1000,
+            ["and",
+                ["Date", ">=", 183, 1],
+                ["RemainNation", "<=", 8]
             ],
-            [
-                "OpenNationBetting",
-                1,
-                1000
-            ],
-            [
-                "DeleteEvent"
-            ]
+            ["OpenNationBetting", 1, 1000],
+            ["DeleteEvent"]
         ],
         [
-            "month",
-            1000,
-            [
-                "and",
-                [
-                    "Date",
-                    ">=",
-                    183,
-                    1
-                ],
-                [
-                    "RemainNation",
-                    "<=",
-                    4
-                ]
+            "month", 1000,
+            ["and",
+                ["Date", ">=", 183, 1],
+                ["RemainNation", "<=", 4]
             ],
-            [
-                "OpenNationBetting",
-                1,
-                1000
-            ],
-            [
-                "DeleteEvent"
-            ]
+            ["OpenNationBetting", 1, 1000],
+            ["DeleteEvent"]
         ],
         [
-            "destroy_nation",
-            1000,
-            [
-                "and",
-                [
-                    "Date",
-                    ">=",
-                    183,
-                    1
-                ],
-                [
-                    "RemainNation",
-                    "==",
-                    1
-                ]
+            "destroy_nation", 1000,
+            ["and",
+                ["Date", ">=", 183, 1],
+                ["RemainNation", "==", 1]
             ],
-            [
-                "BlockScoutAction"
-            ],
-            [
-                "DeleteEvent"
-            ]
+            ["BlockScoutAction"],
+            ["DeleteEvent"]
         ]
     ]
 }

hwe/scss/chiefCenter.scss

@@ -31,16 +31,11 @@ $modcolor2: color.adjust($nbase2color, $lightness: -5%);
             line-height: 30px;
         }
 
-        .time_pad.inverted{
-            background-color: gray;
-            color: white;
-        }
-
         .turn_pad {
             line-height: 30px;
         }
 
-        .row:nth-of-type(odd) .turn_pad {
+        .row:nth-child(odd) .turn_pad {
             background-color: $modcolor2;
         }
     }
@@ -88,7 +83,7 @@ $modcolor2: color.adjust($nbase2color, $lightness: -5%);
     }
 
     .commandBox .controlPad {
-        .turn_pad:nth-of-type(even) {
+        .turn_pad:nth-child(2n) {
             background-color: $modcolor2;
         }
     }
@@ -114,6 +109,7 @@ $modcolor2: color.adjust($nbase2color, $lightness: -5%);
         width: 500px;
         height: 460px;
         margin: auto;
+        overflow: hidden;
     }
 
     #mainTable {
@@ -135,7 +131,7 @@ $modcolor2: color.adjust($nbase2color, $lightness: -5%);
     .commandBox .controlPad {
         margin-top: 10px;
 
-        .turn_pad:nth-of-type(even) {
+        .turn_pad:nth-child(even) {
             background-color: $modcolor2;
         }
     }
@@ -149,7 +145,7 @@ $modcolor2: color.adjust($nbase2color, $lightness: -5%);
         overflow: hidden;
 
 
-        .turn_pad:nth-of-type(even) {
+        .turn_pad:nth-child(even) {
             background-color: $modcolor2;
         }
     }

hwe/scss/nationGeneral.scss

@@ -1,28 +0,0 @@
-@import '@scss/common/bootstrap5.scss';
-@import "@scss/game_bg.scss";
-@import "@scss/util.scss";
-
-#container{
-    padding: 0;
-}
-
-#app {
-    width: 100%;
-}
-
-
-@include media-1000px {
-    #container {
-        width: 1000px;
-        margin: 0 auto;
-        position: relative;
-    }
-}
-
-@include media-500px {
-    #container {
-        position: relative;
-        width: 500px;
-        margin: auto;
-    }
-}

hwe/templates/cityGeneral.php

@@ -1,7 +1,6 @@
 <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?>"
@@ -34,7 +33,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; ?>
@@ -50,5 +49,5 @@
     <td>재 야</td>
     <?php endif; ?>
 <?php endif; ?>
-
+    
 </tr>

hwe/templates/commandButton.php

@@ -10,7 +10,7 @@
 <?=$btnBegin??''?><a href='b_tournament.php' target='_blank' class='open-window <?=$btnClassForTournament??""?>'>토 너 먼 트</a><?=$btnEnd??''?>
 <?=$btnBegin??''?><a href='b_myKingdomInfo.php' class='commandButton <?=$btnClass??""?> <?= $meLevel >= 1 ? '' : 'disabled' ?>'>세력 정보</a><?=$btnEnd??''?>
 <?=$btnBegin??''?><a href='b_myCityInfo.php' class='commandButton <?=$btnClass??""?> <?= ($meLevel >= 1 && $nationLevel >= 1) ? '' : 'disabled' ?>'>세력 도시</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='v_nationGeneral.php' class='commandButton <?=$btnClass??""?> <?= $meLevel >= 1 ? '' : 'disabled' ?>'>세력 장수</a><?=$btnEnd??''?>
+<?=$btnBegin??''?><a href='b_myGenInfo.php' class='commandButton <?=$btnClass??""?> <?= $meLevel >= 1 ? '' : 'disabled' ?>'>세력 장수</a><?=$btnEnd??''?>
 <?=$btnBegin??''?><a href='b_diplomacy.php' class='commandButton <?=$btnClass??""?>'>중원 정보</a><?=$btnEnd??''?>
 <?=$btnBegin??''?><a href='b_currentCity.php' class='commandButton <?=$btnClass??""?>'>현재 도시</a><?=$btnEnd??''?>
 <?=$btnBegin??''?><a href='b_battleCenter.php' target='_blank' class='open-window commandButton <?=$btnClass??""?> <?= $showSecret ? '' : 'disabled' ?>'>감 찰 부</a><?=$btnEnd??''?>

hwe/templates/generalList.php

@@ -22,7 +22,6 @@
 <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/templates/map.php

@@ -1,4 +1,4 @@
-<div class="world_map map_theme_<?= $mapName ?> draw_required">
+<div class="world_map map_theme_<?= $mapTheme ?> draw_required">
     <div class="map_title obj_tooltip" data-bs-toggle="tooltip" data-bs-placement="top" data-tooltip-class="map_title_tooltiptext">
         <span class="map_title_text ">
         </span>

hwe/ts/ChiefCenter/BottomItem.vue

@@ -1,8 +1,8 @@
 <template>
   <div
-    v-for="(officer, _idx) in [chiefList[chiefLevel]]"
-    :key="_idx"
     :class="[`chiefBox${chiefLevel}`, 'subRows']"
+    v-for="(officer, idx) in [chiefList[chiefLevel]]"
+    :key="idx"
     :style="style"
     @click="$emit('click', this)"
   >
@@ -13,22 +13,21 @@
         textDecoration: isMe ? 'underline' : undefined,
       }"
     >
-      {{ officer ? officer?.name ?? "-" : "" }}
+      {{ officer?(officer?.name ?? "-"):'' }}
     </div>
     <div class="bg1 center row gx-0">
-      <div class="col">
-        {{ officer?.officerLevelText }}
-      </div>
-      <div class="col">
-        {{ officer ? (officer?.turnTime ?? "  -  ").slice(-5) : "" }}
-      </div>
+      <div class="col">{{ officer?.officerLevelText }}</div>
+      <div class="col">{{ officer?((officer?.turnTime ?? "  -  ").slice(-5)):'' }}</div>
     </div>
     <div
-      v-for="(turn, idx) in officer?.turn ?? []"
-      :key="idx"
       class="tableCell align-self-center turn_pad"
+      v-for="(turn, idx) in officer?.turn??[]"
+      :key="idx"
       :style="{
-        fontSize: mb_strwidth(turn.brief) > 28 ? `${28 / mb_strwidth(turn.brief)}em` : undefined,
+        fontSize:
+          mb_strwidth(turn.brief) > 28
+            ? `${28 / mb_strwidth(turn.brief)}em`
+            : undefined,
       }"
     >
       {{ turn.brief }}

hwe/ts/ChiefCenter/TopItem.vue

@@ -1,178 +1,88 @@
 <template>
-  <div style="position: relative">
-    <DragSelect
-      v-slot="{ selected }"
-      :class="['subRows', 'chiefCommand']"
-      :style="style"
-      :disabled="!props.officer || !isEditMode"
-      attribute="turnIdx"
-      @dragStart="dragStart()"
-      @dragDone="dragDone(...$event)"
-    >
-      <div class="bg1 center row gx-0" style="font-size: 1.2em">
-        <div class="col-5 align-self-center text-end">
-          {{ officer ? `${officer.officerLevelText} : ` : "" }}
-        </div>
-        <div
-          class="col-7 align-self-center"
-          :style="{
-            color: getNpcColor(officer?.npcType ?? 0),
-          }"
-        >
-          {{ officer?.name }}
-        </div>
+  <div :class="['subRows', 'chiefCommand']" :style="style">
+    <div class="bg1 center row gx-0" style="font-size: 1.2em">
+      <div class="col-5 align-self-center text-end">
+        {{ officer ? `${officer.officerLevelText} : ` : "" }}
       </div>
-      <div v-for="vidx in maxTurn" :key="vidx" :turnIdx="vidx" class="row c-bg2 gx-0">
-        <div
-          :class="[
-            'col-2',
-            'time_pad',
-            'f_tnum',
-            (isDragToggle || isCopyButtonShown) && selected.has(vidx.toString()) ? 'inverted' : undefined,
-          ]"
-        >
-          {{ turnTimes[vidx - 1] }}
-        </div>
-        <div v-if="!officer || !officer.turn || !(vidx - 1 in officer.turn)" class="center" />
-        <div
-          v-else
-          class="tableCell align-self-center col-10 center turn_pad"
-          :style="{
-            fontSize:
-              mb_strwidth(officer.turn[vidx - 1].brief) > 28
-                ? `${28 / mb_strwidth(officer.turn[vidx - 1].brief)}em`
-                : undefined,
-          }"
-        >
-          {{ officer.turn[vidx - 1].brief }}
-        </div>
+      <div
+        class="col-7 align-self-center"
+        :style="{
+          color: getNpcColor(officer?.npcType ?? 0),
+        }"
+      >
+        {{ officer?.name }}
       </div>
-    </DragSelect>
-    <BButton
-      ref="btnCopy"
-      :style="{
-        position: 'absolute',
-        display: isCopyButtonShown ? 'block' : 'none',
-        top: `${btnPos * 30 + 25}px`,
-        right: '10px',
-      }"
-      @blur="isCopyButtonShown = false"
-      @click="tryCopy()"
-    >
-      복사하기
-    </BButton>
+    </div>
+    <div class="row c-bg2 gx-0" v-for="vidx in maxTurn" :key="vidx">
+      <div class="col-2 time_pad f_tnum">
+        {{ turnTimes[vidx - 1] }}
+      </div>
+      <div
+        class="center"
+        v-if="!officer || (!officer.turn) || !(vidx - 1 in officer.turn)"
+      ></div>
+      <div
+        v-else
+        class="tableCell align-self-center col-10 center turn_pad"
+        :style="{
+          fontSize:
+            mb_strwidth(officer.turn[vidx - 1].brief) > 28
+              ? `${28 / mb_strwidth(officer.turn[vidx - 1].brief)}em`
+              : undefined,
+        }"
+      >
+        {{ officer.turn[vidx - 1].brief }}
+      </div>
+    </div>
   </div>
 </template>
-<script setup lang="ts">
+<script lang="ts">
 import { getNpcColor } from "@/common_legacy";
+import { ChiefResponse } from "@/defs";
 import { formatTime } from "@/util/formatTime";
 import { mb_strwidth } from "@/util/mb_strwidth";
 import { parseTime } from "@/util/parseTime";
-import type { StoredActionsHelper } from "@/util/StoredActionsHelper";
 import addMinutes from "date-fns/esm/addMinutes/index";
 import { range } from "lodash";
-import { inject, onMounted, ref, type PropType } from "vue";
+import { defineComponent, PropType } from "vue";
 import VueTypes from "vue-types";
-import DragSelect from "@/components/DragSelect.vue";
-import { BButton } from "bootstrap-vue-3";
-import { QueryActionHelper } from "@/util/QueryActionHelper";
-import type { ChiefResponse } from "@/defs/API/NationCommand";
 
-const props = defineProps({
-  style: VueTypes.object.isRequired,
-  officer: {
-    type: Object as PropType<ChiefResponse["chiefList"][0]>,
-    default: undefined,
+export default defineComponent({
+  props: {
+    style: VueTypes.object.isRequired,
+    officer: {
+      type: Object as PropType<ChiefResponse["chiefList"][0]>,
+    },
+    turnTerm: VueTypes.integer.isRequired,
+    maxTurn: VueTypes.integer.isRequired,
+  },
+  methods: {
+    getNpcColor,
+    mb_strwidth,
   },
-  turnTerm: VueTypes.integer.isRequired,
-  maxTurn: VueTypes.integer.isRequired,
-});
 
-const btnPos = ref(0);
-const btnCopy = ref<InstanceType<typeof BButton> | null>(null);
+  data() {
+    const turnTimes: string[] = [];
+    if (!this.officer || !this.officer.turnTime) {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      for (const _ of range(this.maxTurn)) {
+        turnTimes.push("\xa0");
+      }
+    } else {
+      const baseTurnTime = parseTime(this.officer.turnTime);
+      for (const idx of range(this.officer.turn.length)) {
+        turnTimes.push(
+          formatTime(
+            addMinutes(baseTurnTime, idx * this.turnTerm),
+            this.turnTerm >= 5 ? "HH:mm" : "mm:ss"
+          )
+        );
+      }
+    }
 
-const storedActionsHelper = inject<StoredActionsHelper>("storedNationActionsHelper");
-const isEditMode = storedActionsHelper?.isEditMode ?? ref(false);
-const isDragToggle = ref(false);
-
-const isCopyButtonShown = ref(false);
-
-const queryActionHelper = new QueryActionHelper(props.maxTurn);
-const selectedTurnList = queryActionHelper.selectedTurnList;
-
-onMounted(() => {
-  if (props.officer === undefined) {
-    return;
-  }
-  queryActionHelper.reservedCommandList.value = props.officer.turn.map((rawTurn) => {
     return {
-      ...rawTurn,
-      time: "",
+      turnTimes,
     };
-  });
-  console.log(queryActionHelper.reservedCommandList.value);
+  },
 });
-
-function dragStart() {
-  isDragToggle.value = true;
-}
-
-function eqSet<T>(as: Set<T>, bs: Set<T>) {
-  if (as.size !== bs.size) return false;
-  for (var a of as) if (!bs.has(a)) return false;
-  return true;
-}
-
-function dragDone(...rawSelectedTurn: string[]) {
-  if (rawSelectedTurn.length === 0) {
-    return;
-  }
-  const newSelectedTurnList = new Set<number>();
-
-  let maxPos = -1;
-  for (const rawIdx of rawSelectedTurn) {
-    const idx = parseInt(rawIdx) - 1;
-    newSelectedTurnList.add(idx);
-    maxPos = Math.max(maxPos, idx);
-  }
-
-  btnPos.value = maxPos;
-
-  isDragToggle.value = false;
-  if (newSelectedTurnList.size == 1 && eqSet(selectedTurnList.value, newSelectedTurnList)) {
-    isCopyButtonShown.value = false;
-    return;
-  }
-  selectedTurnList.value = newSelectedTurnList;
-  isCopyButtonShown.value = true;
-  setTimeout(() => {
-    (btnCopy.value?.$el as HTMLButtonElement).focus();
-  }, 0);
-}
-
-function tryCopy() {
-  const actions = queryActionHelper.extractQueryActions();
-  isCopyButtonShown.value = false;
-
-  if (!storedActionsHelper) {
-    return;
-  }
-  storedActionsHelper.clipboard.value = [...actions];
-}
-
-const turnTimes = ref<string[]>([]);
-
-if (!props.officer || !props.officer.turnTime) {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  for (const _ of range(props.maxTurn)) {
-    turnTimes.value.push("\xa0");
-  }
-} else {
-  const baseTurnTime = parseTime(props.officer.turnTime);
-  for (const idx of range(props.officer.turn.length)) {
-    turnTimes.value.push(
-      formatTime(addMinutes(baseTurnTime, idx * props.turnTerm), props.turnTerm >= 5 ? "HH:mm" : "mm:ss")
-    );
-  }
-}
 </script>

hwe/ts/GameConstStore.ts

@@ -1,49 +0,0 @@
-import { SammoAPI } from './SammoAPI';
-import type { GetConstResponse } from './defs/API/Global';
-import type { CityID, CrewTypeID, GameCityDefault, GameConstType, GameUnitType, GameIActionCategory, GameIActionKey, GameIActionInfo } from './defs/GameObj';
-
-export class GameConstStore {
-    public readonly gameConst: GameConstType;
-    public readonly gameUnitConst: Record<CrewTypeID, GameUnitType>;
-    public readonly cityConst: Record<CityID, GameCityDefault>;
-    public readonly cityConstMap: {
-        region: Record<number | string, string | number>;
-        level: Record<number | string, string | number>; //defs.CityLevelText
-    };
-    public readonly iActionInfo: Record<
-        GameIActionCategory,
-        Record<
-            GameIActionKey,
-            GameIActionInfo
-        >
-    >;
-    public readonly iActionKeyMap: Record<string, GameIActionCategory>;
-
-    constructor(response: GetConstResponse) {
-        const data = response.data;
-        this.gameConst = Object.freeze(data.gameConst);
-        this.gameUnitConst = Object.freeze(data.gameUnitConst);
-        this.cityConst = Object.freeze(data.cityConst);
-        this.cityConstMap = Object.freeze(data.cityConstMap);
-        this.iActionInfo = Object.freeze(data.iActionInfo);
-        this.iActionKeyMap = Object.freeze(data.iActionKeyMap);
-    }
-}
-
-let gameConstStore: GameConstStore | undefined = undefined;
-
-export async function getGameConstStore(): Promise<GameConstStore> {
-    //TODO: LocalStorage Cache 조합도 생각해보기.
-    if (gameConstStore !== undefined) {
-        return gameConstStore;
-    }
-    try {
-        const result = await SammoAPI.Global.GetConst();
-        gameConstStore = new GameConstStore(result);
-    }
-    catch (e: unknown) {
-        console.error(`FATAL!: GameConst를 가져오지 못함: ${e}`);
-        throw e;
-    }
-    return gameConstStore;
-}

hwe/ts/PageBoard.vue

@@ -7,23 +7,29 @@
       <div class="row gx-0">
         <div class="col-2 col-md-1 articleTitle bg1 center">제목</div>
         <div class="col-10 col-md-11">
-          <input v-model="newArticle.title" class="titleInput" type="text" maxlength="250" placeholder="제목" />
+          <input
+            class="titleInput"
+            type="text"
+            maxlength="250"
+            placeholder="제목"
+            v-model="newArticle.title"
+          />
         </div>
       </div>
       <div class="row gx-0">
         <div class="col-2 col-md-1 bg1 center">내용</div>
         <div class="col-10 col-md-11">
           <textarea
-            ref="newArticleTextForm"
-            v-model="newArticle.text"
             class="contentInput autosize"
+            ref="newArticleTextForm"
             placeholder="내용"
+            v-model="newArticle.text"
             @input="autoResizeTextarea"
           />
         </div>
       </div>
       <div class="row">
-        <div class="col-8 col-md-10" />
+        <div class="col-8 col-md-10"></div>
         <div class="col-4 col-md-2 d-grid">
           <b-button id="submitArticle" @click="submitArticle"> 등록 </b-button>
         </div>
@@ -35,13 +41,13 @@
           v-for="article in articles"
           :key="article.no"
           :article="article"
-          @submitComment="reloadArticles"
+          @submit-comment="reloadArticles"
         />
       </template>
       <template v-else> 게시물이 없습니다. </template>
     </div>
 
-    <BottomBar />
+    <BottomBar/>
   </div>
 </template>
 
@@ -52,7 +58,7 @@ import BottomBar from "@/components/BottomBar.vue";
 import BoardArticle from "@/components/BoardArticle.vue";
 import { convertFormData } from "@util/convertFormData";
 import axios from "axios";
-import type { InvalidResponse } from "@/defs";
+import { InvalidResponse } from "@/defs";
 import { autoResizeTextarea } from "@util/autoResizeTextarea";
 import { unwrap } from "@util/unwrap";
 export type BoardResponse = {
@@ -97,49 +103,6 @@ export default defineComponent({
       required: true,
     },
   },
-
-  setup(props) {
-    const newArticleTextForm = ref<HTMLInputElement>();
-    const articles = reactive<BoardArticleItem[]>([]);
-
-    const reloadArticles = async () => {
-      let boardResponse: BoardResponse;
-
-      try {
-        const response = await axios({
-          url: "j_board_get_articles.php",
-          responseType: "json",
-          method: "post",
-          data: convertFormData({
-            isSecret: props.isSecretBoard,
-          }),
-        });
-        const result: InvalidResponse | BoardResponse = response.data;
-        if (!result.result) {
-          throw result.reason;
-        }
-        boardResponse = result;
-      } catch (e) {
-        console.error(e);
-        alert(`에러: ${e}`);
-        return;
-      }
-
-      articles.length = 0;
-      articles.push(...Object.values(boardResponse.articles));
-      articles.reverse();
-    };
-
-    onMounted(async () => {
-      await reloadArticles();
-    });
-
-    return {
-      newArticleTextForm,
-      articles,
-      reloadArticles,
-    };
-  },
   data() {
     return {
       title: this.isSecretBoard ? "기밀실" : "회의실",
@@ -187,5 +150,48 @@ export default defineComponent({
       await this.reloadArticles();
     },
   },
+
+  setup(props) {
+    const newArticleTextForm = ref<HTMLInputElement>();
+    const articles = reactive<BoardArticleItem[]>([]);
+
+    const reloadArticles = async () => {
+      let boardResponse: BoardResponse;
+
+      try {
+        const response = await axios({
+          url: "j_board_get_articles.php",
+          responseType: "json",
+          method: "post",
+          data: convertFormData({
+            isSecret: props.isSecretBoard,
+          }),
+        });
+        const result: InvalidResponse | BoardResponse = response.data;
+        if (!result.result) {
+          throw result.reason;
+        }
+        boardResponse = result;
+      } catch (e) {
+        console.error(e);
+        alert(`에러: ${e}`);
+        return;
+      }
+
+      articles.length = 0;
+      articles.push(...Object.values(boardResponse.articles));
+      articles.reverse();
+    };
+
+    onMounted(async () => {
+      await reloadArticles();
+    });
+
+    return {
+      newArticleTextForm,
+      articles,
+      reloadArticles,
+    };
+  },
 });
-</script>
+</script>

hwe/ts/PageChiefCenter.vue

@@ -2,12 +2,29 @@
   <div id="container" class="pageChiefCenter">
     <TopBackBar title="사령부" reloadable @reload="reloadTable" />
 
-    <div v-if="chiefList !== undefined" id="mainTable" :class="`${targetIsMe ? 'targetIsMe' : 'targetIsNotMe'}`">
-      <template v-for="(chiefLevel, vidx) in [12, 10, 8, 6, 11, 9, 7, 5]" :key="chiefLevel">
-        <div v-if="vidx % 4 == 0" :class="['turnIdx', vidx == 0 && !targetIsMe ? undefined : 'only1000px']">
+    <div
+      id="mainTable"
+      v-if="chiefList !== undefined"
+      :class="`${targetIsMe ? 'targetIsMe' : 'targetIsNotMe'}`"
+    >
+      <template
+        v-for="(chiefLevel, vidx) in [12, 10, 8, 6, 11, 9, 7, 5]"
+        :key="chiefLevel"
+      >
+        <div
+          v-if="vidx % 4 == 0"
+          :class="[
+            'turnIdx',
+            vidx == 0 && !targetIsMe ? undefined : 'only1000px',
+          ]"
+        >
           <div :class="['subRows', 'bg0']" :style="mainTableGridRows">
             <div class="bg1">&nbsp;</div>
-            <div v-for="idx in maxChiefTurn" :key="idx" :class="[`turnIdxLeft`, 'align-self-center', 'center']">
+            <div
+              v-for="idx in maxChiefTurn"
+              :class="[`turnIdxLeft`, 'align-self-center', 'center']"
+              :key="idx"
+            >
               {{ idx }}
             </div>
           </div>
@@ -24,27 +41,152 @@
             :maxTurn="maxChiefTurn"
             :turnTerm="turnTerm"
           />
-          <ChiefReservedCommand
-            v-else
-            :key="idx"
-            :targetIsMe="targetIsMe"
-            :year="year"
-            :month="month"
-            :turn="officer.turn"
-            :turnTerm="turnTerm"
-            :commandList="unwrap(commandList)"
-            :turnTime="officer.turnTime"
-            :maxTurn="maxChiefTurn"
-            :maxPushTurn="Math.floor(maxChiefTurn / 2)"
-            :date="date"
-            :officer="officer"
-            @raiseReload="reloadTable()"
-          />
+          <div class="commandBox" v-else>
+            <div
+              class="only1000px bg1 center row gx-0"
+              style="height: 24px; font-size: 1.2em"
+            >
+              <div class="col-5 align-self-center text-end">
+                {{ officer.officerLevelText }} :
+              </div>
+              <div
+                class="col-7 align-self-center"
+                :style="{
+                  color: getNpcColor(officer.npcType ?? 0),
+                }"
+              >
+                {{ officer.name }}
+              </div>
+            </div>
+            <div
+              :class="[
+                'row',
+                'controlPad',
+                chiefLevel == officerLevel ? 'targetIsMe' : 'targetIsNotMe',
+              ]"
+            >
+              <div class="col-3 col-md-12 order-md-last">
+                <div class="d-grid mb-1 py-1 only500px bg1 center">
+                  <div
+                    :style="{
+                      color: getNpcColor(officer.npcType ?? 0),
+                      fontSize: '1.2em',
+                    }"
+                  >
+                    {{ officer.name }}
+                  </div>
+                  <div>{{ officer.officerLevelText }}</div>
+                </div>
+                <div class="row gx-1 gy-1 py-1">
+                  <div class="col-md-4 mx-0 mb-0 mt-1 d-grid">
+                    <div
+                      class="alert alert-primary mb-0 center"
+                      style="padding: 0.5rem 0"
+                    >
+                      {{ serverNow }}
+                    </div>
+                  </div>
+
+                  <b-dropdown class="col-md-4" left text="턴 선택">
+                    <b-dropdown-item @click="selectNone()"
+                      >해제</b-dropdown-item
+                    >
+                    <b-dropdown-item @click="selectAll(true)"
+                      >모든턴</b-dropdown-item
+                    >
+                    <b-dropdown-item @click="selectStep(0, 2)"
+                      >홀수턴</b-dropdown-item
+                    >
+                    <b-dropdown-item @click="selectStep(1, 2)"
+                      >짝수턴</b-dropdown-item
+                    >
+                    <b-dropdown-divider></b-dropdown-divider>
+
+                    <b-dropdown-text
+                      v-for="spanIdx in [3, 4, 5, 6, 7]"
+                      :key="spanIdx"
+                    >
+                      {{ spanIdx }}턴 간격<br />
+                      <b-button-group>
+                        <b-button
+                          class="ignoreMe"
+                          v-for="beginIdx in spanIdx"
+                          :key="beginIdx"
+                          @click="selectStep(beginIdx - 1, spanIdx)"
+                          >{{ beginIdx }}</b-button
+                        >
+                      </b-button-group>
+                    </b-dropdown-text>
+                  </b-dropdown>
+                  <b-dropdown class="col-md-4" text="반복">
+                    <b-dropdown-item
+                      v-for="turnIdx in maxPushTurn"
+                      :key="turnIdx"
+                      @click="repeatNationCommand(turnIdx)"
+                      >{{ turnIdx }}턴
+                    </b-dropdown-item>
+                  </b-dropdown>
+                  <b-dropdown
+                    class="col-md-6"
+                    split
+                    text="당기기"
+                    @click="pullNationCommandSingle"
+                  >
+                    <b-dropdown-item
+                      v-for="turnIdx in maxPushTurn"
+                      :key="turnIdx"
+                      @click="pushNationCommand(-turnIdx)"
+                      >{{ turnIdx }}턴
+                    </b-dropdown-item>
+                  </b-dropdown>
+                  <b-dropdown
+                    class="col-md-6"
+                    split
+                    text="미루기"
+                    @click="pushNationCommandSingle"
+                  >
+                    <b-dropdown-item
+                      v-for="turnIdx in maxPushTurn"
+                      :key="turnIdx"
+                      @click="pushNationCommand(turnIdx)"
+                      >{{ turnIdx }}턴
+                    </b-dropdown-item>
+                  </b-dropdown>
+                </div>
+              </div>
+              <div class="col">
+                <ChiefReservedCommand
+                  :key="idx"
+                  :year="year"
+                  :month="month"
+                  :turn="officer.turn"
+                  :turnTerm="turnTerm"
+                  :commandList="commandList"
+                  :turnTime="officer.turnTime"
+                  :maxTurn="maxChiefTurn"
+                  :maxPushTurn="Math.floor(maxChiefTurn / 2)"
+                  :date="date"
+                  v-model:selectedTurn="turnList"
+                  @raiseReload="reloadTable()"
+                />
+              </div>
+            </div>
+          </div>
         </div>
-        <div v-if="vidx % 4 == 3" :class="['turnIdx', vidx == 7 && !targetIsMe ? undefined : 'only1000px']">
+        <div
+          v-if="vidx % 4 == 3"
+          :class="[
+            'turnIdx',
+            vidx == 7 && !targetIsMe ? undefined : 'only1000px',
+          ]"
+        >
           <div :class="['subRows', 'bg0']" :style="mainTableGridRows">
             <div class="bg1">&nbsp;</div>
-            <div v-for="idx in maxChiefTurn" :key="idx" :class="[`turnIdxRight`, 'align-self-center', 'center']">
+            <div
+              v-for="idx in maxChiefTurn"
+              :class="[`turnIdxRight`, 'align-self-center', 'center']"
+              :key="idx"
+            >
               {{ idx }}
             </div>
           </div>
@@ -52,12 +194,19 @@
       </template>
     </div>
   </div>
-  <div v-if="chiefList" id="bottomChiefBox">
+  <div id="bottomChiefBox" v-if="chiefList">
     <div id="bottomChiefList" class="c-bg2">
-      <template v-for="(chiefLevel, vidx) in [12, 10, 8, 6, 11, 9, 7, 5]" :key="chiefLevel">
-        <div v-if="vidx % 4 == 0" class="turnIdx subRows bg0" :style="subTableGridRows">
-          <div class="bg1" style="grid-row: 1/3" />
-          <div v-for="idx in maxChiefTurn" :key="idx" :class="[`turnIdxLeft`]">
+      <template
+        v-for="(chiefLevel, vidx) in [12, 10, 8, 6, 11, 9, 7, 5]"
+        :key="chiefLevel"
+      >
+        <div
+          class="turnIdx subRows bg0"
+          :style="subTableGridRows"
+          v-if="vidx % 4 == 0"
+        >
+          <div class="bg1" style="grid-row: 1/3"></div>
+          <div v-for="idx in maxChiefTurn" :class="[`turnIdxLeft`]" :key="idx">
             {{ idx }}
           </div>
         </div>
@@ -68,9 +217,13 @@
           :isMe="chiefLevel == officerLevel"
           @click="viewTarget = chiefLevel"
         />
-        <div v-if="vidx % 4 == 3" class="turnIdx subRows bg0" :style="subTableGridRows">
-          <div class="bg1" style="grid-row: 1/3" />
-          <div v-for="idx in maxChiefTurn" :key="idx" :class="`turnIdxRight`">
+        <div
+          class="turnIdx subRows bg0"
+          :style="subTableGridRows"
+          v-if="vidx % 4 == 3"
+        >
+          <div class="bg1" style="grid-row: 1/3"></div>
+          <div v-for="idx in maxChiefTurn" :class="`turnIdxRight`" :key="idx">
             {{ idx }}
           </div>
         </div>
@@ -82,128 +235,255 @@
   </div>
 </template>
 <script lang="ts">
-declare const staticValues: {
-  serverNick: string;
-  mapName: string;
-  unitSet: string;
-};
-</script>
-<script lang="ts" setup>
 import "@scss/common/bootstrap5.scss";
 import "@scss/game_bg.scss";
 import "../../css/config.css";
 
-import { computed, provide, reactive, ref, toRefs, watch } from "vue";
+import { computed, defineComponent, reactive, ref, toRefs, watch } from "vue";
 import ChiefReservedCommand from "@/components/ChiefReservedCommand.vue";
 import TopBackBar from "@/components/TopBackBar.vue";
 import BottomBar from "@/components/BottomBar.vue";
 import VueTypes from "vue-types";
-import { isString } from "lodash";
+import { isString, range } from "lodash";
+import { mb_strwidth } from "./util/mb_strwidth";
 import { entriesWithType } from "./util/entriesWithType";
+import { addMilliseconds } from "date-fns";
+import { formatTime } from "./util/formatTime";
+import { parseTime } from "./util/parseTime";
+import { getNpcColor } from "./common_legacy";
 import TopItem from "@/ChiefCenter/TopItem.vue";
 import BottomItem from "@/ChiefCenter/BottomItem.vue";
-import type { OptionalFull } from "./defs";
+import { ChiefResponse, OptionalFull } from "./defs";
 import { SammoAPI } from "./SammoAPI";
-import { unwrap } from "@/util/unwrap";
-import { StoredActionsHelper } from "./util/StoredActionsHelper";
-import type { ChiefResponse } from "./defs/API/NationCommand";
 
-const props = defineProps({
-  maxChiefTurn: VueTypes.number.isRequired,
-});
-
-const tableObj = reactive<Omit<OptionalFull<ChiefResponse>, "result">>({
-  lastExecute: undefined,
-  year: undefined,
-  month: undefined,
-  turnTerm: undefined,
-  date: undefined,
-  chiefList: undefined,
-  isChief: undefined,
-  autorun_limit: undefined,
-  officerLevel: undefined,
-  commandList: undefined,
-  mapName: undefined,
-  unitSet: undefined,
-});
-
-const { year, month, turnTerm, date, chiefList, officerLevel, commandList } = toRefs(tableObj);
-
-const viewTarget = ref<number | undefined>();
-
-const targetIsMe = ref<boolean>(false);
-watch(viewTarget, (val) => {
-  console.log("targetChange!", val, targetIsMe);
-  if (val === undefined) {
-    targetIsMe.value = false;
-    return;
+function isDropdownChildren(e?: Event): boolean {
+  if (!e) {
+    return false;
   }
-  if (tableObj.officerLevel === undefined) {
-    targetIsMe.value = false;
+  if (!e.target) {
+    return false;
   }
-  targetIsMe.value = val === tableObj.officerLevel;
-});
-
-async function reloadTable(): Promise<void> {
-  try {
-    const response = await SammoAPI.NationCommand.GetReservedCommand();
-    console.log(response);
-    for (const [key, value] of entriesWithType(response)) {
-      if (key === "result") {
-        continue;
-      }
-
-      if (key === "officerLevel") {
-        if (value < 5) {
-          tableObj.officerLevel = undefined;
-        } else {
-          tableObj.officerLevel = value as number;
-        }
-        continue;
-      }
-
-      //HACK:
-      tableObj[key as unknown as "year"] = value as unknown as undefined;
-    }
-
-    if (viewTarget.value === undefined) {
-      if (!tableObj.officerLevel) {
-        viewTarget.value = 12;
-      } else {
-        viewTarget.value = tableObj.officerLevel;
-      }
-    }
-  } catch (e) {
-    if (isString(e)) {
-      alert(e);
-    }
-    console.error(e);
-    return;
+  if (
+    (e.target as HTMLElement).classList.contains("dropdown-item") ||
+    (e.target as HTMLElement).classList.contains("dropdown-toggle-split") ||
+    (e.target as HTMLElement).classList.contains("ignoreMe")
+  ) {
+    return true;
   }
+  return false;
 }
 
-const mainTableGridRows = computed(() => {
-  return {
-    gridTemplateRows: `24px repeat(${props.maxChiefTurn}, 30px)`,
-  };
+export default defineComponent({
+  components: {
+    TopBackBar,
+    BottomBar,
+    ChiefReservedCommand,
+    TopItem,
+    BottomItem,
+  },
+  props: {
+    maxChiefTurn: VueTypes.number.isRequired,
+  },
+  watch: {
+    year() {
+      console.log(this.lastExecute);
+    },
+  },
+  methods: {
+    toggleTurn(turnIdx: number) {
+      if (this.turnList.has(turnIdx)) {
+        this.turnList.delete(turnIdx);
+      } else {
+        this.turnList.add(turnIdx);
+      }
+    },
+    selectTurn(turnIdx: number) {
+      this.turnList.clear();
+      this.turnList.add(turnIdx);
+    },
+    selectNone() {
+      this.turnList.clear();
+    },
+    selectAll(e: Event | true) {
+      //NOTE: split 구현에 버그가 있어서, 수동으로 구분해야함
+      if (e !== true && isDropdownChildren(e)) {
+        return;
+      }
+
+      if (this.turnList.size * 3 > this.maxChiefTurn) {
+        this.turnList.clear();
+      } else {
+        for (let i = 0; i < this.maxChiefTurn; i++) {
+          this.turnList.add(i);
+        }
+      }
+    },
+    selectStep(begin: number, step: number) {
+      this.turnList.clear();
+      for (const idx of range(0, this.maxChiefTurn)) {
+        if ((idx - begin) % step == 0) {
+          this.turnList.add(idx);
+        }
+      }
+    },
+    async repeatNationCommand(amount: number) {
+      try {
+        await SammoAPI.NationCommand.RepeatCommand({ amount });
+      } catch (e) {
+        console.error(e);
+        alert(`실패했습니다: ${e}`);
+        return;
+      }
+      await this.reloadTable();
+    },
+    async pushNationCommand(amount: number) {
+      try {
+        await SammoAPI.NationCommand.PushCommand({ amount });
+      } catch (e) {
+        console.error(e);
+        alert(`실패했습니다: ${e}`);
+        return;
+      }
+      await this.reloadTable();
+    },
+    pushNationCommandSingle(e: Event) {
+      //NOTE: split 구현에 버그가 있어서, 수동으로 구분해야함
+      if (isDropdownChildren(e)) {
+        return;
+      }
+      void this.pushNationCommand(1);
+    },
+    pullNationCommandSingle(e: Event) {
+      //NOTE: split 구현에 버그가 있어서, 수동으로 구분해야함
+      if (isDropdownChildren(e)) {
+        return;
+      }
+      void this.pushNationCommand(-1);
+    },
+  },
+  setup(props) {
+    const viewTarget = ref<number | undefined>();
+
+    const turnList = ref(new Set<number>());
+
+    const targetIsMe = ref<boolean>(false);
+    watch(viewTarget, (val) => {
+      console.log("targetChange!", val, targetIsMe);
+      if (val === undefined) {
+        targetIsMe.value = false;
+        return;
+      }
+      if (tableObj.officerLevel === undefined) {
+        targetIsMe.value = false;
+      }
+      targetIsMe.value = val === tableObj.officerLevel;
+      console.log("result", targetIsMe.value);
+    });
+
+    const tableObj = reactive<Omit<OptionalFull<ChiefResponse>, "result">>({
+      lastExecute: undefined,
+      year: undefined,
+      month: undefined,
+      turnTerm: undefined,
+      date: undefined,
+      chiefList: undefined,
+      isChief: undefined,
+      autorun_limit: undefined,
+      officerLevel: undefined,
+      commandList: undefined,
+    });
+
+    async function reloadTable(): Promise<void> {
+      try {
+        const response =
+          await SammoAPI.NationCommand.GetReservedCommand<ChiefResponse>();
+        console.log(response);
+        for (const [key, value] of entriesWithType(response)) {
+          if (key === "result") {
+            continue;
+          }
+
+          if (key === "officerLevel") {
+            if (value < 5) {
+              tableObj.officerLevel = undefined;
+            } else {
+              tableObj.officerLevel = value as number;
+            }
+            continue;
+          }
+
+          //HACK:
+          tableObj[key as unknown as "year"] = value as unknown as undefined;
+        }
+
+        const serverNowObj = parseTime(response.date);
+        const clientNowObj = new Date();
+        timeDiff.value = serverNowObj.getTime() - clientNowObj.getTime();
+
+        if (viewTarget.value === undefined) {
+          if (!tableObj.officerLevel) {
+            viewTarget.value = 12;
+          } else {
+            viewTarget.value = tableObj.officerLevel;
+          }
+        }
+      } catch (e) {
+        if (isString(e)) {
+          alert(e);
+        }
+        console.error(e);
+        return;
+      }
+    }
+    //
+
+    const mainTableGridRows = computed(() => {
+      return {
+        gridTemplateRows: `24px repeat(${props.maxChiefTurn}, 30px)`,
+      };
+    });
+
+    const subTableGridRows = computed(() => {
+      return {
+        gridTemplateRows: `36px repeat(${props.maxChiefTurn + 1}, 1fr)`,
+      };
+    });
+
+    void reloadTable();
+
+    const serverNow = ref(formatTime(new Date(), "HH:mm:ss"));
+    const timeDiff = ref(0);
+
+    function updateNow() {
+      const serverNowObj = addMilliseconds(new Date(), timeDiff.value);
+      serverNow.value = formatTime(serverNowObj, "HH:mm:ss");
+      setTimeout(() => {
+        updateNow();
+      }, 1000 - serverNowObj.getMilliseconds());
+    }
+
+    setTimeout(() => {
+      updateNow();
+    }, 500);
+
+    return {
+      updateNow,
+      serverNow,
+      timeDiff,
+      turnList,
+      ...toRefs(tableObj),
+      mb_strwidth,
+      mainTableGridRows,
+      subTableGridRows,
+      reloadTable,
+      getNpcColor,
+      viewTarget,
+      targetIsMe,
+      maxPushTurn: props.maxChiefTurn / 2,
+    };
+  },
 });
-
-const subTableGridRows = computed(() => {
-  return {
-    gridTemplateRows: `36px repeat(${props.maxChiefTurn + 1}, 1fr)`,
-  };
-});
-
-void reloadTable();
-
-const storedActionsHelper = new StoredActionsHelper(
-  staticValues.serverNick,
-  "nation",
-  staticValues.mapName,
-  staticValues.unitSet
-);
-provide("storedNationActionsHelper", storedActionsHelper);
 </script>
 <style lang="scss">
 @import "@scss/chiefCenter.scss";
-</style>
+</style>

hwe/ts/PageInheritPoint.vue

@@ -1,31 +1,40 @@
 <template>
-  <TopBackBar :title="title" />
+  <top-back-bar :title="title" />
   <div
     id="container"
     class="bg0 px-2"
-    style="max-width: 1000px; margin: auto; border: solid 1px #888888; overflow: hidden"
+    style="
+      max-width: 1000px;
+      margin: auto;
+      border: solid 1px #888888;
+      overflow: hidden;
+    "
   >
     <div id="inheritance_list" class="row">
       <template v-for="(text, key) in inheritanceViewText" :key="key">
-        <div :id="`inherit_${key}`" class="col col-sm-4 col-12 inherit_item inherit_template_item">
+        <div
+          :id="`inherit_${key}`"
+          class="col col-sm-4 col-12 inherit_item inherit_template_item"
+        >
           <div class="row">
-            <label :id="`inherit_${key}_head`" class="inherit_head col col-md-6 col-sm-7 col-6 col-form-label">{{
-              text.title
-            }}</label>
+            <label
+              :id="`inherit_${key}_head`"
+              class="inherit_head col col-md-6 col-sm-7 col-6 col-form-label"
+              >{{ text.title }}</label
+            >
             <div class="col col-md-6 col-sm-5 col-6">
               <input
-                :id="`inherit_${key}_value`"
                 type="text"
                 class="form-control inherit_value f_tnum"
                 readonly
+                :id="`inherit_${key}_value`"
                 :value="Math.floor(items[key]).toLocaleString()"
               />
             </div>
           </div>
 
           <div style="text-align: right">
-            <!-- eslint-disable-next-line vue/no-v-html -->
-            <small class="form-text text-muted" v-html="text.info" />
+            <small class="form-text text-muted" v-html="text.info"></small>
           </div>
         </div>
         <div v-if="key == 'new'" style="width: 100%; padding: 0 10px">
@@ -35,18 +44,22 @@
     </div>
     <div id="inheritance_store">
       <div class="row">
-        <div class="col">
-          <div class="bg1 a-center">유산 포인트 상점</div>
-        </div>
+        <div class="col"><div class="bg1 a-center">유산 포인트 상점</div></div>
       </div>
 
       <div class="row">
         <div class="col offset-md-4 col-md-4 col-sm-6 col-12 py-2">
           <div class="row px-4">
-            <div class="a-right col-6 align-self-center">다음 전투 특기 선택</div>
+            <div class="a-right col-6 align-self-center">
+              다음 전투 특기 선택
+            </div>
             <div class="col-6">
-              <select v-model="nextSpecialWar" class="form-select col-6">
-                <option v-for="(info, key) in availableSpecialWar" :key="key" :value="key">
+              <select class="form-select col-6" v-model="nextSpecialWar">
+                <option
+                  v-for="(info, key) in availableSpecialWar"
+                  :key="key"
+                  :value="key"
+                >
                   {{ info.title }}
                 </option>
               </select>
@@ -54,23 +67,34 @@
           </div>
           <div class="a-right">
             <small class="form-text text-muted"
-              ><!-- eslint-disable-next-line vue/no-v-html -->
-              <span style="color: white" v-html="availableSpecialWar[nextSpecialWar].info" /><br />다음에 얻을 전투
-              특기를 정합니다.<br /><span style="color: white"
+              ><span
+                style="color: white"
+                v-html="availableSpecialWar[nextSpecialWar].info"
+              /><br />다음에 얻을 전투 특기를 정합니다.<br /><span
+                style="color: white"
                 >필요 포인트: {{ inheritActionCost.nextSpecial }}</span
               ></small
             >
           </div>
           <div class="row px-4">
-            <b-button class="col-6 offset-6" variant="primary" @click="setNextSpecialWar"> 구입 </b-button>
+            <b-button
+              class="col-6 offset-6"
+              variant="primary"
+              @click="setNextSpecialWar"
+              >구입</b-button
+            >
           </div>
         </div>
         <div class="col col-md-4 col-sm-6 col-12 py-2">
           <div class="row px-4">
             <div class="a-right col-6 align-self-center">유니크 입찰</div>
             <div class="col-6">
-              <select v-model="specificUnique" class="form-select col-6">
-                <option v-for="(info, key) in availableUnique" :key="key" :value="key">
+              <select class="form-select col-6" v-model="specificUnique">
+                <option
+                  v-for="(info, key) in availableUnique"
+                  :key="key"
+                  :value="key"
+                >
                   {{ info.title }}
                 </option>
               </select>
@@ -79,23 +103,29 @@
           <div class="row px-4">
             <div class="col f_tnum">
               <NumberInputWithInfo
-                v-model="specificUniqueAmount"
                 title="입찰 포인트"
                 :min="inheritActionCost.minSpecificUnique"
                 :max="items.previous"
+                v-model="specificUniqueAmount"
               />
             </div>
           </div>
           <div class="a-right">
             <small class="form-text text-muted"
-              >얻고자 하는 유니크 아이템을 포인트를 걸어 입찰합니다. 최고 포인트인 경우 다음 턴에 유니크를 얻습니다.<br />
-              <!-- eslint-disable-next-line vue/no-v-html -->
-              <span style="color: white" v-html="availableUnique[specificUnique].info" />
-            </small>
+              >얻고자 하는 유니크 아이템을 포인트를 걸어 입찰합니다. 최고
+              포인트인 경우 다음 턴에 유니크를 얻습니다.<br /><span
+                style="color: white"
+                v-html="availableUnique[specificUnique].info"
+            /></small>
           </div>
 
           <div class="row px-4">
-            <b-button class="col-6 offset-6" variant="primary" @click="buySpecificUnique"> 구입 </b-button>
+            <b-button
+              class="col-6 offset-6"
+              variant="primary"
+              @click="buySpecificUnique"
+              >구입</b-button
+            >
           </div>
         </div>
       </div>
@@ -106,11 +136,16 @@
         <div class="col col-md-4 col-sm-6 col-12 py-2">
           <div class="row px-4">
             <div class="a-right col-6 align-self-center">랜덤 턴 초기화</div>
-            <b-button class="col-6" variant="primary" @click="buySimple('ResetTurnTime')"> 구입 </b-button>
+            <b-button
+              class="col-6"
+              variant="primary"
+              @click="buySimple('ResetTurnTime')"
+              >구입</b-button
+            >
           </div>
           <div class="a-right">
             <small class="form-text text-muted"
-              >다음 턴이 랜덤으로 바뀝니다. (필요 포인트가 피보나치식으로 증가합니다)<br /><span style="color: white"
+              >다음 턴이 랜덤으로 바뀝니다.<br /><span style="color: white"
                 >필요 포인트: {{ inheritActionCost.resetTurnTime }}</span
               ></small
             >
@@ -119,7 +154,12 @@
         <div class="col col-md-4 col-sm-6 col-12 py-2">
           <div class="row px-4">
             <div class="a-right col-6 align-self-center">랜덤 유니크 획득</div>
-            <b-button class="col-6" variant="primary" @click="buySimple('BuyRandomUnique')"> 구입 </b-button>
+            <b-button
+              class="col-6"
+              variant="primary"
+              @click="buySimple('BuyRandomUnique')"
+              >구입</b-button
+            >
           </div>
           <div class="a-right">
             <small class="form-text text-muted"
@@ -131,12 +171,19 @@
         </div>
         <div class="col col-md-4 col-sm-6 col-12 py-2">
           <div class="row px-4">
-            <div class="a-right col-6 align-self-center">즉시 전투 특기 초기화</div>
-            <b-button class="col-6" variant="primary" @click="buySimple('ResetSpecialWar')"> 구입 </b-button>
+            <div class="a-right col-6 align-self-center">
+              즉시 전투 특기 초기화
+            </div>
+            <b-button
+              class="col-6"
+              variant="primary"
+              @click="buySimple('ResetSpecialWar')"
+              >구입</b-button
+            >
           </div>
           <div class="a-right">
             <small class="form-text text-muted"
-              >즉시 전투 특기를 초기화합니다. (필요 포인트가 피보나치식으로 증가합니다)<br /><span style="color: white"
+              >즉시 전투 특기를 초기화합니다.<br /><span style="color: white"
                 >필요 포인트: {{ inheritActionCost.resetSpecialWar }}</span
               ></small
             >
@@ -148,17 +195,23 @@
       <hr :style="{ opacity: 0.5 }" />
     </div>
     <div class="row">
-      <div v-for="(info, buffKey) in inheritBuffHelpText" :key="buffKey" class="col col-md-4 col-sm-6 col-12">
+      <div
+        class="col col-md-4 col-sm-6 col-12"
+        v-for="(info, buffKey) in inheritBuffHelpText"
+        :key="buffKey"
+      >
         <div class="row">
-          <label class="col col-sm-6 col-form-label" :for="`buff-${buffKey}`">{{ info.title }}</label>
+          <label class="col col-sm-6 col-form-label" :for="`buff-${buffKey}`">{{
+            info.title
+          }}</label>
           <div class="col col-sm-6 f_tnum">
             <b-form-input
               :id="`buff-${buffKey}`"
-              v-model="inheritBuff[buffKey]"
               type="number"
+              v-model="inheritBuff[buffKey]"
               :min="prevInheritBuff[buffKey] ?? 0"
               :max="maxInheritBuff"
-            />
+            ></b-form-input>
           </div>
         </div>
         <div style="text-align: right">
@@ -166,7 +219,8 @@
             >{{ info.info }}<br /><span style="color: white"
               >필요 포인트:
               {{
-                inheritActionCost.buff[inheritBuff[buffKey]] - inheritActionCost.buff[prevInheritBuff[buffKey] ?? 0]
+                inheritActionCost.buff[inheritBuff[buffKey]] -
+                inheritActionCost.buff[prevInheritBuff[buffKey] ?? 0]
               }}</span
             ></small
           >
@@ -174,11 +228,15 @@
         <div class="row px-4" style="margin-bottom: 1em">
           <b-button
             variant="secondary"
-            class="col col-md-6 col-4 offset-md-0 offset-4"
             @click="inheritBuff[buffKey] = prevInheritBuff[buffKey] ?? 0"
+            class="col col-md-6 col-4 offset-md-0 offset-4"
+            >리셋</b-button
+          ><b-button
+            variant="primary"
+            class="col col-md-6 col-4"
+            @click="buyInheritBuff(buffKey)"
+            >구입</b-button
           >
-            리셋 </b-button
-          ><b-button variant="primary" class="col col-md-6 col-4" @click="buyInheritBuff(buffKey)"> 구입 </b-button>
         </div>
       </div>
     </div>
@@ -187,7 +245,7 @@
         <div class="bg1 a-center">유산 포인트 변경 내역(최근 30건)</div>
       </div>
     </div>
-    <div v-for="(log, idx) in lastInheritPointLogs" :key="idx" class="row">
+    <div class="row" v-for="(log, idx) in lastInheritPointLogs" :key="idx">
       <div class="col a-right" style="max-width: 20ch">
         <small class="text-muted tnum">[{{ log.date }}]</small>
       </div>
@@ -206,7 +264,6 @@ import TopBackBar from "@/components/TopBackBar.vue";
 import _ from "lodash";
 import NumberInputWithInfo from "@/components/NumberInputWithInfo.vue";
 import { SammoAPI } from "./SammoAPI";
-import type { inheritBuffType } from "./defs/API/InheritAction";
 
 type InheritanceType =
   | "previous"
@@ -234,7 +291,10 @@ declare const lastInheritPointLogs: {
 
 declare const items: Record<InheritanceType, number>;
 
-const inheritanceViewText: Record<InheritanceViewType, { title: string; info: string }> = {
+const inheritanceViewText: Record<
+  InheritanceViewType,
+  { title: string; info: string }
+> = {
   sum: {
     title: "총 포인트",
     info: "다음 플레이에서 사용할 수 있는 총 포인트입니다.",
@@ -293,6 +353,15 @@ const inheritanceViewText: Record<InheritanceViewType, { title: string; info: st
   },
 };
 
+type inheritBuffType =
+  | "warAvoidRatio"
+  | "warCriticalRatio"
+  | "warMagicTrialProb"
+  | "domesticSuccessProb"
+  | "domesticFailProb"
+  | "warAvoidRatioOppose"
+  | "warCriticalRatioOppose"
+  | "warMagicTrialProbOppose";
 
 declare const currentInheritBuff: {
   [v in inheritBuffType]: number | undefined;
@@ -370,13 +439,11 @@ declare const availableUnique: Record<
 
 export default defineComponent({
   name: "PageInheritPoint",
-  components: {
-    TopBackBar,
-    NumberInputWithInfo,
-  },
   data() {
     const inheritBuff = {} as Record<inheritBuffType, number>;
-    for (const buffKey of Object.keys(inheritBuffHelpText) as inheritBuffType[]) {
+    for (const buffKey of Object.keys(
+      inheritBuffHelpText
+    ) as inheritBuffType[]) {
       inheritBuff[buffKey] = currentInheritBuff[buffKey] ?? 0;
     }
     return {
@@ -419,7 +486,9 @@ export default defineComponent({
         alert("낮출 수 없습니다.");
         return;
       }
-      const cost = this.inheritActionCost.buff[level] - this.inheritActionCost.buff[prevLevel];
+      const cost =
+        this.inheritActionCost.buff[level] -
+        this.inheritActionCost.buff[prevLevel];
       if (this.items.previous < cost) {
         alert("유산 포인트가 부족합니다.");
         return;
@@ -427,7 +496,11 @@ export default defineComponent({
 
       const name = inheritBuffHelpText[buffKey].title;
 
-      if (!confirm(`${name}를 ${level}등급으로 올릴까요? ${cost} 포인트가 소모됩니다.`)) {
+      if (
+        !confirm(
+          `${name}를 ${level}등급으로 올릴까요? ${cost} 포인트가 소모됩니다.`
+        )
+      ) {
         return;
       }
 
@@ -446,7 +519,9 @@ export default defineComponent({
       //TODO: 페이지 새로고침 필요없이 하도록
       location.reload();
     },
-    async buySimple(type: "ResetTurnTime" | "BuyRandomUnique" | "ResetSpecialWar") {
+    async buySimple(
+      type: "ResetTurnTime" | "BuyRandomUnique" | "ResetSpecialWar"
+    ) {
       const costMap: Record<typeof type, number> = {
         ResetTurnTime: inheritActionCost.resetTurnTime,
         ResetSpecialWar: inheritActionCost.resetSpecialWar,
@@ -473,7 +548,7 @@ export default defineComponent({
       }
 
       try {
-        await SammoAPI.InheritAction[type]();
+        await SammoAPI.InheritAction[type]({});
       } catch (e) {
         console.error(e);
         alert(`실패했습니다: ${e}`);
@@ -485,7 +560,8 @@ export default defineComponent({
       location.reload();
     },
     async setNextSpecialWar() {
-      const specialWarName = this.availableSpecialWar[this.nextSpecialWar].title ?? undefined;
+      const specialWarName =
+        this.availableSpecialWar[this.nextSpecialWar].title ?? undefined;
       if (specialWarName === undefined) {
         alert(`잘못된 타입: ${this.nextSpecialWar}`);
         return;
@@ -497,7 +573,11 @@ export default defineComponent({
         return;
       }
       //TODO: JosaUtil
-      if (!confirm(`${cost} 포인트로 다음 전특을 ${specialWarName}(으)로 고정하겠습니까?`)) {
+      if (
+        !confirm(
+          `${cost} 포인트로 다음 전특을 ${specialWarName}(으)로 고정하겠습니까?`
+        )
+      ) {
         return;
       }
 
@@ -516,7 +596,8 @@ export default defineComponent({
       location.reload();
     },
     async buySpecificUnique() {
-      const uniqueName = this.availableUnique[this.specificUnique].title ?? undefined;
+      const uniqueName =
+        this.availableUnique[this.specificUnique].title ?? undefined;
       if (uniqueName === undefined) {
         alert(`잘못된 타입: ${this.specificUnique}`);
         return;
@@ -548,9 +629,14 @@ export default defineComponent({
       location.reload();
     },
   },
+  components: {
+    TopBackBar,
+    NumberInputWithInfo,
+  },
 });
 </script>
 
+
 <style>
 .col-form-label {
   text-align: right;
@@ -564,4 +650,4 @@ export default defineComponent({
 .tnum {
   font-feature-settings: "tnum";
 }
-</style>
+</style>

hwe/ts/PageJoin.vue

@@ -1,31 +1,27 @@
 <template>
-  <TopBackBar title="장수 생성" />
+  <top-back-bar title="장수 생성" />
 
-  <div v-if="gameConstStore && args" id="container" class="bg0">
+  <div id="container" class="bg0">
     <div class="nation-list">
       <div class="nation-header nation-row bg1 center">
         <div>국가명</div>
         <div>임관권유문</div>
         <div class="display-toggle d-grid">
           <b-button
-            v-model="displayTable"
             :pressed="displayTable"
             :variant="displayTable ? 'info' : 'secondary'"
+            v-model="displayTable"
             @click="displayTable = !displayTable"
-          >
-            {{ displayTable ? "숨기기" : "보이기" }}
-          </b-button>
+          >{{ displayTable ? "숨기기" : "보이기" }}</b-button>
         </div>
         <div class="zoom-toggle d-grid">
           <b-button
-            v-model="toggleZoom"
             :pressed="toggleZoom"
             :variant="toggleZoom ? 'info' : 'secondary'"
-            :disabled="!displayTable"
+            v-model="toggleZoom"
             @click="toggleZoom = !toggleZoom"
-          >
-            {{ toggleZoom ? "작게 보기" : "크게 보기" }}
-          </b-button>
+            :disabled="!displayTable"
+          >{{ toggleZoom ? "작게 보기" : "크게 보기" }}</b-button>
         </div>
       </div>
       <template v-if="displayTable">
@@ -42,12 +38,9 @@
             }"
             class="d-grid"
           >
-            <div class="align-self-center center">
-              {{ nation.name }}
-            </div>
+            <div class="align-self-center center">{{ nation.name }}</div>
           </div>
           <div class="nation-scout-plate align-self-center">
-            <!-- eslint-disable-next-line vue/no-v-html -->
             <div class="nation-scout-msg" v-html="nation.scoutmsg ?? '-'" />
           </div>
         </div>
@@ -67,22 +60,32 @@
         <div class="col col-md-1 col-3 a-right align-self-center">전콘 사용</div>
         <div class="col col-md-4 col-9 align-self-center">
           <img style="height: 64px; width: 64px" :src="iconPath" />
-          <label> <input v-model="args.pic" type="checkbox" /> 사용 </label>
+          <label>
+            <input type="checkbox" v-model="args.pic" /> 사용
+          </label>
         </div>
         <div class="col col-md-4 col-3 align-self-center a-right">성격</div>
 
         <div class="col col-md-8 col-9 align-self-center">
           <div class="row">
             <div class="col col-md-3 col-4 align-self-center">
-              <select v-model="args.character" class="form-select form-inline" style="max-width: 20ch">
-                <option v-for="(personalityObj, key) in availablePersonality" :key="key" :value="key">
-                  {{ personalityObj.name }}
-                </option>
+              <select
+                class="form-select form-inline"
+                style="max-width: 20ch"
+                v-model="args.character"
+              >
+                <option
+                  v-for="(personalityObj, key) in availablePersonality"
+                  :key="key"
+                  :value="key"
+                >{{ personalityObj.name }}</option>
               </select>
             </div>
             <div class="col col-md-9 col-8 align-self-center">
               <small class="text-muted">
-                {{ availablePersonality[args.character].info }}
+                {{
+                  availablePersonality[args.character].info
+                }}
               </small>
             </div>
           </div>
@@ -100,35 +103,37 @@
           <small class="text-muted">통/무/지</small>
         </div>
         <div class="col col-md-2 col-3 align-self-center">
-          <input v-model="args.leadership" type="number" class="form-control" />
+          <input type="number" class="form-control" v-model="args.leadership" />
         </div>
         <div class="col col-md-2 col-3 align-self-center">
-          <input v-model="args.strength" type="number" class="form-control" />
+          <input type="number" class="form-control" v-model="args.strength" />
         </div>
         <div class="col col-md-2 col-3 align-self-center">
-          <input v-model="args.intel" type="number" class="form-control" />
+          <input type="number" class="form-control" v-model="args.intel" />
         </div>
       </div>
       <div class="row" style="margin-top: 1em">
         <div class="col col-md-4 col-3 a-right align-self-center">능력치 조절</div>
         <div class="col col-md-8 col-9">
-          <b-button variant="secondary" class="stat-btn" @click="randStatRandom"> 랜덤형 </b-button>
-          <b-button variant="secondary" class="stat-btn" @click="randStatLeadPow"> 통솔무력형 </b-button>
-          <b-button variant="secondary" class="stat-btn" @click="randStatLeadInt"> 통솔지력형 </b-button>
-          <b-button variant="secondary" class="stat-btn" @click="randStatPowInt"> 무력지력형 </b-button>
+          <b-button variant="secondary" class="stat-btn" @click="randStatRandom">랜덤형</b-button>
+          <b-button variant="secondary" class="stat-btn" @click="randStatLeadPow">통솔무력형</b-button>
+          <b-button variant="secondary" class="stat-btn" @click="randStatLeadInt">통솔지력형</b-button>
+          <b-button variant="secondary" class="stat-btn" @click="randStatPowInt">무력지력형</b-button>
         </div>
       </div>
     </div>
     <div class="row" style="border-top: solid 1px #aaa; margin-top: 0.5em">
       <div class="col a-center" style="color: orange">
-        모든 능력치는 ( {{ stats.min }} &lt;= 능력치 &lt;= {{ stats.max }} ) 사이로 잡으셔야 합니다. <br />그 외의
-        능력치는 가입되지 않습니다.
+        모든 능력치는 ( {{ stats.min }} &lt;= 능력치 &lt;= {{ stats.max }} )
+        사이로 잡으셔야 합니다.
+        <br />그 외의 능력치는 가입되지 않습니다.
       </div>
     </div>
     <div class="row">
       <div class="col a-center">
-        능력치의 총합은 {{ stats.total }} 입니다. 가입후 {{ stats.bonusMin }} ~ {{ stats.bonusMax }} 의 능력치 보너스를
-        받게 됩니다. <br />임의의 도시에서 재야로 시작하며 건국과 임관은 게임 내에서 실행합니다.
+        능력치의 총합은 {{ stats.total }} 입니다. 가입후 {{ stats.bonusMin }} ~
+        {{ stats.bonusMax }} 의 능력치 보너스를 받게 됩니다.
+        <br />임의의 도시에서 재야로 시작하며 건국과 임관은 게임 내에서 실행합니다.
       </div>
     </div>
 
@@ -136,18 +141,20 @@
       <div class="col col-md-11 col-9 center align-self-center">유산 포인트 사용</div>
       <div class="col col-md-1 col-3">
         <label>
-          <input v-model="displayInherit" type="checkbox" />
-          {{ displayInherit ? "숨기기" : "보이기" }}
+          <input type="checkbox" v-model="displayInherit" />
+          {{
+            displayInherit ? "숨기기" : "보이기"
+          }}
         </label>
       </div>
     </div>
-    <div v-if="displayInherit" class="inherit-block">
+    <div class="inherit-block" v-if="displayInherit">
       <div class="row">
         <div class="col">
-          <NumberInputWithInfo v-model="inheritTotalPoint" title="보유한 유산 포인트" :readonly="true" />
+          <NumberInputWithInfo title="보유한 유산 포인트" v-model="inheritTotalPoint" :readonly="true" />
         </div>
         <div class="col">
-          <NumberInputWithInfo v-model="inheritRequiredPoint" title="필요 유산 포인트" :readonly="true" />
+          <NumberInputWithInfo title="필요 유산 포인트" v-model="inheritRequiredPoint" :readonly="true" />
         </div>
       </div>
       <hr />
@@ -156,17 +163,28 @@
           <div class="row">
             <div class="col col-6 a-right align-self-center">천재로 생성</div>
             <div class="col col-6 align-self-center">
-              <select v-model="args.inheritSpecial" class="form-select form-inline" style="max-width: 20ch">
+              <select
+                class="form-select form-inline"
+                style="max-width: 20ch"
+                v-model="args.inheritSpecial"
+              >
                 <option :value="undefined">사용안함</option>
-                <option v-for="(inheritSpecial, key) in availableInheritSpecial" :key="key" :value="key">
-                  {{ inheritSpecial.name }}
-                </option>
+                <option
+                  v-for="(inheritSpecial, key) in availableInheritSpecial"
+                  :key="key"
+                  :value="key"
+                >{{ inheritSpecial.name }}</option>
               </select>
             </div>
           </div>
           <div class="col align-self-center">
-            <!-- eslint-disable-next-line vue/no-v-html -->
-            <small class="text-muted" v-html="availableInheritSpecial[args.inheritSpecial ?? '']?.info" />
+            <small
+              class="text-muted"
+              v-html="
+                (availableInheritSpecial[args.inheritSpecial ?? ''] ?? { info: '' })
+                  .info
+              "
+            />
           </div>
         </div>
 
@@ -174,11 +192,17 @@
           <div class="row">
             <div class="col col-6 a-right align-self-center">도시</div>
             <div class="col col-6 align-self-center">
-              <select v-model="args.inheritCity" class="form-select form-inline" style="max-width: 20ch">
+              <select
+                class="form-select form-inline"
+                style="max-width: 20ch"
+                v-model="args.inheritCity"
+              >
                 <option :value="undefined">사용안함</option>
-                <option v-for="city in availableInheritCity" :key="city.id" :value="city.id">
-                  {{ `[${city.region}] ${city.name}` }}
-                </option>
+                <option
+                  v-for="city in availableInheritCity"
+                  :key="city[0]"
+                  :value="city[0]"
+                >{{ `[${city[1]}] ${city[2]}` }}</option>
               </select>
             </div>
           </div>
@@ -186,25 +210,28 @@
 
         <div class="col col-md-6 col-sm-6 col-12 p-2 align-self-center">
           <div class="a-center">
-            <label> <input v-model="inheritTurnTimeSet" type="checkbox" />턴 시간 고정 </label>
+            <label>
+              <input type="checkbox" v-model="inheritTurnTimeSet" />턴 시간
+              고정
+            </label>
           </div>
           <div class="row turn_time_pad">
             <div class="col col-md-4 offset-md-3 col-4 offset-3">
               <NumberInputWithInfo
-                v-model="inheritTurnTimeMinute"
                 :readonly="!inheritTurnTimeSet"
                 :min="0"
                 :max="1 - turnterm"
+                v-model="inheritTurnTimeMinute"
                 :right="true"
                 title="분"
               />
             </div>
             <div class="col col-md-4 col-4">
               <NumberInputWithInfo
-                v-model="inheritTurnTimeSecond"
                 :readonly="!inheritTurnTimeSet"
                 :min="0"
                 :max="60"
+                v-model="inheritTurnTimeSecond"
                 :right="true"
                 title="초"
               />
@@ -216,13 +243,13 @@
           <div class="a-center">추가 능력치 고정</div>
           <div class="row">
             <div class="col">
-              <NumberInputWithInfo v-model="(args.inheritBonusStat ?? [0, 0, 0])[0]" :max="stats.bonusMax" title="통솔" />
+              <NumberInputWithInfo title="통솔" v-model="(args.inheritBonusStat ?? [0, 0, 0])[0]" />
             </div>
             <div class="col">
-              <NumberInputWithInfo v-model="(args.inheritBonusStat ?? [0, 0, 0])[1]" :max="stats.bonusMax" title="무력" />
+              <NumberInputWithInfo title="무력" v-model="(args.inheritBonusStat ?? [0, 0, 0])[1]" />
             </div>
             <div class="col">
-              <NumberInputWithInfo v-model="(args.inheritBonusStat ?? [0, 0, 0])[2]" :max="stats.bonusMax" title="지력" />
+              <NumberInputWithInfo title="지력" v-model="(args.inheritBonusStat ?? [0, 0, 0])[2]" />
             </div>
           </div>
         </div>
@@ -231,271 +258,262 @@
 
     <div class="row" style="border-top: solid 1px #aaa">
       <div class="col a-center" style="margin: 0.5em">
-        <b-button color="primary" @click="submitForm"> 장수 생성 </b-button>&nbsp;
-        <b-button color="secondary" @click="resetArgs"> 다시 입력 </b-button>
+        <b-button color="primary" @click="submitForm">장수 생성</b-button>&nbsp;
+        <b-button color="secondary" @click="resetArgs">다시 입력</b-button>
       </div>
     </div>
   </div>
 </template>
 <script lang="ts">
-declare const staticValues: {
-  nationList: {
-    nation: number;
-    name: string;
-    color: string;
-    scout: number;
-    scoutmsg?: string;
-  }[];
-  turnterm: number;
-
-  member: {
-    name: string;
-    grade: number;
-    picture: string;
-    imgsvr: 0 | 1;
-  };
-
-  serverID: string;
-  inheritTotalPoint: number;
-};
-</script>
-<script lang="ts" setup>
 import "@scss/common/bootstrap5.scss";
 import "@scss/game_bg.scss";
 
+import { defineComponent } from "vue";
 import TopBackBar from "@/components/TopBackBar.vue";
 import { getIconPath } from "@util/getIconPath";
 import { isBrightColor } from "@util/isBrightColor";
-import { abilityLeadint, abilityLeadpow, abilityPowint, abilityRand } from "@util/generalStats";
-import { shuffle, sum } from "lodash";
+import {
+  abilityLeadint,
+  abilityLeadpow,
+  abilityPowint,
+  abilityRand,
+} from "@util/generalStats";
+import { clone, shuffle, sum } from "lodash";
 import NumberInputWithInfo from "@/components/NumberInputWithInfo.vue";
 import { SammoAPI } from "./SammoAPI";
-import type { JoinArgs } from "./defs/API/General";
-import { GameConstStore, getGameConstStore } from "@/GameConstStore";
-import { computed, onMounted, ref, watch } from "vue";
-import type { CityID, GameIActionInfo } from "./defs/GameObj";
-import { unwrap } from "@/util/unwrap";
 
-const gameConstStore = ref<GameConstStore>();
-
-const { serverID, member, turnterm } = staticValues;
-
-const nationList = ref(shuffle(staticValues.nationList));
-const args = ref<JoinArgs>();
-
-const stats = ref({
-  min: 50,
-  max: 50,
-  total: 50,
-  bonusMin: 1,
-  bonusMax: 5,
-});
-
-const inheritTotalPoint = ref(staticValues.inheritTotalPoint);
-const availableInheritCity = ref<{ id: CityID; name: string; region: string }[]>([]);
-const availableInheritSpecial = ref<Record<string, GameIActionInfo>>({});
-const availablePersonality = ref<Record<string, GameIActionInfo>>({});
-
-watch(gameConstStore, (gameConst) => {
-  if (gameConst === undefined) {
-    console.error();
-    return;
-  }
-
-  availableInheritCity.value = (() => {
-    const cityList: { id: CityID; name: string; region: string }[] = [];
-    for (const city of Object.values(gameConst.cityConst)) {
-      cityList.push({
-        id: city.id,
-        name: city.name,
-        region: gameConst.cityConstMap.region[city.region] as string,
-      });
-    }
-    cityList.sort((lhs, rhs) => {
-      const rC = lhs.region.localeCompare(rhs.region);
-      if (rC != 0) return rC;
-      return lhs.name.localeCompare(rhs.name);
-    });
-    return cityList;
-  })();
-
-  availableInheritSpecial.value = (() => {
-    const specialList: typeof availableInheritSpecial.value = {};
-    for (const specialWarID of Object.values(gameConst.gameConst.availableSpecialWar)) {
-      specialList[specialWarID] = unwrap(gameConst.iActionInfo.specialWar[specialWarID]);
-    }
-    return specialList;
-  })();
-
-  availablePersonality.value = (() => {
-    const personalityList: typeof availablePersonality.value = {};
-    for (const personalityID of Object.values(gameConst.gameConst.availablePersonality)) {
-      personalityList[personalityID] = unwrap(gameConst.iActionInfo.personality[personalityID]);
-    }
-    personalityList["Random"] = {
-      value: "Random",
-      name: "???",
-      info: "무작위 성격을 선택합니다.",
-    };
-    return personalityList;
-  })();
-
-  stats.value = {
-    min: gameConst.gameConst.defaultStatMin,
-    max: gameConst.gameConst.defaultStatMax,
-    total: gameConst.gameConst.defaultStatTotal,
-    bonusMin: gameConst.gameConst.defaultStatMin,
-    bonusMax: gameConst.gameConst.defaultStatMax,
-  }
-
-  args.value = {
-    name: member.name,
-    leadership: stats.value.total - 2 * Math.floor(stats.value.total / 3),
-    strength: Math.floor(stats.value.total / 3),
-    intel: Math.floor(stats.value.total / 3),
-    pic: true,
-    character: "Random",
-
-    inheritCity: undefined,
-    inheritBonusStat: [0, 0, 0],
-    inheritSpecial: undefined,
-    inheritTurntime: undefined,
+declare const nationList: {
+  nation: number;
+  name: string;
+  color: string;
+  scout: number;
+  scoutmsg?: string;
+}[];
+declare const availablePersonality: {
+  [key: string]: {
+    name: string;
+    info: string;
   };
+};
 
+declare const availableInheritSpecial: {
+  [key: string]: {
+    name: string;
+    info: string;
+  };
+};
 
-});
+declare const availableInheritCity: [number, string, string][];
 
-onMounted(async () => {
-  gameConstStore.value = await getGameConstStore();
-});
+declare const turnterm: number;
 
-function randStatRandom() {
-  if (args.value === undefined) throw "nyc";
-  [args.value.leadership, args.value.strength, args.value.intel] = abilityRand(stats.value);
-}
-function randStatLeadPow() {
-  if (args.value === undefined) throw "nyc";
-  [args.value.leadership, args.value.strength, args.value.intel] = abilityLeadpow(stats.value);
-}
-function randStatLeadInt() {
-  if (args.value === undefined) throw "nyc";
-  [args.value.leadership, args.value.strength, args.value.intel] = abilityLeadint(stats.value);
-}
-function randStatPowInt() {
-  if (args.value === undefined) throw "nyc";
-  [args.value.leadership, args.value.strength, args.value.intel] = abilityPowint(stats.value);
-}
-function resetArgs() {
-  if (!args.value) throw "nyc";
-  const defaultStatTotal = stats.value.total;
-  args.value.name = member.name;
-  args.value.pic = true;
-  args.value.character = "Random";
-  args.value.leadership = defaultStatTotal - 2 * Math.floor(defaultStatTotal / 3);
-  args.value.strength = Math.floor(defaultStatTotal / 3);
-  args.value.intel = Math.floor(defaultStatTotal / 3);
+declare const member: {
+  name: string;
+  grade: number;
+  picture: string;
+  imgsvr: 0 | 1;
+};
+
+declare const stats: {
+  min: number;
+  max: number;
+  total: number;
+  bonusMin: number;
+  bonusMax: number;
+};
+
+declare const inheritPoints: {
+  special: number;
+  turnTime: number;
+  city: number;
+  stat: number;
+};
+
+declare const serverID: string;
+declare const inheritTotalPoint: number;
+
+declare module "@vue/runtime-core" {
+  interface ComponentCustomProperties {
+    member: typeof member;
+  }
 }
 
-async function submitForm() {
-  if (!args.value) throw "nyc";
-  //검증은 언제 되어야 하는가?
-  const subbmitArgs = args.value;
-  const totalStat = subbmitArgs.leadership + subbmitArgs.strength + subbmitArgs.intel;
-  const defaultStatTotal = stats.value.total;
+type APIArgs = {
+  name: string;
+  leadership: number;
+  strength: number;
+  intel: number;
+  pic: boolean;
+  character: string;
+  inheritSpecial?: string;
+  inheritTurntime?: number;
+  inheritCity?: number;
+  inheritBonusStat?: [number, number, number];
+};
 
-  if (totalStat < defaultStatTotal) {
-    if (
-      !confirm(
-        `설정한 능력치가 ${totalStat}으로, 실제 최대치인 ${defaultStatTotal}보다 적습니다.\r\n그래도 진행할까요?`
-      )
-    ) {
-      return false;
-    }
-  }
-  try {
-    await SammoAPI.General.Join(subbmitArgs);
-  } catch (e) {
-    console.error(e);
-    alert(`실패했습니다: ${e}`);
-    return;
-  }
+export default defineComponent({
+  name: "PageJoin",
+  components: {
+    TopBackBar,
+    NumberInputWithInfo,
+  },
+  data() {
+    const displayTable = JSON.parse(
+      localStorage.getItem(`conf.${serverID}.join.displayTable`) ?? "true"
+    );
+    const displayInherit = JSON.parse(
+      localStorage.getItem(`conf.${serverID}.join.displayInherit`) ?? "true"
+    );
+    const nationListShuffled = shuffle(nationList);
+    const args: APIArgs = {
+      name: member.name,
+      leadership: stats.total - 2 * Math.floor(stats.total / 3),
+      strength: Math.floor(stats.total / 3),
+      intel: Math.floor(stats.total / 3),
+      pic: true,
+      character: "Random",
 
-  alert("정상적으로 생성되었습니다. \n위키와 팁/강좌 게시판을 꼭 읽어보세요!");
-  location.href = "./";
-}
+      inheritCity: undefined,
+      inheritBonusStat: [0, 0, 0],
+      inheritSpecial: undefined,
+      inheritTurntime: undefined,
+    };
+    availableInheritCity.sort((lhs, rhs) => {
+      const rC = lhs[1].localeCompare(rhs[1]);
+      if (rC != 0) return rC;
+      return lhs[2].localeCompare(rhs[2]);
+    });
+    return {
+      displayTable,
+      displayInherit,
+      availablePersonality,
+      availableInheritSpecial,
+      availableInheritCity,
+      member: member,
+      stats,
+      args,
+      nationList: nationListShuffled,
+      isBrightColor,
+      inheritTotalPoint,
+      inheritTurnTimeSet: false,
+      inheritTurnTimeMinute: 0,
+      inheritTurnTimeSecond: 0,
+      turnterm,
+      toggleZoom: true,
+    };
+  },
+  watch: {
+    displayTable(newValue: boolean) {
+      localStorage.setItem(
+        `conf.${serverID}.join.displayTable`,
+        JSON.stringify(newValue)
+      );
+    },
+    displayInherit(newValue: boolean) {
+      localStorage.setItem(
+        `conf.${serverID}.join.displayInherit`,
+        JSON.stringify(newValue)
+      );
+    },
+    inheritTurnTimeMinute(newValue: number) {
+      if (!this.inheritTurnTimeSet) {
+        this.args.inheritTurntime = undefined;
+        return;
+      }
+      this.args.inheritTurntime = newValue * 60 + this.inheritTurnTimeSecond;
+    },
+    inheritTurnTimeSecond(newValue: number) {
+      if (!this.inheritTurnTimeSet) {
+        this.args.inheritTurntime = undefined;
+        return;
+      }
+      this.args.inheritTurntime = this.inheritTurnTimeMinute * 60 + newValue;
+    },
+    inheritTurnTimeSet(newValue: boolean) {
+      if (!newValue) {
+        this.args.inheritTurntime = undefined;
+        return;
+      }
+      this.args.inheritTurntime =
+        this.inheritTurnTimeMinute * 60 + this.inheritTurnTimeSecond;
+    },
+  },
+  computed: {
+    iconPath() {
+      if (this.args.pic) {
+        return getIconPath(this.member.imgsvr, this.member.picture);
+      }
+      return getIconPath(0, "default.jpg");
+    },
+    inheritRequiredPoint() {
+      let inheritRequiredPoint = 0;
+      if (this.args.inheritCity !== undefined) {
+        inheritRequiredPoint += inheritPoints.city;
+      }
+      if (this.args.inheritSpecial !== undefined) {
+        inheritRequiredPoint += inheritPoints.special;
+      }
+      if (this.args.inheritTurntime !== undefined) {
+        inheritRequiredPoint += inheritPoints.turnTime;
+      }
+      if (
+        this.args.inheritBonusStat !== undefined &&
+        sum(this.args.inheritBonusStat) != 0
+      ) {
+        inheritRequiredPoint += inheritPoints.stat;
+      }
+      return inheritRequiredPoint;
+    },
+  },
+  methods: {
+    randStatRandom() {
+      [this.args.leadership, this.args.strength, this.args.intel] =
+        abilityRand();
+    },
+    randStatLeadPow() {
+      [this.args.leadership, this.args.strength, this.args.intel] =
+        abilityLeadpow();
+    },
+    randStatLeadInt() {
+      [this.args.leadership, this.args.strength, this.args.intel] =
+        abilityLeadint();
+    },
+    randStatPowInt() {
+      [this.args.leadership, this.args.strength, this.args.intel] =
+        abilityPowint();
+    },
+    resetArgs() {
+      this.args.name = member.name;
+      this.args.pic = true;
+      this.args.character = "Random";
+      this.args.leadership = stats.total - 2 * Math.floor(stats.total / 3);
+      this.args.strength = Math.floor(stats.total / 3);
+      this.args.intel = Math.floor(stats.total / 3);
+    },
+    async submitForm() {
+      //검증은 언제 되어야 하는가?
+      const args = clone(this.args);
+      const totalStat = args.leadership + args.strength + args.intel;
 
-const iconPath = computed(() => {
-  if (!args.value) throw "nyc";
+      if (totalStat < stats.total) {
+        if (!confirm(`설정한 능력치가 ${totalStat}으로, 실제 최대치인 ${stats.total}보다 적습니다.\r\n그래도 진행할까요?`)) {
+          return false;
+        }
+      }
+      try {
+        await SammoAPI.General.Join(args);
+      } catch (e) {
+        console.error(e);
+        alert(`실패했습니다: ${e}`);
+        return;
+      }
 
-  if (args.value.pic) {
-    return getIconPath(member.imgsvr, member.picture);
-  }
-  return getIconPath(0, "default.jpg");
-});
-
-const inheritRequiredPoint = computed(() => {
-  if (!args.value || !gameConstStore.value) throw "nyc";
-
-  let inheritRequiredPoint = 0;
-  const gameConst = gameConstStore.value.gameConst;
-
-  if (args.value.inheritCity !== undefined) {
-    inheritRequiredPoint += gameConst.inheritBornCityPoint;
-  }
-  if (args.value.inheritSpecial !== undefined) {
-    inheritRequiredPoint += gameConst.inheritBornSpecialPoint;
-  }
-  if (args.value.inheritTurntime !== undefined) {
-    inheritRequiredPoint += gameConst.inheritBornTurntimePoint;
-  }
-  if (args.value.inheritBonusStat !== undefined && sum(args.value.inheritBonusStat) != 0) {
-    inheritRequiredPoint += gameConst.inheritBornStatPoint;
-  }
-  return inheritRequiredPoint;
-});
-
-const toggleZoom = ref(true);
-
-const displayTable = ref<boolean>(JSON.parse(localStorage.getItem(`conf.${serverID}.join.displayTable`) ?? "true"));
-watch(displayTable, (newValue: boolean) => {
-  localStorage.setItem(`conf.${serverID}.join.displayTable`, JSON.stringify(newValue));
-});
-
-const displayInherit = ref<boolean>(JSON.parse(localStorage.getItem(`conf.${serverID}.join.displayInherit`) ?? "true"));
-watch(displayInherit, (newValue: boolean) => {
-  localStorage.setItem(`conf.${serverID}.join.displayInherit`, JSON.stringify(newValue));
-});
-
-const inheritTurnTimeSet = ref(false);
-watch(inheritTurnTimeSet, (newValue: boolean) => {
-  if (!args.value) throw "nyc";
-
-  if (!newValue) {
-    args.value.inheritTurntime = undefined;
-    return;
-  }
-  args.value.inheritTurntime = inheritTurnTimeMinute.value * 60 + inheritTurnTimeSecond.value;
-});
-
-const inheritTurnTimeMinute = ref(0);
-watch(inheritTurnTimeMinute, (newValue: number) => {
-  if (!args.value) throw "nyc";
-  if (!inheritTurnTimeSet.value) {
-    args.value.inheritTurntime = undefined;
-    return;
-  }
-  args.value.inheritTurntime = newValue * 60 + inheritTurnTimeSecond.value;
-});
-
-const inheritTurnTimeSecond = ref(0);
-watch(inheritTurnTimeSecond, (newValue: number) => {
-  if (!args.value) throw "nyc";
-
-  if (!inheritTurnTimeSet.value) {
-    args.value.inheritTurntime = undefined;
-    return;
-  }
-  args.value.inheritTurntime = inheritTurnTimeMinute.value * 60 + newValue;
+      alert(
+        "정상적으로 생성되었습니다. \n위키와 팁/강좌 게시판을 꼭 읽어보세요!"
+      );
+      location.href = "./";
+    },
+  },
 });
 </script>
 <style lang="scss">
@@ -594,4 +612,4 @@ watch(inheritTurnTimeSecond, (newValue: number) => {
     }
   }
 }
-</style>
+</style>

hwe/ts/PageNPCControl.vue

@@ -3,7 +3,7 @@
   <BContainer
     id="container"
     class="tb_layout bg0"
-    :toast="{ root: true }"
+    :toast="{root: true}"
     :style="{ maxWidth: '1000px', margin: 'auto', border: 'solid 1px #888888', padding: '0' }"
   >
     <div class="bg1 section_bar">국가 정책</div>
@@ -17,54 +17,94 @@
     <div class="form_list row row-cols-md-2 row-cols-1">
       <div class="col">
         <NumberInputWithInfo v-model="nationPolicy.reqNationGold" :step="100" title="국가 권장 금">
-          이보다 많으면 포상, 적으면 몰수/헌납합니다.(긴급포상 제외)
+          이보다 많으면 포상, 적으면 몰수/헌납합니다.(긴급포상
+          제외)
         </NumberInputWithInfo>
       </div>
       <div class="col">
         <NumberInputWithInfo v-model="nationPolicy.reqNationRice" :step="100" title="국가 권장 쌀">
-          이보다 많으면 포상, 적으면 몰수/헌납합니다.(긴급포상 제외)
+          이보다 많으면 포상, 적으면 몰수/헌납합니다.(긴급포상
+          제외)
         </NumberInputWithInfo>
       </div>
       <div class="col">
-        <NumberInputWithInfo v-model="nationPolicy.reqHumanWarUrgentGold" :step="100" title="유저전투장 긴급포상 금">
+        <NumberInputWithInfo
+          v-model="nationPolicy.reqHumanWarUrgentGold"
+          :step="100"
+          title="유저전투장 긴급포상 금"
+        >
           유저장긴급포상시 이보다 금이 적은 장수에게 포상합니다.
           <br />
-          0이면 보병 6회 징병({{ (defaultStatMax * 100).toLocaleString() }} * 6) 가능한 금을 기준으로 하며, 그 수치는
-          현재 {{ zeroPolicy.reqHumanWarUrgentGold.toLocaleString() }}입니다.
+          0이면
+          보병 6회 징병({{ (defaultStatMax * 100).toLocaleString() }} * 6)
+          가능한 금을 기준으로 하며, 그 수치는 현재
+          {{
+            zeroPolicy.reqHumanWarUrgentGold.toLocaleString()
+          }}입니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
-        <NumberInputWithInfo v-model="nationPolicy.reqHumanWarUrgentRice" :step="100" title="유저전투장 긴급포상 쌀">
+        <NumberInputWithInfo
+          v-model="nationPolicy.reqHumanWarUrgentRice"
+          :step="100"
+          title="유저전투장 긴급포상 쌀"
+        >
           유저장긴급포상시 이보다 쌀이 적은 장수에게 포상합니다.
           <br />
-          0이면 기본 병종으로 {{ (defaultStatMax * 100).toLocaleString() }} * 6명 사살 가능한 쌀을 기준으로 하며, 그
-          수치는 현재 {{ zeroPolicy.reqHumanWarUrgentRice.toLocaleString() }}입니다.
+          0이면
+          기본 병종으로 {{ (defaultStatMax * 100).toLocaleString() }} * 6명 사살
+          가능한 쌀을 기준으로 하며, 그 수치는 현재
+          {{
+            zeroPolicy.reqHumanWarUrgentRice.toLocaleString()
+          }}입니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
-        <NumberInputWithInfo v-model="nationPolicy.reqHumanWarRecommandGold" :step="100" title="유저전투장 권장 금">
+        <NumberInputWithInfo
+          v-model="nationPolicy.reqHumanWarRecommandGold"
+          :step="100"
+          title="유저전투장 권장 금"
+        >
           유저전투장에게 주는 금입니다. 이보다 적으면 포상합니다.
           <br />
           0이면 유저전투장 긴급포상 금의 2배를 기준으로 하며, 그 수치는 현재
-          {{ (calcPolicyValue("reqHumanWarUrgentGold") * 2).toLocaleString() }}입니다.
+          {{
+            (calcPolicyValue("reqHumanWarUrgentGold") * 2).toLocaleString()
+          }}입니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
-        <NumberInputWithInfo v-model="nationPolicy.reqHumanWarRecommandRice" :step="100" title="유저전투장 권장 쌀">
+        <NumberInputWithInfo
+          v-model="nationPolicy.reqHumanWarRecommandRice"
+          :step="100"
+          title="유저전투장 권장 쌀"
+        >
           유저전투장에게 주는 쌀입니다. 이보다 적으면 포상합니다.
           <br />
           0이면 유저전투장 긴급포상 쌀의 2배를 기준으로 하며, 그 수치는 현재
-          {{ (calcPolicyValue("reqHumanWarUrgentRice") * 2).toLocaleString() }}입니다.
+          {{
+            (calcPolicyValue("reqHumanWarUrgentRice") * 2).toLocaleString()
+          }}입니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
-        <NumberInputWithInfo v-model="nationPolicy.reqHumanDevelGold" :step="100" title="유저내정장 권장 금">
-          유저내정장에게 주는 금입니다. 이보다 적으면 포상합니다.
+        <NumberInputWithInfo
+          v-model="nationPolicy.reqHumanDevelGold"
+          :step="100"
+          title="유저내정장 권장 금"
+        >
+          유저내정장에게 주는 금입니다. 이보다 적으면
+          포상합니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
-        <NumberInputWithInfo v-model="nationPolicy.reqHumanDevelRice" :step="100" title="유저내정장 권장 쌀">
-          유저내정장에게 주는 쌀입니다. 이보다 적으면 포상합니다.
+        <NumberInputWithInfo
+          v-model="nationPolicy.reqHumanDevelRice"
+          :step="100"
+          title="유저내정장 권장 쌀"
+        >
+          유저내정장에게 주는 쌀입니다. 이보다 적으면
+          포상합니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
@@ -73,7 +113,9 @@
           <br />
           0이면 기본 병종 4회({{ (defaultStatNPCMax * 100).toLocaleString() }}
           * 4) 징병비를 기준으로 하며, 그 수치는 현재
-          {{ zeroPolicy.reqNPCWarGold.toLocaleString() }}입니다.
+          {{
+            zeroPolicy.reqNPCWarGold.toLocaleString()
+          }}입니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
@@ -81,21 +123,26 @@
           NPC전투장에게 주는 쌀입니다. 이보다 적으면 포상합니다.
           <br />
           0이면 기본 병종으로
-          {{ (defaultStatNPCMax * 100).toLocaleString() }} * 4명 사살 가능한 쌀을 기준으로 하며, 그 수치는 현재
-          {{ zeroPolicy.reqNPCWarRice.toLocaleString() }}입니다.
+          {{ (defaultStatNPCMax * 100).toLocaleString() }} * 4명 사살 가능한
+          쌀을 기준으로 하며, 그 수치는 현재
+          {{
+            zeroPolicy.reqNPCWarRice.toLocaleString()
+          }}입니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
         <NumberInputWithInfo v-model="nationPolicy.reqNPCDevelGold" :step="100" title="NPC내정장 권장 금">
           NPC내정장에게 주는 금입니다. 이보다 5배 더 많다면 헌납합니다.
           <br />
-          0이면 30턴 내정 가능한 금을 기준으로 하며, 그 수치는 현재
+          0이면
+          30턴 내정 가능한 금을 기준으로 하며, 그 수치는 현재
           {{ zeroPolicy.reqNPCDevelGold }}입니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
         <NumberInputWithInfo v-model="nationPolicy.reqNPCDevelRice" :step="100" title="NPC내정장 권장 쌀">
-          NPC내정장에게 주는 쌀입니다. 이보다 5배 더 많다면 헌납합니다.
+          NPC내정장에게 주는 쌀입니다. 이보다 5배 더 많다면
+          헌납합니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
@@ -103,23 +150,21 @@
           v-model="nationPolicy.minimumResourceActionAmount"
           :step="100"
           title="포상/몰수/헌납/삼/팜 최소 단위"
-        >
-          연산결과가 이 단위보다 적다면 수행하지 않습니다.
-        </NumberInputWithInfo>
+        >연산결과가 이 단위보다 적다면 수행하지 않습니다.</NumberInputWithInfo>
       </div>
       <div class="col">
         <NumberInputWithInfo
           v-model="nationPolicy.maximumResourceActionAmount"
           :step="100"
           title="포상/몰수/헌납/삼/팜 최대 단위"
-        >
-          연산결과가 이 단위보다 크다면, 이 값에 맞춥니다.
-        </NumberInputWithInfo>
+        >연산결과가 이 단위보다 크다면, 이 값에 맞춥니다.</NumberInputWithInfo>
       </div>
       <div class="col">
-        <NumberInputWithInfo v-model="nationPolicy.minWarCrew" :step="50" title="최소 전투 가능 병력 수">
-          이보다 적을 때에는 징병을 시도합니다.
-        </NumberInputWithInfo>
+        <NumberInputWithInfo
+          v-model="nationPolicy.minWarCrew"
+          :step="50"
+          title="최소 전투 가능 병력 수"
+        >이보다 적을 때에는 징병을 시도합니다.</NumberInputWithInfo>
       </div>
       <div class="col">
         <NumberInputWithInfo
@@ -127,27 +172,38 @@
           :step="100"
           title="NPC 최소 징병 가능 인구 수"
         >
-          도시의 인구가 이보다 낮으면 NPC는 도시에서 징병하지 않고 후방 워프합니다.
-          <br />NPC의 최대 병력수보다 낮게 설정하면 제자리에서 정착장려를 합니다.
+          도시의 인구가 이보다 낮으면 NPC는 도시에서 징병하지 않고 후방
+          워프합니다.
+          <br />NPC의 최대 병력수보다 낮게 설정하면 제자리에서
+          정착장려를 합니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
         <NumberInputWithInfo
           :modelValue="nationPolicy.safeRecruitCityPopulationRatio * 100"
+          @update:modelValue="
+            nationPolicy.safeRecruitCityPopulationRatio = $event / 100
+          "
           :step="0.5"
           :int="false"
           :min="0"
           :max="100"
           title="제자리 징병 허용 인구율(%)"
-          @update:modelValue="nationPolicy.safeRecruitCityPopulationRatio = $event / 100"
         >
-          전쟁 시 후방 발령, 후방 워프의 기준 인구입니다. 이보다 많다면 '충분하다'고 판단합니다.
-          <br />NPC의 최대 병력수보다 낮게 설정하면 제자리에서 정착장려를 합니다.
+          전쟁 시 후방 발령, 후방 워프의 기준 인구입니다. 이보다 많다면
+          '충분하다'고 판단합니다.
+          <br />NPC의 최대 병력수보다 낮게 설정하면
+          제자리에서 정착장려를 합니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
-        <NumberInputWithInfo v-model="nationPolicy.minNPCWarLeadership" :step="5" title="NPC 전투 참여 통솔 기준">
-          이 수치보다 같거나 높으면 NPC전투장으로 분류됩니다.
+        <NumberInputWithInfo
+          v-model="nationPolicy.minNPCWarLeadership"
+          :step="5"
+          title="NPC 전투 참여 통솔 기준"
+        >
+          이 수치보다 같거나 높으면 NPC전투장으로
+          분류됩니다.
         </NumberInputWithInfo>
       </div>
       <div class="col">
@@ -158,27 +214,44 @@
           :max="100"
           title="훈련/사기진작 목표치"
         >
-          훈련/사기진작 기준치입니다. 이보다 같거나 높으면 출병합니다.
+          훈련/사기진작 기준치입니다. 이보다 같거나 높으면
+          출병합니다.
         </NumberInputWithInfo>
       </div>
       <!--allowNpcAttackCity는 현재 게임 내 비활성-->
     </div>
     <div style="padding: 0 8pt">
       <div class="alert alert-secondary">
-        전투 부대는 작업중입니다(json양식: {부대번호:[시작도시번호(아국),도착도시번호(적군)],...})
-        <br />후방 징병 부대는 작업중입니다(json양식: [부대번호,...]) <br />내정 부대는 작업중입니다(json양식:
-        [부대번호,...])
-        <input id="CombatForce" type="hidden" :value="JSON.stringify(nationPolicy.CombatForce)" data-type="json" />
-        <input id="SupportForce" type="hidden" :value="JSON.stringify(nationPolicy.SupportForce)" data-type="json" />
-        <input id="DevelopForce" type="hidden" :value="JSON.stringify(nationPolicy.DevelopForce)" data-type="json" />
+        전투 부대는 작업중입니다(json양식:
+        {부대번호:[시작도시번호(아국),도착도시번호(적군)],...})
+        <br />후방 징병 부대는 작업중입니다(json양식: [부대번호,...])
+        <br />내정 부대는 작업중입니다(json양식: [부대번호,...])
+        <input
+          type="hidden"
+          :value="JSON.stringify(nationPolicy.CombatForce)"
+          data-type="json"
+          id="CombatForce"
+        />
+        <input
+          type="hidden"
+          :value="JSON.stringify(nationPolicy.SupportForce)"
+          data-type="json"
+          id="SupportForce"
+        />
+        <input
+          type="hidden"
+          :value="JSON.stringify(nationPolicy.DevelopForce)"
+          data-type="json"
+          id="DevelopForce"
+        />
       </div>
     </div>
     <div class="control_bar" data-type="nationPolicy">
       <div class="btn-group" role="group">
-        <button type="button" class="btn btn-dark reset_btn" @click="resetPolicy">초기값으로</button>
-        <button type="button" class="btn btn-secondary revert_btn" @click="rollbackPolicy">이전값으로</button>
+        <button type="button" @click="resetPolicy" class="btn btn-dark reset_btn">초기값으로</button>
+        <button type="button" @click="rollbackPolicy" class="btn btn-secondary revert_btn">이전값으로</button>
       </div>
-      <button type="button" class="btn btn-primary submit_btn" @click="submitPolicy">설정</button>
+      <button type="button" @click="submitPolicy" class="btn btn-primary submit_btn">설정</button>
     </div>
     <div class="row row-cols-md-2 row-cols-1 g-0">
       <div class="col half_section_left">
@@ -193,7 +266,8 @@
         <div class="text-left px-2">
           <small class="text-muted">
             예턴이 없거나, 지정되어 있더라도 실패하면
-            <br />아래 순위에 따라 사령턴을 시도합니다.
+            <br />아래 순위에 따라
+            사령턴을 시도합니다.
           </small>
         </div>
         <div>
@@ -211,14 +285,16 @@
                 </template>
                 <template #item="{ element }">
                   <div class="list-group-item">
-                    <i class="bi bi-list" />
-                    &nbsp;&nbsp;{{ element.id }}
+                    <i class="bi bi-list"></i>
+                    &nbsp;&nbsp;{{
+                      element.id
+                    }}
                     <button
-                      v-b-tooltip.hover
                       class="btn btn-sm float-right btn-secondary py-0 px-1"
+                      v-b-tooltip.hover
                       :title="actionHelpText[element.id]"
                     >
-                      <i class="bi bi-question-lg" />
+                      <i class="bi bi-question-lg"></i>
                     </button>
                   </div>
                 </template>
@@ -234,14 +310,16 @@
               >
                 <template #item="{ element }">
                   <div class="list-group-item">
-                    <i class="bi bi-list" />
-                    &nbsp;&nbsp;{{ element.id }}
+                    <i class="bi bi-list"></i>
+                    &nbsp;&nbsp;{{
+                      element.id
+                    }}
                     <button
-                      v-b-tooltip.hover
                       class="btn btn-sm float-right btn-secondary py-0 px-1"
+                      v-b-tooltip.hover
                       :title="actionHelpText[element.id]"
                     >
-                      <i class="bi bi-question-lg" />
+                      <i class="bi bi-question-lg"></i>
                     </button>
                   </div>
                 </template>
@@ -250,12 +328,22 @@
           </div>
           <div class="control_bar" data-type="nationPriority">
             <div class="btn-group" role="group">
-              <button type="button" class="btn btn-dark reset_btn" @click="resetNationPriority">초기값으로</button>
-              <button type="button" class="btn btn-secondary revert_btn" @click="rollbackNationPriority">
-                이전값으로
-              </button>
+              <button
+                type="button"
+                class="btn btn-dark reset_btn"
+                @click="resetNationPriority"
+              >초기값으로</button>
+              <button
+                type="button"
+                class="btn btn-secondary revert_btn"
+                @click="rollbackNationPriority"
+              >이전값으로</button>
             </div>
-            <button type="button" class="btn btn-primary submit_btn" @click="submitNationPriority">설정</button>
+            <button
+              type="button"
+              class="btn btn-primary submit_btn"
+              @click="submitNationPriority"
+            >설정</button>
           </div>
         </div>
       </div>
@@ -271,7 +359,8 @@
         <div class="text-left px-2">
           <small class="text-muted">
             순위가 높은 것부터 시도합니다.
-            <br />아무것도 실행할 수 없으면 물자조달이나 인재탐색을 합니다.
+            <br />아무것도 실행할 수 없으면
+            물자조달이나 인재탐색을 합니다.
           </small>
         </div>
         <div>
@@ -289,14 +378,16 @@
                 </template>
                 <template #item="{ element }">
                   <div class="list-group-item">
-                    <i class="bi bi-list" />
-                    &nbsp;&nbsp;{{ element.id }}
+                    <i class="bi bi-list"></i>
+                    &nbsp;&nbsp;{{
+                      element.id
+                    }}
                     <button
-                      v-b-tooltip.hover
                       class="btn btn-sm float-right btn-secondary py-0 px-1"
+                      v-b-tooltip.hover
                       :title="actionHelpText[element.id]"
                     >
-                      <i class="bi bi-question-lg" />
+                      <i class="bi bi-question-lg"></i>
                     </button>
                   </div>
                 </template>
@@ -312,14 +403,16 @@
               >
                 <template #item="{ element }">
                   <div class="list-group-item">
-                    <i class="bi bi-list" />
-                    &nbsp;&nbsp;{{ element.id }}
+                    <i class="bi bi-list"></i>
+                    &nbsp;&nbsp;{{
+                      element.id
+                    }}
                     <button
-                      v-b-tooltip.hover
                       class="btn btn-sm float-right btn-secondary py-0 px-1"
+                      v-b-tooltip.hover
                       :title="actionHelpText[element.id]"
                     >
-                      <i class="bi bi-question-lg" />
+                      <i class="bi bi-question-lg"></i>
                     </button>
                   </div>
                 </template>
@@ -328,12 +421,22 @@
           </div>
           <div class="control_bar" data-type="generalPriority">
             <div class="btn-group" role="group">
-              <button type="button" class="btn btn-dark reset_btn" @click="resetGeneralPriority">초기값으로</button>
-              <button type="button" class="btn btn-secondary revert_btn" @click="rollbackGeneralPriority">
-                이전값으로
-              </button>
+              <button
+                type="button"
+                class="btn btn-dark reset_btn"
+                @click="resetGeneralPriority"
+              >초기값으로</button>
+              <button
+                type="button"
+                class="btn btn-secondary revert_btn"
+                @click="rollbackGeneralPriority"
+              >이전값으로</button>
             </div>
-            <button type="button" class="btn btn-primary submit_btn" @click="submitGeneralPriority">설정</button>
+            <button
+              type="button"
+              class="btn btn-primary submit_btn"
+              @click="submitGeneralPriority"
+            >설정</button>
           </div>
         </div>
       </div>
@@ -341,6 +444,7 @@
   </BContainer>
 </template>
 <script lang="ts">
+
 type SetterInfo = {
   setter: string | null;
   date: string | null;
@@ -376,7 +480,13 @@ import "@scss/common/bootstrap5.scss";
 import "@scss/game_bg.scss";
 
 import { ref } from "vue";
-import type { IDItem, InvalidResponse, NationPolicy, NPCChiefActions, NPCGeneralActions } from "@/defs";
+import {
+  IDItem,
+  InvalidResponse,
+  NationPolicy,
+  NPCChiefActions,
+  NPCGeneralActions,
+} from "@/defs";
 import NumberInputWithInfo from "@/components/NumberInputWithInfo.vue";
 import { cloneDeep, isEqual, isNumber, last } from "lodash";
 import { unwrap } from "@util/unwrap";
@@ -386,7 +496,8 @@ import { NPCPriorityBtnHelpMessage } from "@/helpTexts";
 import draggable from "vuedraggable";
 import TopBackBar from "@/components/TopBackBar.vue";
 import { convertIDArray } from "@util/convertIDArray";
-import { useToast, BContainer } from "bootstrap-vue-3";
+import { useToast } from 'bootstrap-vue-3/src/components/BToast/plugin';
+import BContainer from "bootstrap-vue-3/src/components/BContainer.vue";
 
 const chiefActionPriority = ref<IDItem<NPCChiefActions>[]>([]);
 const chiefActionKeys = ref(new Set(staticValues.availableNationPriorityItems));
@@ -423,8 +534,8 @@ function resetPolicy() {
   }
   nationPolicy.value = cloneDeep(staticValues.defaultNationPolicy);
   toasts.info({
-    title: "초기화 완료",
-    body: "서버 초기값을 적용했습니다.설정 버튼을 누르면 반영됩니다.",
+    title: '초기화 완료',
+    body: "서버 초기값을 적용했습니다.설정 버튼을 누르면 반영됩니다."
   });
 }
 
@@ -486,7 +597,9 @@ async function submitPolicy() {
   }
 }
 
-function calcPolicyValue(title: keyof NationPolicy): number {
+function calcPolicyValue(
+  title: keyof NationPolicy
+): number {
   if (!(title in nationPolicy.value)) {
     throw `${title}이 NationPolicy key가 아님`;
   }
@@ -633,7 +746,9 @@ async function submitGeneralPriority() {
       method: "post",
       data: convertFormData({
         type: "generalPriority",
-        data: JSON.stringify(generalActionPriority.value.map(({ id }) => id)),
+        data: JSON.stringify(
+          generalActionPriority.value.map(({ id }) => id)
+        ),
       }),
     });
     const result: InvalidResponse = response.data;
@@ -714,4 +829,4 @@ async function submitGeneralPriority() {
   padding-right: 0;
   padding-left: 0;
 }
-</style>
+</style>

hwe/ts/PageNationBetting.vue

@@ -1,21 +1,27 @@
 <template>
   <BContainer id="container" :toast="{ root: true }" class="pageNationBetting bg0">
     <TopBackBar :title="title" />
-    <BettingDetail v-if="targetBettingID !== undefined" :bettingID="targetBettingID" @reqToast="addToast" />
+    <BettingDetail
+      v-if="targetBettingID !== undefined"
+      :bettingID="targetBettingID"
+      @reqToast="addToast"
+    />
     <div v-if="bettingList === undefined">로딩 중...</div>
-    <div v-else class="bettingList">
+    <div class="bettingList" v-else>
       <div class="bg2">베팅 목록</div>
       <div
+        class="bettingItem"
         v-for="info of Object.values(bettingList).reverse()"
         :key="info.id"
-        class="bettingItem"
         @click="targetBettingID = info.id"
       >
         [{{ parseYearMonth(info.openYearMonth)[0] }}년 {{ parseYearMonth(info.openYearMonth)[1] }}월] {{ info.name }}
-        <span v-if="info.finished">(종료)</span>
-        <span v-else-if="(yearMonth ?? 0) <= info.closeYearMonth"
-          >({{ parseYearMonth(info.closeYearMonth)[0] }}년 {{ parseYearMonth(info.closeYearMonth)[1] }}월까지)</span
-        >
+        <span
+          v-if="info.finished"
+        >(종료)</span>
+        <span
+          v-else-if="(yearMonth ?? 0) <= info.closeYearMonth"
+        >({{ parseYearMonth(info.closeYearMonth)[0] }}년 {{ parseYearMonth(info.closeYearMonth)[1] }}월까지)</span>
         <span v-else>(베팅 마감)</span>
       </div>
     </div>
@@ -27,35 +33,42 @@
 <script lang="ts" setup>
 import TopBackBar from "@/components/TopBackBar.vue";
 import BottomBar from "@/components/BottomBar.vue";
-import type { ToastType } from "@/defs";
+import { BettingInfo, ToastType } from "@/defs";
 import { onMounted, ref } from "vue";
-import { SammoAPI } from "./SammoAPI";
+import { SammoAPI, ValidResponse } from "./SammoAPI";
 import { isString } from "lodash";
 import { parseYearMonth } from "@/util/parseYearMonth";
 import { joinYearMonth } from "./util/joinYearMonth";
 import BettingDetail from "@/components/BettingDetail.vue";
-import { BContainer, useToast } from "bootstrap-vue-3";
+import { useToast } from "bootstrap-vue-3/src/components/BToast/plugin";
 import { unwrap } from "./util/unwrap";
-import type { BettingListResponse } from "./defs/API/Betting";
-
+import BContainer from "bootstrap-vue-3/src/components/BContainer.vue";
 
+type BettingListResponse = ValidResponse & {
+  bettingList: Record<number, Omit<BettingInfo & { totalAmount: number }, 'candidates'>>,
+  year: number,
+  month: number,
+};
 
 const toasts = unwrap(useToast());
 const year = ref<number>();
 const month = ref<number>();
 const yearMonth = ref<number>();
-const bettingList = ref<BettingListResponse["bettingList"]>();
+const bettingList = ref<BettingListResponse['bettingList']>();
+
 
 const targetBettingID = ref<number>();
 
+
 function addToast(msg: ToastType) {
   toasts.show(msg.content, msg.options);
 }
 
-console.log("시작!");
+
+console.log('시작!');
 onMounted(async () => {
   try {
-    const result = await SammoAPI.Betting.GetBettingList();
+    const result = await SammoAPI.Betting.GetBettingList<BettingListResponse>();
     year.value = result.year;
     month.value = result.month;
     yearMonth.value = joinYearMonth(result.year, result.month);
@@ -72,5 +85,8 @@ onMounted(async () => {
   }
 });
 
-const title = "국가 베팅장";
-</script>
+
+const title = '국가 베팅장';
+
+
+</script>

hwe/ts/PageNationGeneral.vue

@@ -1,121 +0,0 @@
-<template>
-  <BContainer id="container" :toast="{ root: true }" class="pageNationGeneral bg0">
-    <TopBackBar :title="title" :reloadable="true" @reload="reload" :teleport-zone="toolbarID" />
-    <!-- eslint-disable-next-line vue/max-attributes-per-line -->
-    <GeneralList
-      v-if="asyncReady"
-      :list="generalList"
-      :troops="troopList"
-      :env="envVal"
-      :toolbarID="toolbarID"
-      role="pageNationGeneral"
-      :height="'fill'"
-      :availableGeneralClick="true"
-      @generalClick="openBattleCenter"
-    />
-    <!--<BottomBar />-->
-  </BContainer>
-</template>
-
-<script lang="ts">
-/*declare const staticValues: {
-    serverNick: string,
-    mapName: string,
-    unitSet: string,
-};*/
-</script>
-<script lang="ts" setup>
-import TopBackBar from "@/components/TopBackBar.vue";
-//import BottomBar from "@/components/BottomBar.vue";
-import { BContainer } from "bootstrap-vue-3";
-import { onMounted, provide, ref } from "vue";
-import { SammoAPI } from "./SammoAPI";
-import { merge2DArrToObjectArr } from "./util/merge2DArrToObjectArr";
-import type { GeneralListItem, GeneralListResponse } from "./defs/API/Nation";
-import GeneralList from "./components/GeneralList.vue";
-import { type GameConstStore, getGameConstStore } from "./GameConstStore";
-
-const generalList = ref<GeneralListItem[]>([]);
-const troopList = ref<Record<number, string>>({});
-const envVal = ref<GeneralListResponse["env"]>({
-  year: 1,
-  month: 1,
-  turnterm: 1,
-  turntime: "2022-02-22 22:22:22.22222",
-  killturn: 80,
-});
-
-const toolbarID = "toolbar-id";
-
-const gameConstStore = ref<GameConstStore>();
-provide("gameConstStore", gameConstStore);
-
-const asyncReady = ref(false);
-
-const title = "세력 장수";
-
-const storeP = getGameConstStore().then((store) => {
-  gameConstStore.value = store;
-});
-
-void Promise.all([storeP]).then(() => {
-  asyncReady.value = true;
-});
-
-async function reload() {
-  try {
-    const { column, list, permission, troops, env } = await SammoAPI.Nation.GeneralList();
-    troopList.value = {};
-    //XXX: 로직상 똑같은데....
-    if (permission == 0) {
-      const rawGeneralList = merge2DArrToObjectArr(column, list);
-      generalList.value = rawGeneralList.map((v) => {
-        return { permission, st0: true, st1: false, st2: false, ...v };
-      });
-    } else if (permission == 1) {
-      const rawGeneralList = merge2DArrToObjectArr(column, list);
-      generalList.value = rawGeneralList.map((v) => {
-        return { permission, st0: true, st1: true, st2: false, ...v };
-      });
-    } else if ([2, 3, 4].includes(permission)) {
-      const rawGeneralList = merge2DArrToObjectArr(column, list);
-      generalList.value = rawGeneralList.map((v) => {
-        return { permission, st0: true, st1: true, st2: true, ...v };
-      });
-
-      for (const [troopLeader, troopName] of troops) {
-        troopList.value[troopLeader] = troopName;
-      }
-    } else {
-      throw `?? ${permission}`;
-    }
-    envVal.value = env;
-  } catch (e) {
-    console.error(e);
-    throw e;
-  }
-}
-
-function openBattleCenter(generalID: number){
-  window.open(`b_battleCenter.php?gen=${generalID}`)
-}
-
-onMounted(async () => {
-  await reload();
-});
-</script>
-
-<style lang="scss">
-html,
-body,
-#app {
-  height: 100%;
-}
-
-.pageNationGeneral {
-  display: grid;
-  //grid-template-rows: auto 1fr auto;
-  grid-template-rows: auto 1fr;
-  height: 100%;
-}
-</style>

hwe/ts/PageNationStratFinan.vue

@@ -1,5 +1,5 @@
 <template>
-  <BContainer id="container" :toast="{ root: true }" class="pageNationStratFinan bg0">
+  <BContainer :toast="{root: true}" id="container" class="pageNationStratFinan bg0">
     <TopBackBar title="내무부" />
     <div class="diplomacyTitle">외교관계</div>
     <div class="diplomacyTable">
@@ -12,7 +12,11 @@
         <div>기간</div>
         <div>종료 시점</div>
       </div>
-      <div v-for="nation in nationsList" :key="nation.nation" :class="['diplomacyItem', 'tRow', 's-border-b']">
+      <div
+        :class="['diplomacyItem', 'tRow', 's-border-b']"
+        v-for="nation in nationsList"
+        :key="nation.nation"
+      >
         <div :class="`sam-nation-bg-${nation.color.slice(1)}`">
           {{ nation.name }}
         </div>
@@ -25,21 +29,28 @@
         <template v-else>
           <div
             :style="{
-              color: diplomacyStateInfo[nation.diplomacy.state].color ?? undefined,
+              color:
+                diplomacyStateInfo[nation.diplomacy.state].color ?? undefined,
             }"
           >
             {{ diplomacyStateInfo[nation.diplomacy.state].name }}
           </div>
           <div>
-            {{ nation.diplomacy.term == 0 ? "-" : `${nation.diplomacy.term}개월` }}
+            {{
+              nation.diplomacy.term == 0 ? "-" : `${nation.diplomacy.term}개월`
+            }}
           </div>
           <div
             v-for="([endYear, endMonth], _idx) in [
-              parseYearMonth(joinYearMonth(year, month) + (nation.diplomacy.term ?? 0)),
+              parseYearMonth(
+                joinYearMonth(year, month) + (nation.diplomacy.term??0)
+              ),
             ]"
             :key="_idx"
           >
-            {{ nation.diplomacy.term == 0 ? "-" : `${endYear}년 ${endMonth}월` }}
+            {{
+              nation.diplomacy.term == 0 ? "-" : `${endYear}년 ${endMonth}월`
+            }}
           </div>
         </template>
       </div>
@@ -49,9 +60,19 @@
       <div class="bg1" style="display: flex; justify-content: space-around">
         <div style="flex: 1 1 auto">국가 방침</div>
         <div>
-          <b-button v-if="editable && !inEditNationMsg" @click="enableEditNationMsg"> 국가방침 수정 </b-button>
-          <b-button v-if="editable && inEditNationMsg" @click="saveNationMsg"> 저장 </b-button>
-          <b-button v-if="editable && inEditNationMsg" @click="rollbackNationMsg"> 취소 </b-button>
+          <b-button
+            @click="enableEditNationMsg"
+            v-if="editable && !inEditNationMsg"
+            >국가방침 수정</b-button
+          >
+          <b-button @click="saveNationMsg" v-if="editable && inEditNationMsg"
+            >저장</b-button
+          >
+          <b-button
+            v-if="editable && inEditNationMsg"
+            @click="rollbackNationMsg"
+            >취소</b-button
+          >
         </div>
       </div>
       <TipTap
@@ -66,12 +87,22 @@
       <div class="bg1" style="display: flex; justify-content: space-around">
         <div style="flex: 1 1 auto">임관 권유</div>
         <div>
-          <b-button v-if="editable && !inEditScoutMsg" @click="enableEditScoutMsg"> 임관 권유문 수정 </b-button>
-          <b-button v-if="editable && inEditScoutMsg" @click="saveScoutMsg"> 저장 </b-button>
-          <b-button v-if="editable && inEditScoutMsg" @click="rollbackScoutMsg"> 취소 </b-button>
+          <b-button
+            @click="enableEditScoutMsg"
+            v-if="editable && !inEditScoutMsg"
+            >임관 권유문 수정</b-button
+          >
+          <b-button @click="saveScoutMsg" v-if="editable && inEditScoutMsg"
+            >저장</b-button
+          >
+          <b-button v-if="editable && inEditScoutMsg" @click="rollbackScoutMsg"
+            >취소</b-button
+          >
         </div>
       </div>
-      <div style="border-bottom: solid gray 0.5px">870px x 200px를 넘어서는 내용은 표시되지 않습니다.</div>
+      <div style="border-bottom: solid gray 0.5px">
+        870px x 200px를 넘어서는 내용은 표시되지 않습니다.
+      </div>
       <div style="width: 870px; margin-left: auto">
         <TipTap
           v-model="scoutMsg"
@@ -88,13 +119,9 @@
         <div class="row gx-0">
           <div class="col-12 bg2">자금 예산</div>
           <div class="col-4 bg1">현 재</div>
-          <div class="col-8">
-            {{ gold.toLocaleString() }}
-          </div>
+          <div class="col-8">{{ gold.toLocaleString() }}</div>
           <div class="col-4 bg1">단기수입</div>
-          <div class="col-8">
-            {{ income.gold.war.toLocaleString() }}
-          </div>
+          <div class="col-8">{{ income.gold.war.toLocaleString() }}</div>
           <div class="col-4 bg1">세 금</div>
           <div class="col-8">
             {{ Math.floor(incomeGoldCity).toLocaleString() }}
@@ -107,7 +134,8 @@
           <div class="col-4 bg1">국고 예산</div>
           <div class="col-8">
             {{ Math.floor(gold + incomeGold - outcomeByBill).toLocaleString() }}
-            ({{ incomeGold >= outcomeByBill ? "+" : "" }}{{ Math.floor(incomeGold - outcomeByBill).toLocaleString() }})
+            ({{ incomeGold >= outcomeByBill ? "+" : ""
+            }}{{ Math.floor(incomeGold - outcomeByBill).toLocaleString() }})
           </div>
         </div>
       </div>
@@ -115,9 +143,7 @@
         <div class="row gx-0">
           <div class="col-12 bg2">군량 예산</div>
           <div class="col-4 bg1">현 재</div>
-          <div class="col-8">
-            {{ rice.toLocaleString() }}
-          </div>
+          <div class="col-8">{{ rice.toLocaleString() }}</div>
           <div class="col-4 bg1">둔전수입</div>
           <div class="col-8">
             {{ Math.floor(incomeRiceWall).toLocaleString() }}
@@ -134,27 +160,37 @@
           <div class="col-4 bg1">국고 예산</div>
           <div class="col-8">
             {{ Math.floor(rice + incomeRice - outcomeByBill).toLocaleString() }}
-            ({{ incomeRice >= outcomeByBill ? "+" : "" }}{{ Math.floor(incomeRice - outcomeByBill).toLocaleString() }})
+            ({{ incomeRice >= outcomeByBill ? "+" : ""
+            }}{{ Math.floor(incomeRice - outcomeByBill).toLocaleString() }})
           </div>
         </div>
       </div>
       <div class="col-6">
         <div class="row gx-0">
           <div class="col-4 bg1 d-grid">
-            <div class="align-self-center">세율 <span class="avoid-wrap">(5 ~ 30%)</span></div>
+            <div class="align-self-center">
+              세율 <span class="avoid-wrap">(5 ~ 30%)</span>
+            </div>
           </div>
           <div class="col-8 row gx-0">
             <div class="col-md-6 offset-md-3 align-self-center">
               <div class="input-group my-0">
                 <input
-                  v-model="policy.rate"
                   type="number"
                   class="form-control py-1 f_tnum px-0 text-end"
+                  v-model="policy.rate"
                   min="5"
                   max="30"
                 /><span class="input-group-text py-1 f_tnum">%</span
-                ><b-button v-if="editable" variant="primary" size="sm" @click="setRate"> 변경 </b-button
-                ><b-button v-if="editable" size="sm" @click="rollbackRate"> 취소 </b-button>
+                ><b-button
+                  variant="primary"
+                  size="sm"
+                  @click="setRate"
+                  v-if="editable"
+                  >변경</b-button
+                ><b-button size="sm" @click="rollbackRate" v-if="editable"
+                  >취소</b-button
+                >
               </div>
             </div>
           </div>
@@ -163,20 +199,29 @@
       <div class="col-6">
         <div class="row gx-0">
           <div class="col-4 bg1 d-grid">
-            <div class="align-self-center">지급률 <span class="avoid-wrap">(20 ~ 200%)</span></div>
+            <div class="align-self-center">
+              지급률 <span class="avoid-wrap">(20 ~ 200%)</span>
+            </div>
           </div>
           <div class="col-8 row gx-0">
             <div class="col-md-6 offset-md-3 align-self-center">
               <div class="input-group my-0">
                 <input
-                  v-model="policy.bill"
                   type="number"
                   class="form-control py-1 f_tnum px-0 text-end"
+                  v-model="policy.bill"
                   min="20"
                   max="200"
                 /><span class="input-group-text py-1 f_tnum">%</span
-                ><b-button v-if="editable" variant="primary" size="sm" @click="setBill"> 변경 </b-button
-                ><b-button v-if="editable" size="sm" @click="rollbackBill"> 취소 </b-button>
+                ><b-button
+                  variant="primary"
+                  size="sm"
+                  @click="setBill"
+                  v-if="editable"
+                  >변경</b-button
+                ><b-button size="sm" @click="rollbackBill" v-if="editable"
+                  >취소</b-button
+                >
               </div>
             </div>
           </div>
@@ -185,20 +230,32 @@
       <div class="col-6">
         <div class="row gx-0">
           <div class="col-4 bg1 d-grid">
-            <div class="align-self-center">기밀 권한 <span class="avoid-wrap">(1 ~ 99년)</span></div>
+            <div class="align-self-center">
+              기밀 권한 <span class="avoid-wrap">(1 ~ 99년)</span>
+            </div>
           </div>
           <div class="col-8 row gx-0">
             <div class="col-md-6 offset-md-3 align-self-center">
               <div class="input-group my-0">
                 <input
-                  v-model="policy.secretLimit"
                   type="number"
                   class="form-control py-1 f_tnum px-0 text-end"
+                  v-model="policy.secretLimit"
                   min="1"
                   max="99"
                 /><span class="input-group-text py-1 f_tnum">년</span
-                ><b-button v-if="editable" variant="primary" size="sm" @click="setSecretLimit"> 변경 </b-button
-                ><b-button v-if="editable" size="sm" @click="rollbackSecretLimit"> 취소 </b-button>
+                ><b-button
+                  variant="primary"
+                  size="sm"
+                  @click="setSecretLimit"
+                  v-if="editable"
+                  >변경</b-button
+                ><b-button
+                  size="sm"
+                  @click="rollbackSecretLimit"
+                  v-if="editable"
+                  >취소</b-button
+                >
               </div>
             </div>
           </div>
@@ -210,23 +267,29 @@
             <div class="align-self-center">전쟁 금지 설정</div>
           </div>
           <div class="col-8 d-grid">
-            <div class="align-self-center">
-              {{ warSettingCnt.remain }} 회(월 +{{ warSettingCnt.inc }}회, 최대{{ warSettingCnt.max }}회)
-            </div>
+            <div class="align-self-center">{{warSettingCnt.remain}} 회(월 +{{warSettingCnt.inc}}회, 최대{{warSettingCnt.max}}회)</div>
           </div>
         </div>
       </div>
-      <div class="col-3 col-md-4" />
+      <div class="col-3 col-md-4"></div>
       <div class="col-3 col-md-2 row gx-0">
         <div class="col-9 col-md-8 text-end p-2">전쟁 금지</div>
         <div class="col-3 col-md-4 py-2">
-          <b-form-checkbox v-model="policy.blockWar" switch @change="setBlockWar" />
+          <b-form-checkbox
+            v-model="policy.blockWar"
+            @change="setBlockWar"
+            switch
+          />
         </div>
       </div>
       <div class="col-3 col-md-2 row gx-0">
         <div class="col-9 col-md-8 text-end p-2">임관 금지</div>
         <div class="col-3 col-md-4 py-2">
-          <b-form-checkbox v-model="policy.blockScout" switch @change="setBlockScout" />
+          <b-form-checkbox
+            v-model="policy.blockScout"
+            @change="setBlockScout"
+            switch
+          />
         </div>
       </div>
     </div>
@@ -240,11 +303,17 @@ import TopBackBar from "@/components/TopBackBar.vue";
 import BottomBar from "@/components/BottomBar.vue";
 import { computed, defineComponent, reactive, ref, toRefs } from "vue";
 import { isString } from "lodash";
-import { type diplomacyState, diplomacyStateInfo, type NationStaticItem } from "./defs";
+import {
+  diplomacyState,
+  diplomacyStateInfo,
+  NationStaticItem,
+} from "./defs";
 import { SammoAPI } from "./SammoAPI";
 import { joinYearMonth } from "@/util/joinYearMonth";
 import { parseYearMonth } from "@/util/parseYearMonth";
-import { useToast, BContainer } from "bootstrap-vue-3";
+import { ValidResponse } from "./util/callSammoAPI";
+import BContainer from "bootstrap-vue-3/src/components/BContainer.vue";
+import { useToast } from "bootstrap-vue-3/src/components/BToast/plugin";
 import { unwrap } from "./util/unwrap";
 
 type NationItem = NationStaticItem & {
@@ -255,6 +324,9 @@ type NationItem = NationStaticItem & {
   };
 };
 
+type SetBlockWarResponse = ValidResponse & {
+  availableCnt: number;
+}
 declare const staticValues: {
   editable: boolean;
   nationMsg: string;
@@ -298,8 +370,8 @@ export default defineComponent({
     TopBackBar,
     BottomBar,
     TipTap,
-    BContainer,
-  },
+    BContainer
+},
   setup() {
     const toasts = unwrap(useToast());
     const self = reactive(staticValues);
@@ -497,7 +569,7 @@ export default defineComponent({
 
     async function setBlockWar() {
       try {
-        const result = await SammoAPI.Nation.SetBlockWar({ value: self.policy.blockWar });
+        const result = await SammoAPI.Nation.SetBlockWar<SetBlockWarResponse>({ value: self.policy.blockWar });
         self.warSettingCnt.remain = result.availableCnt;
         toasts.info({
           title: "변경",
@@ -573,4 +645,4 @@ export default defineComponent({
   },
   methods: {},
 });
-</script>
+</script>

hwe/ts/PartialReservedCommand.vue

@@ -3,193 +3,115 @@
     <div class="col alert alert-dark m-0 p-1 center">
       <h4 class="m-0">명령 목록</h4>
     </div>
+
     <div class="row gx-1">
       <div class="col d-grid">
-        <BButton variant="secondary" @click="isEditMode = !isEditMode">
-          {{ isEditMode ? "일반 모드로" : "고급 모드로" }}
-        </BButton>
+        <b-dropdown left text="턴 선택">
+          <b-dropdown-item @click="selectTurn()">해제</b-dropdown-item>
+          <b-dropdown-item @click="selectAll(true)">모든턴</b-dropdown-item>
+          <b-dropdown-item @click="selectStep(0, 2)">홀수턴</b-dropdown-item>
+          <b-dropdown-item @click="selectStep(1, 2)">짝수턴</b-dropdown-item>
+          <b-dropdown-divider></b-dropdown-divider>
+
+          <b-dropdown-text v-for="spanIdx in [3, 4, 5, 6, 7]" :key="spanIdx">
+            {{ spanIdx }}턴 간격<br />
+            <b-button-group>
+              <b-button
+                class="ignoreMe"
+                v-for="beginIdx in spanIdx"
+                :key="beginIdx"
+                @click="selectStep(beginIdx - 1, spanIdx)"
+                >{{ beginIdx }}</b-button
+              >
+            </b-button-group>
+          </b-dropdown-text>
+        </b-dropdown>
       </div>
       <div
         class="col alert alert-primary m-0 p-0"
-        style="text-align: center; display: flex; justify-content: center; align-items: center"
+        style="
+          text-align: center;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        "
       >
-        <SimpleClock :serverTime="serverNow" />
+        {{ serverNow }}
       </div>
       <div class="col d-grid">
-        <BDropdown right text="반복">
-          <BDropdownItem v-for="turnIdx in maxPushTurn" :key="turnIdx" @click="repeatGeneralCommand(turnIdx)">
-            {{ turnIdx }}턴
-          </BDropdownItem>
-        </BDropdown>
+        <b-dropdown right text="반복">
+          <b-dropdown-item
+            v-for="turnIdx in maxPushTurn"
+            :key="turnIdx"
+            @click="repeatGeneralCommand(turnIdx)"
+            >{{ turnIdx }}턴
+          </b-dropdown-item>
+        </b-dropdown>
       </div>
     </div>
 
-    <div v-if="isEditMode" class="row gx-1">
-      <div class="col-4 d-grid">
-        <BDropdown left text="범위">
-          <BDropdownItem @click="queryActionHelper.selectTurn()"> 해제 </BDropdownItem>
-          <BDropdownItem @click="queryActionHelper.selectAll()"> 모든턴 </BDropdownItem>
-          <BDropdownItem @click="queryActionHelper.selectStep(0, 2)"> 홀수턴 </BDropdownItem>
-          <BDropdownItem @click="queryActionHelper.selectStep(1, 2)"> 짝수턴 </BDropdownItem>
-          <BDropdownDivider />
-
-          <BDropdownText v-for="spanIdx in [3, 4, 5, 6, 7]" :key="spanIdx">
-            {{ spanIdx }}턴 간격
-            <br />
-            <BButtonGroup>
-              <BButton
-                v-for="beginIdx in spanIdx"
-                :key="beginIdx"
-                class="ignoreMe"
-                @click="queryActionHelper.selectStep(beginIdx - 1, spanIdx)"
-              >
-                {{ beginIdx }}
-              </BButton>
-            </BButtonGroup>
-          </BDropdownText>
-        </BDropdown>
-      </div>
-
-      <div class="col-4 d-grid">
-        <BDropdown left text="보관함">
-          <BDropdownItem
-            v-for="[actionKey, actions] of storedActions"
-            :key="actionKey"
-            @click.self="useStoredAction(actions)"
-          >
-            {{ actionKey }}
-            <BButton size="sm" @click.prevent="deleteStoredActions(actionKey)"> 삭제 </BButton>
-          </BDropdownItem>
-        </BDropdown>
-      </div>
-
-      <div class="col-4 d-grid">
-        <BDropdown right text="최근 실행">
-          <BDropdownItem
-            v-for="(action, idx) of Array.from(recentActions.values()).reverse()"
-            :key="idx"
-            @click="void reserveCommandDirect([[queryActionHelper.getSelectedTurnList(), action]])"
-          >
-            {{ action.brief }}
-          </BDropdownItem>
-        </BDropdown>
-      </div>
-
-      <div class="col-5 d-grid">
-        <BDropdown left variant="info" text="선택한 턴을">
-          <BDropdownItem @click="clipboardCut"> <i class="bi bi-scissors" />&nbsp;잘라내기 </BDropdownItem>
-          <BDropdownItem @click="clipboardCopy"> <i class="bi bi-files" />&nbsp;복사하기 </BDropdownItem>
-          <BDropdownItem @click="clipboardPaste"> <i class="bi bi-clipboard-fill" />&nbsp;붙여넣기 </BDropdownItem>
-          <BDropdownDivider />
-          <BDropdownItem @click="setStoredActions">
-            <i class="bi bi-bookmark-plus-fill" />&nbsp;보관하기
-          </BDropdownItem>
-          <BDropdownItem @click="subRepeatCommand"> <i class="bi bi-arrow-repeat" />&nbsp;반복하기 </BDropdownItem>
-          <BDropdownDivider />
-          <BDropdownItem @click="eraseSelectedTurnList"> <i class="bi bi-eraser" />&nbsp;비우기 </BDropdownItem>
-          <BDropdownItem @click="eraseAndPullCommand">
-            <i class="bi bi-arrow-bar-up" />&nbsp;지우고 당기기
-          </BDropdownItem>
-          <BDropdownItem @click="pushEmptyCommand"> <i class="bi bi-arrow-bar-down" />&nbsp;뒤로 밀기 </BDropdownItem>
-          <!-- 최근에 실행한 10턴 -->
-        </BDropdown>
-      </div>
-
-      <div class="col-7 d-grid">
-        <BButton variant="light" :style="{ color: 'black' }" @click="toggleForm($event)"> 명령 선택 ▾ </BButton>
-      </div>
-    </div>
-    <CommandSelectForm
-      ref="commandSelectForm"
-      v-model:activatedCategory="activatedCategory"
-      :commandList="commandList"
-      @onClose="chooseCommand($event)"
-    />
-
-    <div :style="{ position: 'relative' }">
-      <div
-        class="bg-dark"
-        :style="{
-          position: 'absolute',
-          top: `${basicModeRowHeight * currentQuickReserveTarget + 30}px`,
-          width: '100%',
-          zIndex: 9,
-        }"
-      >
-        <CommandSelectForm
-          ref="commandQuickReserveForm"
-          v-model:activatedCategory="activatedCategory"
-          :commandList="commandList"
-          :hideClose="false"
-          @onClose="chooseQuickReserveCommand($event)"
-        />
-      </div>
-    </div>
-    <div
-      :class="{
-        commandTable: true,
-        isEditMode,
-      }"
-    >
+    <div class="commandTable">
       <DragSelect
-        v-slot="{ selected }"
         :style="rowGridStyle"
-        :disabled="!isEditMode"
         attribute="turnIdx"
         @dragStart="isDragToggle = true"
         @dragDone="
           isDragToggle = false;
-          queryActionHelper.toggleTurn(...$event);
+          toggleTurn(...$event);
         "
+        v-slot="{ selected }"
       >
         <div
-          v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)"
-          :key="turnIdx"
+          v-for="(turnObj, turnIdx) in reservedCommandList.slice(
+            0,
+            viewMaxTurn
+          )"
           :turnIdx="turnIdx"
+          :key="turnIdx"
           class="idx_pad center d-grid"
         >
-          <BButton
-            v-if="isEditMode"
+          <b-button
             size="sm"
             :variant="
-              isDragToggle && selected.has(`${turnIdx}`)
-                ? 'light'
-                : selectedTurnList.has(turnIdx)
+              (isDragToggle && selected.has(`${turnIdx}`))?'light':
+              turnList.has(turnIdx)
                 ? 'info'
-                : selectedTurnList.size == 0 && prevSelectedTurnList.has(turnIdx)
+                : turnList.size == 0 && prevTurnList.has(turnIdx)
                 ? 'success'
                 : 'primary'
             "
+            >{{ turnIdx + 1 }}</b-button
           >
-            {{ turnIdx + 1 }}
-          </BButton>
-          <div v-else class="plain-center">
-            {{ turnIdx + 1 }}
-          </div>
         </div>
       </DragSelect>
       <DragSelect
-        v-slot="{ selected }"
         :style="rowGridStyle"
         attribute="turnIdx"
-        :disabled="!isEditMode"
         @dragStart="isDragSingle = true"
         @dragDone="
           isDragSingle = false;
-          queryActionHelper.selectTurn(...$event);
+          selectTurn(...$event);
         "
+        v-slot="{ selected }"
       >
         <div
-          v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)"
+          v-for="(turnObj, turnIdx) in reservedCommandList.slice(
+            0,
+            viewMaxTurn
+          )"
           :key="turnIdx"
           height="24"
           class="month_pad center"
           :turnIdx="turnIdx"
           :style="{
             'white-space': 'nowrap',
-            'font-size': `${Math.min(14, (75 / (`${turnObj.year ?? 1}`.length + 8)) * 1.8)}px`,
+            'font-size': `${Math.min(
+              14,
+              (75 / (`${turnObj.year ?? 1}`.length + 8)) * 1.8
+            )}px`,
             overflow: 'hidden',
-            color: isDragSingle && selected.has(`${turnIdx}`) ? 'cyan' : undefined,
+            color:
+              isDragSingle && selected.has(`${turnIdx}`) ? 'cyan' : undefined,
           }"
         >
           {{ turnObj.year ? `${turnObj.year}年` : "" }}
@@ -198,7 +120,10 @@
       </DragSelect>
       <div :style="rowGridStyle">
         <div
-          v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)"
+          v-for="(turnObj, turnIdx) in reservedCommandList.slice(
+            0,
+            viewMaxTurn
+          )"
           :key="turnIdx"
           class="time_pad center"
           :style="{
@@ -212,98 +137,176 @@
       </div>
       <div :style="rowGridStyle">
         <div
-          v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)"
+          v-for="(turnObj, turnIdx) in reservedCommandList.slice(
+            0,
+            viewMaxTurn
+          )"
           :key="turnIdx"
           class="turn_pad center"
+          @click="chooseCommand(turnObj.action)"
         >
-          <span v-b-tooltip.hover class="turn_text" :style="turnObj.style" :title="turnObj.tooltip">
-            <!-- eslint-disable-next-line vue/no-v-html -->
-            <span v-html="turnObj.brief" />
-          </span>
-        </div>
-      </div>
-      <div v-if="!isEditMode" :style="rowGridStyle">
-        <div
-          v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)"
-          :key="turnIdx"
-          class="action_pad d-grid"
-        >
-          <BButton
-            :variant="turnIdx % 2 == 0 ? 'secondary' : 'dark'"
-            size="sm"
-            class="simple_action_btn bi bi-pencil"
-            @click="toggleQuickReserveForm(turnIdx)"
-          />
+          <span
+            class="turn_text"
+            :style="turnObj.style"
+            v-b-tooltip.hover
+            :title="turnObj.tooltip"
+            v-html="turnObj.brief"
+          ></span>
         </div>
       </div>
     </div>
     <div class="row gx-1">
       <div class="col d-grid">
-        <BDropdown :split="isEditMode" text="당기기" @click="pullGeneralCommandSingle">
-          <BDropdownItem v-for="turnIdx in maxPushTurn" :key="turnIdx" @click="pushGeneralCommand(-turnIdx)">
-            {{ turnIdx }}턴
-          </BDropdownItem>
-        </BDropdown>
+        <b-dropdown right split text="당기기" @click="pullGeneralCommandSingle">
+          <b-dropdown-item
+            v-for="turnIdx in maxPushTurn"
+            :key="turnIdx"
+            @click="pushGeneralCommand(-turnIdx)"
+            >{{ turnIdx }}턴
+          </b-dropdown-item>
+        </b-dropdown>
       </div>
       <div class="col d-grid">
-        <BDropdown :split="isEditMode" text="미루기" @click="pushGeneralCommandSingle">
-          <BDropdownItem v-for="turnIdx in maxPushTurn" :key="turnIdx" @click="pushGeneralCommand(turnIdx)">
-            {{ turnIdx }}턴
-          </BDropdownItem>
-        </BDropdown>
+        <b-dropdown right split text="미루기" @click="pushGeneralCommandSingle">
+          <b-dropdown-item
+            v-for="turnIdx in maxPushTurn"
+            :key="turnIdx"
+            @click="pushGeneralCommand(turnIdx)"
+            >{{ turnIdx }}턴
+          </b-dropdown-item>
+        </b-dropdown>
       </div>
       <div class="col d-grid">
-        <BButton @click="toggleViewMaxTurn">
-          {{ flippedMaxTurn == viewMaxTurn ? "펼치기" : "접기" }}
-        </BButton>
+        <b-button @click="toggleViewMaxTurn">{{
+          flippedMaxTurn == viewMaxTurn ? "펼치기" : "접기"
+        }}</b-button>
+      </div>
+    </div>
+    <div class="row gx-0">
+      <div class="col-2 d-grid">
+        <b-button
+          :pressed="searchModeOn"
+          @click="toggleSearchCommand()"
+          :variant="searchModeOn ? 'info' : 'primary'"
+          v-b-tooltip.hover
+          title="검색 기능을 활성화합니다."
+          ><i class="bi bi-search"></i
+        ></b-button>
+      </div>
+      <div class="col-7">
+        <v-multiselect
+          v-model="selectedCommand"
+          :allow-empty="false"
+          :options="commandList"
+          :group-select="false"
+          group-values="values"
+          group-label="category"
+          label="searchText"
+          track-by="value"
+          open-direction="top"
+          :show-labels="false"
+          selectLabel="선택(엔터)"
+          selectGroupLabel=""
+          selectedLabel="선택됨"
+          deselectLabel="해제(엔터)"
+          deselectGroupLabel=""
+          placeholder="턴 선택"
+          :maxHeight="400"
+          :searchable="searchModeOn"
+        >
+          <template v-slot:noResult>검색 결과가 없습니다.</template>
+          <template v-slot:option="props"
+            ><!--FIXME: 카테고리-->
+            <template v-if="props.option.title">
+              <span
+                class="compensatePositive"
+                v-if="props.option.compensation > 0"
+                >▲</span
+              >
+              <span
+                class="compensateNegative"
+                v-else-if="props.option.compensation < 0"
+                >▼</span
+              >
+              <span class="compensateNeutral" v-else></span>
+              <span :class="[props.option.possible ? '' : 'commandImpossible']">
+                {{ props.option.title }}
+              </span>
+            </template>
+            <template v-else-if="props.option.category">
+              {{ props.option.category }}
+            </template>
+          </template>
+          <template v-slot:singleLabel="props">
+            {{ props.option.simpleName }}
+          </template>
+        </v-multiselect>
+      </div>
+      <div class="col-3 d-grid">
+        <b-button @click="reserveCommand()" variant="primary">실행</b-button>
       </div>
     </div>
   </div>
 </template>
 
 <script lang="ts">
-declare const staticValues: {
-  maxTurn: number;
-  maxPushTurn: number;
-  commandList: {
-    category: string;
-    values: CommandItem[];
-  }[];
-  serverNow: string;
-  serverNick: string;
-  mapName: string;
-  unitSet: string;
-};
-</script>
-
-<script lang="ts" setup>
+import addMilliseconds from "date-fns/esm/addMilliseconds";
 import addMinutes from "date-fns/esm/addMinutes";
-import { range, trim } from "lodash";
+import { isString, range } from "lodash";
 import { stringifyUrl } from "query-string";
-import { onMounted, ref, watch } from "vue";
+import { defineComponent, ref, watch } from "vue";
 import { formatTime } from "@util/formatTime";
 import { joinYearMonth } from "@util/joinYearMonth";
 import { mb_strwidth } from "@util/mb_strwidth";
 import { parseTime } from "@util/parseTime";
 import { parseYearMonth } from "@util/parseYearMonth";
+import { convertSearch초성 } from "./util/convertSearch초성";
 import DragSelect from "@/components/DragSelect.vue";
 import { SammoAPI } from "./SammoAPI";
-import type { CommandItem } from "@/defs";
-import CommandSelectForm from "@/components/CommandSelectForm.vue";
-import { BButton, BButtonGroup, BDropdownItem, BDropdown, BDropdownText, BDropdownDivider } from "bootstrap-vue-3";
-import { StoredActionsHelper } from "./util/StoredActionsHelper";
-import type { TurnObj } from "@/defs";
-import type { Args } from "./processing/args";
-import { QueryActionHelper } from "./util/QueryActionHelper";
-import SimpleClock from "./components/SimpleClock.vue";
-import type { ReservedCommandResponse } from "./defs/API/Command";
 
-const { maxTurn, maxPushTurn, commandList } = staticValues;
+type commandItem = {
+  value: string;
+  title: string;
+  compensation: number;
+  simpleName: string;
+  possible: boolean;
+  reqArg: boolean;
+  searchText?: string;
+};
+
+declare const maxTurn: number;
+declare const maxPushTurn: number;
+declare const commandList: {
+  category: string;
+  values: commandItem[];
+}[];
+declare const serverNow: string;
+type TurnObj = {
+  action: string;
+  brief: string;
+  arg: null | [] | Record<string, number | string | number[] | string[]>;
+};
+
+type TurnObjWithTime = TurnObj & {
+  time: string;
+  year?: number;
+  month?: number;
+  tooltip?: string;
+  style?: Record<string, unknown>;
+};
+
+type ReservedCommandResponse = {
+  result: true;
+  turnTime: string;
+  turnTerm: number;
+  year: number;
+  month: number;
+  date: string;
+  turn: TurnObj[];
+  autorun_limit: null | number;
+};
 
 const listReqArgCommand = new Set<string>();
-const selectedCommand = ref(staticValues.commandList[0].values[0]);
-const commandSelectForm = ref<InstanceType<typeof CommandSelectForm> | null>(null);
-
 for (const commandCategories of commandList) {
   if (!commandCategories.values) {
     continue;
@@ -316,16 +319,6 @@ for (const commandCategories of commandList) {
   }
 }
 
-function toggleForm($event: Event): void {
-  $event.preventDefault();
-
-  const form = commandSelectForm.value;
-  if (!form) {
-    return;
-  }
-  form.toggle();
-}
-
 function isDropdownChildren(e?: Event): boolean {
   if (!e) {
     return false;
@@ -343,448 +336,306 @@ function isDropdownChildren(e?: Event): boolean {
   return false;
 }
 
-const queryActionHelper = new QueryActionHelper(staticValues.maxTurn);
-const storedActionsHelper = new StoredActionsHelper(
-  staticValues.serverNick,
-  "general",
-  staticValues.mapName,
-  staticValues.unitSet
-);
+const searchModeKey = `sammo_searchModeOn`;
 
-const reservedCommandList = queryActionHelper.reservedCommandList;
-const prevSelectedTurnList = queryActionHelper.prevSelectedTurnList;
-const selectedTurnList = queryActionHelper.selectedTurnList;
-
-const isEditMode = storedActionsHelper.isEditMode;
-
-const flippedMaxTurn = 14;
-
-const editModeRowHeight = 29.35;
-const basicModeRowHeight = 34.4;
-const viewMaxTurn = ref(flippedMaxTurn);
-const rowGridStyle = ref({
-  display: "grid",
-  gridTemplateRows: `repeat(${viewMaxTurn.value}, ${isEditMode.value ? editModeRowHeight : basicModeRowHeight}px)`,
-});
-
-watch([isEditMode, viewMaxTurn], ([isEditMode, maxTurn]) => {
-  rowGridStyle.value.gridTemplateRows = `repeat(${maxTurn}, ${isEditMode ? editModeRowHeight : basicModeRowHeight}px)`;
-});
-
-const isDragSingle = ref(false);
-const isDragToggle = ref(false);
-
-const invCommandMap: Record<string, CommandItem> = {};
-for (const category of commandList) {
-  for (const command of category.values) {
-    invCommandMap[command.value] = command;
-  }
-}
-
-function toggleViewMaxTurn() {
-  if (viewMaxTurn.value == flippedMaxTurn) {
-    viewMaxTurn.value = maxTurn;
-  } else {
-    viewMaxTurn.value = flippedMaxTurn;
-  }
-}
-
-async function repeatGeneralCommand(amount: number) {
-  try {
-    await SammoAPI.Command.RepeatCommand({ amount });
-  } catch (e) {
-    console.error(e);
-    alert(`실패했습니다: ${e}`);
-    return;
-  }
-  await reloadCommandList();
-}
-
-async function pushGeneralCommand(amount: number) {
-  try {
-    await SammoAPI.Command.PushCommand({ amount });
-  } catch (e) {
-    console.error(e);
-    alert(`실패했습니다: ${e}`);
-    return;
-  }
-  await reloadCommandList();
-}
-
-const serverNow = ref(new Date());
-
-function pushGeneralCommandSingle(e: Event) {
-  //NOTE: split 구현에 버그가 있어서, 수동으로 구분해야함
-  if (isDropdownChildren(e)) {
-    return;
-  }
-  if (!isEditMode.value) {
-    return;
-  }
-  void pushGeneralCommand(1);
-}
-
-function pullGeneralCommandSingle(e: Event) {
-  //NOTE: split 구현에 버그가 있어서, 수동으로 구분해야함
-  if (isDropdownChildren(e)) {
-    return;
-  }
-  if (!isEditMode.value) {
-    return;
-  }
-  void pushGeneralCommand(-1);
-}
-
-async function reloadCommandList() {
-  let result: ReservedCommandResponse;
-  try {
-    result = await SammoAPI.Command.GetReservedCommand();
-  } catch (e) {
-    console.error(e);
-    alert(`실패했습니다: ${e}`);
-    return;
-  }
-
-  let yearMonth = joinYearMonth(result.year, result.month);
-
-  const turnTime = parseTime(result.turnTime);
-  let nextTurnTime = new Date(turnTime);
-
-  const autorunLimitYearMonth = result.autorun_limit ?? yearMonth - 1;
-  const [autorunLimitYear, autorunLimitMonth] = parseYearMonth(autorunLimitYearMonth);
-
-  reservedCommandList.value = [];
-  for (const obj of result.turn) {
-    const [year, month] = parseYearMonth(yearMonth);
-    let tooltip: string[] = [];
-    let style: Record<string, unknown> = {};
-
-    const brief = obj.brief;
-
-    if (yearMonth <= autorunLimitYearMonth) {
-      if (obj.brief == "휴식") {
-        obj.brief = "휴식<small>(자율 행동)</small>";
+export default defineComponent({
+  name: "PartialReservedCommand",
+  components: {
+    DragSelect,
+  },
+  methods: {
+    updateNow() {
+      const serverNow = addMilliseconds(new Date(), this.timeDiff);
+      this.serverNow = formatTime(serverNow, "HH:mm:ss");
+      setTimeout(() => {
+        this.updateNow();
+      }, 1000 - serverNow.getMilliseconds());
+    },
+    toggleTurn(...turnList: number[] | string[]) {
+      for (let turnIdx of turnList) {
+        if (isString(turnIdx)) {
+          turnIdx = parseInt(turnIdx);
+        }
+        if (this.turnList.has(turnIdx)) {
+          this.turnList.delete(turnIdx);
+        } else {
+          this.turnList.add(turnIdx);
+        }
+      }
+    },
+    selectTurn(...turnList: number[] | string[]) {
+      this.turnList.clear();
+      for (const turnIdx of turnList) {
+        if (isString(turnIdx)) {
+          this.turnList.add(parseInt(turnIdx));
+        } else {
+          this.turnList.add(turnIdx);
+        }
+      }
+    },
+    selectAll(e: Event | true) {
+      //NOTE: split 구현에 버그가 있어서, 수동으로 구분해야함
+      if (e !== true && isDropdownChildren(e)) {
+        return;
       }
-      style.color = "#aaffff";
 
-      tooltip.push(`자율 행동 기간: ${autorunLimitYear}년 ${autorunLimitMonth}월까지`);
+      if (this.turnList.size * 3 > this.maxTurn) {
+        this.turnList.clear();
+      } else {
+        for (let i = 0; i < this.maxTurn; i++) {
+          this.turnList.add(i);
+        }
+      }
+    },
+    selectStep(begin: number, step: number) {
+      this.turnList.clear();
+      for (const idx of range(0, maxTurn)) {
+        if ((idx - begin) % step == 0) {
+          this.turnList.add(idx);
+        }
+      }
+    },
+    toggleViewMaxTurn() {
+      if (this.viewMaxTurn == this.flippedMaxTurn) {
+        this.viewMaxTurn = this.maxTurn;
+      } else {
+        this.viewMaxTurn = this.flippedMaxTurn;
+      }
+    },
+    async repeatGeneralCommand(amount: number) {
+      try {
+        await SammoAPI.Command.RepeatCommand({ amount });
+      } catch (e) {
+        console.error(e);
+        alert(`실패했습니다: ${e}`);
+        return;
+      }
+      await this.reloadCommandList();
+    },
+    async pushGeneralCommand(amount: number) {
+      try {
+        await SammoAPI.Command.PushCommand({ amount });
+      } catch (e) {
+        console.error(e);
+        alert(`실패했습니다: ${e}`);
+        return;
+      }
+      await this.reloadCommandList();
+    },
+    pushGeneralCommandSingle(e: Event) {
+      //NOTE: split 구현에 버그가 있어서, 수동으로 구분해야함
+      if (isDropdownChildren(e)) {
+        return;
+      }
+      void this.pushGeneralCommand(1);
+    },
+    pullGeneralCommandSingle(e: Event) {
+      //NOTE: split 구현에 버그가 있어서, 수동으로 구분해야함
+      if (isDropdownChildren(e)) {
+        return;
+      }
+      void this.pushGeneralCommand(-1);
+    },
+    async reloadCommandList() {
+      let result: ReservedCommandResponse;
+      try {
+        result = await SammoAPI.Command.GetReservedCommand();
+      } catch (e) {
+        console.error(e);
+        alert(`실패했습니다: ${e}`);
+        return;
+      }
+
+      const reservedCommandList: TurnObjWithTime[] = [];
+      let yearMonth = joinYearMonth(result.year, result.month);
+
+      const turnTime = parseTime(result.turnTime);
+      let nextTurnTime = new Date(turnTime);
+
+      const autorunLimitYearMonth = result.autorun_limit ?? yearMonth - 1;
+      const [autorunLimitYear, autorunLimitMonth] = parseYearMonth(
+        autorunLimitYearMonth
+      );
+
+      for (const obj of result.turn) {
+        const [year, month] = parseYearMonth(yearMonth);
+        let tooltip: string[] = [];
+        let style: Record<string, unknown> = {};
+
+        const brief = obj.brief;
+
+        if (yearMonth <= autorunLimitYearMonth) {
+          if (obj.brief == "휴식") {
+            obj.brief = "휴식<small>(자율 행동)</small>";
+          }
+          style.color = "#aaffff";
+
+          tooltip.push(
+            `자율 행동 기간: ${autorunLimitYear}년 ${autorunLimitMonth}월까지`
+          );
+        }
+
+        if (mb_strwidth(brief) > 22) {
+          tooltip.push(brief);
+        }
+
+        reservedCommandList.push({
+          ...obj,
+          year,
+          month,
+          time: formatTime(nextTurnTime, "HH:mm"),
+          tooltip: tooltip.length == 0 ? undefined : tooltip.join("\n"),
+          style,
+        });
+
+        yearMonth += 1;
+        nextTurnTime = addMinutes(nextTurnTime, result.turnTerm);
+      }
+      this.reservedCommandList = reservedCommandList;
+
+      const serverNowObj = parseTime(result.date);
+      const clientNowObj = new Date();
+      const timeDiff = serverNowObj.getTime() - clientNowObj.getTime();
+      this.timeDiff = timeDiff;
+    },
+    async reserveCommand() {
+      let turnList: number[];
+      if (this.turnList.size == 0) {
+        turnList = Array.from(this.prevTurnList.values());
+      } else {
+        turnList = Array.from(this.turnList.values());
+      }
+
+      if (turnList.length == 0) {
+        turnList.push(0);
+      }
+
+      const commandName = this.selectedCommand.value;
+
+      if (listReqArgCommand.has(commandName)) {
+        document.location.href = stringifyUrl({
+          url: "v_processing.php",
+          query: {
+            command: commandName,
+            turnList: turnList.join("_"),
+          },
+        });
+        return;
+      }
+
+      try {
+        await SammoAPI.Command.ReserveCommand({
+          turnList,
+          action: commandName,
+        });
+
+        if (this.turnList.size > 0) {
+          this.prevTurnList.clear();
+          for (const v of this.turnList) {
+            this.prevTurnList.add(v);
+          }
+          this.turnList.clear();
+        }
+      } catch (e) {
+        console.error(e);
+        alert(`실패했습니다: ${e}`);
+        return;
+      }
+      await this.reloadCommandList();
+    },
+    toggleSearchCommand() {
+      const searchModeOn = !this.searchModeOn;
+      this.searchModeOn = searchModeOn;
+      localStorage.setItem(searchModeKey, searchModeOn ? "1" : "0");
+    },
+    chooseCommand(val: string){
+      this.selectedCommand = this.invCommandMap[val];
+    }
+  },
+  data() {
+    const serverNowObj = parseTime(serverNow);
+    const clientNowObj = new Date();
+    const timeDiff = serverNowObj.getTime() - clientNowObj.getTime();
+
+    setTimeout(() => {
+      this.updateNow();
+    }, 1000 - serverNowObj.getMilliseconds());
+
+    const selectedCommand = commandList[0].values[0];
+    for (const subCategory of commandList) {
+      for (const command of subCategory.values) {
+        if (command.searchText) {
+          continue;
+        }
+        command.searchText = convertSearch초성(command.simpleName).join("|");
+      }
     }
 
-    if (mb_strwidth(brief) > 22) {
-      tooltip.push(brief);
-    }
+    const searchModeOn = (localStorage.getItem(searchModeKey) ?? "0") != "0";
 
-    reservedCommandList.value.push({
-      ...obj,
-      year,
-      month,
-      time: formatTime(nextTurnTime, "HH:mm"),
-      tooltip: tooltip.length == 0 ? undefined : tooltip.join("\n"),
-      style,
+    const emptyTurn: TurnObjWithTime[] = Array.from<TurnObjWithTime>({
+      length: maxTurn,
+    }).fill({
+      arg: null,
+      brief: "",
+      action: "",
+      year: undefined,
+      month: undefined,
+      time: "",
     });
 
-    yearMonth += 1;
-    nextTurnTime = addMinutes(nextTurnTime, result.turnTerm);
-  }
+    const prevTurnList = new Set([0]);
+    const turnList = new Set<number>();
 
-  serverNow.value = parseTime(result.date);
-}
+    return {
+      maxTurn,
 
-async function reserveCommandDirect(args: [number[], TurnObj][], reload = true): Promise<boolean> {
-  const query: {
-    turnList: number[];
-    action: string;
-    arg: Args;
-  }[] = [];
-  for (const [turnList, { action, arg }] of args) {
-    query.push({
+      maxPushTurn,
+      commandList,
+      serverNow: formatTime(serverNowObj, "HH:mm:ss"),
+      timeDiff,
+      prevTurnList,
       turnList,
-      action,
-      arg,
-    });
-  }
-
-  try {
-    await SammoAPI.Command.ReserveBulkCommand(query);
-    queryActionHelper.releaseSelectedTurnList();
-  } catch (e) {
-    console.error(e);
-    alert(`실패했습니다: ${e}`);
-    return false;
-  }
-
-  if (reload) {
-    await reloadCommandList();
-  }
-  return true;
-}
-
-async function reserveCommand() {
-  let reqTurnList: number[] = queryActionHelper.getSelectedTurnList();
-
-  const commandName = selectedCommand.value.value;
-
-  if (listReqArgCommand.has(commandName)) {
-    document.location.href = stringifyUrl({
-      url: "v_processing.php",
-      query: {
-        command: commandName,
-        turnList: reqTurnList.join("_"),
-      },
-    });
-    return;
-  }
-
-  try {
-    const result = await SammoAPI.Command.ReserveCommand({
-      turnList: reqTurnList,
-      action: commandName,
+      selectedCommand,
+      reservedCommandList: emptyTurn,
+      autorun_limit: null as null | number,
+      searchModeOn,
+    };
+  },
+  setup() {
+    const flippedMaxTurn = 15;
+    const viewMaxTurn = ref(flippedMaxTurn);
+    const rowGridStyle = ref({
+      display: "grid",
+      gridTemplateRows: `repeat(${viewMaxTurn.value}, 29.4px)`,
     });
 
-    storedActionsHelper.pushRecentActions({
-      action: commandName,
-      brief: result.brief,
-      arg: {},
+    watch(viewMaxTurn, (val) => {
+      rowGridStyle.value.gridTemplateRows = `repeat(${val}, 29.4px)`;
     });
 
-    queryActionHelper.releaseSelectedTurnList();
-  } catch (e) {
-    console.error(e);
-    alert(`실패했습니다: ${e}`);
-    return;
-  }
-  await reloadCommandList();
-}
+    const isDragSingle = ref(false);
+    const isDragToggle = ref(false);
 
-function chooseCommand(val?: string) {
-  if (!val) {
-    return;
-  }
-  selectedCommand.value = invCommandMap[val];
-  void reserveCommand();
-}
-
-const commandQuickReserveForm = ref<InstanceType<typeof CommandSelectForm> | null>(null);
-
-const currentQuickReserveTarget = ref(-1);
-function chooseQuickReserveCommand(val?: string) {
-  if (!val) {
-    return;
-  }
-  selectedCommand.value = invCommandMap[val];
-  selectedTurnList.value.clear();
-  selectedTurnList.value.add(currentQuickReserveTarget.value);
-  void reserveCommand();
-}
-function toggleQuickReserveForm(turnIdx: number) {
-  if (turnIdx == currentQuickReserveTarget.value) {
-    commandQuickReserveForm.value?.toggle();
-    return;
-  }
-  currentQuickReserveTarget.value = turnIdx;
-  commandQuickReserveForm.value?.show();
-}
-
-watch(isEditMode, (newEditMode) => {
-  if (newEditMode) {
-    commandQuickReserveForm.value?.close();
-    currentQuickReserveTarget.value = -1;
-  } else {
-    commandSelectForm.value?.close();
-  }
-});
-
-const emptyTurnObj: TurnObj = { action: "휴식", brief: "휴식", arg: {} };
-
-const recentActions = storedActionsHelper.recentActions;
-const storedActions = storedActionsHelper.storedActions;
-const activatedCategory = storedActionsHelper.activatedCategory;
-
-async function eraseSelectedTurnList(releaseSelect = true): Promise<boolean> {
-  const result = await reserveCommandDirect([[queryActionHelper.getSelectedTurnList(), emptyTurnObj]]);
-  if (releaseSelect) {
-    queryActionHelper.releaseSelectedTurnList();
-  }
-  return result;
-}
-
-const clipboard = storedActionsHelper.clipboard;
-
-async function clipboardCut(releaseSelect = true) {
-  clipboardCopy(false);
-  return eraseSelectedTurnList(releaseSelect);
-}
-
-function clipboardCopy(releaseSelect = true) {
-  clipboard.value = queryActionHelper.extractQueryActions();
-  if (releaseSelect) {
-    queryActionHelper.releaseSelectedTurnList();
-  }
-}
-
-async function clipboardPaste(releaseSelect = true) {
-  const rawActions = clipboard.value;
-  if (rawActions === undefined) {
-    return;
-  }
-
-  const actions = queryActionHelper.amplifyQueryActions(rawActions, queryActionHelper.getSelectedTurnList());
-  if (actions.length === 0) {
-    return;
-  }
-
-  const result = await reserveCommandDirect(actions);
-  if (releaseSelect) {
-    queryActionHelper.releaseSelectedTurnList();
-  }
-  return result;
-}
-
-async function subRepeatCommand(releaseSelect = true): Promise<boolean> {
-  const reqTurnList = queryActionHelper.getSelectedTurnList();
-  const selectedMinTurnIdx = reqTurnList[0];
-  const selectedMaxTurnIdx = reqTurnList[reqTurnList.length - 1];
-  const queryLength = selectedMaxTurnIdx - selectedMinTurnIdx + 1;
-
-  const rawActions = queryActionHelper.extractQueryActions();
-  const actions = queryActionHelper.amplifyQueryActions(rawActions, range(selectedMinTurnIdx, maxTurn, queryLength));
-
-  const result = await reserveCommandDirect(actions);
-  if (releaseSelect) {
-    queryActionHelper.releaseSelectedTurnList();
-  }
-  return result;
-}
-
-async function eraseAndPullCommand(releaseSelect = true): Promise<boolean> {
-  const reqTurnList = queryActionHelper.getSelectedTurnList();
-  const selectedMinTurnIdx = reqTurnList[0];
-  const selectedMaxTurnIdx = reqTurnList[reqTurnList.length - 1];
-  const queryLength = selectedMaxTurnIdx - selectedMinTurnIdx + 1;
-
-  if (selectedMinTurnIdx === 0) {
-    await pushGeneralCommand(-queryLength);
-    return true;
-  }
-
-  if (selectedMinTurnIdx + queryLength == maxTurn) {
-    return eraseSelectedTurnList(releaseSelect);
-  }
-
-  const actions: [number[], TurnObj][] = [];
-
-  const emptyTurnList: number[] = [];
-
-  for (const srcTurnIdx of range(selectedMinTurnIdx + queryLength, maxTurn)) {
-    const rawAction = reservedCommandList.value[srcTurnIdx];
-    if (rawAction.action == emptyTurnObj.action) {
-      emptyTurnList.push(srcTurnIdx - queryLength);
-      continue;
+    const invCommandMap: Record<string, commandItem> = {};
+    for(const category of commandList){
+      for(const command of category.values){
+        invCommandMap[command.value] = command;
+      }
     }
-    actions.push([
-      [srcTurnIdx - queryLength],
-      {
-        action: rawAction.action,
-        arg: rawAction.arg,
-        brief: rawAction.brief,
-      },
-    ]);
-  }
 
-  emptyTurnList.push(...range(maxTurn - queryLength, maxTurn));
-  actions.push([emptyTurnList, emptyTurnObj]);
-
-  const result = await reserveCommandDirect(actions);
-  if (releaseSelect) {
-    queryActionHelper.releaseSelectedTurnList();
-  }
-  return result;
-}
-
-async function pushEmptyCommand(releaseSelect = true): Promise<boolean> {
-  const reqTurnList = queryActionHelper.getSelectedTurnList();
-  const selectedMinTurnIdx = reqTurnList[0];
-  const selectedMaxTurnIdx = reqTurnList[reqTurnList.length - 1];
-  const queryLength = selectedMaxTurnIdx - selectedMinTurnIdx + 1;
-
-  if (selectedMinTurnIdx === 0) {
-    await pushGeneralCommand(queryLength);
-    return true;
-  }
-
-  if (selectedMaxTurnIdx == maxTurn) {
-    return eraseSelectedTurnList(releaseSelect);
-  }
-
-  const actions: [number[], TurnObj][] = [];
-
-  const emptyTurnList: number[] = [];
-
-  for (const srcTurnIdx of range(selectedMinTurnIdx, maxTurn - queryLength)) {
-    const rawAction = reservedCommandList.value[srcTurnIdx];
-    if (rawAction.action == emptyTurnObj.action) {
-      emptyTurnList.push(srcTurnIdx + queryLength);
-      continue;
-    }
-    actions.push([
-      [srcTurnIdx + queryLength],
-      {
-        action: rawAction.action,
-        arg: rawAction.arg,
-        brief: rawAction.brief,
-      },
-    ]);
-  }
-
-  emptyTurnList.push(...range(selectedMinTurnIdx, selectedMinTurnIdx + queryLength));
-  actions.push([emptyTurnList, emptyTurnObj]);
-
-  const result = await reserveCommandDirect(actions);
-  if (releaseSelect) {
-    queryActionHelper.releaseSelectedTurnList();
-  }
-  return result;
-}
-
-function setStoredActions() {
-  const actions = queryActionHelper.extractQueryActions();
-  const turnBrief = new Map<number, string>();
-  for (const [subTurnList, action] of actions) {
-    const actionName = action.action.split("_");
-    const actionShortName = actionName.length == 1 ? actionName[0] : actionName[1];
-    for (const turnIdx of subTurnList) {
-      turnBrief.set(turnIdx, actionShortName[0]);
-    }
-  }
-
-  const turnBriefStr = Array.from(turnBrief.entries())
-    .sort(([turnA], [turnB]) => turnA - turnB)
-    .map(([, action]) => action)
-    .join("");
-
-  const nickName = trim(prompt("선택한 턴들의 별명을 지어주세요", turnBriefStr) ?? "");
-  if (nickName == "") {
-    return;
-  }
-
-  storedActionsHelper.setStoredActions(nickName, actions);
-  queryActionHelper.releaseSelectedTurnList();
-}
-
-function deleteStoredActions(actionKey: string) {
-  storedActionsHelper.deleteStoredActions(actionKey);
-}
-
-async function useStoredAction(rawActions: [number[], TurnObj][]) {
-  const reqTurnList = queryActionHelper.getSelectedTurnList();
-  const actions = queryActionHelper.amplifyQueryActions(rawActions, reqTurnList);
-  const result = await reserveCommandDirect(actions);
-  queryActionHelper.releaseSelectedTurnList();
-  return result;
-}
-
-onMounted(() => {
-  void reloadCommandList();
+    return {
+      isDragSingle,
+      isDragToggle,
+      flippedMaxTurn,
+      viewMaxTurn,
+      rowGridStyle,
+      invCommandMap,
+    };
+  },
+  mounted() {
+    void this.reloadCommandList();
+  },
 });
 </script>
 <style lang="scss">
@@ -797,19 +648,9 @@ onMounted(() => {
 
 .commandPad {
   background-color: $gray-900;
-  position: relative;
 }
 
 .commandTable {
-  width: 100%;
-  display: grid;
-  grid-template-columns:
-    minmax(20px, 0.8fr) minmax(75px, 2.4fr) minmax(40px, 0.9fr)
-    4.8fr minmax(28px, 0.8fr);
-  //30, 70, 37.65, 160
-}
-
-.commandTable.isEditMode {
   width: 100%;
   display: grid;
   grid-template-columns: minmax(30px, 1fr) minmax(75px, 2.5fr) minmax(40px, 1fr) 5fr;
@@ -859,16 +700,11 @@ onMounted(() => {
   }
 }
 
-.isEditMode .month_pad:hover {
+.month_pad:hover {
   text-decoration: underline;
   cursor: pointer;
 }
 
-.plain-center {
-  background-color: black;
-}
-
-.plain-center,
 .month_pad,
 .time_pad,
 .turn_pad {
@@ -892,4 +728,4 @@ onMounted(() => {
   text-overflow: ellipsis;
   overflow: hidden;
 }
-</style>
+</style>

hwe/ts/SammoAPI.ts

@@ -1,132 +1,63 @@
-import type { Args } from "./processing/args";
-import {
-    callSammoAPI, extractHttpMethod, GET, PATCH, POST, PUT,
-    type APITail, type APICallT, type RawArgType, type ValidResponse, type InvalidResponse
-} from "./util/callSammoAPI";
+import { InvalidResponse } from "./defs";
+import { APIPathGen } from "./util/APIPathGen";
+import { callSammoAPI, ValidResponse } from "./util/callSammoAPI";
 export type { ValidResponse, InvalidResponse };
-import { APIPathGen, NumVar } from "./util/APIPathGen.js";
-import type { BettingDetailResponse, BettingListResponse } from "./defs/API/Betting";
-import type { ReserveBulkCommandResponse, ReserveCommandResponse, ReservedCommandResponse } from "./defs/API/Command";
-import type { ChiefResponse } from "./defs/API/NationCommand";
-import type { inheritBuffType } from "./defs/API/InheritAction";
-import type { SetBlockWarResponse, GeneralListResponse as NationGeneralListResponse } from "./defs/API/Nation";
-import type { UploadImageResponse } from "./defs/API/Misc";
-import type { JoinArgs } from "./defs/API/General";
-import type { GetConstResponse } from "./defs/API/Global";
-import type { GeneralListResponse } from "./defs";
+
+async function done<ResultType extends ValidResponse>(args?: Record<string, unknown>): Promise<ResultType>;
+async function done<ResultType extends ValidResponse>(args: Record<string, unknown> | undefined, returnError: false): Promise<ResultType>;
+async function done<ResultType extends ValidResponse, ErrorType extends InvalidResponse>(args: Record<string, unknown> | undefined, returnError: true): Promise<ResultType | ErrorType>;
+
+async function done<ResultType extends ValidResponse, ErrorType extends InvalidResponse>(args?: Record<string, unknown>, returnError = false): Promise<ResultType | ErrorType> {
+    console.error(`Can't directly call. ${args}, ${returnError}. Use auto-generated path API.`);
+    return callSammoAPI<ResultType, ErrorType>([], args, true);
+}
 
 const apiRealPath = {
-    Betting: {
-        Bet: PUT as APICallT<{
-            bettingID: number,
-            bettingType: number[],
-            amount: number,
-        }>,
-        GetBettingDetail: NumVar('betting_id',
-            GET as APICallT<undefined, BettingDetailResponse>
-        ),
-        GetBettingList: GET as APICallT<undefined, BettingListResponse>,
+    Betting:{
+        Bet: done,
+        GetBettingDetail: done,
+        GetBettingList: done,
     },
     Command: {
-        GetReservedCommand: GET as APICallT<undefined, ReservedCommandResponse>,
-        PushCommand: PUT as APICallT<{
-            amount: number
-        }>,
-        RepeatCommand: PUT as APICallT<{
-            amount: number
-        }>,
-        ReserveCommand: PUT as APICallT<{
-            turnList: number[],
-            action: string,
-            arg?: Args
-        }, ReserveCommandResponse>,
-        ReserveBulkCommand: PUT as APICallT<{
-            turnList: number[],
-            action: string,
-            arg?: Args
-        }[], ReserveBulkCommandResponse>,
+        GetReservedCommand: done,
+        PushCommand: done,
+        RepeatCommand: done,
+        ReserveCommand: done,
     },
     General: {
-        Join: POST as APICallT<JoinArgs>,
-    },
-    Global: {
-        GeneralList: GET as APICallT<{
-            with_token?: boolean
-        }, GeneralListResponse>,
-        GetConst: GET as APICallT<undefined, GetConstResponse>,
+        Join: done,
     },
     InheritAction: {
-        BuyHiddenBuff: PUT as APICallT<{
-            type: inheritBuffType,
-            level: number
-        }>,
-        BuyRandomUnique: PUT as APICallT<undefined>,
-        BuySpecificUnique: PUT as APICallT<{
-            item: string,
-            amount: number,
-        }>,
-        ResetSpecialWar: PUT as APICallT<undefined>,
-        ResetTurnTime: PUT as APICallT<undefined>,
-        SetNextSpecialWar: PUT as APICallT<{
-            type: string,
-        }>,
-    },
-    Misc: {
-        UploadImage: POST as APICallT<{
-            imageData: string,
-        }, UploadImageResponse>
+        BuyHiddenBuff: done,
+        BuyRandomUnique: done,
+        BuySpecificUnique: done,
+        ResetSpecialWar: done,
+        ResetTurnTime: done,
+        SetNextSpecialWar: done,
     },
+    Misc: { UploadImage: done },
     NationCommand: {
-        GetReservedCommand: GET as APICallT<undefined, ChiefResponse>,
-        PushCommand: PUT as APICallT<{
-            amount: number
-        }>,
-        RepeatCommand: PUT as APICallT<{
-            amount: number
-        }>,
-        ReserveCommand: PUT as APICallT<{
-            turnList: number[],
-            action: string,
-            arg?: Args
-        }, ReserveCommandResponse>,
-        ReserveBulkCommand: PUT as APICallT<{
-            turnList: number[],
-            action: string,
-            arg?: Args
-        }[], ReserveBulkCommandResponse>,
+        GetReservedCommand: done,
+        PushCommand: done,
+        RepeatCommand: done,
+        ReserveCommand: done,
     },
     Nation: {
-        GeneralList: GET as APICallT<undefined, NationGeneralListResponse>,
-        SetNotice: PUT as APICallT<{
-            msg: string,
-        }>,
-        SetScoutMsg: PUT as APICallT<{
-            msg: string,
-        }>,
-        SetBill: PATCH as APICallT<{
-            amount: number,
-        }>,
-        SetRate: PATCH as APICallT<{
-            amount: number,
-        }>,
-        SetSecretLimit: PATCH as APICallT<{
-            amount: number,
-        }>,
-        SetBlockWar: PATCH as APICallT<{
-            value: boolean,
-        }, SetBlockWarResponse>,
-        SetBlockScout: PATCH as APICallT<{
-            value: boolean,
-        }>,
+        SetNotice: done,
+        SetScoutMsg: done,
+        SetBill: done,
+        SetRate: done,
+        SetSecretLimit: done,
+        SetBlockWar: done,
+        SetBlockScout: done,
     },
 } as const;
 
-export const SammoAPI = APIPathGen(apiRealPath, (path: string[], tail: APITail, pathParam) => {
-    const method = extractHttpMethod(tail);
-    return (args?: RawArgType, returnError?: boolean) => {
+export const SammoAPI = APIPathGen<typeof done, typeof apiRealPath>(apiRealPath, (path: string[]) => {
+    return (args?: Record<string, unknown>, returnError?: boolean) => {
         if (returnError) {
-            return callSammoAPI(method, path.join('/'), args, pathParam, true);
+            return callSammoAPI(path.join('/'), args, true);
         }
-        return callSammoAPI(method, path.join('/'), args, pathParam);
+        return callSammoAPI(path.join('/'), args);
     };
 });

hwe/ts/SammoRootAPI.ts

@@ -1,28 +1,30 @@
-import type { AutoLoginFailed, AutoLoginNonceResponse, AutoLoginResponse, LoginFailed, LoginResponse } from "./defs/API/Login";
+import { InvalidResponse } from "./defs";
 import { APIPathGen } from "./util/APIPathGen";
-import { callSammoAPI, extractHttpMethod, GET, POST, type APICallT, type APITail, type InvalidResponse, type RawArgType, type ValidResponse } from "./util/callSammoAPI";
+import { callSammoAPI, ValidResponse } from "./util/callSammoAPI";
 export type { ValidResponse, InvalidResponse };
 
+async function done<ResultType extends ValidResponse>(args?: Record<string, unknown>): Promise<ResultType>;
+async function done<ResultType extends ValidResponse>(args: Record<string, unknown> | undefined, returnError: false): Promise<ResultType>;
+async function done<ResultType extends ValidResponse, ErrorType extends InvalidResponse>(args: Record<string, unknown> | undefined, returnError: true): Promise<ResultType | ErrorType>;
+
+async function done<ResultType extends ValidResponse, ErrorType extends InvalidResponse>(args?: Record<string, unknown>, returnError = false): Promise<ResultType | ErrorType>{
+    console.error(`Can't directly call. ${args}, ${returnError}. Use auto-generated path API.`);
+    return callSammoAPI<ResultType, ErrorType>([], args, true);
+}
+
 const apiRealPath = {
     Login: {
-        LoginByID: POST as APICallT<{
-            username: string,
-            password: string,
-        }, LoginResponse, LoginFailed>,
-        LoginByToken: POST as APICallT<{
-            hashedToken: string,
-            token_id: number,
-        }, AutoLoginResponse, AutoLoginFailed>,
-        ReqNonce: GET as APICallT<undefined, AutoLoginNonceResponse, AutoLoginFailed>
+        LoginByID: done,
+        LoginByToken: done,
+        ReqNonce: done,
     },
 } as const;
 
-export const SammoRootAPI = APIPathGen(apiRealPath, (path: string[], tail: APITail, pathParam) => {
-    const method = extractHttpMethod(tail);
-    return (args?: RawArgType, returnError?: boolean) => {
+export const SammoRootAPI = APIPathGen<typeof done, typeof apiRealPath>(apiRealPath, (path: string[]) => {
+    return (args?: Record<string, unknown>, returnError?: boolean) => {
         if (returnError) {
-            return callSammoAPI(method, path.join('/'), args, pathParam, true);
+            return callSammoAPI(path.join('/'), args, true);
         }
-        return callSammoAPI(method, path.join('/'), args, pathParam);
+        return callSammoAPI(path.join('/'), args);
     };
 });