fix: 다병종 밸런스 누락분 수정정

fix: 고급모드 연구턴 커맨드 창 넘치는 문제
fix: 척사 버그 수정
2025-02-08 13:54:01 +00:00 · 2025-01-25 19:52:28 +00:00 · 2025-01-24 15:26:56 +09:00 · 2025-01-24 15:23:13 +09:00 · 2025-01-24 15:19:23 +09:00 · 2025-01-24 10:07:56 +09:00
1962 changed files with 202803 additions and 125076 deletions
@@ -0,0 +1,54 @@
+module.exports = {
+    root: true,
+    parser: "vue-eslint-parser",
+    "env": {
+        "browser": true,
+        "es2021": true,
+        'vue/setup-compiler-macros': true
+    },
+    ignorePatterns: ['*.test.ts', '.eslintrc.cjs', 'postcss.config.cjs', 'webpack.config.cjs', '*.js'],
+    overrides: [{
+        files: ['*.ts', '*.tsx', "*.vue"],
+    }],
+    plugins: [
+        "@typescript-eslint",
+        "prettier"
+    ],
+
+    extends: [
+        "eslint:recommended",
+        "plugin:vue/vue3-recommended",
+        "plugin:@typescript-eslint/recommended",
+        "prettier",
+    ],
+    parserOptions: {
+        "sourceType": "module",
+        "project": "./tsconfig.json",
+        "ecmaVersion": 2021,
+        "parser": "@typescript-eslint/parser",
+        extraFileExtensions: ['.vue']
+    },
+    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': {
+            alias: {
+                map: [
+                    ['@', './hwe/ts'],
+                    ['@util', './hwe/ts/util'],
+                    ['@scss', './hwe/scss'],
+                ]
+            }
+        }
+    },
+};
@@ -1,42 +1,74 @@
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-
-
-
-# 체섭 ignore
-*.log
-
-logs/*.txt
-d_log/*.txt
-d_log/*.zip
-sess_*
-*/logs/*.txt
-err.txt
-che/.htaccess
-kwe/.htaccess
-pwe/.htaccess
-twe/.htaccess
-hwe/.htaccess
-
-d_shared
-
-d_pic/*.jpg
-d_pic/*.gif
-d_pic/*.png
-
-d_setting/*.php
-*/d_setting/*.php
-
-**/old/*
-test.php
-
-/che
-/kwe
-/pwe
-/twe
-
-phpinfo.php
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+/node_modules
+
+# 체섭 ignore
+*.log
+
+logs/*.txt
+api_log.db
+d_log/*.txt
+d_log/*.zip
+d_log/*.db
+sess_*
+*/logs/*.txt
+*/logs/*/*.txt
+*/logs/preserved
+err.txt
+
+hwe/.htaccess
+
+d_shared
+
+/d_pic
+d_pic/*.jpg
+d_pic/*.gif
+d_pic/*.png
+d_pic/*.webp
+d_pic/*.avif
+d_pic/uploaded_image
+
+/dist_js
+*/dist_misc/*
+*/dist_js/*
+*/dist_css/*
+/dist_misc/*
+/dist_js/*
+/dist_css/*
+
+d_setting/*.php
+*/d_setting/*.php
+*/d_setting/*.json
+*/d_setting/templates/*.php
+!*.orig.php
+
+**/data/file_cache
+
+**/old/*
+test.*
+
+/che
+/kwe
+/pwe
+/nya
+/pya
+/twe
+
+/hwe/data
+
+/vendor
+phpinfo.php
+*.sqlite3
+
+ingame/js/*
+ingame/css/*
+gateway/js/*
+gateway/css/*
+
+*.db-journal
+
+d_log/cachegrind.*
@@ -0,0 +1,12 @@
+{
+    "extension": ["ts"],
+    "spec": "hwe/test-ts/**/*.test.ts",
+    "require": [
+        "ts-node/register",
+        "tsconfig-paths/register"
+    ],
+    "node-option": [
+        "experimental-specifier-resolution=node",
+        "loader=ts-node/esm"
+    ]
+  }
@@ -2,44 +2,120 @@

 /**
 * This configuration will be read and overlaid on top of the
- * default configuration. Command line arguments will be applied
+ * default configuration. Command-line arguments will be applied
 * after this file is read.
 */
 return [
-
-    // Supported values: '7.0', '7.1', '7.2', null.
-    // If this is set to null,
+    // Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`,
+    // `'7.4'`, `'8.0'`, `'8.1'`, `null`.
+    // If this is set to `null`,
    // then Phan assumes the PHP version which is closest to the minor version
-    // of the php executable used to execute phan.
-    "target_php_version" => '7.0',
-    'backward_compatibility_checks ' => false,
-    'ignore_undeclared_variables_in_global_scope' => false,
-    'minimum_severity'=>\Phan\Issue::SEVERITY_LOW,
+    // of the php executable used to execute Phan.
+    //
+    // Note that the **only** effect of choosing `'5.6'` is to infer
+    // that functions removed in php 7.0 exist.
+    // (See `backward_compatibility_checks` for additional options)
+    "target_php_version" => '8.2',
+    "minimum_target_php_version" => '8.2',
+    'minimum_severity' => \Phan\Issue::SEVERITY_NORMAL,

    'file_list' => [
        'f_config/config.php',
-        'hwe/MYDB.php',
-        'hwe/lib.php',
+        'hwe/_119_b.php',
+        'hwe/_119.php',
+        'hwe/a_bestGeneral.php',
+        'hwe/_admin1.php',
+        'hwe/_admin1_submit.php',
+        'hwe/_admin2.php',
+        'hwe/_admin2_submit.php',
+        'hwe/_admin5.php',
+        'hwe/_admin5_submit.php',
+        'hwe/_admin7.php',
+        'hwe/_admin8.php',
+        'hwe/_admin_force_rehall.php',
+        'hwe/a_emperior_detail.php',
+        'hwe/a_emperior.php',
+        'hwe/a_genList.php',
+        'hwe/a_hallOfFame.php',
+        'hwe/a_kingdomList.php',
+        'hwe/a_npcList.php',
+        'hwe/api.php',
+        'hwe/a_traffic.php',
+        'hwe/battle_simulator.php',
+        'hwe/b_betting.php',
+        'hwe/v_chiefCenter.php',
+        'hwe/b_currentCity.php',
+        'hwe/v_nationStratFinan.php',
+        'hwe/b_genList.php',
+        'hwe/b_myBossInfo.php',
+        'hwe/b_myCityInfo.php',
+        'hwe/b_myGenInfo.php',
+        'hwe/b_myKingdomInfo.php',
+        'hwe/b_myPage.php',
+        'hwe/v_processing.php',
+        'hwe/b_tournament.php',
+        'hwe/c_tournament.php',
        'hwe/func_auction.php',
        'hwe/func_command.php',
        'hwe/func_converter.php',
-        'hwe/func_diplomacy.php',
        'hwe/func_gamerule.php',
        'hwe/func_history.php',
        'hwe/func_legacy.php',
        'hwe/func_map.php',
        'hwe/func_message.php',
-        'hwe/func_npc.php',
-        'hwe/func_process_chief.php',
-        'hwe/func_process_personnel.php',
-        'hwe/func_process_sabotage.php',
+        'hwe/func.php',
        'hwe/func_process.php',
        'hwe/func_string.php',
        'hwe/func_template.php',
        'hwe/func_time_event.php',
        'hwe/func_tournament.php',
+        'hwe/index.php',
+        'hwe/install_db.php',
+        'hwe/install.php',
+        'hwe/j_adjust_icon.php',
+        'hwe/j_autoreset.php',
+        'hwe/j_basic_info.php',
+        'hwe/j_board_article_add.php',
+        'hwe/j_board_comment_add.php',
+        'hwe/j_board_get_articles.php',
+        'hwe/j_diplomacy_destroy_letter.php',
+        'hwe/j_diplomacy_get_letter.php',
+        'hwe/j_diplomacy_respond_letter.php',
+        'hwe/j_diplomacy_rollback_letter.php',
+        'hwe/j_diplomacy_send_letter.php',
+        'hwe/j_export_simulator_object.php',
+        'hwe/j_general_log_old.php',
+        'hwe/j_general_set_permission.php',
+        'hwe/j_get_basic_general_list.php',
+        'hwe/j_get_city_list.php',
+        'hwe/j_get_select_npc_token.php',
+        'hwe/j_get_select_pool.php',
+        'hwe/j_install_db.php',
+        'hwe/j_install.php',
+        'hwe/j_load_scenarios.php',
+        'hwe/j_map.php',
+        'hwe/j_map_recent.php',
+        'hwe/j_myBossInfo.php',
+        'hwe/j_raise_event.php',
+        'hwe/j_select_npc.php',
+        'hwe/j_select_picked_general.php',
+        'hwe/j_server_basic_info.php',
+        'hwe/j_set_my_setting.php',
+        'hwe/j_set_npc_control.php',
+        'hwe/j_simulate_battle.php',
+        'hwe/j_update_picked_general.php',
+        'hwe/j_vacation.php',
+        'hwe/lib.php',
        'hwe/process_war.php',
-        'hwe/func.php'
+        'hwe/proc.php',
+        'hwe/recent_map.php',
+        'hwe/select_general_from_pool.php',
+        'hwe/select_npc.php',
+        'hwe/t_diplomacy.php',
+        'hwe/v_board.php',
+        'hwe/v_inheritPoint.php',
+        'hwe/v_join.php',
+        'hwe/v_NPCControl.php',
    ],

    // A list of directories that should be parsed for class and
@@ -50,9 +126,9 @@ return [
    // Thus, both first-party and third-party code being used by
    // your application should be included in this list.
    'directory_list' => [
-    	'hwe/d_setting',
-    	'hwe/sammo',
-    	'd_setting',
+        'hwe/d_setting',
+        'hwe/sammo',
+        'd_setting',
        'src/sammo',
        'src/kakao',
        'vendor'
@@ -74,6 +150,11 @@ return [
        'vendor/'
    ],

+    'suppress_issue_types' => [
+        'PhanUnreferencedUseNormal',
+        'PhanTypeArraySuspiciousNullable',
+    ],
+
    // A list of plugin files to execute.
    // See https://github.com/phan/phan/tree/master/.phan/plugins for even more.
    // (Pass these in as relative paths.
@@ -88,4 +169,4 @@ return [
        'PregRegexCheckerPlugin',
        'PrintfCheckerPlugin',
    ],
-];
+];
@@ -0,0 +1,5 @@
+{
+  "tabWidth": 2,
+  "useTabs": false,
+  "printWidth": 120
+}
@@ -5,13 +5,15 @@
        "**/.hg": true,
        "**/CVS": true,
        "**/.DS_Store": true,
-        "**/logs/*.txt": true,
+        "**/logs/**/*.txt": true,
        "**/session/sess*":true,
        "/che":true,
        "/kwe":true,
        "/pwe":true,
+        "/nya":true,
+        "/pya":true,
        "/twe":true,
-        
+
    },
    "search.exclude": {
        "e_lib/*":true,
@@ -19,6 +21,13 @@
        "/che":true,
        "/kwe":true,
        "/pwe":true,
+        "/nya":true,
+        "/pya":true,
        "/twe":true,
-      },
+    },
+    "cSpell.words": [
+        "josa",
+        "sammo"
+    ],
+    "editor.tabSize": 4
 }
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta name="color-scheme" content="dark">
+        <title>닫혀 있습니다.</title>
+        <script>
+            setTimeout(function(){
+                window.location.href = '../';
+            }, 5000);
+        </script>
+        <style>
+            html, body{
+                background-color:black;
+                color:yellow;
+            }
+
+        </style>
+    </head>
+    <body>
+        서버가 닫혀있습니다.<br>
+        잠시 뒤에 입구로 이동합니다.
+    </body>
+</html>
@@ -1,6 +1,6 @@
 The MIT License

-Copyright (c) 2018 Hide_D, 62che
+Copyright (c) 2023 Hide_D, 62che

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -5,49 +5,59 @@

 ## 요구사항

-* Apache2
-  * <code>mpm_event</code> 권장
-* PHP 7.0 이상 
-  * <code>php-fpm</code> 권장
-  * php에서 curl을 실행가능해야 합니다.
-* MySQL 5.6 이상, 또는 MariaDB 10.0 이상
-* <code>git</code>
-* <code>curl</code>
+* Apache2 또는 nginx
+  * Apache2인 경우 `mpm_event` 권장
+* PHP 8.0 이상
+  * `php-fpm` 권장
+  * php에서 curl, pdo-sqlite을 실행가능해야 합니다.
+  * mysqli, mysqlnd
+  * gd
+  * mbstring
+* NodeJS 14 이상
+  * 내부의 git을 통해 upgrade 때 `webpack build` 용도로 필요합니다.
+* MariaDB 10.2.1 이상
+  * 현재 MySQL은 지원하지 않습니다.
+* `git`
+* `curl`

-Linux는 Ubuntu 16.04, Windows는 Windows 10에서 XAMPP를 사용한 환경에서 테스트되었습니다.
+Linux는 Ubuntu 18.04, 20.04, Windows는 WSL2를 사용한 환경에서 테스트되었습니다.

-Docker를 이용한 설치는 계획중입니다.
+Docker를 이용한 설치도 제공하고 있습니다.

-## 설치
+## Docker를 이용한 설치
+
+https://storage.hided.net/gitea/devsam/docker 를 참고해 주세요.
+
+## 수동 설치

 본 게임은 <code>git</code>을 이용한 업그레이드 시스템을 구현하였으므로, <code>git</code>이 필요합니다.
-또한 웹 서비스 데몬을 운영중인 사용자(일반적으로 <code>www-data</code>, <code>apache</code>)에게 디렉토리 권한이 주어져야합니다.
+또한 웹 서비스 데몬을 운영중인 사용자(일반적으로 <code>www-data</code>)에게 디렉토리 권한이 주어져야합니다.

 ### 다운로드

 웹 데몬 user가 <code>www-data</code>인 경우 다음과 같이 입력하여 최신 배포버전과 이미지 파일을 얻을 수 있습니다.

 ```
-sudo -u www-data git clone ssh://git@storage.hided.net:2525/devsam/core.git
-git clone ssh://git@storage.hided.net:2525/devsam/image.git
+sudo -u www-data git clone https://storage.hided.net/gitea/devsam/core.git
+sudo -u www-data git clone https://storage.hided.net/gitea/devsam/image.git
 ```

-> 이미지는 별도의 업데이트 기능을 제공하지 않습니다. 수동으로 <code>git pull</code>을 해야합니다.
+> 이미지는 hook/git_hook.php을 통해 동기화되며, 서버 설치 과정에 이미지 갱신 키를 지정하는 것으로 '훼' 서버 업데이트 시 동기화됩니다. 이미지 서버가 게임 서버와 별개여도 동작하나, php와 git을 지원해야합니다.

 ### 설치

 이후 해당 경로를 웹 브라우저를 통해 접근하여 설치를 진행할 수 있습니다.

-Database 수는 로그인 관리 서버 1개, 내부 서버 5개로, 총 6개의 Database가 필요합니다. 내부 설정을 고쳐서 서버 수를 늘리거나 줄일 경우 그에 맞는 Database 수가 필요합니다. 또한 Database마다 관리할 별도의 계정을 만드는 것을 추천합니다.
+Database 수는 로그인 관리 서버 1개, 내부 서버 7개로, 총 8개의 Database가 필요합니다. 내부 설정을 고쳐서 서버 수를 늘리거나 줄일 경우 그에 맞는 Database 수가 필요합니다. 또한 Database마다 관리할 별도의 계정을 만드는 것을 추천합니다.

 설치 이후에는 서버관리 페이지에서 **업데이트** 명령을 통해 원 클릭 업데이트가 가능합니다.


 ## 카카오로그인 연동

-현재 카카오로그인 API KEY를 입력하는 작업이 설치과정에 추가되어있지 않습니다.
+서버 설치 시 카카오 로그인 연동을 위한 API KEY를 입력받습니다.

-<code>f_install/templates/KakaoKey.orig.php</code> 를 <code>d_setting/KakaoKey.php</code>로 복사한 후 API 키를 입력하여야 합니다.
+만약 설치 이후 API KEY를 변경하고자 하는 경우 <code>d_setting/KakaoKey.php</code>에서 API키를 변경해야 합니다.


 ## 라이선스
@@ -0,0 +1,16 @@
+<?php
+
+namespace sammo;
+
+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);
@@ -1,41 +1,53 @@
-{
-    "name":"sammo-hid/sammo",
-    "description":"삼국지 모의전투 HiDCHe",
-    "license": [
-       "MIT",
-       "GPL-2.0-or-later",
-       "proprietary"
-    ],
-    "require": {
-        "brandonwamboldt/utilphp": "^1.1",
-        "sergeytsalkov/meekrodb": "^2.3",
-        "league/plates": "^3.3",
-        "guzzlehttp/guzzle": "^6.3",
-        "leafo/scssphp": "^0.7.5",
-        "monolog/monolog": "^1.23",
-        "firephp/firephp-core": "^0.4.0",
-        "vlucas/valitron": "^1.4",
-        "php-extended/php-tail": "^2.1",
-        "pguardiario/phpuri": "^1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "sammo\\": [
-                "src/sammo"
-            ],
-            "kakao\\": [
-                "src/kakao"
-            ]
-        },
-        "classmap": [
-            "d_setting/"
-        ],
-        "exclude-from-classmap": [
-            "**/*.orig.php"
-        ],
-        "files":[
-            "f_config/config.php"
-        ]
-    }
-    
-}
+{
+    "name":"sammo-hid/sammo",
+    "description":"삼국지 모의전투 HiDCHe",
+    "license": [
+       "MIT",
+       "GPL-2.0-or-later",
+       "proprietary"
+    ],
+    "config": {
+        "platform": {
+            "php": "8.3"
+        }
+    },
+    "require": {
+        "brandonwamboldt/utilphp": "^1.1",
+        "sergeytsalkov/meekrodb": "^2.5",
+        "league/plates": "^3.5",
+        "vlucas/valitron": "^1.4",
+        "php-extended/php-tail": "^5.0",
+        "symfony/lock": "^6.2",
+        "ezyang/htmlpurifier": "^4.10",
+        "xemlock/htmlpurifier-html5": "^0.1.7",
+        "catfan/medoo": "^2.1",
+        "phan/phan": "^5.4",
+        "nette/caching": "^3.3",
+        "illuminate/database": "^10.0",
+        "illuminate/events": "^10.0",
+        "php-ds/php-ds": "^1.5",
+        "hided62/ldto": "^1.0",
+        "league/uri": "^6.8"
+    },
+    "autoload": {
+        "psr-4": {
+            "sammo\\": [
+                "d_setting",
+                "src/sammo"
+            ],
+            "kakao\\": [
+                "d_setting",
+                "src/kakao"
+            ]
+        },
+        "exclude-from-classmap": [
+            "**/*.orig.php"
+        ],
+        "files":[
+            "f_config/config.php"
+        ]
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^10.0"
+    }
+}
@@ -1,109 +1,246 @@
-@charset "utf-8";
-
-*       { margin: 0px; padding: 0px; }
-body    { color:white; background-color:black; border-width:1px; border-color:gray; }
-table   {
-    border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
-    padding: 0px;
-    font-size: 13px;
-    word-break: break-all;
-    text-align: center;
-    font-family: '맑은 고딕'; line-height: 110%;
-}
-th, td      {
-    border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
-    padding: 0px;
-    font-size: 13px;
-    word-break: break-all;
-    text-align: center;
-    font-family: '맑은 고딕'; line-height: 110%;
-}
-
-a.just_link {
-    text-decoration: none;
-}
-
-div     {
-    margin:0px;
-    padding: 0px;
-    word-break: break-all;
-    font-family: '맑은 고딕';
-}
-
-.with_border{
-    border: solid 1px;
-    border-spacing: 0px;
-    border-collapse: separate;
-    border-top-color: gray;
-    border-left-color: gray;
-    border-right-color: black;
-    border-bottom-color: black;
-}
-
-.section_title {
-    height:50px;
-    line-height:50px;
-    font-size: 30px; font-weight: bold;
-    text-align: center;
-}
-
-.legacy_layout div     {
-    border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
-    padding: 0px;
-    font-size: 13px;
-    word-break: break-all;
-    text-align: center;
-    font-family: '맑은 고딕'; line-height: 110%;
-}
-
-font    { font-family: '맑은 고딕'; line-height: 110%; }
-/*
-input   {
-    width: 100px; height: 18px;
-    background-color: black; color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
-    line-height: 110%;
-}
-*/
-
-.obj_fill{
-    display:block;
-    width:100%;
-    height:100%;
-}
-
-button.with_skin {
-    background-color: black; color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
-    line-height: 110%;
-}
-
-input.with_skin   {
-    background-color: black; color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
-    line-height: 110%;
-}
-
-select  {
-    width: 100px; height: 18px;
-    background-color: black; color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
-    line-height: 110%;
-}
-button  {
-    width: 100px; height: 20px;
-    background-color: black; color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
-}
-
-.font0  { font-size: 10px; }
-.font1  { font-size: 13px; }
-.font2  { font-size: 15px; }
-.font3  { font-size: 20px; }
-.font4  { font-size: 30px; }
-.font5  { font-size: 50px; }
+@charset "utf-8";
+body {
+    color: white;
+    background-color: black;
+    font-family: 'Pretendard';
+}
+
+table {
+    border: solid 1px;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
+    padding: 0px;
+    font-size: 14px;
+    word-break: break-all;
+    text-align: center;
+}
+
+th,
+td {
+    border: solid 1px;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
+    padding: 0px;
+    font-size: 14px;
+    word-break: break-all;
+    text-align: center;
+}
+
+a.just_link {
+    text-decoration: none;
+}
+
+.with_border {
+    margin: 0;
+    border: solid 1px;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
+}
+
+.section_title {
+    height: 50px;
+    line-height: 50px;
+    font-size: 30px;
+    font-weight: bold;
+    text-align: center;
+    color: white;
+    padding: 0;
+}
+
+.legacy_layout div {
+    border: solid 1px;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
+    padding: 0px;
+    font-size: 14px;
+    word-break: break-all;
+    text-align: center;
+}
+
+.obj_fill {
+    display: block;
+    width: 100%;
+    height: 100%;
+}
+
+button.with_skin {
+    padding: 0 4px;
+    background-color: #191919;
+    color: white;
+    font-size: 14px;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
+}
+
+button.with_skin:disabled {
+    background-color: #333;
+}
+
+input.with_skin {
+    background-color: #191919;
+    color: white;
+    font-size: 14px;
+}
+
+input.with_skin[type=button], input.with_skin[type=submit]{
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
+}
+
+input.with_skin:disabled {
+    background-color: #333;
+}
+
+.font0 {
+    font-size: 10px;
+}
+
+.font1 {
+    font-size: 14px;
+}
+
+.font2 {
+    font-size: 15px;
+}
+
+.font3 {
+    font-size: 20px;
+}
+
+.font4 {
+    font-size: 30px;
+}
+
+.font5 {
+    font-size: 50px;
+}
+
+caption.section_title {
+    caption-side: top;
+}
+
+.samButton {
+    float: left;
+    display: block;
+    padding: 0;
+    margin: 0;
+    text-decoration: none;
+    position: relative;
+}
+
+a.samButton.disabled {
+    pointer-events: none;
+    cursor: default;
+}
+
+.samButtonOuter {
+    display: table;
+    border: outset 2px white;
+    box-sizing: border-box;
+    font-weight: bold;
+    padding: 1px 6px;
+    width: 125px;
+    height: 30px;
+    background-color: #000000;
+    color: #ffffff;
+}
+
+.samButtonOuter:active {
+    border: inset 2px white;
+}
+
+.samButtonInner {
+    display: table-cell;
+    vertical-align: middle;
+    width: 100%;
+    margin: 0 auto;
+    text-align: center;
+    user-select: none;
+}
+
+.samToolbarButton>.samButtonOuter {
+    width: 125px;
+    height: 30px;
+    background-color: #225500;
+    color: white;
+}
+
+.samToolbarButton2>.samButtonOuter {
+    width: 125px;
+    height: 30px;
+    background-color: #225500;
+    color: magenta;
+}
+
+.samCommandButton>.samButtonOuter {
+    width: 111px;
+    height: 30px;
+}
+
+.samCommandButton.disabled>.samButtonOuter {
+    background-color: transparent !important;
+    color: gray !important;
+    border-color: transparent !important;
+}
+
+.samCommandButton.disabled>.samButtonOuter>.samButtonInner::before {
+    content: '【'
+}
+
+.samCommandButton.disabled>.samButtonOuter>.samButtonInner::after {
+    content: '】'
+}
+
+.tooltip_copyable_info .tooltiptext {
+    display: inline;
+    color: rgba(0, 0, 0, 0);
+    font-size: 0;
+}
+
+.tooltiptext {
+    display: none;
+}
+
+.hidden_but_copyable {
+    color: rgba(0, 0, 0, 0);
+    font-size: 0;
+}
+
+.vertical_flex {
+    height: 100%;
+    display: flex;
+    align-content: center;
+    flex-direction: column;
+    align-items: stretch;
+}
+
+.vertical_flex .item {
+    display: block;
+    flex-grow: 1;
+}
+
+.fill_box {
+    display: block;
+    width: 100%;
+    height: 100%;
+}
@@ -1,221 +1,161 @@
-@charset "utf-8";
-
-#server_notice {
-    margin:10px 0;
-    border: none;
-    text-align:center;
-}
-
-#server_list_container{
-    width:800px;
-    position:absolute;
-    left:50%;
-    margin-left:-400px;
-}
-
-#server_list_table{
-    width:100%;
-}
-
-#server_list tr{
-    height:66px;
-}
-
-#server_list .server_create_and_select .general_create,
-#server_list .server_create_and_select .general_select {
-    width: 120px; height: 33px;
-    float: left;
-}
-
-#server_list .general_create,
-#server_list .general_login {
-    width: 120px; height: 66px;
-    float: left;
-}
-
-.ignore_border{
-    border:0;
-    margin:0;
-    padding:0;
-}
-
-#user_info {
-    margin-top:20px;
-    width: 800px; height: 130px;
-}
-
-
-#user_info button{
-    width: 200px;
-    height: 50px;
-    margin: 10px 50px;
-}
-
-.center_ordered_items{
-    text-align:center;
-}
-
-/*Legacy*/
-
-
-#Entrance_00 {
-    width: 800px;
-    position: absolute; top: 50px; left: 50%;
-    margin-left: -400px;
-    border: none;
-}
-
-#Entrance_0004 {
-    width: 52px; height: 52px;
-    position: absolute; top: 0px; left: -62px;
-    border: 1px solid white;
-}
-
-#Entrance_0005 {
-    width: 160px; height: 600px;
-    position: absolute; top: 62px; left: -170px;
-}
-
-#Entrance_0006 {
-    width: 160px; height: 600px;
-    position: absolute; top: 62px; left: 810px;
-}
-
-
-
-#Entrance_0000 {
-    width: 800px; height: 134px;
-    position: absolute; top: 0px; left: 0px;
-}
-
-#Entrance_000000 {
-    width: 798px; height: 50px;
-    position: absolute; top: 0px; left: 0px;
-    font-size: 30px; font-weight: bold;
-}
-
-#Entrance_000001 {
-    width: 798px; height: 20px;
-    position: absolute; top: 52px; left: 0px;
-    border: none;
-}
-
-#Entrance_00000000 {
-    width: 98px; height: 20px;
-    position: absolute; top: 0px; left: 0px;
-}
-
-#Entrance_00000001 {
-    width: 398px; height: 20px;
-    position: absolute; top: 0px; left: 100px;
-}
-
-#Entrance_00000002 {
-    width: 178px; height: 20px;
-    position: absolute; top: 0px; left: 500px;
-}
-
-#Entrance_00000003 {
-    width: 118px; height: 20px;
-    position: absolute; top: 0px; left: 680px;
-}
-
-#Entrance_000002 {
-    width: 798px; height: 64px;
-    position: absolute; top: 74px; left: 0px;
-    border: none;
-}
-
-.Entrance_ServerList {
-    width: 800px; height: 64px;
-    border: none;
-    float: left;
-}
-
-.Entrance_ServerListServer {
-    width: 98px; height: 64px;
-    float: left;
-}
-
-.Entrance_ServerListDown {
-    width: 698px; height: 64px;
-    float: left;
-}
-
-.Entrance_ServerListInfo {
-    width: 398px; height: 64px;
-    float: left;
-}
-
-.Entrance_ServerListBlock {
-    width: 298px; height: 64px;
-    float: left;
-    line-height: 64px;
-}
-
-.Entrance_ServerListCharacter {
-    width: 64px; height: 64px;
-    float: left;
-}
-
-.Entrance_ServerListName {
-    width: 112px; height: 64px;
-    float: left;
-    line-height: 64px;
-}
-
-
-.Entrance_ServerListSelect {
-    width: 120px; height: 32px;
-    float: left;
-}
-
-#Entrance_000003 {
-    width: 798px; height: 155px;
-    text-align: left;
-}
-
-.Entrance_Alert {
-    color: red; font-size: 15px; font-weight: bold;
-}
-
-.Entrance_Che {
-    color: white; font-size: 15px; font-weight: bold;
-}
-
-.Entrance_Kwe {
-    color: yellow; font-size: 15px; font-weight: bold;
-}
-
-.Entrance_Pwe {
-    color: orange; font-size: 15px; font-weight: bold;
-}
-
-.Entrance_Twe {
-    color: magenta; font-size: 15px; font-weight: bold;
-}
-
-.Entrance_Hwe {
-    color: red; font-size: 15px; font-weight: bold;
-}
-
-#Entrance_0001 {
-    width: 800px; height: 130px;
-    position: absolute; top: 154px; left: 0px;
-}
-
-#Entrance_000100 {
-    width: 798px; height: 50px;
-    position: absolute; top: 0px; left: 0px;
-    font-size: 30px; font-weight: bold;
-}
-
-#Entrance_000101 {
-    width: 200px; height: 50px;
-    position: absolute; top: 65px; left: 150px;
-}
-
-#Entrance_000102 {
-    width: 200px; height: 50px;
-    position: absolute; top: 65px; left: 450px;
-}
+@charset "utf-8";
+body {
+    line-height: 1.3;
+}
+
+#server_notice {
+    margin: 10px 0;
+    border: none;
+    text-align: center;
+}
+
+#server_list_container {
+    width: 800px;
+    position: absolute;
+    left: 50%;
+    margin-left: -400px;
+}
+
+#server_list_table {
+    width: 100%;
+}
+
+#server_list tr {
+    height: 66px;
+}
+
+.ignore_border {
+    border: 0;
+    margin: 0;
+    padding: 0;
+}
+
+#user_info {
+    margin-top: 20px;
+    width: 800px;
+    height: 130px;
+}
+
+#user_info .btn {
+    width: 200px;
+    margin: 10px 50px;
+    padding: 10px;
+}
+
+.center_ordered_items {
+    text-align: center;
+}
+
+.server-action{
+    padding-top: 16px;
+    padding-bottom: 16px;
+}
+
+.Entrance_ServerList {
+    width: 800px;
+    height: 64px;
+    border: none;
+    float: left;
+}
+
+.Entrance_ServerListServer {
+    width: 98px;
+    height: 64px;
+    float: left;
+}
+
+.Entrance_ServerListDown {
+    width: 698px;
+    height: 64px;
+    float: left;
+}
+
+.Entrance_ServerListInfo {
+    width: 398px;
+    height: 64px;
+    float: left;
+}
+
+.Entrance_ServerListBlock {
+    width: 298px;
+    height: 64px;
+    float: left;
+    line-height: 64px;
+}
+
+.Entrance_ServerListCharacter {
+    width: 64px;
+    height: 64px;
+    float: left;
+}
+
+.Entrance_ServerListName {
+    width: 112px;
+    height: 64px;
+    float: left;
+    line-height: 64px;
+}
+
+.Entrance_ServerListSelect {
+    width: 120px;
+    height: 32px;
+    float: left;
+}
+
+#Entrance_000003 {
+    width: 798px;
+    height: 155px;
+    text-align: left;
+}
+
+.Entrance_Alert {
+    color: red;
+    font-size: 15px;
+    font-weight: bold;
+}
+
+.Entrance_Che {
+    color: white;
+    font-size: 15px;
+    font-weight: bold;
+}
+
+.Entrance_Kwe {
+    color: yellow;
+    font-size: 15px;
+    font-weight: bold;
+}
+
+.Entrance_Pwe {
+    color: orange;
+    font-size: 15px;
+    font-weight: bold;
+}
+
+.Entrance_Twe {
+    color: magenta;
+    font-size: 15px;
+    font-weight: bold;
+}
+
+.Entrance_Nya {
+    color: #e67e22;
+    font-size: 15px;
+    font-weight: bold;
+}
+
+.Entrance_Pya {
+    color: #9b59b6;
+    font-size: 15px;
+    font-weight: bold;
+}
+
+.Entrance_Hwe {
+    color: red;
+    font-size: 15px;
+    font-weight: bold;
+}
+
+.BtnPlate {
+    height: inherit;
+}
@@ -7,10 +7,10 @@ body, html{
    margin-top: 70px;
 }

-h1.title { 
+h1.title {
   font-size: 50px;
-   font-family: 'Passion One', cursive; 
-   font-weight: 400; 
+   font-family: 'Pretendard', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic';
+   font-weight: 400;
 }

 hr{
@@ -7,10 +7,10 @@
    margin-top: 70px;
 }

-h1.title { 
+h1.title {
   font-size: 50px;
-   font-family: 'Passion One', cursive; 
-   font-weight: 400; 
+   font-family: 'Pretendard', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic';
+   font-weight: 400;
 }

 hr{
@@ -1,75 +0,0 @@
-body, html{
-    height: 100%;
-    background-repeat: no-repeat;
-}
-
-.main{
-    margin-top: 70px;
-}
-
-h1.title { 
-   font-size: 50px;
-   font-family: 'Passion One', cursive; 
-   font-weight: 400; 
-}
-
-hr{
-   width: 10%;
-   /*color: #fff;*/
-}
-
-.form-group{
-   margin-bottom: 15px;
-}
-
-label{
-   margin-bottom: 15px;
-}
-
-input,
-input::-webkit-input-placeholder {
-   font-size: 11px;
-   padding-top: 3px;
-}
-
-.main-login{
-    /*background-color: #fff;*/
-   /* shadows and rounded borders */
-   -moz-border-radius: 2px;
-   -webkit-border-radius: 2px;
-   border-radius: 2px;
-   -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-   -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-   box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-
-}
-
-.main-center{
-    margin-top: 30px;
-    margin: 0 auto;
-    max-width: 330px;
-   padding: 40px 40px;
-
-}
-
-.login-button{
-   margin-top: 5px;
-}
-
-.login-register{
-   font-size: 11px;
-   text-align: center;
-}
-
-
-.terms{
-    max-height: 200px; overflow: auto;
-}
-
-.vertical-center {
-    min-height: 100%;  /* Fallback for browsers do NOT support vh unit */
-    min-height: 100vh; /* These two lines are counted as one :-)       */
-
-    display: flex;
-    align-items: center;
-}
@@ -1,7 +1,7 @@
@charset "utf-8";

 #user_info_container{
-    width:500px;
+    width:550px;
    position:absolute;
    left:50%;
    margin-left:-250px;
@@ -21,6 +21,7 @@
    right: 6px;
    margin:6px;
    height:40px;
+    line-height:40px;
 }

 #btn_delete_me{
@@ -37,15 +38,15 @@

 #image_upload_filename{
    position:absolute;
-    height:16px;
+    height:20px;
    left:10px;
    width:130px;
-    top:16px;
+    top:12px;
 }

 #image_upload_fake_btn{
-    top:16px;
-    height:20px;
+    top:12px;
+    height:22px;
    right:10px;
    position:absolute;
 }
@@ -53,8 +54,7 @@
 #image_upload{
    opacity: 0;
    position:absolute;
-    top:16px;
-    height:22px;
+    top:12px;
    left:0;
    height:20px;
    width:100%;
@@ -70,7 +70,6 @@
    bottom:0;
    left:0;
    width:50%;
-    height:20px;
 }

 #btn_remove_icon{
@@ -78,171 +77,10 @@
    bottom:0;
    right:0;
    width:50%;
-    height:20px;
 }

-#EntranceManage_00 {
-    width: 500px; height: 409px;
-    z-index: 2;
-}
-
-#EntranceManage_0000 {
-    width: 498px; height: 50px;
-}
-
-#EntranceManage_0001 {
-    width: 100px; height: 30px;
-}
-
-#EntranceManage_0002 {
-    width: 498px; height: 25px;
-}
-
-#EntranceManage_0003 {
-    width: 98px; height: 84px;
-    line-height: 84px;
-}
-
-#EntranceManage_0004 {
-    width: 148px; height: 84px;
-    line-height: 84px;
-}
-
-#EntranceManage_0005 {
-    width: 98px; height: 84px;
-    line-height: 84px;
-}
-
-#EntranceManage_0006 {
-    width: 148px; height: 84px;
-    text-align: left;
-}
-
-#EntranceManage_000600 {
-    width: 80px; height: 17px;
-}
-
-#EntranceManage_000601 {
-    width: 80px; height: 17px;
-}
-
-#EntranceManage_000602 {
-    width: 80px; height: 17px;
-}
-
-#EntranceManage_000603 {
-    width: 144px; height: 20px;
-}
-
-#EntranceManage_0007 {
-    width: 98px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0008 {
-    width: 148px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0009 {
-    width: 98px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0010 {
-    width: 148px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0011 {
-    width: 98px; height: 20px;
-}
-
-#EntranceManage_0012 {
-    width: 148px; height: 20px;
-}
-
-#EntranceManage_0013 {
-    width: 248px; height: 20px;
-}
-
-#EntranceManage_0014 {
-    width: 98px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0015 {
-    width: 148px; height: 64px;
-}
-
-#EntranceManage_001500 {
-    width: 64px; height: 64px;
-}
-
-#EntranceManage_001501 {
-    width: 64px; height: 64px;
-}
-
-#EntranceManage_0016 {
-    width: 248px; height: 64px;
-}
-
-#EntranceManage_001600 {
-    width: 100px; height: 16px;
-    display: none;
-}
-
-#EntranceManage_001601 {
-    width: 70px; height: 20px;
-}
-
-#EntranceManage_001602 {
-    width: 85px; height: 20px;
-}
-
-#EntranceManage_001603 {
-    width: 85px; height: 20px;
-}
-
-#EntranceManage_0017 {
-    width: 98px; height: 100px;
-    line-height: 100px;
-}
-
-#EntranceManage_0018 {
-    width: 398px; height: 100px;
-    text-align: left;
-}
-
-#EntranceManage_0019 {
-    width: 149px; height: 20px;
-}
-
-#EntranceManage_0020 {
-    width: 500px; height: 20px;
-    border: none;
-}
-
-#EntranceManage_002000 {
-    width: 500px;
-}
-
-#EntranceManage_00200000 {
-    width: 498px; height: 20px;
-}
-
-.EntranceManage_Sequence {
-    width: 48px; height: 20px;
-}
-
-.EntranceManage_Date {
-    width: 148px; height: 20px;
-}
-
-.EntranceManage_Amount {
-    width: 148px; height: 20px;
-}
-
-.EntranceManage_Cumul {
-    width: 148px; height: 20px;
-}
+#third_use_disallow{
+    display:none;
+    margin-left:10px;
+    width:40px;
+}
@@ -1,152 +0,0 @@
-/*
-jQuery Redirect v1.1.1
-
-Copyright (c) 2013-2017 Miguel Galante
-Copyright (c) 2011-2013 Nemanja Avramovic, www.avramovic.info
-
-Licensed under CC BY-SA 4.0 License: http://creativecommons.org/licenses/by-sa/4.0/
-
-This means everyone is allowed to:
-
-Share - copy and redistribute the material in any medium or format
-Adapt - remix, transform, and build upon the material for any purpose, even commercially.
-Under following conditions:
-
-Attribution - You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
-ShareAlike - If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
-
-*/
-(function ($) {
-    'use strict';
-
-    /**
-     * jQuery Redirect
-     * @param {string} url - Url of the redirection
-     * @param {Object} values - (optional) An object with the data to send. If not present will look for values as QueryString in the target url.
-     * @param {string} method - (optional) The HTTP verb can be GET or POST (defaults to POST)
-     * @param {string} target - (optional) The target of the form. "_blank" will open the url in a new window.
-     * @param {boolean} traditional - (optional) This provides the same function as jquery's ajax function. The brackets are omitted on the field name if its an array.  This allows arrays to work with MVC.net among others.
-     * @param {boolean} redirectTop - (optional) If its called from a iframe, force to navigate the top window. 
-     */
-    $.redirect = function (url, values, method, target, traditional, redirectTop) {
-        redirectTop = redirectTop || false;
-        var generatedForm = $.redirect.getForm(url, values, method, target, traditional);
-        $('body', redirectTop ? window.top.document : undefined).append(generatedForm.form);
-        generatedForm.submit();
-    };
-
-
-    $.redirect.getForm = function (url, values, method, target, traditional) {
-        method = (method && ["GET", "POST", "PUT", "DELETE"].indexOf(method.toUpperCase()) !== -1) ? method.toUpperCase() : 'POST';
-
-        url = url.split("#");
-        var hash = url[1] ? ("#" + url[1]) : "";
-        url = url[0];
-
-        if (!values) {
-            var obj = $.parseUrl(url);
-            url = obj.url;
-            values = obj.params;
-        }
-
-        values = removeNulls(values);
-
-        var form = $('<form>')
-            .attr("method", method)
-            .attr("action", url + hash);
-
-
-        if (target) {
-            form.attr("target", target);
-        }
-
-        var submit = form[0].submit;
-        iterateValues(values, [], form, null, traditional);
-
-        return { form: form, submit: function () { submit.call(form[0]); } };
-    }
-    //Utility Functions
-    /**
-     * Url and QueryString Parser.
-     * @param {string} url - a Url to parse.
-     * @returns {object} an object with the parsed url with the following structure {url: URL, params:{ KEY: VALUE }}
-     */
-    $.parseUrl = function (url) {
-
-        if (url.indexOf('?') === -1) {
-            return {
-                url: url,
-                params: {}
-            };
-        }
-        var parts = url.split('?'),
-            query_string = parts[1],
-            elems = query_string.split('&');
-        url = parts[0];
-
-        var i, pair, obj = {};
-        for (i = 0; i < elems.length; i += 1) {
-            pair = elems[i].split('=');
-            obj[pair[0]] = pair[1];
-        }
-
-        return {
-            url: url,
-            params: obj
-        };
-    };
-
-    //Private Functions
-    var getInput = function (name, value, parent, array, traditional) {
-        var parentString;
-        if (parent.length > 0) {
-            parentString = parent[0];
-            var i;
-            for (i = 1; i < parent.length; i += 1) {
-                parentString += "[" + parent[i] + "]";
-            }
-
-            if (array) {
-                if (traditional)
-                    name = parentString;
-                else
-                    name = parentString + "[" + name + "]";
-            } else {
-                name = parentString + "[" + name + "]";
-            }
-        }
-
-        return $("<input>").attr("type", "hidden")
-            .attr("name", name)
-            .attr("value", value);
-    };
-
-    var iterateValues = function (values, parent, form, isArray, traditional) {
-        var i, iterateParent = [];
-        Object.keys(values).forEach(function (i) {
-            if (typeof values[i] === "object") {
-                iterateParent = parent.slice();
-                iterateParent.push(i);
-                iterateValues(values[i], iterateParent, form, Array.isArray(values[i]), traditional);
-            } else {
-                form.append(getInput(i, values[i], parent, isArray, traditional));
-            }
-        });
-    };
-
-    var removeNulls = function (values) {
-        var propNames = Object.getOwnPropertyNames(values);
-        for (var i = 0; i < propNames.length; i++) {
-            var propName = propNames[i];
-            if (values[propName] === null || values[propName] === undefined) {
-                delete values[propName];
-            } else if (typeof values[propName] === 'object') {
-                values[propName] = removeNulls(values[propName]);
-            } else if (values[propName].length < 1) {
-                delete values[propName];
-            }
-        }
-        return values;
-    };
-
-}(window.jQuery || window.Zepto || window.jqlite));
@@ -1 +0,0 @@
-TODO : adobdb5, phpmailer5(?), plates, utilphp
@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ko",[],function(){return{errorLoading:function(){return"결과를 불러올 수 없습니다."},inputTooLong:function(n){return"너무 깁니다. "+(n.input.length-n.maximum)+" 글자 지워주세요."},inputTooShort:function(n){return"너무 짧습니다. "+(n.minimum-n.input.length)+" 글자 더 입력해주세요."},loadingMore:function(){return"불러오는 중…"},maximumSelected:function(n){return"최대 "+n.maximum+"개까지만 선택 가능합니다."},noResults:function(){return"결과가 없습니다."},searching:function(){return"검색 중…"},removeAllItems:function(){return"모든 항목 삭제"}}}),n.define,n.require}();
@@ -0,0 +1,553 @@
+/* select2-bootstrap4 with Darkly */
+
+.select2-container--bootstrap4 {
+    color: black;
+}
+
+.select2-container--bootstrap4 .select2-selection {
+    background-color: #fff;
+    border: 1px solid #ced4da;
+    border-radius: 0.25rem;
+    color: #495057;
+    font-size: 1rem;
+    outline: 0;
+}
+
+.select2-container--bootstrap4 .select2-selection.form-control {
+    border-radius: 0.25rem;
+}
+
+.select2-container--bootstrap4 .select2-search--dropdown .select2-search__field {
+    background-color: #fff;
+    border: 1px solid #ced4da;
+    border-radius: 0.25rem;
+    color: #495057;
+    font-size: 1rem;
+}
+
+.select2-container--bootstrap4 .select2-search__field {
+    outline: 0;
+}
+
+.select2-container--bootstrap4 .select2-search__field::-webkit-input-placeholder {
+    color: #6c757d;
+}
+
+.select2-container--bootstrap4 .select2-search__field:-moz-placeholder {
+    color: #6c757d;
+}
+
+.select2-container--bootstrap4 .select2-search__field::-moz-placeholder {
+    color: #6c757d;
+    opacity: 1;
+}
+
+.select2-container--bootstrap4 .select2-search__field:-ms-input-placeholder {
+    color: #6c757d;
+}
+
+.select2-container--bootstrap4 .select2-results__option {
+    padding: 0.75rem 0.375rem;
+    font-size: 1rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option[role=group] {
+    padding: 0;
+}
+
+.select2-container--bootstrap4 .select2-results__option[aria-disabled=true] {
+    color: #6c757d;
+    cursor: not-allowed;
+}
+
+.select2-container--bootstrap4 .select2-results__option[aria-selected=true] {
+    background-color: #f8f9fa;
+    color: #16181b;
+}
+
+.select2-container--bootstrap4 .select2-results__option--highlighted[aria-selected] {
+    background-color: #007bff;
+    color: #fff;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option {
+    padding: 0.75rem 0.375rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__group {
+    padding-left: 0;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -0.375rem;
+    padding-left: 0.75rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -0.75rem;
+    padding-left: 1.125rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1.125rem;
+    padding-left: 1.5rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1.5rem;
+    padding-left: 1.875rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1.875rem;
+    padding-left: 2.25rem;
+}
+
+.select2-container--bootstrap4 .select2-results__group {
+    color: #6c757d;
+    display: block;
+    padding: 0.75rem 0.375rem;
+    font-size: 75%;
+    line-height: 1;
+    white-space: nowrap;
+}
+
+.select2-container--bootstrap4.select2-container--focus .select2-selection,
+.select2-container--bootstrap4.select2-container--open .select2-selection {
+    transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+    border-color: #80bdff;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+    .select2-container--bootstrap4.select2-container--focus .select2-selection,
+    .select2-container--bootstrap4.select2-container--open .select2-selection {
+        transition: none;
+    }
+}
+
+.select2-container--bootstrap4.select2-container--open .select2-selection .select2-selection__arrow b {
+    border-color: transparent transparent #6c757d transparent;
+    border-width: 0 0.25rem 0.25rem 0.25rem;
+}
+
+.select2-container--bootstrap4.select2-container--open.select2-container--below .select2-selection {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+    border-bottom-color: transparent;
+}
+
+.select2-container--bootstrap4.select2-container--open.select2-container--above .select2-selection {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-top-color: transparent;
+}
+
+.select2-container--bootstrap4 .select2-selection__clear {
+    color: #6c757d;
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-right: 10px;
+}
+
+.select2-container--bootstrap4 .select2-selection__clear:hover {
+    color: #343a40;
+}
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection {
+    border-color: #ced4da;
+}
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection,
+.select2-container--bootstrap4.select2-container--disabled .select2-search__field {
+    cursor: not-allowed;
+}
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection,
+.select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice {
+    background-color: #e9ecef;
+}
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection__clear,
+.select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice__remove {
+    display: none;
+}
+
+.select2-container--bootstrap4 .select2-dropdown {
+    border-color: #80bdff;
+    border-width: 1px;
+    overflow-x: hidden;
+    margin-top: -1px;
+}
+
+.select2-container--bootstrap4 .select2-dropdown--above {
+    margin-top: 1px;
+}
+
+.select2-container--bootstrap4 .select2-results>.select2-results__options {
+    max-height: 200px;
+    overflow-y: auto;
+}
+
+.select2-container--bootstrap4 .select2-selection--single {
+    height: calc(2.25rem + 2px);
+    line-height: 1;
+    padding: 0.75rem 1.125rem 0.75rem 0.375rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow {
+    position: absolute;
+    bottom: 0;
+    right: 0.375rem;
+    top: 0;
+    width: 0.25rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
+    border-color: #6c757d transparent transparent transparent;
+    border-style: solid;
+    border-width: 0.25rem 0.25rem 0 0.25rem;
+    height: 0;
+    left: 0;
+    margin-left: -0.25rem;
+    margin-top: -0.125rem;
+    position: absolute;
+    top: 50%;
+    width: 0;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered {
+    color: #495057;
+    padding: 0;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder {
+    color: #6c757d;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple {
+    min-height: calc(2.25rem + 2px);
+    padding: 0;
+    height: auto;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered {
+    box-sizing: border-box;
+    display: block;
+    line-height: 1;
+    list-style: none;
+    margin: 0;
+    overflow: hidden;
+    padding: 0.75rem 0.375rem 0 0.75rem;
+    width: 100%;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__placeholder {
+    color: #6c757d;
+    float: left;
+    margin-top: 5px;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+    color: #495057;
+    background: transparent;
+    border: 1px solid #343a40;
+    border-radius: 0.25rem;
+    cursor: default;
+    float: left;
+    margin: -0.25rem 0 0 0.1875rem;
+    padding: 0 0.75rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field {
+    background: transparent;
+    padding: 0 0.375rem;
+    height: calc(2.25rem + 2px)-2;
+    line-height: 1;
+    margin-top: 0;
+    min-width: 5em;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove {
+    color: #6c757d;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 0.375rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove:hover {
+    color: #343a40;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear {
+    margin-top: 0.75rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-sm,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--single,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--single {
+    border-radius: 0.2rem;
+    font-size: 75%;
+    height: calc(1.8125rem + 2px);
+    line-height: 1;
+    padding: 0.5rem 1rem 0.5rem 0.25rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-sm .select2-selection__arrow b,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
+    margin-left: -0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple {
+    min-height: calc(1.8125rem + 2px);
+    border-radius: 0.2rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__rendered,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered {
+    padding: 0.5rem 0.25rem 0 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__choice,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+    font-size: 75%;
+    line-height: 1;
+    margin: 0 0 0 0.125rem;
+    padding: 0 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-search--inline .select2-search__field,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field {
+    padding: 0 0.25rem;
+    font-size: 75%;
+    height: calc(1.8125rem + 2px)-2;
+    line-height: 1;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__clear,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear {
+    margin-top: 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--single,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--single {
+    border-radius: 0.3rem;
+    font-size: 1.25rem;
+    height: calc(2.875rem + 2px);
+    line-height: 1;
+    padding: 1rem 1.4375rem 1rem 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg .select2-selection__arrow,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow {
+    width: 0.3125rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg .select2-selection__arrow b,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
+    border-width: 0.3125rem 0.3125rem 0 0.3125rem;
+    margin-left: -0.3125rem;
+    margin-left: -1rem;
+    margin-top: -0.15625rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple {
+    min-height: calc(2.875rem + 2px);
+    border-radius: 0.3rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-selection__choice,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+    font-size: 1.25rem;
+    line-height: 1;
+    border-radius: 0.25rem;
+    margin: 0rem 0 0 0.25rem;
+    padding: 0 1rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-search--inline .select2-search__field,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field {
+    padding: 0 0.5rem;
+    font-size: 1.25rem;
+    height: calc(2.875rem + 2px)-2;
+    line-height: 1;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-selection__clear,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear {
+    margin-top: 1rem;
+}
+
+.select2-container--bootstrap4 .select2-selection.input-lg.select2-container--open .select2-selection--single .select2-selection__arrow b {
+    border-color: transparent transparent #6c757d transparent;
+    border-width: 0 0.3125rem 0.3125rem 0.3125rem;
+}
+
+.input-group-lg .select2-container--bootstrap4 .select2-selection.select2-container--open .select2-selection--single .select2-selection__arrow b {
+    border-color: transparent transparent #6c757d transparent;
+    border-width: 0 0.3125rem 0.3125rem 0.3125rem;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single {
+    padding-left: 1.125rem;
+    padding-right: 0.375rem;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__rendered {
+    padding-right: 0;
+    padding-left: 0;
+    text-align: right;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__clear {
+    float: left;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+    left: 0.375rem;
+    right: auto;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__arrow b {
+    margin-left: 0;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice,
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+    float: right;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+    margin-left: 0;
+    margin-right: 0.1875rem;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+    margin-left: 2px;
+    margin-right: auto;
+}
+
+.has-warning .select2-dropdown,
+.has-warning .select2-selection {
+    border-color: #ffc107;
+}
+
+.has-warning .select2-container--focus .select2-selection,
+.has-warning .select2-container--open .select2-selection {
+    border-color: #d39e00;
+}
+
+.has-warning.select2-drop-active {
+    border-color: #d39e00;
+}
+
+.has-warning.select2-drop-active.select2-drop.select2-drop-above {
+    border-top-color: #d39e00;
+}
+
+.has-error .select2-dropdown,
+.has-error .select2-selection {
+    border-color: #dc3545;
+}
+
+.has-error .select2-container--focus .select2-selection,
+.has-error .select2-container--open .select2-selection {
+    border-color: #bd2130;
+}
+
+.has-error.select2-drop-active {
+    border-color: #bd2130;
+}
+
+.has-error.select2-drop-active.select2-drop.select2-drop-above {
+    border-top-color: #bd2130;
+}
+
+.has-success .select2-dropdown,
+.has-success .select2-selection {
+    border-color: #28a745;
+}
+
+.has-success .select2-container--focus .select2-selection,
+.has-success .select2-container--open .select2-selection {
+    border-color: #1e7e34;
+}
+
+.has-success.select2-drop-active {
+    border-color: #1e7e34;
+}
+
+.has-success.select2-drop-active.select2-drop.select2-drop-above {
+    border-top-color: #1e7e34;
+}
+
+.input-group>.select2-hidden-accessible:first-child+.select2-container--bootstrap4>.selection>.select2-selection,
+.input-group>.select2-hidden-accessible:first-child+.select2-container--bootstrap4>.selection>.select2-selection.form-control {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.input-group>.select2-hidden-accessible:not(:first-child)+.select2-container--bootstrap4:not(:last-child)>.selection>.select2-selection,
+.input-group>.select2-hidden-accessible:not(:first-child)+.select2-container--bootstrap4:not(:last-child)>.selection>.select2-selection.form-control {
+    border-radius: 0;
+}
+
+.input-group>.select2-hidden-accessible:not(:first-child):not(:last-child)+.select2-container--bootstrap4:last-child>.selection>.select2-selection,
+.input-group>.select2-hidden-accessible:not(:first-child):not(:last-child)+.select2-container--bootstrap4:last-child>.selection>.select2-selection.form-control {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+.input-group>.select2-container--bootstrap4 {
+    display: table;
+    table-layout: fixed;
+    position: relative;
+    z-index: 2;
+    width: 100%;
+    margin-bottom: 0;
+}
+
+.input-group>.select2-container--bootstrap4>.selection>.select2-selection.form-control {
+    float: none;
+}
+
+.input-group>.select2-container--bootstrap4.select2-container--open,
+.input-group>.select2-container--bootstrap4.select2-container--focus {
+    z-index: 3;
+}
+
+.input-group>.select2-container--bootstrap4,
+.input-group>.select2-container--bootstrap4 .input-group-btn,
+.input-group>.select2-container--bootstrap4 .input-group-btn .btn {
+    vertical-align: top;
+}
+
+.form-control.select2-hidden-accessible {
+    position: absolute !important;
+    width: 1px !important;
+}
+
+@media (min-width: 576px) {
+    .form-inline .select2-container--bootstrap4 {
+        display: inline-block;
+    }
+}
@@ -0,0 +1,481 @@
+.select2-container {
+  box-sizing: border-box;
+  display: inline-block;
+  margin: 0;
+  position: relative;
+  vertical-align: middle; }
+  .select2-container .select2-selection--single {
+    box-sizing: border-box;
+    cursor: pointer;
+    display: block;
+    height: 28px;
+    user-select: none;
+    -webkit-user-select: none; }
+    .select2-container .select2-selection--single .select2-selection__rendered {
+      display: block;
+      padding-left: 8px;
+      padding-right: 20px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap; }
+    .select2-container .select2-selection--single .select2-selection__clear {
+      position: relative; }
+  .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
+    padding-right: 8px;
+    padding-left: 20px; }
+  .select2-container .select2-selection--multiple {
+    box-sizing: border-box;
+    cursor: pointer;
+    display: block;
+    min-height: 32px;
+    user-select: none;
+    -webkit-user-select: none; }
+    .select2-container .select2-selection--multiple .select2-selection__rendered {
+      display: inline-block;
+      overflow: hidden;
+      padding-left: 8px;
+      text-overflow: ellipsis;
+      white-space: nowrap; }
+  .select2-container .select2-search--inline {
+    float: left; }
+    .select2-container .select2-search--inline .select2-search__field {
+      box-sizing: border-box;
+      border: none;
+      font-size: 100%;
+      margin-top: 5px;
+      padding: 0; }
+      .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button {
+        -webkit-appearance: none; }
+
+.select2-dropdown {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  box-sizing: border-box;
+  display: block;
+  position: absolute;
+  left: -100000px;
+  width: 100%;
+  z-index: 1051; }
+
+.select2-results {
+  display: block; }
+
+.select2-results__options {
+  list-style: none;
+  margin: 0;
+  padding: 0; }
+
+.select2-results__option {
+  padding: 6px;
+  user-select: none;
+  -webkit-user-select: none; }
+  .select2-results__option[aria-selected] {
+    cursor: pointer; }
+
+.select2-container--open .select2-dropdown {
+  left: 0; }
+
+.select2-container--open .select2-dropdown--above {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--open .select2-dropdown--below {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-search--dropdown {
+  display: block;
+  padding: 4px; }
+  .select2-search--dropdown .select2-search__field {
+    padding: 4px;
+    width: 100%;
+    box-sizing: border-box; }
+    .select2-search--dropdown .select2-search__field::-webkit-search-cancel-button {
+      -webkit-appearance: none; }
+  .select2-search--dropdown.select2-search--hide {
+    display: none; }
+
+.select2-close-mask {
+  border: 0;
+  margin: 0;
+  padding: 0;
+  display: block;
+  position: fixed;
+  left: 0;
+  top: 0;
+  min-height: 100%;
+  min-width: 100%;
+  height: auto;
+  width: auto;
+  opacity: 0;
+  z-index: 99;
+  background-color: #fff;
+  filter: alpha(opacity=0); }
+
+.select2-hidden-accessible {
+  border: 0 !important;
+  clip: rect(0 0 0 0) !important;
+  -webkit-clip-path: inset(50%) !important;
+  clip-path: inset(50%) !important;
+  height: 1px !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+  position: absolute !important;
+  width: 1px !important;
+  white-space: nowrap !important; }
+
+.select2-container--default .select2-selection--single {
+  background-color: #fff;
+  border: 1px solid #aaa;
+  border-radius: 4px; }
+  .select2-container--default .select2-selection--single .select2-selection__rendered {
+    color: #444;
+    line-height: 28px; }
+  .select2-container--default .select2-selection--single .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold; }
+  .select2-container--default .select2-selection--single .select2-selection__placeholder {
+    color: #999; }
+  .select2-container--default .select2-selection--single .select2-selection__arrow {
+    height: 26px;
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    width: 20px; }
+    .select2-container--default .select2-selection--single .select2-selection__arrow b {
+      border-color: #888 transparent transparent transparent;
+      border-style: solid;
+      border-width: 5px 4px 0 4px;
+      height: 0;
+      left: 50%;
+      margin-left: -4px;
+      margin-top: -2px;
+      position: absolute;
+      top: 50%;
+      width: 0; }
+
+.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  float: left; }
+
+.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  left: 1px;
+  right: auto; }
+
+.select2-container--default.select2-container--disabled .select2-selection--single {
+  background-color: #eee;
+  cursor: default; }
+  .select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear {
+    display: none; }
+
+.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b {
+  border-color: transparent transparent #888 transparent;
+  border-width: 0 4px 5px 4px; }
+
+.select2-container--default .select2-selection--multiple {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  cursor: text; }
+  .select2-container--default .select2-selection--multiple .select2-selection__rendered {
+    box-sizing: border-box;
+    list-style: none;
+    margin: 0;
+    padding: 0 5px;
+    width: 100%; }
+    .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
+      list-style: none; }
+  .select2-container--default .select2-selection--multiple .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-top: 5px;
+    margin-right: 10px;
+    padding: 1px; }
+  .select2-container--default .select2-selection--multiple .select2-selection__choice {
+    background-color: #e4e4e4;
+    border: 1px solid #aaa;
+    border-radius: 4px;
+    cursor: default;
+    float: left;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 0 5px; }
+  .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
+    color: #999;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 2px; }
+    .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
+      color: #333; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+  float: right; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  margin-left: 5px;
+  margin-right: auto; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+  margin-left: 2px;
+  margin-right: auto; }
+
+.select2-container--default.select2-container--focus .select2-selection--multiple {
+  border: solid black 1px;
+  outline: 0; }
+
+.select2-container--default.select2-container--disabled .select2-selection--multiple {
+  background-color: #eee;
+  cursor: default; }
+
+.select2-container--default.select2-container--disabled .select2-selection__choice__remove {
+  display: none; }
+
+.select2-container--default.select2-container--open.select2-container--above .select2-selection--single, .select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-container--default.select2-container--open.select2-container--below .select2-selection--single, .select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--default .select2-search--dropdown .select2-search__field {
+  border: 1px solid #aaa; }
+
+.select2-container--default .select2-search--inline .select2-search__field {
+  background: transparent;
+  border: none;
+  outline: 0;
+  box-shadow: none;
+  -webkit-appearance: textfield; }
+
+.select2-container--default .select2-results > .select2-results__options {
+  max-height: 200px;
+  overflow-y: auto; }
+
+.select2-container--default .select2-results__option[role=group] {
+  padding: 0; }
+
+.select2-container--default .select2-results__option[aria-disabled=true] {
+  color: #999; }
+
+.select2-container--default .select2-results__option[aria-selected=true] {
+  background-color: #ddd; }
+
+.select2-container--default .select2-results__option .select2-results__option {
+  padding-left: 1em; }
+  .select2-container--default .select2-results__option .select2-results__option .select2-results__group {
+    padding-left: 0; }
+  .select2-container--default .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1em;
+    padding-left: 2em; }
+    .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+      margin-left: -2em;
+      padding-left: 3em; }
+      .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+        margin-left: -3em;
+        padding-left: 4em; }
+        .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+          margin-left: -4em;
+          padding-left: 5em; }
+          .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+            margin-left: -5em;
+            padding-left: 6em; }
+
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: #5897fb;
+  color: white; }
+
+.select2-container--default .select2-results__group {
+  cursor: default;
+  display: block;
+  padding: 6px; }
+
+.select2-container--classic .select2-selection--single {
+  background-color: #f7f7f7;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  outline: 0;
+  background-image: -webkit-linear-gradient(top, white 50%, #eeeeee 100%);
+  background-image: -o-linear-gradient(top, white 50%, #eeeeee 100%);
+  background-image: linear-gradient(to bottom, white 50%, #eeeeee 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
+  .select2-container--classic .select2-selection--single:focus {
+    border: 1px solid #5897fb; }
+  .select2-container--classic .select2-selection--single .select2-selection__rendered {
+    color: #444;
+    line-height: 28px; }
+  .select2-container--classic .select2-selection--single .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-right: 10px; }
+  .select2-container--classic .select2-selection--single .select2-selection__placeholder {
+    color: #999; }
+  .select2-container--classic .select2-selection--single .select2-selection__arrow {
+    background-color: #ddd;
+    border: none;
+    border-left: 1px solid #aaa;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    height: 26px;
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    width: 20px;
+    background-image: -webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+    background-image: -o-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+    background-image: linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0); }
+    .select2-container--classic .select2-selection--single .select2-selection__arrow b {
+      border-color: #888 transparent transparent transparent;
+      border-style: solid;
+      border-width: 5px 4px 0 4px;
+      height: 0;
+      left: 50%;
+      margin-left: -4px;
+      margin-top: -2px;
+      position: absolute;
+      top: 50%;
+      width: 0; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  float: left; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  border: none;
+  border-right: 1px solid #aaa;
+  border-radius: 0;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  left: 1px;
+  right: auto; }
+
+.select2-container--classic.select2-container--open .select2-selection--single {
+  border: 1px solid #5897fb; }
+  .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow {
+    background: transparent;
+    border: none; }
+    .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b {
+      border-color: transparent transparent #888 transparent;
+      border-width: 0 4px 5px 4px; }
+
+.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  background-image: -webkit-linear-gradient(top, white 0%, #eeeeee 50%);
+  background-image: -o-linear-gradient(top, white 0%, #eeeeee 50%);
+  background-image: linear-gradient(to bottom, white 0%, #eeeeee 50%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
+
+.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  background-image: -webkit-linear-gradient(top, #eeeeee 50%, white 100%);
+  background-image: -o-linear-gradient(top, #eeeeee 50%, white 100%);
+  background-image: linear-gradient(to bottom, #eeeeee 50%, white 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0); }
+
+.select2-container--classic .select2-selection--multiple {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  cursor: text;
+  outline: 0; }
+  .select2-container--classic .select2-selection--multiple:focus {
+    border: 1px solid #5897fb; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__rendered {
+    list-style: none;
+    margin: 0;
+    padding: 0 5px; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__clear {
+    display: none; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__choice {
+    background-color: #e4e4e4;
+    border: 1px solid #aaa;
+    border-radius: 4px;
+    cursor: default;
+    float: left;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 0 5px; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove {
+    color: #888;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 2px; }
+    .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover {
+      color: #555; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  float: right;
+  margin-left: 5px;
+  margin-right: auto; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+  margin-left: 2px;
+  margin-right: auto; }
+
+.select2-container--classic.select2-container--open .select2-selection--multiple {
+  border: 1px solid #5897fb; }
+
+.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--classic .select2-search--dropdown .select2-search__field {
+  border: 1px solid #aaa;
+  outline: 0; }
+
+.select2-container--classic .select2-search--inline .select2-search__field {
+  outline: 0;
+  box-shadow: none; }
+
+.select2-container--classic .select2-dropdown {
+  background-color: white;
+  border: 1px solid transparent; }
+
+.select2-container--classic .select2-dropdown--above {
+  border-bottom: none; }
+
+.select2-container--classic .select2-dropdown--below {
+  border-top: none; }
+
+.select2-container--classic .select2-results > .select2-results__options {
+  max-height: 200px;
+  overflow-y: auto; }
+
+.select2-container--classic .select2-results__option[role=group] {
+  padding: 0; }
+
+.select2-container--classic .select2-results__option[aria-disabled=true] {
+  color: grey; }
+
+.select2-container--classic .select2-results__option--highlighted[aria-selected] {
+  background-color: #3875d7;
+  color: white; }
+
+.select2-container--classic .select2-results__group {
+  cursor: default;
+  display: block;
+  padding: 6px; }
+
+.select2-container--classic.select2-container--open .select2-dropdown {
+  border-color: #5897fb; }
@@ -1,84 +1,197 @@
 <?php
+
 namespace sammo;

-define('ROOT', realpath(__dir__.'/..'));
-
+define('ROOT', realpath(__DIR__ . '/..'));
+setlocale(LC_ALL, 'ko_KR.UTF-8');
+date_default_timezone_set('Asia/Seoul');
 mb_internal_encoding("UTF-8");
 mb_http_output('UTF-8');
-mb_regex_encoding('UTF-8'); 
+mb_regex_encoding('UTF-8');

-function getFriendlyErrorType($type) 
-{ 
-    switch($type) 
-    { 
-        case E_ERROR: // 1 // 
-            return 'E_ERROR'; 
-        case E_WARNING: // 2 // 
-            return 'E_WARNING'; 
-        case E_PARSE: // 4 // 
-            return 'E_PARSE'; 
-        case E_NOTICE: // 8 // 
-            return 'E_NOTICE'; 
-        case E_CORE_ERROR: // 16 // 
-            return 'E_CORE_ERROR'; 
-        case E_CORE_WARNING: // 32 // 
-            return 'E_CORE_WARNING'; 
-        case E_COMPILE_ERROR: // 64 // 
-            return 'E_COMPILE_ERROR'; 
-        case E_COMPILE_WARNING: // 128 // 
-            return 'E_COMPILE_WARNING'; 
-        case E_USER_ERROR: // 256 // 
-            return 'E_USER_ERROR'; 
-        case E_USER_WARNING: // 512 // 
-            return 'E_USER_WARNING'; 
-        case E_USER_NOTICE: // 1024 // 
-            return 'E_USER_NOTICE'; 
-        case E_STRICT: // 2048 // 
-            return 'E_STRICT'; 
-        case E_RECOVERABLE_ERROR: // 4096 // 
-            return 'E_RECOVERABLE_ERROR'; 
-        case E_DEPRECATED: // 8192 // 
-            return 'E_DEPRECATED'; 
-        case E_USER_DEPRECATED: // 16384 // 
-            return 'E_USER_DEPRECATED'; 
-    } 
-    return "{$type}"; 
+ini_set("session.cache_expire", '10080');      // minutes
+ini_set("session.gc_maxlifetime", '604800');    // seconds
+
+function getFriendlyErrorType($type)
+{
+    switch ($type) {
+        case E_ERROR: // 1 //
+            return 'E_ERROR';
+        case E_WARNING: // 2 //
+            return 'E_WARNING';
+        case E_PARSE: // 4 //
+            return 'E_PARSE';
+        case E_NOTICE: // 8 //
+            return 'E_NOTICE';
+        case E_CORE_ERROR: // 16 //
+            return 'E_CORE_ERROR';
+        case E_CORE_WARNING: // 32 //
+            return 'E_CORE_WARNING';
+        case E_COMPILE_ERROR: // 64 //
+            return 'E_COMPILE_ERROR';
+        case E_COMPILE_WARNING: // 128 //
+            return 'E_COMPILE_WARNING';
+        case E_USER_ERROR: // 256 //
+            return 'E_USER_ERROR';
+        case E_USER_WARNING: // 512 //
+            return 'E_USER_WARNING';
+        case E_USER_NOTICE: // 1024 //
+            return 'E_USER_NOTICE';
+        case E_STRICT: // 2048 //
+            return 'E_STRICT';
+        case E_RECOVERABLE_ERROR: // 4096 //
+            return 'E_RECOVERABLE_ERROR';
+        case E_DEPRECATED: // 8192 //
+            return 'E_DEPRECATED';
+        case E_USER_DEPRECATED: // 16384 //
+            return 'E_USER_DEPRECATED';
+    }
+    return "{$type}";
 }

-function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, int $errline, array $errcontext){
+function getExceptionTraceAsString(\Throwable $exception)
+{
+    //https://gist.github.com/abtris/1437966
+    $rtn = "";
+    $count = 0;
+    $rtn = [];
+    foreach ($exception->getTrace() as $frame) {
+        $args = "";
+        if (isset($frame['args'])) {
+            $args = array();
+            foreach ($frame['args'] as $arg) {
+                if (is_string($arg)) {
+                    $args[] = "'" . $arg . "'";
+                } elseif (is_array($arg)) {
+                    $args[] = "Array";
+                } elseif (is_null($arg)) {
+                    $args[] = 'NULL';
+                } elseif (is_bool($arg)) {
+                    $args[] = ($arg) ? "true" : "false";
+                } elseif (is_object($arg)) {
+                    $args[] = get_class($arg);
+                } elseif (is_resource($arg)) {
+                    $args[] = get_resource_type($arg);
+                } else {
+                    $args[] = $arg;
+                }
+            }
+            $args = join(", ", $args);
+        }
+        $rtn[] = sprintf(
+            "#%s %s:%s %s(%s)",
+            $count,
+            isset($frame['file']) ? $frame['file'] : 'unknown file',
+            isset($frame['line']) ? $frame['line'] : 'unknown line',
+            (isset($frame['class']))  ? $frame['class'] . $frame['type'] . $frame['function'] : $frame['function'],
+            $args
+        );
+        $count++;
+    }
+    return $rtn;
+}
+
+function logError(string $err, string $errstr, string $errpath, array $trace)
+{
+    $fdb = FileDB::db(ROOT . '/d_log/err_log.sqlite3', ROOT . '/f_install/sql/err_log.sql');
+    $date = date("Ymd_His");
+
+    $err = str_replace(ROOT, '{ROOT}', $err);
+    $errstr = str_replace(ROOT, '{ROOT}', $errstr);
+    $errpath = str_replace(ROOT, '{ROOT}', $errpath);
+    $trace = array_map(function (string $text) {
+        return str_replace(ROOT, '{ROOT}', $text);
+    }, $trace);
+
+    $owner = Util::get_client_ip();
+    $session = Session::getInstance();
+    if ($session->isLoggedIn(true)) {
+        $owner .= '(' . $session->getUserID() . ',' . $session->userName . ')';
+    }
+
+    $fdb->insert('err_log', [
+        'date' => $date,
+        'err' => $err,
+        'errstr' => $errstr,
+        'errpath' => $errpath,
+        'trace' => Json::encode($trace),
+        'webuser' => $owner
+    ]);
+}
+
+function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, int $errline)
+{
    if (!(error_reporting() & $errno)) {
        // This error code is not included in error_reporting, so let it fall
        // through to the standard PHP error handler
        return false;
    }

-    $date = date("Ymd_His");
    $e = new \Exception();

-    $data = Json::encode([
-        'date'=>$date,
-        'err'=>getFriendlyErrorType($errno),
-        'errstr'=>$errstr,
-        'trace'=>explode("\n", $e->getTraceAsString())
-    ], Json::PRETTY);
-
-    file_put_contents(ROOT.'/d_log/err_log.txt',"$data\n", FILE_APPEND);
+    logError(
+        getFriendlyErrorType($errno),
+        $errstr,
+        $errfile . ':' . $errline,
+        getExceptionTraceAsString($e)
+    );
+    return true;
 }
-set_error_handler("\sammo\logErrorByCustomHandler");
+set_error_handler("\\sammo\\logErrorByCustomHandler");


-function logExceptionByCustomHandler(\Throwable $e){
+function logExceptionByCustomHandler(\Throwable $e, bool $withDie = true)
+{

-    $date = date("Ymd_His");
+    logError(
+        get_class($e),
+        $e->getMessage(),
+        $e->getFile() . ':' . $e->getLine(),
+        getExceptionTraceAsString($e)
+    );

-    $data = Json::encode([
-        'date'=>$date,
-        'err'=>get_class($e),
-        'errstr'=>$e->getMessage(),
-        'trace'=>explode("\n", $e->getTraceAsString())
-    ], Json::PRETTY);
+    if($withDie){
+        echo $e->getTraceAsString();

-    file_put_contents(ROOT.'/d_log/err_log.txt',"$data\n", FILE_APPEND);
-    throw $e;
+        throw $e;
+    }
+}
+set_exception_handler('\\sammo\\logExceptionByCustomHandler');
+
+function checkForFatal()
+{
+    $error = error_get_last();
+    if($error === null){
+        return;
+    }
+    if (($error["type"]??0) == E_ERROR) {
+        logErrorByCustomHandler($error["type"], $error["message"], $error["file"], $error["line"]);
+    }
+}
+
+register_shutdown_function("\\sammo\\checkForFatal");
+
+function getAPIExecutorClass($path)
+{
+
+    static $basePath = __NAMESPACE__ . '\\API\\';
+    if (is_string($path)) {
+    } else if (is_array($path)) {
+        $path = join('\\', $path);
+    } else {
+        throw new \InvalidArgumentException("{$path}는 올바른 API 지시자가 아님");
+    }
+
+    $classPath = str_replace('/', '\\', $basePath . $path);
+
+    if (class_exists($classPath)) {
+        return $classPath;
+    }
+    throw new \InvalidArgumentException("{$path}는 올바른 API 경로가 아님");
+}
+
+function buildAPIExecutorClass($type, string $rootPath, array $args): \sammo\BaseAPI
+{
+    $class = getAPIExecutorClass($type);
+    return new $class($rootPath, $args);
 }
-set_exception_handler('\\sammo\\logExceptionByCustomHandler');
@@ -1,168 +1,192 @@
 <?php
+
 namespace sammo;

-require(__dir__.'/../vendor/autoload.php');
+require(__DIR__ . '/../vendor/autoload.php');

 ?>
 <!DOCTYPE html>
 <html lang="ko">
+
 <head>
    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <title>설치</title>
-    <script src="../e_lib/jquery-3.2.1.min.js"></script>
-    <script src="../e_lib/bootstrap.bundle.min.js"></script>
-    <script src="../e_lib/jquery.validate.min.js"></script>
-    <script src="../e_lib/sha512.min.js"></script>
-    <script src="../js/install.js"></script>
-    <link type="text/css" rel="stylesheet" href="../e_lib/bootstrap.min.css">
-    <link type="text/css" rel="stylesheet" href="../css/install.css">
+    <?php /* NOTE: 설치 이전에는 ServConfig가 준비되어있지 않으므로 예외로 수동 지정 */ ?>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/vendors.js') ?>
+    <?= WebUtil::printCSS('../dist_js/gateway/vendor.css') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/common_ts.js') ?>
+    <?= WebUtil::printCSS('../dist_js/gateway/common_ts.css') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/install.js') ?>
+    <?= WebUtil::printCSS('../dist_js/gateway/install.css') ?>
+
+    <?= WebUtil::printCSS('../css/install.css') ?>
+
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
    <div class="container">
-        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 설치</h1>
-        <div class="row justify-content-md-center">
+        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 설치</h1>
+        <div class="row justify-content-lg-center">

-        <div class="col col-12 col-md-10 col-lg-7">
-        <div class="card" id="db_form_card" style="display:none">
-            <h3 class="card-header">
-                설치(DB 설정)
-            </h3> 
-            <div class="card-body">
-                <form id="db_form" method="post" action="#">
-                    <div class="form-group row">
-                        <label for="db_host" class="col-sm-4 col-form-label">DB호스트</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="db_host" id="db_host" 
-                             placeholder="호스트" value="localhost" />
-                        </div>
-                    </div>
+            <div class="col col-12 col-lg-10 col-lg-7">
+                <div class="card" id="db_form_card" style="display:none">
+                    <h3 class="card-header">
+                        설치(DB 설정)
+                    </h3>
+                    <div class="card-body">
+                        <form id="db_form" method="post" action="#">
+                            <div class="form-group row">
+                                <label for="db_host" class="col-sm-4 col-form-label">DB호스트</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="db_host" id="db_host" placeholder="호스트" value="localhost" />
+                                </div>
+                            </div>

-                    <div class="form-group row">
-                        <label for="db_port" class="col-sm-4 col-form-label">DB포트</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="db_port" id="db_port" 
-                             placeholder="접속 포트" value="3306" />
-                        </div>
-                    </div>
-                    
-                    <div class="form-group row">
-                        <label for="db_id" class="col-sm-4 col-form-label">DB계정명</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="db_id" id="db_id"  placeholder="DB계정"/>
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label for="db_port" class="col-sm-4 col-form-label">DB포트</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="db_port" id="db_port" placeholder="접속 포트" value="3306" />
+                                </div>
+                            </div>

-                    
-                    <div class="form-group row">
-                        <label for="db_pw" class="col-sm-4 col-form-label">DB비밀번호</label>
-                        <div class="col-sm-8">
-                            <input type="password" class="form-control" name="db_pw" id="db_pw" 
-                             placeholder="DB비밀번호"/>
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label for="db_id" class="col-sm-4 col-form-label">DB계정명</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="db_id" id="db_id" placeholder="DB계정" />
+                                </div>
+                            </div>

-                    <div class="form-group row">
-                        <label for="db_name" class="col-sm-4 col-form-label">DB명</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="db_name" id="db_name" 
-                             placeholder="DB명(예:sammo)"/>
-                        </div>
-                    </div>

-                    <div class="form-group row">
-                        <label for="serv_host" class="col-sm-4 col-form-label">접속 경로</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="serv_host" id="serv_host" 
-                            placeholder="접속경로(예:http://www.example.com)"/>
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label for="db_pw" class="col-sm-4 col-form-label">DB비밀번호</label>
+                                <div class="col-sm-8">
+                                    <input type="password" class="form-control" name="db_pw" id="db_pw" placeholder="DB비밀번호" />
+                                </div>
+                            </div>

-                    <div class="form-group row">
-                        <label for="shared_icon_path" class="col-sm-4 col-form-label">공용 아이콘 주소</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="shared_icon_path" id="shared_icon_path" 
-                            placeholder="공용 아이콘 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)"
-                            value="../image/icons" />
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label for="db_name" class="col-sm-4 col-form-label">DB명</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="db_name" id="db_name" placeholder="DB명(예:sammo)" />
+                                </div>
+                            </div>

-                    <div class="form-group row">
-                        <label for="game_image_path" class="col-sm-4 col-form-label">게임 이미지 주소</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="game_image_path" id="game_image_path" 
-                            placeholder="게임 이미지 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)"
-                            value="../image/game" />
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label for="serv_host" class="col-sm-4 col-form-label">접속 경로</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="serv_host" id="serv_host" placeholder="접속경로(예:http://www.example.com)" />
+                                </div>
+                            </div>

-                    <div class="form-group row">
-                        <div class="col-sm-4"></div>
-                        <div class="col-sm-8">
-                            <button type="submit" 
-                            class="btn btn-primary btn-lg btn-block login-button">설정 파일 생성</button>
-                        </div>
+                            <div class="form-group row">
+                                <label for="shared_icon_path" class="col-sm-4 col-form-label">공용 아이콘 주소</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="shared_icon_path" id="shared_icon_path" placeholder="공용 아이콘 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)" value="../image/icons" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="game_image_path" class="col-sm-4 col-form-label">게임 이미지 주소</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="game_image_path" id="game_image_path" placeholder="게임 이미지 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)" value="../image/game" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="image_request_key" class="col-sm-4 col-form-label">이미지 갱신 키</label>
+                                <div class="input-group col-sm-8">
+                                    <input type="text" class="form-control" name="image_request_key" id="image_request_key" placeholder="이미지 서버의 hook/HashKey.php의 값과 동일하게" value="" />
+                                    <div class="input-group-text">
+                                        <button id="btn_random_generate_key" class="btn btn-secondary" type="button">랜덤 생성</button>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <hr style="width:100%; border-top: 1px solid lightgray;">
+
+                            <div class="form-group row">
+                                <label for="kakao_rest_key" class="col-sm-4 col-form-label">카카오 API Rest Key</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="kakao_rest_key" id="kakao_rest_key" placeholder="카카오톡 API의 Rest Key" value="" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="kakao_admin_key" class="col-sm-4 col-form-label">카카오 API Admin Key</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="kakao_admin_key" id="kakao_admin_key" placeholder="카카오톡 API의 Admin Key" value="" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <div class="col-sm-4"></div>
+                                <div class="col-sm-8">
+                                    <button type="submit" class="btn btn-primary btn-lg btn-block login-button">설정 파일 생성</button>
+                                </div>
+                            </div>
+                        </form>
                    </div>
-                </form>
+                </div>
+                <!--DB 폼 끝-->
+
+                <div class="card" id="admin_form_card" style="display:none">
+                    <h3 class="card-header">
+                        설치(관리자 생성)
+                    </h3>
+                    <div class="card-body">
+                        <form id="admin_form" method="post" action="#">
+                            <div class="form-group row">
+                                <label for="username" class="col-sm-3 col-form-label">계정명</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control" name="username" id="username" placeholder="계정명" />
+                                </div>
+                            </div>
+
+
+                            <div class="form-group row">
+                                <label for="password" class="col-sm-3 col-form-label">비밀번호</label>
+                                <div class="col-sm-9">
+                                    <input type="password" class="form-control" name="password" id="password" placeholder="비밀번호" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="confirm_password" class="col-sm-3 col-form-label">비밀번호 확인</label>
+                                <div class="col-sm-9">
+                                    <input type="password" class="form-control" name="confirm_password" id="confirm_password" placeholder="비밀번호 확인" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="nickname" class="col-sm-3 col-form-label">닉네임</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control" name="nickname" id="nickname" placeholder="닉네임" value="운영자" />
+                                </div>
+                            </div>
+
+                            <input type="hidden" id="global_salt" name="global_salt">
+
+                            <div class="form-group row">
+                                <div class="col-sm-3"></div>
+                                <div class="col-sm-9">
+                                    <button type="submit" class="btn btn-primary btn-lg btn-block login-button">관리자 계정 생성</button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+                <!--ADMIN 폼 끝-->
+
+                <!-- TODO: conf_kakao.php -->
+
            </div>
-        </div><!--DB 폼 끝-->
-
-        <div class="card" id="admin_form_card" style="display:none">
-            <h3 class="card-header">
-                설치(관리자 생성)
-            </h3> 
-            <div class="card-body">
-                <form id="admin_form" method="post" action="#">
-                    <div class="form-group row">
-                        <label for="username" class="col-sm-3 col-form-label">계정명</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="username" id="username"
-                              placeholder="계정명"/>
-                        </div>
-                    </div>
-
-                    
-                    <div class="form-group row">
-                        <label for="password" class="col-sm-3 col-form-label">비밀번호</label>
-                        <div class="col-sm-9">
-                            <input type="password" class="form-control" name="password" id="password" 
-                             placeholder="비밀번호"/>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="confirm_password" class="col-sm-3 col-form-label">비밀번호 확인</label>
-                        <div class="col-sm-9">
-                            <input type="password" class="form-control" name="confirm_password" id="confirm_password" 
-                             placeholder="비밀번호 확인"/>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="nickname" class="col-sm-3 col-form-label">닉네임</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="nickname" id="nickname" 
-                             placeholder="닉네임" value="운영자"/>
-                        </div>
-                    </div>
-
-                    <input type="hidden" id="global_salt" name="global_salt">
-
-                    <div class="form-group row">
-                        <div class="col-sm-3"></div>
-                        <div class="col-sm-9">
-                            <button type="submit"
-                             class="btn btn-primary btn-lg btn-block login-button">관리자 계정 생성</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div><!--ADMIN 폼 끝-->
-
-        <!-- TODO: conf_kakao.php -->
-
-        </div>
        </div>
    </div>
 </body>
-</html>
+
+</html>
@@ -1,33 +1,34 @@
 <?php
+
 namespace sammo;

-require(__dir__.'/../vendor/autoload.php');
+require(__DIR__ . '/../vendor/autoload.php');

 session_start();
 session_destroy();

-$username = mb_strtolower(Util::getReq('username'), 'utf-8');
-$password = Util::getReq('password', 'string');
-$nickname = Util::getReq('nickname');
+$username = mb_strtolower(Util::getPost('username'), 'utf-8');
+$password = Util::getPost('password', 'string');
+$nickname = Util::getPost('nickname');

-if(!$username || !$password || !$nickname){
+if (!$username || !$password || !$nickname) {
    Json::die([
-        'result'=>false,
-        'reason'=>'입력값이 설정되지 않았습니다.'
+        'result' => false,
+        'reason' => '입력값이 설정되지 않았습니다.'
    ]);
 }

-if(strlen((string)$password)!=128){
+if (strlen((string) $password) != 128) {
    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 비밀번호 해시 포맷입니다.'
+        'result' => false,
+        'reason' => '올바르지 않은 비밀번호 해시 포맷입니다.'
    ]);
 }

-if(!class_exists('\\sammo\\RootDB')){
+if (!class_exists('\\sammo\\RootDB')) {
    Json::die([
-        'result'=>false,
-        'reason'=>'DB 설정이 완료되지 않았습니다.'
+        'result' => false,
+        'reason' => 'DB 설정이 완료되지 않았습니다.'
    ]);
 }

@@ -37,42 +38,43 @@ $rootDB = RootDB::db();
 $rootDB->query('LOCK TABLES member WRITE, member_log WRITE');

 $memberCnt = $rootDB->queryFirstField('SELECT count(`NO`) from member');
-if($memberCnt > 0){
+if ($memberCnt > 0) {
    Json::die([
-        'result'=>'false',
-        'reason'=>'이미 계정이 생성되어 있습니다'
+        'result' => 'false',
+        'reason' => '이미 계정이 생성되어 있습니다'
    ]);
 }

 $userSalt = bin2hex(random_bytes(8));
 $finalPassword = Util::hashPassword($userSalt, $password);
-$nowDate = TimeUtil::DatetimeNow();
+$nowDate = TimeUtil::now();

-$rootDB->insert('member',[
+$rootDB->insert('member', [
    'oauth_type' => 'NONE',
    'id' => $username,
    'email' => null,
+    'token_valid_until' => '2999-01-01 00:00:00',
    'pw' => $finalPassword,
    'salt' => $userSalt,
-    'grade'=> 6,
-    'name'=>$nickname,
-    'reg_date'=>$nowDate
+    'grade' => 7,
+    'name' => $nickname,
+    'reg_date' => $nowDate
 ]);
 $userID = $rootDB->insertId();

 $rootDB->insert('member_log', [
-    'member_no'=>$userID,
-    'date'=>$nowDate,
-    'action_type'=>'reg',
-    'action'=>Json::encode([
-        'type'=>'none',
-        'aux'=>'admin',
-        'id'=>$username,
-        'name'=>$nickname
+    'member_no' => $userID,
+    'date' => $nowDate,
+    'action_type' => 'reg',
+    'action' => Json::encode([
+        'type' => 'none',
+        'aux' => 'admin',
+        'id' => $username,
+        'name' => $nickname
    ])
 ]);

 Json::die([
-    'result'=>true,
-    'reason'=>'success'
-]);
+    'result' => true,
+    'reason' => 'success'
+]);
@@ -1,38 +1,37 @@
 <?php
+
 namespace sammo;

-require(__dir__.'/../vendor/autoload.php');
+if(!file_exists(__DIR__ . '/../vendor/autoload.php')){
+    http_response_code(503);
+    die('not_ready');
+}

-if(!class_exists('\\sammo\\RootDB')){
+require(__DIR__ . '/../vendor/autoload.php');
+
+if (!class_exists('\\sammo\\RootDB')) {
    Json::die([
-        'step'=>'config'
+        'step' => 'config'
    ]);
 }

 $rootDB = RootDB::db();

-$rootDB->throw_exception_on_nonsql_error = false;
-$rootDB->nonsql_error_handler = function($params){
+$rootDB->addHook('run_failed', function ($params) {
    Json::die([
-        'step'=>'conn_fail'
+        'step' => 'sql_fail'
    ]);
-};
-
-$rootDB->error_handler = function($params){
-    Json::die([
-        'step'=>'sql_fail'
-    ]);
-};
+});

 $memberCnt = $rootDB->queryFirstField('SELECT count(`NO`) from member');
-if($memberCnt == 0){
+if ($memberCnt == 0) {
    Json::die([
-        'step'=>'admin',
-        'globalSalt'=>RootDB::getGlobalSalt()
+        'step' => 'admin',
+        'globalSalt' => RootDB::getGlobalSalt()
    ]);
 }


 Json::die([
-    'step'=>'done'
-]);
+    'step' => 'done'
+]);
@@ -1,269 +1,305 @@
-<?php
-namespace sammo;
-
-require(__dir__.'/../vendor/autoload.php');
-
-$host = Util::getReq('db_host');
-$port = Util::getReq('db_port', 'int');
-$username = Util::getReq('db_id');
-$password = Util::getReq('db_pw');
-$dbName = Util::getReq('db_name');
-$servHost = Util::getReq('serv_host');
-$sharedIconPath = Util::getReq('shared_icon_path');
-$gameImagePath = Util::getReq('game_image_path');
-
-if (!$host || !$port || !$username || !$password || !$dbName || !$servHost || !$sharedIconPath || !$gameImagePath) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'입력 값이 올바르지 않습니다'
-    ]);
-}
-
-if (!filter_var($servHost, FILTER_VALIDATE_URL)) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'접속 경로가 올바르지 않습니다.'
-    ]);
-}
-
-if (file_exists(ROOT.'/d_setting/RootDB.php') && is_dir(ROOT.'/d_setting/RootDB.php')) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'d_setting/RootDB.php 가 디렉토리입니다'
-    ]);
-}
-
-if (class_exists('\\sammo\\RootDB')) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'이미 RootDB.php 파일이 있습니다'
-    ]);
-}
-
-//파일 권한 검사
-if (file_exists(AppConf::getUserIconPathFS()) && !is_dir(AppConf::getUserIconPathFS())) {
-    Json::die([
-        'result'=>false,
-        'reason'=>AppConf::$userIconPath.' 이 디렉토리가 아닙니다'
-    ]);
-}
-
-if (file_exists(ROOT.'/d_log') && !is_dir(ROOT.'/d_log')) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'d_log 가 디렉토리가 아닙니다'
-    ]);
-}
-
-if (file_exists(ROOT.'/d_shared') && !is_dir(ROOT.'/d_shared')) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'d_shared 가 디렉토리가 아닙니다'
-    ]);
-}
-
-if (file_exists(ROOT.'/d_setting') && !is_dir(ROOT.'/d_setting')) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'d_shared 가 디렉토리가 아닙니다'
-    ]);
-}
-
-if (!file_exists(ROOT.'/d_log')
-    || !file_exists(ROOT.'/d_shared')
-    || !file_exists(ROOT.'/d_setting')
-    || !file_exists(AppConf::getUserIconPathFS())
-) {
-    if (!is_writable(ROOT)) {
-        Json::die([
-            'result'=>false,
-            'reason'=>'하위 디렉토리 생성 권한이 없습니다'
-        ]);
-    }
-
-    //기본 파일 생성
-    if (!file_exists(AppConf::getUserIconPathFS())) {
-        mkdir(AppConf::getUserIconPathFS());
-    }
-
-    if (!file_exists(ROOT.'/d_log')) {
-        mkdir(ROOT.'/d_log');
-    }
-
-    if (!file_exists(ROOT.'/d_setting')) {
-        mkdir(ROOT.'/d_setting');
-    }
-
-    if (!file_exists(ROOT.'/d_shared')) {
-        mkdir(ROOT.'/d_shared');
-    }
-}
-
-
-if (!is_writable(AppConf::getUserIconPathFS())) {
-    Json::die([
-        'result'=>false,
-        'reason'=>AppConf::$userIconPath.' 디렉토리의 쓰기 권한이 없습니다'
-    ]);
-}
-
-if (!is_writable(ROOT.'/d_log')) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'d_log 디렉토리의 쓰기 권한이 없습니다'
-    ]);
-}
-
-if (!is_writable(ROOT.'/d_shared')) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'d_shared 디렉토리의 쓰기 권한이 없습니다'
-    ]);
-}
-
-if (!is_writable(ROOT.'/d_setting')) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'d_setting 디렉토리의 쓰기 권한이 없습니다.'
-    ]);
-}
-
-
-
-if (!file_exists(ROOT.'/d_log/.htaccess')) {
-    @file_put_contents(ROOT.'/d_log/.htaccess', 'Deny from  all');
-}
-
-if (!file_exists(ROOT.'/d_setting/.htaccess')) {
-    @file_put_contents(ROOT.'/d_setting/.htaccess', 'Deny from  all');
-}
-
-//DB 접근 권한 검사
-
-$rootDB = new \MeekroDB($host, $username, $password, $dbName, $port, 'utf8mb4');
-$rootDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
-
-$rootDB->throw_exception_on_nonsql_error = false;
-$rootDB->nonsql_error_handler = function ($params) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'DB 접속에 실패했습니다.'
-    ]);
-};
-
-$rootDB->error_handler = function ($params) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'SQL을 제대로 실행하지 못했습니다. DB상태를 확인해 주세요.'
-    ]);
-};
-
-$mysqli_obj = $rootDB->get(); //로그인에 실패할 경우 자동으로 dbConnFail()이 실행됨.
-
-if ($mysqli_obj->multi_query(file_get_contents(__dir__.'/sql/common_schema.sql'))) {
-    while (true) {
-        if (!$mysqli_obj->more_results()) {
-            break;
-        }
-        if (!$mysqli_obj->next_result()) {
-            break;
-        }
-    }
-}
-
-$rootDB->insert('system', array(
-    'REG'     => 'N',
-    'LOGIN'    => 'N',
-    'CRT_DATE' => TimeUtil::DatetimeNow(),
-    'MDF_DATE' => TimeUtil::DatetimeNow()
-));
-
-$globalSalt = bin2hex(random_bytes(16));
-
-'@phan-var-force string $servHost';
-'@phan-var-force string $sharedIconPath';
-'@phan-var-force string $gameImagePath';
-
-$sharedIconPath = WebUtil::resolveRelativePath($sharedIconPath, $servHost);
-$gameImagePath = WebUtil::resolveRelativePath($gameImagePath, $servHost);
-
-$result = Util::generateFileUsingSimpleTemplate(
-    __dir__.'/templates/ServConfig.orig.php',
-    ROOT.'/d_setting/ServConfig.php',
-    [
-        'serverBasePath'=>$servHost,
-        'sharedIconPath'=>$sharedIconPath,
-        'gameImagePath'=>$gameImagePath
-    ],
-    true
-);
-
-if ($result !== true) {
-    Json::die([
-        'result'=>false,
-        'reason'=>$result
-    ]);
-}
-
-$result = Util::generateFileUsingSimpleTemplate(
-    __dir__.'/templates/common_path.orig.js',
-    ROOT.'/d_shared/common_path.js',
-    [
-        'serverBasePath'=>$servHost,
-        'sharedIconPath'=>$sharedIconPath,
-        'gameImagePath'=>$gameImagePath
-    ],
-    true
-);
-
-if ($result !== true) {
-    Json::die([
-        'result'=>false,
-        'reason'=>$result
-    ]);
-}
-
-
-$result = Util::generateFileUsingSimpleTemplate(
-    __dir__.'/templates/common.orig.css',
-    ROOT.'/d_shared/common.css',
-    [
-        'serverBasePath'=>$servHost,
-        'sharedIconPath'=>$sharedIconPath,
-        'gameImagePath'=>$gameImagePath
-    ],
-    true
-);
-
-if ($result !== true) {
-    Json::die([
-        'result'=>false,
-        'reason'=>$result
-    ]);
-}
-
-
-$result = Util::generateFileUsingSimpleTemplate(
-    __dir__.'/templates/RootDB.orig.php',
-    ROOT.'/d_setting/RootDB.php',
-    [
-        'host'=>$host,
-        'user'=>$username,
-        'password'=>$password,
-        'dbName'=>$dbName,
-        'port'=>$port,
-        'globalSalt'=>$globalSalt,
-    ]
-);
-
-if ($result !== true) {
-    Json::die([
-        'result'=>false,
-        'reason'=>$result
-    ]);
-}
-
-Json::die([
-    'result'=>true,
-    'reason'=>'success'
-]);
+<?php
+
+namespace sammo;
+
+require(__DIR__ . '/../vendor/autoload.php');
+
+$host = Util::getPost('db_host');
+$port = Util::getPost('db_port', 'int');
+$username = Util::getPost('db_id');
+$password = Util::getPost('db_pw');
+$dbName = Util::getPost('db_name');
+$servHost = Util::getPost('serv_host');
+$sharedIconPath = Util::getPost('shared_icon_path');
+$gameImagePath = Util::getPost('game_image_path');
+$imageRequestKey = Util::getPost('image_request_key');
+
+$kakaoRESTKey = Util::getPost('kakao_rest_key', 'string', '');
+$kakaoAdminKey = Util::getPost('kakao_admin_key', 'string', '');
+
+
+if (!$host || !$port || !$username || !$password || !$dbName || !$servHost || !$sharedIconPath || !$gameImagePath) {
+    Json::die([
+        'result' => false,
+        'reason' => '입력 값이 올바르지 않습니다'
+    ]);
+}
+
+if (!filter_var($servHost, FILTER_VALIDATE_URL)) {
+    Json::die([
+        'result' => false,
+        'reason' => '접속 경로가 올바르지 않습니다.'
+    ]);
+}
+
+if (file_exists(ROOT . '/d_setting/RootDB.php') && is_dir(ROOT . '/d_setting/RootDB.php')) {
+    Json::die([
+        'result' => false,
+        'reason' => 'd_setting/RootDB.php 가 디렉토리입니다'
+    ]);
+}
+
+if (class_exists('\\sammo\\RootDB')) {
+    Json::die([
+        'result' => false,
+        'reason' => '이미 RootDB.php 파일이 있습니다'
+    ]);
+}
+
+//파일 권한 검사
+if (file_exists(AppConf::getUserIconPathFS()) && !is_dir(AppConf::getUserIconPathFS())) {
+    Json::die([
+        'result' => false,
+        'reason' => AppConf::$userIconPath . ' 이 디렉토리가 아닙니다'
+    ]);
+}
+
+if (file_exists(ROOT . '/d_log') && !is_dir(ROOT . '/d_log')) {
+    Json::die([
+        'result' => false,
+        'reason' => 'd_log 가 디렉토리가 아닙니다'
+    ]);
+}
+
+if (file_exists(ROOT . '/d_shared') && !is_dir(ROOT . '/d_shared')) {
+    Json::die([
+        'result' => false,
+        'reason' => 'd_shared 가 디렉토리가 아닙니다'
+    ]);
+}
+
+if (file_exists(ROOT . '/d_setting') && !is_dir(ROOT . '/d_setting')) {
+    Json::die([
+        'result' => false,
+        'reason' => 'd_shared 가 디렉토리가 아닙니다'
+    ]);
+}
+
+if (
+    !file_exists(ROOT . '/d_log')
+    || !file_exists(ROOT . '/d_shared')
+    || !file_exists(ROOT . '/d_setting')
+    || !file_exists(AppConf::getUserIconPathFS())
+) {
+    if (!is_writable(ROOT)) {
+        Json::die([
+            'result' => false,
+            'reason' => '하위 디렉토리 생성 권한이 없습니다'
+        ]);
+    }
+
+    //기본 파일 생성
+    if (!file_exists(AppConf::getUserIconPathFS())) {
+        mkdir(AppConf::getUserIconPathFS(), 0775);
+    }
+
+    if (!file_exists(ROOT . '/d_log')) {
+        mkdir(ROOT . '/d_log', 0775);
+    }
+
+    if (!file_exists(ROOT . '/d_setting')) {
+        mkdir(ROOT . '/d_setting', 0775);
+    }
+
+    if (!file_exists(ROOT . '/d_shared')) {
+        mkdir(ROOT . '/d_shared', 0775);
+    }
+}
+
+
+if (!is_writable(AppConf::getUserIconPathFS())) {
+    Json::die([
+        'result' => false,
+        'reason' => AppConf::$userIconPath . ' 디렉토리의 쓰기 권한이 없습니다'
+    ]);
+}
+
+if (!is_writable(ROOT . '/d_log')) {
+    Json::die([
+        'result' => false,
+        'reason' => 'd_log 디렉토리의 쓰기 권한이 없습니다'
+    ]);
+}
+
+if (!is_writable(ROOT . '/d_shared')) {
+    Json::die([
+        'result' => false,
+        'reason' => 'd_shared 디렉토리의 쓰기 권한이 없습니다'
+    ]);
+}
+
+if (!is_writable(ROOT . '/d_setting')) {
+    Json::die([
+        'result' => false,
+        'reason' => 'd_setting 디렉토리의 쓰기 권한이 없습니다.'
+    ]);
+}
+
+
+
+if (!file_exists(ROOT . '/d_log/.htaccess')) {
+    @file_put_contents(ROOT . '/d_log/.htaccess', 'Deny from  all');
+}
+
+if (!file_exists(ROOT . '/d_setting/.htaccess')) {
+    @file_put_contents(ROOT . '/d_setting/.htaccess', 'Deny from  all');
+}
+
+//DB 접근 권한 검사
+
+$rootDB = new \MeekroDB($host, $username, $password, $dbName, $port, 'utf8mb4');
+$rootDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
+
+$rootDB->addHook('run_failed', function ($args) {
+    Json::die([
+        'result' => false,
+        'reason' => '에러.'. $args['error']
+    ]);
+});
+
+$mysqli_obj = $rootDB->get(); //로그인에 실패할 경우 자동으로 dbConnFail()이 실행됨.
+
+if ($mysqli_obj->multi_query(file_get_contents(__DIR__ . '/sql/common_schema.sql'))) {
+    while (true) {
+        if (!$mysqli_obj->more_results()) {
+            break;
+        }
+        if (!$mysqli_obj->next_result()) {
+            break;
+        }
+    }
+}
+
+$rootDB->insert('system', array(
+    'REG'     => 'N',
+    'LOGIN'    => 'N',
+    'CRT_DATE' => TimeUtil::now(),
+    'MDF_DATE' => TimeUtil::now()
+));
+
+$globalSalt = bin2hex(random_bytes(16));
+
+'@phan-var-force string $servHost';
+'@phan-var-force string $sharedIconPath';
+'@phan-var-force string $gameImagePath';
+
+$sharedIconPath = WebUtil::resolveRelativePath($sharedIconPath, $servHost);
+$gameImagePath = WebUtil::resolveRelativePath($gameImagePath, $servHost);
+$imageRequestPath = WebUtil::resolveRelativePath($gameImagePath . '/../hook/git_pull.php', $servHost);
+$imageKeyInstallPath = WebUtil::resolveRelativePath($gameImagePath . '/../hook/InstallKey.php', $servHost);
+
+$result = Util::generateFileUsingSimpleTemplate(
+    __DIR__ . '/templates/ServConfig.orig.php',
+    ROOT . '/d_setting/ServConfig.php',
+    [
+        'serverBasePath' => $servHost,
+        'sharedIconPath' => $sharedIconPath,
+        'gameImagePath' => $gameImagePath,
+        'imageRequestPath' => $imageRequestPath,
+        'imageRequestKey' => $imageRequestKey,
+        'serverList' => [
+            ['che', '체', 'white'],
+            ['kwe', '퀘', 'yellow'],
+            ['pwe', '풰', 'orange'],
+            ['twe', '퉤', 'magenta'],
+            ['nya', '냐', '#e67e22'],
+            ['pya', '퍄', '#9b59b6']
+        ]
+    ],
+    true
+);
+
+if ($imageRequestKey) {
+    @file_get_contents($imageKeyInstallPath . '?key=' . $imageRequestKey);
+}
+
+if ($result !== true) {
+    Json::die([
+        'result' => false,
+        'reason' => $result
+    ]);
+}
+
+$result = Util::generateFileUsingSimpleTemplate(
+    __DIR__ . '/templates/common_path.orig.js',
+    ROOT . '/d_shared/common_path.js',
+    [
+        'serverBasePath' => $servHost,
+        'sharedIconPath' => $sharedIconPath,
+        'gameImagePath' => $gameImagePath
+    ],
+    true
+);
+
+$result = Util::generateFileUsingSimpleTemplate(
+    __DIR__ . '/templates/menu.orig.json',
+    ROOT . '/d_shared/menu.json',
+    [],
+    true
+);
+
+if ($result !== true) {
+    Json::die([
+        'result' => false,
+        'reason' => $result
+    ]);
+}
+
+
+$result = Util::generateFileUsingSimpleTemplate(
+    __DIR__ . '/templates/common.orig.css',
+    ROOT . '/d_shared/common.css',
+    [
+        'serverBasePath' => $servHost,
+        'sharedIconPath' => $sharedIconPath,
+        'gameImagePath' => $gameImagePath
+    ],
+    true
+);
+
+if ($result !== true) {
+    Json::die([
+        'result' => false,
+        'reason' => $result
+    ]);
+}
+
+
+$result = Util::generateFileUsingSimpleTemplate(
+    __DIR__ . '/templates/RootDB.orig.php',
+    ROOT . '/d_setting/RootDB.php',
+    [
+        'host' => $host,
+        'user' => $username,
+        'password' => $password,
+        'dbName' => $dbName,
+        'port' => $port,
+        'globalSalt' => $globalSalt,
+    ]
+);
+
+$kakaoRedirectURI = WebUtil::resolveRelativePath('oauth_kakao/oauth.php', $servHost . '/');
+
+Util::generateFileUsingSimpleTemplate(
+    __DIR__ . '/templates/KakaoKey.orig.php',
+    ROOT . '/d_setting/KakaoKey.php',
+    [
+        'REST_API_KEY' => $kakaoRESTKey,
+        'ADMIN_KEY' => $kakaoAdminKey,
+        'REDIRECT_URI' => $kakaoRedirectURI
+    ],
+    true
+);
+
+if ($result !== true) {
+    Json::die([
+        'result' => false,
+        'reason' => $result
+    ]);
+}
+
+Json::die([
+    'result' => true,
+    'reason' => 'success',
+    'globalSalt' => $globalSalt
+]);
@@ -0,0 +1,114 @@
+<?php
+
+namespace sammo;
+
+require(__DIR__ . '/../vendor/autoload.php');
+
+$session = Session::requireLogin([])->setReadOnly();
+if ($session->userGrade < 6) {
+    Json::die([
+        'result' => false,
+        'reason' => '관리자 아님'
+    ]);
+}
+
+$servHost = Util::getPost('serv_host');
+$sharedIconPath = Util::getPost('shared_icon_path');
+$gameImagePath = Util::getPost('game_image_path');
+
+if ($servHost) {
+    if (!$sharedIconPath || $gameImagePath) {
+        Json::die([
+            'result' => false,
+            'reason' => 'serv_host가 지정된 경우, sharedIconPath와 gameImagePath가 모두 지정되어야합니다.'
+        ]);
+    }
+
+    $sharedIconPath = WebUtil::resolveRelativePath($sharedIconPath, $servHost);
+    $gameImagePath = WebUtil::resolveRelativePath($gameImagePath, $servHost);
+
+    $result = Util::generateFileUsingSimpleTemplate(
+        __DIR__ . '/templates/ServConfig.orig.php',
+        ROOT . '/d_setting/ServConfig.php',
+        [
+            'serverBasePath' => $servHost,
+            'sharedIconPath' => $sharedIconPath,
+            'gameImagePath' => $gameImagePath
+        ],
+        true
+    );
+
+    if ($result !== true) {
+        Json::die([
+            'result' => false,
+            'reason' => $result
+        ]);
+    }
+} else if ($sharedIconPath || $gameImagePath) {
+    $servHost = ServConfig::$serverWebPath;
+    if ($sharedIconPath) {
+        $sharedIconPath = WebUtil::resolveRelativePath($sharedIconPath, $servHost);
+    } else {
+        $sharedIconPath = ServConfig::$sharedIconPath;
+    }
+
+    if ($gameImagePath) {
+        $gameImagePath = WebUtil::resolveRelativePath($gameImagePath, $servHost);
+    } else {
+        $gameImagePath = ServConfig::$gameImagePath;
+    }
+
+    $result = Util::generateFileUsingSimpleTemplate(
+        __DIR__ . '/templates/ServConfig.orig.php',
+        ROOT . '/d_setting/ServConfig.php',
+        [
+            'serverBasePath' => $servHost,
+            'sharedIconPath' => $sharedIconPath,
+            'gameImagePath' => $gameImagePath
+        ],
+        true
+    );
+
+    if ($result !== true) {
+        Json::die([
+            'result' => false,
+            'reason' => $result
+        ]);
+    }
+} else {
+    $servHost = ServConfig::$serverWebPath;
+    $sharedIconPath = ServConfig::$sharedIconPath;
+    $gameImagePath = ServConfig::$gameImagePath;
+}
+
+
+
+$result = Util::generateFileUsingSimpleTemplate(
+    __DIR__ . '/templates/common_path.orig.js',
+    ROOT . '/d_shared/common_path.js',
+    [
+        'serverBasePath' => $servHost,
+        'sharedIconPath' => $sharedIconPath,
+        'gameImagePath' => $gameImagePath
+    ],
+    true
+);
+
+
+$result = Util::generateFileUsingSimpleTemplate(
+    __DIR__ . '/templates/common.orig.css',
+    ROOT . '/d_shared/common.css',
+    [
+        'serverBasePath' => $servHost,
+        'sharedIconPath' => $sharedIconPath,
+        'gameImagePath' => $gameImagePath
+    ],
+    true
+);
+
+if ($result !== true) {
+    Json::die([
+        'result' => false,
+        'reason' => $result
+    ]);
+}
@@ -0,0 +1,17 @@
+CREATE TABLE IF NOT EXISTS "api_log" (
+	"id"	INTEGER NOT NULL,
+	"user_id"	INTEGER NOT NULL,
+	"ip"	TEXT NOT NULL,
+	"date"	TEXT NOT NULL,
+	"path"	TEXT NOT NULL,
+	"arg"	TEXT,
+	"aux"	TEXT,
+	PRIMARY KEY("id" AUTOINCREMENT)
+);
+CREATE INDEX IF NOT EXISTS "by_date" ON "api_log" (
+	"date"	DESC
+);
+CREATE INDEX IF NOT EXISTS "by_user" ON "api_log" (
+	"user_id"	ASC,
+	"date"	DESC
+);
@@ -14,20 +14,25 @@ CREATE TABLE `system` (
 	`MDF_DATE` DATETIME NULL DEFAULT NULL,
 	PRIMARY KEY (`NO`)
 )
-ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+ENGINE=Aria DEFAULT CHARSET=utf8mb4;

 -- 회원 테이블
 CREATE TABLE `member` (
 	`NO` INT(11) NOT NULL AUTO_INCREMENT,
 	`oauth_id` BIGINT(20) NULL DEFAULT NULL,
-	`oauth_type` ENUM('NONE','KAKAO') NOT NULL,
 	`ID` VARCHAR(64) NOT NULL,
 	`EMAIL` VARCHAR(64) NULL DEFAULT NULL,
+	`oauth_type` ENUM('NONE','KAKAO') NOT NULL,
+	`oauth_info` TEXT NOT NULL DEFAULT '{}',
+	`token_valid_until` DATETIME NULL DEFAULT NULL,
 	`PW` CHAR(128) NOT NULL,
 	`salt` CHAR(16) NOT NULL,
+	`third_use` INT(1) NOT NULL DEFAULT '0',
 	`NAME` VARCHAR(64) NOT NULL,
 	`PICTURE` VARCHAR(64) NULL DEFAULT 'default.jpg',
 	`IMGSVR` INT(1) NULL DEFAULT '0',
+	`acl` TEXT NOT NULL DEFAULT '{}' COLLATE 'utf8mb4_bin',
+	`penalty` TEXT NOT NULL DEFAULT '{}' COLLATE 'utf8mb4_bin',
 	`GRADE` INT(1) NULL DEFAULT '1',
 	`REG_NUM` INT(3) NULL DEFAULT '0',
 	`REG_DATE` DATETIME NOT NULL,
@@ -38,9 +43,12 @@ CREATE TABLE `member` (
 	UNIQUE INDEX `ID` (`ID`),
 	UNIQUE INDEX `EMAIL` (`EMAIL`),
 	UNIQUE INDEX `kauth_id` (`oauth_id`),
-	INDEX `delete_after` (`delete_after`)
+	INDEX `delete_after` (`delete_after`),
+	CONSTRAINT `json1` CHECK (json_valid(`acl`)),
+	CONSTRAINT `json2` CHECK (json_valid(`penalty`))
 )
-ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+COLLATE='utf8mb4_general_ci'
+ENGINE=Aria;

 -- 로그인 로그 테이블
 CREATE TABLE `member_log` (
@@ -48,9 +56,50 @@ CREATE TABLE `member_log` (
 	`member_no` INT(11) NOT NULL,
 	`date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	`action_type` ENUM('reg','try_login','login','logout','oauth','change_pw','make_general','access_server','delete') NOT NULL,
-	`action` TEXT NULL DEFAULT NULL COMMENT 'JSON',
+	`action` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_bin',
 	PRIMARY KEY (`id`),
 	INDEX `action` (`member_no`, `action_type`, `date`),
-	INDEX `member` (`member_no`, `date`)
+	INDEX `member` (`member_no`, `date`),
+	CONSTRAINT `json` CHECK (json_valid(`action`))
 )
-ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+COLLATE='utf8mb4_general_ci'
+ENGINE=Aria;
+
+###################
+# KV storage
+###################
+CREATE TABLE if not exists `storage` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`namespace` VARCHAR(40) NOT NULL,
+	`key` VARCHAR(40) NOT NULL,
+	`value` TEXT NOT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE INDEX `key` (`namespace`, `key`),
+	CONSTRAINT `json` CHECK (json_valid(`value`))
+)
+COLLATE='utf8mb4_bin'
+ENGINE=Aria;
+
+CREATE TABLE `login_token` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`user_id` INT(11) NOT NULL,
+	`base_token` VARCHAR(20) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`reg_ip` VARCHAR(40) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`reg_date` DATETIME NOT NULL,
+	`expire_date` DATETIME NOT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE INDEX `by_token` (`base_token`),
+	INDEX `by_date` (`user_id`, `expire_date`)
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE=Aria;
+
+CREATE TABLE `banned_member` (
+	`no` INT NOT NULL AUTO_INCREMENT,
+	`hashed_email` VARCHAR(128) NOT NULL COLLATE 'utf8mb4_general_ci' COMMENT 'SHA512(salt | email | salt )',
+	`info` TEXT NULL COLLATE 'utf8mb4_general_ci' COMMENT '부가정보',
+	PRIMARY KEY (`no`),
+	UNIQUE INDEX `email` (`hashed_email`(128))
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE = Aria;
@@ -0,0 +1,12 @@
+CREATE TABLE IF NOT EXISTS `err_log` (
+	`id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	`date`	TEXT NOT NULL,
+	`err`	TEXT NOT NULL,
+	`errstr`	TEXT NOT NULL,
+	`errpath`  TEXT NOT NULL,
+	`trace`	TEXT NOT NULL,
+	`webuser`  TEXT NULL
+);
+CREATE INDEX IF NOT EXISTS `date` ON `err_log` (
+	`date`	DESC
+);
@@ -1,6 +1,7 @@
 <?php
 namespace kakao;

+// @suppress PhanRedefineClass
 class KakaoKey{
    const REST_KEY = '_tK_REST_API_KEY_';
    const ADMIN_KEY = '_tK_ADMIN_KEY_';
@@ -1,9 +1,16 @@
 <?php
+
 namespace sammo;

+//https://hub.packtpub.com/eloquent-without-laravel/
+use Illuminate\Database\Capsule\Manager as Capsule;
+use Illuminate\Events\Dispatcher;
+use Illuminate\Container\Container;
+
 class RootDB
 {
    private static $uDB = null;
+    private static ?Capsule $uIlluminate = null;

    private static $host = '_tK_host_';
    private static $user = '_tK_user_';
@@ -11,6 +18,8 @@ class RootDB
    private static $dbName = '_tK_dbName_';
    private static $port = _tK_port_;
    private static $encoding = 'utf8mb4';
+    private static $collation = 'utf8mb4_general_ci';
+

    private static $globalSalt = '_tK_globalSalt_';

@@ -18,6 +27,29 @@ class RootDB
    {
    }

+    public static function illuminate(): Capsule
+    {
+        if(self::$uIlluminate !== null){
+            return self::$uIlluminate;
+        }
+        $capsule = new Capsule;
+
+        $capsule->addConnection([
+            'driver'   => 'mysql',
+            'host'     => self::$host,
+            'database' => self::$dbName,
+            'username' => self::$user,
+            'password' => self::$password,
+            'charset'   => self::$encoding,
+            'collation' => self::$collation,
+        ], 'root');
+
+        $capsule->setEventDispatcher(new Dispatcher(new Container));
+        $capsule->bootEloquent();
+        self::$uIlluminate = $capsule;
+        return $capsule;
+    }
+
    /**
     * DB 객체 생성
     *
@@ -29,10 +61,6 @@ class RootDB
        if (self::$uDB === null) {
            self::$uDB = new \MeekroDB(self::$host, self::$user, self::$password, self::$dbName, self::$port, self::$encoding);
            self::$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
-
-            self::$uDB->error_handler= function(){};
-            self::$uDB->throw_exception_on_error = true;
-            self::$uDB->throw_exception_on_nonsql_error = true;
        }
        return self::$uDB;
    }
@@ -1,45 +1,74 @@
-<?php
-namespace sammo;
-
-class ServConfig
-{
-    private function __construct()
-    {
-    }
-
-    public static $serverWebPath = '_tK_serverBasePath_';
-    public static $sharedIconPath = '_tK_sharedIconPath_';
-    public static $gameImagePath = "_tK_gameImagePath_";
-
-    public static function getSharedIconPath(string $filepath='') : string
-    {
-        if($filepath){
-            return static::$sharedIconPath."/{$filepath}";
-        }
-        return static::$sharedIconPath;
-    }
-    
-    public static function getUserIconPath(string $filepath='') : string
-    {
-        return AppConf::getUserIconPathWeb($filepath);
-    }
-
-    public static function getGameImagePath(string $filepath='') : string
-    {
-        if($filepath){
-            return static::$gameImagePath."/{$filepath}";
-        }
-        return static::$gameImagePath;
-    }
-
-
-    /**
-     * 서버 주소 반환. 서버의 경로가 하부 디렉토리인 경우에 하부 디렉토리까지 포함
-     *
-     * @return string
-     */
-    public static function getServerBasepath() : string
-    {
-        return self::$serverWebPath;
-    }
-}
+<?php
+
+namespace sammo;
+
+class ServConfig
+{
+    private function __construct()
+    {
+    }
+
+    public static $serverWebPath = '_tK_serverBasePath_';
+    public static $sharedIconPath = '_tK_sharedIconPath_';
+    public static $gameImagePath = "_tK_gameImagePath_";
+    public static $imageRequestPath = "_tK_imageRequestPath_";
+    public static $imageRequestKey = '_tK_imageRequestKey_';
+    private static $serverList = null;
+
+    public static function getSharedIconPath(string $filepath = ''): string
+    {
+        if ($filepath) {
+            return static::$sharedIconPath . "/{$filepath}";
+        }
+        return static::$sharedIconPath;
+    }
+
+    public static function getUserIconPath(string $filepath = ''): string
+    {
+        return AppConf::getUserIconPathWeb($filepath);
+    }
+
+    public static function getGameImagePath(string $filepath = ''): string
+    {
+        if ($filepath) {
+            return static::$gameImagePath . "/{$filepath}";
+        }
+        return static::$gameImagePath;
+    }
+
+    public static function getImagePullURI(): string
+    {
+        $now = time();
+        $req_hash = Util::hashPassword(sprintf("%016x", $now), static::$imageRequestKey);
+        return static::$imageRequestPath . "?req={$req_hash}&time={$now}";
+    }
+
+    /**
+     * 서버 설정 반환
+     *
+     * @return \sammo\Setting[]
+     */
+    public static function getServerList(): array{
+        $servKeyList = [/*_tK_serverList_*/];
+        $servKeyList[] = ['hwe', '훼', 'red'];
+
+        if (self::$serverList === null) {
+            self::$serverList = [];
+            foreach($servKeyList as [$servKey, $servNick, $servColor]){
+                self::$serverList[$servKey] = new Setting(ROOT.'/'.$servKey, $servNick, $servColor);
+            }
+        }
+        return self::$serverList;
+    }
+
+
+    /**
+     * 서버 주소 반환. 서버의 경로가 하부 디렉토리인 경우에 하부 디렉토리까지 포함
+     *
+     * @return string
+     */
+    public static function getServerBasepath(): string
+    {
+        return self::$serverWebPath;
+    }
+}
@@ -6,53 +6,220 @@

 .img_back {background-image:url('_tK_gameImagePath_/back.jpg'); }

-/* 레거시. */
-#bg0    { background-image:url('_tK_gameImagePath_/back_walnut.jpg'); }
-#bg1    { background-image:url('_tK_gameImagePath_/back_green.jpg'); }
-#bg2    { background-image:url('_tK_gameImagePath_/back_blue.jpg'); }
-
 .map_detail .map_title{
    background:
-        url('_tK_gameImagePath_/ltitle.jpg') no-repeat left, 
+        url('_tK_gameImagePath_/ltitle.jpg') no-repeat left,
        url('_tK_gameImagePath_/rtitle.jpg') no-repeat right;
 }

 .map_detail.map_spring .map_title_text{
    background:
-        url('_tK_gameImagePath_/ad.gif') no-repeat left, 
+        url('_tK_gameImagePath_/ad.gif') no-repeat left,
        url('_tK_gameImagePath_/spring.gif') no-repeat right;
 }

 .map_detail.map_summer .map_title_text{
    background:
-        url('_tK_gameImagePath_/ad.gif') no-repeat left, 
+        url('_tK_gameImagePath_/ad.gif') no-repeat left,
        url('_tK_gameImagePath_/summer.gif') no-repeat right;
 }

 .map_detail.map_fall .map_title_text{
    background:
-        url('_tK_gameImagePath_/ad.gif') no-repeat left, 
+        url('_tK_gameImagePath_/ad.gif') no-repeat left,
        url('_tK_gameImagePath_/fall.gif') no-repeat right;
 }

 .map_detail.map_winter .map_title_text{
    background:
-        url('_tK_gameImagePath_/ad.gif') no-repeat left, 
+        url('_tK_gameImagePath_/ad.gif') no-repeat left,
        url('_tK_gameImagePath_/winter.gif') no-repeat right;
 }

-.map_spring .map_body{
-    background: url('_tK_gameImagePath_/map1.jpg') no-repeat;
+/*체 지도*/
+.map_theme_che.map_spring .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_spring.jpg') no-repeat;
 }

-.map_summer .map_body{
-    background: url('_tK_gameImagePath_/map2.jpg') no-repeat;
+.map_theme_che.map_summer .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_summer.jpg') no-repeat;
 }

-.map_fall .map_body{
-    background: url('_tK_gameImagePath_/map3.jpg') no-repeat;
+.map_theme_che.map_fall .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_fall.jpg') no-repeat;
 }

-.map_winter .map_body{
-    background: url('_tK_gameImagePath_/map4.jpg') no-repeat;
-}
+.map_theme_che.map_winter .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_winter.jpg') no-repeat;
+}
+
+.map_theme_che .map_bgroad{
+    background: url('_tK_gameImagePath_/map/che/che_road.png') no-repeat;
+}
+
+/*미니체 지도*/
+.map_theme_miniche.map_spring .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_spring.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche.map_summer .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_summer.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche.map_fall .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_fall.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche.map_winter .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_winter.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche .map_bgroad{
+    background: url('_tK_gameImagePath_/map/che/miniche_road.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+
+/*미니체 지도*/
+.map_theme_miniche_b.map_spring .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_spring.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b.map_summer .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_summer.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b.map_fall .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_fall.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b.map_winter .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_winter.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b .map_bgroad{
+    background: url('_tK_gameImagePath_/map/che/miniche_road.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+/*미니체 지도*/
+.map_theme_miniche_clean.map_spring .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_spring.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_summer .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_summer.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_fall .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_fall.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_winter .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_winter.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean .map_bgroad{
+    background: url('_tK_gameImagePath_/map/che/miniche_road.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+/*루드라사움 지도*/
+.map_theme_ludo_rathowm .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/ludo_rathowm/back.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_ludo_rathowm .map_bgroad{
+    background: url('_tK_gameImagePath_/map/ludo_rathowm/road.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+.world_map.map_theme_ludo_rathowm .map_title .map_title_text::before {
+    color:white;
+    content:'LP';
+    margin-right:1ch;
+}
+
+/*체스판 지도*/
+.map_theme_chess .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/chess/chessboard.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+
+/*포켓몬 v1 지도*/
+.map_theme_pokemon_v1 .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/pokemon_v1/back_pal8.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+/*CR 지도*/
+.map_theme_cr .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/cr/bg-fs8.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_cr.map_detail .city_base .city_bg {
+    background-image: none !important;
+    width: 39.5px !important;
+    height: 39.5px !important;
+    left: 1px !important;
+    top: -4px !important;
+    opacity: 0.5;
+}
+
+.map_theme_cr.map_detail.small_width_map .city_base .city_bg {
+    background-image: none !important;
+    width: 28.5px !important;
+    height: 28.5px !important;
+    left: 6px !important;
+    top: 4px !important;
+    opacity: 0.5;
+}
+
+.map_theme_cr.map_detail .city_bg.bFF0000 { background-color: #FF0000; }
+.map_theme_cr.map_detail .city_bg.b800000 { background-color: #800000; }
+.map_theme_cr.map_detail .city_bg.bA0522D { background-color: #A0522D; }
+.map_theme_cr.map_detail .city_bg.bFF6347 { background-color: #FF6347; }
+.map_theme_cr.map_detail .city_bg.bFFA500 { background-color: #FFA500; }
+.map_theme_cr.map_detail .city_bg.bFFDAB9 { background-color: #FFDAB9; }
+.map_theme_cr.map_detail .city_bg.bFFD700 { background-color: #FFD700; }
+.map_theme_cr.map_detail .city_bg.bFFFF00 { background-color: #FFFF00; }
+.map_theme_cr.map_detail .city_bg.b7CFC00 { background-color: #7CFC00; }
+.map_theme_cr.map_detail .city_bg.b00FF00 { background-color: #00FF00; }
+.map_theme_cr.map_detail .city_bg.b808000 { background-color: #808000; }
+.map_theme_cr.map_detail .city_bg.b008000 { background-color: #008000; }
+.map_theme_cr.map_detail .city_bg.b2E8B57 { background-color: #2E8B57; }
+.map_theme_cr.map_detail .city_bg.b008080 { background-color: #008080; }
+.map_theme_cr.map_detail .city_bg.b20B2AA { background-color: #20B2AA; }
+.map_theme_cr.map_detail .city_bg.b6495ED { background-color: #6495ED; }
+.map_theme_cr.map_detail .city_bg.b7FFFD4 { background-color: #7FFFD4; }
+.map_theme_cr.map_detail .city_bg.bAFEEEE { background-color: #AFEEEE; }
+.map_theme_cr.map_detail .city_bg.b87CEEB { background-color: #87CEEB; }
+.map_theme_cr.map_detail .city_bg.b00FFFF { background-color: #00FFFF; }
+.map_theme_cr.map_detail .city_bg.b00BFFF { background-color: #00BFFF; }
+.map_theme_cr.map_detail .city_bg.b0000FF { background-color: #0000FF; }
+.map_theme_cr.map_detail .city_bg.b000080 { background-color: #000080; }
+.map_theme_cr.map_detail .city_bg.b483D8B { background-color: #483D8B; }
+.map_theme_cr.map_detail .city_bg.b7B68EE { background-color: #7B68EE; }
+.map_theme_cr.map_detail .city_bg.bBA55D3 { background-color: #BA55D3; }
+.map_theme_cr.map_detail .city_bg.b800080 { background-color: #800080; }
+.map_theme_cr.map_detail .city_bg.bFF00FF { background-color: #FF00FF; }
+.map_theme_cr.map_detail .city_bg.bFFC0CB { background-color: #FFC0CB; }
+.map_theme_cr.map_detail .city_bg.bF5F5DC { background-color: #F5F5DC; }
+.map_theme_cr.map_detail .city_bg.bE0FFFF { background-color: #E0FFFF; }
+.map_theme_cr.map_detail .city_bg.bFFFFFF { background-color: #FFFFFF; }
+.map_theme_cr.map_detail .city_bg.bA9A9A9 { background-color: #A9A9A9; }
@@ -0,0 +1,8 @@
+[
+    ["/bbs/board", "삼모게시판", "_blank"],
+    ["/bbs/tip", "팁/강좌", "_blank"],
+    ["/bbs/news", "삼국 일보", "_blank"],
+    ["/bbs/history2", "개인 열전", "_blank"],
+    ["/bbs/history3", "국가 열전", "_blank"],
+    ["/bbs/patch", "패치 내역", "_blank"]
+]
@@ -1,30 +0,0 @@
-<?php
-namespace sammo;
-
-function MYDB_query($query, $connect)
-{
-    return mysqli_query($connect, $query);
-}
-
-function MYDB_num_rows(\mysqli_result $result) : int
-{
-    return mysqli_num_rows($result);
-}
-
-/**
- * @return mixed[]
- */
-function MYDB_fetch_array(\mysqli_result $result)
-{
-    return mysqli_fetch_array($result);
-}
-
-function MYDB_fetch_row(\mysqli_result $result)
-{
-    return mysqli_fetch_row($result);
-}
-
-function MYDB_error($connect)
-{
-    return mysqli_error($connect);
-}
@@ -5,51 +5,35 @@ include "lib.php";
 include "func.php";

 $session = Session::requireGameLogin()->setReadOnly();
-if($session->userGrade < 5) {
-    ?><!DOCTYPE html>
-<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-</head>
-<body>
-관리자가 아닙니다.<br>
-    <?=banner()?>
-</body>
-</html>
-<?php
-    exit();
+if($session->userGrade < 4) {
+    die(requireAdminPermissionHTML());
 }

 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');

-$query = "select turntime,tnmt_time from game";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
+[$turntime, $tnmt_time] = $gameStor->getValuesAsArray(['turntime','tnmt_time']);

-$query = "select plock from plock";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$plock = MYDB_fetch_array($result);
+$plock = $db->queryFirstField('SELECT plock FROM plock WHERE `type` ="GAME"');
 ?>
 <!DOCTYPE html>
 <html>
 <head>
 <title>삼국지 모의전투 HiDCHe</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<meta charset="UTF-8">
+<meta name="color-scheme" content="dark">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?= WebUtil::printDist('ts', 'common', true) ?>
+<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
    <form action=_119_b.php method=post>
-    시간조정 : <input type=text size=3 name=minute><input type=submit name=btn value='분당김'><input type=submit name=btn value='분지연'> 최종갱신 : <?=$admin['turntime']?><br>
-    시간조정 : <input type=text size=3 name=minute2><input type=submit name=btn value='토너분당김'><input type=submit name=btn value='토너분지연'> 토너먼트 : <?=$admin['tnmt_time']?><br>
+    시간조정 : <input type=text size=3 name=minute><input type=submit name=btn value='분당김'><input type=submit name=btn value='분지연'> 최종갱신 : <?=$turntime?><br>
+    시간조정 : <input type=text size=3 name=minute2><input type=submit name=btn value='토너분당김'><input type=submit name=btn value='토너분지연'> 토너먼트 : <?=$tnmt_time?><br>
    봉급지급 : <input type=submit name=btn value='금지급'><input type=submit name=btn value='쌀지급'><br>
-    락 풀 기 : <input type=submit name=btn value='락걸기'><input type=submit name=btn value='락풀기'> 현재 : <?=$plock['plock']>0?"동결중":"가동중"?><br>
+    락 풀 기 : <input type=submit name=btn value='락걸기'><input type=submit name=btn value='락풀기'> 현재 : <?=$plock>0?"동결중":"가동중"?><br>
    </form>
 </body>
 </html>
-
@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 include "lib.php";
@@ -6,7 +7,7 @@ include "func.php";


 $session = Session::requireGameLogin()->setReadOnly();
-if($session->userGrade < 5){
+if ($session->userGrade < 4) {
    header('location:_119.php');
    die();
 }
@@ -16,58 +17,102 @@ $v->rule('integer', [
    'minute',
    'minutes2'
 ]);
-if(!$v->validate()){
+if (!$v->validate()) {
    Error($v->errorStr());
 }

-$btn = Util::getReq('btn');
-$minute = Util::getReq('minute', 'int');
-$minute2 = Util::getReq('minute2', 'int');
-
-extractMissingPostToGlobals();
+$btn = Util::getPost('btn');
+$minute = Util::getPost('minute', 'int');
+$minute2 = Util::getPost('minute2', 'int');

 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+switch ($btn) {
+    case "분당김":
+        $locked = false;
+        for ($i = 0; $i < 10; $i++) {
+            if (tryLock()) {
+                $locked = true;
+                break;
+            }
+            usleep(500000);
+        }

-switch($btn) {
-case "분당김":
-    $query = "update game set turntime=DATE_SUB(turntime, INTERVAL $minute MINUTE),starttime=DATE_SUB(starttime, INTERVAL $minute MINUTE),tnmt_time=DATE_SUB(tnmt_time, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $query = "update general set turntime=DATE_SUB(turntime, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $query = "update auction set expire=DATE_SUB(expire, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    break;
-case "분지연":
-    $query = "update game set turntime=DATE_ADD(turntime, INTERVAL $minute MINUTE),starttime=DATE_ADD(starttime, INTERVAL $minute MINUTE),tnmt_time=DATE_ADD(tnmt_time, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $query = "update general set turntime=DATE_ADD(turntime, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $query = "update auction set expire=DATE_ADD(expire, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    break;
-case "토너분당김":
-    $query = "update game set tnmt_time=DATE_SUB(tnmt_time, INTERVAL $minute2 MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    break;
-case "토너분지연":
-    $query = "update game set tnmt_time=DATE_ADD(tnmt_time, INTERVAL $minute2 MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    break;
-case "금지급":
-    processGoldIncome();
-    break;
-case "쌀지급":
-    processRiceIncome();
-    break;
-case "락걸기":
-    $query = "update plock set plock=1";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    break;
-case "락풀기":
-    $query = "update plock set plock=0";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    break;
+        $gameStor->cacheValues(['turntime', 'starttime', 'tnmt_time']);
+        $turntime = (new \DateTimeImmutable($gameStor->turntime))->sub(new \DateInterval("PT{$minute}M"));
+        $starttime = (new \DateTimeImmutable($gameStor->starttime))->sub(new \DateInterval("PT{$minute}M"));
+        $tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->sub(new \DateInterval("PT{$minute}M"));
+
+        $gameStor->turntime = $turntime->format('Y-m-d H:i:s.u');
+        $gameStor->starttime = $starttime->format('Y-m-d H:i:s');
+        $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
+
+        $db->update('general', [
+            'turntime' => $db->sqleval('DATE_SUB(turntime, INTERVAL %i MINUTE)', $minute)
+        ], true);
+        $db->update('ng_auction', [
+            'close_date' => $db->sqleval('DATE_SUB(close_date, INTERVAL %i MINUTE)', $minute)
+        ], 'finished = 0');
+        if ($locked) {
+            unlock();
+        }
+        break;
+    case "분지연":
+        $locked = false;
+        for ($i = 0; $i < 5; $i++) {
+            if (tryLock()) {
+                $locked = true;
+                break;
+            }
+            usleep(500000);
+        }
+        $gameStor->cacheValues(['turntime', 'starttime', 'tnmt_time']);
+        $turntime = (new \DateTimeImmutable($gameStor->turntime))->add(new \DateInterval("PT{$minute}M"));
+        $starttime = (new \DateTimeImmutable($gameStor->starttime))->add(new \DateInterval("PT{$minute}M"));
+        $tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->add(new \DateInterval("PT{$minute}M"));
+
+        $gameStor->turntime = $turntime->format('Y-m-d H:i:s.u');
+        $gameStor->starttime = $starttime->format('Y-m-d H:i:s');
+        $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
+
+        $db->update('general', [
+            'turntime' => $db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
+        ], true);
+        $db->update('ng_auction', [
+            'close_date' => $db->sqleval('DATE_ADD(close_date, INTERVAL %i MINUTE)', $minute)
+        ], 'finished = 0');
+        if ($locked) {
+            unlock();
+        }
+        break;
+    case "토너분당김":
+        $tnmt_time = new \DateTime($gameStor->tnmt_time);
+        $tnmt_time->sub(new \DateInterval("PT{$minute2}M"));
+        $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
+        break;
+    case "토너분지연":
+        $tnmt_time = new \DateTimeImmutable($gameStor->tnmt_time);
+        $tnmt_time->add(new \DateInterval("PT{$minute2}M"));
+        $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
+        break;
+    case "금지급":
+        processGoldIncome();
+        break;
+    case "쌀지급":
+        processRiceIncome();
+        break;
+    case "락걸기":
+        for ($i = 0; $i < 10; $i++) {
+            if (tryLock()) {
+                $locked = true;
+                break;
+            }
+            usleep(500000);
+        }
+        break;
+    case "락풀기":
+        unlock();
+        break;
 }

-header('Location:_119.php');
+header('Location:_119.php', true, 303);
@@ -6,28 +6,11 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-</head>
-<body>
-관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
-</body>
-</html>";
-
-    exit();
+if($session->userGrade < 6) {
+    die(requireAdminPermissionHTML());
 }

 $db = DB::db();
-$connect=$db->get();

 $admin = getAdmin();
 ?>
@@ -35,16 +18,20 @@ $admin = getAdmin();
 <html>
 <head>
 <title>게임관리</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<meta charset="UTF-8">
+<meta name="color-scheme" content="dark">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?= WebUtil::printDist('ts', 'common', true) ?>
+<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class="tb_layout bg0">
    <tr><td>게 임 관 리<br><?=backButton()?></td></tr>
 </table>
 <form name=form1 method=post action=_admin1_submit.php>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class="tb_layout bg0">
    <tr><td width=110 align=right>운영자메세지</td>
        <td colspan=3><input type=textarea size=90 style=color:white;background-color:black; name=msg value='<?=$admin['msg']?>'><input type=submit name=btn value=변경></td></td>
    </tr>
@@ -53,9 +40,7 @@ $admin = getAdmin();
    </tr>
    <tr>
        <td width=110 align=right>시작시간변경</td>
-        <td width=285><input type=text size=20 maxlength=20 style=color:white;background-color:black;text-align:right; name=starttime value='<?=$admin['starttime']?>'><input type=submit name=btn value=변경1></td>
-        <td width=110 align=right>현재도시훈사</td>
-        <td width=285><?=$admin['city_rate']?></td>
+        <td width=285><input type=text size=20 maxlength=20 style=color:white;background-color:black;text-align:right; name=starttime value='<?=substr($admin['starttime'], 0, 19)?>'><input type=submit name=btn value=변경1></td>
    </tr>
    <tr>
        <td width=110 align=right>최대 장수</td>
@@ -63,12 +48,6 @@ $admin = getAdmin();
        <td width=110 align=right>최대 국가</td>
        <td width=285><input type=text size=3 maxlength=2 style=color:white;background-color:black;text-align:right; name=maxnation value=<?=$admin['maxnation']?>><input type=submit name=btn value=변경3></td>
    </tr>
-    <tr>
-        <td width=110 align=right></td>
-        <td width=285></td>
-        <td width=110 align=right>현재 수입률</td>
-        <td width=285><?=$admin['gold_rate']?>%</td>
-    </tr>
    <tr>
        <td width=110 align=right>시작 년도</td>
        <td width=285><input type=text size=3 maxlength=3 style=color:white;background-color:black;text-align:right; name=startyear value='<?=$admin['startyear']?>'><input type=submit name=btn value=변경4></td>
@@ -81,7 +60,7 @@ $admin = getAdmin();
    </tr>
 </table>
 </form>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
    <tr><td><?=backButton()?></td></tr>
    <tr><td><?=banner()?> </td></tr>
 </table>
@@ -6,7 +6,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
    header('location:_admin1.php');
    die();
 }
@@ -22,49 +22,37 @@ if (!$v->validate()) {
    Error($v->errorStr());
 }

-$msg = Util::getReq('msg');
-$btn = Util::getReq('btn');
-$log = Util::getReq('log');
-$starttime = Util::getReq('starttime', 'string', (new \DateTime())->format('Y-m-d H:i:s'));
-$maxgeneral = Util::getReq('maxgeneral', 'int', GameConst::$defaultMaxGeneral);
-$maxnation = Util::getReq('maxnation', 'int', GameConst::$defaultMaxNation);
-$startyear = Util::getReq('startyear', 'int', GameConst::$defaultStartYear);
-
-extractMissingPostToGlobals();
+$msg = Util::getPost('msg');
+$btn = Util::getPost('btn');
+$log = Util::getPost('log');
+$starttime = Util::getPost('starttime', 'string', (new \DateTime())->format('Y-m-d H:i:s'));
+$maxgeneral = Util::getPost('maxgeneral', 'int', GameConst::$defaultMaxGeneral);
+$maxnation = Util::getPost('maxnation', 'int', GameConst::$defaultMaxNation);
+$startyear = Util::getPost('startyear', 'int', GameConst::$defaultStartYear);

 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');

 $admin = getAdmin();

 switch ($btn) {
    case "변경":
-        $msg = addslashes(SQ2DQ($msg));
-        $query = "update game set msg='$msg'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+        $gameStor->msg = $msg;
        break;
    case "로그쓰기":
-        $lognum = $admin['historyindex'] + 1;
-        if ($lognum >= 29) {
-            $lognum = 0;
-        }
-        pushWorldHistory(["<R>★</><S>{$log}</>"]);
+        pushGlobalHistoryLog(["<R>★</><S>{$log}</>"]);
        break;
    case "변경1":
-        $query = "update game set starttime='$starttime'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+        $gameStor->starttime = (new \DateTime($starttime))->format('Y-m-d H:i:s');
        break;
    case "변경2":
-        $query = "update game set maxgeneral='$maxgeneral'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+        $gameStor->maxgeneral = $maxgeneral;
        break;
    case "변경3":
-        $query = "update game set maxnation='$maxnation'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+        $gameStor->maxnation = $maxnation;
        break;
    case "변경4":
-        $query = "update game set startyear='$startyear'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+        $gameStor->startyear = $startyear;
        break;
    case "1분턴":
    case "2분턴":
@@ -74,6 +62,7 @@ switch ($btn) {
    case "30분턴":
    case "60분턴":
    case "120분턴":
+        $admin = $gameStor->getValues(['turntime', 'turnterm', 'year', 'startyear', 'month']);
        switch ($btn) {
        case   "1분턴": $turnterm = 1; break;
        case   "2분턴": $turnterm = 2; break;
@@ -83,41 +72,9 @@ switch ($btn) {
        case  "30분턴": $turnterm = 30; break;
        case  "60분턴": $turnterm = 60; break;
        case "120분턴": $turnterm = 120; break;
+        default: throw new \Exception("알 수 없는 턴 기간");
        }
-        $unit = $turnterm * 60;
-        $turn = ($admin['year'] - $admin['startyear']) * 12 + $admin['month'] - 1;
-        $starttime = date("Y-m-d H:i:s", strtotime($admin['turntime']) - $turn * $unit);
-        $starttime = cutTurn($starttime, $turnterm);
-        $query = "update game set turnterm='$turnterm',starttime='$starttime'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-        // 턴시간이 길어지는 경우 랜덤턴 배정
-        if ($turnterm < $admin['turnterm']) {
-            $query = "select no from general";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-            $count = MYDB_num_rows($result);
-            for ($i=0; $i < $count; $i++) {
-                $gen = MYDB_fetch_array($result);
-                $turntime = getRandTurn($turnterm);
-                $query = "update general set turntime='$turntime' where no='{$gen['no']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-            }
-            // 턴시간이 너무 멀리 떨어진 선수 제대로 보정
-        } else {
-            $query = "select no,turntime from general";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-            $count = MYDB_num_rows($result);
-            for ($i=0; $i < $count; $i++) {
-                $gen = MYDB_fetch_array($result);
-                $num = intdiv((strtotime($gen['turntime']) - strtotime($admin['turntime'])), $unit);
-                if ($num > 0) {
-                    $gen['turntime'] = date("Y-m-d H:i:s", strtotime($gen['turntime']) - $unit * $num);
-                    $query = "update general set turntime='{$gen['turntime']}' where no='{$gen['no']}'";
-                    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-                }
-            }
-        }
-        
-        pushWorldHistory(["<R>★</>턴시간이 <C>$btn</>으로 변경됩니다."]);
+        ServerTool::changeServerTerm($turnterm);
        break;
 }

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 include "lib.php";
@@ -6,134 +7,106 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-</head>
-<body>
-관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
-</body>
-</html>";
-
-    exit();
+if ($session->userGrade < 6) {
+    die(requireAdminPermissionHTML());
 }

 $db = DB::db();
-$connect=$db->get();

-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
-<title>회원관리</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+    <title>회원관리</title>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>회 원 관 리<br><?=backButton()?></td></tr>
-</table>
-<form name=form1 method=post action=_admin2_submit.php>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=80 align=center>접속제한</td>
-        <td width=713 align=center><input type=submit name=btn value='전체 접속허용'><input type=submit name=btn value='전체 접속제한'></td>
-    </tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=80 align=center rowspan=12>회원선택<br><br><font color=cyan>NPC</font><br><font color=skyblue>NPC유저</font><br><font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b></td>
-        <td width=105 rowspan=12>
-<?php
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>회 원 관 리<br><?= backButton() ?></td>
+        </tr>
+    </table>
+    <form name=form1 method=post action=_admin2_submit.php>
+        <table align=center width=1000 class='tb_layout bg0'>
+            <tr>
+                <td width=80 align=center>접속제한</td>
+                <td width=713 align=center><input type=submit name=btn value='전체 접속허용'><input type=submit name=btn value='전체 접속제한'></td>
+            </tr>
+        </table>
+        <table align=center width=1000 class='tb_layout bg0'>
+            <tr>
+                <td width=80 align=center rowspan=12>회원선택<br><br>
+                    <font color=cyan>NPC</font><br>
+                    <font color=skyblue>NPC유저</font><br>
+                    <font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b>
+                </td>
+                <td width=105 rowspan=12>
+                    <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>
+                        <?php
+                        $generalList = $db->query('SELECT `no`, `name`, npc, `block` FROM general ORDER BY npc, binary(`name`)');

-echo "
-            <select name=genlist[] size=20 multiple style=color:white;background-color:black;font-size:13>";
+                        foreach ($generalList as $general) {
+                            $style = "style=;";
+                            if ($general['block']         > 0) {
+                                $style .= "background-color:red;";
+                            }

-$query = "select no,name,npc,block from general order by npc,binary(name)";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($result);
+                            $npcColor = getNPCColor($general['npc']);
+                            if ($npcColor !== null) {
+                                $style .= "color:{$npcColor};";
+                            }

-for($i=0; $i < $gencount; $i++) {
-    $general = MYDB_fetch_array($result);
-    $style = "style=;";
-    if($general['block']         > 0) { $style .= "background-color:red;"; }
-    if($general['npc']          >= 2) { $style .= "color:cyan;"; }
-    elseif($general['npc']      == 1) { $style .= "color:skyblue;"; }
-
-    echo "
-                <option value={$general['no']} $style>{$general['name']}</option>";
-}
-
-echo "
-            </select>
-        </td>
-        <td width=100 align=center>아이템 지급</td>
-        <td width=504>
-            <select name=weap size=1 style=color:white;background-color:black;font-size:13>";
-for($i=0; $i < 27; $i++) {
-    echo "
-                <option value={$i}>{$i}</option>";
-}
-?>
-            </select>
-            <input type=submit name=btn value='무기지급'>
-            <input type=submit name=btn value='책지급'>
-            <input type=submit name=btn value='말지급'>
-            <input type=submit name=btn value='도구지급'>
-        </td>
-    </tr>
-    <tr>
-        <td width=100 align=center>블럭</td>
-        <td width=504>
-            <input type=submit name=btn value='블럭 해제'><input type=submit name=btn value='1단계 블럭'><input type=submit name=btn value='2단계 블럭'><input type=submit name=btn value='3단계 블럭'><input type=submit name=btn value='무한삭턴'><br>
-            1단계:발언권, 2단계:턴블럭
-        </td>
-    </tr>
-    <tr>
-        <td align=center>강제 사망</td>
-        <td><input type=submit name=btn value='강제 사망'></td>
-    </tr>
-    <tr>
-        <td align=center>이벤트</td>
-        <td><input type=submit name=btn value='특기 부여'><input type=submit name=btn value='공헌치1000'><input type=submit name=btn value='경험치1000'></td>
-    </tr>
-    <tr>
-        <td align=center>이벤트2</td>
-        <td><input type=submit name=btn value='보숙10000'><input type=submit name=btn value='궁숙10000'><input type=submit name=btn value='기숙10000'><input type=submit name=btn value='귀숙10000'><input type=submit name=btn value='차숙10000'></td>
-    </tr>
-    <tr>
-        <td align=center>접속제한</td>
-        <td><input type=submit name=btn value='접속 허용'><input type=submit name=btn value='접속 제한'></td>
-    </tr>
-    <tr>
-        <td align=center>턴설정</td>
-        <td><input type=submit name=btn value='00턴'><input type=submit name=btn value='랜덤턴'></td>
-    </tr>
-    <tr>
-        <td align=center>NPC해제</td>
-        <td><input type=submit name=btn value='NPC해제'><input type=submit name=btn value='하야입력'><input type=submit name=btn value='방랑해산'><input type=submit name=btn value='NPC설정'></td>
-    </tr>
-    <tr>
-        <td align=center>메세지 전달</td>
-        <td><input type=textarea size=60 maxlength=255 name=msg style=background-color:black;color:white;><input type=submit name=btn value='메세지 전달'></td>
-    </tr>
-</table>
-</form>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+                            echo "<option value={$general['no']} $style>{$general['name']}</option>";
+                        }
+                        ?>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td width=100 align=center>블럭</td>
+                <td width=504>
+                    <input type=submit name=btn value='블럭 해제'><input type=submit name=btn value='1단계 블럭'><input type=submit name=btn value='2단계 블럭'><input type=submit name=btn value='3단계 블럭'><input type=submit name=btn value='무한삭턴'><br>
+                    1단계:발언권, 2단계:턴블럭
+                </td>
+            </tr>
+            <tr>
+                <td align=center>강제 사망</td>
+                <td><input type=submit name=btn value='강제 사망'></td>
+            </tr>
+            <tr>
+                <td align=center>이벤트2</td>
+                <td><input type=submit name=btn value='보숙10000'><input type=submit name=btn value='궁숙10000'><input type=submit name=btn value='기숙10000'><input type=submit name=btn value='귀숙10000'><input type=submit name=btn value='차숙10000'></td>
+            </tr>
+            <tr>
+                <td align=center>접속제한</td>
+                <td><input type=submit name=btn value='접속 허용'><input type=submit name=btn value='접속 제한'></td>
+            </tr>
+            <tr>
+                <td align=center>명령 설정</td>
+                <td><input type=submit name=btn value='하야입력'><input type=submit name=btn value='방랑해산'></td>
+            </tr>
+            <tr>
+                <td align=center>메세지 전달</td>
+                <td><input type=textarea size=60 maxlength=255 name=msg style=background-color:black;color:white;><input type=submit name=btn value='메세지 전달'></td>
+            </tr>
+        </table>
+    </form>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>
@@ -1,353 +1,226 @@
 <?php
+
 namespace sammo;

+use sammo\Enums\MessageType;
+
 include "lib.php";
 include "func.php";

-$btn = Util::getReq('btn');
-$weap = Util::getReq('weap', 'int');
-
-extractMissingPostToGlobals();
+$btn = Util::getPost('btn');
+$item = Util::getPost('item', 'string');
+$genlist = Util::getPost('genlist', 'array_int');
+$msg = Util::getPost('msg', 'string');

 //로그인 검사
 $session = Session::requireLogin()->loginGame()->setReadOnly();

-if($session->userGrade < 5) {
+if ($session->userGrade < 6) {
    header('location:_admin2.php');
 }

 $generalID = $session->generalID;
-if(!$generalID){
+if (!$generalID) {
    header('location:_admin2.php');
+    die();
 }

 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');

-switch($btn) {
+$src = MessageTarget::buildQuick($session->generalID);
+
+$genObjList = [];
+$env = [];
+if ($genlist) {
+    $genObjList = General::createObjListFromDB($genlist);
+    $env = $gameStor->cacheAll();
+}
+switch ($btn) {
    case "전체 접속허용":
-        $db->update('general', [
-            'con'=>0
+        $db->update('general_access_log', [
+            'refresh_score' => 0
        ], true);
        break;
    case "전체 접속제한":
-        $db->update('general', [
-            'con'=>1000
+        $db->update('general_access_log', [
+            'refresh_score' => 1000
        ], true);
        break;
    case "블럭 해제":
        $db->update('general', [
-            'block'=>0
+            'block' => 0
        ], '`no` IN %li', $genlist);
        DB::db()->query('update general set block=0 where no IN %li', $genlist);
        break;
    case "1단계 블럭":
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now();
        $db->update('general', [
-            'block'=>1,
-            'killturn'=>24
+            'block' => 1,
+            'killturn' => 24
        ], '`no` IN %li', $genlist);
        $uid = $db->queryFirstColumn('SELECT `owner` FROM general WHERE `no` IN %li', $genlist);
-        RootDB::db()->update('member',[
-            'block_num'=>$db->sqleval('block_num+1'),
-            'block_date'=>$date
+        RootDB::db()->update('member', [
+            'block_num' => $db->sqleval('block_num+1'),
+            'block_date' => $date
        ], 'id IN %li', $uid);
        break;
    case "2단계 블럭":
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now();
        $db->update('general', [
-            'gold'=>0,
-            'rice'=>0,
-            'block'=>2,
-            'killturn'=>24
+            'gold' => 0,
+            'rice' => 0,
+            'block' => 2,
+            'killturn' => 24
        ], '`no` IN %li', $genlist);
        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
-        RootDB::db()->update('member',[
-            'block_num'=>$db->sqleval('block_num+1'),
-            'block_date'=>$date
+        RootDB::db()->update('member', [
+            'block_num' => $db->sqleval('block_num+1'),
+            'block_date' => $date
        ], 'id IN %li', $uid);
        break;
    case "3단계 블럭":
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now();
        $db->update('general', [
-            'gold'=>0,
-            'rice'=>0,
-            'block'=>3,
-            'killturn'=>24
+            'gold' => 0,
+            'rice' => 0,
+            'block' => 3,
+            'killturn' => 24
        ], '`no` IN %li', $genlist);
        $uid = $db->queryFirstColumn('SELECT `owner` from general where no IN %li', $genlist);
-        RootDB::db()->update('member',[
-            'block_num'=>$db->sqleval('block_num+1'),
-            'block_date'=>$date
+        RootDB::db()->update('member', [
+            'block_num' => $db->sqleval('block_num+1'),
+            'block_date' => $date
        ], 'id IN %li', $uid);
        break;
    case "무한삭턴":
        $db->update('general', [
-            'killturn'=>8000
+            'killturn' => 8000
        ], '`no` IN %li', $genlist);
        break;
    case "강제 사망":
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now(true);
        $db->update('general', [
-            'turn0'=>0,
-            'killturn'=>0,
-            'turntime'=>$date,
+            'killturn' => 0,
+            'turntime' => $date,
        ], '`no` IN %li', $genlist);
-        break;
-    case "특기 부여":
-        list($year, $month) = $db->queryFirstList('select `year`, `month` from `game` where `no`=1');
-
-        $src = MessageTarget::buildQuick($session->generalID);
-        $text = "특기 부여!";
-
-        foreach($db->query("SELECT `no`,leader,power,intel,dex0,dex10,dex20,dex30,dex40 FROM general WHERE `no` IN %li", $genlist) as $general){    
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($general['no']), $text, new DateTime(), new DateTime('9999-12-31'), []);
-            $msg->send(true);
-
-            $specialWar = SpecialityConst::pickSpecialWar($general);
-            $db->update('general', [
-                'specage2'=>$db->sqleval('age'),
-                'special2'=>$specialWar
-            ], 'no=%i', $general['no']);
-            $specialWarName = SpecialityConst::WAR[$specialWar][0];
-            pushGeneralHistory($general, "<C>●</>{$year}년 {$month}월:특기 【<b><C>{$specialWarName}</></b>】(을)를 습득");
-            pushGenLog($general, ["<C>●</>특기 【<b><L>{$specialWarName}</></b>】(을)를 익혔습니다!"]);
-        }
-        
+        $db->update('general_turn', [
+            'action' => '휴식',
+            'arg' => '{}',
+            'brief' => '휴식',
+        ], 'general_id IN %li AND turn_idx = 0', $genlist);
        break;
    case "경험치1000":
-        $src = MessageTarget::buildQuick($session->generalID);
-        $text = $btn." 지급!";
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+        $text = $btn . " 지급!";
+        foreach ($genlist as $generalID) {
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
            $msg->send(true);
        }
-        $db->update('general',[
-            'experience'=>$db->sqleval('experience+1000')
+        $db->update('general', [
+            'experience' => $db->sqleval('experience+1000')
        ], '`no` IN %li', $genlist);

        break;
    case "공헌치1000":
-        $src = MessageTarget::buildQuick($session->generalID);
-        $text = $btn." 지급!";
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+        $text = $btn . " 지급!";
+        foreach ($genlist as $generalID) {
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
            $msg->send(true);
        }
-        $db->update('general',[
-            'dedication'=>$db->sqleval('dedication+1000')
+        $db->update('general', [
+            'dedication' => $db->sqleval('dedication+1000')
        ], '`no` IN %li', $genlist);

        break;
    case "보숙10000":
-        $src = MessageTarget::buildQuick($session->generalID);
        $text = "보병숙련도+10000 지급!";
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+        foreach ($genlist as $generalID) {
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
            $msg->send(true);
        }
-        $db->update('general',[
-            'dex0'=>$db->sqleval('dex0+10000')
+        $db->update('general', [
+            'dex1' => $db->sqleval('dex1+10000')
        ], '`no` IN %li', $genlist);
        break;
    case "궁숙10000":
-        $src = MessageTarget::buildQuick($session->generalID);
        $text = "궁병숙련도+10000 지급!";
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+        foreach ($genlist as $generalID) {
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
            $msg->send(true);
        }
-        $db->update('general',[
-            'dex10'=>$db->sqleval('dex10+10000')
+        $db->update('general', [
+            'dex2' => $db->sqleval('dex2+10000')
        ], '`no` IN %li', $genlist);
        break;
    case "기숙10000":
        $src = MessageTarget::buildQuick($session->generalID);
        $text = "기병숙련도+10000 지급!";
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+        foreach ($genlist as $generalID) {
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
            $msg->send(true);
        }
-        $db->update('general',[
-            'dex20'=>$db->sqleval('dex20+10000')
+        $db->update('general', [
+            'dex3' => $db->sqleval('dex3+10000')
        ], '`no` IN %li', $genlist);
        break;
    case "귀숙10000":
        $src = MessageTarget::buildQuick($session->generalID);
        $text = "귀병숙련도+10000 지급!";
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+        foreach ($genlist as $generalID) {
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
            $msg->send(true);
        }
-        $db->update('general',[
-            'dex30'=>$db->sqleval('dex30+10000')
+        $db->update('general', [
+            'dex4' => $db->sqleval('dex4+10000')
        ], '`no` IN %li', $genlist);
        break;
    case "차숙10000":
        $src = MessageTarget::buildQuick($session->generalID);
        $text = "차병숙련도+10000 지급!";
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+        foreach ($genlist as $generalID) {
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
            $msg->send(true);
        }
-        $db->update('general',[
-            'dex40'=>$db->sqleval('dex40+10000')
+        $db->update('general', [
+            'dex5' => $db->sqleval('dex5+10000')
        ], '`no` IN %li', $genlist);
        break;
    case "접속 허용":
-        $db->update('genera',[
-            'con'=>0
-        ], '`no` IN %li', $genlist);
+        $db->update('general_access_log', [
+            'refresh_score' => 0
+        ], '`general_id` IN %li', $genlist);
        break;
    case "접속 제한":
-        $db->update('genera',[
-            'con'=>1000
-        ], '`no` IN %li', $genlist);
+        $db->update('general_access_log', [
+            'refresh_score' => 1000
+        ], '`general_id` IN %li', $genlist);
        break;
    case "메세지 전달":
-        $text = $msg;
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+        $text = $msg ?? '';
+        foreach ($genlist as $generalID) {
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
            $msg->send(true);
        }
        break;
-    case "무기지급":
-
-        if($weap == 0) {
-            $text = "무기 회수!";
-        }
-        else { 
-            $text = getWeapName($weap)." 지급!"; 
-        }
-
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if($weap == 0){
-            $db->update('general', [
-                'weap'=>0
-            ], '`no` IN %li', $genlist);
-        }
-        else{
-            $db->update('general', [
-                'weap'=>$weap
-            ], '`no` IN %li AND weap < %i', $genlist, $weap);
-        }
-        break;
-    case "책지급":
-        if($weap == 0) {
-            $text = "책 회수!";
-        }
-        else { 
-            $text = getBookName($weap)." 지급!"; 
-        }
-
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if($weap == 0){
-            $db->update('general', [
-                'book'=>0
-            ], '`no` IN %li', $genlist);
-        }
-        else{
-            $db->update('general', [
-                'book'=>$weap
-            ], '`no` IN %li AND book < %i', $genlist, $weap);
-        }
-        break;
-    case "말지급":
-        if($weap == 0) {
-            $text = "말 회수!";
-        }
-        else { 
-            $text = getHorseName($weap)." 지급!"; 
-        }
-
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if($weap == 0){
-            $db->update('general', [
-                'horse'=>0
-            ], '`no` IN %li', $genlist);
-        }
-        else{
-            $db->update('general', [
-                'horse'=>$weap
-            ], '`no` IN %li AND horse < %i', $genlist, $weap);
-        }
-        break;
-    case "도구지급":
-        if($weap == 0) {
-            $text = "특수도구 회수!";
-        }
-        else { 
-            $text = getItemName($weap)." 지급!"; 
-        }
-
-        foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if($weap == 0){
-            $db->update('general', [
-                'item'=>0
-            ], '`no` IN %li', $genlist);
-        }
-        else{
-            $db->update('general', [
-                'item'=>$weap
-            ], '`no` IN %li AND item < %i', $genlist, $weap);
-        }
-        break;
-    case "NPC해제":
-        $db->update('general', [
-            'npc'=>1
-        ], '`no` IN %li', $genlist);
-        break;
    case "하야입력":
-        $db->update('general', [
-            'turn0'=>'00000000000045'
-        ], '`no` IN %li', $genlist);
+        $db->update('general_turn', [
+            'action' => 'che_하야',
+            'arg' => '{}',
+            'brief' => '하야',
+        ], 'general_id IN %li AND turn_idx = 0', $genlist);
        break;
    case "방랑해산":
-        $db->update('general', [
-            'turn0'=>'00000000000047',
-            'turn1'=>'00000000000056'
-        ], '`no` IN %li', $genlist);
-        break;
-    case "NPC설정":
-        $db->update('general', [
-            'npc'=>2
-        ], '`no` IN %li', $genlist);
-        break;
-    case "00턴":
-        $turnterm = $db->queryFirstField('SELECT turnterm FROM game LIMIT 1');
-
-        foreach($genlist as $generalID){
-            $turntime = getRandTurn($turnterm);
-            $cutTurn = cutTurn($turntime, $turnterm);
-            $db->update('general', [
-                'turntime'=>$curTurn
-            ], '`no` IN %li', $genlist);
-        }
-        break;
-    case "랜덤턴":
-        foreach($genlist as $generalID){
-            $turntime = getRandTurn($turnterm);
-            $db->update('general', [
-                'turntime'=>$turntime
-            ], '`no` IN %li', $genlist);
-        }
+        $db->update('general_turn', [
+            'action' => 'che_방랑',
+            'arg' => '{}',
+            'brief' => '방랑',
+        ], 'general_id IN %li AND turn_idx = 0', $genlist);
+        $db->update('general_turn', [
+            'action' => 'che_해산',
+            'arg' => '{}',
+            'brief' => '해산',
+        ], 'general_id IN %li AND turn_idx = 1', $genlist);
        break;
 }

-header('location:_admin2.php');
+header('location:_admin2.php');
@@ -1,145 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-
-if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-</head>
-<body>
-관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
-</body>
-</html>";
-
-    exit();
-}
-
-$db = DB::db();
-$connect=$db->get();
-
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>멀티관리</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-</head>
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>멀 티 관 리<br><?=backButton()?></td></tr>
-</table>
-<form name=form1 method=post action=_admin4_submit.php>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=80 align=center rowspan=3>회원선택<br><br><font color=cyan>NPC</font><br><font color=skyblue>NPC유저</font><br><font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b></td>
-        <td width=105 rowspan=3>
-<?php
-
-echo "
-            <select name=genlist[] size=20 multiple style=color:white;background-color:black;font-size:13>";
-
-$query = "select no,name,npc,block from general where ip!='' order by npc,ip";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($result);
-
-for($i=0; $i < $gencount; $i++) {
-    $general = MYDB_fetch_array($result);
-    $style = "style=;";
-    if($general['block']         > 0) { $style .= "background-color:red;"; }
-    if($general['npc']          >= 2) { $style .= "color:cyan;"; }
-    elseif($general['npc']      == 1) { $style .= "color:skyblue;"; }
-    if($general['con'] > $admin['conlimit']) { $style .= "color:red;"; }
-
-    echo "
-                <option value={$general['no']} $style>{$general['name']}</option>";
-}
-
-echo "
-            </select>";
-?>
-        </td>
-        <td width=100 align=center>블럭</td>
-        <td width=504>
-            <input type=submit name=btn value='블럭 해제'><input type=submit name=btn value='1단계 블럭'><input type=submit name=btn value='2단계 블럭'><input type=submit name=btn value='3단계 블럭'><input type=submit name=btn value='무한삭턴'><br>
-            1단계:발언권, 2단계:턴블럭
-        </td>
-    </tr>
-    <tr>
-        <td align=center>강제 사망</td>
-        <td><input type=submit name=btn value='강제 사망'></td>
-    </tr>
-    <tr>
-        <td align=center>메세지 전달</td>
-        <td><input type=textarea size=60 maxlength=255 name=msg style=background-color:black;color:white;><input type=submit name=btn value='메세지 전달'></td>
-    </tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td align=center width=100>장수명</td>
-        <td align=center width=180>최근로그인</td>
-        <td align=center width=129>IP</td>
-        <td align=center width=100>ID</td>
-    </tr>
-    <tr>
-<?php
-$query = "select substring_index(ip,'.',3) as ip2 from general where ip!='' and npc<2 group by ip2 having count(*)>1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$ipCount = MYDB_num_rows($result);
-$genName = "";
-$genDate = "";
-$genIP   = "";
-$genID   = "";
-for($i=0; $i < $ipCount; $i++) {
-    $ip = MYDB_fetch_array($result);
-
-    $query = "select name,ip,lastconnect,owner,block from general where ip like '{$ip['ip2']}%' and npc<2 order by ip";
-    $genResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $genCount = MYDB_num_rows($genResult);
-    for($k=0; $k < $genCount; $k++) {
-        $gen = MYDB_fetch_array($genResult);
-        if($gen['block'] > 0) $genName .= "<font color=magenta>{$gen['name']}</font><br>";
-        else $genName .= $gen['name']."<br>";
-        $genDate .= $gen['lastconnect']."<br>";
-        $genIP   .= $gen['ip']."<br>";
-        $genID   .= $gen['owner']."<br>";
-    }
-    $genName .= "<br>";
-    $genDate .= "<br>";
-    $genIP   .= "<br>";
-    $genID   .= "<br>";
-}
-echo "
-        <td align=right>$genName</td>
-        <td>$genDate</td>
-        <td>$genIP</td>
-        <td>$genID</td>";
-?>
-    </tr>
-</table>
-<?php
-//NOTE: password의 md5 해시가 같은지 확인하는 방식으로는 앞으로 잡아낼 수 없다. 폐기
-?>
-</form>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-</body>
-</html>
@@ -1,66 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-
-if($session->userGrade < 5) {
-    header('location:_admin4.php');
-    die();
-}
-
-$btn = Util::getReq('btn');
-$genlist = Util::getReq('genlist', 'array_int');
-
-extractMissingPostToGlobals();
-
-$db = DB::db();
-$connect=$db->get();
-
-//NOTE: 왜 기능이 admin2와 admin4가 같이 있는가? 
-//NOTE: 왜 블럭 시 admin4에선 금쌀을 없애지 않는가?
-switch($btn) {
-    case "블럭 해제":
-        DB::db()->query('update general set block=0 where no IN %li', $genlist);
-        break;
-    case "1단계 블럭":
-        $date = date('Y-m-d H:i:s');
-        $db = DB::db();
-        $db->query('update general set block=1,killturn=24 where no IN %li',$genlist);
-        //FIXME: subquery로 하는게 더 빠를 듯.
-        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
-        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
-        break;
-    case "2단계 블럭":
-        $date = date('Y-m-d H:i:s');
-        $db = DB::db();
-        $db->query('update general set block=2,killturn=24 where no IN %li',$genlist);
-        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
-        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
-        break;
-    case "3단계 블럭":
-        $date = date('Y-m-d H:i:s');
-        $db = DB::db();
-        $db->query('update general set block=3,killturn=24 where no IN %li',$genlist);
-        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
-        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
-        break;
-    case "무한삭턴":
-        DB::db()->query('update general set killturn=8000 where no IN %li',$genlist);
-        break;
-    case "강제 사망":
-        $date = date('Y-m-d H:i:s');
-        DB::db()->query('update general set turn0=0,killturn=0,turntime=%s where no IN %li',$date, $genlist);
-        break;
-    case "메세지 전달":
-    //TODO:새 갠메 시스템으로 변경
-        $date = date('Y-m-d H:i:s');
-        for($i=0; $i < count($genlist); $i++) {
-        }
-        break;
-}
-
-header('location:_admin4.php');
-
@@ -1,325 +1,354 @@
 <?php
+
 namespace sammo;

 include "lib.php";
 include "func.php";

-$type = Util::getReq('type', 'int', 0);
-$type2 = Util::getReq('type2', 'int', 0);
+/** @var int */
+$type = Util::getPost('type', 'int', 0);
+/** @var int */
+$type2 = Util::getPost('type2', 'int', 0);

-if($type < 0 || $type > 17){
+if ($type < 0 || $type > 17) {
    $type = 0;
 }
-if($type2 < 0 || $type2 > 6){
+if ($type2 < 0 || $type2 > 6) {
    $type2 = 0;
 }

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-</head>
-<body>
-관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
-</body>
-</html>";
-
-    exit();
+if ($session->userGrade < 6) {
+    die(requireAdminPermissionHTML());
 }

 $db = DB::db();
-$connect=$db->get();

 $sel = [];
 $sel2 = [];
 $sel[$type] = "selected";
 $sel2[$type2] = "selected";

-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
-<title>일제정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+    <title>일제정보</title>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>일 제 정 보<br><?=closeButton()?></td></tr>
-    <tr><td>
-        <form name=form1 method=post>정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[0]??''?>   value=0>국력</option>
-            <option <?=$sel[1]??''?>   value=1>장수</option>
-            <option <?=$sel[2]??''?>   value=2>기술</option>
-            <option <?=$sel[3]??''?>   value=3>국고</option>
-            <option <?=$sel[4]??''?>   value=4>병량</option>
-            <option <?=$sel[5]??''?>   value=5>평금</option>
-            <option <?=$sel[6]??''?>   value=6>평쌀</option>
-            <option <?=$sel[7]??''?>   value=7>평통</option>
-            <option <?=$sel[8]??''?>   value=8>평무</option>
-            <option <?=$sel[9]??''?>   value=9>평지</option>
-            <option <?=$sel[10]??''?> value=10>평Lv</option>
-            <option <?=$sel[11]??''?> value=11>접속률</option>
-            <option <?=$sel[12]??''?> value=12>단기접</option>
-            <option <?=$sel[13]??''?> value=13>보숙</option>
-            <option <?=$sel[14]??''?> value=14>궁숙</option>
-            <option <?=$sel[15]??''?> value=15>기숙</option>
-            <option <?=$sel[16]??''?> value=16>귀숙</option>
-            <option <?=$sel[17]??''?> value=17>차숙</option>
-        </select>
-        <select name=type2 size=1>
-            <option <?=$sel2[0]??''?> value=0>국력</option>
-            <option <?=$sel2[1]??''?> value=1>국가별성향</option>
-            <option <?=$sel2[2]??''?> value=2>국가성향</option>
-            <option <?=$sel2[3]??''?> value=3>장수성격</option>
-            <option <?=$sel2[4]??''?> value=4>장수특기</option>
-            <option <?=$sel2[5]??''?> value=5>병종수</option>
-            <option <?=$sel2[6]??''?> value=6>기타</option>
-        </select>
-        <input type=submit value='정렬하기'>
-        </form>
-        <form name=form2 method=post action=_admin5_submit.php>
-        <select name=nation size=1 style=color:white;background-color:black>";
-            <option value=0>재야</option>";
-<?php
-$query = "select nation,name,color,scout,scoutmsg,gennum from nation order by power";
-$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
-$count = MYDB_num_rows($result);
-for($i=1; $i <= $count; $i++) {
-    $nation = MYDB_fetch_array($result);
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>일 제 정 보<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>정렬순서 :
+                    <select name=type size=1>
+                        <option <?= $sel[0] ?? '' ?> value=0>국력</option>
+                        <option <?= $sel[1] ?? '' ?> value=1>장수</option>
+                        <option <?= $sel[2] ?? '' ?> value=2>기술</option>
+                        <option <?= $sel[3] ?? '' ?> value=3>국고</option>
+                        <option <?= $sel[4] ?? '' ?> value=4>병량</option>
+                        <option <?= $sel[5] ?? '' ?> value=5>평금</option>
+                        <option <?= $sel[6] ?? '' ?> value=6>평쌀</option>
+                        <option <?= $sel[7] ?? '' ?> value=7>평통</option>
+                        <option <?= $sel[8] ?? '' ?> value=8>평무</option>
+                        <option <?= $sel[9] ?? '' ?> value=9>평지</option>
+                        <option <?= $sel[10] ?? '' ?> value=10>평Lv</option>
+                        <option <?= $sel[13] ?? '' ?> value=13>보숙</option>
+                        <option <?= $sel[14] ?? '' ?> value=14>궁숙</option>
+                        <option <?= $sel[15] ?? '' ?> value=15>기숙</option>
+                        <option <?= $sel[16] ?? '' ?> value=16>귀숙</option>
+                        <option <?= $sel[17] ?? '' ?> value=17>차숙</option>
+                    </select>
+                    <select name=type2 size=1>
+                        <option <?= $sel2[0] ?? '' ?> value=0>국력</option>
+                        <option <?= $sel2[1] ?? '' ?> value=1>국가별성향</option>
+                        <option <?= $sel2[2] ?? '' ?> value=2>국가성향</option>
+                        <option <?= $sel2[3] ?? '' ?> value=3>장수성격</option>
+                        <option <?= $sel2[4] ?? '' ?> value=4>장수특기</option>
+                        <option <?= $sel2[5] ?? '' ?> value=5>병종수</option>
+                        <option <?= $sel2[6] ?? '' ?> value=6>기타</option>
+                    </select>
+                    <input type=submit value='정렬하기'>
+                </form>
+                <form name=form2 method=post action=_admin5_submit.php>
+                    <select name=nation size=1 style=color:white;background-color:black>";
+                        <option value=0>재야</option>";
+                        <?php
+                        foreach ($db->query('SELECT nation,name,color,scout,gennum from nation order by power DESC') as $nation) {

-    echo "
+                            echo "
            <option value={$nation['nation']}>{$nation['name']}</option>";
-}
-?>
-        </select>
-        <input type=submit name=btn value='국가변경'>
-        </form>
-    </td></tr>
-</table>
+                        }
+                        ?>
+                    </select>
+                    <input type=submit name=btn value='국가변경'>
+                </form>
+            </td>
+        </tr>
+    </table>

-<table align=center width=1600 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px; id=bg0>
-    <tr id=bg1>
-        <td align=center>국명</td>
-        <td align=center>접률</td>
-        <td align=center>단접</td>
-        <td align=center>국력</td>
-        <td align=center>단합</td>
-        <td align=center>장수</td>
-        <td align=center>속령</td>
-        <td align=center>기술</td>
-        <td align=center>전략</td>
-        <td align=center>국고</td>
-        <td align=center>병량</td>
-        <td align=center>평금</td>
-        <td align=center>평쌀</td>
-        <td align=center>평통</td>
-        <td align=center>평무</td>
-        <td align=center>평지</td>
-        <td align=center>평Lv</td>
-        <td align=center>보숙</td>
-        <td align=center>궁숙</td>
-        <td align=center>기숙</td>
-        <td align=center>귀숙</td>
-        <td align=center>차숙</td>
-        <td align=center>총병</td>
-        <td align=center>인구</td>
-        <td align=center>인구율</td>
-        <td align=center>농업</td>
-        <td align=center>상업</td>
-        <td align=center>치안</td>
-        <td align=center>성벽</td>
-        <td align=center>수비</td>
-        <td align=center>국명</td>
-    </tr>
-<?php
-$query = "
+    <table align=center width=1600 class="tb_layout bg0">
+        <tr class='bg1'>
+            <td align=center>국명</td>
+            <td align=center>국력</td>
+            <td align=center>장수</td>
+            <td align=center>속령</td>
+            <td align=center>기술</td>
+            <td align=center>전략</td>
+            <td align=center>국고</td>
+            <td align=center>병량</td>
+            <td align=center>평금</td>
+            <td align=center>평쌀</td>
+            <td align=center>평통</td>
+            <td align=center>평무</td>
+            <td align=center>평지</td>
+            <td align=center>평Lv</td>
+            <td align=center>보숙</td>
+            <td align=center>궁숙</td>
+            <td align=center>기숙</td>
+            <td align=center>귀숙</td>
+            <td align=center>차숙</td>
+            <td align=center>총병</td>
+            <td align=center>인구</td>
+            <td align=center>인구율</td>
+            <td align=center>농업</td>
+            <td align=center>상업</td>
+            <td align=center>치안</td>
+            <td align=center>성벽</td>
+            <td align=center>수비</td>
+            <td align=center>국명</td>
+        </tr>
+        <?php
+        $query = "
 SELECT
    A.nation,
    A.name,
    A.power,
-    A.chemi,
    A.color,
    A.tech,
-    A.sabotagelimit,
+    A.strategic_cmd_limit,
    A.gold,
    A.rice,
    COUNT(B.nation) AS gennum,
-    ROUND(AVG(B.connect), 1) AS connect,
-    ROUND(AVG(B.con), 1) AS con,
-    ROUND(AVG(B.dex0)) AS dex0,
-    ROUND(AVG(B.dex10)) AS dex10,
-    ROUND(AVG(B.dex20)) AS dex20,
-    ROUND(AVG(B.dex30)) AS dex30,
-    ROUND(AVG(B.dex40)) AS dex40
+    ROUND(AVG(B.dex1)) AS dex1,
+    ROUND(AVG(B.dex2)) AS dex2,
+    ROUND(AVG(B.dex3)) AS dex3,
+    ROUND(AVG(B.dex4)) AS dex4,
+    ROUND(AVG(B.dex5)) AS dex5
 FROM nation A, general B
 WHERE A.nation=B.nation
 GROUP BY B.nation
 ";

-switch($type) {
-    case  0: $query .= " order by power desc"; break;
-    case  1: $query .= " order by gennum desc"; break;
-    case  2: $query .= " order by A.tech desc"; break;
-    case  3: $query .= " order by A.gold desc"; break;
-    case  4: $query .= " order by A.rice desc"; break;
-    case  5: $query .= " order by avg(B.gold) desc"; break;
-    case  6: $query .= " order by avg(B.rice) desc"; break;
-    case  7: $query .= " order by avg(B.leader) desc"; break;
-    case  8: $query .= " order by avg(B.power) desc"; break;
-    case  9: $query .= " order by avg(B.intel) desc"; break;
-    case 10: $query .= " order by avg(B.explevel) desc"; break;
-    case 11: $query .= " order by avg(B.connect) desc"; break;
-    case 12: $query .= " order by avg(B.con) desc"; break;
-    case 13: $query .= " order by avg(B.dex0) desc"; break;
-    case 14: $query .= " order by avg(B.dex10) desc"; break;
-    case 15: $query .= " order by avg(B.dex20) desc"; break;
-    case 16: $query .= " order by avg(B.dex30) desc"; break;
-    case 17: $query .= " order by avg(B.dex40) desc"; break;
-}
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$nationCount = MYDB_num_rows($result);
-for($i=0; $i < $nationCount; $i++) {
-    $nation = MYDB_fetch_array($result);
+        switch ($type) {
+            case  0:
+                $query .= " order by power desc";
+                break;
+            case  1:
+                $query .= " order by gennum desc";
+                break;
+            case  2:
+                $query .= " order by A.tech desc";
+                break;
+            case  3:
+                $query .= " order by A.gold desc";
+                break;
+            case  4:
+                $query .= " order by A.rice desc";
+                break;
+            case  5:
+                $query .= " order by avg(B.gold) desc";
+                break;
+            case  6:
+                $query .= " order by avg(B.rice) desc";
+                break;
+            case  7:
+                $query .= " order by avg(B.leadership) desc";
+                break;
+            case  8:
+                $query .= " order by avg(B.strength) desc";
+                break;
+            case  9:
+                $query .= " order by avg(B.intel) desc";
+                break;
+            case 10:
+                $query .= " order by avg(B.explevel) desc";
+                break;
+            case 13:
+                $query .= " order by avg(B.dex1) desc";
+                break;
+            case 14:
+                $query .= " order by avg(B.dex2) desc";
+                break;
+            case 15:
+                $query .= " order by avg(B.dex3) desc";
+                break;
+            case 16:
+                $query .= " order by avg(B.dex4) desc";
+                break;
+            case 17:
+                $query .= " order by avg(B.dex5) desc";
+                break;
+        }
+        foreach ($db->query($query) as $nation) {
+            $gen = $db->queryFirstRow('SELECT COUNT(*) as cnt,
+            ROUND(AVG(gold)) as avgg,
+            ROUND(AVG(rice)) as avgr,
+            SUM(leadership) as leadership,  ROUND(AVG(leadership), 1) as avgl,
+                                    ROUND(AVG(strength), 1) as avgs,
+                                    ROUND(AVG(intel), 1) as avgi,
+                                    ROUND(AVG(explevel), 1) as avge,
+            SUM(crew) as crew
+from general where nation=%i', $nation['nation']);

-    $query = "select COUNT(*) as cnt,
-                    ROUND(AVG(gold)) as avgg,
-                    ROUND(AVG(rice)) as avgr,
-                    SUM(leader) as leader,  ROUND(AVG(leader), 1) as avgl,
-                                            ROUND(AVG(power), 1) as avgp,
-                                            ROUND(AVG(intel), 1) as avgi,
-                                            ROUND(AVG(explevel), 1) as avge,
-                    SUM(crew) as crew
-        from general where nation='{$nation['nation']}'";
-    $genResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gen = MYDB_fetch_array($genResult);
+            $city = $db->queryFirstRow('SELECT COUNT(*) as cnt,
+            SUM(pop) as pop,    SUM(pop_max) as pop_max,
+            ROUND(SUM(pop)/SUM(pop_max)*100, 2) as rate,
+            trust,
+            ROUND(SUM(agri)/SUM(agri_max)*100, 2) as agri,
+            ROUND(SUM(comm)/SUM(comm_max)*100, 2) as comm,
+            ROUND(SUM(secu)/SUM(secu_max)*100, 2) as secu,
+            ROUND(SUM(wall)/SUM(wall_max)*100, 2) as wall,
+            ROUND(SUM(def)/SUM(def_max)*100, 2) as def
+from city where nation=%i', $nation['nation']);

-    $query = "select COUNT(*) as cnt,
-                    SUM(pop) as pop,    SUM(pop2) as pop2,
-                    ROUND(SUM(pop)/SUM(pop2)*100, 2) as rate,
-                    ROUND(SUM(agri)/SUM(agri2)*100, 2) as agri,
-                    ROUND(SUM(comm)/SUM(comm2)*100, 2) as comm,
-                    ROUND(SUM(secu)/SUM(secu2)*100, 2) as secu,
-                    ROUND(SUM(wall)/SUM(wall2)*100, 2) as wall,
-                    ROUND(SUM(def)/SUM(def2)*100, 2) as def
-        from city where nation='{$nation['nation']}'";
-    $cityResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($cityResult);
-
-    echo "
+            echo "
    <tr>
-        <td align=center style=background-color:{$nation['color']};color:".newColor($nation['color']).";>{$nation['name']}</td>
-        <td align=center>&nbsp;{$nation['connect']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['con']}&nbsp;</td>
+        <td align=center style=background-color:{$nation['color']};color:" . newColor($nation['color']) . ";>{$nation['name']}</td>
        <td align=center>&nbsp;{$nation['power']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['chemi']}&nbsp;</td>
        <td align=center>&nbsp;{$gen['cnt']}&nbsp;</td>
        <td align=center>&nbsp;{$city['cnt']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['tech']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['sabotagelimit']}&nbsp;</td>
+        <td align=right>&nbsp;" . sprintf('%.1f', $nation['tech']) . "&nbsp;</td>
+        <td align=center>&nbsp;{$nation['strategic_cmd_limit']}&nbsp;</td>
        <td align=center>&nbsp;{$nation['gold']}&nbsp;</td>
        <td align=center>&nbsp;{$nation['rice']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avgg']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avgr']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avgl']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avgp']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avgi']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avge']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['dex0']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['dex10']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['dex20']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['dex30']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['dex40']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['crew']}/{$gen['leader']}00&nbsp;</td>
-        <td align=center>&nbsp;{$city['pop']}/{$city['pop2']}&nbsp;</td>
-        <td align=center>&nbsp;{$city['rate']}%&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avgg']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avgr']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avgl']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avgs']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avgi']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avge']}&nbsp;</td>
+        <td align=right>&nbsp;{$nation['dex1']}&nbsp;</td>
+        <td align=right>&nbsp;{$nation['dex2']}&nbsp;</td>
+        <td align=right>&nbsp;{$nation['dex3']}&nbsp;</td>
+        <td align=right>&nbsp;{$nation['dex4']}&nbsp;</td>
+        <td align=right>&nbsp;{$nation['dex5']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['crew']}/{$gen['leadership']}00&nbsp;</td>
+        <td align=center>&nbsp;{$city['pop']}/{$city['pop_max']}&nbsp;</td>
+        <td align=center>&nbsp;" . sprintf('%.1f', $city['pop'] / Util::valueFit($city['pop_max'], 1) * 100) . "%&nbsp;</td>
        <td align=center>&nbsp;{$city['agri']}%&nbsp;</td>
        <td align=center>&nbsp;{$city['comm']}%&nbsp;</td>
        <td align=center>&nbsp;{$city['secu']}%&nbsp;</td>
        <td align=center>&nbsp;{$city['wall']}%&nbsp;</td>
        <td align=center>&nbsp;{$city['def']}%&nbsp;</td>
-        <td align=center style=background-color:{$nation['color']};color:".newColor($nation['color']).";>{$nation['name']}</td>
+        <td align=center style=background-color:{$nation['color']};color:" . newColor($nation['color']) . ";>{$nation['name']}</td>
    </tr>
 ";
-}
+        }

-?>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=getSabotageLogRecent(20)?></td></tr>
-</table>
+        ?>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= getSabotageLogRecent(20) ?></td>
+        </tr>
+    </table>

-<table align=center width=1760 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px; id=bg0>
-    <tr id=bg1>
-        <td width=30 align=center>년</td>
-        <td width=30 align=center>월</td>
-        <td width=50 align=center>국가수</td>
-        <td width=50 align=center>장수수</td>
-<?php
-switch($type2) {
-default:
-case 0: echo "<td width=1600>국력(국력,장수수,도시수,인구/100,최대인구/100,국가자원/100,장수자원/100,능력치,숙련/1000,경험공헌/100)</td>"; break;
-case 1: echo "<td width=1600>국가별성향</td>"; break;
-case 2: echo "<td width=1600>국가성향</td>"; break;
-case 3: echo "<td width=1600>장수성격</td>"; break;
-case 4: echo "<td width=1600>장수특기</td>"; break;
-case 5: echo "<td width=1600>병종수</td>"; break;
-case 6: echo "<td width=1600>기타</td>"; break;
-}
-?>
-    </tr>
-<?php
-$query = "select * from statistic where month=1 or no=1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$count = MYDB_num_rows($result);
-for($i=0; $i < $count; $i++) {
-    $stat = MYDB_fetch_array($result);
-
-    echo "
+    <table align=center width=1760 class="tb_layout bg0">
+        <tr class='bg1'>
+            <td width=30 align=center>년</td>
+            <td width=30 align=center>월</td>
+            <td width=50 align=center>국가수</td>
+            <td width=50 align=center>장수수</td>
+            <?php
+            switch ($type2) {
+                default:
+                case 0:
+                    echo "<td width=1600>국력(국력,장수수,도시수,인구/100,최대인구/100,국가자원/100,장수자원/100,능력치,숙련/1000,경험공헌/100)</td>";
+                    break;
+                case 1:
+                    echo "<td width=1600>국가별성향</td>";
+                    break;
+                case 2:
+                    echo "<td width=1600>국가성향</td>";
+                    break;
+                case 3:
+                    echo "<td width=1600>장수성격</td>";
+                    break;
+                case 4:
+                    echo "<td width=1600>장수특기</td>";
+                    break;
+                case 5:
+                    echo "<td width=1600>병종수</td>";
+                    break;
+                case 6:
+                    echo "<td width=1600>기타</td>";
+                    break;
+            }
+            ?>
+        </tr>
+        <?php
+        foreach ($db->query('SELECT * from statistic where month=1 or no=1') as $stat) {
+            echo "
    <tr>
        <td align=center>{$stat['year']}</td>
        <td align=center>{$stat['month']}</td>
        <td align=center>{$stat['nation_count']}</td>
        <td align=center>{$stat['gen_count']}</td>
 ";
-    switch($type2) {
-        default:
-        case 0: echo "<td>{$stat['power_hist']}</td>"; break;
-        case 1: echo "<td>{$stat['nation_name']}</td>"; break;
-        case 2: echo "<td>{$stat['nation_hist']}</td>"; break;
-        case 3: echo "<td>{$stat['personal_hist']}</td>"; break;
-        case 4: echo "<td>{$stat['special_hist']}</td>"; break;
-        case 5: echo "<td>{$stat['crewtype']}</td>"; break;
-        case 6: echo "<td>{$stat['etc']}</td>"; break;
-    }
-    
-    echo "
+            switch ($type2) {
+                default:
+                case 0:
+                    echo "<td>{$stat['power_hist']}</td>";
+                    break;
+                case 1:
+                    echo "<td>{$stat['nation_name']}</td>";
+                    break;
+                case 2:
+                    echo "<td>{$stat['nation_hist']}</td>";
+                    break;
+                case 3:
+                    echo "<td>{$stat['personal_hist']}</td>";
+                    break;
+                case 4:
+                    echo "<td>{$stat['special_hist']}</td>";
+                    break;
+                case 5:
+                    echo "<td>{$stat['crewtype']}</td>";
+                    break;
+                case 6:
+                    echo "<td>{$stat['etc']}</td>";
+                    break;
+            }
+
+            echo "
    </tr>
 ";
-}
-?>
-</table>
+        }
+        ?>
+    </table>

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>
@@ -1,42 +1,49 @@
 <?php
+
 namespace sammo;

 include "lib.php";
 include "func.php";

-$btn = Util::getReq('btn');
-$nation = Util::getReq('nation', 'int');
-
-extractMissingPostToGlobals();
+$btn = Util::getPost('btn');
+$nation = Util::getPost('nation', 'int');

 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

-if($session->userGrade < 5) {
+if ($session->userGrade < 6) {
    header('location:_admin5.php');
    die();
 }

 $db = DB::db();
-$connect=$db->get();

-switch($btn) {
+switch ($btn) {
    case "국가변경":
-        if($nation == 0) {
+        $oldNation = $db->queryFirstField('SELECT nation FROM general WHERE owner=%i', $userID);
+        if ($nation == 0) {
            $db->update('general', [
-                'nation'=>0,
-                'level'=>0,
+                'nation' => 0,
+                'officer_level' => 0,
+                'officer_city' => 0
            ], 'owner=%i', $userID);
        } else {
            $db->update('general', [
-                'nation'=>$nation,
-                'level'=>1,
+                'nation' => $nation,
+                'officer_level' => 1,
+                'officer_city' => 0
            ], 'owner=%i', $userID);
+            $db->update('nation', [
+                'gennum' => $db->sqleval('gennum + 1')
+            ], 'nation=%i', $oldNation);
+        }
+        if ($oldNation != 0) {
+            $db->update('nation', [
+                'gennum' => $db->sqleval('gennum - 1')
+            ], 'nation=%i', $oldNation);
        }
        break;
 }

 header('location:_admin5.php');
-
-
@@ -1,108 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$type = Util::getReq('type', 'int', 0);
-if($type < 0 || $type > 4){
-    $type = 0;
-}
-extractMissingPostToGlobals();
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-
-if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-</head>
-<body>
-관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
-</body>
-</html>";
-
-    exit();
-}
-
-$db = DB::db();
-$connect=$db->get();
-
-$sel[$type] = "selected";
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>접속정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-</head>
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>접 속 정 보<br><?=closeButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[0]??''?> value=0>접속률</option>
-            <option <?=$sel[1]??''?> value=1>총갱신</option>
-            <option <?=$sel[2]??''?> value=2>갱신/턴</option>
-            <option <?=$sel[3]??''?> value=3>총로그인</option>
-            <option <?=$sel[4]??''?> value=4>갱신/로그인</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr id=bg1>
-        <td align=center width=120>장수명</td>
-        <td align=center width=50>접속률</td>
-        <td align=center width=40>시작연령</td>
-        <td align=center width=40>연령</td>
-        <td align=center width=80>총갱신</td>
-        <td align=center width=80>갱신/턴</td>
-        <td align=center width=80>총로그인</td>
-        <td align=center width=100>갱신/로그인</td>
-    </tr>
-<?php
-switch($type) {
-    case 0: $query = "select name,connect,startage,age,refcnt,logcnt,refcnt/(age-startage+1)/12 as ref,refcnt/logcnt as log from general order by connect desc limit 0,30"; break;
-    case 1: $query = "select name,connect,startage,age,refcnt,logcnt,refcnt/(age-startage+1)/12 as ref,refcnt/logcnt as log from general order by refcnt desc limit 0,30"; break;
-    case 2: $query = "select name,connect,startage,age,refcnt,logcnt,refcnt/(age-startage+1)/12 as ref,refcnt/logcnt as log from general order by ref desc limit 0,30"; break;
-    case 3: $query = "select name,connect,startage,age,refcnt,logcnt,refcnt/(age-startage+1)/12 as ref,refcnt/logcnt as log from general order by logcnt desc limit 0,30"; break;
-    case 4: $query = "select name,connect,startage,age,refcnt,logcnt,refcnt/(age-startage+1)/12 as ref,refcnt/logcnt as log from general order by log desc limit 0,30"; break;
-}
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($genresult);
-
-for($i=0; $i < $gencount; $i++) {
-    $gen = MYDB_fetch_array($genresult);
-    echo "
-    <tr>
-        <td align=center>{$gen['name']}</td>
-        <td align=center>{$gen['connect']}</td>
-        <td align=center>{$gen['startage']}</td>
-        <td align=center>{$gen['age']}</td>
-        <td align=center>".round($gen['refcnt']/2, 1)."</td>
-        <td align=center>".round($gen['ref']/2,1)."</td>
-        <td align=center>{$gen['logcnt']}</td>
-        <td align=center>".round($gen['log']/2,1)."</td>
-    </tr>";
-}
-
-?>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-</body>
-</html>
@@ -1,144 +1,182 @@
 <?php
+
 namespace sammo;

+use sammo\Enums\GeneralQueryMode;
+
 include "lib.php";
 include "func.php";

-$btn = Util::getReq('btn');
-$gen = Util::getReq('gen', 'int', 0);
-$type = Util::getReq('type', 'int', 0);
+$btn = Util::getPost('btn');
+$gen = Util::getPost('gen', 'int', 0);
+$reqQueryType = Util::getPost('query_type', 'string', null);

-if($type < 0 || $type > 3){
-    $type = 0;
+// $queryTypeText, $reqArgType(0=>None, 1=>AdditionalColumn, 2=>rankVal, 3=>aux), $comp
+$queryMap = [
+    'turntime' => ['최근턴', 0, function ($lhs, $rhs) {
+        return - ($lhs['turntime'] <=> $rhs['turntime']);
+    }],
+    'recent_war' => ['최근전투', 1, function ($lhs, $rhs) {
+        return - ($lhs['recent_war'] <=> $rhs['recent_war']);
+    }],
+    'name' => ['장수명', 0, function ($lhs, $rhs) {
+        if ($lhs['npc'] !== $rhs['npc']) {
+            return $lhs['npc'] <=> $rhs['npc'];
+        }
+        return $lhs['name'] <=> $rhs['name'];
+    }],
+    'warnum' => ['전투수', 2, function ($lhs, $rhs) {
+        return - ($lhs['warnum'] <=> $rhs['warnum']);
+    }]
+];
+
+if ($reqQueryType === null || !key_exists($reqQueryType, $queryMap)) {
+    $reqQueryType = Util::array_first_key($queryMap);
 }

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-</head>
-<body>
-관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
-</body>
-</html>";
-
-    exit();
+if ($session->userGrade < 6) {
+    die(requireAdminPermissionHTML());
 }

 $db = DB::db();
-$connect=$db->get();

-if($btn == '정렬하기') {
+if ($btn == '정렬하기') {
    $gen = 0;
 }

-$sel[$type] = "selected";
+[$queryTypeText, $reqArgType, $comp] = $queryMap[$reqQueryType];
+if ($reqArgType === 0) {
+    $generalBasicList = $db->query('SELECT no, name, nation, npc, turntime FROM general');
+} else if ($reqArgType === 1) {
+    $generalBasicList = $db->query('SELECT no, name, nation, npc, turntime, %b FROM general', $reqQueryType);
+} else if ($reqArgType === 2) {
+    $generalBasicList = $db->query(
+        'SELECT no, name, nation, npc, turntime, value as %b
+        FROM general LEFT JOIN rank_data
+        ON general.no = rank_data.general_id
+        WHERE rank_data.type = %s',
+        $reqQueryType,
+        $reqQueryType
+    );
+} else if ($reqArgType === 3) {
+    $generalBasicList = array_map(function ($arr) {
+        $arr['aux'] = Json::decode($arr['aux']);
+        return $arr;
+    }, $db->query('SELECT no, name, nation, npc, turntime, aux FROM general'));
+} else {
+    throw new \sammo\MustNotBeReachedException();
+}
+
+usort($generalBasicList, $comp);
+
+if (!$gen) {
+    $gen = $generalBasicList[0]['no'];
+}
+
+$generalObj = General::createObjFromDB($gen, null, GeneralQueryMode::FullWithAccessLog);
+
 ?>
 <!DOCTYPE html>
 <html>
-<head>
-<title>로그정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-</head>
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>로 그 정 보<br><?=closeButton()?></td></tr>
-    <tr><td>
-        <form name=form1 method=post>
-        정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[0]??''?> value=0>최근턴</option>
-            <option <?=$sel[1]??''?> value=1>최근전투</option>
-            <option <?=$sel[2]??''?> value=2>장수명</option>
-            <option <?=$sel[3]??''?> value=3>전투수</option>
-        </select>
-        <input type=submit name=btn value='정렬하기'>
-        대상장수 :
-        <select name=gen size=1>
-<?php
-switch($type) {
-    case 0: $query = "select no,name from general order by turntime desc"; break;
-    case 1: $query = "select no,name from general order by recwar desc"; break;
-    case 2: $query = "select no,name from general order by npc,binary(name)"; break;
-    case 3: $query = "select no,name from general order by warnum desc"; break;
-}
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($result);

-for($i=0; $i < $gencount; $i++) {
-    $general = MYDB_fetch_array($result);
-    // 선택 없으면 맨 처음 장수
-    if($gen == 0) {
-        $gen = $general['no'];
-    }
-    if($gen == $general['no']) {
-        echo "
-            <option selected value={$general['no']}>{$general['name']}</option>";
-    } else {
-        echo "
-            <option value={$general['no']}>{$general['name']}</option>";
-    }
-}
-?>
-        </select>
-        <input type=submit name=btn value='조회하기'>
-        </form>
-    </td></tr>
-</table>
-<table width=1000 align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=50% align=center id=bg1><font color=skyblue size=3>장 수 정 보</font></td>
-        <td width=50% align=center id=bg1><font color=orange size=3>-</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?php generalInfo($gen); generalInfo2($gen); ?>
-        </td>
-        <td valign=top>&nbsp;
-        </td>
-    </tr>
-    <tr>
-        <td align=center id=bg1><font color=skyblue size=3>개인 기록</font></td>
-        <td align=center id=bg1><font color=orange size=3>전투 기록</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?=getGenLogRecent($gen, 24)?>
-        </td>
-        <td valign=top>
-            <?=getBatLogRecent($gen, 24)?>
-        </td>
-    </tr>
-    <tr>
-        <td align=center id=bg1><font color=skyblue size=3>장수 열전</font></td>
-        <td align=center id=bg1><font color=orange size=3>전투 결과</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?=getGeneralHistoryAll($gen)?>
-        </td>
-        <td valign=top>
-            <?=getBatResRecent($gen, 24)?>
-        </td>
-    </tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+<head>
+    <title>로그정보</title>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+</head>
+
+<body>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>로 그 정 보<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>
+                    정렬순서 :
+                    <select name='query_type' size=1>
+                        <?php foreach ($queryMap as $queryType => [$queryTypeText,]) : ?>
+                            <option <?= $queryType == $reqQueryType ? 'selected' : '' ?> value='<?= $queryType ?>'><?= $queryTypeText ?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <input type=submit name=btn value='정렬하기'>
+                    대상장수 :
+                    <select name=gen size=1>
+                        <?php foreach ($generalBasicList as $general) : ?>
+                            <option <?= $gen == $general['no'] ? 'selected' : '' ?> value='<?= $general['no'] ?>'><?= $general['name'] ?> (<?= substr($general['turntime'], 14, 5) ?>)</option>
+                        <?php endforeach; ?>
+                    </select>
+                    <input type=submit name=btn value='조회하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <table width=1000 align=center class='tb_layout bg0'>
+        <tr>
+            <td width=50% align=center class='bg1'>
+                <font color=skyblue size=3>장 수 정 보</font>
+            </td>
+            <td width=50% align=center class='bg1'>
+                <font color=orange size=3>-</font>
+            </td>
+        </tr>
+        <tr>
+            <td valign=top>
+                <?php generalInfo($generalObj);
+                generalInfo2($generalObj); ?>
+            </td>
+            <td valign=top>&nbsp;
+            </td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>
+                <font color=skyblue size=3>개인 기록</font>
+            </td>
+            <td align=center class='bg1'>
+                <font color=orange size=3>전투 기록</font>
+            </td>
+        </tr>
+        <tr>
+            <td valign=top>
+                <?= formatHistoryToHTML(getGeneralActionLogRecent($gen, 24)) ?>
+            </td>
+            <td valign=top>
+                <?= formatHistoryToHTML(getBattleDetailLogRecent($gen, 24)) ?>
+            </td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>
+                <font color=skyblue size=3>장수 열전</font>
+            </td>
+            <td align=center class='bg1'>
+                <font color=orange size=3>전투 결과</font>
+            </td>
+        </tr>
+        <tr>
+            <td valign=top>
+                <?= formatHistoryToHTML(getGeneralHistoryLogAll($gen)) ?>
+            </td>
+            <td valign=top>
+                <?= formatHistoryToHTML(getBattleResultRecent($gen, 24)) ?>
+            </td>
+        </tr>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>
@@ -1,40 +1,22 @@
 <?php
+
 namespace sammo;

 include "lib.php";
 include "func.php";

-$btn = Util::getReq('btn');
-$gen = Util::getReq('gen', 'int', 0);
+$btn = Util::getPost('btn');
+$gen = Util::getPost('gen', 'int', 0);
 $type = 0;

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if ($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-</head>
-<body>
-관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
-</body>
-</html>";
-
-    exit();
+if ($session->userGrade < 6) {
+    die(requireAdminPermissionHTML());
 }

 $db = DB::db();
-$connect=$db->get();

 if ($btn == '정렬하기') {
    $gen = 0;
@@ -44,120 +26,100 @@ $sel[$type] = "selected";
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
-<title>외교정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+    <title>외교정보</title>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>외 교 정 보<br><?=closeButton()?></td></tr>
-    <tr><td>
-        <form name=form1 method=post>
-        정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[0]??''?> value=0>상태</option>
-        </select>
-        <input type=submit name=btn value='정렬하기'>
-        </form>
-    </td></tr>
-</table>
-<table width=1000 align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>외 교 정 보<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>
+                    정렬순서 :
+                    <select name=type size=1>
+                        <option <?= $sel[0] ?? '' ?> value=0>상태</option>
+                    </select>
+                    <input type=submit name=btn value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <table width=1000 align=center class='tb_layout bg0'>
+        <tr>
+            <td colspan=9 align=center bgcolor=blue>외 교 관 계</td>
+        </tr>
+        <tr>
+            <td width=130 align=center class='bg1'>국 가 명</td>
+            <td width=130 align=center class='bg1'>국 가 명</td>
+            <td width=80 align=center class='bg1'>상 태</td>
+            <td width=60 align=center class='bg1'>기 간</td>
+        </tr>
+        <?php
+
+        $nationName = [];
+        $nationColor = [];
+        foreach (getAllNationStaticInfo() as $nation) {
+            $nationName[$nation['nation']] = $nation['name'];
+            $nationColor[$nation['nation']] = $nation['color'];
+        }
+
+
+        foreach ($db->query('SELECT * from diplomacy where me < you order by state desc') as $dip) {
+            $me = $dip['me'];
+            $you = $dip['you'];
+
+            if ($dip['state'] == 2) {
+                continue;
+            }
+
+            switch ($dip['state']) {
+                case 0:
+                    $state = "<font color=red>교 전</font>";
+                    break;
+                case 1:
+                    $state = "<font color=magenta>선포중</font>";
+                    break;
+                case 2:
+                    $state = "통 상";
+                    break;
+                case 7:
+                    $state = "<font color=green>불가침</font>";
+                    break;
+                default:
+                    throw new \Exception("알 수 없는 외교 상태: {$dip['state']}");
+            }
+
+            $date = TimeUtil::now();
+
+            echo "
    <tr>
-        <td width=100 align=center id=bg1>국 가 명</td>
-        <td width=100 align=center id=bg1>국 가 명</td>
-        <td width=80  align=center id=bg1>상 태</td>
-        <td width=60  align=center id=bg1>기 간</td>
-        <td align=center id=bg1>비 고</td>
-    </tr>
-<?php
-
-$nationName = [];
-$nationColor = [];
-foreach (getAllNationStaticInfo() as $nation) {
-    $nationName[$nation['nation']] = $nation['name'];
-    $nationColor[$nation['nation']] = $nation['color'];
-}
-
-
-$query = "select * from diplomacy where me < you order by state desc";
-
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$dipcount = MYDB_num_rows($result);
-for ($i=0; $i < $dipcount; $i++) {
-    $dip = MYDB_fetch_array($result);
-
-    $me = $dip['me'];
-    $you = $dip['you'];
-
-    $query = "select reserved,showing from diplomacy where you='$me' and me='$you'";
-    $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $dip2 = MYDB_fetch_array($result2);
-
-    if ($dip['state'] == 2 && $dip['fixed'] == "" && $dip['reserved'] == "" && $dip2['reserved'] == "") {
-        continue;
-    }
-
-    switch ($dip['state']) {
-        case 0: $state = "<font color=red>교 전</font>"; break;
-        case 1: $state = "<font color=magenta>선포중</font>"; break;
-        case 2: $state = "통 상"; break;
-        case 3: $state = "<font color=cyan>통합수락중</font>"; break;
-        case 4: $state = "<font color=cyan>통합제의중</font>"; break;
-        case 5: $state = "<font color=cyan>합병수락중</font>"; break;
-        case 6: $state = "<font color=cyan>합병제의중</font>"; break;
-        case 7: $state = "<font color=green>불가침</font>"; break;
-    }
-
-    $date = date('Y-m-d H:i:s');
-    $note = "";
-    if ($dip['fixed'] != "") {
-        if ($dip['state'] == 7) {
-            $note .= $dip['fixed'];
-        } else {
-            $note .= "<font color=gray>{$dip['fixed']}</font>";
-        }
-        if ($dip['reserved'] != "" || $dip2['reserved'] != "") {
-            $note .= "<br>";
-        }
-    }
-    if ($dip['reserved'] != "") {
-        if ($dip['showing'] >= $date) {
-            $note .= "<font color=skyblue>아국측 제의</font>: {$dip['reserved']}";
-        } else {
-            $note .= "<font color=gray>아국측 제의: {$dip['reserved']}</font>";
-        }
-        if ($dip2['reserved'] != "") {
-            $note .= "<br>";
-        }
-    }
-    if ($dip2['reserved'] != "") {
-        if ($dip2['showing'] >= $date) {
-            $note .= "<font color=limegreen>상대측 제의</font>: {$dip2['reserved']}";
-        } else {
-            $note .= "<font color=gray>상대측 제의: {$dip2['reserved']}</font>";
-        }
-    }
-    if ($note == "") {
-        $note = "&nbsp;";
-    }
-
-    echo "
-    <tr>
-        <td align=center style=color:".newColor($nationColor[$me]).";background-color:{$nationColor[$me]};>$nationName[$me]</td>
-        <td align=center style=color:".newColor($nationColor[$you]).";background-color:{$nationColor[$you]};>$nationName[$you]</td>
+        <td align=center style=color:" . newColor($nationColor[$me]) . ";background-color:{$nationColor[$me]};>$nationName[$me]</td>
+        <td align=center style=color:" . newColor($nationColor[$you]) . ";background-color:{$nationColor[$you]};>$nationName[$you]</td>
        <td align=center>$state</td>
        <td align=center>{$dip['term']} 개월</td>
-        <td align=left style=font-size:7px;>{$note}</td>
    </tr>";
-}
-?>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+        }
+        ?>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>
@@ -0,0 +1,32 @@
+<?php
+
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+
+if ($session->userGrade < 6) {
+    die('권한 부족');
+}
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+if (!$gameStor->isunited) {
+    die('아직 천통하지 않았습니다');
+}
+
+foreach ($db->queryFirstColumn(
+    'SELECT no FROM general WHERE npc < 2 and age >= %i',
+    40
+) as $generalNo) {
+    CheckHall($generalNo);
+}
+
+$inheritPointManager = InheritancePointManager::getInstance();
+foreach(General::createObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
+    $inheritPointManager->mergeTotalInheritancePoint($genObj);
+    $inheritPointManager->applyInheritanceUser($genObj->getVar('owner'));
+}
@@ -1,1657 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-//로그인 검사
-
-$isgen = Util::getReq('isgen');
-
-$leader1 = Util::getReq('leader1', 'int', 0);
-$power1 = Util::getReq('power1', 'int', 0);
-$intel1 = Util::getReq('intel1', 'int', 0);
-$type1 = Util::getReq('type1', 'int', 0);
-$crew1 = Util::getReq('crew1', 'int', 0);
-$train1 = Util::getReq('train1', 'int', 0);
-$atmos1 = Util::getReq('atmos1', 'int', 0);
-$level1 = Util::getReq('level1', 'int', 0);
-$explevel1 = Util::getReq('explevel1', 'int', 0);
-$tech1 = Util::getReq('tech1', 'int', 0);
-
-$dex10 = Util::getReq('dex10', 'int', 0);
-$dex110 = Util::getReq('dex110', 'int', 0);
-$dex120 = Util::getReq('dex120', 'int', 0);
-$dex130 = Util::getReq('dex130', 'int', 0);
-$dex140 = Util::getReq('dex140', 'int', 0);
-
-$dx10 = array_fill(0, 20, '');
-$dx110 = array_fill(0, 20, '');
-$dx120 = array_fill(0, 20, '');
-$dx130 = array_fill(0, 20, '');
-$dx140 = array_fill(0, 20, '');
-
-$leader2 = Util::getReq('leader2', 'int', 0);
-$power2 = Util::getReq('power2', 'int', 0);
-$intel2 = Util::getReq('intel2', 'int', 0);
-$type2 = Util::getReq('type2', 'int', 0);
-$crew2 = Util::getReq('crew2', 'int', 0);
-$train2 = Util::getReq('train2', 'int', 0);
-$atmos2 = Util::getReq('atmos2', 'int', 0);
-$level2 = Util::getReq('level2', 'int', 0);
-$explevel2 = Util::getReq('explevel2', 'int', 0);
-$tech2 = Util::getReq('tech2', 'int', 0);
-
-$dex20 = Util::getReq('dex20', 'int', 0);
-$dex210 = Util::getReq('dex210', 'int', 0);
-$dex220 = Util::getReq('dex220', 'int', 0);
-$dex230 = Util::getReq('dex230', 'int', 0);
-$dex240 = Util::getReq('dex240', 'int', 0);
-
-$dx20 = array_fill(0, 20, '');
-$dx210 = array_fill(0, 20, '');
-$dx220 = array_fill(0, 20, '');
-$dx230 = array_fill(0, 20, '');
-$dx240 = array_fill(0, 20, '');
-
-$def = Util::getReq('def', 'int', 0);
-$wall = Util::getReq('wall', 'int', 0);
-$atmos3 = Util::getReq('atmos3', 'int', 0);
-$train3 = Util::getReq('train3', 'int', 0);
-
-$sellevel1 = array_fill(0, 13, '');
-$sel1 = array_fill(0,44, '');
-$tch1 = array_fill(0,11, '');
-
-$sellevel2 = array_fill(0, 13, '');
-$sel2 = array_fill(0,44, '');
-$tch2 = array_fill(0,11, '');
-
-$dec = 0;
-$rice = 0;
-
-$db = DB::db();
-$connect=$db->get();
-increaseRefresh("시뮬", 2);
-
-$query = "select no,tournament,con,turntime from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$query = "select * from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$game = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $game['conlimit']);
-if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
-
-if($session->userGrade < 3) {
-    echo "특별회원이 아닙니다.";
-    exit();
-}
-
-$mydeathnumSum = 0;
-$mykillnumSum = 0;
-$expSum = 0;
-$ricingSum = 0;
-$expSum2 = 0;
-$ricingSum2 = 0;
-
-if($isgen == "장수평균" || $isgen == "성벽평균") {
-    $simulCount = 1000;
-} else {
-    $simulCount = 1;
-}
-
-$general = [
-    'no'=>1
-];
-$oppose = [
-    'no'=>2
-];
-$city = [
-    'gen1'=>0,
-    'gen2'=>0,
-    'gen3'=>0,
-];
-
-if($isgen == "장수공격" || $isgen == "성벽공격" || $isgen == "장수평균" || $isgen == "성벽평균") {
-    $msg2 = "";
-    for($i=0; $i < $simulCount; $i++) {
-        $general['leader'] = $leader1;
-        $general['power'] = $power1;
-        $general['intel'] = $intel1;
-        $general['crewtype'] = $type1;
-        $general['crew'] = $crew1;
-        $general['train'] = $train1;
-        $general['atmos'] = $atmos1;
-        $general['level'] = $level1;
-        $general['explevel'] = $explevel1;
-        $general['dex0'] = $dex10;
-        $general['dex10'] = $dex110;
-        $general['dex20'] = $dex120;
-        $general['dex30'] = $dex130;
-        $general['dex40'] = $dex140;
-
-        $general['injury'] = 0;
-        $general['horse'] = 0;
-        $general['weap'] = 0;
-        $general['book'] = 0;
-
-        $oppose['leader'] = $leader2;
-        $oppose['power'] = $power2;
-        $oppose['intel'] = $intel2;
-        $oppose['crewtype'] = $type2;
-        $oppose['crew'] = $crew2;
-        $oppose['train'] = $train2;
-        $oppose['atmos'] = $atmos2;
-        $oppose['level'] = $level2;
-        $oppose['explevel'] = $explevel2;
-        $oppose['dex0'] = $dex20;
-        $oppose['dex10'] = $dex210;
-        $oppose['dex20'] = $dex220;
-        $oppose['dex30'] = $dex230;
-        $oppose['dex40'] = $dex240;
-
-        $oppose['injury'] = 0;
-        $oppose['horse'] = 0;
-        $oppose['weap'] = 0;
-        $oppose['book'] = 0;
-
-        $city['def'] = $def;
-        $city['wall'] = $wall;
-        $city['agri'] = 0;
-        $city['comm'] = 0;
-        $city['secu'] = 0;
-
-        if($isgen == "장수공격" || $isgen == "장수평균") {
-            $opposecount = 1;
-        } else {
-            $opposecount = 0;
-        }
-
-        $warphase = getRate($game, $general['crewtype'], "spd");   //병종간 페이즈 수 얻기
-
-        // 우선 스케일링
-        $city['def'] *= 10;
-        $city['wall'] *= 10;
-
-        $msg = "";
-        $msg .= "<C>●</>1월:공격장수가 <R>공격</>합니다.<br>";
-
-        $exp = 0;   //병사 소진 시킨 만큼
-        $opexp = 0;
-        $exp2 = 1;  //능력경험치
-        $phase = 0;
-        while($phase < $warphase) {
-            // 장수가 없어서 도시 공격
-            if($opposecount == 0) {
-                $msg .= "<C>●</>".GameUnitConst::byID($general['crewtype'])->name."(으)로 성을 <M>공격</>합니다.<br>";
-
-                $mykillnum = 0; $mydeathnum = 0;
-                while($phase < $warphase) {
-                    $phase++;
-                    $myAtt = getAtt($general, $tech1, 0);
-                    $myDef = getDef($general, $tech1);
-                    $cityAtt = getCityAtt($city);
-                    $cityDef = getCityDef($city);
-
-                    // 감소할 병사 수
-                    $cityCrew = GameConst::$armperphase + $myAtt - $cityDef;
-                    $myCrew = GameConst::$armperphase + $cityAtt - $myDef;
-                    $cityweight = $myAtt - $cityDef;
-                    $myweight = $cityAtt - $myDef;
-
-                    //훈련 사기따라
-                    $myCrew = getCrew($myCrew, $atmos3, $general['train']);
-                    $cityCrew = getCrew($cityCrew, $general['atmos'], $train3);
-                    //숙련도 따라
-                    $genDexAtt = getGenDex($general, $general['crewtype']);
-                    $genDexDef = getGenDex($general, 40);
-                    $cityCrew *= getDexLog($genDexAtt, ($train3-60)*7200);
-                    $myCrew *= getDexLog(($atmos3-60)*7200, $genDexDef);
-
-                    $avoid = 1;
-                    // 병종간 특성
-                    if(intdiv($general['crewtype'], 10) == 3) {   // 귀병
-                        $int = $general['intel'] + getBookEff($general['book']);
-                        if($general['crewtype'] == 30) {
-                            $ratio2 = $int * 5;   // 0~500 즉 50%
-                        } elseif($general['crewtype'] == 31) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 32) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 33) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 34) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 35) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($general['crewtype'] == 36) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($general['crewtype'] == 37) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 38) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        }
-                        $ratio = rand() % 1000; // 0~999
-                        if($ratio <= $ratio2) {
-                            $ratio = rand() % 100; // 0~99
-                            if($ratio >= 30) {
-                                $type = rand() % 3;
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>급습</>을 <C>성공</>했다!<br>";
-                                    $cityCrew *= 1.2;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>위보</>를 <C>성공</>했다!<br>";
-                                    $cityCrew *= 1.4;
-                                    break;
-                                case 2:
-                                    $msg .= "<C>●</><D>혼란</>을 <C>성공</>했다!<br>";
-                                    $cityCrew *= 1.6;
-                                    break;
-                                }
-                            } else {
-                                $type = rand() % 3;
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>급습</>을 <R>실패</>했다!<br>";
-                                    $cityCrew /= 1.2;
-                                    $myCrew *= 1.2;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>위보</>를 <R>실패</>했다!<br>";
-                                    $cityCrew /= 1.4;
-                                    $myCrew *= 1.4;
-                                    break;
-                                case 2:
-                                $msg .= "<C>●</><D>혼란</>을 <R>실패</>했다!<br>";
-                                $cityCrew /= 1.6;
-                                $myCrew *= 1.6;
-                                    break;
-                                }
-                            }
-                        }
-                    } elseif($general['crewtype'] == 40) { // 정란
-                        $cityCrew = $cityCrew * 1.5;
-                    } elseif($general['crewtype'] == 41) { // 충차
-                        $cityCrew = $cityCrew * 2.0;
-                    } elseif($general['crewtype'] == 42) { // 벽력거
-                        $cityCrew = $cityCrew * 1.5;
-                    }
-                    //군주, 참모, 장군 공격 보정 5%
-                    if($general['level'] == 12 || $general['level'] == 11 || $general['level'] == 10 || $general['level'] == 8 || $general['level'] == 6) {
-                        $cityCrew = $cityCrew * 1.05;
-                    }
-                    //레벨 보정
-                    $cityCrew = $cityCrew * (100 + $general['explevel']/6)/100;
-
-                    //크리
-                    $rd = rand() % 100; // 0 ~ 99
-                    $ratio = CriticalRatio3($general['leader'], $general['power'], $general['intel']);
-                    if($ratio >= $rd && $avoid == 1) {
-                        $msg .= "<C>●</><C>필살</>공격!</><br>";
-                        $cityCrew = CriticalScore2($cityCrew);
-                        $avoid = 0;
-                    }
-                    //회피
-                    $ratio = rand() % 100; // 0 ~ 99
-                    $ratio2 = getRate($game, $general['crewtype'], "avd");   //회피율
-                    if($ratio < $ratio2 && $avoid == 1) {
-                        $msg .= "<C>●</><C>회피</>했다!</><br>";
-                        $myCrew /= 10; // 10%만 소모
-                        $avoid = 0;
-                    }
-
-                    //랜타추가
-                    $cityCrew *= (rand() % 21 + 90)/100; // 90~110%
-                    $myCrew *= (rand() % 21 + 90)/100; // 90~110%
-
-                    $general['crew'] -= Util::round($myCrew);
-                    $city['def'] -= Util::round($cityCrew);
-                    $city['wall'] -= Util::round($cityCrew);
-
-                    $tempMyCrew = $myCrew; $tempCityCrew = $cityCrew;
-                    $tempGeneralCrew = $general['crew']; $tempCityDef = $city['def'];
-
-                    if($city['wall'] <= 0) { $city['wall'] = 0; }
-
-                    if($city['def'] < 0) {
-                        $offset =  Util::round($tempCityDef*$tempMyCrew/$tempCityCrew);
-                        $myCrew += $offset;
-                        $general['crew'] -= $offset;
-                        $cityCrew += $tempCityDef;
-                        $city['def'] = 0;
-                    }
-                    if($general['crew'] < 0) {
-                        $offset =  Util::round($tempGeneralCrew*$tempCityCrew/$tempMyCrew);
-                        $cityCrew += $offset;
-                        $city['def'] -= $offset;
-                        $myCrew += $tempGeneralCrew;
-                        $general['crew'] = 0;
-                    }
-
-                    $exp += $cityCrew;
-                    $opexp += $myCrew;
-                    $general['crew'] = Util::round($general['crew']);
-                    $cityCrew = Util::round($cityCrew);
-                    $myCrew =  Util::round($myCrew);
-                    $myAtt = round($myAtt, 2);
-                    $myDef = round($myDef, 2);
-                    $cityAtt = round($cityAtt, 2);
-                    $cityDef = round($cityDef, 2);
-                    $msg .= "<C>●</> $phase : <Y1>【공격장수】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$city['def']} (-$cityCrew)</> <Y1>【성벽】</><br>";
-
-                    $mykillnum += $cityCrew; $mydeathnum += $myCrew;
-
-                    if($city['def'] <= 0) { break; }
-                    if($general['crew'] <= 0) { break; }
-                }
-
-                // 도시쌀 소모 계산
-                $opexp =  Util::round($opexp / 50);
-                $rice = Util::round($opexp * 4 * getCrewtypeRice(0, 0) * ($train3/100 - 0.2));
-
-                //원래대로 스케일링
-                $city['def'] = Util::round($city['def'] / 10);
-                $city['wall'] = Util::round($city['wall'] / 10);
-                //내정 감소
-                $dec =  Util::round($cityCrew / 10);
-                $city['agri'] -= $dec;
-                $city['comm'] -= $dec;
-                $city['secu'] -= $dec;
-                if($city['agri'] < 0) { $city['agri'] = 0; }
-                if($city['comm'] < 0) { $city['comm'] = 0; }
-                if($city['secu'] < 0) { $city['secu'] = 0; }
-                $msg .= "<S>★</>병사수 변화 : <C>-$mydeathnum</> vs <C>-$mykillnum</><br>";
-                $msg .= "<R>★</>【성벽】내정 감소량 : $dec 【성벽】쌀 소모 : $rice<br>";
-
-//                $msg2 .= "<S>★</>병사수 변화 : <C>-$mydeathnum</> vs <C>-$mykillnum</>　　　";
-//                $msg2 .= "<R>★</>【성벽】내정 감소량 : $dec 【성벽】쌀 소모 : $rice<br>";
-
-                if($city['def'] == 0 || $general['crew'] == 0) {
-                    break;
-                }
-            // 장수 대결
-            } else {
-                $msg .= "<C>●</>".GameUnitConst::byID($general['crewtype'])->name."(으)로 <Y>수비장수</>의 ".GameUnitConst::byID($oppose['crewtype'])->name."(을)를 공격합니다.<br>";
-
-                $mykillnum = 0; $mydeathnum = 0;
-                while($phase < $warphase) {
-                    $phase++;
-
-                    $myAtt = getAtt($general, $tech1, 0);
-                    $myDef = getDef($general, $tech1);
-                    $opAtt = getAtt($oppose, $tech2, 0);
-                    $opDef = getDef($oppose, $tech2);
-                    // 감소할 병사 수
-                    $myCrew = GameConst::$armperphase + $opAtt - $myDef;
-                    $opCrew = GameConst::$armperphase + $myAtt - $opDef;
-                    //훈련 사기따라
-                    $myCrew = getCrew($myCrew, $oppose['atmos'], $general['train']);
-                    $opCrew = getCrew($opCrew, $general['atmos'], $oppose['train']);
-                    //숙련도 따라
-                    $genDexAtt = getGenDex($general, $general['crewtype']);
-                    $genDexDef = getGenDex($general, $oppose['crewtype']);
-                    $oppDexAtt = getGenDex($oppose, $oppose['crewtype']);
-                    $oppDexDef = getGenDex($oppose, $general['crewtype']);
-                    $opCrew *= getDexLog($genDexAtt, $oppDexDef);
-                    $myCrew *= getDexLog($oppDexAtt, $genDexDef);
-
-                    $myAvoid = 1;
-                    $opAvoid = 1;
-                    // 병종간 특성
-                    if(intdiv($general['crewtype'], 10) == 3) {   // 귀병
-                        $int = $general['intel'] + getBookEff($general['book']);
-                        if($general['crewtype'] == 30) {
-                            $ratio2 = $int * 5;   // 0~500 즉 50%
-                        } elseif($general['crewtype'] == 31) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 32) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 33) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 34) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 35) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($general['crewtype'] == 36) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($general['crewtype'] == 37) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 38) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        }
-                        $ratio = rand() % 1000; // 0~999
-                        if($ratio <= $ratio2) {
-                            $ratio = rand() % 100;
-                            if($ratio >= 30) {
-                                $type = rand() % 5; // 0~4
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>위보</>를 <C>성공</>했다!<br>";
-                                    $opCrew *= 1.2;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>매복</>을 <C>성공</>했다!<br>";
-                                    $opCrew *= 1.4;
-                                    break;
-                                case 2:
-                                    $msg .= "<C>●</><D>반목</>을 <C>성공</>했다!<br>";
-                                    $opCrew *= 1.6;
-                                    break;
-                                case 3:
-                                    $msg .= "<C>●</><D>화계</>를 <C>성공</>했다!<br>";
-                                    $opCrew *= 1.8;
-                                    break;
-                                case 4:
-                                    $msg .= "<C>●</><D>혼란</>을 <C>성공</>했다!<br>";
-                                    $opCrew *= 2.0;
-                                    break;
-                                }
-                            } else {
-                                $type = rand() % 5; // 0~4
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>위보</>를 <R>실패</>했다!<br>";
-                                    $opCrew /= 1.1;
-                                    $myCrew *= 1.1;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>매복</>을 <R>실패</>했다!<br>";
-                                    $opCrew /= 1.2;
-                                    $myCrew *= 1.2;
-                                    break;
-                                case 2:
-                                    $msg .= "<C>●</><D>반목</>을 <R>실패</>했다!<br>";
-                                    $opCrew /= 1.3;
-                                    $myCrew *= 1.3;
-                                    break;
-                                case 3:
-                                    $msg .= "<C>●</><D>화계</>를 <R>실패</>했다!<br>";
-                                    $opCrew /= 1.4;
-                                    $myCrew *= 1.4;
-                                    break;
-                                case 4:
-                                    $msg .= "<C>●</><D>혼란</>을 <R>실패</>했다!<br>";
-                                    $opCrew /= 1.5;
-                                    $myCrew *= 1.5;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    // 상대 장수 병종간 특성
-                    if(intdiv($oppose['crewtype'], 10) == 3) {   // 귀병
-                        $int = $oppose['intel'] + getBookEff($oppose['book']);
-                        if($oppose['crewtype'] == 30) {
-                            $ratio2 = $int * 5;   // 0~500 즉 50%
-                        } elseif($oppose['crewtype'] == 31) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($oppose['crewtype'] == 32) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($oppose['crewtype'] == 33) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($oppose['crewtype'] == 34) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($oppose['crewtype'] == 35) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($oppose['crewtype'] == 36) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($oppose['crewtype'] == 37) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($oppose['crewtype'] == 38) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        }
-                        $ratio = rand() % 1000; // 0~999
-                        if($ratio <= $ratio2) {
-                            $ratio = rand() % 100;
-                            if($ratio >= 30) {
-                                $type = rand() % 5; // 0~4
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>위보</>에 당했다!<br>";
-                                    $myCrew *= 1.2;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>매복</>에 당했다!<br>";
-                                    $myCrew *= 1.4;
-                                    break;
-                                case 2:
-                                    $msg .= "<C>●</><D>반목</>에 당했다!<br>";
-                                    $myCrew *= 1.6;
-                                    break;
-                                case 3:
-                                    $msg .= "<C>●</><D>화계</>에 당했다!<br>";
-                                    $myCrew *= 1.8;
-                                    break;
-                                case 4:
-                                    $msg .= "<C>●</><D>혼란</>에 당했다!<br>";
-                                    $myCrew *= 2.0;
-                                    break;
-                                }
-                            } else {
-                                $type = rand() % 5; // 0~4
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>위보</>를 간파했다!<br>";
-                                    $myCrew /= 1.1;
-                                    $opCrew *= 1.1;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>매복</>을 간파했다!<br>";
-                                    $myCrew /= 1.2;
-                                    $opCrew *= 1.2;
-                                    break;
-                                case 2:
-                                    $msg .= "<C>●</><D>반목</>을 간파했다!<br>";
-                                    $myCrew /= 1.3;
-                                    $opCrew *= 1.3;
-                                    break;
-                                case 3:
-                                    $msg .= "<C>●</><D>화계</>를 간파했다!<br>";
-                                    $myCrew /= 1.4;
-                                    $opCrew *= 1.4;
-                                    break;
-                                case 4:
-                                    $msg .= "<C>●</><D>혼란</>을 간파했다!<br>";
-                                    $myCrew /= 1.5;
-                                    $opCrew *= 1.5;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    if($oppose['crewtype'] == 43) { // 목우
-                        $r = 0;
-                        $r += $oppose['atmos'];
-                        $r += $oppose['train'];
-                        $ratio = rand() % 400;  // 최대 50% 저지
-                        if($ratio < $r && $opAvoid == 1) {
-                            $msg .= "<C>●</><R>저지</>당했다!</><br>";
-                            $opAvoid = 0;
-                            continue;
-                        }
-                    }
-
-                    // my 입장 상성
-                    // 보병계열 > 궁병계열
-                    if(intdiv($general['crewtype'], 10) == 0 && intdiv($oppose['crewtype'], 10) == 1) {
-                        $myCrew *= 0.8;
-                        $opCrew *= 1.2;
-                    }
-                    // 궁병계열 > 기병계열
-                    if(intdiv($general['crewtype'], 10) == 1 && intdiv($oppose['crewtype'], 10) == 2) {
-                        $myCrew *= 0.8;
-                        $opCrew *= 1.2;
-                    }
-                    // 기병계열 > 보병계열
-                    if(intdiv($general['crewtype'], 10) == 2 && intdiv($oppose['crewtype'], 10) == 0) {
-                        $myCrew *= 0.8;
-                        $opCrew *= 1.2;
-                    }
-                    // 차병계열
-                    if(intdiv($general['crewtype'], 10) == 4) {
-                        $myCrew *= 1.2;
-                        $opCrew *= 0.8;
-                    }
-
-                    // op 입장 상성
-                    // 보병계열 > 궁병계열
-                    if(intdiv($oppose['crewtype'], 10) == 0 && intdiv($general['crewtype'], 10) == 1) {
-                        $opCrew *= 0.8;
-                        $myCrew *= 1.2;
-                    }
-                    // 궁병계열 > 기병계열
-                    if(intdiv($oppose['crewtype'], 10) == 1 && intdiv($general['crewtype'], 10) == 2) {
-                        $opCrew *= 0.8;
-                        $myCrew *= 1.2;
-                    }
-                    // 기병계열 > 보병계열
-                    if(intdiv($oppose['crewtype'], 10) == 2 && intdiv($general['crewtype'], 10) == 0) {
-                        $opCrew *= 0.8;
-                        $myCrew *= 1.2;
-                    }
-                    // 차병계열
-                    if(intdiv($oppose['crewtype'], 10) == 4) {
-                        $opCrew *= 1.2;
-                        $myCrew *= 0.8;
-                    }
-
-                    //군주, 참모, 장군 공격 보정 5%
-                    if($general['level'] == 12 || $general['level'] == 11 || $general['level'] == 10 || $general['level'] == 8 || $general['level'] == 6) {
-                        $opCrew = $opCrew * 1.05;
-                    }
-                    //상대장수 관직 보정
-                    //군주, 참모, 모사 방어 보정 5%
-                    if($oppose['level'] == 12 || $oppose['level'] == 11 || $oppose['level'] == 9 || $oppose['level'] == 7 || $oppose['level'] == 5) {
-                        $opCrew = $opCrew * 0.95;
-                    } elseif($oppose['level'] == 4 && $oppose['no'] == $city['gen1']) { // 태수 보정
-                        $opCrew = $opCrew * 0.95;
-                    } elseif($oppose['level'] == 3 && $oppose['no'] == $city['gen2']) { // 군사 보정
-                        $opCrew = $opCrew * 0.95;
-                    } elseif($oppose['level'] == 2 && $oppose['no'] == $city['gen3']) { // 시중 보정
-                        $opCrew = $opCrew * 0.95;
-                    }
-
-                    //레벨 보정
-                    $myCrew = $myCrew * ((100 - $general['explevel']/3)/100);
-                    $opCrew = $opCrew / ((100 - $general['explevel']/3)/100);
-                    $myCrew = $myCrew / ((100 -  $oppose['explevel']/3)/100);
-                    $opCrew = $opCrew * ((100 -  $oppose['explevel']/3)/100);
-
-                    //크리
-                    $rd = rand() % 100; // 0 ~ 99
-                    $ratio = CriticalRatio3($general['leader'], $general['power'], $general['intel']);
-                    if($ratio >= $rd && $myAvoid == 1) {
-                        $msg .= "<C>●</><C>필살</>공격!</><br>";
-                        $opCrew = CriticalScore2($opCrew);
-                        $myAvoid = 0;
-                    }
-                    //크리
-                    $rd = rand() % 100; // 0 ~ 99
-                    $ratio = CriticalRatio3($oppose['leader'], $oppose['power'], $oppose['intel']);
-                    if($ratio >= $rd && $opAvoid == 1) {
-                        $msg .= "<C>●</>상대의 <R>필살</>공격!</><br>";
-                        $myCrew = CriticalScore2($myCrew);
-                        $opAvoid = 0;
-                    }
-                    //회피
-                    $ratio = rand() % 100; // 0 ~ 99
-                    $ratio2 = getRate($game, $general['crewtype'], "avd");   //회피율
-                    if($ratio < $ratio2 && $myAvoid == 1) {
-                        $msg .= "<C>●</><C>회피</>했다!</><br>";
-                        $myCrew /= 10; // 10%만 소모
-                        $myAvoid = 0;
-                    }
-                    //회피
-                    $ratio = rand() % 100; // 0 ~ 99
-                    $ratio2 = getRate($game, $oppose['crewtype'], "avd");   //회피율
-                    if($ratio < $ratio2 && $opAvoid == 1) {
-                        $msg .= "<C>●</>상대가 <R>회피</>했다!</><br>";
-                        $opCrew /= 10; // 10%만 소모
-                        $opAvoid = 0;
-                    }
-
-                    //랜타추가
-                    $opCrew *= (rand() % 21 + 90)/100; // 90~110%
-                    $myCrew *= (rand() % 21 + 90)/100; // 90~110%
-
-                    $general['crew'] -=  Util::round($myCrew);
-                    $oppose['crew'] -=  Util::round($opCrew);
-                    $tempMyCrew = $myCrew; $tempOpCrew = $opCrew;
-                    $tempGeneralCrew = $general['crew']; $tempOpposeCrew = $oppose['crew'];
-                    if($general['crew'] <= 0 && $oppose['crew'] <= 0) {
-                        $r1 = $tempGeneralCrew / $tempMyCrew;
-                        $r2 = $tempOpposeCrew / $tempOpCrew;
-
-                        if($r1 > $r2) {
-                            $offset =  Util::round($tempOpposeCrew*$tempMyCrew/$tempOpCrew);
-                            $myCrew += $offset;
-                            $general['crew'] -= $offset;
-                            $opCrew += $tempOpposeCrew;
-                            $oppose['crew'] = 0;
-                        } else {
-                            $offset =  Util::round($tempGeneralCrew*$tempOpCrew/$tempMyCrew);
-                            $opCrew += $offset;
-                            $oppose['crew'] -= $offset;
-                            $myCrew += $tempGeneralCrew;
-                            $general['crew'] = 0;
-                        }
-                    } elseif($general['crew'] * $oppose['crew'] <= 0) {
-                        if($oppose['crew'] < 0) {
-                            $offset = Util::round($tempOpposeCrew*$tempMyCrew/$tempOpCrew);
-                            $myCrew += $offset;
-                            $general['crew'] -= $offset;
-                            $opCrew += $tempOpposeCrew;
-                            $oppose['crew'] = 0;
-                        }
-                        if($general['crew'] < 0) {
-                            $offset = Util::round($tempGeneralCrew*$tempOpCrew/$tempMyCrew);
-                            $opCrew += $offset;
-                            $oppose['crew'] -= $offset;
-                            $myCrew += $tempGeneralCrew;
-                            $general['crew'] = 0;
-                        }
-                    }
-
-                    $exp += $opCrew;
-                    $opexp += $myCrew;
-                    $general['crew'] = Util::round($general['crew']);
-                    $oppose['crew'] = Util::round($oppose['crew']);
-                    $myCrew = Util::round($myCrew);
-                    $opCrew = Util::round($opCrew);
-                    $myAtt = round($myAtt, 2);
-                    $myDef = round($myDef, 2);
-                    $opAtt = round($opAtt, 2);
-                    $opDef = round($opDef, 2);
-                    $msg .= "<C>●</> $phase : <Y1>【공격장수】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$oppose['crew']} (-$opCrew)</> <Y1>【수비장수】</><br>";
-
-                    $mykillnum += $opCrew; $mydeathnum += $myCrew;
-
-                    if($oppose['crew'] <= 0) { break; }
-                    if($general['crew'] <= 0) { break; }
-                }
-
-                $msg .= "<S>★</>병사수 변화 : <C>-$mydeathnum</> vs <C>-$mykillnum</><br>";
-//                $msg2 .= "<S>★</>병사수 변화 : <C>-$mydeathnum</> vs <C>-$mykillnum</>　　　";
-            }
-        }
-
-        // 공헌, 명성 상승
-        $exp = Util::round($exp / 50);
-        $ricing = ($exp * 5 * getCrewtypeRice($general['crewtype'], $tech1));
-        $msg .= "★ 【공격장수】공헌 상승 : $exp 쌀 소비 : {$exp}x5x".getCrewtypeRice($general['crewtype'], $tech1)." = $ricing<br>";
-//        $msg2 .= "★ 【공격장수】공헌 상승 : $exp 쌀 소비 : {$exp}x5x".getCrewtypeRice($general['crewtype'], $tech1)." = $ricing<br>";
-
-        $msg = ConvertLog($msg, 1);
-
-        $mydeathnumSum += $mydeathnum;
-        $mykillnumSum += $mykillnum;
-        $expSum += $exp;
-        $ricingSum += $ricing;
-        $expSum2 += $dec;
-        $ricingSum2 += $rice;
-    }
-
-    $mydeathnumSum /= $simulCount;
-    $mykillnumSum /= $simulCount;
-    $expSum /= $simulCount;
-    $ricingSum /= $simulCount;
-    $expSum2 /= $simulCount;
-    $ricingSum2 /= $simulCount;
-    if($isgen == "성벽평균") {
-        $msg2 .= "{$simulCount}회 평균<br>";
-        $msg2 .= "<S>★</>병사수 변화 : <C>-$mydeathnumSum</> vs <C>-$mykillnumSum</>　　　";
-        $msg2 .= "<R>★</>【성벽】내정 감소량 : $expSum2 【성벽】쌀 소모 : $ricingSum2<br>";
-        $msg2 .= "★ 【공격장수】공헌 상승 : $expSum 쌀 소비 : {$expSum}x5x".getCrewtypeRice($general['crewtype'], $tech1)." = $ricingSum<br>";
-    } elseif($isgen == "장수평균") {
-        $msg2 .= "{$simulCount}회 평균<br>";
-        $msg2 .= "<S>★</>병사수 변화 : <C>-$mydeathnumSum</> vs <C>-$mykillnumSum</>　　　";
-        $msg2 .= "★ 【공격장수】공헌 상승 : $expSum 쌀 소비 : {$expSum}x5x".getCrewtypeRice($general['crewtype'], $tech1)." = $ricingSum<br>";
-    }
-
-    $msg2 = ConvertLog($msg2, 1);
-} else {
-    $leader1 = 70;
-    $power1 = 70;
-    $intel1 = 10;
-    $type1 = 0;
-    $crew1 = 7000;
-    $train1 = 100;
-    $atmos1 = 100;
-    $level1 = 1;
-    $explevel1 = 20;
-
-    $leader2 = 70;
-    $power2 = 70;
-    $intel2 = 10;
-    $type2 = 0;
-    $crew2 = 7000;
-    $train2 = 100;
-    $atmos2 = 100;
-    $level2 = 1;
-    $explevel2 = 20;
-
-    $def = 7000;
-    $wall = 7000;
-    $train3 = $game['city_rate'];
-    $atmos3 = $game['city_rate'];
-}
-
-switch($level1) {
-    case 12: $sellevel1[12] = "selected"; break;
-    case 11: $sellevel1[11] = "selected"; break;
-    case 10: $sellevel1[10] = "selected"; break;
-    case 9: $sellevel1[9] = "selected"; break;
-    case 8: $sellevel1[8] = "selected"; break;
-    case 7: $sellevel1[7] = "selected"; break;
-    case 6: $sellevel1[6] = "selected"; break;
-    case 5: $sellevel1[5] = "selected"; break;
-    case 1: $sellevel1[1] = "selected"; break;
-}
-switch($level2) {
-    case 12: $sellevel2[12] = "selected"; break;
-    case 11: $sellevel2[11] = "selected"; break;
-    case 10: $sellevel2[10] = "selected"; break;
-    case 9: $sellevel2[9] = "selected"; break;
-    case 8: $sellevel2[8] = "selected"; break;
-    case 7: $sellevel2[7] = "selected"; break;
-    case 6: $sellevel2[6] = "selected"; break;
-    case 5: $sellevel2[5] = "selected"; break;
-    case 1: $sellevel2[1] = "selected"; break;
-}
-
-switch($type1) {
-    case 0: $sel1[0] = "selected"; break;
-    case 1: $sel1[1] = "selected"; break;
-    case 2: $sel1[2] = "selected"; break;
-    case 3: $sel1[3] = "selected"; break;
-    case 4: $sel1[4] = "selected"; break;
-    case 5: $sel1[5] = "selected"; break;
-    case 10: $sel1[10] = "selected"; break;
-    case 11: $sel1[11] = "selected"; break;
-    case 12: $sel1[12] = "selected"; break;
-    case 13: $sel1[13] = "selected"; break;
-    case 14: $sel1[14] = "selected"; break;
-    case 20: $sel1[20] = "selected"; break;
-    case 21: $sel1[21] = "selected"; break;
-    case 22: $sel1[22] = "selected"; break;
-    case 23: $sel1[23] = "selected"; break;
-    case 24: $sel1[24] = "selected"; break;
-    case 25: $sel1[25] = "selected"; break;
-    case 26: $sel1[26] = "selected"; break;
-    case 27: $sel1[27] = "selected"; break;
-    case 30: $sel1[30] = "selected"; break;
-    case 31: $sel1[31] = "selected"; break;
-    case 32: $sel1[32] = "selected"; break;
-    case 33: $sel1[33] = "selected"; break;
-    case 34: $sel1[34] = "selected"; break;
-    case 35: $sel1[35] = "selected"; break;
-    case 36: $sel1[36] = "selected"; break;
-    case 37: $sel1[37] = "selected"; break;
-    case 38: $sel1[38] = "selected"; break;
-    case 40: $sel1[40] = "selected"; break;
-    case 41: $sel1[41] = "selected"; break;
-    case 42: $sel1[42] = "selected"; break;
-    case 43: $sel1[43] = "selected"; break;
-}
-switch($type2) {
-    case 0: $sel2[0] = "selected"; break;
-    case 1: $sel2[1] = "selected"; break;
-    case 2: $sel2[2] = "selected"; break;
-    case 3: $sel2[3] = "selected"; break;
-    case 4: $sel2[4] = "selected"; break;
-    case 5: $sel2[5] = "selected"; break;
-    case 10: $sel2[10] = "selected"; break;
-    case 11: $sel2[11] = "selected"; break;
-    case 12: $sel2[12] = "selected"; break;
-    case 13: $sel2[13] = "selected"; break;
-    case 14: $sel2[14] = "selected"; break;
-    case 20: $sel2[20] = "selected"; break;
-    case 21: $sel2[21] = "selected"; break;
-    case 22: $sel2[22] = "selected"; break;
-    case 23: $sel2[23] = "selected"; break;
-    case 24: $sel2[24] = "selected"; break;
-    case 25: $sel2[25] = "selected"; break;
-    case 26: $sel2[26] = "selected"; break;
-    case 27: $sel2[27] = "selected"; break;
-    case 30: $sel2[30] = "selected"; break;
-    case 31: $sel2[31] = "selected"; break;
-    case 32: $sel2[32] = "selected"; break;
-    case 33: $sel2[33] = "selected"; break;
-    case 34: $sel2[34] = "selected"; break;
-    case 35: $sel2[35] = "selected"; break;
-    case 36: $sel2[36] = "selected"; break;
-    case 37: $sel2[37] = "selected"; break;
-    case 38: $sel2[38] = "selected"; break;
-    case 40: $sel2[40] = "selected"; break;
-    case 41: $sel2[41] = "selected"; break;
-    case 42: $sel2[42] = "selected"; break;
-    case 43: $sel2[43] = "selected"; break;
-}
-switch($tech1) {
-    case     0: $tch1[0]  = "selected"; break;
-    case  1000: $tch1[1]  = "selected"; break;
-    case  2000: $tch1[2]  = "selected"; break;
-    case  3000: $tch1[3]  = "selected"; break;
-    case  4000: $tch1[4]  = "selected"; break;
-    case  5000: $tch1[5]  = "selected"; break;
-    case  6000: $tch1[6]  = "selected"; break;
-    case  7000: $tch1[7]  = "selected"; break;
-    case  8000: $tch1[8]  = "selected"; break;
-    case  9000: $tch1[9]  = "selected"; break;
-    case 10000: $tch1[10]  = "selected"; break;
-}
-switch($tech2) {
-    case     0: $tch2[0]  = "selected"; break;
-    case  1000: $tch2[1]  = "selected"; break;
-    case  2000: $tch2[2]  = "selected"; break;
-    case  3000: $tch2[3]  = "selected"; break;
-    case  4000: $tch2[4]  = "selected"; break;
-    case  5000: $tch2[5]  = "selected"; break;
-    case  6000: $tch2[6]  = "selected"; break;
-    case  7000: $tch2[7]  = "selected"; break;
-    case  8000: $tch2[8]  = "selected"; break;
-    case  9000: $tch2[9]  = "selected"; break;
-    case 10000: $tch2[10]  = "selected"; break;
-}
-switch($dex10) {
-    case      0: $dx10[0]  = "selected"; break;
-    case   2500: $dx10[1]  = "selected"; break;
-    case   7500: $dx10[2]  = "selected"; break;
-    case  15000: $dx10[3]  = "selected"; break;
-    case  25000: $dx10[4]  = "selected"; break;
-    case  37500: $dx10[5]  = "selected"; break;
-    case  52500: $dx10[6]  = "selected"; break;
-    case  70000: $dx10[7]  = "selected"; break;
-    case  90000: $dx10[8]  = "selected"; break;
-    case 112500: $dx10[9]  = "selected"; break;
-    case 137500: $dx10[10] = "selected"; break;
-    case 165000: $dx10[11] = "selected"; break;
-    case 195000: $dx10[12] = "selected"; break;
-    case 227500: $dx10[13] = "selected"; break;
-    case 262500: $dx10[14] = "selected"; break;
-    case 300000: $dx10[15] = "selected"; break;
-    case 340000: $dx10[16] = "selected"; break;
-    case 382500: $dx10[17] = "selected"; break;
-    case 427500: $dx10[18] = "selected"; break;
-}
-switch($dex110) {
-    case      0: $dx110[0]  = "selected"; break;
-    case   2500: $dx110[1]  = "selected"; break;
-    case   7500: $dx110[2]  = "selected"; break;
-    case  15000: $dx110[3]  = "selected"; break;
-    case  25000: $dx110[4]  = "selected"; break;
-    case  37500: $dx110[5]  = "selected"; break;
-    case  52500: $dx110[6]  = "selected"; break;
-    case  70000: $dx110[7]  = "selected"; break;
-    case  90000: $dx110[8]  = "selected"; break;
-    case 112500: $dx110[9]  = "selected"; break;
-    case 137500: $dx110[10] = "selected"; break;
-    case 165000: $dx110[11] = "selected"; break;
-    case 195000: $dx110[12] = "selected"; break;
-    case 227500: $dx110[13] = "selected"; break;
-    case 262500: $dx110[14] = "selected"; break;
-    case 300000: $dx110[15] = "selected"; break;
-    case 340000: $dx110[16] = "selected"; break;
-    case 382500: $dx110[17] = "selected"; break;
-    case 427500: $dx110[18] = "selected"; break;
-}
-switch($dex120) {
-    case      0: $dx120[0]  = "selected"; break;
-    case   2500: $dx120[1]  = "selected"; break;
-    case   7500: $dx120[2]  = "selected"; break;
-    case  15000: $dx120[3]  = "selected"; break;
-    case  25000: $dx120[4]  = "selected"; break;
-    case  37500: $dx120[5]  = "selected"; break;
-    case  52500: $dx120[6]  = "selected"; break;
-    case  70000: $dx120[7]  = "selected"; break;
-    case  90000: $dx120[8]  = "selected"; break;
-    case 112500: $dx120[9]  = "selected"; break;
-    case 137500: $dx120[10] = "selected"; break;
-    case 165000: $dx120[11] = "selected"; break;
-    case 195000: $dx120[12] = "selected"; break;
-    case 227500: $dx120[13] = "selected"; break;
-    case 262500: $dx120[14] = "selected"; break;
-    case 300000: $dx120[15] = "selected"; break;
-    case 340000: $dx120[16] = "selected"; break;
-    case 382500: $dx120[17] = "selected"; break;
-    case 427500: $dx120[18] = "selected"; break;
-}
-switch($dex130) {
-    case      0: $dx130[0]  = "selected"; break;
-    case   2500: $dx130[1]  = "selected"; break;
-    case   7500: $dx130[2]  = "selected"; break;
-    case  15000: $dx130[3]  = "selected"; break;
-    case  25000: $dx130[4]  = "selected"; break;
-    case  37500: $dx130[5]  = "selected"; break;
-    case  52500: $dx130[6]  = "selected"; break;
-    case  70000: $dx130[7]  = "selected"; break;
-    case  90000: $dx130[8]  = "selected"; break;
-    case 112500: $dx130[9]  = "selected"; break;
-    case 137500: $dx130[10] = "selected"; break;
-    case 165000: $dx130[11] = "selected"; break;
-    case 195000: $dx130[12] = "selected"; break;
-    case 227500: $dx130[13] = "selected"; break;
-    case 262500: $dx130[14] = "selected"; break;
-    case 300000: $dx130[15] = "selected"; break;
-    case 340000: $dx130[16] = "selected"; break;
-    case 382500: $dx130[17] = "selected"; break;
-    case 427500: $dx130[18] = "selected"; break;
-}
-switch($dex140) {
-    case      0: $dx140[0]  = "selected"; break;
-    case   2500: $dx140[1]  = "selected"; break;
-    case   7500: $dx140[2]  = "selected"; break;
-    case  15000: $dx140[3]  = "selected"; break;
-    case  25000: $dx140[4]  = "selected"; break;
-    case  37500: $dx140[5]  = "selected"; break;
-    case  52500: $dx140[6]  = "selected"; break;
-    case  70000: $dx140[7]  = "selected"; break;
-    case  90000: $dx140[8]  = "selected"; break;
-    case 112500: $dx140[9]  = "selected"; break;
-    case 137500: $dx140[10] = "selected"; break;
-    case 165000: $dx140[11] = "selected"; break;
-    case 195000: $dx140[12] = "selected"; break;
-    case 227500: $dx140[13] = "selected"; break;
-    case 262500: $dx140[14] = "selected"; break;
-    case 300000: $dx140[15] = "selected"; break;
-    case 340000: $dx140[16] = "selected"; break;
-    case 382500: $dx140[17] = "selected"; break;
-    case 427500: $dx140[18] = "selected"; break;
-}
-switch($dex20) {
-    case      0: $dx20[0]  = "selected"; break;
-    case   2500: $dx20[1]  = "selected"; break;
-    case   7500: $dx20[2]  = "selected"; break;
-    case  15000: $dx20[3]  = "selected"; break;
-    case  25000: $dx20[4]  = "selected"; break;
-    case  37500: $dx20[5]  = "selected"; break;
-    case  52500: $dx20[6]  = "selected"; break;
-    case  70000: $dx20[7]  = "selected"; break;
-    case  90000: $dx20[8]  = "selected"; break;
-    case 112500: $dx20[9]  = "selected"; break;
-    case 137500: $dx20[10] = "selected"; break;
-    case 165000: $dx20[11] = "selected"; break;
-    case 195000: $dx20[12] = "selected"; break;
-    case 227500: $dx20[13] = "selected"; break;
-    case 262500: $dx20[14] = "selected"; break;
-    case 300000: $dx20[15] = "selected"; break;
-    case 340000: $dx20[16] = "selected"; break;
-    case 382500: $dx20[17] = "selected"; break;
-    case 427500: $dx20[18] = "selected"; break;
-}
-switch($dex210) {
-    case      0: $dx210[0]  = "selected"; break;
-    case   2500: $dx210[1]  = "selected"; break;
-    case   7500: $dx210[2]  = "selected"; break;
-    case  15000: $dx210[3]  = "selected"; break;
-    case  25000: $dx210[4]  = "selected"; break;
-    case  37500: $dx210[5]  = "selected"; break;
-    case  52500: $dx210[6]  = "selected"; break;
-    case  70000: $dx210[7]  = "selected"; break;
-    case  90000: $dx210[8]  = "selected"; break;
-    case 112500: $dx210[9]  = "selected"; break;
-    case 137500: $dx210[10] = "selected"; break;
-    case 165000: $dx210[11] = "selected"; break;
-    case 195000: $dx210[12] = "selected"; break;
-    case 227500: $dx210[13] = "selected"; break;
-    case 262500: $dx210[14] = "selected"; break;
-    case 300000: $dx210[15] = "selected"; break;
-    case 340000: $dx210[16] = "selected"; break;
-    case 382500: $dx210[17] = "selected"; break;
-    case 427500: $dx210[18] = "selected"; break;
-}
-switch($dex220) {
-    case      0: $dx220[0]  = "selected"; break;
-    case   2500: $dx220[1]  = "selected"; break;
-    case   7500: $dx220[2]  = "selected"; break;
-    case  15000: $dx220[3]  = "selected"; break;
-    case  25000: $dx220[4]  = "selected"; break;
-    case  37500: $dx220[5]  = "selected"; break;
-    case  52500: $dx220[6]  = "selected"; break;
-    case  70000: $dx220[7]  = "selected"; break;
-    case  90000: $dx220[8]  = "selected"; break;
-    case 112500: $dx220[9]  = "selected"; break;
-    case 137500: $dx220[10] = "selected"; break;
-    case 165000: $dx220[11] = "selected"; break;
-    case 195000: $dx220[12] = "selected"; break;
-    case 227500: $dx220[13] = "selected"; break;
-    case 262500: $dx220[14] = "selected"; break;
-    case 300000: $dx220[15] = "selected"; break;
-    case 340000: $dx220[16] = "selected"; break;
-    case 382500: $dx220[17] = "selected"; break;
-    case 427500: $dx220[18] = "selected"; break;
-}
-switch($dex230) {
-    case      0: $dx230[0]  = "selected"; break;
-    case   2500: $dx230[1]  = "selected"; break;
-    case   7500: $dx230[2]  = "selected"; break;
-    case  15000: $dx230[3]  = "selected"; break;
-    case  25000: $dx230[4]  = "selected"; break;
-    case  37500: $dx230[5]  = "selected"; break;
-    case  52500: $dx230[6]  = "selected"; break;
-    case  70000: $dx230[7]  = "selected"; break;
-    case  90000: $dx230[8]  = "selected"; break;
-    case 112500: $dx230[9]  = "selected"; break;
-    case 137500: $dx230[10] = "selected"; break;
-    case 165000: $dx230[11] = "selected"; break;
-    case 195000: $dx230[12] = "selected"; break;
-    case 227500: $dx230[13] = "selected"; break;
-    case 262500: $dx230[14] = "selected"; break;
-    case 300000: $dx230[15] = "selected"; break;
-    case 340000: $dx230[16] = "selected"; break;
-    case 382500: $dx230[17] = "selected"; break;
-    case 427500: $dx230[18] = "selected"; break;
-}
-switch($dex240) {
-    case      0: $dx240[0]  = "selected"; break;
-    case   2500: $dx240[1]  = "selected"; break;
-    case   7500: $dx240[2]  = "selected"; break;
-    case  15000: $dx240[3]  = "selected"; break;
-    case  25000: $dx240[4]  = "selected"; break;
-    case  37500: $dx240[5]  = "selected"; break;
-    case  52500: $dx240[6]  = "selected"; break;
-    case  70000: $dx240[7]  = "selected"; break;
-    case  90000: $dx240[8]  = "selected"; break;
-    case 112500: $dx240[9]  = "selected"; break;
-    case 137500: $dx240[10] = "selected"; break;
-    case 165000: $dx240[11] = "selected"; break;
-    case 195000: $dx240[12] = "selected"; break;
-    case 227500: $dx240[13] = "selected"; break;
-    case 262500: $dx240[14] = "selected"; break;
-    case 300000: $dx240[15] = "selected"; break;
-    case 340000: $dx240[16] = "selected"; break;
-    case 382500: $dx240[17] = "selected"; break;
-    case 427500: $dx240[18] = "selected"; break;
-}
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>전투시뮬레이션</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-<style type="text/css">
-select { background-color:black;color:white; }
-input { background-color:black;color:white; }
-</style>
-
-</head>
-
-<body>
-<form method=post action=_simul.php>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr id=bg1>
-        <td>공격장수</td>
-        <td>상대장수</td>
-        <td>상대성벽</td>
-    </tr>
-    <tr>
-        <td>관직
-            <select name=level1 size=1>
-                <option <?=$sellevel1[1]?> value=1>일반</option>
-                <option <?=$sellevel1[5]?> value=5>제3모사</option>
-                <option <?=$sellevel1[6]?> value=6>제3장군</option>
-                <option <?=$sellevel1[7]?> value=7>제2모사</option>
-                <option <?=$sellevel1[8]?> value=8>제2장군</option>
-                <option <?=$sellevel1[9]?> value=9>제1모사</option>
-                <option <?=$sellevel1[10]?> value=10>제1장군</option>
-                <option <?=$sellevel1[11]?> value=11>참모</option>
-                <option <?=$sellevel1[12]?> value=12>군주</option>
-            </select>
-        </td>
-        <td>관직
-            <select name=level2 size=1>
-                <option <?=$sellevel2[1]?> value=1>일반</option>
-                <option <?=$sellevel2[5]?> value=5>제3모사</option>
-                <option <?=$sellevel2[6]?> value=6>제3장군</option>
-                <option <?=$sellevel2[7]?> value=7>제2모사</option>
-                <option <?=$sellevel2[8]?> value=8>제2장군</option>
-                <option <?=$sellevel2[9]?> value=9>제1모사</option>
-                <option <?=$sellevel2[10]?> value=10>제1장군</option>
-                <option <?=$sellevel2[11]?> value=11>참모</option>
-                <option <?=$sellevel2[12]?> value=12>군주</option>
-            </select>
-        </td>
-        <td>-</td>
-    <tr>
-        <td>Lv <input size=2 maxlength=2 name=explevel1 value=<?=$explevel1?>></td>
-        <td>Lv <input size=2 maxlength=2 name=explevel2 value=<?=$explevel2?>></td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>통솔 <input size=3 maxlength=3 name=leader1 value=<?=$leader1?>></td>
-        <td>통솔 <input size=3 maxlength=3 name=leader2 value=<?=$leader2?>></td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>무력 <input size=3 maxlength=3 name=power1 value=<?=$power1?>></td>
-        <td>무력 <input size=3 maxlength=3 name=power2 value=<?=$power2?>></td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>지력 <input size=3 maxlength=3 name=intel1 value=<?=$intel1?>></td>
-        <td>지력 <input size=3 maxlength=3 name=intel2 value=<?=$intel2?>></td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>병종
-            <select name=type1 size=1>
-                <option value=0>--------</option>
-                <option <?=$sel1[0]?> value=0>보병</option>
-                <option <?=$sel1[1]?> value=1>청주병</option>
-                <option <?=$sel1[2]?> value=2>수병</option>
-                <option <?=$sel1[3]?> value=3>자객병</option>
-                <option <?=$sel1[4]?> value=4>근위병</option>
-                <option <?=$sel1[5]?> value=5>등갑병</option>
-                <option value=0>--------</option>
-                <option <?=$sel1[10]?> value=10>궁병</option>
-                <option <?=$sel1[11]?> value=11>궁기병</option>
-                <option <?=$sel1[12]?> value=12>연노병</option>
-                <option <?=$sel1[13]?> value=13>강궁병</option>
-                <option <?=$sel1[14]?> value=14>석궁병</option>
-                <option value=0>--------</option>
-                <option <?=$sel1[20]?> value=20>기병</option>
-                <option <?=$sel1[21]?> value=21>백마병</option>
-                <option <?=$sel1[22]?> value=22>중장기병</option>
-                <option <?=$sel1[23]?> value=23>돌격기병</option>
-                <option <?=$sel1[24]?> value=24>철기병</option>
-                <option <?=$sel1[25]?> value=25>수렵기병</option>
-                <option <?=$sel1[26]?> value=26>맹수병</option>
-                <option <?=$sel1[27]?> value=27>호표기병</option>
-                <option value=0>--------</option>
-                <option <?=$sel1[30]?> value=30>귀병</option>
-                <option <?=$sel1[31]?> value=31>신귀병</option>
-                <option <?=$sel1[32]?> value=32>백귀병</option>
-                <option <?=$sel1[33]?> value=33>흑귀병</option>
-                <option <?=$sel1[34]?> value=34>악귀병</option>
-                <option <?=$sel1[35]?> value=35>남귀병</option>
-                <option <?=$sel1[36]?> value=36>황귀병</option>
-                <option <?=$sel1[37]?> value=37>천귀병</option>
-                <option <?=$sel1[38]?> value=38>마귀병</option>
-                <option value=0>--------</option>
-                <option <?=$sel1[40]?> value=40>정란</option>
-                <option <?=$sel1[41]?> value=41>충차</option>
-                <option <?=$sel1[42]?> value=42>벽력거</option>
-                <option <?=$sel1[43]?> value=43>목우</option>
-            </select>
-        </td>
-        <td>병종
-            <select name=type2 size=1>
-                <option value=0>--------</option>
-                <option <?=$sel2[0]?> value=0>보병</option>
-                <option <?=$sel2[1]?> value=1>청주병</option>
-                <option <?=$sel2[2]?> value=2>수병</option>
-                <option <?=$sel2[3]?> value=3>자객병</option>
-                <option <?=$sel2[4]?> value=4>근위병</option>
-                <option <?=$sel2[5]?> value=5>등갑병</option>
-                <option value=0>--------</option>
-                <option <?=$sel2[10]?> value=10>궁병</option>
-                <option <?=$sel2[11]?> value=11>궁기병</option>
-                <option <?=$sel2[12]?> value=12>연노병</option>
-                <option <?=$sel2[13]?> value=13>강궁병</option>
-                <option <?=$sel2[14]?> value=14>석궁병</option>
-                <option value=0>--------</option>
-                <option <?=$sel2[20]?> value=20>기병</option>
-                <option <?=$sel2[21]?> value=21>백마병</option>
-                <option <?=$sel2[22]?> value=22>중장기병</option>
-                <option <?=$sel2[23]?> value=23>돌격기병</option>
-                <option <?=$sel2[24]?> value=24>철기병</option>
-                <option <?=$sel2[25]?> value=25>수렵기병</option>
-                <option <?=$sel2[26]?> value=26>맹수병</option>
-                <option <?=$sel2[27]?> value=27>호표기병</option>
-                <option value=0>--------</option>
-                <option <?=$sel2[30]?> value=30>귀병</option>
-                <option <?=$sel2[31]?> value=31>신귀병</option>
-                <option <?=$sel2[32]?> value=32>백귀병</option>
-                <option <?=$sel2[33]?> value=33>흑귀병</option>
-                <option <?=$sel2[34]?> value=34>악귀병</option>
-                <option <?=$sel2[35]?> value=35>남귀병</option>
-                <option <?=$sel2[36]?> value=36>황귀병</option>
-                <option <?=$sel2[37]?> value=37>천귀병</option>
-                <option <?=$sel2[38]?> value=38>마귀병</option>
-                <option value=0>--------</option>
-                <option <?=$sel2[40]?> value=40>정란</option>
-                <option <?=$sel2[41]?> value=41>충차</option>
-                <option <?=$sel2[42]?> value=42>벽력거</option>
-                <option <?=$sel2[43]?> value=43>목우</option>
-            </select>
-        </td>
-        <td>성벽 <input size=4 maxlength=4 name=wall value=<?=$wall?>></td>
-    </tr>
-    <tr>
-        <td>병력 <input size=5 maxlength=5 name=crew1 value=<?=$crew1?>></td>
-        <td>병력 <input size=5 maxlength=5 name=crew2 value=<?=$crew2?>></td>
-        <td>수비 <input size=4 maxlength=4 name=def value=<?=$def?>></td>
-    </tr>
-    <tr>
-        <td>훈련 <input size=3 maxlength=3 name=train1 value=<?=$train1?>></td>
-        <td>훈련 <input size=3 maxlength=3 name=train2 value=<?=$train2?>></td>
-        <td>훈련 <input size=3 maxlength=3 name=train3 value=<?=$train3?>></td>
-    </tr>
-    <tr>
-        <td>사기 <input size=3 maxlength=3 name=atmos1 value=<?=$atmos1?>></td>
-        <td>사기 <input size=3 maxlength=3 name=atmos2 value=<?=$atmos2?>></td>
-        <td>사기 <input size=3 maxlength=3 name=atmos3 value=<?=$atmos3?>></td>
-    </tr>
-    <tr>
-        <td>기술
-            <select name=tech1 size=1>
-                <option <?=$tch1[0]?>     value=0>0등급</option>
-                <option <?=$tch1[1]?>  value=1000>1등급</option>
-                <option <?=$tch1[2]?>  value=2000>2등급</option>
-                <option <?=$tch1[3]?>  value=3000>3등급</option>
-                <option <?=$tch1[4]?>  value=4000>4등급</option>
-                <option <?=$tch1[5]?>  value=5000>5등급</option>
-                <option <?=$tch1[6]?>  value=6000>6등급</option>
-                <option <?=$tch1[7]?>  value=7000>7등급</option>
-                <option <?=$tch1[8]?>  value=8000>8등급</option>
-                <option <?=$tch1[9]?>  value=9000>9등급</option>
-                <option <?=$tch1[10]?> value=10000>10등급</option>
-            </select>
-        </td>
-        <td>기술
-            <select name=tech2 size=1>
-                <option <?=$tch2[0]?>     value=0>0등급</option>
-                <option <?=$tch2[1]?>  value=1000>1등급</option>
-                <option <?=$tch2[2]?>  value=2000>2등급</option>
-                <option <?=$tch2[3]?>  value=3000>3등급</option>
-                <option <?=$tch2[4]?>  value=4000>4등급</option>
-                <option <?=$tch2[5]?>  value=5000>5등급</option>
-                <option <?=$tch2[6]?>  value=6000>6등급</option>
-                <option <?=$tch2[7]?>  value=7000>7등급</option>
-                <option <?=$tch2[8]?>  value=8000>8등급</option>
-                <option <?=$tch2[9]?>  value=9000>9등급</option>
-                <option <?=$tch2[10]?> value=10000>10등급</option>
-            </select>
-        </td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>보
-            <select name=dex10 size=1>
-                <option <?=$dx10[0]?>       value=0>F</option>
-                <option <?=$dx10[1]?>    value=2500>E-</option>
-                <option <?=$dx10[2]?>    value=7500>E</option>
-                <option <?=$dx10[3]?>   value=15000>E+</option>
-                <option <?=$dx10[4]?>   value=25000>D-</option>
-                <option <?=$dx10[5]?>   value=37500>D</option>
-                <option <?=$dx10[6]?>   value=52500>D+</option>
-                <option <?=$dx10[7]?>   value=70000>C-</option>
-                <option <?=$dx10[8]?>   value=90000>C</option>
-                <option <?=$dx10[9]?>  value=112500>C+</option>
-                <option <?=$dx10[10]?> value=137500>B-</option>
-                <option <?=$dx10[11]?> value=165000>B</option>
-                <option <?=$dx10[12]?> value=195000>B+</option>
-                <option <?=$dx10[13]?> value=227500>A-</option>
-                <option <?=$dx10[14]?> value=262500>A</option>
-                <option <?=$dx10[15]?> value=300000>A+</option>
-                <option <?=$dx10[16]?> value=340000>S</option>
-                <option <?=$dx10[17]?> value=382500>SS</option>
-                <option <?=$dx10[18]?> value=427500>SSS</option>
-            </select>
-            궁
-            <select name=dex110 size=1>
-                <option <?=$dx110[0]?>       value=0>F</option>
-                <option <?=$dx110[1]?>    value=2500>E-</option>
-                <option <?=$dx110[2]?>    value=7500>E</option>
-                <option <?=$dx110[3]?>   value=15000>E+</option>
-                <option <?=$dx110[4]?>   value=25000>D-</option>
-                <option <?=$dx110[5]?>   value=37500>D</option>
-                <option <?=$dx110[6]?>   value=52500>D+</option>
-                <option <?=$dx110[7]?>   value=70000>C-</option>
-                <option <?=$dx110[8]?>   value=90000>C</option>
-                <option <?=$dx110[9]?>  value=112500>C+</option>
-                <option <?=$dx110[10]?> value=137500>B-</option>
-                <option <?=$dx110[11]?> value=165000>B</option>
-                <option <?=$dx110[12]?> value=195000>B+</option>
-                <option <?=$dx110[13]?> value=227500>A-</option>
-                <option <?=$dx110[14]?> value=262500>A</option>
-                <option <?=$dx110[15]?> value=300000>A+</option>
-                <option <?=$dx110[16]?> value=340000>S</option>
-                <option <?=$dx110[17]?> value=382500>SS</option>
-                <option <?=$dx110[18]?> value=427500>SSS</option>
-            </select>
-            기
-            <select name=dex120 size=1>
-                <option <?=$dx120[0]?>       value=0>F</option>
-                <option <?=$dx120[1]?>    value=2500>E-</option>
-                <option <?=$dx120[2]?>    value=7500>E</option>
-                <option <?=$dx120[3]?>   value=15000>E+</option>
-                <option <?=$dx120[4]?>   value=25000>D-</option>
-                <option <?=$dx120[5]?>   value=37500>D</option>
-                <option <?=$dx120[6]?>   value=52500>D+</option>
-                <option <?=$dx120[7]?>   value=70000>C-</option>
-                <option <?=$dx120[8]?>   value=90000>C</option>
-                <option <?=$dx120[9]?>  value=112500>C+</option>
-                <option <?=$dx120[10]?> value=137500>B-</option>
-                <option <?=$dx120[11]?> value=165000>B</option>
-                <option <?=$dx120[12]?> value=195000>B+</option>
-                <option <?=$dx120[13]?> value=227500>A-</option>
-                <option <?=$dx120[14]?> value=262500>A</option>
-                <option <?=$dx120[15]?> value=300000>A+</option>
-                <option <?=$dx120[16]?> value=340000>S</option>
-                <option <?=$dx120[17]?> value=382500>SS</option>
-                <option <?=$dx120[18]?> value=427500>SSS</option>
-            </select>
-            귀
-            <select name=dex130 size=1>
-                <option <?=$dx130[0]?>       value=0>F</option>
-                <option <?=$dx130[1]?>    value=2500>E-</option>
-                <option <?=$dx130[2]?>    value=7500>E</option>
-                <option <?=$dx130[3]?>   value=15000>E+</option>
-                <option <?=$dx130[4]?>   value=25000>D-</option>
-                <option <?=$dx130[5]?>   value=37500>D</option>
-                <option <?=$dx130[6]?>   value=52500>D+</option>
-                <option <?=$dx130[7]?>   value=70000>C-</option>
-                <option <?=$dx130[8]?>   value=90000>C</option>
-                <option <?=$dx130[9]?>  value=112500>C+</option>
-                <option <?=$dx130[10]?> value=137500>B-</option>
-                <option <?=$dx130[11]?> value=165000>B</option>
-                <option <?=$dx130[12]?> value=195000>B+</option>
-                <option <?=$dx130[13]?> value=227500>A-</option>
-                <option <?=$dx130[14]?> value=262500>A</option>
-                <option <?=$dx130[15]?> value=300000>A+</option>
-                <option <?=$dx130[16]?> value=340000>S</option>
-                <option <?=$dx130[17]?> value=382500>SS</option>
-                <option <?=$dx130[18]?> value=427500>SSS</option>
-            </select>
-            차
-            <select name=dex140 size=1>
-                <option <?=$dx140[0]?>       value=0>F</option>
-                <option <?=$dx140[1]?>    value=2500>E-</option>
-                <option <?=$dx140[2]?>    value=7500>E</option>
-                <option <?=$dx140[3]?>   value=15000>E+</option>
-                <option <?=$dx140[4]?>   value=25000>D-</option>
-                <option <?=$dx140[5]?>   value=37500>D</option>
-                <option <?=$dx140[6]?>   value=52500>D+</option>
-                <option <?=$dx140[7]?>   value=70000>C-</option>
-                <option <?=$dx140[8]?>   value=90000>C</option>
-                <option <?=$dx140[9]?>  value=112500>C+</option>
-                <option <?=$dx140[10]?> value=137500>B-</option>
-                <option <?=$dx140[11]?> value=165000>B</option>
-                <option <?=$dx140[12]?> value=195000>B+</option>
-                <option <?=$dx140[13]?> value=227500>A-</option>
-                <option <?=$dx140[14]?> value=262500>A</option>
-                <option <?=$dx140[15]?> value=300000>A+</option>
-                <option <?=$dx140[16]?> value=340000>S</option>
-                <option <?=$dx140[17]?> value=382500>SS</option>
-                <option <?=$dx140[18]?> value=427500>SSS</option>
-            </select>
-        </td>
-        <td>보
-            <select name=dex20 size=1>
-                <option <?=$dx20[0]?>       value=0>F</option>
-                <option <?=$dx20[1]?>    value=2500>E-</option>
-                <option <?=$dx20[2]?>    value=7500>E</option>
-                <option <?=$dx20[3]?>   value=15000>E+</option>
-                <option <?=$dx20[4]?>   value=25000>D-</option>
-                <option <?=$dx20[5]?>   value=37500>D</option>
-                <option <?=$dx20[6]?>   value=52500>D+</option>
-                <option <?=$dx20[7]?>   value=70000>C-</option>
-                <option <?=$dx20[8]?>   value=90000>C</option>
-                <option <?=$dx20[9]?>  value=112500>C+</option>
-                <option <?=$dx20[10]?> value=137500>B-</option>
-                <option <?=$dx20[11]?> value=165000>B</option>
-                <option <?=$dx20[12]?> value=195000>B+</option>
-                <option <?=$dx20[13]?> value=227500>A-</option>
-                <option <?=$dx20[14]?> value=262500>A</option>
-                <option <?=$dx20[15]?> value=300000>A+</option>
-                <option <?=$dx20[16]?> value=340000>S</option>
-                <option <?=$dx20[17]?> value=382500>SS</option>
-                <option <?=$dx20[18]?> value=427500>SSS</option>
-            </select>
-            궁
-            <select name=dex210 size=1>
-                <option <?=$dx210[0]?>       value=0>F</option>
-                <option <?=$dx210[1]?>    value=2500>E-</option>
-                <option <?=$dx210[2]?>    value=7500>E</option>
-                <option <?=$dx210[3]?>   value=15000>E+</option>
-                <option <?=$dx210[4]?>   value=25000>D-</option>
-                <option <?=$dx210[5]?>   value=37500>D</option>
-                <option <?=$dx210[6]?>   value=52500>D+</option>
-                <option <?=$dx210[7]?>   value=70000>C-</option>
-                <option <?=$dx210[8]?>   value=90000>C</option>
-                <option <?=$dx210[9]?>  value=112500>C+</option>
-                <option <?=$dx210[10]?> value=137500>B-</option>
-                <option <?=$dx210[11]?> value=165000>B</option>
-                <option <?=$dx210[12]?> value=195000>B+</option>
-                <option <?=$dx210[13]?> value=227500>A-</option>
-                <option <?=$dx210[14]?> value=262500>A</option>
-                <option <?=$dx210[15]?> value=300000>A+</option>
-                <option <?=$dx210[16]?> value=340000>S</option>
-                <option <?=$dx210[17]?> value=382500>SS</option>
-                <option <?=$dx210[18]?> value=427500>SSS</option>
-            </select>
-            기
-            <select name=dex220 size=1>
-                <option <?=$dx220[0]?>       value=0>F</option>
-                <option <?=$dx220[1]?>    value=2500>E-</option>
-                <option <?=$dx220[2]?>    value=7500>E</option>
-                <option <?=$dx220[3]?>   value=15000>E+</option>
-                <option <?=$dx220[4]?>   value=25000>D-</option>
-                <option <?=$dx220[5]?>   value=37500>D</option>
-                <option <?=$dx220[6]?>   value=52500>D+</option>
-                <option <?=$dx220[7]?>   value=70000>C-</option>
-                <option <?=$dx220[8]?>   value=90000>C</option>
-                <option <?=$dx220[9]?>  value=112500>C+</option>
-                <option <?=$dx220[10]?> value=137500>B-</option>
-                <option <?=$dx220[11]?> value=165000>B</option>
-                <option <?=$dx220[12]?> value=195000>B+</option>
-                <option <?=$dx220[13]?> value=227500>A-</option>
-                <option <?=$dx220[14]?> value=262500>A</option>
-                <option <?=$dx220[15]?> value=300000>A+</option>
-                <option <?=$dx220[16]?> value=340000>S</option>
-                <option <?=$dx220[17]?> value=382500>SS</option>
-                <option <?=$dx220[18]?> value=427500>SSS</option>
-            </select>
-            귀
-            <select name=dex230 size=1>
-                <option <?=$dx230[0]?>       value=0>F</option>
-                <option <?=$dx230[1]?>    value=2500>E-</option>
-                <option <?=$dx230[2]?>    value=7500>E</option>
-                <option <?=$dx230[3]?>   value=15000>E+</option>
-                <option <?=$dx230[4]?>   value=25000>D-</option>
-                <option <?=$dx230[5]?>   value=37500>D</option>
-                <option <?=$dx230[6]?>   value=52500>D+</option>
-                <option <?=$dx230[7]?>   value=70000>C-</option>
-                <option <?=$dx230[8]?>   value=90000>C</option>
-                <option <?=$dx230[9]?>  value=112500>C+</option>
-                <option <?=$dx230[10]?> value=137500>B-</option>
-                <option <?=$dx230[11]?> value=165000>B</option>
-                <option <?=$dx230[12]?> value=195000>B+</option>
-                <option <?=$dx230[13]?> value=227500>A-</option>
-                <option <?=$dx230[14]?> value=262500>A</option>
-                <option <?=$dx230[15]?> value=300000>A+</option>
-                <option <?=$dx230[16]?> value=340000>S</option>
-                <option <?=$dx230[17]?> value=382500>SS</option>
-                <option <?=$dx230[18]?> value=427500>SSS</option>
-            </select>
-            차
-            <select name=dex240 size=1>
-                <option <?=$dx240[0]?>       value=0>F</option>
-                <option <?=$dx240[1]?>    value=2500>E-</option>
-                <option <?=$dx240[2]?>    value=7500>E</option>
-                <option <?=$dx240[3]?>   value=15000>E+</option>
-                <option <?=$dx240[4]?>   value=25000>D-</option>
-                <option <?=$dx240[5]?>   value=37500>D</option>
-                <option <?=$dx240[6]?>   value=52500>D+</option>
-                <option <?=$dx240[7]?>   value=70000>C-</option>
-                <option <?=$dx240[8]?>   value=90000>C</option>
-                <option <?=$dx240[9]?>  value=112500>C+</option>
-                <option <?=$dx240[10]?> value=137500>B-</option>
-                <option <?=$dx240[11]?> value=165000>B</option>
-                <option <?=$dx240[12]?> value=195000>B+</option>
-                <option <?=$dx240[13]?> value=227500>A-</option>
-                <option <?=$dx240[14]?> value=262500>A</option>
-                <option <?=$dx240[15]?> value=300000>A+</option>
-                <option <?=$dx240[16]?> value=340000>S</option>
-                <option <?=$dx240[17]?> value=382500>SS</option>
-                <option <?=$dx240[18]?> value=427500>SSS</option>
-            </select>
-        </td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>-</td>
-        <td>
-            <input type=submit name=isgen value=장수공격>
-            <?='<input type=submit name=isgen value=장수평균>'?>
-        </td>
-        <td>
-            <input type=submit name=isgen value=성벽공격>
-            <?='<input type=submit name=isgen value=성벽평균>'?>
-        </td>
-    </tr>
-    <tr><td colspan=3>
-<?php
-if($isgen == "장수공격" || $isgen == "성벽공격") {
-    echo $msg;
-} elseif($isgen == "장수평균" || $isgen == "성벽평균") {
-    echo $msg2;
-}
-?>
-    </td></tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr id=bg1>
-        <td align=right></td>
-        <td align=center>공격</td>
-        <td align=center>방어</td>
-        <td align=center>기동</td>
-        <td align=center>회피</td>
-        <td align=center>가격</td>
-        <td align=center>군량</td>
-        <td width=500 align=center>-</td>
-    </tr>
-
-<?php
-    for($i=0; $i <= 5; $i++) {
-        printSimul($game, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=10; $i <= 14; $i++) {
-        printSimul($game, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=20; $i <= 27; $i++) {
-        printSimul($game, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=30; $i <= 38; $i++) {
-        printSimul($game, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=40; $i <= 43; $i++) {
-        printSimul($game, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-?>
-</table>
-</form>
-</body>
-<?php PrintElapsedTime(); ?>
-</html>
-<?php
-
-function printSimul($game, $i) {
-    $att = $game["att{$i}"];
-    $def = $game["def{$i}"];
-    $spd = $game["spd{$i}"];
-    $avd = $game["avd{$i}"];
-    $cst = $game["cst{$i}"];
-    $ric = $game["ric{$i}"];
-    echo "
-    <tr>
-        <td align=right>".GameUnitConst::byId($i)->name."</td>
-        <td align=center>$att</td>
-        <td align=center>$def</td>
-        <td align=center>$spd</td>
-        <td align=center>$avd</td>
-        <td align=center>$cst</td>
-        <td align=center>$ric</td>
-        <td align=center>-</td>
-    </tr>";
-}
-
-
@@ -1,350 +1,430 @@
 <?php
+
 namespace sammo;

+use Ds\Set;
+use sammo\Enums\RankColumn;
+use sammo\Enums\AuctionType;
+
 include "lib.php";
 include "func.php";

 $btn = Util::getReq('btn');

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');

-increaseRefresh("명장일람", 2);
+increaseRefresh("명장일람", 1);
+$templates = new \League\Plates\Engine(__DIR__ . '/templates');

-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);

-$query = "select con,turntime from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
 ?>
 <!DOCTYPE html>
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>명장일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=500" />
+    <title><?= UniqueConst::$serverName ?>: 명장일람</title>
+    <?= 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::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common', 'bestGeneral']) ?>
 </head>

 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>명 장 일 람<br><?=closeButton()?></td></tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<form name=form1 action=a_bestGeneral.php method=post>
-    <tr><td align=center>
-        <input type=submit name=btn value='유저 보기'>
-        <input type=submit name=btn value='NPC 보기'>
-    </td></tr>
-</form>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<?php
-if (isset($btn) && $btn == "NPC 보기") {
-    //FIXME: query가 너무 적나라.
-    $sel = "npc>=2";
-} else {
-    $sel = "npc<2";
-}
+    <div id="container" class="bg0">
+        <div class="row gx-0">
+            <div class="col">명 장 일 람<br><?= closeButton() ?></div>
+        </div>
+        <div class="row gx-0">
+            <div class="col center">
+                <form name=form1 action=a_bestGeneral.php method=get><input type=submit name=btn value='유저 보기'>
+                    <input type=submit name=btn value='NPC 보기'>
+                </form>
+            </div>
+        </div>
+        <?php

-$nationName = ['재야'];
-$nationColor = ['#000000'];
-foreach (getAllNationStaticInfo() as $nation) {
-    $nationName[$nation['nation']] = $nation['name'];
-    $nationColor[$nation['nation']] = $nation['color'];
-}
-
-$type = array(
-    "명 성",
-    "계 급",
-    "계 략 성 공",
-    "전 투 횟 수",
-    "승 리",
-    "승 률",
-    "사 살",
-    "살 상 률",
-    "보 병 숙 련 도",
-    "궁 병 숙 련 도",
-    "기 병 숙 련 도",
-    "귀 병 숙 련 도",
-    "차 병 숙 련 도",
-    "전 력 전 승 률",
-    "통 솔 전 승 률",
-    "일 기 토 승 률",
-    "설 전 승 률",
-    "베 팅 투 자 액",
-    "베 팅 당 첨",
-    "베 팅 수 익 금",
-    "베 팅 수 익 률"
-);
-
-
-for ($i=0; $i < 21; $i++) {
-    $name = [];
-    $data = [];
-    $color = [];
-    $pic = [];
-
-    switch ($i) {
-    case  0: $query = "select nation,no,name,picture,imgsvr,experience as data from general where $sel order by data desc limit 0,10"; break;
-    case  1: $query = "select nation,no,name,picture,imgsvr,dedication as data from general where $sel order by data desc limit 0,10"; break;
-    case  2: $query = "select nation,no,name,picture,imgsvr,firenum as data from general where $sel order by data desc limit 0,10"; break;
-    case  3: $query = "select nation,no,name,picture,imgsvr,warnum as data from general where $sel order by data desc limit 0,10"; break;
-    case  4: $query = "select nation,no,name,picture,imgsvr,killnum as data from general where $sel order by data desc limit 0,10"; break;
-    case  5: $query = "select nation,no,name,picture,imgsvr,killnum/warnum*10000 as data from general where warnum>=10 and $sel order by data desc limit 0,10"; break;
-    case  6: $query = "select nation,no,name,picture,imgsvr,killcrew as data from general where $sel order by data desc limit 0,10"; break;
-    case  7: $query = "select nation,no,name,picture,imgsvr,killcrew/deathcrew*10000 as data from general where warnum>=10 and $sel order by data desc limit 0,10"; break;
-    case  8: $query = "select nation,no,name,picture,imgsvr,dex0 as data from general where $sel order by data desc limit 0,10"; break;
-    case  9: $query = "select nation,no,name,picture,imgsvr,dex10 as data from general where $sel order by data desc limit 0,10"; break;
-    case 10: $query = "select nation,no,name,picture,imgsvr,dex20 as data from general where $sel order by data desc limit 0,10"; break;
-    case 11: $query = "select nation,no,name,picture,imgsvr,dex30 as data from general where $sel order by data desc limit 0,10"; break;
-    case 12: $query = "select nation,no,name,picture,imgsvr,dex40 as data from general where $sel order by data desc limit 0,10"; break;
-    case 13: $query = "select nation,no,name,picture,imgsvr,ttw/(ttw+ttd+ttl)*10000 as data from general where $sel and (ttw+ttd+ttl)>=50 order by data desc limit 0,10"; break;
-    case 14: $query = "select nation,no,name,picture,imgsvr,tlw/(tlw+tld+tll)*10000 as data from general where $sel and (tlw+tld+tll)>=50 order by data desc limit 0,10"; break;
-    case 15: $query = "select nation,no,name,picture,imgsvr,tpw/(tpw+tpd+tpl)*10000 as data from general where $sel and (tpw+tpd+tpl)>=50 order by data desc limit 0,10"; break;
-    case 16: $query = "select nation,no,name,picture,imgsvr,tiw/(tiw+tid+til)*10000 as data from general where $sel and (tiw+tid+til)>=50 order by data desc limit 0,10"; break;
-    case 17: $query = "select nation,no,name,picture,imgsvr,betgold as data from general where $sel order by data desc limit 0,10"; break;
-    case 18: $query = "select nation,no,name,picture,imgsvr,betwin as data from general where $sel order by data desc limit 0,10"; break;
-    case 19: $query = "select nation,no,name,picture,imgsvr,betwingold as data from general where $sel order by data desc limit 0,10"; break;
-    case 20: $query = "select nation,no,name,picture,imgsvr,betwingold/betgold*10000 as data from general where $sel and betgold >= 1000 order by data desc limit 0,10"; break;
-    }
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-
-    echo "
-    <tr><td align=center colspan=10 id=bg1><font size=4>$type[$i]</font></td></tr>
-    <tr align=center id=bg2><td>1위</td><td>2위</td><td>3위</td><td>4위</td><td>5위</td><td>6위</td><td>7위</td><td>8위</td><td>9위</td><td>10위</td></tr>
-    <tr>";
-
-    for ($k=0; $k < 10; $k++) {
-        $gen = MYDB_fetch_array($result);
-
-        if ($i != 2) {
-            if (isset($gen)) {
-                $name[$k] = $gen['name'];
-                $nation[$k] = $nationName[$gen['nation']];
-                $data[$k] = $gen['data'];
-                $color[$k] = $nationColor[$gen['nation']];
-                $pic[$k] = $gen['picture'];
-            } else {
-                $name[$k] = "-";
-                $nation[$k] = "-";
-                $data[$k] = "-";
-                $color[$k] = GameConst::$basecolor4;
-                $pic[$k] = "";
+        $ownerNameList = [];
+        if ($gameStor->isunited) {
+            foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+                $ownerNameList[$ownerID] = $ownerName;
            }
-        } else {
-            $name[$k]   = "???";
-            $nation[$k] = "???";
-            $data[$k]   = $gen['data'];
-            $color[$k]  = GameConst::$basecolor4;
-            $gen['imgsvr'] = 0;
-            $pic[$k]    = "9999.jpg";
        }
-        if ($color[$k] == "") {
-            $color[$k] = GameConst::$basecolor4;
+
+        $nationName = [0 => '재야'];
+        $nationColor = [0 => '#000000'];
+        foreach (getAllNationStaticInfo() as $nation) {
+            $nationName[$nation['nation']] = $nation['name'];
+            $nationColor[$nation['nation']] = $nation['color'];
        }
-        if ($nation[$k] == "") {
-            $nation[$k] = "&nbsp;";
+
+        $types = [
+            ["명 성", "int", function ($v) {
+                $v['value'] = $v['experience'];
+                return $v;
+            }],
+            ["계 급", "int", function ($v) {
+                $v['value'] = $v['dedication'];
+                return $v;
+            }],
+            ["계 략 성 공", "int", function ($v) use ($gameStor) {
+                $v['value'] = $v['firenum'];
+                if ($gameStor->isunited) {
+                    return $v;
+                }
+                $v['nationName'] = '???';
+                $v['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
+                $v['name'] = '???';
+                $v['ownerName'] = null;
+                $v['bgColor'] = GameConst::$basecolor4;
+                $v['fgColor'] = newColor($v['bgColor']);
+                return $v;
+            }],
+            ["전 투 횟 수", "int", function ($v) {
+                $v['value'] = $v['warnum'];
+                return $v;
+            }],
+            ["승 리", "int", function ($v) {
+                $v['value'] = $v['killnum'];
+                return $v;
+            }],
+            ["승 률", "percent", function ($v) {
+                if ($v['warnum'] < 10) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['killnum'] / max(1, $v['warnum']);
+                }
+                return $v;
+            }],
+            ["점 령", "int", function ($v) {
+                $v['value'] = $v['occupied'];
+                return $v;
+            }],
+            ["사 살", "int", function ($v) {
+                $v['value'] = $v['killcrew'];
+                return $v;
+            }],
+            ["살 상 률", "percent", function ($v) {
+                if ($v['warnum'] < 10) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['killcrew'] / max(1, $v['deathcrew']);
+                }
+                return $v;
+            }],
+            ["대 인 사 살", "int", function ($v) {
+                $v['value'] = $v['killcrew_person'];
+                return $v;
+            }],
+            ["대 인 살 상 률", "percent", function ($v) {
+                if ($v['warnum'] < 10) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['killcrew_person'] / max(1, $v['deathcrew_person']);
+                }
+                return $v;
+            }],
+            ["보 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex1'];
+                return $v;
+            }],
+            ["궁 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex2'];
+                return $v;
+            }],
+            ["기 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex3'];
+                return $v;
+            }],
+            ["귀 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex4'];
+                return $v;
+            }],
+            ["차 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex5'];
+                return $v;
+            }],
+            ["전 력 전 승 률", "percent", function ($v) {
+                $totalCnt = $v['ttw'] + $v['ttd'] + $v['ttl'];
+                if ($totalCnt < 50) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['ttw'] / max(1, $totalCnt);
+                }
+                return $v;
+            }],
+            ["통 솔 전 승 률", "percent", function ($v) {
+                $totalCnt = $v['tlw'] + $v['tld'] + $v['tll'];
+                if ($totalCnt < 50) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['tlw'] / max(1, $totalCnt);
+                }
+                return $v;
+            }],
+            ["일 기 토 승 률", "percent", function ($v) {
+                $totalCnt = $v['tsw'] + $v['tsd'] + $v['tsl'];
+                if ($totalCnt < 50) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['tsw'] / max(1, $totalCnt);
+                }
+                return $v;
+            }],
+            ["설 전 승 률", "percent", function ($v) {
+                $totalCnt = $v['tiw'] + $v['tid'] + $v['til'];
+                if ($totalCnt < 50) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['tiw'] / max(1, $totalCnt);
+                }
+
+                return $v;
+            }],
+            ["베 팅 투 자 액", "int", function ($v) {
+                $v['value'] = $v['betgold'];
+                return $v;
+            }],
+            ["베 팅 당 첨", "int", function ($v) {
+                $v['value'] = $v['betwin'];
+                return $v;
+            }],
+            ["베 팅 수 익 금", "int", function ($v) {
+                $v['value'] = $v['betwingold'];
+                return $v;
+            }],
+            ["베 팅 수 익 률", "percent", function ($v) {
+                if ($v['betgold'] < GameConst::$defaultGold) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['betwingold'] / max(1, $v['betgold']);
+                }
+                return $v;
+            }],
+            ["유 산 소 모 량", "int", function ($v) use ($gameStor) {
+                $v['value'] = $v[RankColumn::inherit_point_spent->value];
+                if ($gameStor->isunited) {
+                    return $v;
+                }
+                $v['nationName'] = '???';
+                $v['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
+                $v['name'] = '???';
+                $v['ownerName'] = null;
+                $v['bgColor'] = GameConst::$basecolor4;
+                $v['fgColor'] = newColor($v['bgColor']);
+                return $v;
+            }],
+            ["유 산 획 득 량", "int", function ($v) use ($gameStor) {
+                $v['value'] = $v[RankColumn::inherit_point_earned->value];
+                if ($gameStor->isunited) {
+                    return $v;
+                }
+                $v['nationName'] = '???';
+                $v['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
+                $v['name'] = '???';
+                $v['ownerName'] = null;
+                $v['bgColor'] = GameConst::$basecolor4;
+                $v['fgColor'] = newColor($v['bgColor']);
+                return $v;
+            }],
+        ];
+
+        $generals = [];
+        foreach ($db->query(
+            "SELECT nation,no,name,owner_name as ownerName, owner, picture, imgsvr,
+    experience, dedication,
+    dex1, dex2, dex3, dex4, dex5,
+    horse, weapon, book, item
+    FROM general WHERE %l",
+            $btn == "NPC 보기" ? "npc>=2" : "npc<2"
+        ) as $general) {
+            $generalID = $general['no'];
+            $general['bgColor'] = $nationColor[$general['nation']] ?? GameConst::$basecolor4;
+            $general['fgColor'] = newColor($general['bgColor']);
+            $general['nationName'] = $nationName[$general['nation']];
+
+            if (key_exists('picture', $general)) {
+                $imageTemp = GetImageURL($general['imgsvr']);
+                $general['pictureFullPath'] = "$imageTemp/{$general['picture']}";
+            } else {
+                $general['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
+            }
+
+            $generals[$generalID] = $general;
        }
-        if ($pic[$k] == "") {
-            echo "<td align=center>&nbsp;</td>";
-        } else {
-            $imageTemp = GetImageURL($gen['imgsvr']);
-            echo "<td align=center><img width='64' height='64' src={$imageTemp}/{$pic[$k]}></td>";
+
+        foreach ($db->queryAllLists('SELECT general_id, `type`, `value` FROM rank_data') as [$generalID, $typeKey, $value]) {
+            if (!key_exists($generalID, $generals)) {
+                continue;
+            }
+            $generals[$generalID][$typeKey] = $value;
        }
-    }

-    echo "</tr><tr>";
+        $templates = new \League\Plates\Engine('templates');

-    for ($k=0; $k < 10; $k++) {
-        echo "<td align=center style=background-color:{$color[$k]};color:".newColor($color[$k]).">{$nation[$k]}</td>";
-    }
+        foreach ($types as $idx => [$typeName, $typeValue, $typeFunc]) {
+            $validCnt = 0;
+            $typeGenerals = array_map(function ($general) use ($typeValue, $typeFunc, &$validCnt, $ownerNameList) {
+                $general['ownerName'] = $ownerNameList[$general['owner']] ?? null;
+                $general = ($typeFunc)($general);
+                $value = $general['value'];

-    echo "</tr><tr>";
+                if ($value > 0) {
+                    $validCnt += 1;
+                }

-    for ($k=0; $k < 10; $k++) {
-        echo "<td align=center style=background-color:{$color[$k]};color:".newColor($color[$k]).">{$name[$k]}</td>";
-    }
+                if ($typeValue == 'percent') {
+                    $general['printValue'] = number_format($value * 100, 2) . '%';
+                } else {
+                    $general['printValue'] = number_format($value);
+                }
+                return $general;
+            }, $generals);

-    echo "</tr><tr>";
+            usort($typeGenerals, function ($lhs, $rhs) {
+                //내림차순
+                return - ($lhs['value'] <=> $rhs['value']);
+            });

-    for ($k=0; $k < 10; $k++) {
-        if($data[$k] === '-'){
-            //do Nothing
+
+            echo $templates->render('hallOfFrame', [
+                'typeName' => $typeName,
+                'generals' => array_slice($typeGenerals, 0, min(10, $validCnt))
+            ]);
        }
-        else if ($i == 5 || $i == 7 || $i == 20) {
-            $data[$k] = intdiv($data[$k], 100).".".($data[$k]%100)." %";
+        //유니크 아이템 소유자
+        $itemTypes = [
+            'horse' => '명 마',
+            'weapon' => '명 검',
+            'book' => '명 서',
+            'item' => '도 구'
+        ];
+
+        $simpleItemTypes = array_keys($itemTypes);
+        array_map(function ($itemType) {
+            return $itemType[1];
+        }, $itemTypes);
+        $itemOwners = [];
+
+        foreach ($generals as $general) {
+            foreach ($itemTypes as $itemType => $itemTypeName) {
+                $itemClassName = $general[$itemType];
+                $itemClass = buildItemClass($itemClassName);
+                if ($itemClass->isBuyable()) {
+                    continue;
+                }
+
+                if (key_exists($itemClassName, $itemOwners)) {
+                    $itemOwners[$itemClassName][] = $general;
+                } else {
+                    $itemOwners[$itemClassName] = [$general];
+                }
+            }
        }
-        else if ($i >= 13 && $i <= 16) {
-            $data[$k] = intdiv($data[$k], 100).".".($data[$k]%100)." %";
+
+
+        $dummyAuctionGeneral = [
+            'nation' => 0,
+            'no' => 0,
+            'ownerName' => '',
+            'pictureFullPath' => GetImageURL(0) . "/default.jpg",
+            'name' => '경매중',
+            'bgColor' => '#00582c',
+            'fgColor' => 'white',
+            'nationName' => '-',
+        ];
+
+        foreach ($db->queryFirstColumn(
+            'SELECT `target` FROM ng_auction WHERE `finished` = 0 AND `type` = %s',
+            AuctionType::UniqueItem->value
+        ) as $itemClassName) {
+            if(key_exists($itemClassName, $itemOwners)) {
+                $itemOwners[$itemClassName][] = $dummyAuctionGeneral;
+            }
+            else{
+                $itemOwners[$itemClassName] = [$dummyAuctionGeneral];
+            }
        }
-        echo "<td align=center>{$data[$k]}</td>";
-    }
-    echo "</tr><tr><td colspan=10 height=5 id=bg1></td></tr>";
-}

-echo "
-</table>
-<br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-";

-$type = array(
-    "명 마",
-    "명 검",
-    "명 서",
-    "도 구"
-);

-$call = array(
-    "horse",
-    "weap",
-    "book",
-    "item"
-);
+        foreach (GameConst::$allItems as $itemType => $itemList) {
+            $itemNameType = $itemTypes[$itemType];
+            $itemList = array_reverse($itemList, true);

-$func = array(
-    "\\sammo\\getHorseName",
-    "\\sammo\\getWeapName",
-    "\\sammo\\getBookName",
-    "\\sammo\\getItemName"
-);

-for ($i=0; $i < 4; $i++) {
-    $name = [];
-    $data = [];
-    $color = [];
-    $pic = [];
+            $itemRanker = [];
+            foreach ($itemList as $itemClassName => $itemCnt) {
+                if ($itemCnt == 0) {
+                    continue;
+                }
+                $itemClass = buildItemClass($itemClassName);

-    echo "
-    <tr><td align=center colspan=10 id=bg1><font size=4>$type[$i]</font></td></tr>
-    <tr align=center id=bg2>";
-    for ($k=26; $k > 16; $k--) {
-        $str = $func[$i]($k);
-        echo "<td>".$str."</td>";
-    }
+                if ($itemClass->isBuyable()) {
+                    continue;
+                }

-    echo "</tr><tr>";
+                $info = $itemClass->getInfo();
+                $name = $itemClass->getName();

-    for ($k=26; $k > 16; $k--) {
-        $query = "select nation,no,name,picture,imgsvr from general where {$call[$i]}={$k}";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-        $gen = MYDB_fetch_array($result);
-        if (isset($gen)) {
-            $name[$k] = $gen['name'];
-            $nation[$k] = $nationName[$gen['nation']];
-            $color[$k] = $nationColor[$gen['nation']];
-            $pic[$k] = $gen['picture'];
-        } else {
-            $name[$k] = "미발견";
-            $nation[$k] = "-";
-            $color[$k] = "";
-            $pic[$k] = "";
+
+                if ($info) {
+                    $name = $templates->render('tooltip', [
+                        'text' => $name,
+                        'info' => $info,
+                    ]);
+                }
+                foreach (Util::range($itemCnt) as $itemIdx) {
+                    if (($itemOwners[$itemClassName][$itemIdx] ?? null) === null) {
+                        $emptyCard = [
+                            'rankName' => $name,
+                            'pictureFullPath' => GetImageURL(0) . "/default.jpg",
+                            'value' => $itemClassName,
+                            'name' => '미발견',
+                            'bgColor' => GameConst::$basecolor4,
+                            'fgColor' => newColor(GameConst::$basecolor4),
+                        ];
+                        $itemRanker[] = $emptyCard;
+                        continue;
+                    }
+
+                    $general = $itemOwners[$itemClassName][$itemIdx];
+
+                    $card = [
+                        'rankName' => $name,
+                        'pictureFullPath' => $general['pictureFullPath'],
+                        'value' => $itemClassName,
+                        'nationName' => $general['nationName'],
+                        'name' => $general['name'],
+                        'bgColor' => $general['bgColor'],
+                        'fgColor' => $general['fgColor'],
+                    ];
+                    $itemRanker[] = $card;
+                }
+            }
+
+            echo $templates->render('hallOfFrame', [
+                'typeName' => $itemNameType,
+                'generals' => $itemRanker
+            ]);
        }
-        if ($color[$k] == "") {
-            $color[$k] = GameConst::$basecolor4;
-        }
-        if ($nation[$k] == "") {
-            $nation[$k] = "&nbsp;";
-        }
-        if ($pic[$k] == "") {
-            echo "<td align=center>&nbsp;</td>";
-        } else {
-            $imageTemp = GetImageURL($gen['imgsvr']??0);
-            echo "<td align=center><img width='64' height='64' src={$imageTemp}/{$pic[$k]}></img></td>";
-        }
-    }
-
-    echo "</tr><tr>";
-
-    for ($k=26; $k > 16; $k--) {
-        echo "<td align=center style=background-color:{$color[$k]};color:".newColor($color[$k]).">{$nation[$k]}</td>";
-    }
-
-    echo "</tr><tr>";
-
-    for ($k=26; $k > 16; $k--) {
-        echo "<td align=center style=background-color:{$color[$k]};color:".newColor($color[$k]).">{$name[$k]}</td>";
-    }
-
-    echo "</tr><tr><td colspan=10 height=5 id=bg1></td></tr>";
-
-    echo "
-    <tr align=center id=bg2>";
-    for ($k=16; $k > 6; $k--) {
-        $str = $func[$i]($k);
-        echo "<td>".$str."</td>";
-    }
-
-    echo "</tr><tr>";
-
-    for ($k=16; $k > 6; $k--) {
-        $query = "select nation,no,name,picture,imgsvr from general where {$call[$i]}={$k}";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-        $gen = MYDB_fetch_array($result);
-        if (isset($gen)) {
-            $name[$k] = $gen['name'];
-            $nation[$k] = $nationName[$gen['nation']];
-            $color[$k] = $nationColor[$gen['nation']];
-            $pic[$k] = $gen['picture'];
-        } else {
-            $name[$k] = "미발견";
-            $nation[$k] = "-";
-            $color[$k] = "";
-            $pic[$k] = "";
-        }
-        if ($color[$k] == "") {
-            $color[$k] = GameConst::$basecolor4;
-        }
-        if ($nation[$k] == "") {
-            $nation[$k] = "&nbsp;";
-        }
-        if ($pic[$k] == "") {
-            echo "<td align=center>&nbsp;</td>";
-        } else {
-            $imageTemp = GetImageURL($gen['imgsvr']??0);
-            echo "<td align=center><img width='64' height='64' src={$imageTemp}/{$pic[$k]}></img></td>";
-        }
-    }
-
-    echo "</tr><tr>";
-
-    for ($k=16; $k > 6; $k--) {
-        echo "<td align=center style=background-color:{$color[$k]};color:".newColor($color[$k]).">{$nation[$k]}</td>";
-    }
-
-    echo "</tr><tr>";
-
-    for ($k=16; $k > 6; $k--) {
-        echo "<td align=center style=background-color:{$color[$k]};color:".newColor($color[$k]).">{$name[$k]}</td>";
-    }
-
-    echo "</tr><tr><td colspan=10 height=5 id=bg1></td></tr>";
-}
-
-?>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+        ?>
+        <div class="row gx-0">
+            <div class="col"><?= closeButton() ?></div>
+        </div>
+        <div class="row bg0 gx-0">
+            <div class="col bg0"><?= banner() ?></div>
+        </div>
+    </div>
 </body>
-</html>

+</html>
@@ -1,207 +1,137 @@
 <?php
+
 namespace sammo;

 include "lib.php";
 include "func.php";

-$select = Util::getReq('select', 'int', 0);
-
-extractMissingPostToGlobals();
-
 $db = DB::db();
-$connect=$db->get();

-increaseRefresh("왕조일람", 2);
+increaseRefresh("왕조일람", 1);
 ?>
 <!DOCTYPE html>
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>왕조일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 왕조일람</title>
+    <?= WebUtil::printJS('../d_shared/common_path.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::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', 'common') ?>

 </head>

 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style="font-size:13px;word-break:break-all;color:white;background-color:black" id=bg0>
-    <tr><td>역 대 왕 조<br>
-        <input type=button value='창 닫기' onclick=window.close()><br>
-    </td></tr>
-</table>
+    <table align=center width=1000 class="tb_layout bg0">
+        <tr>
+            <td>역 대 왕 조<br>
+                <button onclick=window.close()>창 닫기</button><br>
+            </td>
+        </tr>
+    </table>

-<?php
+    <?php

-if ($select == 0) {
-    $query = "select * from emperior order by no desc";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $empcount = MYDB_num_rows($result);
+    $showCurrentNation = true;

-    for ($i=0; $i < $empcount; $i++) {
-        $emperior = MYDB_fetch_array($result);
+    $emperiors = $db->query('SELECT * FROM emperior ORDER BY `no` DESC');

-        echo "
-<form action=a_emperior.php method=post>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style='font-size:13px;word-break:break-all;color:white;' id=bg0>
-    <tr>
-        <td bgcolor=skyblue align=center colspan=8>
-            <font size=5>{$emperior['phase']}</font>
-            <input type=submit value='자세히'>
-            <input type=hidden name=select value='{$emperior['no']}'>
-        </td>
-    </tr>
-    <tr>
-        <td align=center style=color:".newColor($emperior['color'])."; bgcolor={$emperior['color']} colspan=8>
-            <font size=5>{$emperior['name']} ({$emperior['year']}年 {$emperior['month']}月)</font>
-        </td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center width=123>국 력</td>
-        <td align=center width=123>{$emperior['power']}</td>
-        <td id=bg1 align=center width=123>장 수</td>
-        <td align=center width=123>{$emperior['gennum']}</td>
-        <td id=bg1 align=center width=123>속 령</td>
-        <td align=center width=123>{$emperior['citynum']}</td>
-        <td id=bg1 align=center width=123>성 향</td>
-        <td align=center width=123>{$emperior['type']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 width=123 align=center>황 제</td>
-        <td width=123 align=center>{$emperior['l12name']}</td>
-        <td id=bg1 width=123 align=center>승 상</td>
-        <td width=123 align=center>{$emperior['l11name']}</td>
-        <td id=bg1 width=123 align=center>위 장 군</td>
-        <td width=123 align=center>{$emperior['l10name']}</td>
-        <td id=bg1 width=123 align=center>사 공</td>
-        <td width=123 align=center>{$emperior['l9name']}</td>
-    </tr>
-</table>
-</form>";
+    if ($emperiors) {
+        $serverID = $emperior[0]['server_id'] ?? ($emperior[0]['serverID'] ?? null);
+        if ($serverID == UniqueConst::$serverID) {
+            $showCurrentNation = false;
+        }
    }
-} else {
-    $query = "select * from emperior where no='$select'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $emperior = MYDB_fetch_array($result);

-    echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style='font-size:13px;word-break:break-all;color:white;' id=bg0>
-    <tr>
-        <td bgcolor=skyblue align=center colspan=6>
-            <font size=5>{$emperior['phase']}</font>
-            <input type=submit value='전체보기'>
-            <input type=hidden name=select value='0'>
-        </td>
-    </tr>
-    <tr>
-        <td id=bg1 width=98 align=center>국 가 수<br>(최종 / 최대)</td>
-        <td align=center width=398 colspan=2>{$emperior['nation_count']}</td>
-        <td id=bg1 width=98 align=center>장 수 수<br>(최종 / 최대)</td>
-        <td align=center width=398 colspan=2>{$emperior['gen_count']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>등 장 국 가</td>
-        <td colspan=5>{$emperior['nation_name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>국가별 성향</td>
-        <td colspan=5>{$emperior['nation_hist']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>장 수 성 격</td>
-        <td colspan=5>{$emperior['personal_hist']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>장 수 특 기</td>
-        <td colspan=5>{$emperior['special_hist']}</td>
-    </tr>
-    <tr>
-        <td align=center style=color:".newColor($emperior['color'])."; bgcolor={$emperior['color']} colspan=6>
-            <font size=5>{$emperior['name']} ({$emperior['year']}年 {$emperior['month']}月)</font>
-        </td>
-    </tr>
-    <tr>
-        <td id=bg1 width=98 align=center>국 력</td>
-        <td align=center width=398 colspan=2>{$emperior['power']}</td>
-        <td id=bg1 width=98 align=center>성 향</td>
-        <td align=center width=398 colspan=2>{$emperior['type']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 width=98 align=center>장 수</td>
-        <td align=center width=398 colspan=2>{$emperior['gennum']}</td>
-        <td id=bg1 width=98 align=center>속 령</td>
-        <td align=center width=398 colspan=2>{$emperior['citynum']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>총 인 구</td>
-        <td align=center colspan=2>{$emperior['pop']}</td>
-        <td id=bg1 align=center>인 구 율</td>
-        <td align=center colspan=2>{$emperior['poprate']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>국 고</td>
-        <td align=center colspan=2>{$emperior['gold']}</td>
-        <td id=bg1 align=center>병 량</td>
-        <td align=center colspan=2>{$emperior['rice']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>황 제</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l12name']}</td>
-        <td id=bg1 align=center>승 상</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l11name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>위 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l10name']}</td>
-        <td id=bg1 align=center>사 공</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l9name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>표 기 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l8name']}</td>
-        <td id=bg1 align=center>태 위</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l7name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>거 기 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l6name']}</td>
-        <td id=bg1 align=center>사 도</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l5name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>오 호 장 군</td>
-        <td colspan=5>{$emperior['tiger']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>건 안 칠 자</td>
-        <td colspan=5>{$emperior['eagle']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>장 수 들<br>(공헌도 순서)</td>
-        <td colspan=5>{$emperior['gen']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>역 사 기 록</td>
-        <td colspan=5>".ConvertLog($emperior['history'], 1)."</td>
-    </tr>
-</table>
-";
-}
-?>
+    if ($showCurrentNation) {
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
+    ?>

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all;color:white; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+        <table align=center width=1000 style="margin-top:10px;" class='tb_layout bg0'>
+            <tr>
+                <td style="background-color:#333333;" align=center colspan=8>
+                    <font size=5>현재 (<?= $year ?>年 <?= $month ?>月)</font>
+                    <a href="v_history.php"><button type='button'>역사 보기</button></a>
+                </td>
+            </tr>
+        </table>
+
+    <?php
+    }
+
+    foreach ($emperiors as $emperior) {
+        $serverID = $emperior['server_id'] ?? ($emperior['serverID'] ?? null);
+    ?>
+
+        <table align=center width=1000 style="margin-top:10px;" class='tb_layout bg0'>
+            <tr>
+                <td bgcolor=skyblue align=center colspan=8>
+                    <font size=5><?= $emperior['phase'] ?></font>
+
+                    <a href="a_emperior_detail.php?select=<?= $emperior['no'] ?>"><button type='button'>자세히</button></a>
+
+                    <?php if ($emperior['server_id']) : ?>
+                        <a href="v_history.php?serverID=<?= $emperior['server_id'] ?>"><button type='button'>역사 보기</button></a>
+                    <?php endif ?>
+                </td>
+            </tr>
+            <tr>
+                <td align=center style='color:<?= newColor($emperior['color']) ?>;background-color:<?= $emperior['color'] ?>' colspan=8>
+                    <font size=5><?= $emperior['name'] ?> (<?= $emperior['year'] ?>年 <?= $emperior['month'] ?>月)</font>
+                </td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center width=80>국 력</td>
+                <td align=center width=170><?= $emperior['power'] ?></td>
+                <td class='bg1' align=center width=80>장 수</td>
+                <td align=center width=170><?= $emperior['gennum'] ?></td>
+                <td class='bg1' align=center width=80>속 령</td>
+                <td align=center width=170><?= $emperior['citynum'] ?></td>
+                <td class='bg1' align=center width=80>성 향</td>
+                <td align=center width=170><?= $emperior['type'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>황 제</td>
+                <td align=center><?= $emperior['l12name'] ?></td>
+                <td class='bg1' align=center>승 상</td>
+                <td align=center><?= $emperior['l11name'] ?></td>
+                <td class='bg1' align=center>표 기 장 군</td>
+                <td align=center><?= $emperior['l10name'] ?></td>
+                <td class='bg1' align=center>사 공</td>
+                <td align=center><?= $emperior['l9name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>거 기 장 군</td>
+                <td align=center><?= $emperior['l8name'] ?></td>
+                <td class='bg1' align=center>태 위</td>
+                <td align=center><?= $emperior['l7name'] ?></td>
+                <td class='bg1' align=center>위 장 군</td>
+                <td align=center><?= $emperior['l6name'] ?></td>
+                <td class='bg1' align=center>사 도</td>
+                <td align=center><?= $emperior['l5name'] ?></td>
+            </tr>
+        </table>
+
+
+
+    <?php
+    }
+    ?>
+
+    <table style="margin-top:10px;" align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>
-</html>

+</html>
@@ -1,208 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$select = Util::getReq('select', 'int', 0);
-
-extractMissingPostToGlobals();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("왕조일람", 2);
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>왕조일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>역 대 왕 조<br>
-        <input type=button value='창 닫기' onclick=window.close()><br>
-    </td></tr>
-</table>
-
-<?php
-
-if ($select == 0) {
-    $query = "select * from emperior_table order by no desc";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $empcount = MYDB_num_rows($result);
-
-    for ($i=0; $i < $empcount; $i++) {
-        $emperior = MYDB_fetch_array($result);
-
-        echo "
-<form action=a_emperior2.php method=post>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td bgcolor=skyblue align=center colspan=8>
-            <font size=5>{$emperior['phase']}</font>
-            <input type=submit value='자세히'>
-            <input type=hidden name=select value='{$emperior['no']}'>
-        </td>
-    </tr>
-    <tr>
-        <td align=center style=color:".newColor($emperior['color'])."; bgcolor={$emperior['color']} colspan=8>
-            <font size=5>{$emperior['name']} ({$emperior['year']}年 {$emperior['month']}月)</font>
-        </td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center width=123>국 력</td>
-        <td align=center width=123>{$emperior['power']}</td>
-        <td id=bg1 align=center width=123>장 수</td>
-        <td align=center width=123>{$emperior['gennum']}</td>
-        <td id=bg1 align=center width=123>속 령</td>
-        <td align=center width=123>{$emperior['citynum']}</td>
-        <td id=bg1 align=center width=123>성 향</td>
-        <td align=center width=123>{$emperior['type']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 width=123 align=center>황 제</td>
-        <td width=123 align=center>{$emperior['l12name']}</td>
-        <td id=bg1 width=123 align=center>승 상</td>
-        <td width=123 align=center>{$emperior['l11name']}</td>
-        <td id=bg1 width=123 align=center>위 장 군</td>
-        <td width=123 align=center>{$emperior['l10name']}</td>
-        <td id=bg1 width=123 align=center>사 공</td>
-        <td width=123 align=center>{$emperior['l9name']}</td>
-    </tr>
-</table>
-</form>";
-    }
-} else {
-    $query = "select * from emperior_table where no='$select'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $emperior = MYDB_fetch_array($result);
-
-    echo "
-<form action=a_emperior2.php method=post>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td bgcolor=skyblue align=center colspan=6>
-            <font size=5>{$emperior['phase']}</font>
-            <input type=submit value='전체보기'>
-            <input type=hidden name=select value='0'>
-        </td>
-    </tr>
-    <tr>
-        <td id=bg1 width=98 align=center>국 가 수<br>(최종 / 최대)</td>
-        <td align=center width=398 colspan=2>{$emperior['nation_count']}</td>
-        <td id=bg1 width=98 align=center>장 수 수<br>(최종 / 최대)</td>
-        <td align=center width=398 colspan=2>{$emperior['gen_count']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>등 장 국 가</td>
-        <td colspan=5>{$emperior['nation_name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>국가별 성향</td>
-        <td colspan=5>{$emperior['nation_hist']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>장 수 성 격</td>
-        <td colspan=5>{$emperior['personal_hist']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>장 수 특 기</td>
-        <td colspan=5>{$emperior['special_hist']}</td>
-    </tr>
-    <tr>
-        <td align=center style=color:".newColor($emperior['color'])."; bgcolor={$emperior['color']} colspan=6>
-            <font size=5>{$emperior['name']} ({$emperior['year']}年 {$emperior['month']}月)</font>
-        </td>
-    </tr>
-    <tr>
-        <td id=bg1 width=98 align=center>국 력</td>
-        <td align=center width=398 colspan=2>{$emperior['power']}</td>
-        <td id=bg1 width=98 align=center>성 향</td>
-        <td align=center width=398 colspan=2>{$emperior['type']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 width=98 align=center>장 수</td>
-        <td align=center width=398 colspan=2>{$emperior['gennum']}</td>
-        <td id=bg1 width=98 align=center>속 령</td>
-        <td align=center width=398 colspan=2>{$emperior['citynum']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>총 인 구</td>
-        <td align=center colspan=2>{$emperior['pop']}</td>
-        <td id=bg1 align=center>인 구 율</td>
-        <td align=center colspan=2>{$emperior['poprate']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>국 고</td>
-        <td align=center colspan=2>{$emperior['gold']}</td>
-        <td id=bg1 align=center>병 량</td>
-        <td align=center colspan=2>{$emperior['rice']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>황 제</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l12name']}</td>
-        <td id=bg1 align=center>승 상</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l11name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>위 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l10name']}</td>
-        <td id=bg1 align=center>사 공</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l9name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>표 기 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l8name']}</td>
-        <td id=bg1 align=center>태 위</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l7name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>거 기 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l6name']}</td>
-        <td id=bg1 align=center>사 도</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l5name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>오 호 장 군</td>
-        <td colspan=5>{$emperior['tiger']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>건 안 칠 자</td>
-        <td colspan=5>{$emperior['eagle']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>장 수 들<br>(공헌도 순서)</td>
-        <td colspan=5>{$emperior['gen']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>역 사 기 록</td>
-        <td colspan=5>".ConvertLog($emperior['history'], 1)."</td>
-    </tr>
-</table>
-</form>";
-}
-?>
-
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
-
@@ -0,0 +1,224 @@
+<?php
+
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+$select = Util::getReq('select', 'int', 0);
+
+$db = DB::db();
+
+$templates = new \League\Plates\Engine('templates');
+$templates->registerFunction('ConvertLog', '\sammo\ConvertLog');
+$templates->registerFunction('newColor', '\sammo\newColor');
+increaseRefresh("왕조일람", 1);
+
+$emperior = $db->queryFirstRow('SELECT * FROM emperior WHERE `no`=%i', $select);
+$serverID = $emperior['server_id'] ?? ($emperior['serverID'] ?? null);
+
+?>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 왕조일람</title>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+
+</head>
+
+<body>
+    <table align=center width=1000 class="tb_layout bg0">
+        <tr>
+            <td>역 대 왕 조<br>
+                <button onclick=window.close()>창 닫기</button>
+                <div style="float:right;"><a href="a_emperior.php"><button type='button'>전체보기</button></a>
+                    <div>
+            </td>
+        </tr>
+
+    </table>
+
+    <?php
+
+    if ($emperior) :
+    ?>
+
+
+        <table align=center width=1000 class='tb_layout bg0'>
+            <tr>
+                <td bgcolor=skyblue align=center colspan=6>
+                    <font size=5><?= $emperior['phase'] ?></font>
+                </td>
+            </tr>
+            <tr>
+                <td class='bg1' width=98 align=center>국 가 수<br>(최종 / 최대)</td>
+                <td align=center width=398 colspan=2><?= $emperior['nation_count'] ?></td>
+                <td class='bg1' width=98 align=center>장 수 수<br>(최종 / 최대)</td>
+                <td align=center width=398 colspan=2><?= $emperior['gen_count'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>등 장 국 가</td>
+                <td colspan=5><?= $emperior['nation_name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>국가별 성향</td>
+                <td colspan=5><?= $emperior['nation_hist'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>장 수 성 격</td>
+                <td colspan=5><?= $emperior['personal_hist'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>장 수 특 기</td>
+                <td colspan=5><?= $emperior['special_hist'] ?></td>
+            </tr>
+            <tr>
+                <td align=center style=color:<?= newColor($emperior['color']) ?>; bgcolor=<?= $emperior['color'] ?> colspan=6>
+                    <font size=5><?= $emperior['name'] ?> (<?= $emperior['year'] ?>年 <?= $emperior['month'] ?>月)</font>
+                </td>
+            </tr>
+            <tr>
+                <td class='bg1' width=98 align=center>국 력</td>
+                <td align=center width=398 colspan=2><?= $emperior['power'] ?></td>
+                <td class='bg1' width=98 align=center>성 향</td>
+                <td align=center width=398 colspan=2><?= $emperior['type'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' width=98 align=center>장 수</td>
+                <td align=center width=398 colspan=2><?= $emperior['gennum'] ?></td>
+                <td class='bg1' width=98 align=center>속 령</td>
+                <td align=center width=398 colspan=2><?= $emperior['citynum'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>총 인 구</td>
+                <td align=center colspan=2><?= $emperior['pop'] ?></td>
+                <td class='bg1' align=center>인 구 율</td>
+                <td align=center colspan=2><?= $emperior['poprate'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>국 고</td>
+                <td align=center colspan=2><?= $emperior['gold'] ?></td>
+                <td class='bg1' align=center>병 량</td>
+                <td align=center colspan=2><?= $emperior['rice'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>황 제</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l12name'] ?></td>
+                <td class='bg1' align=center>승 상</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l11name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>위 장 군</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l10name'] ?></td>
+                <td class='bg1' align=center>사 공</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l9name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>표 기 장 군</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l8name'] ?></td>
+                <td class='bg1' align=center>태 위</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l7name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>거 기 장 군</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l6name'] ?></td>
+                <td class='bg1' align=center>사 도</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l5name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>오 호 장 군</td>
+                <td colspan=5><?= $emperior['tiger'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>건 안 칠 자</td>
+                <td colspan=5><?= $emperior['eagle'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>장 수 들<br>(공헌도 순서)</td>
+                <td colspan=5><?= $emperior['gen'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>역 사 기 록</td>
+                <td colspan=5><?= formatHistoryToHTML(Json::decode($emperior['history'])) ?></td>
+            </tr>
+        </table>
+
+    <?php
+    endif;
+
+    $showServers = $emperior;
+
+    if (!$serverID) {
+        $serverID = UniqueConst::$serverID;
+    }
+
+    if ($showServers) {
+        $nations = $db->query('SELECT * FROM ng_old_nations WHERE server_id=%s ORDER BY date DESC', $serverID);
+        foreach ($nations as $nation) {
+            if (!$nation['nation'] ?? null) {
+                continue;
+            }
+            $nation = array_merge(Json::decode($nation['data']), $nation);
+
+            /** @var array $nation */
+            $nation['typeName'] = getNationType($nation['type']);
+            $nation['levelName'] = getNationLevel($nation['level']);
+            /** @var int[]|null $nationGenerals */
+            $nationGenerals = $nation['generals'];
+
+            if ($nationGenerals) {
+                $generals = $db->query('SELECT `general_no`, `name`, `last_yearmonth` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nationGenerals);
+
+                if (count($generals) != count($nationGenerals) && $serverID == UniqueConst::$serverID) {
+                    $liveGenerals = $nationGenerals;
+                    foreach ($generals as $general) {
+                        if (in_array($general['general_no'], $nationGenerals)) {
+                            unset($nationGenerals[$general['general_no']]);
+                        }
+                    }
+                    $liveGenerals = $db->query('SELECT `no`as`general_no`, `name` FROM general WHERE no IN %li', $liveGenerals);
+                    $nation['generalsFull'] = array_merge($liveGenerals, $generals);
+                } else {
+                    $nation['generalsFull'] = $generals;
+                }
+            } else {
+                $nation['generalsFull'] = [];
+            }
+
+            if (key_exists('aux', $nation) && !is_array($nation['aux'])) {
+                $nation = array_merge(Json::decode($nation['aux']), $nation);
+            }
+
+            echo $templates->render('oldNation', $nation);
+        }
+    }
+    ?>
+
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
+</body>
+
+</html>
@@ -1,205 +1,228 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$type = Util::getReq('type', 'int', 9);
-
-extractMissingPostToGlobals();
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("장수일람", 2);
-
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
-$query = "select con,turntime from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-if ($type <= 0 || $type > 15) {
-    $type = 9;
-}
-
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>장수일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-<script type="text/javascript" src="../e_lib/jquery-3.2.1.min.js"></script>
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>장 수 일 람<br><?=closeButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
-        <select id='viewType' name='type' size=1>
-            <option value=1>국가</option>
-            <option value=2>통솔</option>
-            <option value=3>무력</option>
-            <option value=4>지력</option>
-            <option value=5>명성</option>
-            <option value=6>계급</option>
-            <option value=7>관직</option>
-            <option value=8>삭턴</option>
-            <option value=9>벌점</option>
-            <option value=10>Lv</option>
-            <option value=11>성격</option>
-            <option value=12>내특</option>
-            <option value=13>전특</option>
-            <option value=14>연령</option>
-            <option value=15>NPC</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<?php
-$nationname = [];
-$nationlevel = [];
-$nationname[0] = "-";
-foreach (getAllNationStaticInfo() as $nation) {
-    $nationname[$nation['nation']] = $nation['name'];
-    $nationlevel[$nation['nation']] = $nation['level'];
-}
-
-switch ($type) { //FIXME:  $query 처리 조심.
-    case  1: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by nation"; break;
-    case  2: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by leader desc"; break;
-    case  3: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by power desc"; break;
-    case  4: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by intel desc"; break;
-    case  5: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
-    case  6: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by dedication desc"; break;
-    case  7: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by level desc"; break;
-    case  8: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by killturn"; break;
-    default:
-    case  9: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by connect desc"; break;
-    case 10: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
-    case 11: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by personal"; break;
-    case 12: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special desc"; break;
-    case 13: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special2 desc"; break;
-    case 14: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by age desc"; break;
-    case 15: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by npc desc"; break;
-}
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$gencount = MYDB_num_rows($genresult);
-
-echo"
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=64  align=center id=bg1>얼 굴</td>
-        <td width=100 align=center id=bg1>이 름</td>
-        <td width=50 align=center id=bg1>연령</td>
-        <td width=50 align=center id=bg1>성격</td>
-        <td width=90 align=center id=bg1>특기</td>
-        <td width=50 align=center id=bg1>레 벨</td>
-        <td width=100 align=center id=bg1>국 가</td>
-        <td width=60 align=center id=bg1>명 성</td>
-        <td width=60 align=center id=bg1>계 급</td>
-        <td width=80 align=center id=bg1>관 직</td>
-        <td width=45 align=center id=bg1>통솔</td>
-        <td width=45 align=center id=bg1>무력</td>
-        <td width=45 align=center id=bg1>지력</td>
-        <td width=45 align=center id=bg1>삭턴</td>
-        <td width=84 align=center id=bg1>벌점</td>
-    </tr>";
-for ($j=0; $j < $gencount; $j++) {
-    $general = MYDB_fetch_array($genresult);
-    $nation = $nationname[$general['nation']];
-
-    if ($general['level'] == 12) {
-        $lbonus = $nationlevel[$general['nation']] * 2;
-    } elseif ($general['level'] >= 5) {
-        $lbonus = $nationlevel[$general['nation']];
-    } else {
-        $lbonus = 0;
-    }
-    if ($lbonus > 0) {
-        $lbonus = "<font color=cyan>+{$lbonus}</font>";
-    } else {
-        $lbonus = "";
-    }
-
-    if ($general['injury'] > 0) {
-        $leader = intdiv($general['leader'] * (100 - $general['injury']), 100);
-        $power = intdiv($general['power'] * (100 - $general['injury']), 100);
-        $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leader = "<font color=red>{$leader}</font>{$lbonus}";
-        $power = "<font color=red>{$power}</font>";
-        $intel = "<font color=red>{$intel}</font>";
-    } else {
-        $leader = "{$general['leader']}{$lbonus}";
-        $power = "{$general['power']}";
-        $intel = "{$general['intel']}";
-    }
-
-    if ($general['npc'] >= 2) {
-        $name = "<font color=cyan>{$general['name']}</font>";
-    } elseif ($general['npc'] == 1) {
-        $name = "<font color=skyblue>{$general['name']}</font>";
-    } else {
-        $name =  "{$general['name']}";
-    }
-
-    $general['connect'] = Util::round($general['connect'] / 10) * 10;
-
-    $imageTemp = GetImageURL($general['imgsvr']);
-    echo "
-    <tr>
-        <td align=center><img width='64' height='64' src={$imageTemp}/{$general['picture']}></img></td>
-        <td align=center>$name</td>
-        <td align=center>{$general['age']}세</td>
-        <td align=center>".getGenChar($general['personal'])."</td>
-        <td align=center>".getGenSpecial($general['special'])." / ".getGenSpecial($general['special2'])."</td>
-        <td align=center>Lv ".getExpLevel($general['experience'])."</td>
-        <td align=center>{$nation}</td>
-        <td align=center>".getHonor($general['experience'])."</td>
-        <td align=center>".getDed($general['dedication'])."</td>
-        <td align=center>";
-    echo getLevel($general['level']);
-    echo "</td>
-        <td align=center>$leader</td>
-        <td align=center>$power</td>
-        <td align=center>$intel</td>
-        <td align=center>{$general['killturn']}</td>
-        <td align=center>{$general['connect']}";
-    echo "<br>【".getConnect($general['connect'])."】</td>
-    </tr>";
-}
-echo "
-</table>
-";
-
-?>
-
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-<script type="text/javascript">
-$(document).ready(function() {
-    $("#viewType").val("<?=$type?>").attr("selected", "selected");
-});
-</script>
-</body>
-
-</html>
+<?php
+
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+$type = Util::getReq('type', 'int', 9);
+
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+increaseRefresh("장수일람", 2);
+
+$me = $db->queryFirstRow(
+    'SELECT refresh_score,turntime FROM `general`
+    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner = %i', $userID
+);
+
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
+    printLimitMsg($me['turntime']);
+    exit();
+}
+
+if ($type <= 0 || $type > 15) {
+    $type = 9;
+}
+
+$ownerNameList = [];
+if ($gameStor->isunited) {
+    foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
+
+?>
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 장수일람</title>
+    <?= 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::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', 'common') ?>
+
+</head>
+
+<body>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>장 수 일 람<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>정렬순서 :
+                    <select id='viewType' name='type' size=1>
+                        <option value=1>국가</option>
+                        <option value=2>통솔</option>
+                        <option value=3>무력</option>
+                        <option value=4>지력</option>
+                        <option value=5>명성</option>
+                        <option value=6>계급</option>
+                        <option value=7>관직</option>
+                        <option value=8>삭턴</option>
+                        <option value=9>벌점</option>
+                        <option value=10>Lv</option>
+                        <option value=11>성격</option>
+                        <option value=12>내특</option>
+                        <option value=13>전특</option>
+                        <option value=14>연령</option>
+                        <option value=15>NPC</option>
+                    </select>
+                    <input type=submit value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <?php
+    $nationname = [];
+    $nationlevel = [];
+    $nationname[0] = "-";
+    foreach (getAllNationStaticInfo() as $nation) {
+        $nationname[$nation['nation']] = $nation['name'];
+        $nationlevel[$nation['nation']] = $nation['level'];
+    }
+
+
+    [$orderKey, $orderDesc] = [
+        1 => ['nation', false],
+        2 => ['leadership', true],
+        3 => ['strength', true],
+        4 => ['intel', true],
+        5 => ['experience', true],
+        6 => ['dedication', true],
+        7 => ['officer_level', true],
+        8 => ['killturn', false],
+        9 => ['refresh_score_total', true],
+        10 => ['experience', true],
+        11 => ['personal', true],
+        12 => ['special', true],
+        13 => ['special2', true],
+        14 => ['age', true],
+        15 => ['npc', true],
+    ][$type];
+
+    $generalList = $db->query(
+        'SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,refresh_score_total
+        FROM `general` LEFT JOIN `general_access_log` ON general.no = general_access_log.general_id order by %b %l',
+        $orderKey,
+        $orderDesc ? 'desc' : ''
+    );
+
+    echo "
+<table align=center width=1000 class='tb_layout bg0'>
+    <tr>
+        <td width=64  align=center class='bg1'>얼 굴</td>
+        <td width=140 align=center class='bg1'>이 름</td>
+        <td width=45 align=center class='bg1'>연령</td>
+        <td width=45 align=center class='bg1'>성격</td>
+        <td width=80 align=center class='bg1'>특기</td>
+        <td width=45 align=center class='bg1'>레 벨</td>
+        <td width=140 align=center class='bg1'>국 가</td>
+        <td width=55 align=center class='bg1'>명 성</td>
+        <td width=55 align=center class='bg1'>계 급</td>
+        <td width=75 align=center class='bg1'>관 직</td>
+        <td width=45 align=center class='bg1'>통솔</td>
+        <td width=45 align=center class='bg1'>무력</td>
+        <td width=45 align=center class='bg1'>지력</td>
+        <td width=45 align=center class='bg1'>삭턴</td>
+        <td width=70 align=center class='bg1'>벌점</td>
+    </tr>";
+    foreach ($generalList as $general) {
+        $nation = $nationname[$general['nation']];
+
+        $lbonus = calcLeadershipBonus($general['officer_level'], $nationlevel[$general['nation']] ?? 0);
+        if ($lbonus > 0) {
+            $lbonusText = "<font color=cyan>+{$lbonus}</font>";
+        } else {
+            $lbonusText = "";
+        }
+
+        if ($general['injury'] > 0) {
+            $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100);
+            $strength = intdiv($general['strength'] * (100 - $general['injury']), 100);
+            $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
+            $leadership = "<font color=red>{$leadership}</font>{$lbonusText}";
+            $strength = "<font color=red>{$strength}</font>";
+            $intel = "<font color=red>{$intel}</font>";
+        } else {
+            $leadership = "{$general['leadership']}{$lbonusText}";
+            $strength = "{$general['strength']}";
+            $intel = "{$general['intel']}";
+        }
+
+
+
+        $name = formatName($general['name'], $general['npc']);
+
+        if (key_exists($general['owner'], $ownerNameList)) {
+            $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
+        }
+
+        $general['refresh_score_total'] = Util::round($general['refresh_score_total'], -1);
+
+        $imageTemp = GetImageURL($general['imgsvr']);
+        echo "
+    <tr data-general-id='{$general['no']}'
+        data-general-wounded='{$general['injury']}'
+        data-general-leadership='{$general['leadership']}'
+        data-general-leadership-bonus='{$lbonus}'
+        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>
+        <td align=center>{$general['age']}세</td>
+        <td align=center>" . displayCharInfo($general['personal']) . "</td>
+        <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>
+        <td align=center>Lv " . getExpLevel($general['experience']) . "</td>
+        <td align=center>{$nation}</td>
+        <td align=center>" . getHonor($general['experience']) . "</td>
+        <td align=center>" . getDed($general['dedication']) . "</td>
+        <td align=center>";
+        echo getOfficerLevelText($general['officer_level']);
+        echo "</td>
+        <td align=center>$leadership</td>
+        <td align=center>$strength</td>
+        <td align=center>$intel</td>
+        <td align=center>{$general['killturn']}</td>
+        <td align=center>" . $general['refresh_score_total'] ?? 0;
+        echo "<br>【" . getRefreshScoreText($general['refresh_score_total'] ?? 0) . "】</td>
+    </tr>";
+    }
+    echo "
+</table>
+";
+
+    ?>
+
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $("#viewType").val("<?= $type ?>").attr("selected", "selected");
+        });
+    </script>
+</body>
+
+</html>
@@ -1,124 +1,169 @@
 <?php
+
 namespace sammo;

 include "lib.php";
 include "func.php";

+$session = Session::getInstance()->setReadOnly();
+$seasonIdx = Util::getReq('seasonIdx', 'int', UniqueConst::$seasonIdx);
+$scenarioIdx = Util::getReq('scenarioIdx', 'int', null);
+
 $db = DB::db();
-$connect=$db->get();
+
+increaseRefresh("명예의전당", 1);
+
+$scenarioList = (function () {
+    $db = DB::db();
+    $scenarioList = [];
+    foreach ($db->query('SELECT season, scenario_name as name, count(scenario) as cnt, scenario from ng_games group by season, scenario order by season desc, scenario asc') as $scenarioInfo) {
+        $seasonIdx = $scenarioInfo['season'];
+        $scenarioIdx = $scenarioInfo['scenario'];
+        if (!key_exists($seasonIdx, $scenarioList)) {
+            $scenarioList[$seasonIdx] = [];
+        }
+        $scenarioList[$seasonIdx][$scenarioIdx] = $scenarioInfo;
+    }
+    return $scenarioList;
+})();
+
+
+
+if ($scenarioIdx && key_exists($scenarioIdx, $scenarioList[$seasonIdx] ?? [])) {
+    $searchScenarioName = $scenarioList[$seasonIdx][$scenarioIdx]['name'];
+    $searchFilter = $db->sqleval('season = %i AND scenario = %i', $seasonIdx, $scenarioIdx);
+} else {
+    $searchScenarioName = '* 모두 *';
+    $searchFilter = $db->sqleval('season = %i', $seasonIdx);
+}

-increaseRefresh("명예의전당", 2);
 ?>
 <!DOCTYPE html>
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>명예의 전당</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=500" />
+    <title><?= UniqueConst::$serverName ?>: 명예의 전당</title>
+    <?= 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::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common', 'hallOfFame']) ?>
 </head>

 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=Font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>명 예 의 전 당<br><?=closeButton()?></td></tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<?php
-$type = array(
-    "명 성",
-    "계 급",
-    "계 략 성 공",
-    "전 투 횟 수",
-    "승 리",
-    "승 률",
-    "사 살",
-    "살 상 률",
-    "보 병 숙 련 도",
-    "궁 병 숙 련 도",
-    "기 병 숙 련 도",
-    "귀 병 숙 련 도",
-    "차 병 숙 련 도",
-    "전 력 전 승 률",
-    "통 솔 전 승 률",
-    "일 기 토 승 률",
-    "설 전 승 률",
-    "베 팅 투 자 액",
-    "베 팅 당 첨",
-    "베 팅 수 익 금",
-    "베 팅 수 익 률"
-);
-for ($i=0; $i < 21; $i++) {
-    $name = [];
-    $nation = [];
-    $data = [];
-    $color = [];
-    $pic = [];
-    
-    $query = "select * from hall where type={$i} order by rank";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+    <div id="container" class="bg0">
+        <div class="row gx-0">
+            <div class="col">명 예 의 전 당<br><?= closeButton() ?></div>
+        </div>
+        <div class="row gx-0">
+            <div class="col center">
+                시나리오 검색 : <select id="by_scenario" name="by_scenario">
+                    <?php foreach ($scenarioList as $iterSeasonIdx => $subScenarioList) : ?>
+                        <option data-season="<?= $iterSeasonIdx ?>" value="" <?= ($iterSeasonIdx == $seasonIdx && $scenarioIdx === null) ? "selected='selected'" : '' ?>>* 시즌 : <?= $iterSeasonIdx ?> 종합 *</option>
+                        <?php foreach ($subScenarioList as $info) : ?>
+                            <option data-season="<?= $iterSeasonIdx ?>" value="<?= $info['scenario'] ?>" <?= ($iterSeasonIdx == $seasonIdx && $info['scenario'] === $scenarioIdx) ? "selected='selected'" : '' ?>><?= $info['name'] ?>(<?= $info['cnt'] ?>회)</option>
+                        <?php endforeach; ?>
+                    <?php endforeach; ?>
+                    ?>
+                </select>
+            </div>
+        </div>
+        <?php
+        $types = [
+            'experience' => ['명 성', 'int'],
+            'dedication' => ['계 급', 'int'],
+            'firenum' => ['계 략 성 공', 'int'],
+            'warnum' => ['전 투 횟 수', 'int'],
+            'killnum' => ['승 리', 'int'],
+            'winrate' => ['승 률', 'percent'],
+            'occupied' => ['점 령', 'int'],
+            'killcrew' => ['사 살', 'int'],
+            'killrate' => ['살 상 률', 'percent'],
+            'killcrew_person' => ['대 인 사 살', 'int'],
+            'killrate_person' => ['대 인 살 상 률', 'percent'],
+            'dex1' => ['보 병 숙 련 도', 'int'],
+            'dex2' => ['궁 병 숙 련 도', 'int'],
+            'dex3' => ['기 병 숙 련 도', 'int'],
+            'dex4' => ['귀 병 숙 련 도', 'int'],
+            'dex5' => ['차 병 숙 련 도', 'int'],
+            'ttrate' => ['전 력 전 승 률', 'percent'],
+            'tlrate' => ['통 솔 전 승 률', 'percent'],
+            'tsrate' => ['일 기 토 승 률', 'percent'],
+            'tirate' => ['설 전 승 률', 'percent'],
+            'betgold' => ['베 팅 투 자 액', 'int'],
+            'betwin' => ['베 팅 당 첨', 'int'],
+            'betwingold' => ['베 팅 수 익 금', 'int'],
+            'betrate' => ['베 팅 수 익 률', 'percent'],
+        ];

-    echo "
-    <tr><td align=center colspan=10 id=bg1><font size=4>$type[$i]</font></td></tr>
-    <tr align=center id=bg2><td>1위</td><td>2위</td><td>3위</td><td>4위</td><td>5위</td><td>6위</td><td>7위</td><td>8위</td><td>9위</td><td>10위</td></tr>
-    <tr>";
+        $templates = new \League\Plates\Engine('templates');

-    for ($k=0; $k < 10; $k++) {
-        $gen = MYDB_fetch_array($result);
-        $name[$k]   = $gen['name'];
-        $nation[$k] = $gen['nation'];
-        $data[$k]   = $gen['data'];
-        $color[$k]  = $gen['color'];
-        $pic[$k]    = $gen['picture'];
-        if ($color[$k] == "") {
-            $color[$k] = GameConst::$basecolor4;
+        $ownerNameList = [];
+        foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+            $ownerNameList[$ownerID] = $ownerName;
        }
-        if ($nation[$k] == "") {
-            $nation[$k] = "&nbsp;";
-        }
-        /*
-                if($pic[$k] == "") {
-                    echo "<td align=center>&nbsp;</td>";
-                } else {
-                    $imageTemp = GetImageURL($gen['imgsvr']);
-                    echo "<td align=center><img width='64' height='64' src={$imageTemp}/{$pic[$k]}></img></td>";
+
+        foreach ($types as $typeName => [$typeDescribe, $typeValue]) {
+            $hallResult = $db->query('SELECT * FROM hall WHERE `type`=%s AND %? ORDER BY `value` DESC LIMIT 10', $typeName, $searchFilter);
+
+            $hallResult = array_map(function ($general) use ($typeValue, $ownerNameList) {
+                $aux = Json::decode($general['aux']);
+                /** @var array $general */
+                $general = array_merge($aux, $general);
+
+                if (key_exists($general['owner'], $ownerNameList)) {
+                    $general['ownerName'] = $ownerNameList[$general['owner']];
                }
-        */
-    }

-//    echo "</tr><tr>";
+                if (!key_exists('bgColor', $general)) {
+                    if (!key_exists('color', $general)) {
+                        $color = GameConst::$basecolor4;
+                    } else {
+                        $color = $general['color'];
+                    }
+                    $general['bgColor'] = $color;
+                }

-    for ($k=0; $k < 10; $k++) {
-        echo "<td align=center style=background-color:{$color[$k]};color:".newColor($color[$k]).">{$nation[$k]}</td>";
-    }
+                if (!key_exists('fgColor', $general)) {
+                    $general['fgColor'] = newColor($general['bgColor']);
+                }

-    echo "</tr><tr>";
+                if (key_exists('picture', $general)) {
+                    $imageTemp = GetImageURL($general['imgsvr']);
+                    $general['pictureFullPath'] = "$imageTemp/{$general['picture']}";
+                } else {
+                    $general['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
+                }

-    for ($k=0; $k < 10; $k++) {
-        echo "<td align=center style=background-color:{$color[$k]};color:".newColor($color[$k]).">{$name[$k]}</td>";
-    }
+                if (!key_exists('printValue', $general)) {
+                    $value = $general['value'];
+                    if ($typeValue == 'percent') {
+                        $general['printValue'] = number_format($value * 100, 2) . '%';
+                    } else {
+                        $general['printValue'] = number_format($value);
+                    }
+                }

-    echo "</tr><tr>";
+                return $general;
+            }, $hallResult);

-    for ($k=0; $k < 10; $k++) {
-        if ($i == 5 || $i == 7 || $i == 20) {
-            $data[$k] = intdiv($data[$k], 100).".".($data[$k]%100)." %";
+            echo $templates->render('hallOfFrame', [
+                'typeName' => $typeDescribe,
+                'generals' => $hallResult
+            ]);
        }
-        if ($i >= 13 && $i <= 16) {
-            $data[$k] = intdiv($data[$k], 100).".".($data[$k]%100)." %";
-        }
-        echo "<td align=center>{$data[$k]}</td>";
-    }
-    echo "</tr><tr><td colspan=10 height=5 id=bg1></td></tr>";
-}
-?>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+        ?>
+        <div class="row gx-0">
+            <div class="col"><?= closeButton() ?></div>
+        </div>
+        <div class="row bg0 gx-0">
+            <div class="col bg0"><?= banner() ?></div>
+        </div>
+    </div>
 </body>
-</html>

+</html>
@@ -1,164 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-$btn = Util::getReq('btn');
-$yearmonth = Util::getReq('yearmonth', 'int');
-
-extractMissingPostToGlobals();
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("연감", 5);
-
-$query = "select startyear,year,month,conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
-$query = "select map,con,turntime from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-$query = "select year,month from history order by no limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$history = MYDB_fetch_array($result);
-$s = ($history['year']*12) + $history['month'];
-
-$query = "select year,month from history order by no desc limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$history = MYDB_fetch_array($result);
-$e = ($history['year']*12) + $history['month'];
-
-//FIXME: $yearmonth가 올바르지 않을 경우에 처리가 필요.
-if (!$yearmonth) {
-    $year = $admin['year'];
-    $month = $admin['month'] - 1;
-} else {
-    $year = intdiv($yearmonth, 100);
-    $month = $yearmonth % 100;
-
-    if ($btn == "◀◀ 이전달") {
-        $month -= 1;
-    } elseif ($btn == "다음달 ▶▶") {
-        $month += 1;
-    }
-}
-$now = ($year*12) + $month;
-
-if ($now < $s) {
-    $now = $s;
-}
-if ($now > $e) {
-    $now = $e;
-}
-
-$year = intdiv($now, 12);
-$month = $now % 12;
-if ($month <= 0) {
-    $year -= 1;
-    $month += 12;
-}
-
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>연감</title>
-<script src="../e_lib/jquery-3.2.1.min.js"></script>
-<script src="../d_shared/common_path.js"></script>
-<script src="js/common.js"></script>
-<script src="js/base_map.js"></script>
-<script src="js/map.js"></script>
-
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-<link href="css/map.css" rel="stylesheet">
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>연 감<br><?=closeButton()?></td></tr>
-    <tr><td>
-        <form name=form1 method=post>
-        년월 선택 :
-        <input type=submit name=btn value="◀◀ 이전달">
-        <select name=yearmonth size=1>
-<?php
-$query = "select year,month from history";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$histCount = MYDB_num_rows($result);
-for ($i=0; $i < $histCount; $i++) {
-    $history = MYDB_fetch_array($result);
-    $value = "".$history['year'].StringUtil::padStringAlignRight($history['month'], 2, "0");
-    if ($history['year'] == $year && $history['month'] == $month) {
-        echo "
-            <option selected value={$value}>{$history['year']}년 {$history['month']}월</option>";
-    } else {
-        echo "
-            <option value={$value}>{$history['year']}년 {$history['month']}월</option>";
-    }
-}
-
-$query = "select log,genlog,nation,power,gen,city from history where year='$year' and month='$month'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$history = MYDB_fetch_array($result);
-?>
-        </select>
-        <input type=submit name=btn value='조회하기'>
-        <input type=submit name=btn value="다음달 ▶▶">
-        </form>
-    </td></tr>
-</table>
-<table align=center width=1000 height=520 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td colspan=5 align=center id=bg1>중 원 지 도</td></tr>
-    <tr height=520>
-        <td width=698>
-            <?=getMapHtml();?>
-            
-        <td width=98 valign=top><?=$history['nation']?></td>
-        <td width=78 valign=top><?=$history['power']?></td>
-        <td width=58 valign=top><?=$history['gen']?></td>
-        <td width=58 valign=top><?=$history['city']?></td>
-    </tr>
-    <tr><td colspan=5 align=center id=bg1>중 원 정 세</td></tr>
-    <tr>
-        <td colspan=5 valign=top>
-            <?=$history['log']?>
-        </td>
-    </tr>
-    <tr><td colspan=5 align=center id=bg1>장 수 동 향</td></tr>
-    <tr>
-        <td colspan=5 valign=top>
-            <?=$history['genlog']?>
-        </td>
-    </tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<script>
-reloadWorldMap({
-    targetJson:'j_map_history.php?year=<?=$year?>&month=<?=$month?>',
-    showMe:false,
-    neutralView:true
-});
-</script>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 include "lib.php";
@@ -8,247 +9,198 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

 $db = DB::db();
-$connect=$db->get();
-
+$gameStor = KVStorage::getStorage($db, 'game_env');
+$gameStor->cacheValues(['killturn', 'autorun_user', 'turnterm']);
 increaseRefresh("세력일람", 2);

-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
+$me = $db->queryFirstRow(
+    'SELECT refresh_score, turntime FROM `general`
+    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
+);

-$query = "select con,turntime from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
+    printLimitMsg($me['turntime']);
+    exit();
+}
 ?>
 <!DOCTYPE html>
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>세력일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 세력일람</title>
+    <?= WebUtil::printJS('../d_shared/common_path.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::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common', 'extKingdoms']) ?>
+    <?= WebUtil::printStaticValues($gameStor->getValues(['killturn', 'autorun_user', 'turnterm'])) ?>
 </head>

 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>세 력 일 람<br><?=closeButton()?></td></tr>
-</table>
-<?php
-$query = "select nation,name,color,level,type,power,gennum,capital from nation order by power desc";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$count = MYDB_num_rows($result);
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>세 력 일 람<br><?= closeButton() ?></td>
+        </tr>
+    </table>
+    <?php

-for($i=1; $i <= $count; $i++) {
-    $nation = MYDB_fetch_array($result);   //국가정보
+    $nations = getAllNationStaticInfo();
+    uasort($nations, function ($lhs, $rhs) {
+        return $rhs['power'] <=> $lhs['power'];
+    });

-    $query = "select city,name from city where nation='{$nation['nation']}'"; // 도시 이름 목록
-    $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $citycount = MYDB_num_rows($cityresult);
+    $nations[0] = getNationStaticInfo(0);

-    $query = "select npc,name,city from general where nation='{$nation['nation']}' and level='12'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $level12 = MYDB_fetch_array($genresult);
+    foreach ($db->query('SELECT npc,name,city,nation,officer_level,penalty,permission FROM general ORDER BY dedication DESC') as $general) {
+        $nationID = $general['nation'];

-    $query = "select npc,name from general where nation='{$nation['nation']}' and level='11'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $level11 = MYDB_fetch_array($genresult);
+        if (!key_exists('generals', $nations[$nationID])) {
+            $nations[$nationID]['generals'] = [];
+        }
+        $nations[$nationID]['generals'][] = $general;
+    }

-    $query = "select npc,name from general where nation='{$nation['nation']}' and level='10'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $level10 = MYDB_fetch_array($genresult);
+    foreach ($db->queryAllLists('SELECT city, name, nation FROM city') as [$cityID, $cityName, $nationID]) {
+        if (!key_exists('cities', $nations[$nationID])) {
+            $nations[$nationID]['cities'] = [];
+        }
+        $nations[$nationID]['cities'][$cityID] = $cityName;
+    }

-    $query = "select npc,name from general where nation='{$nation['nation']}' and level='9'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $level9 = MYDB_fetch_array($genresult);
+    foreach ($nations as $nation) {
+        if ($nation['nation'] == 0) {
+            //재야 도시, 장수
+            continue;
+        }
+        $generals = $nation['generals'];

-    $query = "select npc,name from general where nation='{$nation['nation']}' and level='8'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $level8 = MYDB_fetch_array($genresult);
-
-    $query = "select npc,name from general where nation='{$nation['nation']}' and level='7'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $level7 = MYDB_fetch_array($genresult);
-
-    $query = "select npc,name from general where nation='{$nation['nation']}' and level='6'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $level6 = MYDB_fetch_array($genresult);
-
-    $query = "select npc,name from general where nation='{$nation['nation']}' and level='5'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $level5 = MYDB_fetch_array($genresult);
-
-    $query = "select npc,name from general where nation='{$nation['nation']}' order by dedication desc";    // 장수 목록
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gencount = MYDB_num_rows($genresult);
-
-    if($level12['name'] == "") { $l12 = "-"; }
-    elseif($level12['npc'] >= 2) { $l12 = "<font color=cyan>{$level12['name']}</font>"; }
-    elseif($level12['npc'] == 1) { $l12 = "<font color=skyblue>{$level12['name']}</font>"; }
-    else { $l12 = $level12['name']; }
-
-    if($level11['name'] == "") { $l11 = "-"; }
-    elseif($level11['npc'] >= 2) { $l11 = "<font color=cyan>{$level11['name']}</font>"; }
-    elseif($level11['npc'] == 1) { $l11 = "<font color=skyblue>{$level11['name']}</font>"; }
-    else { $l11 = $level11['name']; }
-
-    if($level10['name'] == "") { $l10 = "-"; }
-    elseif($level10['npc'] >= 2) { $l10 = "<font color=cyan>{$level10['name']}</font>"; }
-    elseif($level10['npc'] == 1) { $l10 = "<font color=skyblue>{$level10['name']}</font>"; }
-    else { $l10 = $level10['name']; }
-
-    if($level9['name'] == "") { $l9 = "-"; }
-    elseif($level9['npc'] >= 2) { $l9 = "<font color=cyan>{$level9['name']}</font>"; }
-    elseif($level9['npc'] == 1) { $l9 = "<font color=skyblue>{$level9['name']}</font>"; }
-    else { $l9 = $level9['name']; }
-
-    if($level8['name'] == "") { $l8 = "-"; }
-    elseif($level8['npc'] >= 2) { $l8 = "<font color=cyan>{$level8['name']}</font>"; }
-    elseif($level8['npc'] == 1) { $l8 = "<font color=skyblue>{$level8['name']}</font>"; }
-    else { $l8 = $level8['name']; }
-
-    if($level7['name'] == "") { $l7 = "-"; }
-    elseif($level7['npc'] >= 2) { $l7 = "<font color=cyan>{$level7['name']}</font>"; }
-    elseif($level7['npc'] == 1) { $l7 = "<font color=skyblue>{$level7['name']}</font>"; }
-    else { $l7 = $level7['name']; }
-
-    if($level6['name'] == "") { $l6 = "-"; }
-    elseif($level6['npc'] >= 2) { $l6 = "<font color=cyan>{$level6['name']}</font>"; }
-    elseif($level6['npc'] == 1) { $l6 = "<font color=skyblue>{$level6['name']}</font>"; }
-    else { $l6 = $level6['name']; }
-
-    if($level5['name'] == "") { $l5 = "-"; }
-    elseif($level5['npc'] >= 2) { $l5 = "<font color=cyan>{$level5['name']}</font>"; }
-    elseif($level5['npc'] == 1) { $l5 = "<font color=skyblue>{$level5['name']}</font>"; }
-    else { $l5 = $level5['name']; }
-
-    echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
-    <tr>
-        <td colspan=8 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 {$nation['name']} 】</td>
-    </tr>
-    <tr>
-        <td width=123 align=center id=bg1>성 향</td>
-        <td width=123 align=center><font color=yellow>".getNationType($nation['type'])."</font></td>
-        <td width=123 align=center id=bg1>작 위</td>
-        <td width=123 align=center>".getNationLevel($nation['level'])."</td>
-        <td width=123 align=center id=bg1>국 력</td>
-        <td width=123 align=center>{$nation['power']}</td>
-        <td width=123 align=center id=bg1>장수 / 속령</td>
-        <td width=123 align=center>{$gencount} / {$citycount}</td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>".getLevel(12, $nation['level'])."</td>
-        <td align=center>$l12</td>
-        <td align=center id=bg1>".getLevel(11, $nation['level'])."</td>
-        <td align=center>$l11</td>
-        <td align=center id=bg1>".getLevel(10, $nation['level'])."</td>
-        <td align=center>$l10</td>
-        <td align=center id=bg1>".getLevel( 9, $nation['level'])."</td>
-        <td align=center>$l9</td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>".getLevel( 8, $nation['level'])."</td>
-        <td align=center>$l8</td>
-        <td align=center id=bg1>".getLevel( 7, $nation['level'])."</td>
-        <td align=center>$l7</td>
-        <td align=center id=bg1>".getLevel( 6, $nation['level'])."</td>
-        <td align=center>$l6</td>
-        <td align=center id=bg1>".getLevel( 5, $nation['level'])."</td>
-        <td align=center>$l5</td>
-    </tr>
-    <tr>
-        <td colspan=8>";
-    if($nation['level'] > 0) {
-        echo "속령 일람 : ";
-
-        for($j=0; $j < $citycount; $j++) {
-            $city = MYDB_fetch_array($cityresult);
-            if($city['city'] == $nation['capital']) {
-                echo "<font color=cyan>[{$city['name']}]</font>, ";
-            } else {
-                echo "{$city['name']}, ";
+        $chiefs = [];
+        $ambassadors = [];
+        $auditors = [];
+        foreach ($generals as $general) {
+            $officerLevel = $general['officer_level'];
+            if ($officerLevel >= 5) {
+                $chiefs[$officerLevel] = $general;
+            }
+            $generalPermission = checkSecretPermission($general, false);
+            if ($generalPermission == 4) {
+                $ambassadors[] = $general['name'];
+            } else if ($generalPermission == 3) {
+                $auditors[] = $general['name'];
            }
        }
-    } else {
-        $query = "select name from city where city='{$level12['city']}'";   // 군주 위치 도시 이름
-        $cityResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $city = MYDB_fetch_array($cityResult);

-        echo "현재 위치 : <font color=yellow>{$city['name']}</font>";
-    }
-    echo"
+        echo "
+<table align=center width=1000 class='tb_layout bg2'>
+    <tr>
+        <td colspan=8 align=center style=color:" . newColor($nation['color']) . "; bgcolor={$nation['color']}>【 {$nation['name']} 】</td>
+    </tr>
+    <tr>
+        <td width=80 align=center class='bg1'>성 향</td>
+        <td width=170 align=center><font color=yellow>" . getNationType($nation['type']) . "</font></td>
+        <td width=80 align=center class='bg1'>작 위</td>
+        <td width=170 align=center>" . getNationLevel($nation['level']) . "</td>
+        <td width=80 align=center class='bg1'>국 력</td>
+        <td width=170 align=center>{$nation['power']}</td>
+        <td width=80 align=center class='bg1'>장수 / 속령</td>
+        <td width=170 align=center>{$nation['gennum']} / " . count($nation['cities'] ?? []) . "</td>
+    ";
+        for ($chiefLevel = 12; $chiefLevel >= 5; $chiefLevel--) {
+            if ($chiefLevel % 4 == 0) {
+                echo '</tr><tr>';
+            }
+            $chief = $chiefs[$chiefLevel] ?? ['name' => '-', 'npc' => 0];
+            $officerLevelText = getOfficerLevelText($chiefLevel, $nation['level']);
+            $chiefText = formatName($chief['name'], $chief['npc']);
+            echo "<td class='center bg1'>{$officerLevelText}</td>
+        <td class='center'>{$chiefText}</td>";
+        }
+        echo "</tr>
+    <tr>
+        <td align=center class='bg1'>외교권자</td><td colspan=5>";
+        echo join(', ', $ambassadors);
+        echo "</td><td align=center class='bg1'>조언자</td><td align=center >";
+        echo count($auditors) . '명';
+        echo "</td></tr>
+    <tr>
+        <td colspan=8>";
+        if ($nation['level'] > 0) {
+            echo "속령 일람 : ";
+
+            foreach ($nation['cities'] as $cityID => $cityName) {
+                if ($cityID == $nation['capital']) {
+                    echo "<font color=cyan>[{$cityName}]</font>, ";
+                } else {
+                    echo "{$cityName}, ";
+                }
+            }
+        } else {
+            $cityName = CityConst::byID($chiefs[12]['city'])->name;
+
+            echo "현재 위치 : <font color=yellow>{$cityName}</font>";
+        }
+        echo "
        </td>
    </tr>
    <tr>
        <td colspan=8> 장수 일람 : ";
-    for($j=0; $j < $gencount; $j++) {
-        $general = MYDB_fetch_array($genresult);
-        if($general['npc'] >= 2) { echo "<font color=cyan>{$general['name']}</font>, "; }
-        elseif($general['npc'] == 1) { echo "<font color=skyblue>{$general['name']}</font>, "; }
-        else { echo "{$general['name']}, "; }
-    }
-    echo"
+        foreach ($generals as $general) {
+            echo formatName($general['name'], $general['npc']).', ';
+        }
+        echo "
        </td>
    </tr>
 </table>
 <br>";
-}
+    }

-//재야
-$query = "select npc,name from general where nation='0'";    // 장수 목록
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($genresult);
-
-$query = "select name from city where nation='0'"; // 도시 이름 목록
-$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$citycount = MYDB_num_rows($cityresult);
-
-echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
+    //재야
+    echo "
+<table align=center width=1000 class='tb_layout bg2'>
    <tr>
        <td colspan=5 align=center>【 재 야 】</td>
    </tr>
    <tr>
        <td width=498 align=center>&nbsp;</td>
-        <td width=123 align=center id=bg1>장 수</td>
-        <td width=123 align=center>{$gencount}</td>
-        <td width=123 align=center id=bg1>속 령</td>
-        <td width=123 align=center>{$citycount}</td>
+        <td width=123 align=center class='bg1'>장 수</td>
+        <td width=123 align=center>{$nations[0]['gennum']}</td>
+        <td width=123 align=center class='bg1'>속 령</td>
+        <td width=123 align=center>" . count($nations[0]['cities'] ?? []) . "</td>
    </tr>
    <tr>
        <td colspan=5> 속령 일람 : ";
-for($j=0; $j < $citycount; $j++) {
-    $city = MYDB_fetch_array($cityresult);
-    echo "{$city['name']}, ";
-}
-echo"
+    foreach ($nations[0]['cities'] ?? [] as $cityName) {
+        echo "{$cityName}, ";
+    }
+    echo "
        </td>
    </tr>
    <tr>
        <td colspan=5> 장수 일람 : ";
-    for($j=0; $j < $gencount; $j++) {
-        $general = MYDB_fetch_array($genresult);
-        if($general['npc'] >= 2) { echo "<font color=cyan>{$general['name']}</font>, "; }
-        elseif($general['npc'] == 1) { echo "<font color=skyblue>{$general['name']}</font>, "; }
-        else { echo "{$general['name']}, "; }
+    foreach ($nations[0]['generals'] as $general) {
+        $generalText = formatName($general['name'], $general['npc']);
+        echo "{$generalText}, ";
    }
-    echo"
+    echo "
        </td>
    </tr>
 </table>";

-?>
+    ?>

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>

-</html>
+</html>
@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 include "lib.php";
@@ -6,14 +7,11 @@ include "func.php";

 $type = Util::getReq('type', 'int', 1);

-extractMissingPostToGlobals();
-
-if($type <= 0 || $type > 8){
+if ($type <= 0 || $type > 8) {
    $type = 1;
 }

 $db = DB::db();
-$connect=$db->get();

 increaseRefresh("빙의일람", 2);

@@ -25,106 +23,119 @@ $sel[$type] = "selected";
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>빙의일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 빙의일람</title>
+    <?= WebUtil::printJS('../d_shared/common_path.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::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>

 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>빙 의 일 람<br><?=closeButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[1]??''?> value=1>이름</option>
-            <option <?=$sel[2]??''?> value=2>국가</option>
-            <option <?=$sel[3]??''?> value=3>종능</option>
-            <option <?=$sel[4]??''?> value=4>통솔</option>
-            <option <?=$sel[5]??''?> value=5>무력</option>
-            <option <?=$sel[6]??''?> value=6>지력</option>
-            <option <?=$sel[7]??''?> value=7>명성</option>
-            <option <?=$sel[8]??''?> value=8>계급</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<?php
-$nationname = [];
-$nationname[0] = "-";
-foreach (getAllNationStaticInfo() as $nation) {
-    $nationname[$nation['nation']] = $nation['name'];
-}
-
-switch ($type) {//FIXME: $query 처리 부실
-    default:
-    case  1: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by binary(name)"; break;
-    case  2: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by nation"; break;
-    case  3: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by sum desc"; break;
-    case  4: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by leader"; break;
-    case  5: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by power"; break;
-    case  6: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by intel"; break;
-    case  7: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by experience"; break;
-    case  8: $query = "select npc,nation,name,name2,special,special2,personal,leader,power,intel,leader+power+intel as sum,explevel,experience,dedication from general where npc=1 order by dedication"; break;
-}
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$gencount = MYDB_num_rows($genresult);
-
-echo"
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=102  align=center id=bg1>희생된 장수</td>
-        <td width=102  align=center id=bg1>악령 이름</td>
-        <td width=68  align=center id=bg1>레벨</td>
-        <td width=118 align=center id=bg1>국가</td>
-        <td width=68  align=center id=bg1>성격</td>
-        <td width=88  align=center id=bg1>특기</td>
-        <td width=68  align=center id=bg1>종능</td>
-        <td width=68  align=center id=bg1>통솔</td>
-        <td width=68  align=center id=bg1>무력</td>
-        <td width=68  align=center id=bg1>지력</td>
-        <td width=78  align=center id=bg1>명성</td>
-        <td width=78  align=center id=bg1>계급</td>
-    </tr>";
-for ($j=0; $j < $gencount; $j++) {
-    $general = MYDB_fetch_array($genresult);
-    $nation = $nationname[$general['nation']];
-
-    if ($general['npc'] >= 2) {
-        $name = "<font color=cyan>{$general['name']}</font>";
-    } elseif ($general['npc'] == 1) {
-        $name = "<font color=skyblue>{$general['name']}</font>";
-    } else {
-        $name =  "{$general['name']}";
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>빙 의 일 람<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>정렬순서 :
+                    <select name=type size=1>
+                        <option <?= $sel[1] ?? '' ?> value=1>이름</option>
+                        <option <?= $sel[2] ?? '' ?> value=2>국가</option>
+                        <option <?= $sel[3] ?? '' ?> value=3>종능</option>
+                        <option <?= $sel[4] ?? '' ?> value=4>통솔</option>
+                        <option <?= $sel[5] ?? '' ?> value=5>무력</option>
+                        <option <?= $sel[6] ?? '' ?> value=6>지력</option>
+                        <option <?= $sel[7] ?? '' ?> value=7>명성</option>
+                        <option <?= $sel[8] ?? '' ?> value=8>계급</option>
+                    </select>
+                    <input type=submit value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <?php
+    $nationName = [];
+    $nationName[0] = "-";
+    foreach (getAllNationStaticInfo() as $nation) {
+        $nationName[$nation['nation']] = $nation['name'];
    }

-    echo "
-    <tr>
-        <td align=center>{$name}</td>
-        <td align=center>{$general['name2']}</td>
-        <td align=center>Lv {$general['explevel']}</td>
-        <td align=center>{$nation}</td>
-        <td align=center>".getGenChar($general['personal'])."</td>
-        <td align=center>".getGenSpecial($general['special'])." / ".getGenSpecial($general['special2'])."</td>
-        <td align=center>{$general['sum']}</td>
-        <td align=center>{$general['leader']}</td>
-        <td align=center>{$general['power']}</td>
-        <td align=center>{$general['intel']}</td>
-        <td align=center>{$general['experience']}</td>
-        <td align=center>{$general['dedication']}</td>
-    </tr>";
-}
-echo "
-</table>
-";
+    $generalList = $db->query('SELECT npc,nation,name,owner_name,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1');
+    $generalListFromPool = $db->query('SELECT npc,nation,name,owner_name,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general JOIN select_pool on general.no = select_pool.general_id where npc=0');

-?>
+    if ($generalListFromPool) {
+        $generalList = array_merge($generalListFromPool, $generalList);
+    }

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+    $sortType = [
+        1 => ['name', true],
+        2 => ['nation', true],
+        3 => ['sum', false],
+        4 => ['leadership', false],
+        5 => ['strength', false],
+        6 => ['intel', false],
+        7 => ['experience', false],
+        8 => ['dedication', false],
+    ];
+
+    [$sortKey, $isAsc] = $sortType[$type];
+
+    if ($isAsc) {
+        usort($generalList, function ($lhs, $rhs) use ($sortKey) {
+            return $lhs[$sortKey] <=> $rhs[$sortKey];
+        });
+    } else {
+        usort($generalList, function ($lhs, $rhs) use ($sortKey) {
+            return $rhs[$sortKey] <=> $lhs[$sortKey];
+        });
+    }
+
+    ?>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td width=102 align=center class='bg1'>희생된 장수</td>
+            <td width=102 align=center class='bg1'>악령 이름</td>
+            <td width=68 align=center class='bg1'>레벨</td>
+            <td width=118 align=center class='bg1'>국가</td>
+            <td width=68 align=center class='bg1'>성격</td>
+            <td width=88 align=center class='bg1'>특기</td>
+            <td width=68 align=center class='bg1'>종능</td>
+            <td width=68 align=center class='bg1'>통솔</td>
+            <td width=68 align=center class='bg1'>무력</td>
+            <td width=68 align=center class='bg1'>지력</td>
+            <td width=78 align=center class='bg1'>명성</td>
+            <td width=78 align=center class='bg1'>계급</td>
+        </tr>
+        <?php foreach ($generalList as $general) : ?>
+            <tr>
+                <td align=center><?= formatName($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>
+                <td align=center><?= displayCharInfo($general['personal']) ?></td>
+                <td align=center><?= displaySpecialDomesticInfo($general['special']) ?> / <?= displaySpecialWarInfo($general['special2']) ?></td>
+                <td align=center><?= $general['sum'] ?></td>
+                <td align=center><?= $general['leadership'] ?></td>
+                <td align=center><?= $general['strength'] ?></td>
+                <td align=center><?= $general['intel'] ?></td>
+                <td align=center><?= $general['experience'] ?></td>
+                <td align=center><?= $general['dedication'] ?></td>
+            </tr>
+        <?php endforeach; ?>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>

-</html>
+</html>
@@ -1,82 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("세력도", 2);
-checkTurn();
-
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
-
-$query = "select map,con,turntime from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<title>세력도</title>
-<script src="../e_lib/jquery-3.2.1.min.js"></script>
-<script src="../d_shared/common_path.js"></script>
-<script src="js/common.js"></script>
-<script src="js/base_map.js"></script>
-<script src="js/map.js"></script>
-<script>
-$(function(){
-
-    reloadWorldMap({
-        neutralView:true,
-        showMe:true
-    });
-
-});
-</script>
-<link href="../d_shared/common.css" rel="stylesheet">
-<link href="css/normalize.css" rel="stylesheet">
-<link href="css/common.css" rel="stylesheet">
-<link href="css/map.css" rel="stylesheet">
-
-</head>
-
-<body>
-<table align=center width=1200 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>세 력 도<br><?=closeButton()?></td></tr>
-</table>
-<table align=center width=1200 height=520 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr height=520>
-        <td width=498 valign=top>
-            <?=getGeneralPublicRecordRecent(34)?>
-        </td>
-        <td width=698>
-            <?=getMapHtml()?>
-        </td>
-    </tr>
-    <tr>
-        <td colspan=2 valign=top>
-            <?php getWorldHistoryRecent(34); ?>
-        </td>
-    </tr>
-</table>
-<table align=center width=1200 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-
-</html>
-
@@ -1,271 +1,227 @@
 <?php
+
 namespace sammo;

+use sammo\Enums\GeneralAccessLogColumn;
+
 include "lib.php";
 include "func.php";

 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');

-increaseRefresh("갱신정보", 2);
+increaseRefresh("갱신정보", 1);

-$query = "select year,month,refresh,maxrefresh,maxonline from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$game = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxrefresh', 'maxonline', 'recentTraffic']);

-$log = getRawFileLogRecent(__dir__.'/logs/_traffic.txt', 11, 100);
-
-$date = [];
-$year = [];
-$month = [];
-$refresh = [];
-$online = [];
+$recentTraffic = $admin['recentTraffic'] ?? [];

 $curonline = getOnlineNum();
-$visibleLogs = min(11, count($log));
-for ($i=0; $i < $visibleLogs; $i++) {
-    $parse = explode("|", $log[count($log)-$visibleLogs+$i]);
-    $date[$i]    = trim($parse[0]);
-    $year[$i]    = trim($parse[1]);
-    $month[$i]   = trim($parse[2]);
-    $refresh[$i] = trim($parse[3]);
-    $online[$i]  = trim($parse[4]);
+
+$recentTraffic[] = [
+    'year'    => $admin['year'],
+    'month'   => $admin['month'],
+    'refresh' => $admin['refresh'],
+    'online'  => $curonline,
+    'date' => TimeUtil::now()
+];
+
+if ($admin['maxrefresh'] == 0) {
+    $admin['maxrefresh'] = 1;
 }
-if ($game['maxrefresh'] == 0) {
-    $game['maxrefresh'] = 1;
+if ($admin['maxrefresh'] < $admin['refresh']) {
+    $admin['maxrefresh'] = $admin['refresh'];
 }
-if ($game['maxrefresh'] < $game['refresh']) {
-    $game['maxrefresh'] = $game['refresh'];
+if ($admin['maxonline'] == 0) {
+    $admin['maxonline'] = 1;
 }
-if ($game['maxonline'] == 0) {
-    $game['maxonline'] = 1;
-}
-if ($game['maxonline'] < $curonline) {
-    $game['maxonline'] = $curonline;
+if ($admin['maxonline'] < $curonline) {
+    $admin['maxonline'] = $curonline;
 }
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
-<title>트래픽정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+    <title><?= UniqueConst::$serverName ?>: 트래픽정보</title>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= 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" />
+    <style>
+        .big_bar {
+            float: left;
+            position: relative;
+            height: 30px;
+        }

+        .big_bar span {
+            float: right;
+            padding: 0;
+            margin: 0;
+            line-height: 30px;
+            padding-right: 1ch;
+        }
+
+        .little_bar {
+            float: left;
+            position: relative;
+            height: 17px;
+        }
+
+        span.out_bar {
+            line-height: 30px;
+            margin-left: 1ch;
+        }
+    </style>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
+
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>트 래 픽 정 보<br><?=closeButton()?></td></tr>
-</table>
-<br>
-<table align=center width=1016 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all;>
-    <tr><td align=left>
-        <table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-            <tr><td colspan=4 align=center id=bg2><font size=5>접 속 량</font></td></tr>
-<?php
-for ($i=0; $i < $visibleLogs; $i++) {
-    $w = round($refresh[$i] / $game['maxrefresh'] * 100, 1);
-    if ($w >= 100) {
-        $w -= 0.1;
-    }
-    if ($refresh[$i] < 10 && $w < 3) {
-        $w = 3;
-    } elseif ($refresh[$i] < 100 && $w < 6) {
-        $w = 6;
-    } elseif ($refresh[$i] < 1000 && $w < 9) {
-        $w = 9;
-    }
-    $w2 = round(100 - $w, 1);
-    $color = getTrafficColor($w);
-    $dt = substr($date[$i], 11, 5); ?>
-            <tr height=30>
-                <td width=100 align=center><?=$year[$i]?>년 <?=$month[$i]?>월</td>
-                <td width=60 align=center id=bg2><?=$dt?></td>
-                <td width=2 align=center id=bg1></td>
-                <td width=320 align=center>
-                    <table align=center width=100% height=30 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                        <tr>
-                            <td width=<?=$w?>% bgcolor=<?=$color?> align=right><?=$refresh[$i]?>&nbsp;</td>
-                            <td width=<?=$w2?>% id=bg0><font size=1>&nbsp;</font></td>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>트 래 픽 정 보<br><?= closeButton() ?></td>
+        </tr>
+    </table>
+    <br>
+    <table align=center width=1016>
+        <tr>
+            <td align=left>
+                <table align=center class='tb_layout bg0'>
+                    <tr>
+                        <td colspan=4 align=center class='bg2'>
+                            <font size=5>접 속 량</font>
+                        </td>
+                    </tr>
+                    <?php
+                    foreach ($recentTraffic as $trafficItem) {
+                        $value = $trafficItem['refresh'];
+                        $w = round($value / $admin['maxrefresh'] * 100, 1);
+                        $color = getTrafficColor($w);
+                        $dt = substr($trafficItem['date'], 11, 5); ?>
+                        <tr height=30>
+                            <td width=100 align=center><?= $trafficItem['year'] ?>년 <?= $trafficItem['month'] ?>월</td>
+                            <td width=60 align=center class='bg2'><?= $dt ?></td>
+                            <td width=2 align=center class='bg1'></td>
+                            <td width=320>
+                                <?php if ($w == 0) : ?>
+                                    <span class="out_bar"><?= $value ?></span>
+                                <?php elseif ($w < 10) : ?>
+                                    <div class='big_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'></div><span class="out_bar"><?= $value ?></span>
+                                <?php else : ?>
+                                    <div class='big_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'><span><?= $value ?></span></div>
+                                <?php endif; ?>
+
+                            </td>
                        </tr>
-                    </table>
-                </td>
-            </tr>
-<?php
-}
-$w = round($game['refresh'] / $game['maxrefresh'] * 100, 1);
-if ($w >= 100) {
-    $w -= 0.1;
-}
-if ($game['refresh'] < 10 && $w < 3) {
-    $w = 3;
-} elseif ($game['refresh'] < 100 && $w < 6) {
-    $w = 6;
-} elseif ($game['refresh'] < 1000 && $w < 9) {
-    $w = 9;
-}
-$w2 = round(100 - $w, 1);
-$color = getTrafficColor($w);
-$dt = date('H:i');
-?>
-            <tr height=30>
-                <td width=100 align=center><?=$game['year']?>년 <?=$game['month']?>월</td>
-                <td width=60 align=center id=bg2><?=$dt?></td>
-                <td width=2 align=center id=bg1></td>
-                <td width=320 align=center>
-                    <table align=center width=100% height=30 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                        <tr>
-                            <td width=<?=$w?>% bgcolor=<?=$color?> align=right><?=$game['refresh']?>&nbsp;</td>
-                            <td width=<?=$w2?>% id=bg0><font size=1>&nbsp;</font></td>
+                    <?php
+                    }
+                    ?>
+                    <tr>
+                        <td colspan=4 height=5 align=center class='bg1'></td>
+                    </tr>
+                    <tr>
+                        <td colspan=4 height=30 align=center class='bg0'>최고기록: <?= $admin['maxrefresh'] ?></td>
+                    </tr>
+
+
+                </table>
+            </td>
+            <td align=right>
+                <table align=center class='tb_layout bg0'>
+                    <tr>
+                        <td colspan=4 align=center class='bg2'>
+                            <font size=5>접 속 자</font>
+                        </td>
+                    </tr>
+                    <?php
+                    foreach ($recentTraffic as $trafficItem) {
+                        $value = $trafficItem['online'];
+                        $w = round($value / $admin['maxonline'] * 100, 1);
+                        $color = getTrafficColor($w);
+                        $dt = substr($trafficItem['date'], 11, 5); ?>
+                        <tr height=30>
+                            <td width=100 align=center><?= $trafficItem['year'] ?>년 <?= $trafficItem['month'] ?>월</td>
+                            <td width=60 align=center class='bg2'><?= $dt ?></td>
+                            <td width=2 align=center class='bg1'></td>
+                            <td width=320>
+                                <?php if ($w == 0) : ?>
+                                    <span class="out_bar"><?= $value ?></span>
+                                <?php elseif ($w < 10) : ?>
+                                    <div class='big_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'></div><span class="out_bar"><?= $value ?></span>
+                                <?php else : ?>
+                                    <div class='big_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'><span><?= $value ?></span></div>
+                                <?php endif; ?>
+
+                            </td>
                        </tr>
-                    </table>
-                </td>
-            </tr>
-            <tr><td colspan=4 height=5 align=center id=bg1></td></tr>
+                    <?php
+                    }
+                    ?>
+                    <tr>
+                        <td colspan=4 height=5 align=center class='bg1'></td>
+                    </tr>
+                    <tr>
+                        <td colspan=4 height=30 align=center class='bg0'>최고기록: <?= $admin['maxonline'] ?></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+    <br>
+    <table align=center class='tb_layout bg0'>
+        <tr>
+            <td colspan=3 align=center class='bg2'>
+                <font size=5>주 의 대 상 자 (순간과도갱신)</font>
+            </td>
+        </tr>
+        <?php
+        $totalRefresh = [
+            ...$db->queryFirstRow('SELECT sum(`refresh`) as `refresh`, sum(`refresh_score_total`) as `refresh_score_total` from general_access_log'),
+            'name' => '접속자 총합'
+        ];
+
+        $top5Refresh = $db->query(
+            'SELECT `name`, `log`.`refresh`, `refresh_score_total` FROM `general_access_log` AS `log`
+            INNER JOIN `general` ON `log`.`general_id` = `general`.`no` ORDER BY `log`.`refresh` DESC LIMIT 5'
+        );
+
+        foreach (array_merge([$totalRefresh], $top5Refresh) as $i => $user) {
+            $w = round($user['refresh'] / max(1, $totalRefresh['refresh']) * 100, 1);
+            $w2 = round(100 - $w, 1);
+            $color = getTrafficColor($w);
+        ?>
            <tr>
-                <td colspan=4 height=30 align=center id=bg0>최고기록: <?=$game['maxrefresh']?></td>
-            </tr>
-
-
-        </table>
-    </td>
-    <td align=right>
-        <table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-            <tr><td colspan=4 align=center id=bg2><font size=5>접 속 자</font></td></tr>
-<?php
-for ($i=0; $i < $visibleLogs; $i++) {
-    $w = round($online[$i] / $game['maxonline'] * 100, 1);
-    if ($w >= 100) {
-        $w -= 0.1;
-    }
-    if ($online[$i] < 10 && $w < 3) {
-        $w = 3;
-    } elseif ($online[$i] < 100 && $w < 6) {
-        $w = 6;
-    } elseif ($online[$i] < 1000 && $w < 9) {
-        $w = 9;
-    }
-    $w2 = round(100 - $w, 1);
-    $color = getTrafficColor($w);
-    $dt = substr($date[$i], 11, 5); ?>
-            <tr height=30>
-                <td width=100 align=center><?=$year[$i]?>년 <?=$month[$i]?>월</td>
-                <td width=60 align=center id=bg2><?=$dt?></td>
-                <td width=2 align=center id=bg1></td>
-                <td width=320 align=center>
-                    <table align=center width=100% height=30 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                        <tr>
-                            <td width=<?=$w?>% bgcolor=<?=$color?> align=right><?=$online[$i]?>&nbsp;</td>
-                            <td width=<?=$w2?>% id=bg0><font size=1>&nbsp;</font></td>
-                        </tr>
-                    </table>
+                <td width=98 align=center><?= $user['name'] ?></td>
+                <td width=98 align=center><?= $user['refresh_score_total'] ?>(<?= $user['refresh'] ?>)</td>
+                <td width=798>
+                    <?php if ($w == 0) : ?>
+                    <?php elseif ($w < 10) : ?>
+                        <div class='little_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'></div>
+                    <?php else : ?>
+                        <div class='little_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'></div>
+                    <?php endif; ?>
                </td>
            </tr>
-<?php
-}
-$w = round($curonline / $game['maxonline'] * 100, 1);
-if ($w >= 100) {
-    $w -= 0.1;
-}
-if ($curonline < 10 && $w < 3) {
-    $w = 3;
-} elseif ($curonline < 100 && $w < 6) {
-    $w = 6;
-} elseif ($curonline < 1000 && $w < 9) {
-    $w = 9;
-}
-$w2 = round(100 - $w, 1);
-$color = getTrafficColor($w);
-$dt = date('H:i');
-echo "
-            <tr height=30>
-                <td width=100 align=center>{$game['year']}년 {$game['month']}월</td>
-                <td width=60 align=center id=bg2>{$dt}</td>
-                <td width=2 align=center id=bg1></td>
-                <td width=320 align=center>
-                    <table align=center width=100% height=30 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                        <tr>
-                            <td width={$w}% bgcolor={$color} align=right>{$curonline}&nbsp;</td>
-                            <td width={$w2}% id=bg0><font size=1>&nbsp;</font></td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-            <tr><td colspan=4 height=5 align=center id=bg1></td></tr>
-            <tr>
-                <td colspan=4 height=30 align=center id=bg0>최고기록: {$game['maxonline']}</td>
-            </tr>
-";
-?>
-        </table>
-    </td></tr>
-</table>
-<br>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td colspan=3 align=center id=bg2><font size=5>주 의 대 상 자 (순간과도갱신)</font></td></tr>
-<?php
-$query = "select sum(refresh) as refresh,sum(connect) as connect from general";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$user = MYDB_fetch_array($result);
-$user['connect'] = round($user['connect'], 1);
-$maxrefresh = $user['refresh'];
-
-$w = round($maxrefresh / $maxrefresh * 100, 1);
-$w2 = round(100 - $w, 1);
-$color = getTrafficColor($w);
-echo "
-    <tr id=bg2>
-        <td width=98  align=center>주의대상자</td>
-        <td width=98  align=center>벌점(순간갱신)</td>
-        <td width=798 align=center>전체 대비</td>
-    </tr>
-    <tr>
-        <td align=center>접속자 총합</td>
-        <td align=center>{$user['connect']}({$maxrefresh})</td>
-        <td align=center>
-            <table align=center width=100% height=100% border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                <tr>
-                    <td width={$w}% bgcolor={$color}>&nbsp;</td>
-                    <td width={$w2}%>&nbsp;</td>
-                </tr>
-            </table>
-        </td>
-    </tr>
-";
-
-$query = "select name,refresh,connect from general order by refresh desc limit 0,5";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$count = MYDB_num_rows($result);
-for ($i=0; $i < $count; $i++) {
-    $user = MYDB_fetch_array($result);
-
-    $w = round($user['refresh'] / $maxrefresh * 100, 1);
-    $w2 = round(100 - $w, 1);
-    $color = getTrafficColor($w);
-    echo "
-    <tr>
-        <td width=98  align=center>{$user['name']}</td>
-        <td width=98  align=center>{$user['connect']}({$user['refresh']})</td>
-        <td width=798 align=center>
-            <table align=center width=100% height=100% border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                <tr>
-                    <td width={$w}% bgcolor={$color}>&nbsp;</td>
-                    <td width={$w2}%>&nbsp;</td>
-                </tr>
-            </table>
-        </td>
-    </tr>
-    ";
-}
-?>
-</table>
-<br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+        <?php
+        }
+        ?>
+    </table>
+    <br>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
+
 </html>

 <?php
@@ -274,7 +230,7 @@ function getTrafficColor($per)
    $r = getHex($per);
    $b = getHex(100 - $per);
    $color = $r . "00" . $b;
-    return $color;
+    return '#' . $color;
 }

 function getHex($dec)
@@ -288,9 +244,37 @@ function getHex($dec)
 function getHexCode($hex)
 {
    switch ($hex) {
-    case  0: return "0";    case  1: return "1";    case  2: return "2";    case  3: return "3";
-    case  4: return "4";    case  5: return "5";    case  6: return "6";    case  7: return "7";
-    case  8: return "8";    case  9: return "9";    case 10: return "A";    case 11: return "B";
-    case 12: return "C";    case 13: return "D";    case 14: return "E";    case 15: return "F";
+        case  0:
+            return "0";
+        case  1:
+            return "1";
+        case  2:
+            return "2";
+        case  3:
+            return "3";
+        case  4:
+            return "4";
+        case  5:
+            return "5";
+        case  6:
+            return "6";
+        case  7:
+            return "7";
+        case  8:
+            return "8";
+        case  9:
+            return "9";
+        case 10:
+            return "A";
+        case 11:
+            return "B";
+        case 12:
+            return "C";
+        case 13:
+            return "D";
+        case 14:
+            return "E";
+        case 15:
+            return "F";
    }
 }
@@ -1,370 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("설문조사", 1);
-
-$query = "select no,vote from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
-
-$query = "select develcost,voteopen,vote,votecomment from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
-$vote = explode("|", $admin['vote']);
-if ($vote[0] == "") {
-    $vote[0] = "-";
-}
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>설문조사</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-<script type="text/javascript">
-function captureKey(e) {
-    if(e.keyCode == 13 && e.srcElement.type == 'text') {
-        form1.btn.value = '댓글';
-        form1.btn.click();
-        return false;
-    }
-}
-</script>
-
-</head>
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>설 문 조 사<br><?=closeButton()?></td></tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<form name=form1 action=c_vote.php method=post>
-    <tr><td colspan=3 align=center id=bg2><font size=5>설 문 조 사 (<?=$admin['develcost']*5?>금과 추첨으로 유니크템 증정!)</font></td></tr>
-<?php
-
-if ($session->userGrade >= 5) {
-    echo "
-    <tr>
-        <td width=48  align=center><input type=submit name=btn value='알림'></td>
-        <td width=98  align=center><input type=submit name=btn value='수정'></td>
-        <td width=848 align=left><input type=text name=title style=width:848px;></td>
-    </tr>
-    ";
-}
-
-$vote[0] = Tag2Code($vote[0]);
-echo "
-    <tr>
-        <td colspan=2 width=148 align=center id=bg1>제 목</td>
-        <td width=848 align=left>&nbsp;{$vote[0]}</td>
-    </tr>
-";
-
-$query = "select no from general where vote>0 and npc<2";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$voteCount = MYDB_num_rows($result);
-
-$query = "select no from general where npc<2";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$allCount = MYDB_num_rows($result);
-
-$percentage = round($voteCount / $allCount * 100, 1);
-
-$voteTypeCount = count($vote);
-for ($i=1; $i < $voteTypeCount; $i++) {
-    echo "
-    <tr>
-        <td width=48 align=center style=color:".getNewColor($i)."; bgcolor=".getVoteColor($i).">{$i}.</td>
-        <td width=98 align=center>
-    ";
-    if ($me['vote'] == 0 && $me['no'] > 0) {
-        echo "
-            <input type=radio name=sel value={$i}>
-        ";
-    } elseif ($admin['voteopen'] >= 1 || $session->userGrade >= 5) {
-        $query = "select no from general where vote='{$i}'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-        $vCount = MYDB_num_rows($result);
-
-        $per = @round($vCount / $voteCount * 100, 1);
-        echo "{$vCount} 표 ({$per}%)";
-    } else {
-        echo "추후공개";
-    }
-    $vote[$i] = Tag2Code($vote[$i]);
-    echo "
-        </td>
-        <td align=left>&nbsp;{$vote[$i]}</td>
-    </tr>
-    ";
-}
-
-echo "
-    <tr>
-";
-if ($me['vote'] == 0 && $me['no'] > 0) {
-    echo "
-        <td align=center>투표</td>
-        <td align=center><input type=submit name=btn value='투표'></td>
-    ";
-} else {
-    echo "
-        <td colspan=2 align=center>결산</td>
-    ";
-}
-echo "
-        <td align=left>&nbsp;투표율 : {$voteCount} / {$allCount} ({$percentage} %)</td>
-    </tr>
-";
-
-if ($session->userGrade >= 5) {
-    echo "
-    <tr>
-        <td align=center><input type=submit name=btn value='리셋'></td>
-        <td align=center><input type=submit name=btn value='추가'></td>
-        <td align=left><input type=text name=str style=width:848px;></td>
-    </tr>
-    ";
-}
-
-if ($admin['votecomment'] != "") {
-    $comment = explode("|", $admin['votecomment']);
-    $commentCount = count($comment);
-} else {
-    $commentCount = 0;
-}
-echo "
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td colspan=4 align=center id=bg1>댓 글</td>
-    </tr>
-";
-for ($i=0; $i < $commentCount; $i++) {
-    $cmt = explode(":", $comment[$i]);
-    $cmt[2] = Tag2Code($cmt[2]);
-    $j = $i+1;
-    echo "
-    <tr>
-        <td width=28  align=center>{$j}.</td>
-        <td width=83  align=center>{$cmt[0]}</td>
-        <td width=83  align=center>{$cmt[1]}</td>
-        <td width=788 align=left>&nbsp;{$cmt[2]}</td>
-    </tr>
-    ";
-}
-if ($me['no'] > 0) {
-    echo "
-    <tr>
-        <td width=108 colspan=2 align=center>-</td>
-        <td width=83  align=center><input type=submit name=btn value='댓글'></td>
-        <td align=left><input type=text name=comment maxlength=60 style=width:798px; onkeydown='return captureKey(event)'></td>
-    </tr>
-    ";
-}
-?>
-</table>
-<br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td colspan=3 align=center id=bg2><font size=5>
-        전 체 통 계
-<?php
-if ($session->userGrade >= 5) {
-    echo "
-        <input type=submit name=btn value='숨김'>
-        <input type=submit name=btn value='전체통계만'>
-        <input type=submit name=btn value='전부'>";
-}
-echo "
-    </font></td></tr>";
-
-if ($admin['voteopen'] >= 1 || $session->userGrade >= 5) {
-    echo "
-    <tr>
-        <td width=98  align=center>전 체</td>
-        <td width=128 align=center>{$voteCount} / {$allCount} ({$percentage} %)</td>
-        <td width=768 align=center>
-            <table align=center width=100% height=100% border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                <tr>
-    ";
-
-    $memCount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
-    if ($memCount == 0) {
-        $memCount = 1;
-    }
-
-    $totalVote = [];
-    $nationVoteCount = [[0]];
-    $nationVote = [[]];
-
-    foreach ($db->query("SELECT nation, vote, count(`no`) as cnt FROM general WHERE npc<2 GROUP BY nation, vote") as $row) {
-        $nation = $row['nation'];
-        $vote = $row['vote'];
-        $cnt = $row['cnt'];
-
-        if (!isset($totalVote[$vote])) {
-            $totalVote[$vote] = 0;
-        }
-
-        if (!isset($nationVoteCount[$nation])) {
-            $nationVoteCount[$nation] = 0;
-            $nationVote[$nation] = [];
-        }
-
-        if (!isset($nationVote[$nation][$vote])) {
-            $nationVote[$nation][$vote] = 0;
-        }
-
-        $totalVote[$vote] += $cnt;
-        $nationVoteCount[$nation] += $cnt;
-        $nationVote[$nation][$vote] += $cnt;
-    }
-
-    for ($i=0; $i < $voteTypeCount; $i++) {
-        $per = round(($totalVote[$i]??0) / $memCount * 100, 1);
-//        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-        echo "
-                    <td width={$per}% align=center style=color:".getNewColor($i)."; bgcolor=".getVoteColor($i).">{$totalVote[$i]}</td>
-        ";
-    }
-
-    echo "
-                </tr>
-            </table>
-        </td>
-    </tr>
-    ";
-}
-
-if ($admin['voteopen'] >= 2 || $session->userGrade >= 5) {
-    $query = "select no from general where nation=0 and npc<2";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $memCount = MYDB_num_rows($result);
-    if ($memCount == 0) {
-        $memCount = 1;
-    }
-
-    if (!isset($nationVoteCount[0])) {
-        $nationVoteCount[0] = 0;
-    }
-    $percentage = round($nationVoteCount[0] / $memCount * 100, 1);
-
-    echo "
-    <tr>
-        <td align=center bgcolor=black>재 야</td>
-        <td align=center>{$nationVoteCount[0]} / {$memCount} ({$percentage} %)</td>
-        <td align=center>
-            <table align=center width=100% height=100% border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                <tr>
-    ";
-
-    for ($i=0; $i < $voteTypeCount; $i++) {
-        $per = round(Util::array_get($nationVote[0][$i], 0) / $memCount * 100, 1);
-//        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-        echo "
-                    <td width={$per}% align=center style=color:".getNewColor($i)."; bgcolor=".getVoteColor($i).">{$nationVote[0][$i]}</td>
-        ";
-    }
-
-    echo "
-                </tr>
-            </table>
-        </td>
-    </tr>
-    ";
-
-    $query = "select nation,color,name,gennum from nation order by gennum desc";
-    $nationResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $nationcount = MYDB_num_rows($nationResult);
-    for ($i=0; $i < $nationcount; $i++) {
-        $nation = MYDB_fetch_array($nationResult);
-
-        $query = "select no from general where nation='{$nation['nation']}' and npc<2";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-        $memCount = MYDB_num_rows($result);
-
-        $voteCount = $nationVoteCount[$nation['nation']] ?? 0;
-        $percentage = round($voteCount / $memCount * 100, 1);
-
-        echo "
-    <tr>
-        <td align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>{$nation['name']}</td>
-        <td align=center>{$voteCount} / {$memCount} ({$percentage} %)</td>
-        <td align=center>
-            <table align=center width=100% height=100% border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                <tr>
-        ";
-
-        for ($k=0; $k < $voteTypeCount; $k++) {
-            $per = round($nationVote[$nation['nation']][$k] / $memCount * 100, 1);
-//            if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-            echo "
-                    <td width={$per}% align=center style=color:".getNewColor($k)."; bgcolor=".getVoteColor($k).">{$nationVote[$nation['nation']][$k]}</td>
-            ";
-        }
-
-        echo "
-                </tr>
-            </table>
-        </td>
-    </tr>
-        ";
-    }
-}
-?>
-</form>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
-
-<?php
-function getVoteColor($type)
-{
-    if ($type > 0) {
-        $type = (($type - 1) % 7) + 1;
-    }
-
-    switch ($type) {
-    default:
-    case 0: $color = "black"; break;
-    case 1: $color = "red"; break;
-    case 2: $color = "orange"; break;
-    case 3: $color = "yellow"; break;
-    case 4: $color = "green"; break;
-    case 5: $color = "blue"; break;
-    case 6: $color = "navy"; break;
-    case 7: $color = "purple"; break;
-    }
-
-    return $color;
-}
-
-function getNewColor($type)
-{
-    if ($type > 0) {
-        $type = (($type - 1) % 7) + 1;
-    }
-
-    switch ($type) {
-    case 2: $color = "black"; break;
-    case 3: $color = "black"; break;
-    default:$color = "white"; break;
-    }
-
-    return $color;
-}
@@ -0,0 +1,13 @@
+<?php
+
+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);
@@ -1,304 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$msg = Util::getReq('msg');
-$msg2 = Util::getReq('msg2');
-
-extractMissingPostToGlobals();
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("거래장", 2);
-
-$query = "select no,special,con,turntime from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
-
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-$query = "select no from auction where no1='{$me['no']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$tradeCount = MYDB_num_rows($result);
-
-$query = "select no from auction where no2='{$me['no']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$bidCount = MYDB_num_rows($result);
-
-$btCount = $tradeCount + $bidCount;
-
-if ($session->userGrade >= 5 || ($me['special'] != 30 && $btCount < 1) || ($me['special'] == 30 && $btCount < 3)) {
-    $btn = "submit";
-} else {
-    $btn = "hidden";
-}
-
-if ($msg == "") {
-    $msg = "-";
-}
-if ($msg2 == "") {
-    $msg2 = "-";
-}
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>거래장</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
-</head>
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>거 래 장<br><?=closeButton()?></td></tr>
-    <tr><td align=center id=bg2><font color=orange size=6><b>거 래 장</b></font><input type=button value='갱신' onclick=location.replace('b_auction.php')></td></tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<form method=post action=c_auction.php>
-    <tr><td colspan=11 align=center bgcolor=orange><font size=5>팝 니 다</font></td></tr>
-    <tr align=center id=bg1>
-        <td width=68>거래번호</td>
-        <td width=48>선택</td>
-        <td width=98>판매자</td>
-        <td width=118>물품</td>
-        <td width=88>수량</td>
-        <td width=88>시작판매가</td>
-        <td width=88>현재판매가</td>
-        <td width=88>즉시판매가</td>
-        <td width=48>단가</td>
-        <td width=98>구매 예정자</td>
-        <td width=148>거래종료</td>
-    </tr>
-<?php
-$query = "select * from auction where type=0 order by expire";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$count = MYDB_num_rows($result);
-
-$chk = 0;
-for ($i=0; $i < $count; $i++) {
-    $auction = MYDB_fetch_array($result);
-    $itemname = GetStuffName($auction['stuff']);
-    $radio = "";
-    $alert = "";
-    $alert2 = "";
-    if ($auction['no1'] == $me['no']) {
-        $radio = " disabled";
-    } elseif ($auction['no2'] > 0 && $auction['amount'] * 2 <= $auction['value'] && $auction['stuff'] == 0) {
-        $radio = " disabled";
-        $alert = "<font color=red>";
-        $alert2 = "</font>";
-    } elseif ($auction['no2'] > 0 && $auction['topv'] <= $auction['value']) {
-        $radio = " disabled";
-        $alert = "<font color=red>";
-        $alert2 = "</font>";
-    } elseif ($chk == 0) {
-        $radio = " checked";
-        $chk = 1;
-    }
-    $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
-    $pv = substr((string)$pv, 0, 4);
-    if ($auction['stuff'] != 0) {
-        $pv = '-';
-    }
-    echo "
-    <tr align=center>
-        <td>{$auction['no']}</td>
-        <td><input type=radio name=sel value={$auction['no']}{$radio}></td>
-        <td>{$auction['name1']}</td>
-        <td>{$itemname}</td>
-        <td>{$auction['amount']}</td>
-        <td>금 {$auction['cost']}</td>
-        <td>{$alert}금 {$auction['value']}{$alert2}</td>
-        <td>{$alert}금 {$auction['topv']}{$alert2}</td>
-        <td>{$alert}{$pv}{$alert2}</td>
-        <td>{$alert}{$auction['name2']}{$alert2}</td>
-        <td>{$auction['expire']}</td>
-    </tr>
-    ";
-}
-?>
-    <tr height=25>
-        <td align=center id=bg1>등록결과</td>
-        <td colspan=10><?=ConvertLog($msg)?></td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>입찰등록</td>
-        <td colspan=10>
-            　지불할 금액: <input type=text style=color:white;background-color:black; size=6 maxlength=6 name=value>
-            <input type=<?=$btn?> name=btn value='구매시도' onclick='return confirm("정말 입찰하시겠습니까?");'>
-        </td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>거래등록</td>
-        <td colspan=10>
-            　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
-            　물품: <select size=1 name=stuff style=color:white;background-color:black;>
-                <option style=color:white; value=0>쌀</option>
-            </select>
-            　판매량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
-            　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=500>
-            　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=2000>
-            <input type=<?=$btn?> name=btn value='판매' onclick='return confirm("정말 판매하시겠습니까?");'>
-        </td>
-    </tr>
-    <tr>
-        <td colspan=11>
-            ㆍ<font color=cyan>Hint</font>) 거래자가 판매(물품 판매, 금 수령), 입찰자가 구매(물품 구입, 금 지불).<br>
-            ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 높을수록 판매자 유리.<br>
-            ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 낮을수록 입찰자 유리.<br>
-        </td>
-    </tr>
-</form>
-</table>
-<br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<form method=post action=c_auction.php>
-    <tr><td colspan=11 align=center bgcolor=skyblue><font size=5>삽 니 다</font></td></tr>
-    <tr align=center id=bg1>
-        <td width=68>거래번호</td>
-        <td width=48>선택</td>
-        <td width=98>구매자</td>
-        <td width=118>물품</td>
-        <td width=88>수량</td>
-        <td width=88>시작구매가</td>
-        <td width=88>현재구매가</td>
-        <td width=88>즉시구매가</td>
-        <td width=48>단가</td>
-        <td width=98>판매 예정자</td>
-        <td width=148>거래종료</td>
-    </tr>
-<?php
-$query = "select * from auction where type=1 order by expire";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$count = MYDB_num_rows($result);
-
-$chk = 0;
-for ($i=0; $i < $count; $i++) {
-    $auction = MYDB_fetch_array($result);
-    $itemname = GetStuffName($auction['stuff']);
-    $radio = "";
-    $alert = "";
-    $alert2 = "";
-    if ($auction['no1'] == $me['no']) {
-        $radio = " disabled";
-    } elseif ($auction['no2'] > 0 && $auction['amount'] >= $auction['value'] * 2 && $auction['stuff'] == 0) {
-        $radio = " disabled";
-        $alert = "<font color=red>";
-        $alert2 = "</font>";
-    } elseif ($auction['no2'] > 0 && $auction['topv'] >= $auction['value']) {
-        $radio = " disabled";
-        $alert = "<font color=red>";
-        $alert2 = "</font>";
-    } elseif ($chk == 0) {
-        $radio = " checked";
-        $chk = 1;
-    }
-    $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
-    $pv = substr((string)$pv, 0, 4);
-    if ($auction['stuff'] != 0) {
-        $pv = '-';
-    }
-    echo "
-    <tr align=center>
-        <td>{$auction['no']}</td>
-        <td><input type=radio name=sel value={$auction['no']}{$radio}></td>
-        <td>{$auction['name1']}</td>
-        <td>{$itemname}</td>
-        <td>{$auction['amount']}</td>
-        <td>금 {$auction['cost']}</td>
-        <td>{$alert}금 {$auction['value']}{$alert2}</td>
-        <td>{$alert}금 {$auction['topv']}{$alert2}</td>
-        <td>{$alert}{$pv}{$alert2}</td>
-        <td>{$alert}{$auction['name2']}{$alert2}</td>
-        <td>{$auction['expire']}</td>
-    </tr>
-    ";
-}
-?>
-    <tr height=25>
-        <td align=center id=bg1>등록결과</td>
-        <td colspan=10><?=ConvertLog($msg2)?></td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>입찰등록</td>
-        <td colspan=10>
-            　수령할 금액: <input type=text style=color:white;background-color:black; size=6 maxlength=6 name=value>
-            <input type=<?=$btn?> name=btn value='판매시도' onclick='return confirm("정말 입찰하시겠습니까?");'>
-        </td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>거래등록</td>
-        <td colspan=10>
-            　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
-            　물품: <select size=1 name=stuff style=color:white;background-color:black;>
-                <option style=color:white; value=0>쌀</option>
-            </select>
-            　구입량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
-            　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=2000>
-            　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=500>
-            <input type=<?=$btn?> name=btn value='구매' onclick='return confirm("정말 구매하시겠습니까?");'>
-        </td>
-    </tr>
-    <tr>
-        <td colspan=11>
-            ㆍ<font color=cyan>Hint</font>) 거래자가 구매(물품 구매, 금 지불), 입찰자가 판매(물품 판매, 금 수령).<br>
-            ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 낮을수록 구매자 유리.<br>
-            ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 높을수록 입찰자 유리.<br>
-        </td>
-    </tr>
-</form>
-</table>
-<br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td align=center id=bg2><font size=5>최 근 기 록</font></td></tr>
-    <tr><td>
-    <?=getAuctionLogRecent(20)?>
-    </td></tr>
-    <tr><td align=center id=bg2><font size=5>도 움 말</font></td></tr>
-    <tr><td>
-        <font color=white size=2>
-ㆍ판매거래는 거래자가 판매할 물품을 거래하면, 구입을 희망하는 사람이 현재가보다 높게 입찰하여 구입하는 방식입니다.<br>
-ㆍ<font color=cyan>Hint</font>) 쌀이 귀한 경우는 입찰자가 많아서 자연스레 단가가 오르게 됩니다. (해당 물품을 사려는 가격이 오름)<br>
-ㆍ<font color=cyan>Hint</font>) 쌀이 흔한 경우는 초기 가격을 낮게 책정해야 판매가 가능할 겁니다.<br>
-ㆍ구매거래는 거래자가 구입할 물품을 거래하면, 판매를 희망하는 사람이 현재가보다 낮게 입찰하여 판매하는 방식입니다.<br>
-ㆍ<font color=cyan>Hint</font>) 쌀이 흔한 경우는 입찰자가 많아서 자연스레 단가가 내리게 됩니다. (해당 물품을 팔려는 가격이 내림)<br>
-ㆍ<font color=cyan>Hint</font>) 쌀이 귀한 경우는 초기 가격을 높게 책정해야 구입이 가능할 겁니다.<br>
-ㆍ마감임박때 입찰하는 경우 입찰후 1턴 후로 종료시간이 연장됩니다.<br>
-ㆍ즉시구매가로 입찰하는 경우 입찰후 1턴 후로 종료시간이 결정됩니다.<br>
-ㆍ악용 방지를 위해 50% ~ 200%의 가격에서 거래시작이 가능합니다.<br>
-ㆍ악용 방지를 위해 즉시판매가는 110% 이상, 즉시구매가는 90% 이하의 시세로 가능합니다.<br>
-ㆍ악용 방지를 위해 즉시판매가는 시작판매가의 110% 이상, 즉시구매가는 시작구매가의 90% 이하로 가능합니다.<br>
-ㆍ1인당 도합 1건의 거래와 입찰이 가능합니다. 거상 특기 소유자는 1인당 도합 3건입니다.<br>
-ㆍ기본금쌀 1000은 거래에 사용되지 못합니다.<br>
-ㆍ유찰될 때는 거래 과실자에게 거래금의 1%가 벌금으로 부과됩니다.<br>
-ㆍ<font color=magenta>10단위로 거래가 가능합니다. 1자리는 반올림 처리 됩니다.</font><br>
-ㆍ<font color=red>★ 최고가 거래 ★</font> 혹은 <font color=red>★ 최저가 거래 ★</font> 는 암거래 및 악용의 가능성이니 감시 부탁드립니다.<br>
-ㆍ거래와 입찰은 취소가 불가능하니 주의하세요!<br>
-ㆍ<font color=cyan>Hint</font>) 단가는 금/쌀로 쌀1을 거래하기 위한 금의 양입니다.<br>
-ㆍ<font color=cyan>Hint</font>) 단가가 높으면(>1.00) 쌀이 비싸므로 판매가 이득입니다.<br>
-ㆍ<font color=cyan>Hint</font>) 단가가 낮으면(<1.00) 금이 비싸므로 구매가 이득입니다.<br>
-ㆍ즐거운 거래!
-        </font>
-    </td></tr>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
@@ -1,163 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$v = new Validator($_POST + $_GET);
-$v->rule('required', 'gen')
->rule('integer', 'gen');
-
-$btn = Util::getReq('btn');
-$gen = Util::getReq('gen', 'int', 0);
-$type = Util::getReq('type', 'int', 0);
-
-if ($type < 0 || $type > 3) {
-    $type = 0;
-}
-
-extractMissingPostToGlobals();
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("감찰부", 2);
-//전투 추진을 위해 갱신
-checkTurn();
-
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
-$query = "select nation from general where no='$gen'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$general = MYDB_fetch_array($result);
-
-$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
-
-$query = "select secretlimit from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$nation = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-//재야인 경우
-$meLevel = $me['level'];
-if ($meLevel == 0 || ($meLevel == 1 && $me['belong'] < $nation['secretlimit'])) {
-    echo "수뇌부가 아니거나 사관년도가 부족합니다.";
-    exit();
-}
-
-//잘못된 접근
-if ($general['nation'] != $me['nation']) {
-    $gen = 0;
-}
-
-if ($btn == '정렬하기') {
-    $gen = 0;
-}
-
-$sel = [];
-$sel[$type] = "selected";
-
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-<title>감찰부</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>감 찰 부<br><?=closeButton()?></td></tr>
-    <tr><td>
-        <form name=form1 method=post>
-        정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[0]??''?> value=0>최근턴</option>
-            <option <?=$sel[1]??''?> value=1>최근전투</option>
-            <option <?=$sel[2]??''?> value=2>장수명</option>
-            <option <?=$sel[3]??''?> value=3>전투수</option>
-        </select>
-        <input type=submit name=btn value='정렬하기'>
-        대상장수 :
-        <select name=gen size=1>
-<?php
-switch ($type) {
-    default:
-    case 0: $query = "select no,name from general where nation='{$me['nation']}' order by turntime desc"; break;
-    case 1: $query = "select no,name from general where nation='{$me['nation']}' order by recwar desc"; break;
-    case 2: $query = "select no,name from general where nation='{$me['nation']}' order by npc,binary(name)"; break;
-    case 3: $query = "select no,name from general where nation='{$me['nation']}' order by warnum desc"; break;
-}
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$gencount = MYDB_num_rows($result);
-
-for ($i=0; $i < $gencount; $i++) {
-    $general = MYDB_fetch_array($result);
-    // 선택 없으면 맨 처음 장수
-    if ($gen == 0) {
-        $gen = $general['no'];
-    }
-    if ($gen == $general['no']) {
-        echo "
-            <option selected value={$general['no']}>{$general['name']}</option>";
-    } else {
-        echo "
-            <option value={$general['no']}>{$general['name']}</option>";
-    }
-}
-?>
-        </select>
-        <input type=submit name=btn value='조회하기'>
-        </form>
-    </td></tr>
-</table>
-<table width=1000 align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=50% align=center id=bg1><font color=skyblue size=3>장 수 정 보</font></td>
-        <td width=50% align=center id=bg1><font color=orange size=3>장 수 열 전</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?php generalInfo($gen); generalInfo2($gen); ?>
-        </td>
-        <td valign=top>
-            <?=getGeneralHistoryAll($gen)?>
-        </td>
-    </tr>
-    <tr>
-        <td align=center id=bg1><font color=orange size=3>전투 기록</font></td>
-        <td align=center id=bg1><font color=orange size=3>전투 결과</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?=getBatLogRecent($gen, 24)?>
-        </td>
-        <td valign=top>
-            <?=getBatResRecent($gen, 24)?>
-        </td>
-    </tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
@@ -1,6 +1,11 @@
 <?php
+
 namespace sammo;

+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\Enums\GeneralQueryMode;
+use sammo\Enums\RankColumn;
+
 include "lib.php";
 include "func.php";
 //로그인 검사
@@ -8,323 +13,448 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');

 increaseRefresh("베팅장", 1);
-checkTurn();
+TurnExecutionHelper::executeAllCommand();

-$query = "select no,tournament,con,turntime,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
+$generalID = $session->generalID;

-$query = "select conlimit,tournament,phase,tnmt_type,develcost,bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);

-$con = checkLimit($me['con'], $admin['conlimit']);
-if ($con >= 2) {
+
+
+$me = $db->queryFirstRow(
+    'SELECT no,tournament,refresh_score,turntime FROM `general`
+    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id where owner=%i', $userID
+);
+
+$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'turnterm', 'develcost']);
+$turnTerm = $admin['turnterm'];
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }

 switch ($admin['tnmt_type']) {
-default: throw new \RuntimeException('Invalid tnmt_type');break;
-case 0: $tnmt_type = "<font color=cyan>전력전</font>"; $tp = "tot"; $tp2 = "종합"; $tp3 = "total"; break;
-case 1: $tnmt_type = "<font color=cyan>통솔전</font>"; $tp = "ldr"; $tp2 = "통솔"; $tp3 = "leader"; break;
-case 2: $tnmt_type = "<font color=cyan>일기토</font>"; $tp = "pwr"; $tp2 = "무력"; $tp3 = "power"; break;
-case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "itl"; $tp2 = "지력"; $tp3 = "intel"; break;
+    case convertTournamentType('전력전'):
+        $tnmt_type = "전력전";
+        $color = "cyan";
+        $tp = "total";
+        $tp2 = "종합";
+        $tp3 = "total";
+        break;
+    case convertTournamentType('통솔전'):
+        $tnmt_type = "통솔전";
+        $color = "cyan";
+        $tp = "leadership";
+        $tp2 = "통솔";
+        $tp3 = "leadership";
+        break;
+    case convertTournamentType('일기토'):
+        $tnmt_type = "일기토";
+        $color = "cyan";
+        $tp = "strength";
+        $tp2 = "무력";
+        $tp3 = "strength";
+        break;
+    case convertTournamentType('설전'):
+        $tnmt_type = "설전";
+        $color = "cyan";
+        $tp = "intel";
+        $tp2 = "지력";
+        $tp3 = "intel";
+        break;
+    default:
+        throw new \RuntimeException('Invalid tnmt_type');
 }

+$bettingID = $gameStor->last_tournament_betting_id ?? 0;
+$myBet = [];
+$globalBet = [];
+
+if ($bettingID != 0) {
+    $betting = $bettingID != 0 ? new Betting($bettingID) : null;
+    $info = $betting->getInfo();
+
+    foreach ($db->queryAllLists(
+        'SELECT general_id, user_id, amount, betting_type FROM ng_betting WHERE betting_id = %i',
+        $bettingID
+    ) as [$betGeneralID, $userID, $amount, $bettingTypeKey]) {
+        $bettingKey = Json::decode($bettingTypeKey)[0];
+        if ($betGeneralID == $generalID) {
+            $myBet[$bettingKey] = $amount;
+        }
+
+        if (key_exists($bettingKey, $globalBet)) {
+            $globalBet[$bettingKey] += $amount;
+        } else {
+            $globalBet[$bettingKey] = $amount;
+        }
+    }
+} else {
+    $info = getDummyBettingInfo($tnmt_type);
+}
+
+$myBetTotal = array_sum($myBet);
+$globalBetTotal = array_sum($globalBet);
+
 $str1 = getTournament($admin['tournament']);
 $str2 = getTournamentTime();
-$str3 = getTournamentTerm();
+if ($str2) {
+    $str2 = ', ' . $str2;
+}
+$str3 = getTournamentTermText($turnTerm);
+if ($str3) {
+    $str3 = ', ' . $str3;
+}

 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
    MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>베팅장</title>
-<style>
-body { color:white; background-color:black; border-width:1px; border-color:gray; }
-table { font-family:'맑은 고딕'; line-height:110%; }
-font { font-family:'맑은 고딕'; line-height:110%; }
-input { font-family:'맑은 고딕'; line-height:110%; height:20px }
-select { font-family:'굴림'; line-height:100%; }
-#bg0 { background-image:url(<?=ServConfig::$gameImagePath?>/back_walnut.jpg); }
-#bg1 { background-image:url(<?=ServConfig::$gameImagePath?>/back_green.jpg); }
-#bg2 { background-image:url(<?=ServConfig::$gameImagePath?>/back_blue.jpg); }
-</style>

+<head>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 베팅장</title>
+    <?= WebUtil::printJS('../d_shared/common_path.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::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common', 'betting']) ?>
+    <?= WebUtil::printStaticValues([
+        'staticValues'=>[
+            'bettingID'=> $bettingID
+        ]
+    ])?>
 </head>

 <body>
-<table align=center width=1120 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>베 팅 장<br><?=closeButton()?></td></tr>
-</table>
-<table align=center width=1120 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:10px;word-break:break-all; id=bg0>
-    <tr><td colspan=16><input type=button value='갱신' onclick='location.reload()'></td></tr>
-    <tr><td colspan=16 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.", ".$str2.", ".$str3?>)</font></td></tr>
-    <tr><td height=50 colspan=16 align=center id=bg2><font color=limegreen size=6>16강 상황</font><br><font color=orange size=3>(전체 금액 : <?=$admin['bet']?> / 내 투자 금액 : <?=$me['bet']?>)</font></td></tr>
-</table>
-<table align=center width=1120 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:10px;word-break:break-all; id=bg0>
-    <tr align=center><td height=10 colspan=16></td></tr>
-    <tr align=center>
-<?php
-$query = "select npc,name,win from tournament where grp>=60 order by grp, grp_no";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-for ($i=0; $i < 1; $i++) {
-    $general = MYDB_fetch_array($result);
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    echo "<td colspan=16>{$general['name']}</td>";
-}
+    <table align=center width=1120 class='tb_layout bg0'>
+        <tr>
+            <td>베 팅 장<br><?= closeButton() ?></td>
+        </tr>
+    </table>
+    <table align=center width=1120 class='tb_layout bg0'>
+        <tr>
+            <td colspan=16><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button></td>
+        </tr>
+        <tr>
+            <td colspan=16 align=center>
+                <font color=white size=6><span style="color:<?= $color ?>"><?= $tnmt_type ?></span> (<?= $str1 . $str2 . $str3 ?>)</font>
+            </td>
+        </tr>
+        <tr>
+            <td height=50 colspan=16 align=center class='bg2'>
+                <font color=limegreen size=6>16강 상황</font><br>
+                <font color=orange size=3>(전체 금액 : <?= $globalBetTotal ?> / 내 투자 금액 : <?= $myBetTotal ?>)</font>
+            </td>
+        </tr>
+    </table>
+    <table align=center width=1120 class='mimic_flex bg0' style='border:solid 1px gray;font-size:10px;'>
+        <tr align=center>
+            <td height=10 colspan=16></td>
+        </tr>
+        <tr align=center>
+            <?php
+            $generalList = $db->query('SELECT npc,name,win from tournament where grp>=60 order by grp, grp_no LIMIT 1');
+            while (count($generalList) < 1) {
+                $generalList[] = [
+                    'name' => '-',
+                    'npc' => 0,
+                    'win' => 0
+                ];
+            }
+            foreach ($generalList as $i => $general) {
+                if ($general['name'] == "") {
+                    $general['name'] = "-";
+                }

-echo "
+                $general['name'] = formatName($general['name'], $general['npc']);
+                echo "<td colspan=16>{$general['name']}</td>";
+            }
+
+            echo "
    </tr>
    <tr align=center>";

-$query = "select npc,name,win from tournament where grp>=50 order by grp, grp_no";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$cent = [];
-$line = [];
-$gen = [];
-for ($i=0; $i < 1; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-for ($i=0; $i < 2; $i++) {
-    $general = MYDB_fetch_array($result);
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 1; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━━━━━━━━━━━━━━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━━━━━━━━━━━━━━━━━━━┓"."</font>";
-    echo "<td colspan=16>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+            $cent = [];
+            $line = [];
+            $gen = [];
+            for ($i = 0; $i < 1; $i++) {
+                $cent[$i] = "<font color=white>";
+            }
+            $generalList = $db->query('SELECT npc,name,win from tournament where grp>=50 order by grp, grp_no LIMIT 2');
+            while (count($generalList) < 2) {
+                $generalList[] = [
+                    'name' => '-',
+                    'npc' => 0,
+                    'win' => 0
+                ];
+            }
+            foreach ($generalList as $i => $general) {
+                if ($general['name'] == "") {
+                    $general['name'] = "-";
+                }
+                $general['name'] = formatName($general['name'], $general['npc']);
+                if ($general['win'] > 0) {
+                    $line[$i] = "<font color=red>";
+                    $cent[intdiv($i, 2)] = "<font color=red>";
+                } else {
+                    $line[$i] = "<font color=white>";
+                }
+                $gen[$i] = $general['name'];
+            }
+            for ($i = 0; $i < 1; $i++) {
+                $cent[$i] = $cent[$i] . "┻" . "</font>";
+                $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━━━━━━━━━━━━━━━━━━━" . "</font>";
+                $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━━━━━━━━━━━━━━━━━━━┓" . "</font>";
+                echo "<td colspan=16>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+            }
+            echo "
    </tr>
    <tr align=center>";

-for ($i=0; $i < 2; $i++) {
-    echo "<td colspan=8>{$gen[$i]}</td>";
-}
+            for ($i = 0; $i < 2; $i++) {
+                echo "<td colspan=8>{$gen[$i]}</td>";
+            }

-echo "
+            echo "
    </tr>
    <tr align=center>";

-$query = "select npc,name,win from tournament where grp>=40 order by grp, grp_no";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-for ($i=0; $i < 2; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-for ($i=0; $i < 4; $i++) {
-    $general = MYDB_fetch_array($result);
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 2; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━━━━━┓"."</font>";
-    echo "<td colspan=8>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+            for ($i = 0; $i < 2; $i++) {
+                $cent[$i] = "<font color=white>";
+            }
+            $generalList = $db->query('SELECT npc,name,win from tournament where grp>=40 order by grp, grp_no LIMIT 4');
+            while (count($generalList) < 4) {
+                $generalList[] = [
+                    'name' => '-',
+                    'npc' => 0,
+                    'win' => 0
+                ];
+            }
+            foreach ($generalList as $i => $general) {
+                if ($general['name'] == "") {
+                    $general['name'] = "-";
+                }
+                $general['name'] = formatName($general['name'], $general['npc']);
+                if ($general['win'] > 0) {
+                    $line[$i] = "<font color=red>";
+                    $cent[intdiv($i, 2)] = "<font color=red>";
+                } else {
+                    $line[$i] = "<font color=white>";
+                }
+                $gen[$i] = $general['name'];
+            }
+            for ($i = 0; $i < 2; $i++) {
+                $cent[$i] = $cent[$i] . "┻" . "</font>";
+                $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━━━━━" . "</font>";
+                $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━━━━━┓" . "</font>";
+                echo "<td colspan=8>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+            }
+            echo "
    </tr>
    <tr align=center>";

-for ($i=0; $i < 4; $i++) {
-    echo "<td colspan=4>{$gen[$i]}</td>";
-}
+            for ($i = 0; $i < 4; $i++) {
+                echo "<td colspan=4>{$gen[$i]}</td>";
+            }

-echo "
+            echo "
    </tr>
    <tr align=center>";

-$query = "select npc,name,win from tournament where grp>=30 order by grp, grp_no";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-for ($i=0; $i < 4; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-for ($i=0; $i < 8; $i++) {
-    $general = MYDB_fetch_array($result);
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 4; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━┓"."</font>";
-    echo "<td colspan=4>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+            for ($i = 0; $i < 4; $i++) {
+                $cent[$i] = "<font color=white>";
+            }
+            $generalList = $db->query('SELECT npc,name,win from tournament where grp>=30 order by grp, grp_no LIMIT 8');
+            while (count($generalList) < 8) {
+                $generalList[] = [
+                    'name' => '-',
+                    'npc' => 0,
+                    'win' => 0
+                ];
+            }
+            foreach ($generalList as $i => $general) {
+                if ($general['name'] == "") {
+                    $general['name'] = "-";
+                }
+                $general['name'] = formatName($general['name'], $general['npc']);
+                if ($general['win'] > 0) {
+                    $line[$i] = "<font color=red>";
+                    $cent[intdiv($i, 2)] = "<font color=red>";
+                } else {
+                    $line[$i] = "<font color=white>";
+                }
+                $gen[$i] = $general['name'];
+            }
+            for ($i = 0; $i < 4; $i++) {
+                $cent[$i] = $cent[$i] . "┻" . "</font>";
+                $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━" . "</font>";
+                $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━┓" . "</font>";
+                echo "<td colspan=4>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+            }
+            echo "
    </tr>
    <tr align=center>";

-for ($i=0; $i < 8; $i++) {
-    echo "<td colspan=2>{$gen[$i]}</td>";
-}
-
-echo "
+            for ($i = 0; $i < 8; $i++) {
+                echo "<td colspan=2>{$gen[$i]}</td>";
+            }
+            echo "
    </tr>
    <tr align=center>";

-$query = "select npc,name,win from tournament where grp>=20 order by grp, grp_no";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-for ($i=0; $i < 8; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-for ($i=0; $i < 16; $i++) {
-    $general = MYDB_fetch_array($result);
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 8; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━"."</font>";
-    $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>
+            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');
+            while (count($generalList) < 16) {
+                $generalList[] = [
+                    'name' => '-',
+                    'npc' => 0,
+                    'win' => 0
+                ];
+            }
+            foreach ($generalList as $i => $general) {
+                if ($general['name'] == "") {
+                    $general['name'] = "-";
+                }
+                $general['name'] = formatName($general['name'], $general['npc']);
+                if ($general['win'] > 0) {
+                    $line[$i] = "<font color=red>";
+                    $cent[intdiv($i, 2)] = "<font color=red>";
+                } else {
+                    $line[$i] = "<font color=white>";
+                }
+                $gen[$i] = $general['name'];
+                if (array_key_exists($tp, $general)) {
+                    $stat[$i] = $general[$tp];
+                } else {
+                    $stat[$i] = "-";
+                }
+            }
+            for ($i = 0; $i < 8; $i++) {
+                $cent[$i] = $cent[$i] . "┻" . "</font>";
+                $line[$i * 2] =     $line[$i * 2] . "┏━━" . "</font>";
+                $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━┓" . "</font>";
+                echo "<td colspan=2>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+            }
+            ?>
+        </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>
+    </table>
+    <table align=center width=1120 style="table-layout: fixed" class='tb_layout bg0'>
+        <tr align=center>
+            <td height=10 colspan=16></td>
+        </tr>
+        <?php
+
+        $bet = [];
+        $gold = [];
+        $keyMap = [];
+        foreach ($info->candidates as $key => $candidate) {
+            $keyMap[$candidate->aux['idx']] = $key;
+        }
+
+        foreach ($globalBet as $key => $amount) {
+            if ($amount == 0) {
+                $bet[$key] = "∞";
+                $gold[$key] = 0;
+            } else {
+                $rewardRatio = round($globalBetTotal / $amount, 2);
+                $bet[$key]  = $rewardRatio;
+                $gold[$key] = $rewardRatio * ($myBet[$key] ?? 0);
+            }
+        }
+        echo "
    <tr align=center>";

-for ($i=0; $i < 16; $i++) {
-    echo "<td width=70>{$gen[$i]}</td>";
-}
+        foreach (range(0, 15) as  $i) {
+            $amount = $bet[$keyMap[$i] ?? -1] ?? 0;
+            echo "<td width=70><font color=skyblue>{$amount}</font></td>";
+        }
+        ?>
+        </tr>
+        <tr align=center>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+        </tr>
+        <tr align=center>
+            <?php
+            foreach (range(0, 15) as  $i) {
+                $amount = $myBet[$keyMap[$i] ?? -1] ?? 0;
+                echo "<td><font color=orange>{$amount}</font></td>";
+            }
+            ?>
+        </tr>
+        <tr align=center>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+        </tr>
+        <tr align=center>
+            <?php
+            foreach (range(0, 15) as  $i) {
+                $amount = $gold[$keyMap[$i] ?? -1] ?? 0;
+                echo "<td><font color=cyan>{$amount}</font></td>";
+            }

-$query = "select bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15 from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
-$myBet = [];
-$bet = [];
-$gold = [];
-
-for ($i=0; $i < 16; $i++) {
-    $myBet[$i]  = $me["bet{$i}"];
-}
-
-for ($i=0; $i < 16; $i++) {
-    $bet[$i]  = @round($admin['bet'] /  $admin["bet{$i}"], 2);
-    if ($bet[$i] == 0) {
-        $bet[$i] = "∞";
-    }
-}
-
-for ($i=0; $i < 16; $i++) {
-    $gold[$i] = Util::round($myBet[$i] * $bet[$i]);
-}
-?>
-    </tr>
-</table>
-<table align=center width=1120 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr align=center><td height=10 colspan=16></td></tr>
-<?php
-echo "
-    <tr align=center>";
-
-for ($i=0; $i < 16; $i++) {
-    echo "<td width=70><font color=skyblue>{$bet[$i]}</font></td>";
-}
-?>
-    </tr>
-    <tr align=center>
-        <td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td>
-        <td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td>
-    </tr>
-    <tr align=center>
-<?php
-for ($i=0; $i < 16; $i++) {
-    echo "<td><font color=orange>{$myBet[$i]}</font></td>";
-}
-?>
-    </tr>
-    <tr align=center>
-        <td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td>
-        <td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td>
-    </tr>
-    <tr align=center>
-<?php
-for ($i=0; $i < 16; $i++) {
-    echo "<td><font color=cyan>{$gold[$i]}</font></td>";
-}
-
-echo "
+            echo "
    </tr>
    <tr align=center><td height=10 colspan=16></td></tr>";

-if ($admin['tournament'] == 6) {
-    echo "
-<form method=post action=c_betting.php>
-    <tr align=center>";
+            if ($admin['tournament'] == 6) {
+                echo "
+    <tr align=center style='height:2.5em;'>";

-    for ($i=0; $i < 16; $i++) {
-        echo "
+                foreach (range(0, 15) as  $i) {
+                    $key = $keyMap[$i] ?? -1;
+                    echo "
        <td>
-            <select size=1 name=gold{$i} style=color:white;background-color:black;>
+            <select size=1 id='target_{$key}' style='color:white;background-color:black;padding:0.2rem 0.1rem;'>
                <option style=color:white; value=10>금10</option>
                <option style=color:white; value=20>금20</option>
                <option style=color:white; value=50>금50</option>
@@ -334,77 +464,166 @@ if ($admin['tournament'] == 6) {
                <option style=color:white; value=1000>최대</option>
            </select>
        </td>";
-    }
+                }

-    echo "
+                echo "
    </tr>
-    <tr align=center>";
+    <tr align=center style='height:2.2em;'>";

-    for ($i=0; $i < 16; $i++) {
-        echo "
-        <td><input type=submit name=btn{$i} value=베팅! style=width:100%;color:white;background-color:black;></td>";
-    }
+                foreach (range(0, 15) as  $i) {
+                    $key = $keyMap[$i] ?? -1;
+                    echo "
+        <td><input type=button class='submitBtn' data-target='{$key}' value=베팅! style='width:100%;color:white;padding:0.2rem 0.1rem;background-color:black;'></td>";
+                }

-    echo "
-    </tr>
-</form>";
-}
+                echo "</tr>";
+            }

-?>
-    <tr align=center>
-        <td height=30 colspan=16>
-            <font color=skyblue size=4>배당률</font> × <font color=orange size=4>베팅금</font> = <font color=cyan size=4>적중시 환수금</font><br>
-            <font color=skyblue size=4>( 베팅후 500원 이하일땐 베팅이 불가능합니다. )</font>
-        </td>
-    </tr>
-    <tr align=center><td height=10 colspan=16></td></tr>
-</table>
-<table align=center width=1120 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr align=center><td height=50 colspan=4 id=bg2><font color=yellow size=6>토너먼트 랭킹</font></td></tr>
-    <tr align=center><td colspan=4 id=bg2><font color=skyblue size=3>순위 / 장수명 / 능력치 / 경기수 / 승리 / 무승부 / 패배 / 집계점수 / 우승횟수</font></td></tr>
-    <tr align=center>
-<?php
+            ?>
+        <tr align=center>
+            <td height=30 colspan=16>
+                <font color=skyblue size=4>배당률</font> × <font color=orange size=4>베팅금</font> = <font color=cyan size=4>적중시 환수금</font><br>
+                <font color=skyblue size=4>( 베팅후 500원 이하일땐 베팅이 불가능합니다. )</font>
+            </td>
+        </tr>
+        <tr align=center>
+            <td height=10 colspan=16></td>
+        </tr>
+    </table>
+    <table align=center width=1120 class='tb_layout bg0'>
+        <tr align=center>
+            <td height=50 colspan=4 class='bg2'>
+                <font color=yellow size=6>토너먼트 랭킹</font>
+            </td>
+        </tr>
+        <tr align=center>
+            <td colspan=4 class='bg2'>
+                <font color=skyblue size=3>순위 / 장수명 / 능력치 / 경기수 / 승리 / 무승부 / 패배 / 집계점수 / 우승횟수</font>
+            </td>
+        </tr>
+        <tr align=center>
+            <?php

-$type1 = array("전 력 전", "통 솔 전", "일 기 토", "설 전");
-$type2 = array("종합", "통솔", "무력", "지력");
-$type3 = array("tt", "tl", "tp", "ti");
-$type4 = array("total", "leader", "power", "intel");
+            $tournamentType = [
+                '전 력 전' => [
+                    '종합',
+                    function (GeneralLite $general) {
+                        return $general->getVar('leadership') + $general->getVar('strength') + $general->getVar('intel');
+                    },
+                    'tt',
+                ],
+                '통 솔 전' => [
+                    '통솔',
+                    function (GeneralLite $general) {
+                        return $general->getVar('leadership');
+                    },
+                    'tl',
+                ],
+                '일 기 토' => [
+                    '무력',
+                    function (GeneralLite $general) {
+                        return $general->getVar('strength');
+                    },
+                    'ts',
+                ],
+                '설 전' => [
+                    '지력',
+                    function (GeneralLite $general) {
+                        return $general->getVar('intel');
+                    },
+                    'ti',
+                ],
+            ];

-for ($i=0; $i < 4; $i++) {
-    $grp = $i;
-    echo "
-        <td>
-            <table align=center width=280 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                <tr><td colspan=9 align=center style=color:white;background-color:black;><font size=4>{$type1[$i]}</font></td></tr>
-                <tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$type2[$i]}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>勝</td></tr>";
+            $type1 = array("전 력 전", "통 솔 전", "일 기 토", "설 전");
+            $type2 = array("종합", "통솔", "무력", "지력");
+            $type3 = array("tt", "tl", "ts", "ti");
+            $type4 = array("total", "leadership", "strength", "intel");

-    $query = "select npc,name,leader,power,intel,leader+power+intel as total,{$type3[$i]}p as prize,{$type3[$i]}w+{$type3[$i]}d+{$type3[$i]}l as game,{$type3[$i]}w as win,{$type3[$i]}d as draw,{$type3[$i]}l as lose,{$type3[$i]}g as gl from general order by gl desc, game desc, win desc, draw desc, lose, no limit 0,30";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    for ($k=1; $k <= 30; $k++) {
-        $general = MYDB_fetch_array($result);
-        printRow($k, $general['npc'], $general['name'], $general[$type4[$i]], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gl'], $general['prize'], 0);
-    }
-    echo "
-            </table>
-        </td>";
-}
-
-?>
-    </tr>
-    <tr>
-        <td colspan=16>
-ㆍ토너먼트의 16강 대진표가 완성되면, 베팅 기간이 주어집니다.<br>
-ㆍ유저들의 베팅 상황에 따라 배당률이 실시간 결정되며, 자신의 베팅금에 따른 예상 환급금을 알 수 있습니다.<br>
-ㆍ베팅은 16슬롯에 각각 베팅 가능하며, 도합 최대 금 1000씩 베팅 가능합니다.<br>
-ㆍ소지금 500원 이하일땐 베팅이 불가능합니다.
-ㆍ삼모와 더불어 토너먼트, 베팅기능으로 즐거운 삼모 되세요!<br>
-        </td>
-    </tr>
-</table>
-<table align=center width=1120 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+            foreach ($tournamentType as $tournamentTypeText => [$statTypeText, $statFunc, $rankColumn]) : ?>
+                <td>
+                    <table align=center width=280 class='tb_layout bg0 f_tnum'>
+                        <tr>
+                            <td colspan=9 align=center style=color:white;background-color:black;>
+                                <font size=4><?= $tournamentTypeText ?></font>
+                            </td>
+                        </tr>
+                        <tr class='bg1'>
+                            <td align=center>순</td>
+                            <td align=center>장수</td>
+                            <td align=center><?= $statTypeText ?></td>
+                            <td align=center>경</td>
+                            <td align=center>승</td>
+                            <td align=center>무</td>
+                            <td align=center>패</td>
+                            <td align=center>점</td>
+                            <td align=center>勝</td>
+                        </tr>
+                        <?php
+                        $prizeColumn = RankColumn::from("{$rankColumn}p");
+                        $gameColumn = RankColumn::from("{$rankColumn}g");
+                        $winColumn = RankColumn::from("{$rankColumn}w");
+                        $drawColumn = RankColumn::from("{$rankColumn}d");
+                        $loseColumn = RankColumn::from("{$rankColumn}l");
+                        $tournamentRankerList = GeneralLite::createObjListFromDB(
+                            $db->queryFirstColumn('SELECT general_id FROM rank_data WHERE `type`= %s ORDER BY value DESC LIMIT 40', $gameColumn->value),
+                            [$prizeColumn->value, $gameColumn->value, $winColumn->value, $drawColumn->value, $loseColumn->value, 'leadership', 'strength', 'intel', 'no', 'npc', 'name'],
+                            GeneralLiteQueryMode::Core
+                        );
+                        usort($tournamentRankerList, function (GeneralLite $lhs, GeneralLite $rhs) use ($gameColumn, $winColumn, $drawColumn, $loseColumn) {
+                            $result = - ($lhs->getRankVar($gameColumn) <=> $rhs->getRankVar($gameColumn));
+                            if ($result !== 0) return $result;
+                            $result = - (
+                                ($lhs->getRankVar($winColumn) + $lhs->getRankVar($drawColumn) + $lhs->getRankVar($loseColumn))
+                                <=>
+                                ($rhs->getRankVar($winColumn) + $rhs->getRankVar($drawColumn) + $rhs->getRankVar($loseColumn))
+                            );
+                            if ($result !== 0) return $result;
+                            $result = - ($lhs->getRankVar($winColumn) <=> $rhs->getRankVar($winColumn));
+                            if ($result !== 0) return $result;
+                            $result = - ($lhs->getRankVar($drawColumn) <=> $rhs->getRankVar($drawColumn));
+                            if ($result !== 0) return $result;
+                            return $lhs->getRankVar($loseColumn) <=> $rhs->getRankVar($loseColumn);
+                        });
+                        $tournamentRankerList = array_splice($tournamentRankerList, 0, 30);
+                        foreach ($tournamentRankerList as $rank => $ranker) {
+                            printRow(
+                                $rank,
+                                $ranker->getNPCType(),
+                                $ranker->getName(),
+                                ($statFunc)($ranker),
+                                $ranker->getRankVar($winColumn) + $ranker->getRankVar($drawColumn) + $ranker->getRankVar($loseColumn),
+                                $ranker->getRankVar($winColumn),
+                                $ranker->getRankVar($drawColumn),
+                                $ranker->getRankVar($loseColumn),
+                                $ranker->getRankVar($gameColumn),
+                                $ranker->getRankVar($prizeColumn),
+                                0
+                            );
+                        }
+                        ?>
+                    </table>
+                </td>
+            <?php endforeach; ?>
+        </tr>
+        <tr>
+            <td colspan=16>
+                ㆍ토너먼트의 16강 대진표가 완성되면, 베팅 기간이 주어집니다.<br>
+                ㆍ유저들의 베팅 상황에 따라 배당률이 실시간 결정되며, 자신의 베팅금에 따른 예상 환급금을 알 수 있습니다.<br>
+                ㆍ베팅은 16슬롯에 각각 베팅 가능하며, 도합 최대 금 1000씩 베팅 가능합니다.<br>
+                ㆍ소지금 500원 이하일땐 베팅이 불가능합니다.
+                ㆍ삼모와 더불어 토너먼트, 베팅기능으로 즐거운 삼모 되세요!<br>
+            </td>
+        </tr>
+    </table>
+    <table align=center width=1120 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>
@@ -1,75 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("기밀실", 1);
-
-$query = "select no,nation,level from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-if($me['level'] < 5) {
-    echo "수뇌부가 아닙니다.";
-    exit();
-}
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>기밀실</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>기 밀 실<br><?=backButton()?></td></tr>
-<form name=form1 method=post action=c_chiefboard.php>
-    <tr><td align=center>
-        제목 <input type=textarea maxlength=50 name=title style=color:white;background-color:black;width:830px;>
-        </td>
-    </tr>
-    <tr><td>
-        <textarea name=msg style=color:white;background-color:black;width:998px;height:200px;></textarea><br>
-        <input type=submit value=저장하기>
-        <input type=hidden name=num value=-1>
-    </td></tr>
-</form>
-</table>
-<br>
-<?php
-$nation = getNation($me['nation']);
-
-//20개 메세지
-$index = $nation['coreindex'];
-for($i=0; $i < 20; $i++) {
-    $who = "coreboard{$index}_who";
-    $query = "select name,picture,imgsvr from general where no='$nation[$who]'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
-    if($nation["coreboard{$index}"] != '') { msgprint($nation["coreboard{$index}"], $general['name'], $general['picture'], $general['imgsvr'], $nation["coreboard{$index}_when"], $index, 1); }
-    $index--;
-    if($index < 0) { $index = 19; }
-}
-
-?>
-
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
-
@@ -1,194 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("사령부", 1);
-
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
-
-$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$query = "select secretlimit from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$nation = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
-
-if($me['level'] == 0 || ($me['level'] == 1 && $me['belong'] < $nation['secretlimit'])) {
-    echo "수뇌부가 아니거나 사관년도가 부족합니다.";
-    exit();
-}
-
-if($me['level'] >= 5) { $btn = "submit"; $btn2 = "button"; }
-else { $btn = "hidden"; $btn2 = "hidden"; }
-
-$date = date('Y-m-d H:i:s');
-
-// 명령 목록
-$query = "select year,month,turnterm from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
-
-$query = "
-    select nation,level,
-    l12turn0,l12turn1,l12turn2,l12turn3,l12turn4,l12turn5,l12turn6,l12turn7,l12turn8,l12turn9,l12turn10,l12turn11,
-    l11turn0,l11turn1,l11turn2,l11turn3,l11turn4,l11turn5,l11turn6,l11turn7,l11turn8,l11turn9,l11turn10,l11turn11,
-    l10turn0,l10turn1,l10turn2,l10turn3,l10turn4,l10turn5,l10turn6,l10turn7,l10turn8,l10turn9,l10turn10,l10turn11,
-    l9turn0, l9turn1, l9turn2, l9turn3, l9turn4, l9turn5, l9turn6, l9turn7, l9turn8, l9turn9, l9turn10, l9turn11,
-    l8turn0, l8turn1, l8turn2, l8turn3, l8turn4, l8turn5, l8turn6, l8turn7, l8turn8, l8turn9, l8turn10, l8turn11,
-    l7turn0, l7turn1, l7turn2, l7turn3, l7turn4, l7turn5, l7turn6, l7turn7, l7turn8, l7turn9, l7turn10, l7turn11,
-    l6turn0, l6turn1, l6turn2, l6turn3, l6turn4, l6turn5, l6turn6, l6turn7, l6turn8, l6turn9, l6turn10, l6turn11,
-    l5turn0, l5turn1, l5turn2, l5turn3, l5turn4, l5turn5, l5turn6, l5turn7, l5turn8, l5turn9, l5turn10, l5turn11
-    from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$nation = MYDB_fetch_array($result);
-
-$lv = getNationChiefLevel($nation['level']);
-$turn = [];
-$gen = [[],[],[],[],[],[],[],[],[],[],[],[]];
-for($i=12; $i >= $lv; $i--) {
-    $turn[$i] = getCoreTurn($nation, $i);
-
-    $query = "select name,turntime,npc from general where level={$i} and nation='{$me['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gen[$i] = MYDB_fetch_array($result);
-}
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>사령부</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-<script type="text/javascript">
-function turn(type) {
-    if(type == 0) location.replace('turn_push_core.php');
-    else if(type == 1) location.replace('turn_pop_core.php');
-}
-</script>
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>사 령 부<input type=button value='갱신' onclick=location.replace('b_chiefcenter.php')><br><?=backButton()?></td></tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td colspan=10 align=center bgcolor=skyblue>수뇌부 일정</td></tr>
-    <tr><td colspan=10 align=center>
-<?php
-$year = $admin['year'];
-$month = $admin['month'];
-$date = substr(date('Y-m-d H:i:s'), 14);
-
-$totaldate = [];
-$turntime = [];
-$turndate = [];
-
-for($i=12; $i >= $lv; $i--) {
-    $totaldate[$i] = $gen[$i]['turntime'];
-    $turntime[$i] = substr($gen[$i]['turntime'], 14);
-}
-
-//FIXME: 각 칸을 div로 놓으면 네개씩 출력하는 삽질이 필요없다.
-
-for($k=0; $k < 2; $k++) {
-    $l4 = 12 - $k;  $l3 = 10 - $k;  $l2 =  8 - $k;  $l1 =  6 - $k;
-
-    if(!isset($gen[$l4])){
-        $gen[$l4] = [
-            'npc'=>0,
-            'name'=>0
-        ];
-    }
-
-    if    ($gen[$l4]['npc'] >= 2) { $gen[$l4]['name'] = "<font color=cyan>".($gen[$l4]['name']??'')."</font>"; }
-    elseif($gen[$l4]['npc'] == 1) { $gen[$l4]['name'] = "<font color=skyblue>".($gen[$l4]['name']??'')."</font>"; }
-    if    ($gen[$l3]['npc'] >= 2) { $gen[$l3]['name'] = "<font color=cyan>".($gen[$l3]['name']??'')."</font>"; }
-    elseif($gen[$l3]['npc'] == 1) { $gen[$l3]['name'] = "<font color=skyblue>".($gen[$l3]['name']??'')."</font>"; }
-    if    ($gen[$l2]['npc'] >= 2) { $gen[$l2]['name'] = "<font color=cyan>".($gen[$l2]['name']??'')."</font>"; }
-    elseif($gen[$l2]['npc'] == 1) { $gen[$l2]['name'] = "<font color=skyblue>".($gen[$l2]['name']??'')."</font>"; }
-    if    ($gen[$l1]['npc'] >= 2) { $gen[$l1]['name'] = "<font color=cyan>".($gen[$l1]['name']??'')."</font>"; }
-    elseif($gen[$l1]['npc'] == 1) { $gen[$l1]['name'] = "<font color=skyblue>".($gen[$l1]['name']??'')."</font>"; }
-
-    echo "
-    <tr>
-        <td align=center id=bg1>.</td>
-        <td colspan=2 align=center id=bg1><b>".getLevel($l4, $nation['level'])." : ".($gen[$l4]['name']??'')."</b></td>
-        <td colspan=2 align=center id=bg1><b>".getLevel($l3, $nation['level'])." : ".($gen[$l3]['name']??'')."</b></td>
-        <td colspan=2 align=center id=bg1><b>".getLevel($l2, $nation['level'])." : ".($gen[$l2]['name']??'')."</b></td>
-        <td colspan=2 align=center id=bg1><b>".getLevel($l1, $nation['level'])." : ".($gen[$l1]['name']??'')."</b></td>
-        <td align=center id=bg1>.</td>
-    </tr>
-    ";
-
-    for($i=0; $i < 12; $i++) {
-        $turndate[$l4] = substr($totaldate[$l4]??'', 11, 5);
-        $turndate[$l3] = substr($totaldate[$l3]??'', 11, 5);
-        $turndate[$l2] = substr($totaldate[$l2]??'', 11, 5);
-        $turndate[$l1] = substr($totaldate[$l1]??'', 11, 5);
-        $j = $i + 1;
-        $td4 = $turndate[$l4]??"-";
-        $td3 = $turndate[$l3]??"-";
-        $td2 = $turndate[$l2]??"-";
-        $td1 = $turndate[$l1]??"-";
-        $tn4 = $turn[$l4][$i]??"-";
-        $tn3 = $turn[$l3][$i]??"-";
-        $tn2 = $turn[$l2][$i]??"-";
-        $tn1 = $turn[$l1][$i]??"-";
-        echo "
-    <tr>
-        <td width=28  align=center id=bg0><b>$j</b></td>
-        <td width=58  align=center bgcolor=black><b>$td4</b></td>
-        <td width=173 align=center height=24 style=table-layout:fixed; id=bg2>$tn4</td>
-        <td width=58  align=center bgcolor=black><b>$td3</b></td>
-        <td width=173 align=center height=24 style=table-layout:fixed; id=bg2>$tn3</td>
-        <td width=58  align=center bgcolor=black><b>$td2</b></td>
-        <td width=173 align=center height=24 style=table-layout:fixed; id=bg2>$tn2</td>
-        <td width=58  align=center bgcolor=black><b>$td1</b></td>
-        <td width=173 align=center height=24 style=table-layout:fixed; id=bg2>$tn1</td>
-        <td width=28  align=center id=bg0><b>$j</b></td>
-    </tr>
-        ";
-        if($totaldate[$l4]??'') { $totaldate[$l4] = addTurn($totaldate[$l4], $admin['turnterm']); }
-        if($totaldate[$l3]??'') { $totaldate[$l3] = addTurn($totaldate[$l3], $admin['turnterm']); }
-        if($totaldate[$l2]??'') { $totaldate[$l2] = addTurn($totaldate[$l2], $admin['turnterm']); }
-        if($totaldate[$l1]??'') { $totaldate[$l1] = addTurn($totaldate[$l1], $admin['turnterm']); }
-    }
-    if($k == 0) {
-        echo "<form action=processing.php method=post><tr><td colspan=5 align=right>";
-        echo CoreTurnTable();
-        echo "</td><td colspan=5>
-        <input type={$btn2} style=background-color:".GameConst::$basecolor2.";color:white;width:58px;font-size:13px; value='미루기▼' onclick='turn(0)'>
-        <input type={$btn2} style=background-color:".GameConst::$basecolor2.";color:white;width:58px;font-size:13px; value='▲당기기' onclick='turn(1)'>
-        <br>";
-        CoreCommandTable();
-        echo "<input type={$btn} style=background-color:".GameConst::$basecolor2.";color:white;width:55px;font-size:13px; value='실 행'></td></tr></form>";
-    }
-}
-
-?>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
-
@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 include "lib.php";
@@ -6,132 +7,154 @@ include "func.php";

 $citylist = Util::getReq('citylist', 'int');

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
+$userGrade = Session::getUserGrade();

 $db = DB::db();
-$connect=$db->get();
-
+$gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("현재도시", 1);

-$query = "select no,nation,level,city from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
+$lastExecute = substr($gameStor->turntime, 5, 14);

-$query = "select nation,level,spy from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$myNation = MYDB_fetch_array($result);
+$me = $db->queryFirstRow('SELECT no,nation,officer_level,city from general where owner=%i', $userID);
+$myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation']) ?? [
+    'nation' => 0,
+    'level' => 0,
+    'spy' => ''
+];
+
+$templates = new \League\Plates\Engine('templates');

 ?>
 <!DOCTYPE html>
 <html>

 <head>
-<title>도시정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link href="../d_shared/common.css" rel="stylesheet">
-<link href="css/common.css" rel="stylesheet">
+    <title><?= UniqueConst::$serverName ?>: 도시정보</title>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../e_lib/select2/select2.min.css') ?>
+    <?= WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css') ?>
+    <?= 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" />
+    <style>
+        #general_list tr td {
+            text-align: center;
+        }

+        #general_list tr td:last-child {
+            text-align: left;
+            padding-left: 1em;
+        }
+
+        .general_turn_text {
+            font-size: x-small;
+        }
+    </style>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common', 'currentCity']) ?>
 </head>

 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>도 시 정 보<br><?=backButton()?></td></tr>
-</table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>도 시 정 보<br><?= backButton() ?></td>
+        </tr>
+    </table>

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=998>
-            <form name=cityselect method=get>도시선택 :
-                <select name=citylist size=1 style=color:white;background-color:black;width:798px;>
-<?php
-if(!$citylist){
-    $citylist = $me['city'];
-}
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td width=998>
+                <form name=cityselect method=get>
+                    <div style='text-align:center;'>도시선택 :
+                        <select id="citySelector" name=citylist size=1 style='display:inline-block;min-width:400px;'>
+                            <?php
+                            if (!$citylist) {
+                                $citylist = $me['city'];
+                            }

-// 재야일때는 현재 도시만
-$valid = 0;
-if($me['level'] == 0) {
-    $query = "select city,name,nation from city where city='{$me['city']}'";
-    $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($cityresult);
-    echo "
+                            // 재야일때는 현재 도시만
+                            $valid = 0;
+                            if ($me['officer_level'] == 0) {
+                                $city = $db->queryFirstRow('SELECT city,name,nation from city where city=%i', $me['city']);
+                                echo "
                    <option value={$city['city']}";
-    if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
-    echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
-    if($city['nation'] == 0) echo "공백지";
-    elseif($me['nation'] == $city['nation']) echo "본국==";
-    else echo "타국==";
-    echo "============================================</option>";
-} else {
-    // 아국 도시들 선택
-    $query = "select city,name,nation from city where nation='{$me['nation']}'";
-    $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $citycount = MYDB_num_rows($cityresult);
-
-    for($i=0; $i < $citycount; $i++) {
-        $city = MYDB_fetch_array($cityresult);
-        echo "
+                                if ($city['city'] == $citylist) {
+                                    echo " selected";
+                                    $valid = 1;
+                                }
+                                echo ">【" . StringUtil::padString($city['name'], 4, '_') . "】";
+                                if ($city['nation'] == 0) echo "공백지";
+                                elseif ($me['nation'] == $city['nation']) echo "본국";
+                                else echo "타국";
+                                echo "</option>";
+                            } else {
+                                // 아국 도시들 선택
+                                foreach ($db->query('SELECT city,name,nation from city where nation=%i', $me['nation']) as $city) {
+                                    echo "
                        <option value={$city['city']}";
-        if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
-        echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
-        if($city['nation'] == 0) echo "공백지";
-        elseif($me['nation'] == $city['nation']) echo "본국==";
-        else echo "타국==";
-        echo "============================================</option>";
-    }
+                                    if ($city['city'] == $citylist) {
+                                        echo " selected";
+                                        $valid = 1;
+                                    }
+                                    echo ">【" . StringUtil::padString($city['name'], 4, '_') . "】";
+                                    if ($city['nation'] == 0) echo "공백지";
+                                    elseif ($me['nation'] == $city['nation']) echo "본국";
+                                    else echo "타국";
+                                    echo "</option>";
+                                }

-    // 아국 장수가 있는 타국 도시들 선택
-    $query = "select distinct A.city,B.name,B.nation from general A,city B where A.city=B.city and A.nation='{$me['nation']}' and B.nation!='{$me['nation']}'";
-    $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $citycount = MYDB_num_rows($cityresult);
-
-    for($i=0; $i < $citycount; $i++) {
-        $city = MYDB_fetch_array($cityresult);
-        echo "
+                                // 아국 장수가 있는 타국 도시들 선택
+                                foreach ($db->query('SELECT distinct A.city,B.name,B.nation from general A,city B where A.city=B.city and A.nation=%i and B.nation!=%i', $me['nation'], $me['nation']) as $city) {
+                                    echo "
                        <option value={$city['city']}";
-        if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
-        echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
-        if($city['nation'] == 0) echo "공백지";
-        elseif($me['nation'] == $city['nation']) echo "본국==";
-        else echo "타국==";
-        echo "============================================</option>";
-    }
-}
+                                    if ($city['city'] == $citylist) {
+                                        echo " selected";
+                                        $valid = 1;
+                                    }
+                                    echo ">【" . StringUtil::padString($city['name'], 4, '_') . "】";
+                                    if ($city['nation'] == 0) echo "공백지";
+                                    elseif ($me['nation'] == $city['nation']) echo "본국";
+                                    else echo "타국";
+                                    echo "</option>";
+                                }
+                            }

-if($myNation['level'] > 0) {
-    // 첩보도시도 목록에 추가
-    $where = 'city=0';
-    $cities = array_map('intval',explode("|", $myNation['spy']));
-    foreach($cities as $citySpy) {
-        $city = intdiv($citySpy, 10);
-        $where .= " or city='{$city}'";
-    }
+                            if ($myNation['level'] > 0) {
+                                // 첩보도시도 목록에 추가

-    $query = "select city,name,nation from city where {$where}";
-    $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $citycount = MYDB_num_rows($cityresult);
+                                $rawSpy = $myNation['spy'];

-    for($i=0; $i < $citycount; $i++) {
-        $city = MYDB_fetch_array($cityresult);
-        echo "
-                        <option value={$city['city']}";
-        if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
-        echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
-        if($city['nation'] == 0) echo "공백지";
-        elseif($me['nation'] == $city['nation']) echo "본국==";
-        else echo "타국==";
-        echo "============================================</option>";
-    }
+                                if ($rawSpy == '') {
+                                    $spyCities = [];
+                                } else {
+                                    $spyCities = array_keys(Json::decode($rawSpy));
+                                }

-}

-echo "
-                </select>
-                <input type=submit value='도 시 선 택'>
+                                if ($spyCities) {
+                                    foreach ($db->query('SELECT city,name,nation FROM city WHERE city in %li', $spyCities) as $city) {
+                                        echo "<option value={$city['city']}";
+                                        if ($city['city'] == $citylist) {
+                                            echo " selected";
+                                            $valid = 1;
+                                        }
+                                        echo ">【" . StringUtil::padString($city['name'], 4, '_') . "】";
+                                        if ($city['nation'] == 0) echo "공백지";
+                                        elseif ($me['nation'] == $city['nation']) echo "본국";
+                                        else echo "타국";
+                                        echo "</option>";
+                                    }
+                                }
+                            }
+
+                            echo "
+                </select></div>
                <p align=center>명령 화면에서 도시를 클릭하셔도 됩니다.</p>
            </form>
        </td>
@@ -139,212 +162,379 @@ echo "
 </table>
 <br>";

-unset($city);
+                            unset($city);

-// 첩보된 도시까지만 허용
-if($valid == 0 && $session->userGrade < 5) {
-    $citylist = $me['city'];
-}
+                            // 첩보된 도시까지만 허용
+
+                            $showDetailedInfo = false;
+                            if ($valid) {
+                                $showDetailedInfo = true;
+                            }
+
+                            if (!key_exists($citylist, CityConst::all())) {
+                                $citylist = $me['city'];
+                                $showDetailedInfo = true;
+                                $valid = 1;
+                            }
+
+                            if ($userGrade >= 6) {
+                                $valid = true;
+                                $showDetailedInfo = true;
+                            }
+
+                            if (!$valid) {
+                                $ownCities = Util::convertArrayToSetLike($db->queryFirstColumn('SELECT city FROM city WHERE nation = %i AND nation != 0', $me['nation']));
+                                foreach (array_keys(CityConst::byID($citylist)->path) as $pathID) {
+                                    if (key_exists($pathID, $ownCities)) {
+                                        $showDetailedInfo = true;
+                                        break;
+                                    }
+                                }
+                            }


-$city = $db->queryFirstRow('SELECT * FROM city WHERE city=%i', $citylist);
-$nation = getNationStaticInfo($city['nation']);
+                            $city = $db->queryFirstRow('SELECT * FROM city WHERE city=%i', $citylist);
+                            $cityNation = getNationStaticInfo($city['nation']);

-//태수, 군사, 시중
-$gen1 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen1']);
-$gen2 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen2']);
-$gen3 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen3']);
+                            //태수, 군사, 종사
+                            $officer = [
+                                4 => ['name' => '-', 'npc' => 0],
+                                3 => ['name' => '-', 'npc' => 0],
+                                2 => ['name' => '-', 'npc' => 0]
+                            ];

-if($city['trade'] == 0) {
-    $city['trade'] = "- ";
-}
-?>
+                            foreach ($db->query('SELECT `name`, npc, `officer_level` FROM general WHERE `officer_city` = %i', $city['city']) as $officerInfo) {
+                                $officer[$officerInfo['officer_level']] = $officerInfo;
+                            }

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-</table>
+                            if ($city['trade'] === null) {
+                                $city['trade'] = "- ";
+                            }

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
-    <tr>
-        <td colspan=12 align=center style=color:"<?=newColor($nation['color'])?>"; bgcolor=<?=$nation['color']?>>【 <?=CityConst::$regionMap[$city['region']]?> | <?=CityConst::$levelMap[$city['level']]?> 】 <?=$city['name']?></td>
-    </tr>
-    <tr>
-        <td align=center width=48 id=bg1>주민</td>
-        <td align=center width=112><?=$city['pop']?>/<?=$city['pop2']?></td>
-        <td align=center width=48 id=bg1>농업</td>
-        <td align=center width=108><?=$city['agri']?>/<?=$city['agri2']?></td>
-        <td align=center width=48 id=bg1>상업</td>
-        <td align=center width=108><?=$city['comm']?>/<?=$city['comm2']?></td>
-        <td align=center width=48 id=bg1>치안</td>
-        <td align=center width=108><?=$city['secu']?>/<?=$city['secu2']?></td>
-        <td align=center width=48 id=bg1>수비</td>
-        <td align=center width=108><?=$city['def']?>/<?=$city['def2']?></td>
-        <td align=center width=48 id=bg1>성벽</td>
-        <td align=center width=108><?=$city['wall']?>/<?=$city['wall2']?></td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>민심</td>
-        <td align=center><?=$city['rate']?></td>
-        <td align=center id=bg1>시세</td>
-        <td align=center><?=$city['trade']?>%</td>
-        <td align=center id=bg1>인구</td>
-        <td align=center><?=round($city['pop']/$city['pop2']*100, 2)?>%</td>
-        <td align=center id=bg1>태수</td>
-        <td align=center><?=$gen1['name']??'-'?></td>
-        <td align=center id=bg1>군사</td>
-        <td align=center><?=$gen2['name']??'-'?></td>
-        <td align=center id=bg1>시중</td>
-        <td align=center><?=$gen3['name']??'-'?></td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>장수</td>
-        <td colspan=11>
-<?php
-    $query = "select name, npc from general where city='{$city['city']}' and nation='{$city['nation']}'";    // 장수 목록
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gencount = MYDB_num_rows($genresult);
-    if($gencount == 0) echo "-";
-    for($i=0; $i < $gencount; $i++) {
-        $general = MYDB_fetch_array($genresult);
-        echo "{$general['name']}, ";
-    }
-?>
-        </td>
-    </tr>
-</table>
-<?php
-$query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos,term,turn0,turn1,turn2,turn3,turn4,turn5 from general where city='{$city['city']}' order by dedication desc";    // 장수 목록
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($genresult);
+                            $dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'])[0];
+                            if ($showDetailedInfo) {
+                                $generals = $db->query(
+                                    'SELECT %l from general where city=%i order by turntime',
+                                    Util::formatListOfBackticks($dbColumns),
+                                    $city['city']
+                                );
+                            } else {
+                                $generals = [];
+                            }

-$nationname = [];
-$nationlevel = [];
-foreach(getAllNationStaticInfo() as $nation){
-    $nationname[$nation['nation']] = $nation['name'];
-    $nationlevel[$nation['nation']] = $nation['level'];
-}
+                            if ($valid) {
+                                $city['trustText'] = round($city['trust'], 1);
+                                $city['popRateText'] = round($city['pop'] / $city['pop_max'] * 100, 2);
+                            } else {
+                                $city['agri'] = '?';
+                                $city['comm'] = '?';
+                                $city['pop'] = '?';
+                                $city['secu'] = '?';
+                                $city['trustText'] = '?';
+                                $city['popRateText'] = '?';

-if($gencount != 0) {
-    echo "
-<br>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=64 align=center id=bg1>얼 굴</td>
-        <td width=98 align=center id=bg1>이 름</td>
-        <td width=48 align=center id=bg1>통솔</td>
-        <td width=48 align=center id=bg1>무력</td>
-        <td width=48 align=center id=bg1>지력</td>
-        <td width=78 align=center id=bg1>관 직</td>
-        <td width=28 align=center id=bg1>守</td>
-        <td width=78 align=center id=bg1>병 종</td>
-        <td width=78 align=center id=bg1>병 사</td>
-        <td width=48 align=center id=bg1>훈련</td>
-        <td width=48 align=center id=bg1>사기</td>
-        <td width=310 align=center id=bg1>명 령</td>
-    </tr>";
-}
+                                if ($city['nation'] != 0) {
+                                    $city['def'] = '?';
+                                    $city['wall'] = '?';
+                                }
+                            }

-for($j=0; $j < $gencount; $j++) {
-    $general = MYDB_fetch_array($genresult);

-    if($general['level'] == 12) {
-        $lbonus = $nationlevel[$general['nation']] * 2;
-    } elseif($general['level'] >= 5) {
-        $lbonus = $nationlevel[$general['nation']];
-    } else {
-        $lbonus = 0;
-    }
-    if($lbonus > 0) {
-        $lbonus = "<font color=cyan>+{$lbonus}</font>";
-    } else {
-        $lbonus = "";
-    }
+                            $generalTurnList = [];

-    if($general['injury'] > 0) {
-        $leader = intdiv($general['leader'] * (100 - $general['injury']), 100);
-        $power = intdiv($general['power'] * (100 - $general['injury']), 100);
-        $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leader = "<font color=red>{$leader}</font>{$lbonus}";
-        $power = "<font color=red>{$power}</font>";
-        $intel = "<font color=red>{$intel}</font>";
-    } else {
-        $leader = "{$general['leader']}{$lbonus}";
-        $power = "{$general['power']}";
-        $intel = "{$general['intel']}";
-    }
+                            if ($generals) {
+                                foreach ($db->queryAllLists(
+                                    'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
+                                    array_column($generals, 'no')
+                                ) as [$generalID, $turnIdx, $brief]) {
+                                    if (!key_exists($generalID, $generalTurnList)) {
+                                        $generalTurnList[$generalID] = [];
+                                    }
+                                    $generalTurnList[$generalID][$turnIdx] = $brief;
+                                }
+                            }

-    if($general['npc'] >= 2) { $general['name'] = "<font color=cyan>{$general['name']}</font>"; }
-    elseif($general['npc'] == 1) { $general['name'] = "<font color=skyblue>{$general['name']}</font>"; }
-    $imageTemp = GetImageURL($general['imgsvr']);
-    echo "
-    <tr>
-        <td align=center height=64></td>
-        <td align=center>{$general['name']}</td>
-        <td align=center>$leader</td>
-        <td align=center>$power</td>
-        <td align=center>$intel</td>
-        <td align=center>".getLevel($general['level'])."</td>";
-    //아국장수이거나 보는 사람이 운영자일때 보여줌
-    if(($general['nation'] != 0 && $general['nation'] == $myNation['nation']) || $session->userGrade >= 5) {
-        switch($general['mode']) {
-        case 0: $mode = "×"; break;
-        case 1: $mode = "○"; break;
-        case 2: $mode = "◎"; break;
-        }

-        echo "
-        <td align=center>$mode</td>
-        <td align=center>".GameUnitConst::byId($general['crewtype'])->name."</td>
-        <td align=center>{$general['crew']}</td>
-        <td align=center>{$general['train']}</td>
-        <td align=center>{$general['atmos']}</td>";
-        if($general['npc'] >= 2) {
-            echo "
-        <td>NPC 장수";
-        } else {
-            echo "
-        <td>
-            <font size=1>";
-            $turn = getTurn($general, 1);
+                            $nationname = [];
+                            $nationlevel = [];
+                            foreach (getAllNationStaticInfo() as $nation) {
+                                $nationname[$nation['nation']] = $nation['name'];
+                                $nationlevel[$nation['nation']] = $nation['level'];
+                            }

-            for($i=0; $i < 4; $i++) {
-                $k = $i+1;
-                echo "
-                    &nbsp;&nbsp;$k : $turn[$i]<br>";
-            }
-            echo "
-            </font>";
-        }
-    } elseif($general['nation'] != 0) {
-        echo "
-        <td align=center>?</td>
-        <td align=center>?</td>
-        <td align=center>{$general['crew']}</td>
-        <td align=center>?</td>
-        <td align=center>?</td>
-        <td>【{$nationname[$general['nation']]}】 장수";
-    } else {
-        echo "
-        <td align=center>?</td>
-        <td align=center>?</td>
-        <td align=center>{$general['crew']}</td>
-        <td align=center>?</td>
-        <td align=center>?</td>
-        <td>&nbsp; 재 야";
-    }
+                            //도시명	오	적군	0/0(0)	병장(총)	0/0(4)	90병장	0/0	60병장	0/0	수비○	0/0
+                            $generalsFormat = [];

-    echo "
-        </td>
-    </tr>";
-}
-?>
-</table>

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+                            foreach ($generals as $general) {
+                                $nationInfo = getNationStaticInfo($general['nation']);
+
+                                if ($general['nation'] != 0 && $general['nation'] == $myNation['nation']) {
+                                    $ourGeneral = true;
+                                } else {
+                                    $ourGeneral = false;
+                                }
+
+                                if ($userGrade == 7) {
+                                    $ourGeneral = true;
+                                }
+
+                                $isNPC = $general['npc'] > 1;
+                                $wounded = $general['injury'];
+
+
+                                $name = $general['name'];
+                                $nameText = formatName($name, $general['npc']);
+
+                                $leadership = $general['leadership'];
+                                $strength = $general['strength'];
+                                $intel = $general['intel'];
+
+                                $leadershipText = formatWounded($leadership, $general['injury']);
+                                $strengthText = formatWounded($strength, $general['injury']);
+                                $intelText = formatWounded($intel, $general['injury']);
+
+                                $officerLevel = $general['officer_level'];
+                                $officerLevelText = getOfficerLevelText($officerLevel);
+
+                                $leadershipBonus = calcLeadershipBonus($officerLevel, $nationInfo['level']);
+                                $leadershipBonusText = formatLeadershipBonus($leadershipBonus);
+
+                                if ($ourGeneral) {
+                                    $defenceTrain = $general['defence_train'];
+                                    $defenceTrainText = formatDefenceTrain($defenceTrain);
+                                    $crewType = $general['crewtype'];
+                                    $crewTypeText = GameUnitConst::byId($crewType)->name;
+                                    $crew = $general['crew'];
+                                    $train = $general['train'];
+                                    $atmos = $general['atmos'];
+                                } else {
+                                    $defenceTrain = 0;
+                                    $defenceTrainText = '';
+                                    $crewType = 0;
+                                    $crewTypeText = '';
+                                    $crew = $general['crew'];
+                                    $train = -1;
+                                    $atmos = -1;
+
+                                    if (!$valid) {
+                                        $crew = -1;
+                                    }
+                                }
+
+                                $nation = $general['nation'];
+                                $nationName = $nationInfo['name'];
+
+                                if ($ourGeneral && !$isNPC) {
+                                    $turnText = [];
+                                    foreach ($generalTurnList[$general['no']] as $turnRawIdx => $turn) {
+                                        $turnIdx = $turnRawIdx + 1;
+                                        $turnText[] = "{$turnIdx} : $turn";
+                                    }
+                                    $turnText = join('<br>', $turnText);
+                                } else {
+                                    $turnText = '';
+                                }
+
+                                $generalsFormat[] = [
+                                    'ourGeneral' => $ourGeneral,
+                                    'iconPath' => GetImageURL($general['imgsvr']) . '/' . $general['picture'],
+                                    'isNPC' => $isNPC,
+                                    'npc' => $general['npc'],
+                                    'wounded' => $wounded,
+                                    'name' => $name,
+                                    'nameText' => $nameText,
+                                    'leadership' => $leadership,
+                                    'leadershipText' => $leadershipText,
+                                    'leadershipBonus' => $leadershipBonus,
+                                    'leadershipBonusText' => $leadershipBonusText,
+                                    'officerLevel' => $officerLevel,
+                                    'officerLevelText' => $officerLevelText,
+                                    'strength' => $strength,
+                                    'strengthText' => $strengthText,
+                                    'intel' => $intel,
+                                    'intelText' => $intelText,
+                                    'defenceTrain' => $defenceTrain,
+                                    'defenceTrainText' => $defenceTrainText,
+                                    'crewType' => $crewType,
+                                    'crewTypeText' => $crewTypeText,
+                                    'crew' => $crew,
+                                    'train' => $train,
+                                    'atmos' => $atmos,
+                                    'nation' => $nation,
+                                    'nationName' => $nationName,
+                                    'turnText' => $turnText
+                                ];
+                            }
+
+                            $generalsName = array_map(function ($gen) {
+                                return formatName($gen['name'], $gen['npc']);
+                            }, $generals);
+
+                            $enemyCrew = 0;
+                            $enemyCnt = 0;
+                            $enemyArmedCnt = 0;
+                            $crew90 = 0;
+                            $gen90 = 0;
+                            $crew80 = 0;
+                            $gen80 = 0;
+                            $crew60 = 0;
+                            $gen60 = 0;
+
+                            $crewDef = 0;
+                            $genDef = 0;
+
+                            $crewTotal = 0;
+                            $armedGenTotal = 0;
+                            $genTotal = 0;
+
+
+                            foreach ($generalsFormat as $general) {
+                                if (!$general['nation'] || !$myNation['nation']) {
+                                    continue;
+                                }
+                                if ($general['nation'] != $myNation['nation']) {
+                                    $enemyCnt += 1;
+                                    if ($general['crew'] >= 0) {
+                                        $enemyCrew += $general['crew'];
+                                    }
+                                    if ($general['crew'] > 0) {
+                                        $enemyArmedCnt += 1;
+                                    }
+                                    continue;
+                                }
+
+                                $crewTotal += $general['crew'];
+                                $genTotal += 1;
+
+                                if ($general['crew'] == 0) {
+                                    continue;
+                                }
+                                $armedGenTotal += 1;
+
+                                $minTrain = min($general['train'], $general['atmos']);
+
+                                if ($minTrain >= 90) {
+                                    $crew90 += $general['crew'];
+                                    $gen90 += 1;
+                                }
+
+                                $chkDef = false;
+
+                                if ($minTrain >= 80) {
+                                    $crew80 += $general['crew'];
+                                    $gen80 += 1;
+                                }
+
+                                if ($minTrain >= 60) {
+                                    $crew60 += $general['crew'];
+                                    $gen60 += 1;
+                                }
+
+                                if ($minTrain >= $general['defenceTrain']) {
+                                    $crewDef += $general['crew'];
+                                    $genDef += 1;
+                                    $chkDef = true;
+                                }
+                            }
+
+                            ?>
+
+                            <table align=center width=1000 class='tb_layout bg0'>
+                                <tr>
+                                    <td><?= backButton() ?></td>
+                                </tr>
+                            </table>
+
+                            <table align=center width=1000 class='tb_layout bg2'>
+                                <tr>
+                                    <td colspan=11 align=center style='color:<?= newColor($cityNation['color']) ?>; background:<?= $cityNation['color'] ?>'>【 <?= CityConst::$regionMap[$city['region']] ?> | <?= CityConst::$levelMap[$city['level']] ?> 】 <?= $city['name'] ?></td>
+                                    <td style='color:<?= newColor($cityNation['color']) ?>; background:<?= $cityNation['color'] ?>' class='center'><?= $lastExecute ?></td>
+                                </tr>
+                                <tr>
+                                    <td align=center width=48 class=bg1>주민</td>
+                                    <td align=center width=112><?= $city['pop'] ?>/<?= $city['pop_max'] ?></td>
+                                    <td align=center width=48 class=bg1>농업</td>
+                                    <td align=center width=108><?= $city['agri'] ?>/<?= $city['agri_max'] ?></td>
+                                    <td align=center width=48 class=bg1>상업</td>
+                                    <td align=center width=108><?= $city['comm'] ?>/<?= $city['comm_max'] ?></td>
+                                    <td align=center width=48 class=bg1>치안</td>
+                                    <td align=center width=108><?= $city['secu'] ?>/<?= $city['secu_max'] ?></td>
+                                    <td align=center width=48 class=bg1>수비</td>
+                                    <td align=center width=108><?= $city['def'] ?>/<?= $city['def_max'] ?></td>
+                                    <td align=center width=48 class=bg1>성벽</td>
+                                    <td align=center width=108><?= $city['wall'] ?>/<?= $city['wall_max'] ?></td>
+                                </tr>
+                                <tr>
+                                    <td align=center class=bg1>민심</td>
+                                    <td align=center><?= $city['trustText'] ?></td>
+                                    <td align=center class=bg1>시세</td>
+                                    <td align=center><?= $city['trade'] ?>%</td>
+                                    <td align=center class=bg1>인구</td>
+                                    <td align=center><?= $city['popRateText'] ?>%</td>
+                                    <td align=center class=bg1>태수</td>
+                                    <td align=center><?= $officer[4]['name'] ?></td>
+                                    <td align=center class=bg1>군사</td>
+                                    <td align=center><?= $officer[3]['name'] ?></td>
+                                    <td align=center class=bg1>종사</td>
+                                    <td align=center><?= $officer[2]['name'] ?></td>
+                                </tr>
+                                <tr>
+                                    <td align=center class=bg1>도시명</td>
+                                    <td align=center><?= $city['name'] ?></td>
+                                    <td align=center class=bg1>적군</td>
+                                    <td align=center><?= number_format($enemyCrew) ?>/<?= number_format($enemyArmedCnt) ?>(<?= number_format($enemyCnt) ?>)</td>
+                                    <td align=center class=bg1>병장(총)</td>
+                                    <td align=center><?= number_format($crewTotal) ?>/<?= number_format($armedGenTotal) ?>(<?= number_format($genTotal) ?>)</td>
+                                    <td align=center class=bg1>90병장</td>
+                                    <td align=center><?= number_format($crew90) ?>/<?= number_format($gen90) ?></td>
+                                    <td align=center class=bg1>60병장</td>
+                                    <td align=center><?= number_format($crew60) ?>/<?= number_format($gen60) ?></td>
+                                    <td align=center class=bg1>수비○</td>
+                                    <td align=center><?= number_format($crewDef) ?>/<?= number_format($genDef) ?></td>
+                                </tr>
+                                <tr>
+                                    <td align=center class=bg1>장수</td>
+                                    <td colspan=11><?= $showDetailedInfo ? join(', ', $generalsName) : '<span style="color:gray">알 수 없음</span>' ?></td>
+                                </tr>
+                            </table>
+
+                            <br>
+                            <?php if ($showDetailedInfo) : ?>
+                                <table align=center class='tb_layout bg0'>
+                                    <thead>
+                                        <tr>
+                                            <td width=64 align=center class=bg1>얼 굴</td>
+                                            <td width=128 align=center class=bg1>이 름</td>
+                                            <td width=48 align=center class=bg1>통솔</td>
+                                            <td width=48 align=center class=bg1>무력</td>
+                                            <td width=48 align=center class=bg1>지력</td>
+                                            <td width=78 align=center class=bg1>관 직</td>
+                                            <td width=28 align=center class=bg1>守</td>
+                                            <td width=78 align=center class=bg1>병 종</td>
+                                            <td width=78 align=center class=bg1>병 사</td>
+                                            <td width=48 align=center class=bg1>훈련</td>
+                                            <td width=48 align=center class=bg1>사기</td>
+                                            <td width=280 align=center class=bg1>명 령</td>
+                                        </tr>
+                                    </thead>
+                                    <tbody class='bg0' id='general_list'>
+                                        <?php
+                                        foreach ($generalsFormat as $general) {
+                                            echo $templates->render('cityGeneral', $general);
+                                        }
+                                        ?>
+                                    </tbody>
+                                </table>
+                            <?php endif; ?>
+                            <table align=center width=1000 class='tb_layout bg0'>
+                                <tr>
+                                    <td><?= backButton() ?></td>
+                                </tr>
+                                <tr>
+                                    <td><?= banner() ?> </td>
+                                </tr>
+                            </table>
 </body>
-</html>

+</html>
@@ -1,316 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("내무부", 1);
-
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
-$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
-
-$query = "select secretlimit from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$nation = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-if ($me['level'] == 0 || ($me['level'] == 1 && $me['belong'] < $nation['secretlimit'])) {
-    echo "수뇌부가 아니거나 사관년도가 부족합니다.";
-    exit();
-}
-
-if ($me['level'] >= 5) {
-    $btn = "submit";
-    $read = "";
-} else {
-    $btn = "hidden";
-    $read = "readonly";
-}
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>내무부</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>내 무 부<br><?=backButton()?></td></tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
-    <tr>
-        <td width=100 align=center id=bg1>국 가 명</td>
-        <td width=50  align=center id=bg1>국력</td>
-        <td width=40  align=center id=bg1>장수</td>
-        <td width=40  align=center id=bg1>속령</td>
-        <td width=80  align=center id=bg1>상태</td>
-        <td width=60  align=center id=bg1>기간</td>
-        <td width=100 align=center id=bg1>종 료 시 점</td>
-        <td align=center id=bg1>비 고</td>
-    </tr>
-<?php
-$query = "select year,month from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
-$query = "select nation,name,color,power,gennum from nation order by power desc";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$nationcount = MYDB_num_rows($result);
-for ($i=0; $i < $nationcount; $i++) {
-    $nation = MYDB_fetch_array($result);
-
-    // 아국표시
-    if ($nation['nation'] == $me['nation']) {
-        //속령수
-        $query = "select city from city where nation='{$nation['nation']}'";
-        $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-        $citycount = MYDB_num_rows($result2);
-        echo "
-    <tr>
-        <td align=center style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</td>
-        <td align=center>{$nation['power']}</td>
-        <td align=center>{$nation['gennum']}</td>
-        <td align=center>$citycount</td>
-        <td align=center>-</td>
-        <td align=center>-</td>
-        <td align=center>-</td>
-        <td align=left style=font-size:7px;>-</td>
-    </tr>";
-
-        continue;
-    }
-
-    $query = "select state,term,fixed,reserved,showing from diplomacy where me='{$me['nation']}' and you='{$nation['nation']}'";
-    $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $dip = MYDB_fetch_array($result2);
-
-    $query = "select reserved,showing from diplomacy where you='{$me['nation']}' and me='{$nation['nation']}'";
-    $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $dip2 = MYDB_fetch_array($result2);
-    //속령수
-    $query = "select city from city where nation='{$nation['nation']}'";
-    $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $citycount = MYDB_num_rows($result2);
-    switch ($dip['state']) {
-        case 0: $state = "<font color=red>교 전</font>"; break;
-        case 1: $state = "<font color=magenta>선포중</font>"; break;
-        case 2: $state = "통 상"; break;
-        case 3: $state = "<font color=cyan>통합수락중</font>"; break;
-        case 4: $state = "<font color=cyan>통합제의중</font>"; break;
-        case 5: $state = "<font color=cyan>합병수락중</font>"; break;
-        case 6: $state = "<font color=cyan>합병제의중</font>"; break;
-        case 7: $state = "<font color=green>불가침</font>"; break;
-    }
-
-    $term = $admin['year'] * 12 + $admin['month'] + $dip['term'];
-    $year = intdiv($term, 12);
-    $month = $term % 12;
-
-    if ($month == 0) {
-        $month = 12;
-        $year--;
-    }
-
-    $date = date('Y-m-d H:i:s');
-    $note = "";
-    if ($dip['fixed'] != "") {
-        if ($dip['state'] == 7) {
-            $note .= $dip['fixed'];
-        } else {
-            $note .= "<font color=gray>{$dip['fixed']}</font>";
-        }
-        if ($dip['reserved'] != "" || $dip2['reserved'] != "") {
-            $note .= "<br>";
-        }
-    }
-    if ($dip['showing'] >= $date) {
-        if ($dip['reserved'] != "") {
-            $note .= "<font color=skyblue>아국측 제의</font>: ".$dip['reserved'];
-            if ($dip2['reserved'] != "") {
-                $note .= "<br>";
-            }
-        }
-    }
-    if ($dip2['showing'] >= $date) {
-        if ($dip2['reserved'] != "") {
-            $note .= "<font color=limegreen>상대측 제의</font>: ".$dip2['reserved'];
-        }
-    }
-    if ($note == "") {
-        $note = "&nbsp;";
-    }
-
-    echo "
-    <tr>
-        <td align=center style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</td>
-        <td align=center>{$nation['power']}</td>
-        <td align=center>{$nation['gennum']}</td>
-        <td align=center>$citycount</td>
-        <td align=center>$state</td>";
-    if ($dip['term'] != 0) {
-        echo"
-        <td align=center>{$dip['term']} 개월</td>
-        <td align=center>{$year}年 {$month}月</td>";
-    } else {
-        echo"
-        <td align=center>-</td>
-        <td align=center>-</td>";
-    }
-    echo "
-        <td align=left style=font-size:7px;>{$note}</td>
-    </tr>";
-}
-echo "
-</table>
-";
-
-$query = "select nation,name,color,type,msg,gold,rice,bill,rate,scout,war,scoutmsg,secretlimit from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$nation = MYDB_fetch_array($result);
-
-$query = "select gold_rate,rice_rate from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-// 금 수지
-$deadIncome = getDeadIncome($nation['nation'], $nation['type'], $admin['gold_rate']);
-
-$goldincomeList  = getGoldIncome($nation['nation'], $nation['rate'], $admin['gold_rate'], $nation['type']);
-$goldincome  = $goldincomeList[0] + $goldincomeList[1] + $deadIncome;
-$goldoutcome = getGoldOutcome($nation['nation'], $nation['bill']);
-$riceincomeList = getRiceIncome($nation['nation'], $nation['rate'], $admin['rice_rate'], $nation['type']);
-$riceincome  = $riceincomeList[0] + $riceincomeList[1];
-$riceoutcome = getRiceOutcome($nation['nation'], $nation['bill']);
-
-
-$budgetgold = $nation['gold'] + $goldincome - $goldoutcome + $deadIncome;
-$budgetrice = $nation['rice'] + $riceincome - $riceoutcome;
-$budgetgolddiff = $goldincome - $goldoutcome + $deadIncome;
-$budgetricediff = $riceincome - $riceoutcome;
-if ($budgetgolddiff > 0) {
-    $budgetgolddiff = "+{$budgetgolddiff}";
-} else {
-    $budgetgolddiff = "$budgetgolddiff";
-}
-if ($budgetricediff > 0) {
-    $budgetricediff = "+{$budgetricediff}";
-} else {
-    $budgetricediff = "$budgetricediff";
-}
-
-?>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<form name=form1 method=post action=c_dipcenter.php>
-    <tr><td colspan=2 height=10></td></tr>
-    <tr><td colspan=2 align=center bgcolor=orange>국 가 방 침 &amp; 임관 권유 메세지</td></tr>
-    <tr><td colspan=2 id=bg1>국가 방침 <input type=text <?=$read?> maxlength=500 style=color:white;background-color:black;width:830px; name=msg value='<?=$nation['msg']?>'><input type=<?=$btn?> name=btn value=국가방침></td></tr>
-    <tr><td colspan=2 id=bg1>임관 권유 <input type=text <?=$read?> maxlength=500 style=color:white;background-color:black;width:830px; name=scoutmsg value='<?=$nation['scoutmsg']?>'><input type=<?=$btn?> name=btn value=임관권유></td></tr>
-    <tr><td colspan=2>900 x 200px 넘는 크기를 점유할 시 통보없이 제한될 수 있습니다.</td></tr>
-    <tr><td colspan=2 height=10></td></tr>
-    <tr><td colspan=2 align=center bgcolor=green>예 산 &amp; 정 책</td></tr>
-    <tr>
-        <td colspan=2>
-            <table width=998 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<?php
-echo "
-                <tr>
-                    <td colspan=2 align=center id=bg1>자금 예산</td>
-                    <td colspan=2 align=center id=bg1>병량 예산</td>
-                </tr>
-                <tr>
-                    <td width=248 align=right id=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
-                    <td width=248 align=center>{$nation['gold']}</td>
-                    <td width=248 align=right id=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
-                    <td width=248 align=center>{$nation['rice']}</td>
-                </tr>
-                <tr>
-                    <td align=right id=bg1>단기수입&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$deadIncome</td>
-                    <td align=right id=bg1>둔전수입&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$riceincomeList[1]</td>
-                </tr>
-                <tr>
-                    <td align=right id=bg1>세 금&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$goldincomeList[0]</td>
-                    <td align=right id=bg1>세 곡&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$riceincomeList[0]</td>
-                </tr>
-                <tr>
-                    <td align=right id=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$goldincome / -$goldoutcome</td>
-                    <td align=right id=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$riceincome / -$riceoutcome</td>
-                </tr>
-                <tr>
-                    <td align=right id=bg1>국고 예산&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>{$budgetgold} ({$budgetgolddiff})</td>
-                    <td align=right id=bg1>병량 예산&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>{$budgetrice} ({$budgetricediff})</td>
-                </tr>";
-?>
-                <tr>
-                    <td align=right id=bg1>세율 (5 ~ 30%)&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center><input type=text <?=$read?> name=rate style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['rate']?>>% <input type=<?=$btn?> name=btn value=세율></td>
-                    <td align=right id=bg1>봉급 지급율 (20 ~ 200%)&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center><input type=text <?=$read?> name=bill style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['bill']?>>% <input type=<?=$btn?> name=btn value=지급율></td>
-                </tr>
-                <tr>
-                    <td align=right id=bg1>기밀 권한 (1 ~ 99년)&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center><input type=text <?=$read?> name=secretlimit style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['secretlimit']?>>년 <input type=<?=$btn?> name=btn value=기밀권한></td>
-                    <td align=right id=bg1>임관&전쟁 변경 가능</td>
-                    <td align=center>무제한</td>
-                </tr>
-                <tr>
-                    <td colspan=4 align=center>
-<?php
-if ($nation['scout'] == 0) {
-    echo "
-    <input type=$btn name=btn value='임관 금지'>";
-} else {
-    echo "
-    <input type=$btn name=btn value='임관 허가'>";
-}
-
-if ($nation['war'] == 0) {
-    echo "
-    <input type=$btn name=btn value='전쟁 금지'>";
-} else {
-    echo "
-    <input type=$btn name=btn value='전쟁 허가'>";
-}
-?>
-                    </td>
-                </tr>
-            </table>
-    <tr><td colspan=2>기밀 권한이란, 암행부를 열람할 수 있는 일반 장수의 최소 사관 년수를 의미합니다.</td></tr>
-    <tr><td colspan=2 height=10></td></tr>
-</form>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
@@ -1,253 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("중원정보", 1);
-
-$query = "select turnterm from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
-
-$query = "select no,nation,map from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$query = "select nation,color,name,power,gennum from nation where level>0 order by power desc";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$nationcount = MYDB_num_rows($result);
-$nationnum = [];
-$nationname = [];
-
-$nationStr = "";
-$powerStr = "";
-$genStr = "";
-$cityStr = "";
-for($i=0; $i < $nationcount; $i++) {
-    $nation = MYDB_fetch_array($result);
-
-    $query = "select city from city where nation='{$nation['nation']}'";
-    $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $citycount = MYDB_num_rows($cityresult);
-
-
-    $nationnum[] = $nation['nation'];
-    $nationname[$nation['nation']] = $nation['name'];
-
-    $nationStr .= "<font color=cyan>◆</font> <font style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</font><br>";
-    $powerStr .= "국력 {$nation['power']}<br>";
-    $genStr .= "장수 {$nation['gennum']}<br>";
-    $cityStr .= "속령 $citycount<br>";
-}
-
-$realConflict = [];
-foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE conflict!=%s', '{}') as list(
-    $cityID, 
-    $cityName, 
-    $rawConflict
-))
-{
-    $conflict = Json::decode($rawConflict);
-    if (count($conflict)<2) {
-        continue;
-    }
-
-    $sum = array_sum($conflict);
-
-    foreach ($conflict as $nationID=>$killnum) {
-        $conflict[$nationID] = ['killnum'=>$killnum];
-        $conflict[$nationID]['percent'] = round(100*$killnum / $sum, 1);
-        $conflict[$nationID]['name'] = $nationname[$nationID];
-        $conflict[$nationID]['color'] = getNationStaticInfo($nationID)['color'];
-    }
-
-    $realConflict[] = [$cityID, $cityName, $conflict];
-};
-
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<title>중원정보</title>
-<script src="../e_lib/jquery-3.2.1.min.js"></script>
-<script src="../d_shared/common_path.js"></script>
-<script src="js/common.js"></script>
-<script src="js/base_map.js"></script>
-<script src="js/map.js"></script>
-<script>
-$(function(){
-
-    reloadWorldMap({
-        neutralView:true,
-        showMe:true
-    });
-
-});
-</script>
-<link href="css/normalize.css" rel="stylesheet">
-<link href="../d_shared/common.css" rel="stylesheet">
-<link href="css/common.css" rel="stylesheet">
-<link href="css/map.css" rel="stylesheet">
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>중 원 정 보<br><?=backButton()?></td></tr>
-</table>
-<br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td colspan=<?=$nationcount+1?> align=center bgcolor=blue>외 교 현 황</td></tr>
-<?php
-echo "
-    <tr>
-        <td align=center width=108 style=background-color:".GameConst::$basecolor2.";>&nbsp;</td>";
-
-if($nationcount != 0) {
-    $width = intdiv(888, $nationcount);
-}
-
-for($i=0; $i < $nationcount; $i++) {
-    echo "
-        <td align=center width={$width} style=background-color:".getNationStaticInfo($nationnum[$i])['color'].";color:".newColor(getNationStaticInfo($nationnum[$i])['color']).";>{$nationname[$nationnum[$i]]}</td>";
-}
-echo "
-    </tr>";
-
-$state = [];
-
-for($i=0; $i < $nationcount; $i++) {
-    $query = "select you,state from diplomacy where me='$nationnum[$i]'";
-    $dipresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nationcount2 = MYDB_num_rows($dipresult);
-    for($k=0; $k < $nationcount2; $k++) {
-        $dip = MYDB_fetch_array($dipresult);
-        $state[$dip['you']] = $dip['state'];
-    }
-    echo "
-    <tr>
-        <td align=center style=background-color:".getNationStaticInfo($nationnum[$i])['color'].";color:".newColor(getNationStaticInfo($nationnum[$i])['color']).";>{$nationname[$nationnum[$i]]}</td>";
-
-    for($k=0; $k < $nationcount; $k++) {
-        if($i == $k) {
-            $str = "＼";
-        } else {
-            switch($state[$nationnum[$k]]) {
-                case 0: $str = "<font color=red>★</font>"; break;
-                case 1: $str = "<font color=magenta>▲</font>"; break;
-                case 2:
-                    if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation'] || $session->userGrade >= 5) { $str = "ㆍ"; }
-                    else { $str = "?"; }
-//                    $str = "ㆍ";
-                    break;
-                case 3: $str = "<font color=cyan>○</font>"; break;
-                case 4: $str = "<font color=cyan>○</font>"; break;
-                case 5: $str = "<font color=cyan>◎</font>"; break;
-                case 6: $str = "<font color=cyan>◎</font>"; break;
-                case 7:
-                    if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation'] || $session->userGrade >= 5) { $str = "<font color=green>@</font>"; }
-                    else { $str = "?"; }
-//                    $str = "<font color=limegreen>@</font>";
-                    break;
-            }
-        }
-
-        if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation']) { $backcolor = "style=background-color:".GameConst::$basecolor3.";"; }
-        else { $backcolor = ""; }
-
-        echo "
-        <td align=center $backcolor>$str</td>";
-    }
-    echo "
-    </tr>
-";
-}
-?>
-    <tr><td colspan=<?=$nationcount+1?> align=center>불가침 : <font color=limegreen>@</font>, 통합 : <font color=cyan>○</font>, 합병 : <font color=skyblue>◎</font>, 통상 : ㆍ, 선포 : <font color=magenta>▲</font>, 교전 : <font color=red>★</font></td></tr>
-</table>
-
-<?php if ($realConflict) : ?>
-
-<br>
-<table
-    align='center'
-    width=1000 
-    border=1 
-    cellspacing=0 
-    cellpadding=0 
-    bordercolordark='gray' 
-    bordercolorlight='black' 
-    style='font-size:13px;word-break:break-all;' 
-    class='bg0'
->
-    <tr><td colspan=2 align=center bgcolor=magenta>분 쟁 현 황</td></tr>
-    <?php foreach($realConflict as list($cityID, $cityName, $conflict)): ?>
-    <tr>
-        <td align=center width=48><?=$cityName?></td>
-        <td width=948>
-            <table 
-                border=0
-                cellspacing=0 
-                cellpadding=0
-                bordercolordark='gray'
-                bordercolorlight='black'
-                style='font-size:13px;word-break:break-all;width:100%;'
-                class='bg0'
-            >
-            <?php foreach($conflict as $item): ?>
-                <tr>
-                    <td 
-                        width=98
-                        align=right 
-                        style='color:<?=newColor($item['color'])?>;background-color:<?=$item['color']?>;'
-                    ><?=$item['name']?>&nbsp;</td>
-                    <td width=48 align=right><?=(float)$item['percent']?> %&nbsp;</td>
-                    <td width=*><div
-                        style='display:inline-block;width:<?=$item['percent']?>%;background-color:<?=$item['color']?>;'
-                    >&nbsp;</div></td>
-                </tr>
-            <?php endforeach; ?>
-            </table>
-    
-        </td>
-    </tr>
-    <?php endforeach; ?>
-    <tr><td colspan=2 height=5 id=bg1></td></tr>
-</table>
-
-<?php endif; ?> 
-
-<br>
-<table class="bg0" align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style="font-size:13px;word-break:break-all;">
-    <tr>
-        <td colspan=5 align=center bgcolor=green><font size=3>중 원 지 도</font></td>
-    </tr>
-    <tr>
-        <td width=698 height=420>
-            <?=getMapHtml()?>
-        </td>
-        <td width=98 valign=top><?=$nationStr?></td>
-        <td width=78 valign=top><?=$powerStr?></td>
-        <td width=58 valign=top><?=$genStr?></td>
-        <td width=58 valign=top><?=$cityStr?></td>
-    </tr>
-</table>
-<br>
-
-<table class="bg0" align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style="font-size:13px;word-break:break-all;">
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 include "lib.php";
@@ -9,207 +10,278 @@ if ($type <= 0 || $type > 8) {
    $type = 7;
 }

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');

-increaseRefresh("암행부", 2);
+increaseRefresh("암행부", 1);

-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
+$me = $db->queryFirstRow(
+    'SELECT no,nation,officer_level,refresh_score,turntime,belong,permission,penalty FROM `general`
+    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
+);

-$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
+$nationLevel = $db->queryFirstField('SELECT level FROM nation WHERE nation=%i', $me['nation']);

-$query = "select level,secretlimit from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$nation = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }

-if ($me['level'] == 0 || ($me['level'] == 1 && $me['belong'] < $nation['secretlimit'])) {
-    echo "수뇌부가 아니거나 사관년도가 부족합니다.";
-    exit();
+$permission = checkSecretPermission($me);
+if ($permission < 0) {
+    echo '국가에 소속되어있지 않습니다.';
+    die();
+} else if ($permission < 1) {
+    echo "권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.";
+    die();
 }

 $sel = [];
 $sel[$type] = "selected";

+$templates = new \League\Plates\Engine('templates');
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
    MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>암행부</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>

+<head>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 암행부</title>
+    <?= 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::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>

 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>암 행 부<br><?=closeButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[1]??''?> value=1>자금</option>
-            <option <?=$sel[2]??''?> value=2>군량</option>
-            <option <?=$sel[3]??''?> value=3>도시</option>
-            <option <?=$sel[4]??''?> value=4>병종</option>
-            <option <?=$sel[5]??''?> value=5>병사</option>
-            <option <?=$sel[6]??''?> value=6>삭제턴</option>
-            <option <?=$sel[7]??''?> value=7>턴</option>
-            <option <?=$sel[8]??''?> value=8>부대</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<?php
-$query = "select troop,name from troop where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$troopCount = MYDB_num_rows($result);
-$troopName = [];
-for ($i=0; $i < $troopCount; $i++) {
-    $troop = MYDB_fetch_array($result);
-    $troopName[$troop['troop']] = $troop['name'];
-}
-
-switch ($type) {
-    case 1: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by gold desc"; break;
-    case 2: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by rice desc"; break;
-    case 3: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by city"; break;
-    case 4: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by crewtype desc"; break;
-    case 5: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by crew desc"; break;
-    case 6: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by killturn"; break;
-    case 7: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by turntime"; break;
-    case 8: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by troop desc"; break;
-}
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$gencount = MYDB_num_rows($genresult);
-
-echo"
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=98 align=center id=bg1>이 름</td>
-        <td width=98 align=center id=bg1>통무지</td>
-        <td width=98 align=center id=bg1>부 대</td>
-        <td width=58 align=center id=bg1>자 금</td>
-        <td width=58 align=center id=bg1>군 량</td>
-        <td width=48 align=center id=bg1>도시</td>
-        <td width=28 align=center id=bg1>守</td>
-        <td width=58 align=center id=bg1>병 종</td>
-        <td width=68 align=center id=bg1>병 사</td>
-        <td width=48 align=center id=bg1>훈련</td>
-        <td width=48 align=center id=bg1>사기</td>
-        <td width=148 align=center id=bg1>명 령</td>
-        <td width=58 align=center id=bg1>삭턴</td>
-        <td width=58 align=center id=bg1>턴</td>
-    </tr>";
-for ($j=0; $j < $gencount; $j++) {
-    $general = MYDB_fetch_array($genresult);
-    $city = CityConst::byID($general['city'])->name;
-    $troop = $troopName[$general['troop']]??'-';
-
-    if ($general['level'] == 12) {
-        $lbonus = $nation['level'] * 2;
-    } elseif ($general['level'] >= 5) {
-        $lbonus = $nation['level'];
-    } else {
-        $lbonus = 0;
-    }
-    if ($lbonus > 0) {
-        $lbonus = "<font color=cyan>+{$lbonus}</font>";
-    } else {
-        $lbonus = "";
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>암 행 부<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=get>정렬순서 :
+                    <select name=type size=1>
+                        <option <?= $sel[1] ?? '' ?> value=1>자금</option>
+                        <option <?= $sel[2] ?? '' ?> value=2>군량</option>
+                        <option <?= $sel[3] ?? '' ?> value=3>도시</option>
+                        <option <?= $sel[4] ?? '' ?> value=4>병종</option>
+                        <option <?= $sel[5] ?? '' ?> value=5>병사</option>
+                        <option <?= $sel[6] ?? '' ?> value=6>삭제턴</option>
+                        <option <?= $sel[7] ?? '' ?> value=7>턴</option>
+                        <option <?= $sel[8] ?? '' ?> value=8>부대</option>
+                    </select>
+                    <input type=submit value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <?php
+    $troopName = [];
+    foreach ($db->queryAllLists('SELECT troop_leader, name FROM troop WHERE nation=%i', $me['nation']) as [$troopID, $tName]) {
+        $troopName[$troopID] = $tName;
    }

-    if ($general['injury'] > 0) {
-        $leader = intdiv($general['leader'] * (100 - $general['injury']), 100);
-        $power = intdiv($general['power'] * (100 - $general['injury']), 100);
-        $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leader = "<font color=red>{$leader}</font>{$lbonus}";
-        $power = "<font color=red>{$power}</font>";
-        $intel = "<font color=red>{$intel}</font>";
-    } else {
-        $leader = "{$general['leader']}{$lbonus}";
-        $power = "{$general['power']}";
-        $intel = "{$general['intel']}";
+    $orderSQL = '';
+    switch ($type) {
+        case 1:
+            $orderSQL = "order by gold desc";
+            break;
+        case 2:
+            $orderSQL = "order by rice desc";
+            break;
+        case 3:
+            $orderSQL = "order by city";
+            break;
+        case 4:
+            $orderSQL = "order by crewtype desc";
+            break;
+        case 5:
+            $orderSQL = "order by crew desc";
+            break;
+        case 6:
+            $orderSQL = "order by killturn";
+            break;
+        case 7:
+            $orderSQL = "order by turntime";
+            break;
+        case 8:
+            $orderSQL = "order by troop desc";
+            break;
    }

-    if ($general['npc'] >= 2) {
-        $name = "<font color=cyan>{$general['name']}</font>";
-    } elseif ($general['npc'] == 1) {
-        $name = "<font color=skyblue>{$general['name']}</font>";
-    } else {
-        $name =  "{$general['name']}";
+    $generals = $db->query(
+        'SELECT npc,defence_train,no,officer_level,troop,city,injury,leadership,strength,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,nation from general WHERE nation = %i %l',
+        $me['nation'],
+        $orderSQL
+    );
+
+    $generalTurnList = [];
+
+    foreach ($db->queryAllLists(
+        'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
+        array_column($generals, 'no')
+    ) as [$generalID, $turnIdx, $brief]) {
+        if (!key_exists($generalID, $generalTurnList)) {
+            $generalTurnList[$generalID] = [];
+        }
+        $generalTurnList[$generalID][$turnIdx] = $brief;
    }

-    switch ($general['mode']) {
-    case 0: $mode = "×"; break;
-    case 1: $mode = "○"; break;
-    case 2: $mode = "◎"; break;
-    }
+    $genCntEff = 0;
+    foreach ($generals as &$general) {
+        $general['cityText'] = CityConst::byID($general['city'])->name;
+        $general['troopText'] = $troopName[$general['troop']] ?? '-';

-    echo "
-    <tr>
-        <td align=center>$name<br>Lv ".getExpLevel($general['experience'])."</td>
-        <td align=center>{$leader}∥{$power}∥{$intel}</td>
-        <td align=center>$troop</td>
-        <td align=center>{$general['gold']}</td>
-        <td align=center>{$general['rice']}</td>
-        <td align=center>$city</td>
-        <td align=center>$mode</td>
-        <td align=center>".GameUnitConst::byId($general['crewtype'])->name."</td>
-        <td align=center>{$general['crew']}</td>
-        <td align=center>{$general['train']}</td>
-        <td align=center>{$general['atmos']}</td>";
-    if ($general['npc'] >= 2) {
-        echo "
-        <td>
-            <font size=3>NPC 장수";
-    } else {
-        echo "
-        <td>
-            <font size=1>";
-        $turn = getTurn($general, 1, 0);
+        if ($general['npc'] != 5) {
+            $genCntEff += 1;
+        }

-        for ($i=0; $i < 5; $i++) {
-            $turn[$i] = StringUtil::subStringForWidth($turn[$i], 0, 20);
-            $k = $i+1;
-            echo "
-                &nbsp;$k : $turn[$i]  <br>";
+        $lbonus = calcLeadershipBonus($general['officer_level'], $nationLevel);
+        if ($lbonus > 0) {
+            $lbonusText = "<font color=cyan>+{$lbonus}</font>";
+        } else {
+            $lbonusText = "";
+        }
+        $general['lbonus'] = $lbonus;
+        $general['lbonusText'] = $lbonusText;
+
+        if ($general['injury'] > 0) {
+            $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100);
+            $strength = intdiv($general['strength'] * (100 - $general['injury']), 100);
+            $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
+            $leadership = "<font color=red>{$leadership}</font>{$lbonusText}";
+            $strength = "<font color=red>{$strength}</font>";
+            $intel = "<font color=red>{$intel}</font>";
+        } else {
+            $leadership = "{$general['leadership']}{$lbonusText}";
+            $strength = "{$general['strength']}";
+            $intel = "{$general['intel']}";
+        }
+
+        $general['leadershipText'] = $leadership;
+        $general['strengthText'] = $strength;
+        $general['intelText'] = $intel;
+
+        $general['expLevelText'] = getExpLevel($general['experience']);
+
+        $general['nameText'] = formatName($general['name'], $general['npc']);
+
+        $general['modeText'] = formatDefenceTrain($general['defence_train']);
+        $general['crewtypeText'] = GameUnitConst::byId($general['crewtype'])->name ?? '-';
+
+
+        if ($general['npc'] < 2) {
+            $turntext = [];
+            foreach ($generalTurnList[$general['no']] as $turnRawIdx => $turn) {
+                $turn = StringUtil::subStringForWidth($turn, 0, 41);
+                $turnIdx = $turnRawIdx + 1;
+                $turntext[] = "&nbsp;$turnIdx : $turn";
+            }
+            $general['turntext'] = join("<br>\n", $turntext);
        }
    }
-    echo "
-            </font>
-        </td>
-        <td align=center>{$general['killturn']}</td>
-        <td align=center>".substr($general['turntime'], 14, 5)."</td>
-    </tr>";
-}
-echo "
-</table>
-";
+    unset($general);

-?>
+    $genCnt = countPureGeneralFromRawList($generals);
+    $totalGold = 0;
+    $totalRice = 0;
+    $crew90 = 0;
+    $gen90 = 0;
+    $crew80 = 0;
+    $gen80 = 0;
+    $crew60 = 0;
+    $gen60 = 0;
+    $crewTotal = 0;
+    //$genTotal = 0;
+    foreach ($generals as $general) {
+        if ($general['npc'] == 5) {
+            continue;
+        }
+        $totalGold += $general['gold'];
+        $totalRice += $general['rice'];

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+        $crewTotal += $general['crew'];
+
+        if ($general['crew'] == 0) {
+            continue;
+        }
+        if ($general['train'] >= 90 && $general['atmos'] >= 90) {
+            $crew90 += $general['crew'];
+            $gen90 += 1;
+        }
+
+        if ($general['train'] >= 80 && $general['atmos'] >= 80) {
+            $crew80 += $general['crew'];
+            $gen80 += 1;
+        }
+
+        if ($general['train'] >= 60 && $general['atmos'] >= 60) {
+            $crew60 += $general['crew'];
+            $gen60 += 1;
+        }
+    }
+    ?>
+
+    <table style='width:1000px;margin:5px auto' class='tb_layout bg0'>
+        <thead>
+            <colgroup>
+                <col style="width:120px;">
+                <col>
+                <col style="width:120px;">
+                <col>
+                <col style="width:120px;">
+                <col>
+                <col style="width:120px;">
+                <col>
+            </colgroup>
+        </thead>
+        <tbody>
+            <tr>
+                <td class='bg1'>전체 금</td>
+                <td><?= number_format($totalGold) ?></td>
+                <td class='bg1'>전체 쌀</td>
+                <td><?= number_format($totalRice) ?></td>
+                <td class='bg1'>평균 금</td>
+                <td><?= number_format($totalGold / $genCntEff, 2) ?></td>
+                <td class='bg1'>평균 쌀</td>
+                <td><?= number_format($totalRice / $genCntEff, 2) ?></td>
+            </tr>
+            <tr>
+                <td class='bg1'>전체 병력/장수</td>
+                <td><?= number_format($crewTotal) ?>/<?= number_format($genCntEff) ?></td>
+                <td class='bg1'>훈사 90 병력/장수</td>
+                <td><?= number_format($crew90) ?>/<?= number_format($gen90) ?></td>
+                <td class='bg1'>훈사 80 병력/장수</td>
+                <td><?= number_format($crew80) ?>/<?= number_format($gen80) ?></td>
+                <td class='bg1'>훈사 60 병력/장수</td>
+                <td><?= number_format($crew60) ?>/<?= number_format($gen60) ?></td>
+            </tr>
+        </tbody>
+    </table>
+
+    <?= $templates->render('generalList', ['generals' => $generals]) ?>
+
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>
@@ -1,509 +1,568 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("인사부", 1);
-//훼섭 추방을 위해 갱신
-checkTurn();
-
-$query = "select no,nation,level from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$meLevel = $me['level'];
-if($meLevel == 0) {
-    echo "재야입니다.";
-    exit();
-}
-
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>인사부</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-<script type="text/javascript">
-function out() {
-    return confirm('정말 추방하시겠습니까?');
-}
-</script>
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>인 사 부<br><?=backButton()?></td></tr>
-</table>
-<br>
-
-<?php
-
-$query = "select nation,name,level,color,l12set,l11set,l10set,l9set,l8set,l7set,l6set,l5set from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$nation = MYDB_fetch_array($result);   //국가정보
-
-$lv = getNationChiefLevel($nation['level']);
-if($meLevel >= 5) { $btn = "submit"; }
-else { $btn = "hidden"; }
-
-$query = "select name,level,picture,imgsvr,belong from general where nation='{$nation['nation']}' and level>={$lv} order by level desc";
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$level = [];
-for($i=12; $i >= $lv; $i--) {
-    $levels = MYDB_fetch_array($genresult);
-    $level[$levels['level']] = $levels;
-}
-
-$query = "select name,picture,killnum from general where nation='{$nation['nation']}' order by killnum desc limit 5";   // 오호장군
-$tigerresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-$query = "select name,picture,firenum from general where nation='{$nation['nation']}' order by firenum desc limit 7";   // 건안칠자
-$eagleresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']} colspan=6>
-            <font size=5>【 {$nation['name']} 】</font>
-        </td>
-    </tr>
-";
-for($i=12; $i >= $lv; $i-=2) {
-    $i1 = $i;   $i2 = $i - 1;
-    $imageTemp1 = GetImageURL($level[$i1]['imgsvr']??0);
-    $imageTemp2 = GetImageURL($level[$i2]['imgsvr']??0);
-    ?>
-    <tr>
-        <td width=98 align=center id=bg1><font size=4><?=getLevel($i1, $nation['level'])?></font></td>
-        <td width=64 height=64 style='background:no-repeat center url("<?=$imageTemp1?>/<?=$level[$i1]['picture']??'default.jpg'?>");background-size:64px;'></td>
-        <td width=332><font size=4><?=$level[$i1]['name']??'-'?>(<?=$level[$i1]['belong']??'-'?>년)</font></td>
-        <td width=98 align=center id=bg1><font size=4><?=getLevel($i2, $nation['level'])?></font></td>
-        <td width=64 height=64 style='background:no-repeat center url("<?=$imageTemp2?>/<?=$level[$i2]['picture']??'default.jpg'?>");background-size:64px;'></td>
-        <td width=332><font size=4><?=$level[$i2]['name']??'-'?>(<?=$level[$i2]['belong']??'-'?>년)</font></td>
-    </tr>
-    <?php
-}
-
-echo "
-    <tr>
-        <td width=98 align=center id=bg1>오호장군【승전】</td>
-        <td colspan=5>
-";
-
-$tigernum = MYDB_num_rows($tigerresult);
-for($i=0; $i < $tigernum; $i++) {
-    $tiger = MYDB_fetch_array($tigerresult);
-
-    if($tiger['killnum'] > 0) {
-        echo "{$tiger['name']}【{$tiger['killnum']}】, ";
-    }
-}
-
-echo "
-        </td>
-    </tr>
-    <tr>
-        <td width=98 align=center id=bg1>건안칠자【계략】</td>
-        <td colspan=5>
-";
-
-$eaglenum = MYDB_num_rows($eagleresult);
-for($i=0; $i < $eaglenum; $i++) {
-    $eagle = MYDB_fetch_array($eagleresult);
-
-    if($eagle['firenum'] > 0) {
-        echo "{$eagle['name']}【{$eagle['firenum']}】, ";
-    }
-}
-
-echo "
-        </td>
-    </tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<form method=post action=c_myBossInfo.php>
-    <tr><td colspan=6 height=5></td></tr>
-    <tr><td colspan=2 align=center bgcolor=red>추 방</td></tr>
-    <tr>
-        <td width=498 align=right id=bg1>대상 장수</td>
-        <td width=498>
-";
-
-if($meLevel >= 5 && $nation["l{$meLevel}set"] == 0) {
-    echo "
-            <select name=outlist size=1 style=color:white;background-color:black;>";
-
-    $query = "select no,name,level from general where nation='{$me['nation']}' and level!='12' and no!='{$me['no']}' order by npc,binary(name)";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gencount = MYDB_num_rows($result);
-
-    for($i=0; $i < $gencount; $i++) {
-        $general = MYDB_fetch_array($result);
-        echo "
-                <option value={$general['no']}>{$general['name']}</option>";
-    }
-
-    echo "
-            </select>
-            <input type=$btn name=btn value=추방 onclick='return out()'>";
-}
-
-$query = "select name,city from general where nation='{$me['nation']}' and level=12";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$general = MYDB_fetch_array($result);
-echo "
-        </td>
-    </tr>
-</form>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td colspan=4 height=5></td></tr>
-    <tr><td colspan=4 align=center bgcolor=blue>수 뇌 부 임 명</td></tr>
-    <tr>
-        <td width=98  align=right id=bg1>".getLevel(12, $nation['level'])."</td>
-        <td width=398>{$general['name']} 【".CityConst::byID($general['city'])->name."】</td>
-        <td width=98  align=right id=bg1>".getLevel(11, $nation['level'])."</td>
-<form method=post action=c_myBossInfo.php>
-        <td width=398>
-";
-
-if($meLevel >= 5 && $nation['l11set'] == 0) {
-    echo "
-            <select name=genlist size=1 maxlength=15 style=color:white;background-color:black;>
-                <option value=0>____공석____</option>";
-    $query = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' order by npc,binary(name)";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gencount = MYDB_num_rows($result);
-
-    for($i=0; $i < $gencount; $i++) {
-        $general = MYDB_fetch_array($result);
-        if($general['level'] == 11) {
-            echo "<option style=color:red; selected value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } elseif($general['level'] > 1) {
-            echo "<option style=color:orange; value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } else {
-            echo "<option value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        }
-    }
-
-    echo "
-            </select>
-            <input type=hidden name=level value=11>
-            <input type=$btn name=btn value=임명>";
-} else {
-    $query = "select name,city from general where nation='{$me['nation']}' and level='11'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
-    echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
-}
-echo "
-        </td>
-</form>
-    </tr>
-";
-
-$queries = [];
-$queries[10] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and power>='".GameConst::$goodgenpower."' order by npc,binary(name)";
-$queries[9]  = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and intel>='".GameConst::$goodgenintel."' order by npc,binary(name)";
-$queries[8]  = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and power>='".GameConst::$goodgenpower."' order by npc,binary(name)";
-$queries[7]  = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and intel>='".GameConst::$goodgenintel."' order by npc,binary(name)";
-$queries[6]  = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and power>='".GameConst::$goodgenpower."' order by npc,binary(name)";
-$queries[5]  = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and intel>='".GameConst::$goodgenintel."' order by npc,binary(name)";
-
-for($i=10; $i >= $lv; $i--) {
-    if($i % 2 == 0) { echo "<tr>"; }
-    echo "
-        <td width=98 align=right id=bg1>".getLevel($i, $nation['level'])."</td>
-<form method=post action=c_myBossInfo.php>
-        <td width=398>
-    ";
-
-    if($meLevel >= 5 && $nation["l{$i}set"] == 0) {
-        echo "
-            <select name=genlist size=1 style=color:white;background-color:black;>
-                <option value=0>____공석____</option>";
-
-        $query = $queries[$i];
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $gencount = MYDB_num_rows($result);
-
-        for($k=0; $k < $gencount; $k++) {
-            $general = MYDB_fetch_array($result);
-            if($general['level'] == $i) {
-                echo "<option style=color:red; selected value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-            } elseif($general['level'] > 1) {
-                echo "<option style=color:orange; value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-            } else {
-                echo "<option value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-            }
-        }
-
-        echo "
-            </select>
-            <input type=hidden name=level value={$i}>
-            <input type=$btn name=btn value=임명>";
-    } else {
-        $query = "select name,city from general where nation='{$me['nation']}' and level={$i}";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $general = MYDB_fetch_array($result);
-        echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
-    }
-    echo "</td></form>";
-    if($i % 2 == 1) { echo "</tr>"; }
-}
-echo "
-    <tr><td colspan=4>※ <font color=red>빨간색</font>은 현재 임명중인 장수, <font color=orange>노란색</font>은 다른 관직에 임명된 장수, 하얀색은 일반 장수를 뜻합니다.</td></tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td colspan=5 height=5></td></tr>
-";
-if($meLevel >= 5) {
-    echo "
-    <tr><td colspan=5 align=center bgcolor=orange>도 시 관 직 임 명</td></tr>
-<form method=post action=c_myBossInfo.php>
-    <tr>
-        <td colspan=3 align=right id=bg2>태 수 임 명</td>
-        <td colspan=2>
-            <select name=citylist size=1 style=color:white;background-color:black;>
-    ";
-
-    $query = "select city,name,region from city where nation='{$nation['nation']}' and gen1set=0 order by region,level desc,binary(name)"; // 도시 이름 목록
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $citycount = MYDB_num_rows($result);
-
-    $region = 0;
-    for($i=0; $i < $citycount; $i++) {
-        $city = MYDB_fetch_array($result);
-
-        if($region != $city['region']) {
-            if($region != 0) {
-                echo "</optgroup>";
-            }
-            echo "<optgroup label=' 【 ".CityConst::$regionMap[$city['region']]." 】 ' style=color:skyblue;>";
-            $region = $city['region'];
-        }
-
-        echo "<option value='{$city['city']}' style=color:white;>{$city['name']}</option>";
-    }
-    echo "</optgroup>";
-
-    echo "
-            </select>
-            <select name=genlist size=1 style=color:white;background-color:black;>
-                <option value=0>____공석____</option>
-    ";
-
-    $query = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and power>='".GameConst::$goodgenpower."' order by npc,binary(name)";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $count = MYDB_num_rows($result);
-    for($i=0; $i < $count; $i++) {
-        $general = MYDB_fetch_array($result);
-        if($general['level'] == 4) {
-            echo "<option style=color:red; value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } elseif($general['level'] > 1) {
-            echo "<option style=color:orange; value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } else {
-            echo "<option value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        }
-    }
-
-    echo "
-            </select>
-            <input type=hidden name=level value=4>
-            <input type=$btn name=btn value=임명>
-        </td>
-    </tr>
-</form>
-<form method=post action=c_myBossInfo.php>
-    <tr>
-        <td colspan=3 align=right id=bg2>군 사 임 명</td>
-        <td colspan=2>
-            <select name=citylist size=1 style=color:white;background-color:black;>
-    ";
-
-    $query = "select city,name,region from city where nation='{$nation['nation']}' and gen2set=0 order by region,level desc,binary(name)"; // 도시 이름 목록
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $citycount = MYDB_num_rows($result);
-
-    $region = 0;
-    for($i=0; $i < $citycount; $i++) {
-        $city = MYDB_fetch_array($result);
-
-        if($region != $city['region']) {
-            if($region != 0) {
-                echo "</optgroup>";
-            }
-            echo "<optgroup label=' 【 ".CityConst::$regionMap[$city['region']]." 】 ' style=color:skyblue;>";
-            $region = $city['region'];
-        }
-
-        echo "<option value='{$city['city']}' style=color:white;>{$city['name']}</option>";
-    }
-    echo "</optgroup>";
-
-    echo "
-            </select>
-            <select name=genlist size=1 style=color:white;background-color:black;>
-                <option value=0>____공석____</option>
-    ";
-
-    $query = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and intel>='".GameConst::$goodgenintel."' order by npc,binary(name)";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $count = MYDB_num_rows($result);
-    for($i=0; $i < $count; $i++) {
-        $general = MYDB_fetch_array($result);
-        if($general['level'] == 3) {
-            echo "<option style=color:red; value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } elseif($general['level'] > 1) {
-            echo "<option style=color:orange; value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } else {
-            echo "<option value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        }
-    }
-
-    echo "
-            </select>
-            <input type=hidden name=level value=3>
-            <input type=$btn name=btn value=임명>
-        </td>
-    </tr>
-</form>
-<form method=post action=c_myBossInfo.php>
-    <tr>
-        <td colspan=3 align=right id=bg2>시 중 임 명</td>
-        <td colspan=2>
-            <select name=citylist size=1 style=color:white;background-color:black;>
-    ";
-
-    $query = "select city,name,region from city where nation='{$nation['nation']}' and gen3set=0 order by region, level desc,binary(name)"; // 도시 이름 목록
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $citycount = MYDB_num_rows($result);
-
-    $region = 0;
-    for($i=0; $i < $citycount; $i++) {
-        $city = MYDB_fetch_array($result);
-
-        if($region != $city['region']) {
-            if($region != 0) {
-                echo "</optgroup>";
-            }
-            echo "<optgroup label=' 【 ".CityConst::$regionMap[$city['region']]." 】 ' style=color:skyblue;>";
-            $region = $city['region'];
-        }
-
-        echo "<option value='{$city['city']}' style=color:white;>{$city['name']}</option>";
-    }
-    echo "</optgroup>";
-
-    echo "
-            </select>
-            <select name=genlist size=1 style=color:white;background-color:black;>
-                <option value=0>____공석____</option>
-    ";
-
-    $query = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' order by npc,binary(name)";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $count = MYDB_num_rows($result);
-    for($i=0; $i < $count; $i++) {
-        $general = MYDB_fetch_array($result);
-        if($general['level'] == 2) {
-            echo "<option style=color:red; value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } elseif($general['level'] > 1) {
-            echo "<option style=color:orange; value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } else {
-            echo "<option value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        }
-    }
-
-    echo "
-            </select>
-            <input type=hidden name=level value=2>
-            <input type=$btn name=btn value=임명>
-        </td>
-    </tr>
-    <tr><td colspan=5>※ <font color=red>빨간색</font>은 현재 임명중인 장수, <font color=orange>노란색</font>은 다른 관직에 임명된 장수, 하얀색은 일반 장수를 뜻합니다.</td></tr>
-</form>
-    ";
-}
-echo "
-    <tr>
-        <td width=158 align=center id=bg1 colspan=2><font size=4>도 시</font></td>
-        <td width=278 align=center id=bg1><font size=4>태 수 (사관) 【현재도시】</font></td>
-        <td width=278 align=center id=bg1><font size=4>군 사 (사관) 【현재도시】</font></td>
-        <td width=278 align=center id=bg1><font size=4>시 중 (사관) 【현재도시】</font></td>
-    </tr>
-";
-
-$citylevel = [];
-$citylevel[1] = "수";
-$citylevel[2] = "진";
-$citylevel[3] = "관";
-$citylevel[4] = "이";
-$citylevel[5] = "소";
-$citylevel[6] = "중";
-$citylevel[7] = "대";
-$citylevel[8] = "특";
-
-$query = "select city,name,gen1,gen2,gen3,level,region,gen1set,gen2set,gen3set from city where nation='{$nation['nation']}' order by region,level desc,binary(name)"; // 도시 이름 목록
-$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$citycount = MYDB_num_rows($cityresult);
-
-$region = 0;
-for($j=0; $j < $citycount; $j++) {
-    $city = MYDB_fetch_array($cityresult);
-
-    $query = "select name,belong,city from general where no='{$city['gen1']}'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gen1 = MYDB_fetch_array($genresult);
-    $query = "select name,belong,city from general where no='{$city['gen2']}'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gen2 = MYDB_fetch_array($genresult);
-    $query = "select name,belong,city from general where no='{$city['gen3']}'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gen3 = MYDB_fetch_array($genresult);
-
-    if($region != $city['region']) {
-        echo "
-    <tr><td colspan=5 height=3 id=bg1></td></tr>
-    <tr><td colspan=5 id=bg1><font size=4 color=skyblue> 【 ".CityConst::$regionMap[$city['region']]." 】 </font></td></tr>";
-        $region = $city['region'];
-    }
-
-    $gen1['name'] = $gen1['name']==""?"-":$gen1['name']." ({$gen1['belong']}년) 【".CityConst::byID($gen1['city'])->name."】";
-    $gen2['name'] = $gen2['name']==""?"-":$gen2['name']." ({$gen2['belong']}년) 【".CityConst::byID($gen2['city'])->name."】";
-    $gen3['name'] = $gen3['name']==""?"-":$gen3['name']." ({$gen3['belong']}년) 【".CityConst::byID($gen3['city'])->name."】";
-    if($city['gen1set'] == 1) { $gen1['name'] = "<font color=orange>".$gen1['name']."</font>"; }
-    if($city['gen2set'] == 1) { $gen2['name'] = "<font color=orange>".$gen2['name']."</font>"; }
-    if($city['gen3set'] == 1) { $gen3['name'] = "<font color=orange>".$gen3['name']."</font>"; }
-    echo "
-    <tr>
-        <td width=78 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}><font size=3>【{$citylevel[$city['level']]}】</font></td>
-        <td width=78 align=right  style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}><font size=3>{$city['name']}&nbsp;&nbsp;</font></td>
-        <td align=center>{$gen1['name']}</td>
-        <td align=center>{$gen2['name']}</td>
-        <td align=center>{$gen3['name']}</td>
-    </tr>
-    ";
-}
-?>
-    <tr><td colspan=5>※ <font color=orange>노란색</font>은 변경 불가능, 하얀색은 변경 가능 관직입니다.</td></tr>
-</table>
-<br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
+<?php
+
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+
+increaseRefresh("인사부", 1);
+//훼섭 추방을 위해 갱신
+TurnExecutionHelper::executeAllCommand();
+
+$me = $db->queryFirstRow('SELECT no,nation,officer_level from general where owner=%i', $userID);
+$nationID = $me['nation'];
+
+$meLevel = $me['officer_level'];
+if ($meLevel == 0) {
+    echo "재야입니다.";
+    exit();
+}
+
+$nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nation where nation=%i', $nationID); //국가정보
+
+if ($meLevel >= 5) {
+    $candidateStrength = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and strength>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
+    $candidateIntel = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and intel>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
+    $candidateAny = $db->query('SELECT no,name,officer_level,city,npc,leadership,strength,intel,killturn from general where nation=%i and officer_level!=12  order by npc,binary(name)', $nationID); //추방 때문에 조금 더 김
+} else {
+    $candidateStrength = [];
+    $candidateIntel = [];
+    $candidateAny = [];
+}
+
+
+?>
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 인사부</title>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../e_lib/select2/select2.min.css') ?>
+    <?= WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css') ?>
+    <?= 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" />
+    <script type="text/javascript">
+        var chiefStatMin = <?= GameConst::$chiefStatMin ?>;
+        var myLevel = <?= $meLevel ?>;
+    </script>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common', 'bossInfo']) ?>
+
+    <?php
+
+    $ambassadors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'ambassador\' AND nation = %i', $nationID);
+    $auditors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'auditor\' AND nation = %i', $nationID);
+    $candidateAmbassadors = [];
+    $candidateAuditors = [];
+    foreach ($ambassadors as $ambassador) {
+        $candidateAmbassadors[] = $ambassador;
+    }
+    foreach ($auditors as $auditor) {
+        $candidateAuditors[] = $auditor;
+    }
+    foreach ($db->query('SELECT no, name, nation, officer_level, penalty, permission FROM general WHERE nation = %i AND permission = \'normal\' AND officer_level != 12', $nationID) as $candidate) {
+        $maxPermission = checkSecretMaxPermission($candidate);
+        if ($maxPermission == 4) {
+            $candidateAmbassadors[] = $candidate;
+        }
+        if ($maxPermission >= 3) {
+            $candidateAuditors[] = $candidate;
+        }
+    }
+
+    ?>
+    <script>
+        var candidateAmbassadors = <?= Json::encode(array_map(function ($value) {
+                                        return [
+                                            'id' => $value['no'],
+                                            'text' => $value['name'],
+                                            "selected" => ($value['permission'] != 'normal')
+                                        ];
+                                    }, $candidateAmbassadors)) ?>;
+
+        var candidateAuditors = <?= Json::encode(array_map(function ($value) {
+                                    return [
+                                        'id' => $value['no'],
+                                        'text' => $value['name'],
+                                        "selected" => ($value['permission'] != 'normal')
+                                    ];
+                                }, $candidateAuditors)) ?>;
+    </script>
+
+</head>
+
+<body>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>인 사 부<br><?= backButton() ?></td>
+        </tr>
+    </table>
+    <br>
+
+    <?php
+
+    $lv = getNationChiefLevel($nation['level']);
+    if ($meLevel >= 5) {
+        $btn = "button";
+    } else {
+        $btn = "hidden";
+    }
+
+    $level = Util::convertArrayToDict(
+        $db->query(
+            'SELECT name,officer_level,city,picture,imgsvr,belong from general where nation=%i and officer_level>=%i order by officer_level desc',
+            $nationID,
+            $lv
+        ),
+        'officer_level'
+    );
+
+
+    $tigers = $db->query(
+        'SELECT value, name
+    FROM rank_data LEFT JOIN general ON rank_data.general_id = general.no
+    WHERE rank_data.nation_id = %i AND rank_data.type = "killnum" AND value > 0 ORDER BY value DESC LIMIT 5',
+        $nationID
+    ); // 오호장군
+    $tigerstr = join(', ', array_map(function ($arr) {
+        $number = number_format($arr['value']);
+        return "{$arr['name']}【{$number}】";
+    }, $tigers));
+
+    $eagles = $db->query(
+        'SELECT value, name
+    FROM rank_data LEFT JOIN general ON rank_data.general_id = general.no
+    WHERE rank_data.nation_id = %i AND rank_data.type = "firenum" AND value > 0 ORDER BY value DESC LIMIT 7',
+        $nationID
+    ); // 건안칠자
+    $eaglestr = join(', ', array_map(function ($arr) {
+        $number = number_format($arr['value']);
+        return "{$arr['name']}【{$number}】";
+    }, $eagles));
+
+    ?>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td align=center style='color:<?= newColor($nation['color']) ?>; background-color:<?= $nation['color'] ?>' colspan=6>
+                <font size=5>【 <?= $nation['name'] ?> 】</font>
+            </td>
+        </tr>
+        <?php
+        for ($i = 12; $i >= $lv; $i -= 2) {
+            $i1 = $i;
+            $i2 = $i - 1;
+            $imageTemp1 = GetImageURL($level[$i1]['imgsvr'] ?? 0);
+            $imageTemp2 = GetImageURL($level[$i2]['imgsvr'] ?? 0);
+        ?>
+            <tr>
+                <td width=98 align=center class='bg1'>
+                    <font size=4><?= getOfficerLevelText($i1, $nation['level']) ?></font>
+                </td>
+                <td width=64 class='generalIcon' height=64 style='background:no-repeat center url("<?= $imageTemp1 ?>/<?= $level[$i1]['picture'] ?? 'default.jpg' ?>");background-size:64px;'></td>
+                <td width=332>
+                    <font size=4><?= $level[$i1]['name'] ?? '-' ?>(<?= $level[$i1]['belong'] ?? '-' ?>년)</font>
+                </td>
+                <td width=98 align=center class='bg1'>
+                    <font size=4><?= getOfficerLevelText($i2, $nation['level']) ?></font>
+                </td>
+                <td width=64 class='generalIcon' height=64 style='background:no-repeat center url("<?= $imageTemp2 ?>/<?= $level[$i2]['picture'] ?? 'default.jpg' ?>");background-size:64px;'></td>
+                <td width=332>
+                    <font size=4><?= $level[$i2]['name'] ?? '-' ?>(<?= $level[$i2]['belong'] ?? '-' ?>년)</font>
+                </td>
+            </tr>
+        <?php
+        }
+
+        ?>
+        <tr>
+            <td width=98 align=center class='bg1'>오호장군【승전】</td>
+            <td colspan=5><?= $tigerstr ?></td>
+        </tr>
+        <tr>
+            <td width=98 align=center class='bg1'>건안칠자【계략】</td>
+            <td colspan=5><?= $eaglestr ?></td>
+        </tr>
+    </table>
+
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td colspan=4 height=5></td>
+        </tr>
+        <tr>
+            <td colspan=4 align=center bgcolor=blue>수 뇌 부 임 명</td>
+        </tr>
+        <tr>
+            <?php $officerLevelText = getOfficerLevelText(11, $nation['level']); ?>
+            <td width=98 align=right class='bg1'><?= getOfficerLevelText(12, $nation['level']) ?></td>
+            <td width=398><?= $level[12]['name'] ?> 【<?= CityConst::byID($level[12]['city'])->name ?>】</td>
+            <td width=98 align=right class='bg1'><?= $officerLevelText ?></td>
+            <td width=398>
+                <?php
+                if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], 11)) {
+                    echo "
+            <select id='genlist_11' size=1 maxlength=15 style=color:white;background-color:black;>
+                <option value=0 data-officer_level='0' data-name=''>____공석____</option>";
+
+                    foreach ($candidateAny as $general) {
+                        if ($general['officer_level'] == 11) {
+                            echo "<option style=color:red; selected data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                        } elseif ($general['officer_level'] > 1) {
+                            echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                        } else {
+                            echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                        }
+                    }
+
+                    echo "
+            </select>
+            <input class='btn_appoint' type=$btn data-officer_level='11' data-officer_level_text='{$officerLevelText}' value=임명>";
+                } else {
+                    if (key_exists(11, $level)) {
+                        echo "{$level[11]['name']} 【" . CityConst::byID($level[11]['city'])->name . "】";
+                    }
+                }
+                echo "
+        </td>
+    </tr>
+";
+
+                for ($i = 10; $i >= $lv; $i--) {
+                    if ($i % 2 == 0) {
+                        echo "<tr>";
+                    }
+                    $officerLevelText = getOfficerLevelText($i, $nation['level']);
+                    echo "
+        <td width=98 align=right class='bg1'>{$officerLevelText}</td>
+        <td width=398>
+    ";
+
+
+                    if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $i)) {
+                        echo "
+            <select id='genlist_{$i}' size=1 style=color:white;background-color:black;>
+                <option value=0 data-officer_level='0' data-name=''>____공석____</option>";
+
+                        foreach (($i % 2 == 0 ? $candidateStrength : $candidateIntel) as $general) {
+                            if ($general['officer_level'] == $i) {
+                                echo "<option style=color:red; selected data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } elseif ($general['officer_level'] > 1) {
+                                echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } else {
+                                echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            }
+                        }
+
+                        echo "
+            </select>
+            <input class='btn_appoint' type=$btn data-officer_level='{$i}' data-officer_level_text='$officerLevelText' value=임명>";
+                    } else {
+                        $general = $level[$i] ?? null;
+                        if ($general) {
+                            echo "{$general['name']} 【" . CityConst::byID($general['city'])->name . "】";
+                        }
+                    }
+                    echo "</td>";
+                    if ($i % 2 == 1) {
+                        echo "</tr>";
+                    }
+                }
+                echo "
+    <tr><td colspan=4>※ <font color=red>빨간색</font>은 현재 임명중인 장수, <font color=orange>노란색</font>은 다른 관직에 임명된 장수, 하얀색은 일반 장수를 뜻합니다.</td></tr>
+</table>
+
+";
+
+                if ($meLevel == 12) :
+                ?>
+                    <table align='center' width='1000' class='tb_layout bg0'>
+                        <tr>
+                            <td colspan='4' height='5'></td>
+                        </tr>
+                        <tr>
+                            <td colspan='4' align='center' bgcolor='purple'>외 교 권 자 임 명</td>
+                        </tr>
+                        <tr>
+                            <td width=98 align=right class='bg1'>외교권자</td>
+                            <td width=398>
+                                <select id="selectAmbassador" multiple="multiple">
+                                </select>
+                                <button id='changeAmbassador' type='button'>임명</button>
+                            </td>
+                            <td width=98 align=right class='bg1'>조언자</td>
+                            <td width=398>
+                                <select id="selectAuditor" multiple="multiple">
+                                </select>
+                                <button id='changeAuditor' type='button'>임명</button>
+                            </td>
+                        </tr>
+                    </table>
+                <?php
+                endif;
+                ?>
+                <table align=center width=1000 id='officer_list' class='tb_layout bg0'>
+                    <tr>
+                        <td colspan=5 height=5></td>
+                    </tr>
+                    <?php
+                    if ($meLevel >= 5) {
+                        $officerLevelText = getOfficerLevelText(4, $nation['level']);
+                        echo "
+    <tr><td colspan=5 align=center bgcolor=orange>도 시 관 직 임 명</td></tr>
+    <tr>
+        <td colspan=3 align=right class='bg2'>{$officerLevelText} 임명</td>
+        <td colspan=2>
+            <select id='citylist_4' size=1 style=color:white;background-color:black;>
+    ";
+
+                        $cityList = $db->query('SELECT city,name,region,officer_set FROM city WHERE nation=%i ORDER BY region,level DESC,binary(name)', $nationID);
+                        $region = 0;
+                        foreach ($cityList as $city) {
+                            if (isOfficerSet($city['officer_set'], 4)) {
+                                continue;
+                            }
+
+                            if ($region != $city['region']) {
+                                if ($region != 0) {
+                                    echo "</optgroup>";
+                                }
+                                echo "<optgroup label=' 【 " . CityConst::$regionMap[$city['region']] . " 】 ' style=color:skyblue;>";
+                                $region = $city['region'];
+                            }
+
+                            echo "<option value='{$city['city']}' style=color:white;><span class='name_field'>{$city['name']}</span></option>";
+                        }
+                        echo "</optgroup>";
+
+                        echo "
+            </select>
+            <select id='genlist_4' size=1 style=color:white;background-color:black;>
+                <option value=0 data-officer_level='0' data-name=''>____공석____</option>
+    ";
+
+                        foreach ($candidateStrength as $general) {
+                            if ($general['officer_level'] == 4) {
+                                echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } elseif ($general['officer_level'] > 1) {
+                                echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } else {
+                                echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            }
+                        }
+
+                        echo "
+            </select>
+            <input class='btn_appoint' type=$btn data-officer_level='4' data-officer_level_text='{$officerLevelText}' value=임명>
+        </td>
+    </tr>";
+                        $officerLevelText = getOfficerLevelText(3, $nation['level']);
+                        echo "<tr>
+        <td colspan=3 align=right class='bg2'>{$officerLevelText} 임명</td>
+        <td colspan=2>
+            <select id='citylist_3' size=1 style=color:white;background-color:black;>
+    ";
+
+                        $region = 0;
+                        foreach ($cityList as $city) {
+                            if (isOfficerSet($city['officer_set'], 3)) {
+                                continue;
+                            }
+
+                            if ($region != $city['region']) {
+                                if ($region != 0) {
+                                    echo "</optgroup>";
+                                }
+                                echo "<optgroup label=' 【 " . CityConst::$regionMap[$city['region']] . " 】 ' style=color:skyblue;>";
+                                $region = $city['region'];
+                            }
+
+                            echo "<option value='{$city['city']}' style=color:white;><span class='name_field'>{$city['name']}</span></option>";
+                        }
+                        echo "</optgroup>";
+
+                        echo "
+            </select>
+            <select id='genlist_3' size=1 style=color:white;background-color:black;>
+                <option value=0 data-officer_level='0' data-name=''>____공석____</option>
+    ";
+
+                        foreach ($candidateIntel as $general) {
+                            if ($general['officer_level'] == 3) {
+                                echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } elseif ($general['officer_level'] > 1) {
+                                echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } else {
+                                echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            }
+                        }
+
+                        echo "
+            </select>
+            <input class='btn_appoint' type=$btn data-officer_level='3'  data-officer_level_text='{$officerLevelText}' value=임명>
+        </td>
+    </tr>";
+                        $officerLevelText = getOfficerLevelText(2, $nation['level']);
+                        echo "<tr>
+        <td colspan=3 align=right class='bg2'>{$officerLevelText} 임명</td>
+        <td colspan=2>
+            <select id='citylist_2' size=1 style=color:white;background-color:black;>
+    ";
+
+                        $region = 0;
+                        foreach ($cityList as $city) {
+                            if (isOfficerSet($city['officer_set'], 2)) {
+                                continue;
+                            }
+
+                            if ($region != $city['region']) {
+                                if ($region != 0) {
+                                    echo "</optgroup>";
+                                }
+                                echo "<optgroup label=' 【 " . CityConst::$regionMap[$city['region']] . " 】 ' style=color:skyblue;>";
+                                $region = $city['region'];
+                            }
+
+                            echo "<option value='{$city['city']}' style=color:white;><span class='name_field'>{$city['name']}</span></option>";
+                        }
+                        echo "</optgroup>";
+
+                        echo "
+            </select>
+            <select id='genlist_2' size=1 style=color:white;background-color:black;>
+                <option value=0>____<span class='name_field'>공석</span>____</option>
+    ";
+
+                        foreach ($candidateAny as $general) {
+                            if ($general['officer_level'] == 2) {
+                                echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } elseif ($general['officer_level'] > 1) {
+                                echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } else {
+                                echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            }
+                        }
+
+                        echo "
+            </select>
+            <input class='btn_appoint' type=$btn data-officer_level='2'  data-officer_level_text='{$officerLevelText}' value=임명>
+        </td>
+    </tr>
+    <tr><td colspan=5>※ <font color=red>빨간색</font>은 현재 임명중인 장수, <font color=orange>노란색</font>은 다른 관직에 임명된 장수, 하얀색은 일반 장수를 뜻합니다.</td></tr>
+    ";
+                    }
+                    echo "
+    <tr>
+        <td width=158 align=center class='bg1' colspan=2><font size=4>도 시</font></td>
+        <td width=278 align=center class='bg1'><font size=4>태 수 (사관) 【현재도시】</font></td>
+        <td width=278 align=center class='bg1'><font size=4>군 사 (사관) 【현재도시】</font></td>
+        <td width=278 align=center class='bg1'><font size=4>종 사 (사관) 【현재도시】</font></td>
+    </tr>
+";
+
+                    $citylevel = getCityLevelList();
+
+                    $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) {
+                        $officerCityID = $officer['officer_city'];
+                        if (!key_exists($officerCityID, $officerList)) {
+                            $officerList[$officerCityID] = [];
+                        }
+                        $officerList[$officerCityID][$officer['officer_level']] = $officer;
+                    }
+
+                    $region = 0;
+                    $dummyOfficer = [
+                        'name' => '-',
+                        'belong' => 0,
+                    ];
+
+                    $textColor = newColor($nation['color']);
+                    $nationColor = $nation['color'];
+
+                    foreach ($db->query('SELECT city,name,level,region,officer_set from city where nation=%i order by region,level desc,binary(name)', $nationID) as $city) {
+                        $cityID = $city['city'];
+                        $cityOfficerList = $officerList[$cityID] ?? [];
+                    ?>
+                        <?php if ($region != $city['region']) : ?>
+                            <tr>
+                                <td colspan=5 height=3 class='bg1'></td>
+                            </tr>
+                            <tr>
+                                <td colspan=5 class='bg1'>
+                                    <font size=4 color=skyblue> 【 <?= CityConst::$regionMap[$city['region']] ?> 】 </font>
+                                </td>
+                            </tr>
+                        <?php endif;
+                        $region = $city['region']; ?>
+                        <tr>
+                            <td width=78 align=center style='color:<?= $textColor ?>;background-color:<?= $nationColor ?>;font-size:1.2em;'>【<?= $citylevel[$city['level']] ?>】</td>
+                            <td width=78 align=right style='color:<?= $textColor ?>;background-color:<?= $nationColor ?>;font-size:1.2em;'><?= $city['name'] ?>&nbsp;&nbsp;</td>
+
+                            <?php foreach (Util::range(4, 1, -1) as $officerLevel) : ?>
+                                <?php if (key_exists($officerLevel, $cityOfficerList)) :
+                                    $officer = $cityOfficerList[$officerLevel];
+                                ?>
+                                    <td style="color:<?= isOfficerSet($city['officer_set'], $officerLevel) ? 'orange' : 'white' ?>;"><?= $officer['name'] ?>(<?= $officer['belong'] ?>년) 【<?= CityConst::byID($officer['city'])->name ?>】</td>
+                                <?php else : ?>
+                                    <td>-</td>
+                                <?php endif; ?>
+                            <?php endforeach; ?>
+                        </tr>
+                    <?php
+
+                    }
+                    ?>
+                    <tr>
+                        <td colspan=5>※ <font color=orange>노란색</font>은 변경 불가능, 하얀색은 변경 가능 관직입니다.</td>
+                    </tr>
+                </table>
+                <table align=center width=1000 class='tb_layout bg0'>
+                    <tr>
+                        <td colspan=6 height=5></td>
+                    </tr>
+                    <tr>
+                        <td colspan=2 align=center bgcolor=red>추 방</td>
+                    </tr>
+                    <tr>
+                        <td width=498 align=right class='bg1'>대상 장수</td>
+                        <td width=498>
+                            <?php
+                            if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $meLevel)) : ?>
+
+                                <select id='genlist_kick' size=1 style=color:white;background-color:black;>";
+
+                                    <?php foreach ($candidateAny as $general) : ?>
+                                        <?php if ($general['no'] === $me['no']) {
+                                            continue;
+                                        }
+                                        ?>
+                                        <option data-officer_level='<?= $general['officer_level'] ?>' data-name='<?= $general['name'] ?>' value='<?= $general['no'] ?>'><?= $general['name'] ?> <small>(<?= $general['leadership'] ?>/<?= $general['strength'] ?>/<?= $general['intel'] ?>, <?= $general['killturn'] ?>턴)</small></option>
+                                    <?php endforeach; ?>
+                                </select>
+                                <input type=<?= $btn ?> id='btn_kick' value=추방>
+                            <?php endif; ?>
+                        </td>
+                    </tr>
+                </table>
+                <br>
+                <table align=center width=1000 class='tb_layout bg0'>
+                    <tr>
+                        <td><?= backButton() ?></td>
+                    </tr>
+                    <tr>
+                        <td><?= banner() ?></td>
+                    </tr>
+                </table>
+</body>
+
+</html>
@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 include "lib.php";
@@ -9,22 +10,17 @@ if ($type <= 0 || $type > 12) {
    $type = 10;
 }

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

 $db = DB::db();
-$connect=$db->get();
-
 increaseRefresh("세력도시", 1);

-$query = "select no,nation,level from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
+$me = $db->queryFirstRow('SELECT no,nation,officer_level FROM general WHERE owner=%i', $userID);
+$nationID = $me['nation'];

-if ($me['level'] == 0) {
+if ($me['officer_level'] == 0) {
    echo "재야입니다.";
    exit();
 }
@@ -36,164 +32,243 @@ $sel = [$type => "selected"];
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>세력도시</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 세력도시</title>
+    <?= 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::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common', 'extExpandCity']) ?>
 </head>

 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>세 력 도 시<br><?=backButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[1]??''?> value=1>기본</option>
-            <option <?=$sel[2]??''?> value=2>인구</option>
-            <option <?=$sel[3]??''?> value=3>인구율</option>
-            <option <?=$sel[4]??''?> value=4>민심</option>
-            <option <?=$sel[5]??''?> value=5>농업</option>
-            <option <?=$sel[6]??''?> value=6>상업</option>
-            <option <?=$sel[7]??''?> value=7>치안</option>
-            <option <?=$sel[8]??''?> value=8>수비</option>
-            <option <?=$sel[9]??''?> value=9>성벽</option>
-            <option <?=$sel[10]??''?> value=10>시세</option>
-            <option <?=$sel[11]??''?> value=11>지역</option>
-            <option <?=$sel[12]??''?> value=12>규모</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<?php
-$query = "select nation from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>세 력 도 시<br><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>정렬순서 :
+                    <select name=type size=1>
+                        <option <?= $sel[1] ?? '' ?> value=1>기본</option>
+                        <option <?= $sel[2] ?? '' ?> value=2>인구</option>
+                        <option <?= $sel[3] ?? '' ?> value=3>인구율</option>
+                        <option <?= $sel[4] ?? '' ?> value=4>민심</option>
+                        <option <?= $sel[5] ?? '' ?> value=5>농업</option>
+                        <option <?= $sel[6] ?? '' ?> value=6>상업</option>
+                        <option <?= $sel[7] ?? '' ?> value=7>치안</option>
+                        <option <?= $sel[8] ?? '' ?> value=8>수비</option>
+                        <option <?= $sel[9] ?? '' ?> value=9>성벽</option>
+                        <option <?= $sel[10] ?? '' ?> value=10>시세</option>
+                        <option <?= $sel[11] ?? '' ?> value=11>지역</option>
+                        <option <?= $sel[12] ?? '' ?> value=12>규모</option>
+                    </select>
+                    <input type=submit value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <?php

-$nation = getNationStaticInfo($me['nation']);  //국가정보
+    $nation = $db->queryFirstRow('SELECT nation, name, color, type, level, capital, gennum, `power`, `rate` from nation WHERE nation = %i', $nationID);  //국가정보
+    $nationTypeObj = buildNationTypeClass($nation['type']);

-$query = "select *,pop/pop2 as poprate from city where nation='{$me['nation']}'";
-
-switch ($type) {
-    case  1: break;
-    case  2: $query .= " order by pop desc"; break;
-    case  3: $query .= " order by poprate desc"; break;
-    case  4: $query .= " order by rate desc"; break;
-    case  5: $query .= " order by agri desc"; break;
-    case  6: $query .= " order by comm desc"; break;
-    case  7: $query .= " order by secu desc"; break;
-    case  8: $query .= " order by def desc"; break;
-    case  9: $query .= " order by wall desc"; break;
-    case 10: $query .= " order by trade desc"; break;
-    case 11: $query .= " order by region,level desc"; break;
-    case 12: $query .= " order by level desc, region"; break;
-}
-$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$citycount = MYDB_num_rows($cityresult);
-
-$region = 0;
-$level = 0;
-
-for ($j=0; $j < $citycount; $j++) {
-    $city = MYDB_fetch_array($cityresult);
-    if ($city['city'] == $nation['capital']) {
-        $city['name'] = "<font color=cyan>[{$city['name']}]</font>";
-    }
-    $query = "select name from general where no='{$city['gen1']}'";    // 태수
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $gen1 = MYDB_fetch_array($genresult);
-
-    $query = "select name from general where no='{$city['gen2']}'";    // 군사
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $gen2 = MYDB_fetch_array($genresult);
-
-    $query = "select name from general where no='{$city['gen3']}'";    // 시중
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $gen3 = MYDB_fetch_array($genresult);
-
-    if ($type == 10 && $city['region'] != $region) {
-        echo "<br>";
-        $region = $city['region'];
-    } elseif ($type == 11 && $city['level'] != $level) {
-        echo "<br>";
-        $level = $city['level'];
-    }
-
-    if ($city['trade'] == 0) {
-        $city['trade'] = "- ";
-    }
-
-    echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=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=48 id=bg1>주민</td>
-        <td align=center width=112>{$city['pop']}/{$city['pop2']}</td>
-        <td align=center width=48 id=bg1>농업</td>
-        <td align=center width=108>{$city['agri']}/{$city['agri2']}</td>
-        <td align=center width=48 id=bg1>상업</td>
-        <td align=center width=108>{$city['comm']}/{$city['comm2']}</td>
-        <td align=center width=48 id=bg1>치안</td>
-        <td align=center width=108>{$city['secu']}/{$city['secu2']}</td>
-        <td align=center width=48 id=bg1>수비</td>
-        <td align=center width=108>{$city['def']}/{$city['def2']}</td>
-        <td align=center width=48 id=bg1>성벽</td>
-        <td align=center width=108>{$city['wall']}/{$city['wall2']}</td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>민심</td>
-        <td align=center>{$city['rate']}</td>
-        <td align=center id=bg1>시세</td>
-        <td align=center>{$city['trade']}%</td>
-        <td align=center id=bg1>인구</td>
-        <td align=center>".round($city['pop']/$city['pop2']*100, 2)." %</td>
-        <td align=center id=bg1>태수</td>
-        <td align=center>";
-    echo $gen1['name']==''?"-":"{$gen1['name']}";
-    echo "</td>
-        <td align=center id=bg1>군사</td>
-        <td align=center>";
-    echo $gen2['name']==''?"-":"{$gen2['name']}";
-    echo "</td>
-        <td align=center id=bg1>시중</td>
-        <td align=center>";
-    echo $gen3['name']==''?"-":"{$gen3['name']}";
-    echo "</td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>장수</td>
-        <td colspan=11>";
-    $query = "select npc,name from general where city='{$city['city']}' and nation='{$me['nation']}'";    // 장수 목록
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $gencount = MYDB_num_rows($genresult);
-    if ($gencount == 0) {
-        echo "-";
-    }
-    for ($i=0; $i < $gencount; $i++) {
-        $general = MYDB_fetch_array($genresult);
-        if ($general['npc'] >= 2) {
-            echo "<font color=cyan>{$general['name']}, </font>";
-        } elseif ($general['npc'] == 1) {
-            echo "<font color=skyblue>{$general['name']}, </font>";
-        } else {
-            echo "{$general['name']}, ";
+    $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) {
+        $officerCityID = $officer['officer_city'];
+        if (!key_exists($officerCityID, $officerList)) {
+            $officerList[$officerCityID] = [];
        }
+        $officerList[$officerCityID][$officer['officer_level']] = $officer;
    }
-    echo "
-        </td>
-    </tr>
-</table>
-";
-}
-?>

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+    $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);
+
+
+    switch ($type) {
+        case  1:
+            break;
+        case  2:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['pop'] <=> $lhs['pop'];
+            });
+            break;
+        case  3:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['poprate'] <=> $lhs['poprate'];
+            });
+            break;
+        case  4:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['trust'] <=> $lhs['trust'];
+            });
+            break;
+        case  5:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['agri'] <=> $lhs['agri'];
+            });
+            break;
+        case  6:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['comm'] <=> $lhs['comm'];
+            });
+            break;
+        case  7:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['secu'] <=> $lhs['secu'];
+            });
+            break;
+        case  8:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['def'] <=> $lhs['def'];
+            });
+            break;
+        case  9:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['wall'] <=> $lhs['wall'];
+            });
+            break;
+        case 10:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['trade'] <=> $lhs['trade'];
+            });
+            break;
+        case 11:
+            usort($cityList, function ($lhs, $rhs) {
+                $cmpTrust = $lhs['region'] <=> $rhs['region'];
+                if ($cmpTrust != 0) {
+                    return $cmpTrust;
+                }
+                return $rhs['level'] <=> $lhs['level'];
+            });
+            break;
+        case 12:
+            usort($cityList, function ($lhs, $rhs) {
+                $cmpTrust = $rhs['level'] <=> $lhs['level'];
+                if ($cmpTrust != 0) {
+                    return $cmpTrust;
+                }
+                return $lhs['region'] <=> $rhs['region'];
+            });
+            break;
+    }
+
+    $region = 0;
+    $level = 0;
+
+    foreach ($cityList as $city) {
+        $cityID = $city['city'];
+        if ($city['city'] == $nation['capital']) {
+            $city['name'] = "<font color=cyan>[{$city['name']}]</font>";
+        }
+
+        $officerQuery = [];
+        $officerName = [
+            2 => '-',
+            3 => '-',
+            4 => '-'
+        ];
+
+        $cityOfficerList = $officerList[$cityID] ?? [];
+        $effectiveOfficerCnt = 0;
+        foreach ($cityOfficerList as $cityOfficer) {
+            if ($cityOfficer['city'] == $cityID) {
+                $effectiveOfficerCnt += 1;
+            }
+            $officerName[$cityOfficer['officer_level']] = formatName($cityOfficer['name'], $cityOfficer['npc']);
+        }
+
+        if ($type == 10 && $city['region'] != $region) {
+            echo "<br>";
+            $region = $city['region'];
+        } elseif ($type == 11 && $city['level'] != $level) {
+            echo "<br>";
+            $level = $city['level'];
+        }
+
+        if ($city['trade'] === null) {
+            $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);
+
+    ?>
+        <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>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
+    <div id="helper_genlist" style="display:none;"></div>
 </body>

-</html>
-
+</html>
@@ -1,202 +1,198 @@
 <?php
+
 namespace sammo;

 include "lib.php";
 include "func.php";

 $type = Util::getReq('type', 'int', 1);
-if($type <= 0 || $type > 15) {
+if ($type <= 0 || $type > 15) {
    $type = 1;
 }

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');

 increaseRefresh("세력장수", 1);

-$query = "select no,nation,level from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
+$me = $db->queryFirstRow('SELECT no,nation,officer_level from general where owner=%i', $userID);

-if($me['level'] == 0) {
+if ($me['officer_level'] == 0) {
    echo "재야입니다.";
    exit();
 }

 $sel = [$type => "selected"];

+$ownerNameList = [];
+if ($gameStor->isunited) {
+    foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
+
+
 ?>
 <!DOCTYPE html>
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>세력장수</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 세력장수</title>
+    <?= 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::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>

 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>세 력 장 수<br><?=backButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[1]??''?> value=1>관직</option>
-            <option <?=$sel[2]??''?> value=2>계급</option>
-            <option <?=$sel[3]??''?> value=3>명성</option>
-            <option <?=$sel[4]??''?> value=4>통솔</option>
-            <option <?=$sel[5]??''?> value=5>무력</option>
-            <option <?=$sel[6]??''?> value=6>지력</option>
-            <option <?=$sel[7]??''?> value=7>자금</option>
-            <option <?=$sel[8]??''?> value=8>군량</option>
-            <option <?=$sel[9]??''?> value=9>병사</option>
-            <option <?=$sel[10]??''?> value=10>벌점</option>
-            <option <?=$sel[11]??''?> value=11>성격</option>
-            <option <?=$sel[12]??''?> value=12>내특</option>
-            <option <?=$sel[13]??''?> value=13>전특</option>
-            <option <?=$sel[14]??''?> value=14>사관</option>
-            <option <?=$sel[15]??''?> value=15>NPC</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<?php
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>세 력 장 수<br><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>정렬순서 :
+                    <select name=type size=1>
+                        <option <?= $sel[1] ?? '' ?> value=1>관직</option>
+                        <option <?= $sel[2] ?? '' ?> value=2>계급</option>
+                        <option <?= $sel[3] ?? '' ?> value=3>명성</option>
+                        <option <?= $sel[4] ?? '' ?> value=4>통솔</option>
+                        <option <?= $sel[5] ?? '' ?> value=5>무력</option>
+                        <option <?= $sel[6] ?? '' ?> value=6>지력</option>
+                        <option <?= $sel[7] ?? '' ?> value=7>자금</option>
+                        <option <?= $sel[8] ?? '' ?> value=8>군량</option>
+                        <option <?= $sel[9] ?? '' ?> value=9>병사</option>
+                        <option <?= $sel[10] ?? '' ?> value=10>벌점</option>
+                        <option <?= $sel[11] ?? '' ?> value=11>성격</option>
+                        <option <?= $sel[12] ?? '' ?> value=12>내특</option>
+                        <option <?= $sel[13] ?? '' ?> value=13>전특</option>
+                        <option <?= $sel[14] ?? '' ?> value=14>사관</option>
+                        <option <?= $sel[15] ?? '' ?> value=15>NPC</option>
+                    </select>
+                    <input type=submit value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <?php

-$nationLevel = DB::db()->queryFirstField('select level from nation where nation = %i', $me['nation']);
-$orderByText = '';//FIXME: 쿼리 재작성
-switch($type) {
-    case  1: $orderByText = " order by level desc"; break;
-    case  2: $orderByText = " order by dedication desc"; break;
-    case  3: $orderByText = " order by experience desc"; break;
-    case  4: $orderByText = " order by leader desc"; break;
-    case  5: $orderByText = " order by power desc"; break;
-    case  6: $orderByText = " order by intel desc"; break;
-    case  7: $orderByText = " order by gold desc"; break;
-    case  8: $orderByText = " order by rice desc"; break;
-    case  9: $orderByText = " order by crew desc"; break;
-    case 10: $orderByText = " order by connect desc"; break;
-    case 11: $orderByText = " order by personal"; break;
-    case 12: $orderByText = " order by special desc"; break;
-    case 13: $orderByText = " order by special2 desc"; break;
-    case 14: $orderByText = " order by belong desc"; break;
-    case 15: $orderByText = " order by npc desc"; break;
-}
-$query = 
-    "select 
-        npc,
-        special,
-        special2,
-        personal,
-        picture,
-        imgsvr,
-        name,
-        level,
-        dedication,
-        experience,
-        injury,
-        leader,
-        power,
-        intel,
-        gold,
-        rice,
-        belong,
-        connect,
-        killturn
-    from general where nation='{$me['nation']}' ".$orderByText;
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($genresult);
+    $nationLevel = DB::db()->queryFirstField('select level from nation where nation = %i', $me['nation']);

-echo"
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=64 align=center id=bg1>얼 굴</td>
-        <td width=98 align=center id=bg1>이 름</td>
-        <td width=78 align=center id=bg1>관 직</td>
-        <td width=68 align=center id=bg1>계 급</td>
-        <td width=68 align=center id=bg1>명 성</td>
-        <td width=68 align=center id=bg1>봉 록</td>
-        <td width=48 align=center id=bg1>통솔</td>
-        <td width=48 align=center id=bg1>무력</td>
-        <td width=48 align=center id=bg1>지력</td>
-        <td width=68 align=center id=bg1>자 금</td>
-        <td width=68 align=center id=bg1>군 량</td>
-        <td width=48 align=center id=bg1>성 격</td>
-        <td width=78 align=center id=bg1>특 기</td>
-        <td width=48 align=center id=bg1>사 관</td>
-        <td width=70 align=center id=bg1>벌점</td>
-    </tr>";
-for($j=0; $j < $gencount; $j++) {
-    $general = MYDB_fetch_array($genresult);
+    [$orderKey, $orderDesc] = [
+        1 => ['officer_level', true],
+        2 => ['dedication', true],
+        3 => ['experience', true],
+        4 => ['leadership', true],
+        5 => ['strength', true],
+        6 => ['intel', true],
+        7 => ['gold', true],
+        8 => ['rice', true],
+        9 => ['crew', true],
+        10 => ['refresh_score_total', true],
+        11 => ['personal', true],
+        12 => ['special', true],
+        13 => ['special2', true],
+        14 => ['belong', true],
+        15 => ['npc', true],
+    ][$type];

-    if($general['level'] == 12) {
-        $lbonus = $nationLevel * 2;
-    } elseif($general['level'] >= 5) {
-        $lbonus = $nationLevel;
-    } else {
-        $lbonus = 0;
-    }
-    if($lbonus > 0) {
-        $lbonus = "<font color=cyan>+{$lbonus}</font>";
-    } else {
-        $lbonus = "";
-    }
+    $generalList = $db->query(
+        'SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,refresh_score_total,gold,rice,crew,belong
+        FROM `general` LEFT JOIN `general_access_log` ON general.no = general_access_log.general_id where nation = %i order by %b %l', $me['nation'], $orderKey, $orderDesc ? 'desc' : '');

-    if($general['injury'] > 0) {
-        $leader = intdiv($general['leader'] * (100 - $general['injury']), 100);
-        $power = intdiv($general['power'] * (100 - $general['injury']), 100);
-        $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leader = "<font color=red>{$leader}</font>{$lbonus}";
-        $power = "<font color=red>{$power}</font>";
-        $intel = "<font color=red>{$intel}</font>";
-    } else {
-        $leader = "{$general['leader']}{$lbonus}";
-        $power = "{$general['power']}";
-        $intel = "{$general['intel']}";
-    }
-
-    if($general['npc'] >= 2) { $name = "<font color=cyan>{$general['name']}</font>"; }
-    elseif($general['npc'] == 1) { $name = "<font color=skyblue>{$general['name']}</font>"; }
-    else { $name =  "{$general['name']}"; }
-
-    $imageTemp = GetImageURL($general['imgsvr']);
    echo "
+<table align=center class='tb_layout bg0'>
    <tr>
-        <td align=center style='background:no-repeat center url(\"{$imageTemp}/{$general['picture']}\");background-size:64px;' height=64></td>
+        <td width=64 align=center class='bg1'>얼 굴</td>
+        <td width=98 align=center class='bg1'>이 름</td>
+        <td width=78 align=center class='bg1'>관 직</td>
+        <td width=68 align=center class='bg1'>계 급</td>
+        <td width=68 align=center class='bg1'>명 성</td>
+        <td width=68 align=center class='bg1'>봉 록</td>
+        <td width=48 align=center class='bg1'>통솔</td>
+        <td width=48 align=center class='bg1'>무력</td>
+        <td width=48 align=center class='bg1'>지력</td>
+        <td width=68 align=center class='bg1'>자 금</td>
+        <td width=68 align=center class='bg1'>군 량</td>
+        <td width=48 align=center class='bg1'>성 격</td>
+        <td width=78 align=center class='bg1'>특 기</td>
+        <td width=48 align=center class='bg1'>사 관</td>
+        <td width=70 align=center class='bg1'>벌점</td>
+    </tr>";
+    foreach ($generalList as $general) {
+
+        $lbonus = calcLeadershipBonus($general['officer_level'], $nationLevel);
+        if ($lbonus > 0) {
+            $lbonus = "<font color=cyan>+{$lbonus}</font>";
+        } else {
+            $lbonus = "";
+        }
+
+        if ($general['injury'] > 0) {
+            $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100);
+            $strength = intdiv($general['strength'] * (100 - $general['injury']), 100);
+            $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
+            $leadership = "<font color=red>{$leadership}</font>{$lbonus}";
+            $strength = "<font color=red>{$strength}</font>";
+            $intel = "<font color=red>{$intel}</font>";
+        } else {
+            $leadership = "{$general['leadership']}{$lbonus}";
+            $strength = "{$general['strength']}";
+            $intel = "{$general['intel']}";
+        }
+
+        $name = formatName($general['name'], $general['npc']);
+
+        if (key_exists($general['owner'], $ownerNameList)) {
+            $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
+        }
+
+        $imageTemp = GetImageURL($general['imgsvr']);
+        echo "
+    <tr>
+        <td align=center class='generalIcon' style='background:no-repeat center url(\"{$imageTemp}/{$general['picture']}\");background-size:64px;' height=64></td>
        <td align=center>$name</td>
-        <td align=center>"; echo getLevel($general['level'], $nationLevel); echo "</td>
-        <td align=center>".getDed($general['dedication'])."</td>
-        <td align=center>".getHonor($general['experience'])."</td>
-        <td align=center>".getBill($general['dedication'])."</td>
-        <td align=center>$leader</td>
-        <td align=center>$power</td>
+        <td align=center>";
+        echo getOfficerLevelText($general['officer_level'], $nationLevel);
+        echo "</td>
+        <td align=center>" . getDed($general['dedication']) . "</td>
+        <td align=center>" . getHonor($general['experience']) . "</td>
+        <td align=center>" . getBill($general['dedication']) . "</td>
+        <td align=center>$leadership</td>
+        <td align=center>$strength</td>
        <td align=center>$intel</td>
        <td align=center>{$general['gold']}</td>
        <td align=center>{$general['rice']}</td>
-        <td align=center>".getGenChar($general['personal'])."</td>
-        <td align=center>".getGenSpecial($general['special'])." / ".getGenSpecial($general['special2'])."</td>
+        <td align=center>" . displayCharInfo($general['personal']) . "</td>
+        <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>
        <td align=center>{$general['belong']}</td>
-        <td align=center>{$general['connect']}"; echo "<br>(".getConnect($general['connect']).")</td>
+        <td align=center>". $general['refresh_score_total'] ?? 0;
+        echo "<br>(" . getRefreshScoreText($general['refresh_score_total'] ?? 0) . ")</td>
    </tr>";
-}
+    }
    echo "
 </table>
 ";

-?>
+    ?>

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>

-</html>
-
+</html>
@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 include "lib.php";
@@ -8,15 +9,13 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');

 increaseRefresh("세력정보", 1);

-$query = "select no,nation,level from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
+$nationID = $db->queryFirstField('SELECT nation FROM general WHERE owner=%i', $userID);

-if($me['level'] == 0) {
+if ($nationID == 0) {
    echo "재야입니다.";
    exit();
 }
@@ -25,143 +24,142 @@ if($me['level'] == 0) {
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>세력정보</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 세력정보</title>
+    <?= WebUtil::printJS('../d_shared/common_path.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::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>

 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>세 력 정 보<br><?=backButton()?></td></tr>
-</table>
-<br>
-<?php
-$query = "select nation from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>세 력 정 보<br><?= backButton() ?></td>
+        </tr>
+    </table>
+    <br>
+    <?php

-$query = "select nation,gennum,power,rate,bill,type,gold,rice,color,name,level,tech,history,capital from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$nation = MYDB_fetch_array($result);   //국가정보
+    $nation = $db->queryFirstRow('SELECT nation,gennum,power,rate,bill,type,gold,rice,color,name,level,tech,capital FROM nation WHERE nation=%i', $nationID);   //국가정보
+    $cityList = $db->query('SELECT * FROM city WHERE nation=%i', $nationID);

-$query = "select city,name,pop,pop2 from city where nation='{$nation['nation']}'"; // 도시 이름 목록
-$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$citycount = MYDB_num_rows($cityresult);
+    $currPop = 0;
+    $maxPop = 0;
+    $cityNames = [];

-$totalpop = 0;
-$maxpop = 0;
-$cityname = [];
-for($j=0; $j < $citycount; $j++) {
-    $city = MYDB_fetch_array($cityresult);
-    if($city['city'] == $nation['capital']) { $cityname[$j] = "<font color=cyan>[{$city['name']}]</font>"; }
-    else { $cityname[$j] = $city['name']; }
-    $totalpop += $city['pop'];
-    $maxpop += $city['pop2'];
-}
+    foreach ($cityList as $city) {
+        $currPop += $city['pop'];
+        $maxPop += $city['pop_max'];
+        if ($city['city'] == $nation['capital']) {
+            $cityNames[] = "<span style='color:cyan;'>{$city['name']}</span>";
+        } else {
+            $cityNames[] = $city['name'];
+        }
+    }

-$query = "select sum(crew) as totcrew,sum(leader)*100 as maxcrew from general where nation='{$nation['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$general = MYDB_fetch_array($result);
+    [$currCrew, $maxCrew] = $db->queryFirstList('SELECT sum(crew), sum(leadership)*100 FROM general WHERE nation=%i AND npc != 5', $nation['nation']);
+    $dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID);

-$query = "select gold_rate,rice_rate from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
-// 금 수지
-$deadIncome = getDeadIncome($nation['nation'], $nation['type'], $admin['gold_rate']);
+    $goldIncome  = getGoldIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
+    $warIncome  = getWarGoldIncome($nation['type'], $cityList);
+    $totalGoldIncome = $goldIncome + $warIncome;

-$goldincomeList  = getGoldIncome($nation['nation'], $nation['rate'], $admin['gold_rate'], $nation['type']);
-$goldincome  = $goldincomeList[0] + $goldincomeList[1] + $deadIncome;
-$goldoutcome = getGoldOutcome($nation['nation'], $nation['bill']);
-$riceincomeList = getRiceIncome($nation['nation'], $nation['rate'], $admin['rice_rate'], $nation['type']);
-$riceincome  = $riceincomeList[0] + $riceincomeList[1];
-$riceoutcome = getRiceOutcome($nation['nation'], $nation['bill']);
+    $riceIncome = getRiceIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
+    $wallIncome = getWallIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
+    $totalRiceIncome = $riceIncome + $wallIncome;

+    $outcome = getOutcome($nation['bill'], $dedicationList);

-$budgetgold = $nation['gold'] + $goldincome - $goldoutcome + $deadIncome;
-$budgetrice = $nation['rice'] + $riceincome - $riceoutcome;
-$budgetgolddiff = $goldincome - $goldoutcome + $deadIncome;
-$budgetricediff = $riceincome - $riceoutcome;
-if($budgetgolddiff > 0) { $budgetgolddiff = "+{$budgetgolddiff}"; }
-else { $budgetgolddiff = "$budgetgolddiff"; }
-if($budgetricediff > 0) { $budgetricediff = "+{$budgetricediff}"; }
-else { $budgetricediff = "$budgetricediff"; }
+    $budgetgold = $nation['gold'] + $totalGoldIncome - $outcome;
+    $budgetrice = $nation['rice'] + $totalRiceIncome - $outcome;
+    $budgetgolddiff = $totalGoldIncome - $outcome;
+    $budgetricediff = $totalRiceIncome - $outcome;

-echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
-    <tr>
-        <td colspan=8 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 ";echo $me['nation']==0?"공 백 지":"{$nation['name']}";echo " 】</td>
-    </tr>
-    <tr>
-        <td width=98 align=center id=bg1>총주민</td>
-        <td width=198 align=center>{$totalpop}/{$maxpop}</td>
-        <td width=98 align=center id=bg1>총병사</td>
-        <td width=198 align=center>{$general['totcrew']}/{$general['maxcrew']}</td>
-        <td width=98 align=center id=bg1>국 력</td>
-        <td width=298 align=center colspan=3>{$nation['power']}</td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>국 고</td>
-        <td align=center>"; echo $nation['gold']==0?"-":"{$nation['gold']}"; echo "</td>
-        <td align=center id=bg1>병 량</td>
-        <td align=center>"; echo $nation['rice']==0?"-":"{$nation['rice']}"; echo "</td>
-        <td align=center id=bg1>세 율</td>
-        <td align=center colspan=3>"; echo $me['nation']==0?"해당 없음":"{$nation['rate']} %"; echo "</td>
-        </td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>세금/단기</td>
-        <td align=center>+$goldincomeList[0] / +$deadIncome</td>
-        <td align=center id=bg1>세곡/둔전</td>
-        <td align=center>+$riceincomeList[0] / +$riceincomeList[1]</td>
-        <td align=center id=bg1>지급율</td>
-        <td align=center colspan=3>"; echo $me['nation']==0?"해당 없음":"{$nation['bill']} %"; echo "</td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>수입/지출</td>
-        <td align=center>+$goldincome / -$goldoutcome</td>
-        <td align=center id=bg1>수입/지출</td>
-        <td align=center>+$riceincome / -$riceoutcome</td>
-        <td align=center id=bg1>속 령</td>
-        <td width=98 align=center>$citycount</td>
-        <td width=98 align=center id=bg1>장 수</td>
-        <td width=98 align=center>{$nation['gennum']}</td>
-    </tr>
-    <tr>
-        <td align=center id=bg1>국고 예산</td>
-        <td align=center>{$budgetgold} ({$budgetgolddiff})</td>
-        <td align=center id=bg1>병량 예산</td>
-        <td align=center>{$budgetrice} ({$budgetricediff})</td>
-        <td align=center id=bg1>기술력</td>
-        <td align=center>{$nation['tech']}</td>
-        <td align=center id=bg1>작 위</td>
-        <td align=center>".getNationLevel($nation['level'])."</td>
-    </tr>
-    <tr>
-        <td align=center valign=top id=bg1> 속령일람 :</td>
-        <td colspan=7>";
-for($j=0; $j < $citycount; $j++) {
-    echo "$cityname[$j], ";
-}
-echo"
-        </td>
-    </tr>
-    <tr>
-        <td align=center valign=top id=bg1>국가열전</td>
-        <td colspan=7 id=bg0>".ConvertLog($nation['history'])."</td>
-    </tr>
-</table>
-<br>";
+    if ($budgetgolddiff > 0) {
+        $budgetgolddiff = '+' . number_format($budgetgolddiff);
+    } else {
+        $budgetgolddiff = number_format($budgetgolddiff);
+    }
+    if ($budgetricediff > 0) {
+        $budgetricediff = '+' . number_format($budgetricediff);
+    } else {
+        $budgetricediff = number_format($budgetricediff);
+    }

-?>
+    ?>
+    <table align=center width=1000 class='tb_layout bg2'>
+        <tr>
+            <td colspan=8 align=center style='color:<?= newColor($nation['color']) ?>;background-color:<?= $nation['color'] ?>'>【<?= $nation['name'] ?>】</td>
+        </tr>
+        <tr>
+            <td width=98 align=center class='bg1'>총주민</td>
+            <td width=198 align=center><?= number_format($currPop) ?>/<?= number_format($maxPop) ?></td>
+            <td width=98 align=center class='bg1'>총병사</td>
+            <td width=198 align=center><?= number_format($currCrew) ?>/<?= number_format($maxCrew) ?></td>
+            <td width=98 align=center class='bg1'>국 력</td>
+            <td width=298 align=center colspan=3><?= $nation['power'] ?></td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>국 고</td>
+            <td align=center><?= number_format($nation['gold']) ?></td>
+            <td align=center class='bg1'>병 량</td>
+            <td align=center><?= number_format($nation['rice']) ?></td>
+            <td align=center class='bg1'>세 율</td>
+            <td align=center colspan=3><?= $nation['rate'] ?> %</td>
+            </td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>세금/단기</td>
+            <td align=center>+<?= number_format($goldIncome) ?> / +<?= number_format($warIncome) ?></td>
+            <td align=center class='bg1'>세곡/둔전</td>
+            <td align=center>+<?= number_format($riceIncome) ?> / +<?= number_format($wallIncome) ?></td>
+            <td align=center class='bg1'>지급률</td>
+            <td align=center colspan=3><?= $nation['bill'] ?> %</td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>수입/지출</td>
+            <td align=center>+<?= number_format($totalGoldIncome) ?> / -<?= number_format($outcome) ?></td>
+            <td align=center class='bg1'>수입/지출</td>
+            <td align=center>+<?= number_format($totalRiceIncome) ?> / -<?= number_format($outcome) ?></td>
+            <td align=center class='bg1'>속 령</td>
+            <td width=98 align=center><?= count($cityList) ?></td>
+            <td width=98 align=center class='bg1'>장 수</td>
+            <td width=98 align=center><?= $nation['gennum'] ?></td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>국고 예산</td>
+            <td align=center><?= number_format($budgetgold) ?> (<?= $budgetgolddiff ?>)</td>
+            <td align=center class='bg1'>병량 예산</td>
+            <td align=center><?= number_format($budgetrice) ?> (<?= $budgetricediff ?>)</td>
+            <td align=center class='bg1'>기술력</td>
+            <td align=center><?= number_format(floor($nation['tech'])) ?></td>
+            <td align=center class='bg1'>작 위</td>
+            <td align=center><?= getNationLevel($nation['level']) ?></td>
+        </tr>
+        <tr>
+            <td align=center valign=top class='bg1'> 속령일람 :</td>
+            <td colspan=7><?= join(', ', $cityNames) ?></td>
+        </tr>
+        <tr>
+            <td align=center valign=top class='bg1'>국가열전</td>
+            <td colspan=7 class='bg0'><?= formatHistoryToHTML(getNationHistoryLogAll($nation['nation'])) ?></td>
+        </tr>
+    </table>
+    <br>

-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>

-</html>
-
+</html>
@@ -1,148 +1,275 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$btn = Util::getReq('btn');
-$map = Util::getReq('map', 'int', 0);
-$mode = Util::getReq('mode', 'int', 2);
-$tnmt = Util::getReq('tnmt', 'int', 1);
-
-extractMissingPostToGlobals();
-
-if($map < 0 || $map > 2){
-    $map = 0;
-}
-
-if($mode < 0 || $mode > 2){
-    $mode = 2;
-}
-
-if($tnmt < 0 || $tnmt > 1){
-    $tnmt = 1;
-}
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("내정보", 1);
-
-$query = "select myset from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
-
-if ($me['myset'] > 0) {
-    $submit = 'submit';
-} else {
-    $submit = 'hidden';
-}
-
-if ($btn == "설정저장" && $me['myset'] > 0) {
-    if ($me['myset'] > 1) {
-        $submit = 'submit';
-    } else {
-        $submit = 'hidden';
-    }
-
-    $db->update('general', [
-        'myset'=>$db->sqleval('myset-1'),
-        'map'=>$map,
-        'mode'=>$mode,
-        'tnmt'=>$tnmt
-    ], 'owner=%i', $userID);
-}
-
-$query = "select no,map,mode,tnmt,myset from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>내정보</title>
-<link href="../d_shared/common.css" rel="stylesheet">
-<link rel=stylesheet href="css/common.css">
-<script type="text/javascript">
-function go(type) {
-    if(type == 0){ 
-        location.replace('c_vacation.php');
-    }
-}
-</script>
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>내 정 보<br><?=backButton()?></td></tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=50%>
-            <?php myInfo(); ?>
-            <?php myInfo2(); ?>
-        </td>
-        <td width=50% valign=top>
-            <form name=form1 action=b_myPage.php method=post>
-                &nbsp;&nbsp;&nbsp;&nbsp;지도수준 【
-                <input type=radio name=map value=0 <?=$me['map']==0?"checked":""; ?>>상세
-                <input type=radio name=map value=1 <?=$me['map']==1?"checked":""; ?>>간단
-                <input type=radio name=map value=2 <?=$me['map']==2?"checked":""; ?>>생략
-                】<br><br>
-                &nbsp;&nbsp;&nbsp;&nbsp;토너먼트 【
-                <input type=radio name=tnmt value=0 <?=$me['tnmt']==0?"checked":""; ?>>수동참여
-                <input type=radio name=tnmt value=1 <?=$me['tnmt']==1?"checked":""; ?>>자동참여
-                】<br>
-                &nbsp;&nbsp;&nbsp;&nbsp;∞<font color=orange>개막직전 남는자리가 있을경우 랜덤하게 참여합니다.</font><br><br>
-                &nbsp;&nbsp;&nbsp;&nbsp;수비 【
-                <input type=radio name=mode  value=2 <?=$me['mode']==2?"checked":""; ?>>◎(훈사80)
-                <input type=radio name=mode  value=1 <?=$me['mode']==1?"checked":""; ?>>○(훈사60)
-                <input type=radio name=mode  value=0 <?=$me['mode']==0?"checked":""; ?>>×
-                】<br><br>
-                &nbsp;&nbsp;&nbsp;&nbsp;<input type=<?=$submit?> name=btn style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px; value=설정저장><br>
-                &nbsp;&nbsp;&nbsp;&nbsp;∞<font color=orange>설정저장은 이달중 <?=$me['myset']?>회 남았습니다.</font><br><br>
-            </form>
-            &nbsp;&nbsp;&nbsp;&nbsp;휴 가 신 청<br>
-            &nbsp;&nbsp;&nbsp;&nbsp;<input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px; value=휴가신청 onclick='go(0)'>
-        </td>
-    </tr>
-    <tr>
-        <td align=center id=bg1><font color=skyblue size=3>개인 기록</font></td>
-        <td align=center id=bg1><font color=orange size=3>전투 기록</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?=getGenLogRecent($me['no'], 24)?>
-        </td>
-        <td valign=top>
-            <?=getBatLogRecent($me['no'], 24)?>
-        </td>
-    </tr>
-    <tr>
-        <td align=center id=bg1><font color=skyblue size=3>장수 열전</font></td>
-        <td align=center id=bg1><font color=orange size=3>전투 결과</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?=getGeneralHistoryAll($me['no'])?>
-        </td>
-        <td valign=top>
-            <?=getBatResRecent($me['no'], 24)?>
-        </td>
-    </tr>
-</table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
-
+<?php
+
+namespace sammo;
+
+use sammo\Enums\GeneralAccessLogColumn;
+use sammo\Enums\GeneralQueryMode;
+use sammo\Enums\TableName;
+
+include "lib.php";
+include "func.php";
+
+$showDieOnPrestartBtn = false;
+$showBuildNationCandidateBtn = false;
+$availableDieOnPrestart = false;
+
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+$generalID = $session->generalID;
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+$gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
+
+increaseRefresh("내정보", 1);
+
+$me = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
+
+$myset = $me->getVar('myset');
+if ($myset > 0) {
+    $submit = 'button';
+} else {
+    $submit = 'hidden';
+}
+
+$lastRefresh = $db->queryFirstField(
+    'SELECT %b FROM %b WHERE %b = %i',
+    GeneralAccessLogColumn::lastRefresh->value,
+    TableName::generalAccessLog->value,
+    GeneralAccessLogColumn::generalID->value,
+    $generalID
+);
+
+$targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
+if ($gameStor->turntime <= $gameStor->opentime) {
+    //서버 가오픈시 할 수 있는 행동
+    if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
+        $showDieOnPrestartBtn = true;
+        if ($targetTime <= TimeUtil::now()) {
+            $availableDieOnPrestart = true;
+        }
+    }
+
+    if ($me->getNationID() == 0) {
+        $showBuildNationCandidateBtn = true;
+    }
+}
+
+$use_treatment = $me->getAuxVar('use_treatment') ?? 10;
+$use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
+
+$changeDefence999Train = -3;
+$changeDefence999Atmos = -6;
+$changeDefence999Train = $me->onCalcDomestic('changeDefenceTrain', "train999", $changeDefence999Train);
+$changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $changeDefence999Atmos);
+
+?>
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=500" />
+    <title><?= UniqueConst::$serverName ?>: 내정보</title>
+    <?= WebUtil::printStaticValues([
+        'availableDieOnPrestart' => $availableDieOnPrestart,
+        'staticValues' => [
+            'items' => Util::mapWithKey(fn (string $key, BaseItem $item) => [
+                'name' => $item->getName(),
+                'rawName' => $item->getRawName(),
+                'className' => $item->getRawClassName(),
+                'cost' => $item->getCost(),
+                'isBuyable' => $item->isBuyable(),
+            ], $me->getItems())
+        ]
+    ]) ?>
+    <?= 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::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['myPage']) ?>
+</head>
+
+<body>
+    <div id="container" class="bg0">
+        <div class="row gx-0">
+            <div class="col">내 정 보<br><?= backButton() ?></div>
+        </div>
+        <div class="row gx-0">
+            <div class="col col-12 col-lg-6">
+                <div class="row">
+                    <div class="col"><?php generalInfo($me); ?><?php generalInfo2($me); ?></div>
+                </div>
+            </div>
+
+            <div class="col col-12 col-lg-6">
+                <div class="row mx-0 gx-0">
+                    <div class="col" style='padding-left:2ch;'>
+                        토너먼트 【
+                        <input type=radio class='tnmt' name=tnmt value=0 <?= $me->getVar('tnmt') == 0 ? "checked" : ""; ?>>수동참여
+                        <input type=radio class='tnmt' name=tnmt value=1 <?= $me->getVar('tnmt') == 1 ? "checked" : ""; ?>>자동참여
+                        】<br>
+                        ∞<span style='color:orange'>개막직전 남는자리가 있을경우 랜덤하게 참여합니다.</span><br><br>
+
+                        환약 사용 【<select id='use_treatment' name='use_treatment'>
+                            <option value=10 <?= ($use_treatment == 10) ? "selected" : ""; ?>>경상</option>
+                            <option value=21 <?= ($use_treatment == 21) ? "selected" : ""; ?>>중상</option>
+                            <option value=41 <?= ($use_treatment == 41) ? "selected" : ""; ?>>심각</option>
+                            <option value=61 <?= ($use_treatment == 61) ? "selected" : ""; ?>>위독</option>
+                            <option value=100 <?= ($use_treatment == 100) ? "selected" : ""; ?>>사용안함</option>
+                        </select>】<br>
+                        ∞<span style='color:orange'>부상을 입었을 때 환약을 사용하는 기준입니다.</span><br><br>
+                        <?php if (($gameStor->autorun_user['options']['chief']) ?? false) : ?>
+                            자동 사령턴 허용 【<select id='use_auto_nation_turn' name='use_auto_nation_turn'>
+                                <option value=1 <?= $use_auto_nation_turn ? "selected" : ""; ?>>허용</option>
+                                <option value=0 <?= (!$use_auto_nation_turn) ? "selected" : ""; ?>>허용 안함</option>
+                            </select>】<br>
+                            ∞<span style='color:orange'>수뇌가 되었을 때 휴식 턴이어도 적당한 턴을 알아서 넣는 것을 허용합니다.</span><br><br>
+                        <?php else : ?>
+                            <input type="hidden" id='use_auto_nation_turn' name='use_auto_nation_turn' value="1" />
+                        <?php endif; ?>
+                        수비 【<select id='defence_train' name='defence_train'>
+                            <?php foreach ([90, 80, 60, 40] as $targetDefenceTrain) : ?>
+                                <option value='<?= $targetDefenceTrain ?>' <?= $me->getVar('defence_train') == $targetDefenceTrain ? "selected" : ""; ?>><?= formatDefenceTrain($targetDefenceTrain) ?>(훈사<?= $targetDefenceTrain ?>)</option>
+                            <?php endforeach; ?>
+                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>
+                                <?php if ($changeDefence999Train != 0 || $changeDefence999Train != 0) :
+                                ?>[<?= $changeDefence999Train != 0 ? "훈련 {$changeDefence999Train}," : '' ?><?= $changeDefence999Atmos != 0 ? "사기 {$changeDefence999Atmos}" : ''
+                                                                                                ?>]<?php endif ?></option>
+                        </select>
+                        】<br><br>
+                        <input type=<?= $submit ?> id='set_my_setting' name=btn style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px; value=설정저장><br>
+                        ∞<span style='color:orange'>설정저장은 이달중 <?= $myset ?>회 남았습니다.</span><br><br>
+
+                        <?php if ($me->getPenaltyList()->count()) : ?>
+                            징계 목록(저장 시 갱신)<br>
+                            <?php foreach ($me->getPenaltyList() as $penaltyKey => $penalty) : ?>
+                                <span style='color:red'><?= $penaltyKey->getHelptext() ?> : <?= $penalty ?></span><br>
+                            <?php endforeach; ?>
+                            <br />
+                        <?php endif; ?>
+                        <?php if (!($gameStor->autorun_user['limit_minutes'] ?? false)) : ?>
+                            휴 가 신 청<br>
+                            <button type="button" id='vacation' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>휴가 신청</button><br><br>
+                        <?php endif; ?>
+                        <!--빙의 해제용 삭턴 조절<br>
+            <a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>빙의 해체 요청</button></a>-->
+
+                        <?php if ($showDieOnPrestartBtn) : ?>
+                            가오픈 기간 내 장수 삭제 (<?= substr($targetTime, 0, 19) ?> 부터)<br>
+                            <button type="button" id='dieOnPrestart' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>장수 삭제</button><br><br>
+                        <?php endif; ?>
+
+                        <?php if ($showBuildNationCandidateBtn) : ?>
+                            서버 개시 이전 거병(2턴부터 건국 가능)<br>
+                            <button type="button" id='buildNationCandidate' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>사전 거병</button><br><br>
+                        <?php endif; ?>
+
+                        <?php if (GameConst::$availableInstantAction['instantRetreat'] ?? false) : ?>
+                            거리 3칸 이내 아국 도시로 즉시 이동<br>
+                            <button type="button" id='instantRetreat' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>접경 귀환</button><br><br>
+                        <?php endif; ?>
+
+                        <?php if ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>
+                            다른 장수 선택 (<?= substr($me->getAuxVar('next_change') ?? TimeUtil::now(), 0, 19) ?> 부터)<br>
+                            <a href="select_general_from_pool.php" id='select_general_from_pool'><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>다른 장수 선택</button></a><br><br>
+                        <?php endif; ?>
+
+                        <div class="row">
+                            <div class="col-4 text-end">500px/1000px 모드<br>(모바일 전용, 즉시 설정)</div>
+                            <div class="col-8">
+                                <div class="btn-group" role="group" aria-label="500px/1000px 모드 설정">
+                                    <input type="radio" class="btn-check" name="screenMode" value="auto" id="screenMode_auto" autocomplete="off">
+                                    <label class="btn btn-primary" for="screenMode_auto">자동</label>
+
+                                    <input type="radio" class="btn-check" name="screenMode" value="500px" id="screenMode_500px" autocomplete="off">
+                                    <label class="btn btn-primary" for="screenMode_500px">500px</label>
+
+                                    <input type="radio" class="btn-check" name="screenMode" value="1000px" id="screenMode_1000px" autocomplete="off">
+                                    <label class="btn btn-primary" for="screenMode_1000px">1000px</label>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col">아이템 파기</div>
+
+                        </div>
+                        <div class="row mx-1">
+                            <div class="btn-group" role="group">
+                                <?php foreach ($me->getItems() as $itemKey => $item) : ?>
+                                    <button type="button" data-item-type='<?= $itemKey ?>' class="drop-item-btn btn btn-primary <?= $item->getName() == '-' ? 'disabled' : '' ?>"><?= $item->getName() ?></button>
+                                <?php endforeach; ?>
+                            </div>
+                        </div>
+                        <br>
+
+                        개인용 CSS<br>
+                        <textarea id='custom_css' style='color:white;background-color:black;width:420px;height:150px;'></textarea>
+                    </div>
+                </div>
+            </div>
+            <div class="col col-12 col-lg-6">
+                <div class="row gx-0">
+                    <div class="col bg1 text-center">
+                        <h4 style='color:skyblue'>개인 기록</h4>
+                    </div>
+                </div>
+                <div class="row gx-0">
+                    <div id='generalActionPlate'>
+                        <?= formatHistoryToHTML(getGeneralActionLogRecent($generalID, 24), 'generalAction') ?>
+                    </div>
+                    <button type="button" class="load_old_log btn btn-secondary" data-log_type="generalAction">이전 로그 불러오기</button>
+                </div>
+            </div>
+            <div class="col col-12 col-lg-6">
+                <div class="row gx-0">
+                    <div class="col bg1 text-center">
+                        <h4 style='color:orange'>전투 기록</h4>
+                    </div>
+                </div>
+                <div class="row gx-0">
+                    <div id='battleDetailPlate'>
+                        <?= formatHistoryToHTML(getBattleDetailLogRecent($generalID, 24), 'battleDetail') ?>
+                    </div>
+                    <button type="button" class="load_old_log btn btn-secondary" data-log_type="battleDetail">이전 로그 불러오기</button>
+                </div>
+            </div>
+
+            <div class="col col-12 col-lg-6">
+                <div class="row gx-0">
+                    <div class="col bg1 text-center">
+                        <h4 style='color:skyblue'>장수 열전</h4>
+                    </div>
+                </div>
+                <div class="row gx-0">
+                    <?= formatHistoryToHTML(getGeneralHistoryLogAll($generalID)) ?>
+                </div>
+            </div>
+            <div class="col col-12 col-lg-6">
+                <div class="row gx-0">
+                    <div class="col bg1 text-center">
+                        <h4 style='color:orange'>전투 결과</h4>
+                    </div>
+                </div>
+                <div class="row gx-0">
+                    <div id='battleResultPlate'>
+                        <?= formatHistoryToHTML(getBattleResultRecent($generalID, 24), 'battleResult') ?>
+                    </div>
+                    <button type="button" class="load_old_log btn btn-secondary" data-log_type="battleResult">이전 로그 불러오기</button>
+                </div>
+            </div>
+        </div>
+        <div class="row  gx-0">
+            <div class="col "><?= backButton() ?></div>
+        </div>
+        <div class="row bg0 gx-0">
+            <div class="col bg0"><?= banner() ?></div>
+        </div>
+    </div>
+</body>
+
+</html>
@@ -1,70 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("회의실", 1);
-
-$query = "select no,nation from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>회의실</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>회 의 실<br><?=backButton()?></td></tr>
-<form name=form1 method=post action=c_nationboard.php>
-    <tr><td align=center>
-        제목 <input type=textarea maxlength=50 name=title style=color:white;background-color:black;width:830px;>
-        </td>
-    </tr>
-    <tr><td>
-        <textarea name=msg style=color:white;background-color:black;width:998px;height:200px;></textarea><br>
-        <input type=submit value=저장하기>
-        <input type=hidden name=num value=-1>
-    </td></tr>
-</form>
-</table>
-<br>
-<?php
-$nation = getNation($me['nation']);
-
-//20개 메세지
-$index = $nation['boardindex'];
-for($i=0; $i < 20; $i++) {
-    $who = "board{$index}_who";
-    $query = "select name,picture,imgsvr from general where no='$nation[$who]'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
-    if($nation["board{$index}"] != '') { msgprint($nation["board{$index}"], $general['name'], $general['picture'], $general['imgsvr'], $nation["board{$index}_when"], $index, 0); }
-    $index--;
-    if($index < 0) { $index = 19; }
-}
-
-?>
-
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
-
@@ -1,58 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("국법", 1);
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>국법</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>국 법<br><?=backButton()?></td></tr>
-    <tr><td>
-
-<?php
-$query = "select no,nation,level from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$query = "select rule from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$nation = MYDB_fetch_array($result);
-
-if($me['level'] >= 5) {
-    echo "
-<form name=form1 method=post action=c_nationrule.php>
-<textarea name=msg style=color:white;background-color:black;width:998px;height:500px;>{$nation['rule']}</textarea><br>
-<input type=submit value=저장하기>
-</form>";
-} else {
-    echo "
-<textarea name=msg style=color:white;background-color:black;width:998px;height:500px; readonly>{$nation['rule']}</textarea><br>";
-}
-
-?>
-    </td></tr>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
-
@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 include "lib.php";
@@ -8,415 +9,387 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');

 increaseRefresh("토너먼트", 1);
-checkTurn();
+TurnExecutionHelper::executeAllCommand();

-$query = "select no,tournament,con,turntime from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
+$me = $db->queryFirstRow(
+    'SELECT no,tournament,refresh_score,turntime from `general`
+    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id where owner=%i', $userID
+);
+$generalID = $me['no'];
+$admin = $gameStor->getValues(['tournament', 'phase', 'turnterm', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
+$turnTerm = $admin['turnterm'];

-$query = "select conlimit,tournament,phase,tnmt_msg,tnmt_type,develcost,tnmt_trig from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }

 switch ($admin['tnmt_type']) {
-default: throw new \RuntimeException('invalid tnmt_type');
-case 0: $tnmt_type = "<font color=cyan>전력전</font>"; $tp = "tot"; $tp2 = "종합"; $tp3 = "total"; break;
-case 1: $tnmt_type = "<font color=cyan>통솔전</font>"; $tp = "ldr"; $tp2 = "통솔"; $tp3 = "leader"; break;
-case 2: $tnmt_type = "<font color=cyan>일기토</font>"; $tp = "pwr"; $tp2 = "무력"; $tp3 = "power"; break;
-case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "itl"; $tp2 = "지력"; $tp3 = "intel"; break;
+    case convertTournamentType('전력전'):
+        $tnmt_type = "전력전";
+        $color = 'cyan';
+        $tp = "total";
+        $tp2 = "종합";
+        $tp3 = "total";
+        break;
+    case convertTournamentType('통솔전'):
+        $tnmt_type = "통솔전";
+        $color = 'cyan';
+        $tp = "leadership";
+        $tp2 = "통솔";
+        $tp3 = "leadership";
+        break;
+    case convertTournamentType('일기토'):
+        $tnmt_type = "일기토";
+        $color = 'cyan';
+        $tp = "strength";
+        $tp2 = "무력";
+        $tp3 = "strength";
+        break;
+    case convertTournamentType('설전'):
+        $tnmt_type = "설전";
+        $color = 'cyan';
+        $tp = "intel";
+        $tp2 = "지력";
+        $tp3 = "intel";
+        break;
+    default:
+        throw new \RuntimeException('invalid tnmt_type');
 }

+
+$bettingID = $gameStor->last_tournament_betting_id ?? 0;
+if ($bettingID != 0) {
+    $betting = $bettingID != 0 ? new Betting($bettingID) : null;
+    $info = $betting->getInfo();
+} else {
+    $info = getDummyBettingInfo($tnmt_type);
+}
+
+$myBet = [];
+$globalBet = [];
+
+if ($bettingID != 0) {
+    $betting = $bettingID != 0 ? new Betting($bettingID) : null;
+    $info = $betting->getInfo();
+
+    foreach ($db->queryAllLists(
+        'SELECT general_id, user_id, amount, betting_type FROM ng_betting WHERE betting_id = %i',
+        $bettingID
+    ) as [$betGeneralID, $userID, $amount, $bettingTypeKey]) {
+        $bettingKey = Json::decode($bettingTypeKey)[0];
+        if ($betGeneralID == $generalID) {
+            $myBet[$bettingKey] = $amount;
+        }
+
+        if (key_exists($bettingKey, $globalBet)) {
+            $globalBet[$bettingKey] += $amount;
+        } else {
+            $globalBet[$bettingKey] = $amount;
+        }
+    }
+} else {
+    $info = getDummyBettingInfo($tnmt_type);
+}
+
+$myBetTotal = array_sum($myBet);
+$globalBetTotal = array_sum($globalBet);
+
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
    MessageBox("접속제한이 얼마 남지 않았습니다! 제한량이 모자라다면 참여를 해보세요^^");
 } ?>
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>토너먼트</title>
-<style>
-body { color:white; background-color:black; border-width:1px; border-color:gray; }
-table { font-family:'맑은 고딕'; line-height:110%; }
-font { font-family:'맑은 고딕'; line-height:110%; }
-input { font-family:'맑은 고딕'; line-height:110%; height:20px }
-select { font-family:'굴림'; line-height:100%; }
-#bg0 { background-image:url(<?=ServConfig::$gameImagePath?>/back_walnut.jpg); }
-#bg1 { background-image:url(<?=ServConfig::$gameImagePath?>/back_green.jpg); }
-#bg2 { background-image:url(<?=ServConfig::$gameImagePath?>/back_blue.jpg); }
-</style>

+<head>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 토너먼트</title>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>

 <body>
-<table align=center width=2000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>삼모전 토너먼트<br><?=closeButton()?></td></tr>
-</table>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<?php
-if ($session->userGrade >= 5) {
-    $sel = [];
-    echo "
-<form method=post action=c_tournament.php>
-    <tr><td colspan=8><input type=textarea size=150 style=color:white;background-color:black; name=msg><input type=submit name=btn value='메시지'></td></tr>
-    <tr><td colspan=8>
-        <input type=button value='갱신' onclick='location.reload()'>";
+    <table align=center width=2000 class='tb_layout bg0'>
+        <tr>
+            <td>삼모전 토너먼트<br><?= closeButton() ?></td>
+        </tr>
+    </table>
+    <table align=center class='tb_layout bg0'>
+        <?php if ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) : ?>
+            <form method=post action=c_tournament.php>
+                <tr>
+                    <td colspan=8><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button><button type="submit" class="btn btn-sammo-base2" onclick='return confirm("참가비 금<?= $admin['develcost'] ?>이 필요합니다. 참가하시겠습니까?")'>참가</button><input type='hidden' name='btn' value='참가'/></td>
+                </tr>
+            </form>
+        <?php else : ?>
+            <tr>
+                <td colspan=8><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button></td>
+            </tr>
+        <?php endif;

-    switch ($admin['tnmt_trig']) {
-    case 0: $sel[0] = "selected"; break;
-    case 1: $sel[1] = "selected"; break;
-    case 2: $sel[2] = "selected"; break;
-    case 3: $sel[3] = "selected"; break;
-    case 4: $sel[4] = "selected"; break;
-    case 5: $sel[5] = "selected"; break;
-    case 6: $sel[6] = "selected"; break;
-    case 7: $sel[7] = "selected"; break;
-    }
-
-    if ($admin['tournament'] == 0) {
-        ?>
-            <select name=auto size=1 style=color:white;background-color:black;>
-                <option style=color:white; value=0>수동진행</option>
-                <option style=color:white; value=1>12분 05일</option>
-                <option style=color:white; value=2>07분 10시</option>
-                <option style=color:white; value=3>03분 04시</option>
-                <option style=color:white; value=4>01분 82분</option>
-                <option style=color:white; value=5>30초 41분</option>
-                <option style=color:white; value=6>15초 21분</option>
-                <option style=color:white; value=7>05초 07분</option>
-            </select>
-            <select name=type size=1 style=color:white;background-color:black;>
-                <option style=color:white; value=0>전력전</option>
-                <option style=color:white; value=1>통솔전</option>
-                <option style=color:white; value=2>일기토</option>
-                <option style=color:white; value=3>설전</option>
-            </select>
-            <input type=submit name=btn value='개최'>
-            <select name=trig size=1 style=color:white;background-color:black;>
-                <option style=color:white; value=0 <?=$sel[0]??''?>>수동진행</option>
-                <option style=color:white; value=1 <?=$sel[1]??''?>>12분 05일</option>
-                <option style=color:white; value=2 <?=$sel[2]??''?>>07분 10시</option>
-                <option style=color:white; value=3 <?=$sel[3]??''?>>03분 04시</option>
-                <option style=color:white; value=4 <?=$sel[4]??''?>>01분 82분</option>
-                <option style=color:white; value=5 <?=$sel[5]??''?>>30초 41분</option>
-                <option style=color:white; value=6 <?=$sel[6]??''?>>15초 21분</option>
-                <option style=color:white; value=7 <?=$sel[7]??''?>>05초 07분</option>
-            </select>
-            <input type=submit name=btn value='자동개최설정'>
-            <input type=submit name=btn value='포상'>
-            <input type=submit name=btn value='회수'>
-        <?php
-    } else {
-        echo "<input type=submit name=btn value='중단' onclick='return confirm(\"진짜 중단하시겠습니까?\")'>";
-    }
-
-    switch ($admin['tournament']) {
-    case 1:
-        echo "<select name=gen size=1 style=color:white;background-color:black;>";
-
-        $query = "select no,name,npc,tnmt,leader,power,intel,leader+power+intel as total from general where tournament=0 and gold>='{$admin['develcost']}' order by {$tp3} desc";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-        $genCount = MYDB_num_rows($result);
-
-        for ($i=0; $i < $genCount; $i++) {
-            $general = MYDB_fetch_array($result);
-            if ($general['npc'] >= 2) {
-                $npc = "cyan";
-            } elseif ($general['npc'] == 1) {
-                $npc = "skyblue";
-            } elseif ($general['tnmt'] > 0) {
-                $npc = "blue";
-            } else {
-                $npc = "white";
-            }
-            echo "<option style=color:{$npc}; value={$general['no']}>[{$general[$tp3]}]{$general['name']}</option>";
+        $str1 = getTournament($admin['tournament']);
+        $str2 = getTournamentTime();
+        if ($str2) {
+            $str2 = ', ' . $str2;
        }
+        $str3 = getTournamentTermText($turnTerm);
+        if ($str3) {
+            $str3 = ', ' . $str3;
+        }
+        ?>
+        <tr>
+            <td colspan=8>운영자 메세지 : <font color=orange size=5><?= $admin['tnmt_msg'] ?></font>
+            </td>
+        </tr>
+        <tr>
+            <td colspan=8 align=center>
+                <font color=white size=6><span style="color:<?= $color ?>"><?= $tnmt_type ?></span> (<?= $str1 . $str2 . $str3 ?>)</font>
+            </td>
+        </tr>
+        <tr>
+            <td colspan=8 align=center class='bg2'>
+                <font color=magenta size=5>16강 승자전</font>
+            </td>
+        </tr>
+        <tr>
+            <td height=10 colspan=8 align=center></td>
+        </tr>
+        <?php
+
        echo "
-        </select>
-        <input type=submit name=btn value='투입'>
-        <input type=submit name=btn value='무명투입'>
-        <input type=submit name=btn value='쪼렙투입'>
-        <input type=submit name=btn value='일반투입'>
-        <input type=submit name=btn value='굇수투입'>
-        <input type=submit name=btn value='랜덤투입'>
-        <input type=submit name=btn value='쪼렙전부투입'>
-        <input type=submit name=btn value='일반전부투입'>
-        <input type=submit name=btn value='굇수전부투입'>
-        <input type=submit name=btn value='랜덤전부투입'>
-        <input type=submit name=btn value='무명전부투입'>";
-        break;
-    case 2: echo "<input type=submit name=btn value='예선'><input type=submit name=btn value='예선전부'>"; break;
-    case 3: echo "<input type=submit name=btn value='추첨'><input type=submit name=btn value='추첨전부'>"; break;
-    case 4: echo "<input type=submit name=btn value='본선'><input type=submit name=btn value='본선전부'>"; break;
-    case 5: echo "<input type=submit name=btn value='배정'>"; break;
-    case 6: echo "<input type=submit name=btn value='베팅마감'>"; break;
-    case 7: echo "<input type=submit name=btn value='16강'>"; break;
-    case 8: echo "<input type=submit name=btn value='8강'>"; break;
-    case 9: echo "<input type=submit name=btn value='4강'>"; break;
-    case 10: echo "<input type=submit name=btn value='결승'>"; break;
-    }
-
-    echo "
-    </td></tr>
-</form>";
-} elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) {
-    echo "<form method=post action=c_tournament.php><tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'><input type=submit name=btn value='참가' onclick='return confirm(\"참가비 금{$admin['develcost']}이 필요합니다. 참가하시겠습니까?\")'></td></tr></form>";
-} else {
-    echo "<tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'></td></tr>";
-}
-
-$str1 = getTournament($admin['tournament']);
-$str2 = getTournamentTime();
-$str3 = getTournamentTerm();
-?>
-    <tr><td colspan=8>운영자 메세지 : <font color=orange size=5><?=$admin['tnmt_msg']?></font></td></tr>
-    <tr><td colspan=8 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.", ".$str2.", ".$str3?>)</font></td></tr>
-    <tr><td colspan=8 align=center id=bg2><font color=magenta size=5>16강 승자전</font></td></tr>
-    <tr><td height=10 colspan=8 align=center></td></tr>
-<?php
-
-echo "
    <tr>
        <td colspan=8>
-            <table align=center width=2000 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+            <table align=center width=2000 class='bg0 mimic_flex'>
               <tr align=center>";

-$query = "select npc,name,win from tournament where grp>=60 order by grp, grp_no";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-for ($i=0; $i < 1; $i++) {
-    $general = MYDB_fetch_array($result) ?? [
-        'name'=>'',
-        'npc'=>0,
-        'win'=>0
-    ];
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    echo "<td colspan=16>{$general['name']}</td>";
-}
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=60 order by grp, grp_no LIMIT 1');
+        while (count($generalList) < 1) {
+            $generalList[] = [
+                'name' => '-',
+                'npc' => 0,
+                'win' => 0
+            ];
+        }
+        foreach ($generalList as $i => $general) {
+            if ($general['name'] == "") {
+                $general['name'] = "-";
+            }
+            $general['name'] = formatName($general['name'], $general['npc']);
+            echo "<td colspan=16>{$general['name']}</td>";
+        }

-echo "
+        echo "
                </tr>
                <tr align=center>";

-$query = "select npc,name,win from tournament where grp>=50 order by grp, grp_no";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$cent = [];
-for ($i=0; $i < 1; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-$line = [];
-$gen = [];
-for ($i=0; $i < 2; $i++) {
-    //FIXME: 다시 작성. null인 경우엔 어쩌려고?
-    $general = MYDB_fetch_array($result) ?? [
-        'name'=>'',
-        'npc'=>0,
-        'win'=>0
-    ];
-
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 1; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓"."</font>";
-    echo "<td colspan=16>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+        $cent = [];
+        for ($i = 0; $i < 1; $i++) {
+            $cent[$i] = "<font color=white>";
+        }
+        $line = [];
+        $gen = [];
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=50 order by grp, grp_no LIMIT 2');
+        while (count($generalList) < 2) {
+            $generalList[] = [
+                'name' => '-',
+                'npc' => 0,
+                'win' => 0
+            ];
+        }
+        foreach ($generalList as $i => $general) {
+            if ($general['name'] == "") {
+                $general['name'] = "-";
+            }
+            $general['name'] = formatName($general['name'], $general['npc']);
+            if ($general['win'] > 0) {
+                $line[$i] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
+            } else {
+                $line[$i] = "<font color=white>";
+            }
+            $gen[$i] = $general['name'];
+        }
+        for ($i = 0; $i < 1; $i++) {
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" . "</font>";
+            $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓" . "</font>";
+            echo "<td colspan=16>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+        }
+        echo "
                </tr>
                <tr align=center>";

-for ($i=0; $i < 2; $i++) {
-    echo "<td colspan=8>{$gen[$i]}</td>";
-}
+        for ($i = 0; $i < 2; $i++) {
+            echo "<td colspan=8>{$gen[$i]}</td>";
+        }

-echo "
+        echo "
+                </tr>
+                <tr align=center>";
+        for ($i = 0; $i < 2; $i++) {
+            $cent[$i] = "<font color=white>";
+        }
+
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=40 order by grp, grp_no LIMIT 4');
+        while (count($generalList) < 4) {
+            $generalList[] = [
+                'name' => '-',
+                'npc' => 0,
+                'win' => 0
+            ];
+        }
+        foreach ($generalList as $i => $general) {
+            if ($general['name'] == "") {
+                $general['name'] = "-";
+            }
+            $general['name'] = formatName($general['name'], $general['npc']);
+            if ($general['win'] > 0) {
+                $line[$i] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
+            } else {
+                $line[$i] = "<font color=white>";
+            }
+            $gen[$i] = $general['name'];
+        }
+        for ($i = 0; $i < 2; $i++) {
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━━━━━━━━━━" . "</font>";
+            $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━━━━━━━━━━┓" . "</font>";
+            echo "<td colspan=8>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+        }
+        echo "
                </tr>
                <tr align=center>";

-$query = "select npc,name,win from tournament where grp>=40 order by grp, grp_no";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-for ($i=0; $i < 2; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-for ($i=0; $i < 4; $i++) {
-    $general = MYDB_fetch_array($result) ?? [
-        'name'=>'',
-        'npc'=>0,
-        'win'=>0
-    ];
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 2; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━━━━━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━━━━━━━━━━┓"."</font>";
-    echo "<td colspan=8>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+        for ($i = 0; $i < 4; $i++) {
+            echo "<td colspan=4>{$gen[$i]}</td>";
+        }
+
+        echo "
                </tr>
                <tr align=center>";

-for ($i=0; $i < 4; $i++) {
-    echo "<td colspan=4>{$gen[$i]}</td>";
-}
+        for ($i = 0; $i < 4; $i++) {
+            $cent[$i] = "<font color=white>";
+        }

-echo "
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=30 order by grp, grp_no LIMIT 8');
+        while (count($generalList) < 8) {
+            $generalList[] = [
+                'name' => '-',
+                'npc' => 0,
+                'win' => 0
+            ];
+        }
+        foreach ($generalList as $i => $general) {
+            if ($general['name'] == "") {
+                $general['name'] = "-";
+            }
+            $general['name'] = formatName($general['name'], $general['npc']);
+            if ($general['win'] > 0) {
+                $line[$i] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
+            } else {
+                $line[$i] = "<font color=white>";
+            }
+            $gen[$i] = $general['name'];
+        }
+        for ($i = 0; $i < 4; $i++) {
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━" . "</font>";
+            $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━┓" . "</font>";
+            echo "<td colspan=4>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+        }
+        echo "
                </tr>
                <tr align=center>";

-$query = "select npc,name,win from tournament where grp>=30 order by grp, grp_no";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-for ($i=0; $i < 4; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-for ($i=0; $i < 8; $i++) {
-    $general = MYDB_fetch_array($result) ?? [
-        'name'=>'',
-        'npc'=>0,
-        'win'=>0
-    ];
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 4; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━┓"."</font>";
-    echo "<td colspan=4>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+        for ($i = 0; $i < 8; $i++) {
+            echo "<td colspan=2>{$gen[$i]}</td>";
+        }
+
+        echo "
                </tr>
                <tr align=center>";

-for ($i=0; $i < 8; $i++) {
-    echo "<td colspan=2>{$gen[$i]}</td>";
-}
-
-echo "
+        for ($i = 0; $i < 8; $i++) {
+            $cent[$i] = "<font color=white>";
+        }
+        $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' => '-',
+                'npc' => 0,
+                'win' => 0
+            ];
+        }
+        foreach ($generalList as $i => $general) {
+            if ($general['name'] == "") {
+                $general['name'] = "-";
+            }
+            $general['name'] = formatName($general['name'], $general['npc']);
+            if ($general['win'] > 0) {
+                $line[$i] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
+            } else {
+                $line[$i] = "<font color=white>";
+            }
+            $gen[$i] = $general['name'];
+        }
+        for ($i = 0; $i < 8; $i++) {
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━" . "</font>";
+            $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>";

-$query = "select npc,name,win from tournament where grp>=20 order by grp, grp_no";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-for ($i=0; $i < 8; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-for ($i=0; $i < 16; $i++) {
-    $general = MYDB_fetch_array($result) ?? [
-        'name'=>'',
-        'npc'=>0,
-        'win'=>0
-    ];
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 8; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━"."</font>";
-    $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>";
+        for ($i = 0; $i < 16; $i++) {
+            echo "<td width=125>{$gen[$i]}</td>";
+        }

-for ($i=0; $i < 16; $i++) {
-    echo "<td width=125>{$gen[$i]}</td>";
-}
-
-echo"
+        echo "
                </tr>";
+        $admin = $gameStor->getValues(['tournament', 'phase']);
+        $bet = [];
+        $gold = [];
+        $keyMap = [];
+        foreach ($info->candidates as $key => $candidate) {
+            $keyMap[$candidate->aux['idx']] = $key;
+        }

-$query = "select tournament,bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$betting = MYDB_fetch_array($result);
-$bet = [];
-for ($i=0; $i < 16; $i++) {
-    if($betting['bet'] == 0){
-        $bet[$i] = '∞';
-        continue;
-    }
-    $bet[$i]  = round($betting['bet'] /  $betting["bet{$i}"], 2);
-}
+        foreach ($globalBet as $key => $amount) {
+            if ($amount == 0) {
+                $bet[$key] = "∞";
+                $gold[$key] = 0;
+            } else {
+                $rewardRatio = round($globalBetTotal / $amount, 2);
+                $bet[$key]  = $rewardRatio;
+                $gold[$key] = $rewardRatio * ($myBet[$key] ?? 0);
+            }
+        }

-echo "
+        echo "
                <tr align=center>";

-for ($i=0; $i < 16; $i++) {
-    echo "<td><font color=skyblue>{$bet[$i]}</font></td>";
-}
+        foreach (range(0, 15) as  $i) {
+            $amount = $bet[$keyMap[$i] ?? -1] ?? 0;
+            echo "<td><font color=skyblue>{$amount}</font></td>";
+        }

-echo "
+        echo "
                </tr>
                <tr align=center><td height=10 colspan=16></td></tr>
                <tr align=center><td colspan=16><font color=skyblue size=4>배당률이 낮을수록 베팅된 금액이 많고 유저들이 우승후보로 많이 선택한 장수입니다.</font></td></tr>
@@ -424,86 +397,94 @@ echo "
        </td>
    </tr>";

-if ($admin['tournament'] >= 7 || $admin['tournament'] == 0) {
-    printFighting($admin['tournament'], $admin['phase']);
-}
-echo "
+        if ($admin['tournament'] >= 7 || $admin['tournament'] == 0) {
+            printFighting($admin['tournament'], $admin['phase']);
+        }
+        echo "
    <tr><td height=10 colspan=8 align=center></td></tr>
-    <tr><td colspan=8 align=center id=bg2><font color=orange size=5>조별 본선 순위</font></td></tr>
+    <tr><td colspan=8 align=center class='bg2'><font color=orange size=5>조별 본선 순위</font></td></tr>
    <tr>";

-$num = array("一", "二", "三", "四", "五", "六", "七", "八");
+        $num = array("一", "二", "三", "四", "五", "六", "七", "八");

-for ($i=0; $i < 8; $i++) {
-    $grp = $i + 10;
-    echo "
+        for ($i = 0; $i < 8; $i++) {
+            $grp = $i + 10;
+            echo "
        <td>
-            <table align=center width=250 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+            <table align=center width=250 class='tb_layout bg0'>
                <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
-                <tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
+                <tr class='bg1'><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";

-    $query = "select npc,name,ldr,pwr,itl,ldr+pwr+itl as tot,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp='$grp' order by gd desc, gl desc, seq";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    for ($k=1; $k <= 4; $k++) {
-        $general = MYDB_fetch_array($result);
-        printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
-    }
-    echo "
+            $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq', $grp);
+            foreach ($generalList as $k => $general) {
+                printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
+            }
+            foreach (Util::range(count($generalList), 4) as $idx) {
+                printRow($idx, 0, '', '', '', '', '', '', '', '', '');
+            }
+            echo "
            </table>
        </td>";
-}
-echo "</tr>";
-if ($admin['tournament'] == 4 || $admin['tournament'] == 5) {
-    printFighting($admin['tournament'], $admin['phase']);
-}
-echo "
-    <tr><td colspan=8 align=center id=bg2><font color=yellow size=5>조별 예선 순위</font></td></tr>
+        }
+        echo "</tr>";
+        if ($admin['tournament'] == 4 || $admin['tournament'] == 5) {
+            printFighting($admin['tournament'], $admin['phase']);
+        }
+        echo "
+    <tr><td colspan=8 align=center class='bg2'><font color=yellow size=5>조별 예선 순위</font></td></tr>
    <tr>";

-for ($i=0; $i < 8; $i++) {
-    $grp = $i;
-    echo "
+        for ($i = 0; $i < 8; $i++) {
+            $grp = $i;
+            echo "
        <td>
-            <table align=center width=250 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+            <table align=center width=250 class='tb_layout bg0'>
                <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
-                <tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
+                <tr class='bg1'><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";

-    $query = "select npc,name,ldr,pwr,itl,ldr+pwr+itl as tot,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp='$grp' order by gd desc, gl desc, seq";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    for ($k=1; $k <= 8; $k++) {
-        $general = MYDB_fetch_array($result);
-        printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
-    }
-    echo "
+            $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq', $grp);
+            foreach ($generalList as $k => $general) {
+                printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
+            }
+            foreach (Util::range(count($generalList), 8) as $idx) {
+                printRow($idx, 0, '', '', '', '', '', '', '', '', '');
+            }
+            echo "
            </table>
        </td>";
-}
+        }

-if ($admin['tournament'] == 2 || $admin['tournament'] == 3) {
-    printFighting($admin['tournament'], $admin['phase']);
-}
+        if ($admin['tournament'] == 2 || $admin['tournament'] == 3) {
+            printFighting($admin['tournament'], $admin['phase']);
+        }

-?>
-    </tr>
-    <tr><td colspan=8>
-        <font color=white size=2>
-ㆍ예선은 홈&amp;어웨이 풀리그로 진행됩니다. (총 14경기)<br>
-ㆍ상위 4명이 본선에 진출하게 되며 조추첨을 통해 조가 배정됩니다.<br>
-ㆍ각 조1위가 시드1로 랜덤하게 조에 배정되며, 역시 각 조2위가 시드2로 랜덤하게 조에 배정됩니다.<br>
-ㆍ그후 남은 3, 4위는 완전 랜덤하게 모든 조에 랜덤하게 배정됩니다.<br>
-ㆍ본선은 개인당 3경기를 치르게 되며 승점(승3, 무1, 패0), 득실, 참가순서(시드)에 따라 순위를 매깁니다.<br>
-ㆍ각 조 1, 2위는 16강에 지정된 위치에 배정됩니다.<br>
-ㆍ16강부터는 1경기 토너먼트로 진행됩니다.<br>
-ㆍ참가비는 금20~140이며, 성적에 따라 금과 약간의 명성이 포상으로 주어집니다.<br>
-ㆍ16강자 100, 8강자 300, 4강자 600, 준우승자 1200, 우승자 2000 (220년 기준)<br>
-ㆍ즐거운 삼토!
-        </font>
-    </td></tr>
-</table>
-<table align=center width=2000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-<?php PrintElapsedTime(); ?>
+        ?>
+        </tr>
+        <tr>
+            <td colspan=8>
+                <font color=white size=2>
+                    ㆍ예선은 홈&amp;어웨이 풀리그로 진행됩니다. (총 14경기)<br>
+                    ㆍ상위 4명이 본선에 진출하게 되며 조추첨을 통해 조가 배정됩니다.<br>
+                    ㆍ각 조1위가 시드1로 랜덤하게 조에 배정되며, 역시 각 조2위가 시드2로 랜덤하게 조에 배정됩니다.<br>
+                    ㆍ그후 남은 3, 4위는 완전 랜덤하게 모든 조에 랜덤하게 배정됩니다.<br>
+                    ㆍ본선은 개인당 3경기를 치르게 되며 승점(승3, 무1, 패0), 득실, 참가순서(시드)에 따라 순위를 매깁니다.<br>
+                    ㆍ각 조 1, 2위는 16강에 지정된 위치에 배정됩니다.<br>
+                    ㆍ16강부터는 1경기 토너먼트로 진행됩니다.<br>
+                    ㆍ참가비는 금20~140이며, 성적에 따라 금과 약간의 명성이 포상으로 주어집니다.<br>
+                    ㆍ16강자 100, 8강자 300, 4강자 600, 준우승자 1200, 우승자 2000 (220년 기준)<br>
+                    ㆍ즐거운 삼토!
+                </font>
+            </td>
+        </tr>
+    </table>
+    <table align=center width=2000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>
@@ -1,164 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("부대편성", 1);
-
-$query = "select no,nation,troop from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$query = "select * from troop where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$troopcount = MYDB_num_rows($result);
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>부대편성</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
-</head>
-
-<body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td>부 대 편 성<br><?=backButton()?></td></tr>
-</table>
-<form name=form1 method=post action=c_troop.php>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td align=center width=64  id=bg1>선 택</td>
-        <td align=center width=98  id=bg1>부 대 정 보</td>
-        <td align=center width=64  id=bg1>부 대 장</td>
-        <td align=center width=662 id=bg1 style=table-layout:fixed;word-break:break-all;>장 수</td>
-        <td align=center width=98  id=bg1 style=table-layout:fixed;word-break:break-all;>부대장행동</td>
-    </tr>
-<?php
-for($i=0; $i < $troopcount; $i++) {
-    $troop = MYDB_fetch_array($result);
-
-    $genlist = "";
-    $query = "select no,name,picture,imgsvr,turntime,city,turn0,turn1,turn2,turn3,turn4,turn5 from general where troop='{$troop['troop']}'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gencount = MYDB_num_rows($genresult);
-    for($j=0; $j < $gencount; $j++) {
-        $general = MYDB_fetch_array($genresult);
-        $genlist .= $general['name'].", ";
-        if($troop['no'] == $general['no']) {
-            $picture = $general['picture'];
-            $imageTemp = GetImageURL($general['imgsvr']);
-            $name = $general['name'];
-            $turntime = $general['turntime'];
-            $query = "select name from city where city='{$general['city']}'";
-            $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $city = MYDB_fetch_array($cityresult);
-            $cityname = $city['name'];
-            $turn = "";
-            for($k=0; $k < 5; $k++) {
-                $m = $k+1;
-                if($general["turn{$k}"] == 26) {
-                    $turn .= "&nbsp;$m : 집합<br>";
-                } else {
-                    $turn .= "&nbsp;$m : ∼<br>";
-                }
-            }
-        }
-    }
-    $genlist .= "({$gencount}명)";
-
-    if($me['troop'] == 0) {
-        echo "
-    <tr>
-        <td align=center rowspan=2><input "; echo $i==0?"checked ":""; echo "type=radio name=troop value='{$troop['troop']}'></td>
-        <td align=center >{$troop['name']}<br>【 $cityname 】</td>
-        <td height=64 style='background:no-repeat center url(\"{$imageTemp}/{$picture}\");background-size:64px;'>&nbsp;</td>
-        <td rowspan=2 width=662>$genlist</td>
-        <td rowspan=2>$turn</td>
-    </tr>
-    <tr><td align=center><font size=2>【턴】".substr($turntime, 14)."</font></td><td align=center><font size=1>$name</font></td></tr>
-    <tr><td colspan=5>";
-    } else {
-        echo "
-    <tr>
-        <td align=center rowspan=2>&nbsp;</td>
-        <td align=center >{$troop['name']}<br>【 $cityname 】</td>
-        <td height=64 style='background:no-repeat center url(\"{$imageTemp}/{$picture}\");background-size:64px;'>&nbsp;</td>
-        <td rowspan=2 width=662>$genlist</td>
-        <td rowspan=2>";
-
-        if($troop['no'] == $me['no']) {
-            $query = "select no,name from general where troop='{$troop['troop']}' and no!='{$me['no']}' order by binary(name)";
-            $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $genCount = MYDB_num_rows($genresult);
-                echo "
-            <select name=gen size=3 style=color:white;background-color:black;font-size:13px;width:98px;>";
-            for($k=0; $k < $genCount; $k++) {
-                $general = MYDB_fetch_array($genresult);
-                echo "
-                <option value={$general['no']}>{$general['name']}</option>";
-            }
-            echo "
-            </select><br>
-            <input type=submit name=btn value='부 대 추 방' style=width:100px;height:25px;>";
-        } else {
-            echo $turn;
-        }
-
-        echo "
-        </td>
-    </tr>
-    <tr><td align=center><font size=2>【턴】".substr($turntime, 14)."</font></td><td align=center><font size=1>$name</font></td></tr>
-    <tr><td colspan=5>";
-    }
-}
-
-if($me['troop'] == 0) {
-    echo"
-<input type=submit name=btn value='부 대 가 입'>";
-} else {
-    echo"
-<input type=submit name=btn value='부 대 탈 퇴' onclick='return confirm(\"정말 부대를 탈퇴하시겠습니까?\")'>";
-}
-
-echo "
-</td></tr>
-</table>
-<br>";
-
-echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=80 id=bg1>부 대 명</td>
-        <td width=100><input type=text style=color:white;background-color:black; size=12 maxlength=6 name=name></td>";
-if($me['troop'] == 0) {
-    echo "
-        <td><input type=submit name=btn value='부 대 창 설'></td>";
-} else {
-    echo "
-        <td><input type=submit name=btn value='부 대 변 경'></td>";
-}
-echo "
-    </tr>
-</table>";
-
-?>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-</form>
-<?php PrintElapsedTime(); ?>
-</body>
-</html>
-
@@ -0,0 +1,553 @@
+<?php
+
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+$session = Session::requireLogin()->setReadOnly();
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$gameStor->cacheValues(['startyear', 'year']);
+$startYear = $gameStor->startyear;
+$year = $gameStor->year;
+
+$me = $db->queryFirstRow('SELECT no, nation, city FROM general WHERE owner =%i', Session::getUserID());
+
+if ($me) {
+    $generalID = $me['no'];
+    $nationID = $me['nation'];
+    $city = $db->queryFirstRow('SELECT city, level, def, wall FROM city WHERE city = %i', $me['city']);
+} else {
+    $generalID = 0;
+    $nationID = 0;
+    $city = [
+        'city' => 0,
+        'level' => 5,
+        'def' => 1000,
+        'wall' => 1000,
+    ];
+}
+
+if ($nationID) {
+    $nation = $db->queryFirstRow('SELECT level, type, tech, capital FROM nation WHERE nation = %i', $nationID);
+} else {
+    $nation = null;
+}
+
+?>
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title><?= UniqueConst::$serverName ?>: 전투 시뮬레이터</title>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1100" />
+    <?= 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/battle_simulator.css') ?>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <script>
+        var defaultSpecialDomestic = '<?= GameConst::$defaultSpecialDomestic ?>';
+        var city = <?= Json::encode($city) ?>;
+        var nation = <?= Json::encode($nation) ?>;
+    </script>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common', 'battle_simulator']) ?>
+</head>
+
+<body>
+    <div id="container">
+        <div class="card mb-3">
+            <div class="card-header">
+                전역 설정
+            </div>
+            <div class="card-body dragpad_battle">
+                <div class="row gx-0">
+                    <div class="col-sm-4">
+                        <div class="input-group">
+                            <input type="number" class="form-control" aria-describedby="text_year" value="<?= $startYear ?>" disabled>
+                            <div class="input-group-text"> 년 시작 </div>
+                            <input type="number" class="form-control" id="year" value="<?= $year ?>" min="<?= $startYear ?>">
+                            <div class="input-group-text"> 년 </div>
+                            <input type="number" class="form-control" id="month" value="1" min="1" max="12">
+                            <div class="input-group-text"> 월 </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-5 px-2">
+                        <div class="btn-toolbar" role="toolbar">
+                            <div class="input-group me-2" role="group">
+                                <div class="input-group-text">
+                                    시드
+                                </div>
+                                <input type="text" class="form-control" id="seed" aria-describedby="text_seed">
+                                <div class="input-group-text">
+                                    반복 횟수
+                                </div>
+                                <select class="form-select" id="repeat_cnt">
+                                    <option value="1">1회 (로그 표기)</option>
+                                    <option value="1000">1000회 (요약 표기)</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="btn-toolbar" role="toolbar">
+                            <div class="btn-group me-2" role="group">
+                                <button type="button" class="btn btn-danger btn-begin_battle">전투</button>
+                            </div>
+                            <div class="btn-group me-2" role="group">
+                                <button type="button" class="btn btn-info btn-battle-save">모두 저장</button>
+                                <input type="file" class="form_load_battle_file" accept=".json" style="display: none;" />
+                                <button type="button" class="btn btn-primary btn-battle-load">모두 불러오기</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-sm">
+                <div class="card mb-2 attacker_nation">
+                    <div class="card-header">
+                        출병국 설정
+                    </div>
+                    <div class="card-body nation_detail dragpad_battle">
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">국가 성향
+                            </div>
+                            <select class="form-select form_nation_type" style="width:25ch;">
+                                <?php foreach (GameConst::$availableNationType as $typeID) : ?>
+                                    <?php $nationTypeClass = buildNationTypeClass($typeID) ?>
+                                    <option value="<?= $typeID ?>"><?= $nationTypeClass->getName() ?> (<?= $nationTypeClass::$pros ?>, <?= $nationTypeClass::$cons ?>)</option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">기술 </div>
+                            <input type="number" class="form-control form_tech" value="1" min="0" max="12">
+                            <div class="input-group-text">등급 </div>
+                        </div>
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">국가 규모 </div>
+                            <select class="form-select form_nation_level">
+                                <?php foreach (getNationLevelList() as $nationLevel => [$name, $chiefCnt, $cityCnt]) : ?>
+                                    <option value="<?= $nationLevel ?>"><?= $name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">도시 규모
+                            </div>
+                            <select class="form-select form_city_level">
+                                <?php foreach (getCityLevelList() as $levelID => $name) : ?>
+                                    <option value="<?= $levelID ?>"><?= $name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">수도
+                            </div>
+                            <div class="btn-group" role="group" aria-label="수도">
+                                <input type="radio" class="btn-check" name="is_attacker_capital" value="1" id="is_attacker_capital_1" autocomplete="off">
+                                <label class="btn btn-secondary" for="is_attacker_capital_1">Y</label>
+
+                                <input type="radio" class="btn-check" name="is_attacker_capital" value="0" id="is_attacker_capital_0" autocomplete="off" checked>
+                                <label class="btn btn-secondary" for="is_attacker_capital_0">N</label>
+                            </div>
+
+                        </div>
+                        <div class="input-group mb-1">
+
+                        </div>
+                    </div>
+                </div>
+                <div class="card mb-2 attacker_form general_form" data-general_no='1'>
+                    <div class="card-header">
+                        <div class="float-sm-start" style="line-height:25px;">출병자 설정</div>
+                        <div class="float-sm-end btn-toolbar" role="toolbar">
+                            <div class="btn-group btn-group-sm me-2" role="group">
+                                <button type="button" class="btn btn-success btn-general-import-server">서버에서 가져오기</button>
+                            </div>
+                            <div class="btn-group btn-group-sm me-2" role="group">
+                                <button type="button" class="btn btn-info btn-general-save">저장</button>
+                                <input type="file" class="form_load_general_file" accept=".json" style="display: none;" />
+                                <button type="button" class="btn btn-primary btn-general-load">불러오기</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div><!-- <div class="col-sm"> -->
+            <div class="col-sm defender-column">
+                <div class="card mb-2 defender_nation">
+                    <div class="card-header">
+                        수비국 설정
+                    </div>
+                    <div class="card-body dragpad_battle">
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">국가 성향
+                            </div>
+                            <select class="form-select form_nation_type" style="width:25ch;">
+                                <?php foreach (GameConst::$availableNationType as $typeID) : ?>
+                                    <?php $nationTypeObj = buildNationTypeClass($typeID) ?>
+                                    <option value="<?= $typeID ?>"><?= $nationTypeObj->getName() ?> (<?= $nationTypeObj::$pros ?>, <?= $nationTypeObj::$cons ?>)</option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">기술
+                            </div>
+                            <input type="number" class="form-control form_tech" value="1" min="0" max="12">
+                            <div class="input-group-text">등급
+                            </div>
+                        </div>
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">국가 규모
+                            </div>
+                            <select class="form-select form_nation_level">
+                                <?php foreach (getNationLevelList() as $nationLevel => [$name, $chiefCnt, $cityCnt]) : ?>
+                                    <option value="<?= $nationLevel ?>"><?= $name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">도시 규모
+                            </div>
+                            <select class="form-select form_city_level">
+                                <?php foreach (getCityLevelList() as $levelID => $name) : ?>
+                                    <option value="<?= $levelID ?>"><?= $name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">수도
+                            </div>
+                            <div class="btn-group" role="group" aria-label="수도">
+                                <input type="radio" class="btn-check" name="is_defender_capital" value="1" id="is_defender_capital_1" autocomplete="off">
+                                <label class="btn btn-secondary" for="is_defender_capital_1">Y</label>
+
+                                <input type="radio" class="btn-check" name="is_defender_capital" value="0" id="is_defender_capital_0" autocomplete="off" checked>
+                                <label class="btn btn-secondary" for="is_defender_capital_0">N</label>
+                            </div>
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">수비
+                            </div>
+                            <input type="number" class="form-control form_def" id="city_def" value="1000" min="10" step="10">
+                            <div class="input-group-text">성벽
+                            </div>
+                            <input type="number" class="form-control form_wall" id="city_wall" value="1000" min="0" step="10">
+                        </div>
+                    </div>
+                </div>
+                <div class="card mb-2 defender_add_form">
+                    <div class="card-header">
+                        <div class="float-sm-start" style="line-height:25px;">수비자 설정</div>
+                        <div class="float-sm-end btn-toolbar" role="toolbar">
+                            <div class="btn-group btn-group-sm me-2" role="group">
+                                <button type="button" class="btn btn-dark btn-reorder_defender">수비 순서대로 정렬</button>
+                            </div>
+                            <div class="btn-group btn-group-sm" role="group">
+                                <button type="button" class="btn btn-success add-defender">추가</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="card mb-2 form_sample">
+                    <div class="card-header">
+                        <div class="float-sm-start" style="line-height:25px;">수비자 설정</div>
+                        <div class="float-sm-end btn-toolbar" role="toolbar">
+                            <div class="btn-group btn-group-sm me-2" role="group">
+                                <button type="button" class="btn btn-success btn-general-import-server">서버에서 가져오기</button>
+                            </div>
+                            <div class="btn-group btn-group-sm me-2" role="group">
+                                <button type="button" class="btn btn-info btn-general-save">저장</button>
+                                <input type="file" class="form_load_general_file" accept=".json" style="display: none;" />
+                                <button type="button" class="btn btn-primary btn-general-load">불러오기</button>
+                            </div>
+                            <div class="btn-group btn-group-sm" role="group">
+                                <button type="button" class="btn btn-warning copy-defender">복제</button>
+                                <button type="button" class="btn btn-danger delete-defender">제거</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="card-body general_detail">
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">이름
+                            </div>
+                            <input type="text" class="form-control form_general_name" value="무명" style="width:15ch;">
+                            <div class="input-group-text">직위
+                            </div>
+                            <select class="form-select form_officer_level" style="width:8ch;">
+                                <option value="1">일반</option>
+                                <option value="4">태수</option>
+                                <option value="3">군사</option>
+                                <option value="2">종사</option>
+                                <option value="10">무장 수뇌</option>
+                                <option value="9">지장 수뇌</option>
+                                <option value="11">참모</option>
+                                <option value="12">군주</option>
+                            </select>
+                            <div class="input-group-text">Level
+                            </div>
+                            <input type="number" class="form-control form_exp_level" value="20" min="0" max="300" step="1">
+
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">통솔
+                            </div>
+                            <input type="number" class="form-control form_leadership" value="50" min="1" max="300" step="1">
+                            <div class="input-group-text">무력
+                            </div>
+                            <input type="number" class="form-control form_strength" value="50" min="1" max="300" step="1">
+                            <div class="input-group-text">지력
+                            </div>
+                            <input type="number" class="form-control form_intel" value="50" min="1" max="300" step="1">
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">명마
+                            </div>
+                            <select class="form-select form_general_horse">
+                                <option value='None'>-</option>
+                                <?php foreach (GameConst::$allItems['horse'] as $horseID => $cnt) : ?>
+                                    <option value="<?= $horseID ?>"><?= getItemName($horseID) ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">무기
+                            </div>
+                            <select class="form-select form_general_weap">
+                                <option value='None'>-</option>
+                                <?php foreach (GameConst::$allItems['weapon'] as $weaponID => $cnt) : ?>
+                                    <option value="<?= $weaponID ?>"><?= getItemName($weaponID) ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">서적
+                            </div>
+                            <select class="form-select form_general_book">
+                                <option value='None'>-</option>
+                                <?php foreach (GameConst::$allItems['book'] as $bookID => $cnt) : ?>
+                                    <option value="<?= $bookID ?>"><?= getItemName($bookID) ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">부상
+                            </div>
+                            <input type="number" class="form-control form_injury" value="0" min="0" max="80" step="1">
+                            <div class="input-group-text">%(<span class="injury_helptext">건강</span>)
+                            </div>
+                            <div class="input-group-text">군량
+                            </div>
+                            <input type="number" class="form-control form_rice" value="5000" min="50" max="40000" step="50">
+                            <div class="input-group-text">도구
+                            </div>
+                            <select class="form-select form_general_item">
+                                <option value='None'>-</option>
+                                <?php foreach (GameConst::$allItems['item'] as $itemID => $cnt) : ?>
+                                    <option value="<?= $itemID ?>"><?= getItemName($itemID) ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">병종
+                            </div>
+                            <select class="form-select form_crewtype">
+                                <?php foreach (GameUnitConst::all() as $crewTypeID => $crewType) : ?>
+                                    <?php if ($crewType->armType === GameUnitConst::T_CASTLE) {
+                                        continue;
+                                    } ?>
+                                    <option value="<?= $crewTypeID ?>"><?= $crewType->name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">병사
+                            </div>
+                            <input type="number" class="form-control form_crew" value="7000" min="100" step="100">
+                            <div class="input-group-text">성격
+                            </div>
+                            <select class="form-select form_general_character">
+                                <?php foreach (getCharacterList(false) as $characterID => [$name, $info]) : ?>
+                                    <option value="<?= $characterID ?>"><?= $name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">훈련
+                            </div>
+                            <input type="number" class="form-control form_train" value="100" min="40" max="<?= GameConst::$maxTrainByWar ?>" step="1">
+                            <div class="input-group-text">사기
+                            </div>
+                            <input type="number" class="form-control form_atmos" value="100" min="40" max="<?= GameConst::$maxAtmosByWar ?>" step="1">
+                            <div class="input-group-text">전특
+                            </div>
+                            <select class="form-select form_general_special_war">
+                                <?php foreach (SpecialityHelper::getSpecialWarList(false) as $specialWarID => $specialObj) : ?>
+                                    <option value="<?= $specialWarID ?>"><?= $specialObj->getName() ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">보병숙련
+                            </div>
+                            <select class="form-select form_dex1">
+                                <?php foreach (getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]) : ?>
+                                    <option value="<?= $dexAmount ?>"><?= "{$name} (" . number_format($dexAmount) . ")" ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">궁병숙련
+                            </div>
+                            <select class="form-select form_dex2">
+                                <?php foreach (getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]) : ?>
+                                    <option value="<?= $dexAmount ?>"><?= "{$name} (" . number_format($dexAmount) . ")" ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">기병숙련
+                            </div>
+                            <select class="form-select form_dex3">
+                                <?php foreach (getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]) : ?>
+                                    <option value="<?= $dexAmount ?>"><?= "{$name} (" . number_format($dexAmount) . ")" ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">귀병숙련
+                            </div>
+                            <select class="form-select form_dex4">
+                                <?php foreach (getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]) : ?>
+                                    <option value="<?= $dexAmount ?>"><?= "{$name} (" . number_format($dexAmount) . ")" ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">차병숙련
+                            </div>
+                            <select class="form-select form_dex5">
+                                <?php foreach (getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]) : ?>
+                                    <option value="<?= $dexAmount ?>"><?= "{$name} (" . number_format($dexAmount) . ")" ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text only_defender">수비여부
+                            </div>
+                            <select class="form-select form_defence_train only_defender">
+                                <option value="90">훈사 90</option>
+                                <option value="80">훈사 80</option>
+                                <option value="60">훈사 60</option>
+                                <option value="40">훈사 40</option>
+                                <option value="999">안함</option>
+                            </select>
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">전투 수
+                            </div>
+                            <input type="number" class="form-control form_warnum" value="0" step="1">
+                            <div class="input-group-text">승리 수
+                            </div>
+                            <input type="number" class="form-control form_killnum" value="0" step="1">
+                            <div class="input-group-text">사살 수
+                            </div>
+                            <input type="number" class="form-control form_killcrew" value="0" step="1">
+                        </div>
+
+                        <div class="input-group mb-0">
+                            <div class="input-group-text">자신</div>
+                            <div class="input-group-text">회피 확률</div>
+                            <input type="number" class="form-control form_war_avoid_ratio" value="0" step="1" min="0" max="5">
+                            <div class="input-group-text">필살 확률</div>
+                            <input type="number" class="form-control form_war_critical_ratio" value="0" step="1" min="0" max="5">
+                            <div class="input-group-text">계략 시도 확률</div>
+                            <input type="number" class="form-control form_war_magic_trial_prob" value="0" step="1" min="0" max="5">
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">상대</div>
+                            <div class="input-group-text">회피 확률</div>
+                            <input type="number" class="form-control form_oppose_war_avoid_ratio" value="0" step="1" min="0" max="5">
+                            <div class="input-group-text">필살 확률</div>
+                            <input type="number" class="form-control form_oppose_war_critical_ratio" value="0" step="1" min="0" max="5">
+                            <div class="input-group-text">계략 시도 확률</div>
+                            <input type="number" class="form-control form_oppose_war_magic_trial_prob" value="0" step="1" min="0" max="5">
+                        </div>
+                    </div>
+                </div>
+
+
+            </div><!-- <div class="col-sm"> -->
+        </div>
+        <div class="card mb-3">
+            <div class="card-header">
+                전투 요약
+            </div>
+            <table class="table">
+                <tbody id="battle_result_summary">
+                    <tr>
+                        <th style='width:18ch;'>전투 일시</th>
+                        <td id='result_datetime'></td>
+                    </tr>
+                    <tr>
+                        <th>전투 횟수</th>
+                        <td id='result_warcnt'></td>
+                    </tr>
+                    <tr>
+                        <th>전투 페이즈</th>
+                        <td id='result_phase'></td>
+                    </tr>
+                    <tr>
+                        <th>준 피해</th>
+                        <td><span id='result_killed'>0</span><span id='result_varKilled'> (<span id='result_minKilled'>0</span> ~ <span id='result_maxKilled'>0</span>)</span></td>
+                    </tr>
+                    <tr>
+                        <th>받은 피해</th>
+                        <td><span id='result_dead'>0</span><span id='result_varDead'> (<span id='result_minDead'>0</span> ~ <span id='result_maxDead'>0</span>)</span></td>
+                    </tr>
+                    <tr>
+                        <th>출병자 군량 소모</th>
+                        <td id='result_attackerRice'></td>
+                    </tr>
+                    <tr>
+                        <th>수비자 군량 소모</th>
+                        <td id='result_defenderRice'></td>
+                    </tr>
+                    <tr>
+                        <th>공격자 스킬</th>
+                        <td id='result_attackerSkills'></td>
+                    </tr>
+                    <tr class='result_defenderSkills'>
+                        <th>수비자1 스킬</th>
+                        <td></td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <div class="row">
+            <div class="col-sm">
+                <div class="card mb-3">
+                    <div class="card-header">
+                        마지막 전투 로그
+                    </div>
+                    <div class="card-body" id="generalBattleResultLog">
+
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm">
+                <div class="card mb-3">
+                    <div class="card-header">
+                        마지막 전투 상세 로그
+                    </div>
+                    <div class="card-body" id="generalBattleDetailLog">
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="importModal" class="modal" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">장수 목록</h5>
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <select id="modalSelector"></select>
+                    <p>타국 장수를 선택한 경우 숙련과 아이템은 0으로 초기화됩니다.</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-primary" id='importFromDB'>가져오기</button>
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
@@ -1,283 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$v = new Validator($_POST + $_GET);
-$v->rule('integer', [
-    'amount',
-    'cost',
-    'topv',
-    'value',
-    'term',
-    'stuff',
-    'sel'
-]);
-
-$btn = Util::getReq('btn');
-$amount = Util::getReq('amount', 'int');
-$cost = Util::getReq('cost', 'int');
-$topv = Util::getReq('topv', 'int');
-$value = Util::getReq('value', 'int');
-$term = Util::getReq('term', 'int');
-$stuff = Util::getReq('stuff', 'int');
-$sel = Util::getReq('sel', 'int');
-
-$msg = '';
-$msg2 = '';
-
-extractMissingPostToGlobals();
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("입찰", 1);
-
-$query = "select turnterm from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
-$query = "select no,name,gold,rice,special from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
-
-$query = "select no from auction where no1='{$me['no']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$tradeCount = MYDB_num_rows($result);
-
-$query = "select no from auction where no2='{$me['no']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$bidCount = MYDB_num_rows($result);
-
-$btCount = $tradeCount + $bidCount;
-
-$unit = $admin['turnterm'] * 60;
-
-$amount = Util::round($amount / 10) * 10;
-$cost = Util::round($cost / 10) * 10;
-$topv = Util::round($topv / 10) * 10;
-$value = Util::round($value / 10) * 10;
-if ($term > 24) {
-    $term = 24;
-}
-
-$valid = 1;
-if ($session->userGrade >= 5 || ($me['special'] != 30 && $btCount < 1) || ($me['special'] == 30 && $btCount < 3)) {
-} else {
-    $msg = "ㆍ<span class='ev_warning'>더이상 등록할 수 없습니다.</span>";
-    $msg2 = "ㆍ<span class='ev_warning'>더이상 등록할 수 없습니다.</span>";
-    $valid = 0;
-    $btn = "hidden";
-}
-
-if ($btn == "판매") {
-    if ($stuff != 0) {
-        $msg = "ㆍ<span class='ev_warning'>현재 쌀만 거래 가능합니다.</span>";
-        $valid = 0;
-    }
-    if ($term < 0 || $term > 24) {
-        $msg = "ㆍ<span class='ev_warning'>종료기한은 1 ~ 24 턴 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($amount < 100 || $amount > 10000) {
-        $msg = "ㆍ<span class='ev_warning'>거래량은 100 ~ 10000 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($cost > $amount * 2 || $cost * 2 < $amount) {
-        $msg = "ㆍ<span class='ev_warning'>시작판매가는 50% ~ 200% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv < $amount*1.1 || $topv > $amount * 2) {
-        $msg = "ㆍ<span class='ev_warning'>즉시판매가는 110% ~ 200% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv < $cost*1.1) {
-        $msg = "ㆍ<span class='ev_warning'>즉시판매가는 시작판매가의 110% 이상이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($amount > $me['rice'] - 1000) {
-        $msg = "ㆍ<span class='ev_warning'>기본 군량 1000은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg = "ㆍ<span class='ev_success'>등록 성공.</span>";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term);
-        $db->insert('auction', [
-            'type'=>0,
-            'no1'=>$me['no'],
-            'name1'=>$me['name'],
-            'stuff'=>$stuff,
-            'amount'=>$amount,
-            'cost'=>$cost,
-            'value'=>$cost,
-            'topv'=>$topv,
-            'expire'=>$date
-        ]);
-    }
-} elseif ($btn == "구매시도") {
-    $query = "select no2,value,topv,expire,amount from auction where no='$sel'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $auction = MYDB_fetch_array($result);
-
-    if ($value == $auction['topv']) {
-        $valid = 2;
-    }
-    if (!$auction) {
-        $msg = "ㆍ<span class='ev_warning'>종료된 거래입니다.</span>";
-        $valid = 0;
-    }
-    /*
-        if($stuff != 0) {
-            $msg = "ㆍ<span class='ev_warning'>현재 쌀만 거래 가능합니다.</span>";
-            $valid = 0;
-        }
-    */
-    if ($auction['no2'] > 0 && $value <= $auction['value']) {
-        $msg = "ㆍ<span class='ev_warning'>현재판매가보다 높게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value < $auction['value']) {
-        $msg = "ㆍ<span class='ev_warning'>현재판매가보다 높게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $auction['topv']) {
-        $msg = "ㆍ<span class='ev_warning'>즉시판매가보다 높을 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $me['gold'] - 1000) {
-        $msg = "ㆍ<span class='ev_warning'>기본 자금 1000은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg = "ㆍ<span class='ev_success'>입찰 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-        if ($auction['expire'] > $date) {
-            $date = $auction['expire'];
-        }
-        
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    } elseif ($valid == 2) {
-        $msg = "ㆍ<span class='ev_success'>즉시판매 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    }
-} elseif ($btn == "구매") {
-    if ($stuff != 0) {
-        $msg2 = "ㆍ<span class='ev_warning'>현재 쌀만 거래 가능합니다.</span>";
-        $valid = 0;
-    }
-    if ($term < 0 || $term > 24) {
-        $msg2 = "ㆍ<span class='ev_warning'>종료기한은 1 ~ 24 턴 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($amount < 100 || $amount > 10000) {
-        $msg2 = "ㆍ<span class='ev_warning'>거래량은 100 ~ 10000 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($cost > $amount * 2 || $cost * 2 < $amount) {
-        $msg2 = "ㆍ<span class='ev_warning'>시작구매가는 50% ~ 200% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv < $amount * 0.5 || $topv > $amount * 0.9) {
-        $msg2 = "ㆍ<span class='ev_warning'>즉시구매가는 50% ~ 90% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv > $cost * 0.9) {
-        $msg2 = "ㆍ<span class='ev_warning'>즉시구매가는 시작구매가의 90% 이하이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($cost > $me['gold'] - 1000) {
-        $msg2 = "ㆍ<span class='ev_warning'>기본 자금 1000은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg2 = "ㆍ<span class='ev_success'>등록 성공.</span>";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term);
-
-        $db->insert('auction', [
-            'type'=>1,
-            'no1'=>$me['no'],
-            'name1'=>$me['name'],
-            'stuff'=>$stuff, 
-            'amount'=>$amount, 
-            'cost'=>$cost, 
-            'value'=>$cost, 
-            'topv'=>$topv, 
-            'expire'=>$date
-        ]);
-    }
-} elseif ($btn == "판매시도") {
-    $query = "select no2,value,topv,expire,amount from auction where no='$sel'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $auction = MYDB_fetch_array($result);
-
-    if ($value == $auction['topv']) {
-        $valid = 2;
-    }
-    if (!$auction) {
-        $msg2 = "ㆍ<span class='ev_warning'>종료된 거래입니다.</span>";
-        $valid = 0;
-    }
-    if ($stuff != 0) {
-        $msg2 = "ㆍ<span class='ev_warning'>현재 쌀만 거래 가능합니다.</span>";
-        $valid = 0;
-    }
-    if ($auction['no2'] > 0 && $value >= $auction['value']) {
-        $msg2 = "ㆍ<span class='ev_warning'>현재구매가보다 낮게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $auction['value']) {
-        $msg2 = "ㆍ<span class='ev_warning'>현재구매가보다 낮게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value < $auction['topv']) {
-        $msg2 = "ㆍ<span class='ev_warning'>즉시구매가보다 낮을 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $me['rice'] - 1000) {
-        $msg2 = "ㆍ<span class='ev_warning'>기본 군량 1000은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg2 = "ㆍ<span class='ev_success'>입찰 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-        if ($auction['expire'] > $date) {
-            $date = $auction['expire'];
-        }
-
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    } elseif ($valid == 2) {
-        $msg2 = "ㆍ<span class='ev_success'>즉시구매 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    }
-}
-
-Submit("b_auction.php", $msg, $msg2);
@@ -1,67 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-
-// $btn0~15, $gold0~15
-
-//FIXME: 으악!!!!! 왜?! idx를 지정하고 gold를 지정하라고!
-$betTarget = -1;
-$betGold = -1;
-for($i=0;$i<16;$i++){
-    $textBtn = "btn{$i}";
-    $textGold = "gold{$i}";
-    $btn = Util::getReq($textBtn);
-    $gold = Util::getReq($textGold, 'int');
-    if($btn === "베팅!" && $gold){
-        $betTarget = $i;
-        $betGold = $gold;
-        break;
-    }
-}
-
-if($betGold == -1){
-    extractMissingPostToGlobals();
-}
-
-
-if($betTarget < 0 || $betGold < 10 || $betGold > 1000){
-    header('Location: b_betting.php');
-    exit();
-}
-
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-
-increaseRefresh("베팅", 1);
-
-$tournament = $db->queryFirstField('SELECT tournament FROM game LIMIT 1');
-if($tournament != 6) {
-    header('Location: b_betting.php');
-    exit();
-}
-
-$bets = $db->queryFirstList('SELECT bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15,gold FROM general WHERE `owner`=%i', $userID);
-$myGold = array_pop($bets);
-$totalBet = array_sum($bets);
-
-//NOTE: 위 코드에서 $betTarget은 0~15의 정수임이 보장된다.
-$oldBet = $bets[$betTarget];
-if($betGold + 500 <= $myGold && $betGold + $oldBet <= 1000 && $betGold + $totalBet <= 1000) {
-    $db->update('general', [
-        'gold'=>$db->sqleval('gold - %i', $betGold),
-        "bet{$betTarget}"=>$db->sqleval("bet{$betTarget} + %i", $betGold),
-        'betgold'=>$db->sqleval('betgold + %i', $betGold)
-    ], 'owner = %i', $userID);
-    $db->update('game', [
-        "bet{$betTarget}"=>$db->sqleval("bet{$betTarget} + %i", $betGold)
-    ], true);
-}
-
-header('location: b_betting.php');
@@ -1,60 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$title = Util::getReq('title');
-$msg = Util::getReq('msg');
-$num = Util::getReq('num', 'int');
-$reply = Util::getReq('reply');
-// $title, $msg, $num
-
-extractMissingPostToGlobals();
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-if (getBlockLevel() == 1 || getBlockLevel() == 3) {
-    header('location:b_chiefboard.php');
-    die();
-}
-
-$query = "select no,nation from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$title = str_replace("|", " ", $title);
-$msg = str_replace("|", " ", $msg);
-$reply = str_replace("|", " ", $reply);
-$title = trim($title);
-$msg = trim($msg);
-$reply = trim($reply);
-
-$nation = getNation($me['nation']);
-
-//새글 추가시
-if($num == -1 && $title != "" && $msg != "") {
-    $num = $nation['coreindex'] + 1;
-    if($num >= 20) { $num = 0; }
-    $msg = $title."|".$msg;
-    $msg = addslashes(SQ2DQ($msg));
-    $date = date('Y-m-d H:i:s');
-    $query = "update nation set coreboard{$num}='$msg',coreboard{$num}_who='{$me['no']}',coreboard{$num}_when='$date' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $query = "update nation set coreindex='$num' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-//$num에 댓글시
-} elseif($num >= 0 && $reply != "") {
-    $newmsg = $nation["coreboard{$num}"]."|".$me['no']."|".$reply;
-    $newmsg = addslashes(SQ2DQ($newmsg));
-
-    $query = "update nation set coreboard{$num}='$newmsg' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-}
-
-header('location:b_chiefboard.php');
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`TODO : adobdb5, phpmailer5(?), plates, utilphp`