feat: 턴 선택기를 재 작성 (#211)

- select form에서 유사 dialog 버튼 방식으로 변경
  - 카테고리마다 페이지 이동
- 일반 모드 / 고급 모드 분리
- 일반 모드에서는 턴별 즉시 설정
- 고급 모드에서는 드래그를 포함한 각종 기능 제공
  - 최근 실행 턴
  - 잘라내기, 복사하기, 붙여넣기
  - 반복하기
  - 비우기
  - 지우고 당기기, 뒤로 밀기
  - 보관하기, 보관한 턴 사용하기

Co-authored-by: Hide_D <hided62@gmail.com>
Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/211
Co-authored-by: hide_d <hided62@gmail.com>
Co-committed-by: hide_d <hided62@gmail.com>

hwe/a_history.php

@@ -203,9 +203,13 @@ $nations = $history['nations'];
             <td><?= banner() ?> </td>
         </tr>
     </table>
+    <?= WebUtil::printStaticValues([
+        'staticValues' => [
+            'serverNick' => DB::prefix(),
+            'serverID' => UniqueConst::$serverID,
+        ]
+    ])?>
     <script>
-        window.serverNick = '<?= DB::prefix() ?>';
-        window.serverID = '<?= UniqueConst::$serverID ?>';
         <?php if($isCurrent): ?>
         reloadWorldMap({
             showMe: false,

hwe/b_diplomacy.php

@@ -98,9 +98,13 @@ $neutralStateCharMap = [
     <?= WebUtil::printCSS('css/map.css') ?>
     <?= WebUtil::printCSS('css/history.css') ?>
     <?= WebUtil::printDist('ts', ['common', 'map']) ?>
+    <?= WebUtil::printStaticValues([
+        'staticValues' => [
+            'serverNick' => DB::prefix(),
+            'serverID' => UniqueConst::$serverID
+        ],
+    ]) ?>
     <script>
-        window.serverNick = '<?= DB::prefix() ?>';
-        window.serverID = '<?= UniqueConst::$serverID ?>';
         $(function() {
 
             reloadWorldMap({

hwe/func_command.php

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

hwe/index.php

@@ -126,19 +126,34 @@ 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
+        '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,
+        ]
     ]) ?>
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
 </head>

hwe/recent_map.php

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

hwe/sammo/API/NationCommand/GetReservedCommand.php

@@ -117,6 +117,8 @@ 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/GameConstBase.php

@@ -275,9 +275,17 @@ class GameConstBase
 
     /** @var array 선택 가능한 커맨드 */
     public static $availableGeneralCommand = [
-        '' => [
+        '개인' => [
             '휴식',
-            'che_요양'
+            'che_요양',
+            'che_단련',
+            'che_숙련전환',
+            'che_견문',
+            'che_은퇴',
+            'che_장비매매',
+            'che_군량매매',
+            'che_내정특기초기화',
+            'che_전투특기초기화',
         ],
         '내정' => [
             'che_농지개간',
@@ -291,43 +299,35 @@ 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/scenario/scenario_904.json

@@ -1,19 +1,27 @@
 {
-    "title":"【이벤트】 대리전",
+    "title": "【이벤트】 대리전",
-    "startYear":180,
+    "startYear": 180,
-    "map":{
+    "map": {
-        "mapName":"miniche_b"
+        "mapName": "miniche_b"
     },
-    "history":[
+    "history": [
         "<C>●</>180년 1월:<L><b>【이벤트】</b></>NPC 군주 뒤에 플레이해보는 이벤트 깃수"
     ],
     "const": {
-        "joinRuinedNPCProp":0,
+        "joinRuinedNPCProp": 0,
-        "npcBanMessageProb":1,
+        "npcBanMessageProb": 1,
         "availableGeneralCommand": {
-            "": [
+            "개인": [
                 "휴식",
-                "che_요양"
+                "che_요양",
+                "che_단련",
+                "che_숙련전환",
+                "che_견문",
+                "che_은퇴",
+                "che_장비매매",
+                "che_군량매매",
+                "che_내정특기초기화",
+                "che_전투특기초기화"
             ],
             "내정": [
                 "che_농지개간",
@@ -27,36 +35,29 @@
                 "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_하야"
@@ -93,102 +94,755 @@
             ]
         }
     },
-    "nation":[
+    "nation": [
-        ["엄백호",   "#800080", 10000, 10000, "엄백호",   500, "che_덕가",     1, ["건안"]],
+        [
-        ["맹획",     "#A0522D", 10000, 10000, "맹획",     500, "che_덕가",     1, ["월수"]],
+            "엄백호",
-        ["유표",     "#E0FFFF", 10000, 10000, "유표",     500, "che_도가",     1, ["영릉"]],
+            "#800080",
-        ["올돌골",   "#800000", 10000, 10000, "올돌골",   500, "che_도적",     1, ["남해"]],
+            10000,
-        ["동탁",     "#A9A9A9", 10000, 10000, "동탁",     500, "che_도적",     1, ["안정"]],
+            10000,
-        ["유비",     "#008000", 10000, 10000, "유비",     500, "che_명가",     1, ["평원"]],
+            "엄백호",
-        ["유기",     "#008080", 10000, 10000, "유기",     500, "che_명가",     1, ["강하"]],
+            500,
-        ["유장",     "#483D8B", 10000, 10000, "유장",     500, "che_묵가",     1, ["덕양"]],
+            "che_덕가",
-        ["조조",     "#000080", 10000, 10000, "조조",     500, "che_법가",     1, ["진류"]],
+            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, ["오"]],
+            "#A0522D",
-        ["헌제",     "#BA55D3", 10000, 10000, "헌제",     500, "che_유가",     1, ["홍농"]],
+            10000,
-        ["원술",     "#FFC0CB", 10000, 10000, "원술",     500, "che_음양가",   1, ["여남"]],
+            10000,
-        ["마등",     "#808000", 10000, 10000, "마등",     500, "che_종횡가",   1, ["무도"]],
+            "맹획",
-        ["목록대왕", "#7CFC00", 10000, 10000, "목록대왕", 500, "che_종횡가",   1, ["건녕"]],
+            500,
-        ["장량",     "#FFD700", 10000, 10000, "장량",     500, "che_태평도",   1, ["하내"]]
+            "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":[
+    "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,
-        [999, "유표",     1293,  3, null, 85, 85, 85, 12, 150, 250, null, null],
+            "엄백호",
-        [999, "올돌골",   1241,  4, null, 85, 85, 85, 12, 150, 250, null, null],
+            1217,
-        [999, "동탁",     1083,  5, null, 85, 85, 85, 12, 150, 250, null, null],
+            1,
-        [999, "유비",     1281,  6, null, 85, 85, 85, 12, 150, 250, null, null],
+            null,
-        [999, "유기",     1276,  7, null, 85, 85, 85, 12, 150, 250, null, null],
+            85,
-        [999, "유장",     1290,  8, null, 85, 85, 85, 12, 150, 250, null, null],
+            85,
-        [999, "조조",     1392,  9, null, 85, 85, 85, 12, 150, 250, null, null],
+            85,
-        [999, "원소",     1268, 10, null, 85, 85, 85, 12, 150, 250, null, null],
+            12,
-        [999, "공손찬",   1033, 11, null, 85, 85, 85, 12, 150, 250, null, null],
+            150,
-        [999, "석벌휴",   null, 12, null, 85, 85, 85, 12, 150, 250, null, null],
+            250,
-        [999, "고남무",   null, 13, null, 85, 85, 85, 12, 150, 250, null, null],
+            null,
-        [999, "장로",     1319, 14, null, 85, 85, 85, 12, 150, 250, null, 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,
-        [999, "원술",     1269, 18, null, 85, 85, 85, 12, 150, 250, null, null],
+            "맹획",
-        [999, "마등",     1094, 19, null, 85, 85, 85, 12, 150, 250, null, null],
+            1108,
-        [999, "목록대왕", 1110, 20, null, 85, 85, 85, 12, 150, 250, null, null],
+            2,
-        [999, "장량",     1318, 21, null, 85, 85, 85, 12, 150, 250, null, null]
+            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,
+            "month",
-            ["or", ["Date", "==", null, 12], ["Date", "==", null, 6]],
+            1000,
-            ["CreateManyNPC", 10, 10],
+            [
-            ["DeleteEvent"]
+                "or",
-        ],
+                [
-        [
+                    "Date",
-            "month", 1000,
+                    "==",
-            ["Date", "==", 181, 1],
+                    null,
-            ["OpenNationBetting", 4, 1000],
+                    12
-            ["OpenNationBetting", 1, 1000],
+                ],
-            ["DeleteEvent"]
+                [
-        ],
+                    "Date",
-        [
+                    "==",
-            "month", 1000,
+                    null,
-            ["and",
+                    6
-                ["Date", ">=", 183, 1],
+                ]
-                ["RemainNation", "<=", 16]
             ],
-            ["OpenNationBetting", 4, 1000],
+            [
-            ["OpenNationBetting", 1, 1000],
+                "CreateManyNPC",
-            ["DeleteEvent"]
+                10,
+                10
+            ],
+            [
+                "DeleteEvent"
+            ]
         ],
         [
-            "month", 1000,
+            "month",
-            ["and",
+            1000,
-                ["Date", ">=", 183, 1],
+            [
-                ["RemainNation", "<=", 8]
+                "Date",
+                "==",
+                181,
+                1
             ],
-            ["OpenNationBetting", 1, 1000],
+            [
-            ["DeleteEvent"]
+                "OpenNationBetting",
+                4,
+                1000
+            ],
+            [
+                "OpenNationBetting",
+                1,
+                1000
+            ],
+            [
+                "DeleteEvent"
+            ]
         ],
         [
-            "month", 1000,
+            "month",
-            ["and",
+            1000,
-                ["Date", ">=", 183, 1],
+            [
-                ["RemainNation", "<=", 4]
+                "and",
+                [
+                    "Date",
+                    ">=",
+                    183,
+                    1
+                ],
+                [
+                    "RemainNation",
+                    "<=",
+                    16
+                ]
             ],
-            ["OpenNationBetting", 1, 1000],
+            [
-            ["DeleteEvent"]
+                "OpenNationBetting",
+                4,
+                1000
+            ],
+            [
+                "OpenNationBetting",
+                1,
+                1000
+            ],
+            [
+                "DeleteEvent"
+            ]
         ],
         [
-            "destroy_nation", 1000,
+            "month",
-            ["and",
+            1000,
-                ["Date", ">=", 183, 1],
+            [
-                ["RemainNation", "==", 1]
+                "and",
+                [
+                    "Date",
+                    ">=",
+                    183,
+                    1
+                ],
+                [
+                    "RemainNation",
+                    "<=",
+                    8
+                ]
             ],
-            ["BlockScoutAction"],
+            [
-            ["DeleteEvent"]
+                "OpenNationBetting",
+                1,
+                1000
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "and",
+                [
+                    "Date",
+                    ">=",
+                    183,
+                    1
+                ],
+                [
+                    "RemainNation",
+                    "<=",
+                    4
+                ]
+            ],
+            [
+                "OpenNationBetting",
+                1,
+                1000
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "destroy_nation",
+            1000,
+            [
+                "and",
+                [
+                    "Date",
+                    ">=",
+                    183,
+                    1
+                ],
+                [
+                    "RemainNation",
+                    "==",
+                    1
+                ]
+            ],
+            [
+                "BlockScoutAction"
+            ],
+            [
+                "DeleteEvent"
+            ]
         ]
     ]
 }

hwe/ts/PageChiefCenter.vue

@@ -392,6 +392,8 @@ export default defineComponent({
       autorun_limit: undefined,
       officerLevel: undefined,
       commandList: undefined,
+      mapName: undefined,
+      unitSet: undefined,
     });
 
     async function reloadTable(): Promise<void> {

hwe/ts/PartialReservedCommand.vue

@@ -3,29 +3,12 @@
     <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">
-        <b-dropdown left text="턴 선택">
+        <BButton
-          <b-dropdown-item @click="selectTurn()">해제</b-dropdown-item>
+          variant="secondary"
-          <b-dropdown-item @click="selectAll(true)">모든턴</b-dropdown-item>
+          @click="isEditMode = !isEditMode"
-          <b-dropdown-item @click="selectStep(0, 2)">홀수턴</b-dropdown-item>
+        >{{ isEditMode ? '일반 모드로' : '고급 모드로' }}</BButton>
-          <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"
@@ -35,29 +18,127 @@
           justify-content: center;
           align-items: center;
         "
-      >
+      >{{ formatTime(serverNow, "HH:mm:ss") }}</div>
-        {{ serverNow }}
-      </div>
       <div class="col d-grid">
-        <b-dropdown right text="반복">
+        <BDropdown right text="반복">
-          <b-dropdown-item
+          <BDropdownItem
             v-for="turnIdx in maxPushTurn"
             :key="turnIdx"
             @click="repeatGeneralCommand(turnIdx)"
-            >{{ turnIdx }}턴
+          >{{ turnIdx }}턴</BDropdownItem>
-          </b-dropdown-item>
+        </BDropdown>
-        </b-dropdown>
       </div>
     </div>
 
-    <div class="commandTable">
+    <div class="commandSelectFormAnchor">
+      <div v-if="isEditMode" class="row gx-1">
+        <div class="col-4 d-grid">
+          <BDropdown left text="범위">
+            <BDropdownItem @click="selectTurn()">해제</BDropdownItem>
+            <BDropdownItem @click="selectAll(true)">모든턴</BDropdownItem>
+            <BDropdownItem @click="selectStep(0, 2)">홀수턴</BDropdownItem>
+            <BDropdownItem @click="selectStep(1, 2)">짝수턴</BDropdownItem>
+            <BDropdownDivider></BDropdownDivider>
+
+            <BDropdownText v-for="spanIdx in [3, 4, 5, 6, 7]" :key="spanIdx">
+              {{ spanIdx }}턴 간격
+              <br />
+              <BButtonGroup>
+                <BButton
+                  class="ignoreMe"
+                  v-for="beginIdx in spanIdx"
+                  :key="beginIdx"
+                  @click="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="useStoredAction(actions)"
+            >
+              {{ actionKey }}
+              <BButton @click.prevent="deleteStoredActions(actionKey)" size="sm">삭제</BButton>
+            </BDropdownItem>
+          </BDropdown>
+        </div>
+
+        <div class="col-4 d-grid">
+          <BDropdown right text="최근 실행">
+            <BDropdownItem
+              v-for="(action, idx) in recentActions"
+              :key="idx"
+              @click="void reserveCommandDirect([[Array.from(turnList.values()), 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"></i>&nbsp;잘라내기
+            </BDropdownItem>
+            <BDropdownItem @click="clipboardCopy">
+              <i class="bi bi-files"></i>&nbsp;복사하기
+            </BDropdownItem>
+            <BDropdownItem @click="clipboardPaste">
+              <i class="bi bi-clipboard-fill"></i>&nbsp;붙여넣기
+            </BDropdownItem>
+            <BDropdownDivider />
+            <BDropdownItem @click="setStoredActions">
+              <i class="bi bi-bookmark-plus-fill"></i>&nbsp;보관하기
+            </BDropdownItem>
+            <BDropdownItem @click="subRepeatCommand">
+              <i class="bi bi-arrow-repeat"></i>&nbsp;반복하기
+            </BDropdownItem>
+            <BDropdownDivider />
+            <BDropdownItem @click="eraseSelectedTurnList">
+              <i class="bi bi-eraser"></i>&nbsp;비우기
+            </BDropdownItem>
+            <BDropdownItem @click="eraseAndPullCommand">
+              <i class="bi bi-arrow-bar-up"></i>&nbsp;지우고 당기기
+            </BDropdownItem>
+            <BDropdownItem @click="pushEmptyCommand">
+              <i class="bi bi-arrow-bar-down"></i>&nbsp;뒤로 밀기
+            </BDropdownItem>
+            <!-- 최근에 실행한 10턴 -->
+          </BDropdown>
+        </div>
+
+        <div class="col-7 d-grid">
+          <BButton variant="light" @click="toggleForm($event)" :style="{ color: 'black' }">명령 선택 ▾</BButton>
+        </div>
+      </div>
+    </div>
+
+    <div :style="{ position: 'relative' }">
+      <div
+        class="commandQuickReserveFormAnchor bg-dark"
+        :style="{
+          position: 'absolute',
+          top: `${basicModeRowHeight * currentQuickReserveTarget + 30}px`,
+          width: '100%',
+          zIndex: 9,
+        }"
+      ></div>
+    </div>
+    <div :class="{
+      commandTable: true,
+      isEditMode,
+    }">
       <DragSelect
         :style="rowGridStyle"
+        :disabled="!isEditMode"
         attribute="turnIdx"
         @dragStart="isDragToggle = true"
         @dragDone="
-          isDragToggle = false;
+  isDragToggle = false;
-          toggleTurn(...$event);
+toggleTurn(...$event);
         "
         v-slot="{ selected }"
       >
@@ -70,27 +151,29 @@
           :key="turnIdx"
           class="idx_pad center d-grid"
         >
-          <b-button
+          <BButton
+            v-if="isEditMode"
             size="sm"
             :variant="
-              (isDragToggle && selected.has(`${turnIdx}`))?'light':
+              (isDragToggle && selected.has(`${turnIdx}`)) ? 'light' :
-              turnList.has(turnIdx)
+                turnList.has(turnIdx)
-                ? 'info'
+                  ? 'info'
-                : turnList.size == 0 && prevTurnList.has(turnIdx)
+                  : turnList.size == 0 && prevTurnList.has(turnIdx)
-                ? 'success'
+                    ? 'success'
-                : 'primary'
+                    : 'primary'
             "
-            >{{ turnIdx + 1 }}</b-button
+          >{{ turnIdx + 1 }}</BButton>
-          >
+          <div v-else class="plain-center">{{ turnIdx + 1 }}</div>
         </div>
       </DragSelect>
       <DragSelect
         :style="rowGridStyle"
         attribute="turnIdx"
+        :disabled="!isEditMode"
         @dragStart="isDragSingle = true"
         @dragDone="
-          isDragSingle = false;
+  isDragSingle = false;
-          selectTurn(...$event);
+selectTurn(...$event);
         "
         v-slot="{ selected }"
       >
@@ -131,9 +214,7 @@
             whiteSpace: 'nowrap',
             overflow: 'hidden',
           }"
-        >
+        >{{ turnObj.time }}</div>
-          {{ turnObj.time }}
-        </div>
       </div>
       <div :style="rowGridStyle">
         <div
@@ -154,138 +235,97 @@
           ></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)"
+          ></BButton>
+        </div>
+      </div>
     </div>
     <div class="row gx-1">
       <div class="col d-grid">
-        <b-dropdown right split text="당기기" @click="pullGeneralCommandSingle">
+        <BDropdown :split="isEditMode" text="당기기" @click="pullGeneralCommandSingle">
-          <b-dropdown-item
+          <BDropdownItem
             v-for="turnIdx in maxPushTurn"
             :key="turnIdx"
             @click="pushGeneralCommand(-turnIdx)"
-            >{{ turnIdx }}턴
+          >{{ turnIdx }}턴</BDropdownItem>
-          </b-dropdown-item>
+        </BDropdown>
-        </b-dropdown>
       </div>
       <div class="col d-grid">
-        <b-dropdown right split text="미루기" @click="pushGeneralCommandSingle">
+        <BDropdown :split="isEditMode" text="미루기" @click="pushGeneralCommandSingle">
-          <b-dropdown-item
+          <BDropdownItem
             v-for="turnIdx in maxPushTurn"
             :key="turnIdx"
             @click="pushGeneralCommand(turnIdx)"
-            >{{ turnIdx }}턴
+          >{{ turnIdx }}턴</BDropdownItem>
-          </b-dropdown-item>
+        </BDropdown>
-        </b-dropdown>
       </div>
       <div class="col d-grid">
-        <b-button @click="toggleViewMaxTurn">{{
+        <BButton @click="toggleViewMaxTurn">{{ flippedMaxTurn == viewMaxTurn ? "펼치기" : "접기" }}</BButton>
-          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>
+  <CommandSelectForm
+    :commandList="commandList"
+    anchor=".commandSelectFormAnchor"
+    ref="commandSelectForm"
+    @on-close="chooseCommand($event)"
+  />
+  <CommandSelectForm
+    :commandList="commandList"
+    anchor=".commandQuickReserveFormAnchor"
+    ref="commandQuickReserveForm"
+    @on-close="chooseQuickReserveCommand($event)"
+    :hideClose="false"
+  />
 </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 { isString, range } from "lodash";
+import { clone, isString, min, range, repeat, trim } from "lodash";
 import { stringifyUrl } from "query-string";
-import { defineComponent, ref, watch } from "vue";
+import { onMounted, 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 { SammoAPI, type InvalidResponse } from "./SammoAPI";
-
+import type { CommandItem, ReserveCommandResponse } from "@/defs";
-type commandItem = {
+import CommandSelectForm from "@/components/CommandSelectForm.vue";
-  value: string;
+import { BButton, BButtonGroup, BDropdownItem, BDropdown, BDropdownText, BDropdownDivider } from "bootstrap-vue-3";
-  title: string;
+import { StoredActionsHelper } from "./util/StoredActionsHelper";
-  compensation: number;
+import type { TurnObj } from '@/defs';
-  simpleName: string;
+import { unwrap } from "./util/unwrap";
-  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;
@@ -306,7 +346,21 @@ type ReservedCommandResponse = {
   autorun_limit: null | number;
 };
 
+
+const {
+  maxTurn,
+  maxPushTurn,
+  commandList,
+} = staticValues;
+
+
 const listReqArgCommand = new Set<string>();
+const serverNow = ref(parseTime(staticValues.serverNow));
+const clientNow = ref(new Date());
+const timeDiff = ref(serverNow.value.getTime() - clientNow.value.getTime());
+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;
@@ -319,6 +373,16 @@ 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;
@@ -336,307 +400,608 @@ function isDropdownChildren(e?: Event): boolean {
   return false;
 }
 
-const searchModeKey = `sammo_searchModeOn`;
 
-export default defineComponent({
+setTimeout(() => {
-  name: "PartialReservedCommand",
+  updateNow();
-  components: {
+}, 1000 - serverNow.value.getMilliseconds());
-    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;
-      }
 
-      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[] = [];
+const emptyTurn: TurnObjWithTime[] = Array.from<TurnObjWithTime>({
-      let yearMonth = joinYearMonth(result.year, result.month);
+  length: staticValues.maxTurn,
+}).fill({
+  arg: {},
+  brief: "",
+  action: "",
+  year: undefined,
+  month: undefined,
+  time: "",
+});
 
-      const turnTime = parseTime(result.turnTime);
+const editModeKey = `sammo_edit_mode_key`;
-      let nextTurnTime = new Date(turnTime);
 
-      const autorunLimitYearMonth = result.autorun_limit ?? yearMonth - 1;
+const prevTurnList = ref(new Set([0]));
-      const [autorunLimitYear, autorunLimitMonth] = parseYearMonth(
+const turnList = ref(new Set<number>());
-        autorunLimitYearMonth
+const reservedCommandList = ref(emptyTurn);
-      );
+const isEditMode = ref(localStorage.getItem(editModeKey) === '1');
 
-      for (const obj of result.turn) {
+const flippedMaxTurn = 14;
-        const [year, month] = parseYearMonth(yearMonth);
-        let tooltip: string[] = [];
-        let style: Record<string, unknown> = {};
 
-        const brief = obj.brief;
+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)`,
+});
 
-        if (yearMonth <= autorunLimitYearMonth) {
+watch([isEditMode, viewMaxTurn], ([isEditMode, maxTurn]) => {
-          if (obj.brief == "휴식") {
+  rowGridStyle.value.gridTemplateRows = `repeat(${maxTurn}, ${isEditMode ? editModeRowHeight : basicModeRowHeight}px)`;
-            obj.brief = "휴식<small>(자율 행동)</small>";
+});
-          }
-          style.color = "#aaffff";
 
-          tooltip.push(
+const isDragSingle = ref(false);
-            `자율 행동 기간: ${autorunLimitYear}년 ${autorunLimitMonth}월까지`
+const isDragToggle = ref(false);
-          );
-        }
 
-        if (mb_strwidth(brief) > 22) {
+const invCommandMap: Record<string, CommandItem> = {};
-          tooltip.push(brief);
+for (const category of commandList) {
-        }
+  for (const command of category.values) {
+    invCommandMap[command.value] = command;
+  }
+}
 
-        reservedCommandList.push({
-          ...obj,
-          year,
-          month,
-          time: formatTime(nextTurnTime, "HH:mm"),
-          tooltip: tooltip.length == 0 ? undefined : tooltip.join("\n"),
-          style,
-        });
 
-        yearMonth += 1;
+function updateNow() {
-        nextTurnTime = addMinutes(nextTurnTime, result.turnTerm);
+  serverNow.value = addMilliseconds(new Date(), timeDiff.value);
-      }
+  setTimeout(() => {
-      this.reservedCommandList = reservedCommandList;
+    updateNow();
+  }, 1000 - serverNow.value.getMilliseconds());
+}
 
-      const serverNowObj = parseTime(result.date);
+function toggleTurn(...reqTurnList: number[] | string[]) {
-      const clientNowObj = new Date();
+  for (let turnIdx of reqTurnList) {
-      const timeDiff = serverNowObj.getTime() - clientNowObj.getTime();
+    if (isString(turnIdx)) {
-      this.timeDiff = timeDiff;
+      turnIdx = parseInt(turnIdx);
-    },
-    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];
     }
-  },
+    if (turnList.value.has(turnIdx)) {
-  data() {
+      turnList.value.delete(turnIdx);
-    const serverNowObj = parseTime(serverNow);
+    } else {
-    const clientNowObj = new Date();
+      turnList.value.add(turnIdx);
-    const timeDiff = serverNowObj.getTime() - clientNowObj.getTime();
+    }
+  }
+}
 
-    setTimeout(() => {
+function selectTurn(...reqTurnList: number[] | string[]) {
-      this.updateNow();
+  turnList.value.clear();
-    }, 1000 - serverNowObj.getMilliseconds());
+  for (const turnIdx of reqTurnList) {
+    if (isString(turnIdx)) {
+      turnList.value.add(parseInt(turnIdx));
+    } else {
+      turnList.value.add(turnIdx);
+    }
+  }
+}
 
-    const selectedCommand = commandList[0].values[0];
+function selectAll(e: Event | true) {
-    for (const subCategory of commandList) {
+  //NOTE: split 구현에 버그가 있어서, 수동으로 구분해야함
-      for (const command of subCategory.values) {
+  if (e !== true && isDropdownChildren(e)) {
-        if (command.searchText) {
+    return;
+  }
+
+  if (turnList.value.size * 3 > maxTurn) {
+    turnList.value.clear();
+  } else {
+    for (let i = 0; i < maxTurn; i++) {
+      turnList.value.add(i);
+    }
+  }
+}
+
+function selectStep(begin: number, step: number) {
+  turnList.value.clear();
+  for (const idx of range(0, maxTurn)) {
+    if ((idx - begin) % step == 0) {
+      turnList.value.add(idx);
+    }
+  }
+}
+
+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();
+}
+
+
+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>";
+      }
+      style.color = "#aaffff";
+
+      tooltip.push(
+        `자율 행동 기간: ${autorunLimitYear}년 ${autorunLimitMonth}월까지`
+      );
+    }
+
+    if (mb_strwidth(brief) > 22) {
+      tooltip.push(brief);
+    }
+
+    reservedCommandList.value.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);
+  }
+
+  serverNow.value = parseTime(result.date);
+  clientNow.value = new Date();
+  timeDiff.value = serverNow.value.getTime() - clientNow.value.getTime();
+}
+
+async function reserveCommandDirect(args: [number[], TurnObj][], reload = true): Promise<boolean> {
+  const waiterList: Promise<ReserveCommandResponse | InvalidResponse>[] = [];
+  for (const [turnList, { action, arg }] of args) {
+    waiterList.push(
+      SammoAPI.Command.ReserveCommand<ReserveCommandResponse, InvalidResponse>({
+        turnList,
+        action,
+        arg,
+      }, true)
+    );
+  }
+
+  let success = true;
+  for (const [idx, waiter] of waiterList.entries()) {
+    try {
+      const response = await waiter;
+      if (!response.result) {
+        const message = `${args[idx][0].join(',')}을 예약하지 못했습니다: ${response.reason}`
+        console.error(message, args[idx][1]);
+        alert(message);
+        success = false;
+      }
+    }
+    catch (e) {
+      const message = `${args[idx][0].join(',')}을 예약하지 못했습니다: ${e}`
+      console.error(message, args[idx][1]);
+      success = false;
+    }
+  }
+  if (reload) {
+    await reloadCommandList();
+  }
+  return success;
+}
+
+function getSelectedTurnList(): number[] {
+  if (turnList.value.size) {
+    return Array.from(turnList.value);
+  }
+  if (prevTurnList.value.size) {
+    return Array.from(prevTurnList.value);
+  }
+  return [0];
+}
+
+function releaseSelectedTurnList() {
+  if (turnList.value.size > 0) {
+    prevTurnList.value.clear();
+    for (const v of turnList.value) {
+      prevTurnList.value.add(v);
+    }
+    turnList.value.clear();
+  }
+}
+
+async function reserveCommand() {
+  let reqTurnList: number[] = 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<ReserveCommandResponse>({
+      turnList: reqTurnList,
+      action: commandName,
+    });
+
+    storedActionsHelper.pushRecentActions({
+      action: commandName,
+      brief: result.brief,
+      arg: {}
+    });
+
+    releaseSelectedTurnList();
+
+
+  } catch (e) {
+    console.error(e);
+    alert(`실패했습니다: ${e}`);
+    return;
+  }
+  await reloadCommandList();
+}
+
+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];
+  turnList.value.clear();
+  turnList.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 => {
+  localStorage.setItem(editModeKey, newEditMode ? '1' : '0');
+  if (newEditMode) {
+    commandQuickReserveForm.value?.close();
+    currentQuickReserveTarget.value = -1;
+  }
+  else {
+    commandSelectForm.value?.close();
+  }
+});
+
+const emptyTurnObj: TurnObj = { action: '휴식', brief: '휴식', arg: {} };
+
+const storedActionsHelper = new StoredActionsHelper(staticValues.serverNick, 'general', staticValues.mapName, staticValues.unitSet);
+
+const recentActions = storedActionsHelper.recentActions;
+const storedActions = storedActionsHelper.storedActions;
+
+async function eraseSelectedTurnList(releaseSelect = true): Promise<boolean> {
+  const result = await reserveCommandDirect([[
+    getSelectedTurnList(),
+    emptyTurnObj
+  ]]);
+  if (releaseSelect) {
+    releaseSelectedTurnList();
+  }
+  return result;
+}
+
+
+function refineQueryActions(): [number[], TurnObj][] {
+  const reqTurnList = getSelectedTurnList();
+  const selectedMinTurnIdx = unwrap(min<number>(reqTurnList));
+  const buffer: [number[], TurnObj][] = [];
+  for (const rawTurnIdx of reqTurnList) {
+    const turnIdx = rawTurnIdx - selectedMinTurnIdx;
+    const rawAction = reservedCommandList.value[rawTurnIdx]
+    buffer.push([[turnIdx], {
+      action: rawAction.action,
+      arg: clone(rawAction.arg),
+      brief: rawAction.brief
+    }]);
+  }
+  return buffer;
+}
+
+function amplifyQueryActions(rawActions: [number[], TurnObj][], reqTurnList: number[]): [number[], TurnObj][] {
+  if (reqTurnList.length < 1) {
+    return [];
+  }
+
+  let minQueryIdx = maxTurn;
+  let maxQueryIdx = 0;
+  for (const [turnList] of rawActions) {
+    for (const turnIdx of turnList) {
+      minQueryIdx = Math.min(minQueryIdx, turnIdx);
+      maxQueryIdx = Math.max(maxQueryIdx, turnIdx);
+    }
+  }
+  const queryLength = maxQueryIdx - minQueryIdx + 1;
+
+  const queryTurnList: number[] = [reqTurnList[0]];
+  for (const reqTurnIdx of reqTurnList) {
+    const last = queryTurnList[queryTurnList.length - 1];
+    if (reqTurnIdx < last + queryLength) {
+      continue;
+    }
+    queryTurnList.push(reqTurnIdx);
+  }
+
+  const actions: [number[], TurnObj][] = [];
+  for (const [baseTurnList, action] of rawActions) {
+    const subTurnList: number[] = [];
+    for (const baseTurnIdx of baseTurnList) {
+      for (const queryTurnIdx of queryTurnList) {
+        const targetTurn = baseTurnIdx + queryTurnIdx;
+        if (targetTurn >= maxTurn) {
           continue;
         }
-        command.searchText = convertSearch초성(command.simpleName).join("|");
+        subTurnList.push(baseTurnIdx + queryTurnIdx);
       }
     }
-
+    if (subTurnList.length == 0) {
-    const searchModeOn = (localStorage.getItem(searchModeKey) ?? "0") != "0";
+      continue;
-
-    const emptyTurn: TurnObjWithTime[] = Array.from<TurnObjWithTime>({
-      length: maxTurn,
-    }).fill({
-      arg: null,
-      brief: "",
-      action: "",
-      year: undefined,
-      month: undefined,
-      time: "",
-    });
-
-    const prevTurnList = new Set([0]);
-    const turnList = new Set<number>();
-
-    return {
-      maxTurn,
-
-      maxPushTurn,
-      commandList,
-      serverNow: formatTime(serverNowObj, "HH:mm:ss"),
-      timeDiff,
-      prevTurnList,
-      turnList,
-      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)`,
-    });
-
-    watch(viewMaxTurn, (val) => {
-      rowGridStyle.value.gridTemplateRows = `repeat(${val}, 29.4px)`;
-    });
-
-    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;
-      }
     }
+    actions.push([subTurnList, action]);
+  }
 
-    return {
+  return actions;
-      isDragSingle,
+}
-      isDragToggle,
+
-      flippedMaxTurn,
+const clipboard = ref<[number[], TurnObj][] | undefined>(undefined);
-      viewMaxTurn,
+
-      rowGridStyle,
+async function clipboardCut(releaseSelect = true) {
-      invCommandMap,
+  clipboardCopy(false);
-    };
+  return eraseSelectedTurnList(releaseSelect);
-  },
+}
-  mounted() {
+
-    void this.reloadCommandList();
+function clipboardCopy(releaseSelect = true) {
-  },
+  clipboard.value = refineQueryActions();
+  if (releaseSelect) {
+    releaseSelectedTurnList();
+  }
+}
+
+async function clipboardPaste(releaseSelect = true) {
+  const rawActions = clipboard.value;
+  if (rawActions === undefined) {
+    return;
+  }
+
+  const actions = amplifyQueryActions(rawActions, getSelectedTurnList());
+  if (actions.length === 0) {
+    return;
+  }
+
+  const result = await reserveCommandDirect(actions);
+  if (releaseSelect) {
+    releaseSelectedTurnList();
+  }
+  return result;
+}
+
+async function subRepeatCommand(releaseSelect = true): Promise<boolean> {
+  const reqTurnList = getSelectedTurnList().sort((a, b) => (a - b));
+  const selectedMinTurnIdx = reqTurnList[0];
+  const selectedMaxTurnIdx = reqTurnList[reqTurnList.length - 1];
+  const queryLength = selectedMaxTurnIdx - selectedMinTurnIdx + 1;
+
+  const rawActions = refineQueryActions();
+  const actions = amplifyQueryActions(rawActions, range(selectedMinTurnIdx, maxTurn, queryLength));
+
+  const result = await reserveCommandDirect(actions);
+  if (releaseSelect) {
+    releaseSelectedTurnList();
+  }
+  return result;
+}
+
+
+async function eraseAndPullCommand(releaseSelect = true): Promise<boolean> {
+  const reqTurnList = getSelectedTurnList().sort((a, b) => (a - b));
+  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;
+    }
+    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) {
+    releaseSelectedTurnList();
+  }
+  return result;
+}
+
+async function pushEmptyCommand(releaseSelect = true): Promise<boolean> {
+  const reqTurnList = getSelectedTurnList().sort((a, b) => (a - b));
+  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) {
+    releaseSelectedTurnList();
+  }
+  return result;
+}
+
+function setStoredActions() {
+  const actions = refineQueryActions();
+  const turnBrief: string[] = [];
+  for (const [subTurnList, action] of actions) {
+    const actionName = action.action.split('_');
+    const actionShortName = actionName.length == 1 ? actionName[0] : actionName[1];
+    turnBrief.push(repeat(actionShortName[0], subTurnList.length));
+  }
+  const nickName = trim(prompt('선택한 턴들의 별명을 지어주세요', turnBrief.join()) ?? '');
+  if (nickName == '') {
+    return;
+  }
+
+  storedActionsHelper.setStoredActions(nickName, actions);
+  releaseSelectedTurnList();
+}
+
+function deleteStoredActions(actionKey: string) {
+  storedActionsHelper.deleteStoredActions(actionKey)
+}
+
+async function useStoredAction(rawActions: [number[], TurnObj][]) {
+  const reqTurnList = getSelectedTurnList().sort((a, b) => (a - b));
+  const actions = amplifyQueryActions(rawActions, reqTurnList)
+  const result = await reserveCommandDirect(actions);
+  releaseSelectedTurnList();
+  return result;
+}
+
+onMounted(() => {
+  void reloadCommandList();
 });
+
 </script>
 <style lang="scss">
 @use "sass:color";
@@ -648,9 +1013,19 @@ export default defineComponent({
 
 .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;
@@ -700,11 +1075,16 @@ export default defineComponent({
   }
 }
 
-.month_pad:hover {
+.isEditMode .month_pad:hover {
   text-decoration: underline;
   cursor: pointer;
 }
 
+.plain-center {
+  background-color: black;
+}
+
+.plain-center,
 .month_pad,
 .time_pad,
 .turn_pad {

hwe/ts/components/ChiefReservedCommand.vue

@@ -425,7 +425,7 @@ export default defineComponent({
     const emptyTurn: TurnObjWithTime[] = Array.from<TurnObjWithTime>({
       length: this.maxTurn,
     }).fill({
-      arg: null,
+      arg: {},
       brief: "",
       action: "",
       year: undefined,

hwe/ts/components/CommandSelectForm.vue

@@ -0,0 +1,193 @@
+<template>
+    <teleport :to="anchor">
+        <div v-if="showForm" class="my-1">
+            <div class="commandCategory row gx-0 gy-1">
+                <div
+                    class="categoryItem col-4 d-grid"
+                    v-for="[categoryKey, { deco: categoryDeco }] of commandList"
+                    :key="categoryKey"
+                >
+                    <BButton
+                        variant="success"
+                        @click="chosenCategory = categoryKey"
+                        :active="chosenCategory == categoryKey"
+                    >{{ categoryDeco.altName ?? categoryDeco.name }}</BButton>
+                </div>
+            </div>
+            <div class="commandList row gx-1 gy-1 my-1">
+                <div
+                    class="col-6 d-grid"
+                    v-for="commandItem of chosenSubList"
+                    :key="commandItem.value"
+                    @click="close(commandItem.value)"
+                >
+                    <div class="commandItem">
+                        <p :class="['center', 'my-0', commandItem.possible ? '' : 'commandImpossible']">
+                            {{ commandItem.simpleName }}
+                            <span
+                                class="compensatePositive"
+                                v-if="commandItem.compensation > 0"
+                            >▲</span>
+                            <span
+                                class="compensateNegative"
+                                v-else-if="commandItem.compensation < 0"
+                            >▼</span>
+                        </p>
+                        <small class="center" :style="{ display: 'block' }">
+                            {{
+                                commandItem.title.startsWith(commandItem.simpleName)
+                                    ? commandItem.title.substring(commandItem.simpleName.length)
+                                    : commandItem.title
+                            }}
+                        </small>
+                    </div>
+                </div>
+            </div>
+            <div v-if="!hideClose" class="commandBottom row mt-1 mb-1">
+                <div class="offset-8 col-4 d-grid">
+                    <BButton @click="close()">닫기</BButton>
+                </div>
+            </div>
+        </div>
+    </teleport>
+</template>
+<script setup lang="ts">
+/*
+            <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>
+ */
+import type { CommandItem } from "@/defs";
+import { BButton } from "bootstrap-vue-3";
+import { ref, defineProps, defineEmits, defineExpose, type PropType, watch, onMounted } from "vue";
+
+const chosenCategory = ref<string>("-");
+const chosenSubList = ref<CommandItem[]>([]);
+
+interface CategoryDecoration {
+    name: string,
+    altName?: string,
+    //icon?: string,
+    //color?: string,
+    //backgroundColor?: string,
+}
+
+const props = defineProps({
+    categoryInfo: {
+        type: Object as PropType<Record<string, Omit<CategoryDecoration, 'name'>>>,
+        required: false,
+    },
+    commandList: {
+        type: Object as PropType<{
+            category: string;
+            values: CommandItem[];
+        }[]>,
+        required: true,
+    },
+    anchor: {
+        type: String,
+        required: false,
+        default: '.commandSelectFormAnchor',
+    },
+    hideClose: {
+        type: Boolean,
+        required: false,
+        default: true,
+    }
+})
+
+const showForm = ref(false);
+
+function convCategoryDeco(category: string): CategoryDecoration {
+    const itemInfo = props.categoryInfo?.[category];
+    if (!itemInfo) {
+        return {
+            name: category,
+        }
+    }
+    return {
+        name: category,
+        ...itemInfo
+    };
+}
+
+
+
+const commandList = ref(new Map<string, {
+    deco: CategoryDecoration,
+    values: CommandItem[],
+}>());
+
+function updateCommandList(rawCommandList: typeof props.commandList) {
+    commandList.value.clear();
+    for (const { category, values } of rawCommandList) {
+        commandList.value.set(category, {
+            deco: convCategoryDeco(category),
+            values
+        });
+    }
+}
+
+watch(() => props.commandList, updateCommandList);
+updateCommandList(props.commandList);
+
+watch(chosenCategory, (category) => {
+    console.log('sel', category);
+    const itemInfo = commandList.value?.get(category);
+    if (itemInfo === undefined) {
+        console.error(`category 없음: ${category}`);
+        return;
+    }
+    chosenSubList.value = itemInfo.values;
+});
+
+onMounted(() => {
+    chosenCategory.value = props.commandList[0].category;
+});
+
+function show(): void {
+    showForm.value = true;
+}
+
+function toggle(): void {
+    showForm.value = !showForm.value;
+    if (showForm.value === false) {
+        emits('onClose');
+    }
+}
+
+function close(category?: string): void {
+    showForm.value = false;
+    emits('onClose', category);
+}
+
+const emits = defineEmits<{
+    (event: 'onClose', command?: string): void,
+}>();
+
+defineExpose({
+    show,
+    close,
+    toggle
+})
+
+</script>
+
+<style scoped>
+.commandItem {
+    border: gray 1px solid;
+    border-radius: 0.5em;
+    overflow: hidden;
+    cursor: pointer;
+    padding: 0.1em;
+    margin: 0;
+}
+</style>

hwe/ts/components/DragSelect.vue

@@ -1,12 +1,14 @@
 <template>
   <div
     ref="container"
-    style="
+    :style="{
-      position: relative;
+      position: 'relative',
-      user-select: none;
+      userSelect: disabled ? undefined : 'none',
-      overflow: hidden;
+      overflow: 'hidden',
-      touch-action: none;
+      touchAction: disabled ? undefined : 'none',
+    }
     "
+    :class="{ disabledDrag: disabled }"
   >
     <slot :selected="intersected" />
   </div>
@@ -58,6 +60,11 @@ export default defineComponent({
       required: false,
       default: () => ref(new Set()),
     },
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false,
+    }
   },
   emits: ["update:modelValue", "dragDone", "dragStart"],
   setup(props, { emit }) {
@@ -138,6 +145,9 @@ export default defineComponent({
 
       let isMine = false;
       function startDrag(e: MouseEvent | Touch) {
+        if (props.disabled) {
+          return;
+        }
         containerRect = uContainer.getBoundingClientRect();
         children = uContainer.children;
         start = getCoords(e);
@@ -152,6 +162,9 @@ export default defineComponent({
         emit("dragStart");
       }
       function drag(e: MouseEvent | Touch) {
+        if (props.disabled) {
+          return;
+        }
         end = getCoords(e);
         const dimensions = getDimensions(start, end);
         if (end.x < start.x) {
@@ -165,6 +178,9 @@ export default defineComponent({
         intersection();
       }
       function endDrag() {
+        if (props.disabled) {
+          return;
+        }
         start = { x: 0, y: 0 };
         end = { x: 0, y: 0 };
         box.style.width = "0";
@@ -172,16 +188,34 @@ export default defineComponent({
         document.removeEventListener("mousemove", drag);
         document.removeEventListener("touchmove", touchMove);
         box.remove();
-        if(isMine){
+        if (isMine) {
-            emit("dragDone", intersected.value);
+          emit("dragDone", intersected.value);
         }
         isMine = false;
       }
 
-      uContainer.addEventListener("mousedown", startDrag);
+      watch(() => props.disabled, disabledNext => {
-      uContainer.addEventListener("touchstart", touchStart);
+        if (disabledNext) {
-      document.addEventListener("mouseup", endDrag);
+          uContainer.removeEventListener("mousedown", startDrag);
-      document.addEventListener("touchend", endDrag);
+          uContainer.removeEventListener("touchstart", touchStart);
+          document.removeEventListener("mouseup", endDrag);
+          document.removeEventListener("touchend", endDrag);
+        }
+        else {
+          uContainer.addEventListener("mousedown", startDrag);
+          uContainer.addEventListener("touchstart", touchStart);
+          document.addEventListener("mouseup", endDrag);
+          document.addEventListener("touchend", endDrag);
+        }
+      });
+
+      if (!props.disabled) {
+        uContainer.addEventListener("mousedown", startDrag);
+        uContainer.addEventListener("touchstart", touchStart);
+        document.addEventListener("mouseup", endDrag);
+        document.addEventListener("touchend", endDrag);
+      }
+
 
       onBeforeUnmount(() => {
         uContainer.removeEventListener("mousedown", startDrag);

hwe/ts/defs.ts

@@ -1,3 +1,5 @@
+import type { Args } from "./processing/args";
+
 export type InvalidResponse = {
     result: false;
     reason: string;
@@ -33,6 +35,11 @@ export type GeneralListResponse = {
     token: Record<number, number>,
 }
 
+export type ReserveCommandResponse = {
+    result: true,
+    brief: string,
+}
+
 export type NationLevel = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
 export const NationLevelText: Record<NationLevel, string> = {
     0: '방랑군',
@@ -176,13 +183,14 @@ export type OptionalFull<Type> = {
 export type TurnObj = {
     action: string;
     brief: string;
-    arg: null | [] | Record<string, number | string | number[] | string[]>;
+    arg: Args;
 };
 
 
 export type CommandItem = {
     value: string;
     title: string;
+    info: string,
     compensation: number;
     simpleName: string;
     possible: boolean;
@@ -215,6 +223,8 @@ export type ChiefResponse = {
         category: string;
         values: CommandItem[];
     }[];
+    mapName: string,
+    unitSet: string,
 };
 
 
@@ -250,4 +260,4 @@ export type BettingInfo = {
     closeYearMonth: number;
     candidates: SelectItem[];
     winner?: number[];
-}
+}

hwe/ts/map.ts

@@ -9,8 +9,12 @@ import { exportWindow } from '@util/exportWindow';
 import { htmlReady } from './util/htmlReady';
 import { initTooltip } from './legacy/initTooltip';
 
-declare const serverNick: string;
+declare const staticValues: {
-declare const serverID: string;
+    serverNick: string;
+    serverID: string;
+}
+
+const { serverNick, serverID } = staticValues;
 
 type CityPositionMap = {
     [cityID: number]: [string, number, number];

hwe/ts/util/StoredActionsHelper.ts

@@ -0,0 +1,60 @@
+import type { TurnObj } from '@/defs';
+import { ref } from 'vue';
+
+
+export class StoredActionsHelper {
+    public readonly recentActions = ref<TurnObj[]>([]);
+    public readonly storedActions = ref(new Map<string, [number[], TurnObj][]>());
+    public readonly recentActionsKey: string;
+    public readonly storedActionsKey: string;
+
+    constructor(protected serverNick: string, protected type: 'general' | 'nation', protected mapName: string, protected unitSet: string, protected maxRecent = 10) {
+        this.recentActionsKey = `${serverNick}_${mapName}_${unitSet}_${type}RecentActions`;
+        this.storedActionsKey = `${serverNick}_${mapName}_${unitSet}_${type}StoredActions`;
+        this.loadRecentActions();
+        this.loadStoredActions();
+    }
+
+    loadRecentActions() {
+        this.recentActions.value = JSON.parse(localStorage.getItem(this.recentActionsKey) ?? '[]');
+    }
+
+    pushRecentActions(action: TurnObj) {
+        this.recentActions.value.unshift(action);
+        if (this.recentActions.value.length > this.maxRecent) {
+            this.recentActions.value.pop();
+        }
+        this.saveRecentActions();
+    }
+
+    saveRecentActions() {
+        localStorage.setItem(this.recentActionsKey, JSON.stringify(this.recentActions.value));
+    }
+
+    loadStoredActions() {
+        const rawValue: [string, [number[], TurnObj][]][] = JSON.parse(
+            localStorage.getItem(this.storedActionsKey) ?? '[]'
+        );
+        this.storedActions.value = new Map(rawValue);
+    }
+
+    setStoredActions(actionKey: string, actions: [number[], TurnObj][]) {
+        this.storedActions.value.set(actionKey, actions);
+        console.log(this.storedActions.value);
+        this.saveStoredActions();
+    }
+
+    deleteStoredActions(actionKey: string) {
+        if (this.storedActions.value.delete(actionKey)) {
+            this.saveStoredActions();
+        }
+    }
+
+    saveStoredActions() {
+        localStorage.setItem(
+            this.storedActionsKey,
+            JSON.stringify(Array.from(this.storedActions.value.entries()))
+        );
+    }
+
+}

hwe/ts/v_processing.ts

@@ -9,11 +9,20 @@ import { type App, createApp } from 'vue';
 import { auto500px } from './util/auto500px';
 import { isString } from 'lodash';
 import { type Args, testSubmitArgs } from './processing/args';
-import { SammoAPI, type ValidResponse } from './SammoAPI';
+import { SammoAPI } from './SammoAPI';
+import { StoredActionsHelper } from './util/StoredActionsHelper';
+import type { ReserveCommandResponse } from './defs';
 
-declare const turnList: number[];
+declare const staticValues: {
+    serverNick: string,
+    turnList: number[],
+    mapName: string,
+    unitSet: string,
+};
 
-async function submitCommand<T extends ValidResponse>(isChiefTurn: boolean, turnList: number[], action: string, arg: Args): Promise<T> {
+const { turnList } = staticValues;
+
+async function submitCommand<T extends ReserveCommandResponse>(isChiefTurn: boolean, turnList: number[], action: string, arg: Args): Promise<T> {
     const targetAPI = isChiefTurn ? SammoAPI.NationCommand.ReserveCommand : SammoAPI.Command.ReserveCommand;
 
     try {
@@ -22,19 +31,28 @@ async function submitCommand<T extends ValidResponse>(isChiefTurn: boolean, turn
             throw new TypeError(`Invalied Type ${testResult[0]}, ${testResult[2]} should be ${testResult[1]}`);
         }
         console.log('trySubmit', arg);
-        const response = await targetAPI({
+        const responseP = targetAPI<T>({
                 action,
                 turnList,
                 arg,
         });
 
+        const storedActionsHelper = new StoredActionsHelper(staticValues.serverNick, isChiefTurn?'nation':'general', staticValues.mapName, staticValues.unitSet);
+
+        const response = await responseP;
+        storedActionsHelper.pushRecentActions({
+            action,
+            brief: response.brief,
+            arg: (arg??{}),
+        })
+
         if (!isChiefTurn) {
             window.location.href = './';
         } else {
             window.location.href = 'v_chiefCenter.php';
         }
 
-        return response as T;
+        return response;
     }
     catch (e) {
         console.error(e);

hwe/v_processing.php

@@ -76,13 +76,22 @@ if (!$commandObj->hasPermissionToReserve()) {
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
     <?= WebUtil::printJS('d_shared/base_map.js') ?>
     <?= WebUtil::printStaticValues([
-        'serverNick' => DB::prefix(),
+        'staticValues' => [
-        'serverID' => UniqueConst::$serverID,
+            'serverNick' => DB::prefix(),
+            'serverID' => UniqueConst::$serverID,
+            'commandName' => $commandObj->getName(),
+            'turnList' => $turnList,
+            'currentCity' => $general->getCityID(),
+            'currentNation' => $general->getNationID(),
+            'entryInfo' => [$isChiefTurn?'Nation':'General', $commandType],
+            'mapName' => GameConst::$mapName,
+            'unitSet' => GameConst::$unitSet,
+        ],
         'commandName' => $commandObj->getName(),
         'turnList' => $turnList,
         'currentCity' => $general->getCityID(),
         'currentNation' => $general->getNationID(),
-        'entryInfo' => [$isChiefTurn?'Nation':'General', $commandType]
+        'entryInfo' => [$isChiefTurn?'Nation':'General', $commandType],
     ])?>
     <?= WebUtil::printStaticValues($commandObj->exportJSVars(), false) ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />