튜토리얼 버튼을 전투 시뮬레이터로 변경

구버전 시뮬레이터 삭제
국가에는 escape가 되어있으므로 메시지 템플릿에 2중 escape는 필요하지 않음
2018-08-28 20:13:54 +09:00 · 2018-08-28 13:22:17 +09:00 · 2018-08-28 01:49:25 +09:00 · 2018-08-27 23:39:58 +09:00 · 2018-08-27 23:31:51 +09:00 · 2018-08-27 23:17:31 +09:00
766 changed files with 64663 additions and 11897 deletions
@@ -15,6 +15,7 @@ d_log/*.txt
 d_log/*.zip
 sess_*
 */logs/*.txt
+*/logs/*/*.txt
 err.txt
 che/.htaccess
 kwe/.htaccess
@@ -43,3 +44,5 @@ test.php
 /twe

 phpinfo.php
+vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/*
+*.sqlite3
@@ -5,7 +5,7 @@
        "**/.hg": true,
        "**/CVS": true,
        "**/.DS_Store": true,
-        "**/logs/*.txt": true,
+        "**/logs/**/*.txt": true,
        "**/session/sess*":true,
        "/che":true,
        "/kwe":true,
@@ -7,7 +7,7 @@

 * Apache2
  * <code>mpm_event</code> 권장
-* PHP 7.0 이상 
+* PHP 7.2 이상 
  * <code>php-fpm</code> 권장
  * php에서 curl을 실행가능해야 합니다.
 * MySQL 5.6 이상, 또는 MariaDB 10.0 이상
@@ -32,13 +32,13 @@ 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
 ```

-> 이미지는 별도의 업데이트 기능을 제공하지 않습니다. 수동으로 <code>git pull</code>을 해야합니다.
+> 이미지는 git hook을 이용한 업데이트 기능을 제공하지만 아직 범용성 있는 설계가 되어있진 않습니다.

 ### 설치

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

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

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

@@ -17,7 +17,10 @@
        "vlucas/valitron": "^1.4",
        "php-extended/php-tail": "^2.1",
        "pguardiario/phpuri": "^1.0",
-        "symfony/lock": "^3.4"
+        "symfony/lock": "^4.1",
+        "ezyang/htmlpurifier": "^4.10",
+        "xemlock/htmlpurifier-html5": "^0.1.7",
+        "catfan/medoo": "^1.5"
    },
    "autoload": {
        "psr-4": {
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "content-hash": "a329d39be5161c87438d41f9adf4417b",
+    "content-hash": "3fceaf3c2925068c7e757ab12036e29e",
    "packages": [
        {
            "name": "brandonwamboldt/utilphp",
@@ -52,6 +52,112 @@
            ],
            "time": "2015-02-02T17:56:14+00:00"
        },
+        {
+            "name": "catfan/medoo",
+            "version": "v1.5.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/catfan/Medoo.git",
+                "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/catfan/Medoo/zipball/8d90cba0e8ff176028847527d0ea76fe41a06ecf",
+                "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pdo": "*",
+                "php": ">=5.4"
+            },
+            "suggest": {
+                "ext-pdo_dblib": "For MSSQL or Sybase database on Linux/UNIX platform",
+                "ext-pdo_mysql": "For MySQL or MariaDB database",
+                "ext-pdo_oci": "For Oracle database",
+                "ext-pdo_oci8": "For Oracle version 8 database",
+                "ext-pdo_pqsql": "For PostgreSQL database",
+                "ext-pdo_sqlite": "For SQLite database",
+                "ext-pdo_sqlsrv": "For MSSQL database"
+            },
+            "type": "framework",
+            "autoload": {
+                "psr-4": {
+                    "Medoo\\": "/src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Angel Lai",
+                    "email": "angel@catfan.me"
+                }
+            ],
+            "description": "The lightest PHP database framework to accelerate development",
+            "homepage": "https://medoo.in",
+            "keywords": [
+                "database",
+                "lightweight",
+                "mariadb",
+                "mssql",
+                "mysql",
+                "oracle",
+                "php framework",
+                "postgresql",
+                "sql",
+                "sqlite"
+            ],
+            "time": "2018-06-14T18:59:08+00:00"
+        },
+        {
+            "name": "ezyang/htmlpurifier",
+            "version": "v4.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ezyang/htmlpurifier.git",
+                "reference": "d85d39da4576a6934b72480be6978fb10c860021"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d85d39da4576a6934b72480be6978fb10c860021",
+                "reference": "d85d39da4576a6934b72480be6978fb10c860021",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2"
+            },
+            "require-dev": {
+                "simpletest/simpletest": "^1.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "HTMLPurifier": "library/"
+                },
+                "files": [
+                    "library/HTMLPurifier.composer.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL"
+            ],
+            "authors": [
+                {
+                    "name": "Edward Z. Yang",
+                    "email": "admin@htmlpurifier.org",
+                    "homepage": "http://ezyang.com"
+                }
+            ],
+            "description": "Standards compliant HTML filter written in PHP",
+            "homepage": "http://htmlpurifier.org/",
+            "keywords": [
+                "html"
+            ],
+            "time": "2018-02-23T01:58:20+00:00"
+        },
        {
            "name": "firephp/firephp-core",
            "version": "v0.4.0",
@@ -90,16 +196,16 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "6.3.2",
+            "version": "6.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90"
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/68d0ea14d5a3f42a20e87632a5f84931e2709c90",
-                "reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
                "shasum": ""
            },
            "require": {
@@ -109,7 +215,7 @@
            },
            "require-dev": {
                "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
                "psr/log": "^1.0"
            },
            "suggest": {
@@ -151,7 +257,7 @@
                "rest",
                "web service"
            ],
-            "time": "2018-03-26T16:33:04+00:00"
+            "time": "2018-04-22T15:46:56+00:00"
        },
        {
            "name": "guzzlehttp/promises",
@@ -271,16 +377,16 @@
        },
        {
            "name": "leafo/scssphp",
-            "version": "v0.7.5",
+            "version": "v0.7.7",
            "source": {
                "type": "git",
                "url": "https://github.com/leafo/scssphp.git",
-                "reference": "8b538d828bbb75276974605c4a1a435e939da74e"
+                "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/leafo/scssphp/zipball/8b538d828bbb75276974605c4a1a435e939da74e",
-                "reference": "8b538d828bbb75276974605c4a1a435e939da74e",
+                "url": "https://api.github.com/repos/leafo/scssphp/zipball/1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
+                "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
                "shasum": ""
            },
            "require": {
@@ -319,7 +425,7 @@
                "scss",
                "stylesheet"
            ],
-            "time": "2018-02-09T02:04:21+00:00"
+            "time": "2018-07-22T01:22:08+00:00"
        },
        {
            "name": "league/plates",
@@ -454,54 +560,6 @@
            ],
            "time": "2017-06-19T01:22:40+00:00"
        },
-        {
-            "name": "paragonie/random_compat",
-            "version": "v2.0.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
-                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*|5.*"
-            },
-            "suggest": {
-                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/random.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com",
-                    "homepage": "https://paragonie.com"
-                }
-            ],
-            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-            "keywords": [
-                "csprng",
-                "pseudorandom",
-                "random"
-            ],
-            "time": "2018-04-04T21:24:14+00:00"
-        },
        {
            "name": "pguardiario/phpuri",
            "version": "1.0",
@@ -528,16 +586,16 @@
        },
        {
            "name": "php-extended/php-system",
-            "version": "1.3.0",
+            "version": "1.4.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/php-extended/php-system.git",
-                "reference": "66727d5dc0a665916bd7e08bcfb9820e7be1d20c"
+                "url": "https://gitlab.com/php-extended/php-system.git",
+                "reference": "9e6b3c2009ef56dc123efc43900e40cdf217ace0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-extended/php-system/zipball/66727d5dc0a665916bd7e08bcfb9820e7be1d20c",
-                "reference": "66727d5dc0a665916bd7e08bcfb9820e7be1d20c",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-system/repository/archive.zip?sha=9e6b3c2009ef56dc123efc43900e40cdf217ace0",
+                "reference": "9e6b3c2009ef56dc123efc43900e40cdf217ace0",
                "shasum": ""
            },
            "type": "library",
@@ -553,31 +611,31 @@
            "authors": [
                {
                    "name": "Anastaszor",
-                    "role": "developer"
+                    "role": "Developer"
                }
            ],
            "description": "A generic way to find informations about the running system",
-            "homepage": "https://github.com/php-extended/php-system",
+            "homepage": "https://gitlab.com/php-extended/php-system",
            "keywords": [
                "operating system",
                "os",
                "php",
                "system"
            ],
-            "time": "2017-01-14T11:56:24+00:00"
+            "time": "2018-06-07T06:03:27+00:00"
        },
        {
            "name": "php-extended/php-tail",
-            "version": "2.1.1",
+            "version": "2.2.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/php-extended/php-tail.git",
-                "reference": "eabf7bee64f8c30fe9b9e1176562fdb903c54ae7"
+                "url": "https://gitlab.com/php-extended/php-tail.git",
+                "reference": "19fbd3a79ccc071954f28296b2c44754335304a0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-extended/php-tail/zipball/eabf7bee64f8c30fe9b9e1176562fdb903c54ae7",
-                "reference": "eabf7bee64f8c30fe9b9e1176562fdb903c54ae7",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-tail/repository/archive.zip?sha=19fbd3a79ccc071954f28296b2c44754335304a0",
+                "reference": "19fbd3a79ccc071954f28296b2c44754335304a0",
                "shasum": ""
            },
            "require": {
@@ -596,11 +654,11 @@
            "authors": [
                {
                    "name": "Anastaszor",
-                    "role": "developer"
+                    "role": "Developer"
                }
            ],
            "description": "A smart way to tail files depending of the environment",
-            "homepage": "https://github.com/php-extended/php-tail",
+            "homepage": "https://gitlab.com/php-extended/php-tail",
            "keywords": [
                "cheat",
                "mighty",
@@ -608,7 +666,7 @@
                "php",
                "tail"
            ],
-            "time": "2017-07-25T13:52:42+00:00"
+            "time": "2018-06-07T06:04:58+00:00"
        },
        {
            "name": "psr/http-message",
@@ -752,22 +810,21 @@
        },
        {
            "name": "symfony/lock",
-            "version": "v3.4.9",
+            "version": "v4.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/lock.git",
-                "reference": "3a707193326d31603824706e34a95af899a59788"
+                "reference": "d508b5dd92272cb74300396ecaadde969d0f7976"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/3a707193326d31603824706e34a95af899a59788",
-                "reference": "3a707193326d31603824706e34a95af899a59788",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/d508b5dd92272cb74300396ecaadde969d0f7976",
+                "reference": "d508b5dd92272cb74300396ecaadde969d0f7976",
                "shasum": ""
            },
            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "psr/log": "~1.0",
-                "symfony/polyfill-php70": "~1.0"
+                "php": "^7.1.3",
+                "psr/log": "~1.0"
            },
            "require-dev": {
                "predis/predis": "~1.0"
@@ -775,7 +832,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.1-dev"
                }
            },
            "autoload": {
@@ -810,96 +867,40 @@
                "redlock",
                "semaphore"
            ],
-            "time": "2018-04-29T14:44:26+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6",
-                "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": "~1.0|~2.0",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2018-04-26T10:06:28+00:00"
+            "time": "2018-06-21T11:15:46+00:00"
        },
        {
            "name": "vlucas/valitron",
-            "version": "v1.4.2",
+            "version": "v1.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/vlucas/valitron.git",
-                "reference": "87775d76268beda2afa085bdd6e44b17e98907c6"
+                "reference": "3c5463315bfa23b17f8949b100a960d035234e43"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/valitron/zipball/87775d76268beda2afa085bdd6e44b17e98907c6",
-                "reference": "87775d76268beda2afa085bdd6e44b17e98907c6",
+                "url": "https://api.github.com/repos/vlucas/valitron/zipball/3c5463315bfa23b17f8949b100a960d035234e43",
+                "reference": "3c5463315bfa23b17f8949b100a960d035234e43",
                "shasum": ""
            },
            "require": {
                "php": ">=5.3.2"
            },
            "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^4.8.35 || ^5.5 || ^6.5"
+            },
+            "suggest": {
+                "ext-mbstring": "It can support the multiple bytes string length."
            },
            "type": "library",
            "autoload": {
-                "psr-0": {
-                    "Valitron": "src/"
+                "psr-4": {
+                    "Valitron\\": "src/Valitron"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
-                "BSD"
+                "BSD-3-Clause"
            ],
            "authors": [
                {
@@ -915,7 +916,47 @@
                "validation",
                "validator"
            ],
-            "time": "2017-10-30T23:15:06+00:00"
+            "time": "2018-05-06T10:45:26+00:00"
+        },
+        {
+            "name": "xemlock/htmlpurifier-html5",
+            "version": "v0.1.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/xemlock/htmlpurifier-html5.git",
+                "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/b4b35e51ec75e0207c23035f7d9a354bdcdac359",
+                "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359",
+                "shasum": ""
+            },
+            "require": {
+                "ezyang/htmlpurifier": "^4.7",
+                "php": ">=5.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.7.*|5.7.*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "library/HTMLPurifier/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "xemlock",
+                    "email": "xemlock@gmail.com"
+                }
+            ],
+            "description": "HTML Purifier definitions for HTML5 elements",
+            "time": "2018-06-07T14:30:17+00:00"
        }
    ],
    "packages-dev": [],
@@ -61,6 +61,7 @@ a.just_link {
 }

 button.with_skin {
+    padding:0 4px;
    background-color: black; color: white;
    font-family: '맑은 고딕';
    font-size: 13px;
@@ -89,4 +90,78 @@ input.with_skin:disabled {

 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:'】'
 }
@@ -87,6 +87,17 @@ input::-webkit-input-placeholder {
    align-items: center;
 }

+.full-content {
+    position:fixed;
+    left:0;
+    top:0;
+    width:100%;
+    height:100%;
+    margin:0;
+    padding:0;
+    z-index:800;
+}
+
 #btn_kakao_login{
    cursor: pointer;
    height:46px;
@@ -1,7 +1,7 @@
@charset "utf-8";

 #user_info_container{
-    width:500px;
+    width:550px;
    position:absolute;
    left:50%;
    margin-left:-250px;
@@ -0,0 +1,132 @@
+//download.js v3.0, by dandavis; 2008-2014. [CCBY2] see http://danml.com/download.html for tests/usage
+// v1 landed a FF+Chrome compat way of downloading strings to local un-named files, upgraded to use a hidden frame and optional mime
+// v2 added named files via a[download], msSaveBlob, IE (10+) support, and window.URL support for larger+faster saves than dataURLs
+// v3 added dataURL and Blob Input, bind-toggle arity, and legacy dataURL fallback was improved with force-download mime and base64 support
+
+// data can be a string, Blob, File, or dataURL
+
+		 
+						 
+						 
+function download(data, strFileName, strMimeType) {
+	
+	var self = window, // this script is only for browsers anyway...
+		u = "application/octet-stream", // this default mime also triggers iframe downloads
+		m = strMimeType || u, 
+		x = data,
+		D = document,
+		a = D.createElement("a"),
+		z = function(a){return String(a);},
+		
+		
+		B = self.Blob || self.MozBlob || self.WebKitBlob || z,
+		BB = self.MSBlobBuilder || self.WebKitBlobBuilder || self.BlobBuilder,
+		fn = strFileName || "download",
+		blob, 
+		b,
+		ua,
+		fr;
+
+	//if(typeof B.bind === 'function' ){ B=B.bind(self); }
+	
+	if(String(this)==="true"){ //reverse arguments, allowing download.bind(true, "text/xml", "export.xml") to act as a callback
+		x=[x, m];
+		m=x[0];
+		x=x[1]; 
+	}
+	
+	
+	
+	//go ahead and download dataURLs right away
+	if(String(x).match(/^data\:[\w+\-]+\/[\w+\-]+[,;]/)){
+		return navigator.msSaveBlob ?  // IE10 can't do a[download], only Blobs:
+			navigator.msSaveBlob(d2b(x), fn) : 
+			saver(x) ; // everyone else can save dataURLs un-processed
+	}//end if dataURL passed?
+	
+	try{
+	
+		blob = x instanceof B ? 
+			x : 
+			new B([x], {type: m}) ;
+	}catch(y){
+		if(BB){
+			b = new BB();
+			b.append([x]);
+			blob = b.getBlob(m); // the blob
+		}
+		
+	}
+	
+	
+	
+	function d2b(u) {
+		var p= u.split(/[:;,]/),
+		t= p[1],
+		dec= p[2] == "base64" ? atob : decodeURIComponent,
+		bin= dec(p.pop()),
+		mx= bin.length,
+		i= 0,
+		uia= new Uint8Array(mx);
+
+		for(i;i<mx;++i) uia[i]= bin.charCodeAt(i);
+
+		return new B([uia], {type: t});
+	 }
+	  
+	function saver(url, winMode){
+		
+		
+		if ('download' in a) { //html5 A[download] 			
+			a.href = url;
+			a.setAttribute("download", fn);
+			a.innerHTML = "downloading...";
+			D.body.appendChild(a);
+			setTimeout(function() {
+				a.click();
+				D.body.removeChild(a);
+				if(winMode===true){setTimeout(function(){ self.URL.revokeObjectURL(a.href);}, 250 );}
+			}, 66);
+			return true;
+		}
+		
+		//do iframe dataURL download (old ch+FF):
+		var f = D.createElement("iframe");
+		D.body.appendChild(f);
+		if(!winMode){ // force a mime that will download:
+			url="data:"+url.replace(/^data:([\w\/\-\+]+)/, u);
+		}
+		 
+	
+		f.src = url;
+		setTimeout(function(){ D.body.removeChild(f); }, 333);
+		
+	}//end saver 
+		
+
+	if (navigator.msSaveBlob) { // IE10+ : (has Blob, but not a[download] or URL)
+		return navigator.msSaveBlob(blob, fn);
+	} 	
+	
+	if(self.URL){ // simple fast and modern way using Blob and URL:
+		saver(self.URL.createObjectURL(blob), true);
+	}else{
+		// handle non-Blob()+non-URL browsers:
+		if(typeof blob === "string" || blob.constructor===z ){
+			try{
+				return saver( "data:" +  m   + ";base64,"  +  self.btoa(blob)  ); 
+			}catch(y){
+				return saver( "data:" +  m   + "," + encodeURIComponent(blob)  ); 
+			}
+		}
+		
+		// Blob but not URL:
+		fr=new FileReader();
+		fr.onload=function(e){
+			saver(this.result); 
+		};
+		fr.readAsDataURL(blob);
+	}	
+	return true;
+} /* end download() */
+
@@ -49,40 +49,86 @@ function getFriendlyErrorType($type)
    return "{$type}"; 
 }

+function getExceptionTraceAsString($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, array $trace){
+    $fdb = FileDB::db(ROOT.'/d_log/err_log.sqlite3', ROOT.'/f_install/sql/err_log.sql');
+    $date = date("Ymd_His");
+
+    $trace = array_map(function(string $text){
+        return str_replace(ROOT, '{ROOT}', $text);
+    }, $trace);
+
+    $fdb->insert('err_log', [
+        'date'=>$date,
+        'err'=>$err,
+        'errstr'=>$errstr,
+        'trace'=>Json::encode($trace)
+    ]);
+}
+
 function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, int $errline, array $errcontext){
    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,
+        getExceptionTraceAsString($e)
+    );
 }
 set_error_handler("\sammo\logErrorByCustomHandler");


 function logExceptionByCustomHandler(\Throwable $e){
-
-    $date = date("Ymd_His");
-
-    $data = Json::encode([
-        'date'=>$date,
-        'err'=>get_class($e),
-        'errstr'=>$e->getMessage(),
-        'trace'=>explode("\n", $e->getTraceAsString())
-    ], Json::PRETTY);
-
-    file_put_contents(ROOT.'/d_log/err_log.txt',"$data\n", FILE_APPEND);
+    logError(
+        get_class($e),
+        $e->getMessage(),
+        getExceptionTraceAsString($e)
+    );
+    
    echo $e->getTraceAsString();
    throw $e;
 }
@@ -8,12 +8,14 @@ require(__dir__.'/../vendor/autoload.php');
 <html lang="ko">
 <head>
    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <title>설치</title>
-    <?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+    <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
    <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
    <?=WebUtil::printJS('../e_lib/jquery.validate.min.js')?>
    <?=WebUtil::printJS('../e_lib/sha512.min.js')?>
+    <?=WebUtil::printJS('../js/common.js')?>
    <?=WebUtil::printJS('../js/install.js')?>
    <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
    <?=WebUtil::printCSS('../css/install.css')?>
@@ -0,0 +1,10 @@
+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,
+	`trace`	TEXT NOT NULL
+);
+CREATE INDEX IF NOT EXISTS `date` ON `err_log` (
+	`date`	DESC
+);
@@ -41,18 +41,86 @@
        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_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;
+}
+
+.map_theme_ludo_rathowm.map_detail.map_spring .map_title_text{
+    background:
+        url('_tK_gameImagePath_/spring.gif') no-repeat right;
+}
+
+.map_theme_ludo_rathowm.map_detail.map_summer .map_title_text{
+    background:
+        url('_tK_gameImagePath_/summer.gif') no-repeat right;
+}
+
+.map_theme_ludo_rathowm.map_detail.map_fall .map_title_text{
+    background:
+        url('_tK_gameImagePath_/fall.gif') no-repeat right;
+}
+
+.map_theme_ludo_rathowm.map_detail.map_winter .map_title_text{
+    background:
+        url('_tK_gameImagePath_/winter.gif') no-repeat right;
+}
+
+.world_map.map_theme_ludo_rathowm .map_title .map_title_text::before {
+    color:white;
+    content:'LP';
+    margin-right:1ch;
 }
@@ -11,7 +11,9 @@ if($session->userGrade < 4) {
 <html>
 <head>
 <title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -28,7 +30,7 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();

-list($turntime, $tnmt_time) = $gameStor->getValuesAsArray(['turntime','tnmt_time']);
+[$turntime, $tnmt_time] = $gameStor->getValuesAsArray(['turntime','tnmt_time']);

 $query = "select plock from plock";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -38,7 +40,9 @@ $plock = MYDB_fetch_array($result);
 <html>
 <head>
 <title>삼국지 모의전투 HiDCHe</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -12,7 +12,9 @@ if($session->userGrade < 5) {
 <html>
 <head>
 <title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -34,7 +36,9 @@ $admin = getAdmin();
 <html>
 <head>
 <title>게임관리</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -12,7 +12,9 @@ if($session->userGrade < 5) {
 <html>
 <head>
 <title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -32,7 +34,9 @@ $db = DB::db();
 <html>
 <head>
 <title>회원관리</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -54,7 +58,7 @@ $db = DB::db();
 <?php

 echo "
-            <select name=genlist[] size=20 multiple style=color:white;background-color:black;font-size:13>";
+            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:13px'>";
 $generalList = $db->query('SELECT `no`, `name`, npc, `block` FROM general ORDER BY npc, binary(`name`)');

 foreach($generalList as $general){
@@ -72,7 +76,7 @@ echo "
        </td>
        <td width=100 align=center>아이템 지급</td>
        <td width=504>
-            <select name=weap size=1 style=color:white;background-color:black;font-size:13>";
+            <select name=weap size=1 style='color:white;background-color:black;font-size:13px'>";
 for($i=0; $i < 27; $i++) {
    echo "
                <option value={$i}>{$i}</option>";
@@ -6,6 +6,8 @@ include "func.php";

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

 extractMissingPostToGlobals();

@@ -93,13 +95,13 @@ switch($btn) {
    case "강제 사망":
        $date = date('Y-m-d H:i:s');
        $db->update('general', [
-            'turn0'=>0,
+            'turn0'=>EncodeCommand(0, 0, 0, 0),
            'killturn'=>0,
            'turntime'=>$date,
        ], '`no` IN %li', $genlist);
        break;
    case "특기 부여":
-        list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
+        [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
        $text = "특기 부여!";

        foreach($db->query("SELECT `no`,leader,power,intel,dex0,dex10,dex20,dex30,dex40 FROM general WHERE `no` IN %li", $genlist) as $general){    
@@ -314,13 +316,13 @@ switch($btn) {
        break;
    case "하야입력":
        $db->update('general', [
-            'turn0'=>'00000000000045'
+            'turn0'=>EncodeCommand(0, 0, 0, 45)
        ], '`no` IN %li', $genlist);
        break;
    case "방랑해산":
        $db->update('general', [
-            'turn0'=>'00000000000047',
-            'turn1'=>'00000000000056'
+            'turn0'=>EncodeCommand(0, 0, 0, 47),
+            'turn1'=>EncodeCommand(0, 0, 0, 56)
        ], '`no` IN %li', $genlist);
        break;
    case "NPC설정":
@@ -12,7 +12,9 @@ if($session->userGrade < 5) {
 <html>
 <head>
 <title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -35,7 +37,9 @@ $conlimit = $gameStor->conlimit;
 <html>
 <head>
 <title>멀티관리</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -51,14 +55,9 @@ $conlimit = $gameStor->conlimit;
 <?php

 echo "
-            <select name=genlist[] size=20 multiple style=color:white;background-color:black;font-size:13>";
+            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:13px'>";

-$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);
+foreach($db->query('SELECT no,name,npc,block,con from general where ip!=\'\' order by npc,ip') as $general){
    $style = "style=;";
    if($general['block']         > 0) { $style .= "background-color:red;"; }
    if($general['npc']          >= 2) { $style .= "color:cyan;"; }
@@ -13,11 +13,11 @@ if($session->userGrade < 5) {

 $btn = Util::getReq('btn');
 $genlist = Util::getReq('genlist', 'array_int');
+$msg = Util::getReq('msg','string', '메시지');

 extractMissingPostToGlobals();

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

 //NOTE: 왜 기능이 admin2와 admin4가 같이 있는가? 
 //NOTE: 왜 블럭 시 admin4에선 금쌀을 없애지 않는가?
@@ -52,12 +52,25 @@ switch($btn) {
        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);
+        DB::db()->query('update general set turn0=%s,killturn=0,turntime=%s where no IN %li',EncodeCommand(0, 0, 0, 0),$date, $genlist);
        break;
    case "메세지 전달":
    //TODO:새 갠메 시스템으로 변경
        $date = date('Y-m-d H:i:s');
+        $src = MessageTarget::buildQuick($session->generalID);
        for($i=0; $i < count($genlist); $i++) {
+            $msgObj = new Message(
+                Message::MSGTYPE_PRIVATE,
+                $src,
+                MessageTarget::buildQuick($genlist[$i]),
+                $msg,
+                new DateTime(),
+                new \DateTime('9999-12-31'),
+                []
+            );
+            if($msgObj){
+                $msgObj->send(true);
+            }
        }
        break;
 }
@@ -25,7 +25,9 @@ if($session->userGrade < 5) {
 <html>
 <head>
 <title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -51,7 +53,9 @@ $sel2[$type2] = "selected";
 <html>
 <head>
 <title>일제정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -19,7 +19,9 @@ if($session->userGrade < 5) {
 <html>
 <head>
 <title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -42,7 +44,9 @@ $sel[$type] = "selected";
 <html>
 <head>
 <title>접속정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -23,7 +23,9 @@ if($session->userGrade < 5) {
 <html>
 <head>
 <title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -49,7 +51,9 @@ $sel[$type] = "selected";
 <html>
 <head>
 <title>로그정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -19,7 +19,9 @@ if ($session->userGrade < 5) {
 <html>
 <head>
 <title>관리메뉴</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -45,7 +47,9 @@ $sel[$type] = "selected";
 <html>
 <head>
 <title>외교정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -1,1658 +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();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-$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);
-
-$admin = $gameStor->getAll();
-
-$con = checkLimit($me['con']);
-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($admin, $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) {
-                $josaRo = JosaUtil::pick(GameUnitConst::byID($general['crewtype'])->name, '로');
-                $msg .= "<C>●</>".GameUnitConst::byID($general['crewtype'])->name."{$josaRo} 성을 <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($admin, $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 {
-                $josaUl = JosaUtil::pick(GameUnitConst::byID($oppose['crewtype'])->name, '을');
-                $josaRo = JosaUtil::pick(GameUnitConst::byID($general['crewtype'])->name, '로');
-                $msg .= "<C>●</>".GameUnitConst::byID($general['crewtype'])->name."{$josaRo} <Y>수비장수</>의 ".GameUnitConst::byID($oppose['crewtype'])->name."{$josaUl} 공격합니다.<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($admin, $general['crewtype'], "avd");   //회피율
-                    if($ratio < $ratio2 && $myAvoid == 1) {
-                        $msg .= "<C>●</><C>회피</>했다!</><br>";
-                        $myCrew /= 10; // 10%만 소모
-                        $myAvoid = 0;
-                    }
-                    //회피
-                    $ratio = rand() % 100; // 0 ~ 99
-                    $ratio2 = getRate($admin, $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 = $admin['city_rate'];
-    $atmos3 = $admin['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>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.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 class='tb_layout 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 class='tb_layout 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($admin, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=10; $i <= 14; $i++) {
-        printSimul($admin, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=20; $i <= 27; $i++) {
-        printSimul($admin, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=30; $i <= 38; $i++) {
-        printSimul($admin, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=40; $i <= 43; $i++) {
-        printSimul($admin, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-?>
-</table>
-</form>
-</body>
-</html>
-<?php
-
-function printSimul($admin, $i) {
-    $att = $admin["att{$i}"];
-    $def = $admin["def{$i}"];
-    $spd = $admin["spd{$i}"];
-    $avd = $admin["avd{$i}"];
-    $cst = $admin["cst{$i}"];
-    $ric = $admin["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>";
-}
-
-
@@ -14,36 +14,33 @@ $userID = Session::getUserID();

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

-increaseRefresh("명장일람", 2);
+increaseRefresh("명장일람", 1);

-$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']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
 ?>
 <!DOCTYPE html>
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1136" />
 <title><?=UniqueConst::$serverName?>: 명장일람</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/hallOfFame.css')?>

+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
 </head>

 <body>
-<table align=center width=1000 class='tb_layout bg0'>
+<table align=center width=1100 class='tb_layout bg0'>
    <tr><td>명 장 일 람<br><?=closeButton()?></td></tr>
 </table>
-<table align=center width=1000 class='tb_layout bg0'>
+<table align=center width=1100 class='tb_layout bg0'>
 <form name=form1 action=a_bestGeneral.php method=post>
    <tr><td align=center>
        <input type=submit name=btn value='유저 보기'>
@@ -51,294 +48,223 @@ if ($con >= 2) {
    </td></tr>
 </form>
 </table>
-<table align=center width=1000 class='tb_layout bg0'>
+<div style="margin:auto;width=1000px;">
 <?php
-if (isset($btn) && $btn == "NPC 보기") {
-    //FIXME: query가 너무 적나라.
-    $sel = "npc>=2";
-} else {
-    $sel = "npc<2";
-}

-$nationName = ['재야'];
-$nationColor = ['#000000'];
+
+$nationName = [0=>'재야'];
+$nationColor = [0=>'#000000'];
 foreach (getAllNationStaticInfo() as $nation) {
    $nationName[$nation['nation']] = $nation['name'];
    $nationColor[$nation['nation']] = $nation['color'];
 }

-$type = array(
-    "명 성",
-    "계 급",
-    "계 략 성 공",
-    "전 투 횟 수",
-    "승 리",
-    "승 률",
-    "사 살",
-    "살 상 률",
-    "보 병 숙 련 도",
-    "궁 병 숙 련 도",
-    "기 병 숙 련 도",
-    "귀 병 숙 련 도",
-    "차 병 숙 련 도",
-    "전 력 전 승 률",
-    "통 솔 전 승 률",
-    "일 기 토 승 률",
-    "설 전 승 률",
-    "베 팅 투 자 액",
-    "베 팅 당 첨",
-    "베 팅 수 익 금",
-    "베 팅 수 익 률"
-);
+$types = [
+    ["명 성", "int", function($v){$v['value'] = $v['experience']; return $v; }],
+    ["계 급", "int", function($v){$v['value'] = $v['dedication']; return $v; }],
+    ["계 략 성 공", "int", function($v){
+        $v['value'] = $v['firenum'];
+        $v['nationName'] = '???';
+        $v['pictureFullPath'] = GetImageURL(0)."/default.jpg";
+        $v['name'] = '???'; 
+        $v['owner_name'] = 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['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['dex0']; return $v; }],
+    ["궁 병 숙 련 도", "int", function($v){$v['value'] = $v['dex10']; return $v; }],
+    ["기 병 숙 련 도", "int", function($v){$v['value'] = $v['dex20']; return $v; }],
+    ["귀 병 숙 련 도", "int", function($v){$v['value'] = $v['dex30']; return $v; }],
+    ["차 병 숙 련 도", "int", function($v){$v['value'] = $v['dex40']; 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['tpw']+$v['tpd']+$v['tpl'];
+        if($totalCnt < 50){
+            $v['value'] = 0;
+        }
+        else{
+            $v['value'] = $v['tpw']/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'] < 1000){
+            $v['value'] = 0;
+        }
+        else{
+            $v['value'] = $v['betwingold']/max(1, $v['betgold']);
+        }
+        return $v;
+    }],
+];

-
-for ($i=0; $i < 21; $i++) {
-    $name = [];
-    $data = [];
-    $color = [];
-    $pic = [];
-
-    //FIXME: 쿼리에 index를 사용할 수 없는 녀석들이 있다. 그냥 모두 받아서 일괄 처리하는게 더 나을 수도 있음.
-    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;
+$generals = array_map(function($general) use($nationColor, $nationName) {
+    $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']}";
    }
-    $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] = "";
-            }
-        } 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;
-        }
-        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]}></td>";
-        }
+    else{
+        $general['pictureFullPath'] = GetImageURL(0)."/default.jpg";
    }

-    echo "</tr><tr>";
+    return $general;
+}, $db->query(
+    "SELECT nation,no,name,name2 as owner_name, picture, imgsvr, 
+    experience, dedication, firenum, warnum, killnum, killcrew, deathcrew, 
+    dex0, dex10, dex20, dex30, dex40, 
+    ttw, ttd, ttl, tlw, tld, tll, tpw, tpd, tpl, tiw, tid, til,
+    betgold, betwin, betwingold,
+    horse, weap, book, item
+    FROM general WHERE %l", $btn == "NPC 보기"?"npc>=2":"npc<2"));

-    for ($k=0; $k < 10; $k++) {
-        echo "<td align=center style=background-color:{$color[$k]};font-size:80%;color:".newColor($color[$k]).">{$nation[$k]}</td>";
-    }

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

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

-    echo "</tr><tr>";
-
-    for ($k=0; $k < 10; $k++) {
-        if($data[$k] === '-'){
-            //do Nothing
+        if($value > 0){
+            $validCnt+=1;
        }
-        else if ($i == 5 || $i == 7 || $i == 20) {
-            $data[$k] = intdiv($data[$k], 100).".".($data[$k]%100)." %";
+
+        if($typeValue == 'percent'){
+            $general['printValue'] = number_format($value*100, 2).'%';
        }
-        else if ($i >= 13 && $i <= 16) {
-            $data[$k] = intdiv($data[$k], 100).".".($data[$k]%100)." %";
+        else {
+            $general['printValue'] = number_format($value);
        }
-        echo "<td align=center>{$data[$k]}</td>";
-    }
-    echo "</tr><tr><td colspan=10 height=5 id=bg1></td></tr>";
+        return $general;
+    }, $generals);
+
+    usort($typeGenerals, function($lhs, $rhs){
+        //내림차순
+        return -($lhs['value'] <=> $rhs['value']);
+    });
+
+
+    echo $templates->render('hallOfFrame', [
+        'typeName'=>$typeName,
+        'generals'=>array_slice($typeGenerals, 0, min(10, $validCnt))
+    ]);
 }
-
-echo "
-</table>
-<br>
-<table align=center width=1000 class='tb_layout bg0'>
-";
-
-$type = array(
-    "명 마",
-    "명 검",
-    "명 서",
-    "도 구"
-);
-
-$call = array(
-    "horse",
-    "weap",
-    "book",
-    "item"
-);
-
-$func = array(
-    "\\sammo\\getHorseName",
-    "\\sammo\\getWeapName",
-    "\\sammo\\getBookName",
-    "\\sammo\\getItemName"
-);
-
-for ($i=0; $i < 4; $i++) {
-    $name = [];
-    $data = [];
-    $color = [];
-    $pic = [];
-
-    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>";
-    }
-
-    echo "</tr><tr>";
-
-    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 ($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]};font-size:80%;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]};font-size:80%;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]};font-size:80%;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]};font-size:80%;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 class='tb_layout bg0'>
+</div>
+<div style="margin:auto;width=1000px;margin-top:5px;">
+<?php
+//유니크 아이템 소유자
+$itemTypes = [
+    ["명 마", 'horse', function($v){return getHorseName($v);}, 7, 26, []],
+    ["명 검", 'weap', function($v){return getWeapName($v);}, 7, 26, []],
+    ["명 서", 'book', function($v){return getBookName($v);}, 7, 26, []],
+    ["도 구", 'item', function($v){return displayItemInfo($v);}, 7, 26, []],
+];
+
+$simpleItemTypes = array_map(function($itemType){return $itemType[1];}, $itemTypes);
+
+foreach($generals as $general){
+    foreach($itemTypes as $itemIdx=>[,$itemType, $itemFunc,,,]){
+        $itemCode = $general[$itemType];
+        if($itemCode <= 6){
+            continue;
+        }
+
+        $itemName = ($itemFunc)($itemCode);
+        $general['rankName'] = $itemName;
+        $general['value'] = $itemCode;
+        $itemTypes[$itemIdx][5][$itemCode] = $general;
+    }
+}
+
+foreach($itemTypes as [$itemNameType, $itemType, $itemFunc, $itemMinCode, $itemMaxCode, $itemOwners]){
+    $itemRanker = [];
+    for($itemCode = $itemMaxCode; $itemCode >= $itemMinCode; $itemCode--){
+        if(!key_exists($itemCode, $itemOwners)){
+            $emptyCard = [
+                'rankName' => ($itemFunc)($itemCode),
+                'pictureFullPath' => GetImageURL(0)."/default.jpg",
+                'value'=>$itemCode,
+                'name'=>'미발견',
+                'bgColor'=>GameConst::$basecolor4,
+                'fgColor'=>newColor(GameConst::$basecolor4),
+            ];
+            $itemRanker[$itemCode] = $emptyCard;
+            continue;
+        }
+
+        $general = $itemOwners[$itemCode];
+        $itemRanker[$itemCode] = $general;
+    }
+
+    echo $templates->render('hallOfFrame', [
+        'typeName'=>$itemNameType,
+        'generals'=>$itemRanker
+    ]);
+}
+?>
+</div>
+<table align=center width=1100 class='tb_layout bg0'>
    <tr><td><?=closeButton()?></td></tr>
    <tr><td><?=banner()?> </td></tr>
 </table>
@@ -4,20 +4,17 @@ 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'>
+<meta charset="UTF-8">
+<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::printCSS('css/common.css')?>
@@ -27,180 +24,95 @@ increaseRefresh("왕조일람", 2);
 <body>
 <table align=center width=1000 class="tb_layout bg0">
    <tr><td>역 대 왕 조<br>
-        <input type=button value='창 닫기' onclick=window.close()><br>
+        <button onclick=window.close()>창 닫기</button><br>
    </td></tr>
 </table>

 <?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 class='tb_layout bg0'>
+if($emperiors){
+    $serverID = $emperior[0]['server_id']??($emperior[0]['serverID']??null);
+    if($serverID == UniqueConst::$serverID){
+        $showCurrentNation = false;
+    }
+}
+
+if ($showCurrentNation) {
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
+?>
+
+<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="a_emperior_detail.php"><button>자세히</button></a>
+            
+            <a href="a_history.php"><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>
-            <input type=submit value='자세히'>
-            <input type=hidden name=select value='{$emperior['no']}'>
+            <font size=5><?=$emperior['phase']?></font>
+            
+            <a href="a_emperior_detail.php?select=<?=$emperior['no']?>"><button>자세히</button></a>
+            
+            <?php if($emperior['server_id']): ?>
+            <a href="a_history.php?serverID=<?=$emperior['server_id']?>"><button>역사 보기</button></a>
+            <?php endif ?>
        </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 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=80>국 력</td>
-        <td align=center width=170>{$emperior['power']}</td>
+        <td align=center width=170><?=$emperior['power']?></td>
        <td id=bg1 align=center width=80>장 수</td>
-        <td align=center width=170>{$emperior['gennum']}</td>
+        <td align=center width=170><?=$emperior['gennum']?></td>
        <td id=bg1 align=center width=80>속 령</td>
-        <td align=center width=170>{$emperior['citynum']}</td>
+        <td align=center width=170><?=$emperior['citynum']?></td>
        <td id=bg1 align=center width=80>성 향</td>
-        <td align=center width=170>{$emperior['type']}</td>
+        <td align=center width=170><?=$emperior['type']?></td>
    </tr>
    <tr>
        <td id=bg1 align=center>황 제</td>
-        <td align=center>{$emperior['l12name']}</td>
+        <td align=center><?=$emperior['l12name']?></td>
        <td id=bg1 align=center>승 상</td>
-        <td align=center>{$emperior['l11name']}</td>
+        <td align=center><?=$emperior['l11name']?></td>
        <td id=bg1 align=center>위 장 군</td>
-        <td align=center>{$emperior['l10name']}</td>
+        <td align=center><?=$emperior['l10name']?></td>
        <td id=bg1 align=center>사 공</td>
-        <td align=center>{$emperior['l9name']}</td>
+        <td align=center><?=$emperior['l9name']?></td>
    </tr>
 </table>
-</form>";
-    }
-} 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 class='tb_layout 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>
-";
+
+
+<?php
 }
 ?>

-<table align=center width=1000 class='tb_layout bg0'>
+<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>
@@ -17,7 +17,9 @@ increaseRefresh("왕조일람", 2);
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<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::printCSS('css/common.css')?>
@@ -0,0 +1,210 @@
+<?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 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::printCSS('css/common.css')?>
+
+</head>
+
+<body>
+<table align=center width=1000 class="tb_layout bg0">
+    <tr><td><?=$emperior?'역 대 왕 조':'현 재 왕 조'?><br>
+        <button onclick=window.close()>창 닫기</button>
+        <div style="float:right;"><a href="a_emperior.php"><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 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>
+
+<?php
+endif;
+
+$showServers = $serverID || (!$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 += Json::decode($nation['data']);
+
+        $nation['typeName'] = getNationType($nation['type']);
+        $nation['levelName'] = getNationLevel($nation['level']);
+        if($nation['generals']){
+            $generals = $db->query('SELECT `general_no`, `name`, `last_yearmonth` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nation['generals']);
+
+            if(count($generals) != $nation['generals'] && $serverID == UniqueConst::$serverID){
+                $liveGenerals = $nation['generals'];
+                foreach($generals as $general){
+                    if(in_array($general['general_no'], $nation['generals'])){
+                        unset($nation['generals'][$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 += Json::decode($nation['aux']);
+        }
+        
+        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>
@@ -37,12 +37,17 @@ if ($type <= 0 || $type > 15) {
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 장수일람</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('js/common.js')?>

 </head>

@@ -80,22 +85,22 @@ foreach (getAllNationStaticInfo() as $nation) {
 }

 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;
+    case  1: $query = "select no,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 no,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 no,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 no,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 no,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 no,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 no,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 no,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;
+    case  9: $query = "select no,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 no,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 no,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 no,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 no,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 no,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 no,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);
@@ -131,20 +136,20 @@ for ($j=0; $j < $gencount; $j++) {
        $lbonus = 0;
    }
    if ($lbonus > 0) {
-        $lbonus = "<font color=cyan>+{$lbonus}</font>";
+        $lbonusText = "<font color=cyan>+{$lbonus}</font>";
    } else {
-        $lbonus = "";
+        $lbonusText = "";
    }

    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}";
+        $leader = "<font color=red>{$leader}</font>{$lbonusText}";
        $power = "<font color=red>{$power}</font>";
        $intel = "<font color=red>{$intel}</font>";
    } else {
-        $leader = "{$general['leader']}{$lbonus}";
+        $leader = "{$general['leader']}{$lbonusText}";
        $power = "{$general['power']}";
        $intel = "{$general['intel']}";
    }
@@ -161,12 +166,19 @@ for ($j=0; $j < $gencount; $j++) {

    $imageTemp = GetImageURL($general['imgsvr']);
    echo "
-    <tr>
-        <td align=center><img width='64' height='64' src={$imageTemp}/{$general['picture']}></img></td>
+    <tr data-general-id='{$general['no']}' 
+        data-general-wounded='{$general['injury']}' 
+        data-general-leadership='{$general['leader']}'
+        data-general-leadership-bonus='{$lbonus}'
+        data-general-power='{$general['power']}'
+        data-general-intel='{$general['intel']}'
+        data-is-npc='".($general['npc']>=2?'true':'false')."'
+    >
+        <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>".displayCharInfo($general['personal'])."</td>
+        <td align=center>".displaySpecialInfo($general['special'])." / ".displaySpecialInfo($general['special2'])."</td>
        <td align=center>Lv ".getExpLevel($general['experience'])."</td>
        <td align=center>{$nation}</td>
        <td align=center>".getHonor($general['experience'])."</td>
@@ -4,117 +4,142 @@ namespace sammo;
 include "lib.php";
 include "func.php";

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

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

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1136" />
 <title><?=UniqueConst::$serverName?>: 명예의 전당</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/hallOfFame.css')?>

+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJs('js/hallOfFame.js')?>
 </head>

 <body>
-<table align=center width=1000 class='tb_layout bg0'>
+<table align=center width=1100 class='tb_layout bg0'>
    <tr><td>명 예 의 전 당<br><?=closeButton()?></td></tr>
+    <tr><td>
+시나리오 검색 : <select id="by_scenario" name="by_scenario">
+    <option value="" <?=$scenarioIdx?"selected='selected'":''?>>* 종합 *</option>
+<?php foreach($scenarioList as $info): ?>
+    <option
+        value="<?=$info['scenario']?>"
+        <?=($info['scenario']===$scenarioIdx)?"selected='selected'":''?>
+    ><?=$info['name']?>(<?=$info['cnt']?>회)</option>
+<?php endforeach; ?>
+?>
+</select>
+</td></tr>
 </table>
-<table align=center width=1000 class='tb_layout bg0'>
+<div style="margin:auto;width=1100px;">
 <?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), "");
+$types = [
+    ["명 성", 'int'],
+    ["계 급", 'int'],
+    ["계 략 성 공", 'int'],
+    ["전 투 횟 수", 'int'],
+    ["승 리", 'int'],
+    ["승 률", 'percent'],
+    ["사 살", 'int'],
+    ["살 상 률", 'percent'],
+    ["보 병 숙 련 도", 'int'],
+    ["궁 병 숙 련 도", 'int'],
+    ["기 병 숙 련 도", 'int'],
+    ["귀 병 숙 련 도", 'int'],
+    ["차 병 숙 련 도", 'int'],
+    ["전 력 전 승 률", 'percent'],
+    ["통 솔 전 승 률", 'percent'],
+    ["일 기 토 승 률", 'percent'],
+    ["설 전 승 률", 'percent'],
+    ["베 팅 투 자 액", 'int'],
+    ["베 팅 당 첨", 'int'],
+    ["베 팅 수 익 금", 'int'],
+    ["베 팅 수 익 률", '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;
+foreach($types as $idx=>[$typeName, $typeValue]) {
+    $hallResult = $db->query('SELECT * FROM ng_hall WHERE `type`=%i AND %? ORDER BY `value` DESC LIMIT 10', $idx, $searchFilter);
+
+    $hallResult = array_map(function($general)use($typeValue){
+        $aux = Json::decode($general['aux']);
+        $general += $aux;
+        if(!key_exists('bgColor', $general)){
+            if(!key_exists('color', $general)){
+                $general['bgColor'] = GameConst::$basecolor4;
+            }
+            else{
+                $general['bgColor'] = $general['color'];
+            }
        }
-        if ($nation[$k] == "") {
-            $nation[$k] = "&nbsp;";
+        
+        if(!key_exists('fgColor', $general)){
+            $general['fgColor'] = newColor($general['bgColor']);
        }
-        /*
-                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>";
-                }
-        */
-    }

-//    echo "</tr><tr>";
-
-    for ($k=0; $k < 10; $k++) {
-        echo "<td align=center style=background-color:{$color[$k]};font-size:80%;color:".newColor($color[$k]).">{$nation[$k]}</td>";
-    }
-
-    echo "</tr><tr>";
-
-    for ($k=0; $k < 10; $k++) {
-        echo "<td align=center style=background-color:{$color[$k]};font-size:80%;color:".newColor($color[$k]).">{$name[$k]}</td>";
-    }
-
-    echo "</tr><tr>";
-
-    for ($k=0; $k < 10; $k++) {
-        if ($i == 5 || $i == 7 || $i == 20) {
-            $data[$k] = intdiv($data[$k], 100).".".($data[$k]%100)." %";
+        if(key_exists('picture', $general)){
+            $imageTemp = GetImageURL($general['imgsvr']);
+            $general['pictureFullPath'] = "$imageTemp/{$general['picture']}";
        }
-        if ($i >= 13 && $i <= 16) {
-            $data[$k] = intdiv($data[$k], 100).".".($data[$k]%100)." %";
+        else{
+            $general['pictureFullPath'] = GetImageURL(0)."/default.jpg";
        }
-        echo "<td align=center>{$data[$k]}</td>";
-    }
-    echo "</tr><tr><td colspan=10 height=5 id=bg1></td></tr>";
+
+        if(!key_exists('printValue', $general)){
+            $value = $general['value'];
+            if($typeValue == 'percent'){
+                $general['printValue'] = number_format($value*100, 2).'%';
+            }
+            else {
+                $general['printValue'] = number_format($value);
+            }
+        }
+
+        return $general;
+    }, $hallResult);
+
+    echo $templates->render('hallOfFrame', [
+        'typeName'=>$typeName,
+        'generals'=>$hallResult
+    ]);
 }
 ?>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
+</div>
+<table align=center width=1100 class='tb_layout bg0'>
    <tr><td><?=closeButton()?></td></tr>
    <tr><td><?=banner()?> </td></tr>
 </table>
@@ -5,6 +5,7 @@ include "lib.php";
 include "func.php";
 $btn = Util::getReq('btn');
 $yearmonth = Util::getReq('yearmonth', 'int');
+$serverID = Util::getReq('serverID', 'string', null);

 extractMissingPostToGlobals();

@@ -14,15 +15,18 @@ $userID = Session::getUserID();

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

-increaseRefresh("연감", 2);
+if(!$serverID){
+    $serverID = UniqueConst::$serverID;
+}

-$admin = $gameStor->getValues(['startyear','year','month']);
+if($serverID === UniqueConst::$serverID){
+    increaseRefresh("연감", 1);
+}

-$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);
+$admin = $gameStor->getValues(['startyear','year','month','map_theme']);
+
+$me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner = %i', $userID);

 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -30,18 +34,32 @@ if ($con >= 2) {
    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'];
+
+[$s_year, $s_month] = $db->queryFirstList('SELECT year, month FROM history WHERE server_id = %s ORDER BY year ASC, month ASC LIMIT 1', $serverID);
+$s = $s_year * 12 + $s_month;
+
+if($s_year === null){
+    echo '인자 에러';
+    exit();
+}
+
+[$e_year, $e_month] = $db->queryFirstList('SELECT year, month FROM history WHERE server_id = %s ORDER BY year DESC, month DESC LIMIT 1', $serverID);
+$e = $e_year * 12 + $e_month;
+
+if($serverID !== UniqueConst::$serverID){
+    $mapTheme = $db->queryFirstField('SELECT map FROM ng_games WHERE server_id=%s', $serverID)?:'che';
+}
+else{
+    $mapTheme = $admin['map_theme']??'che';
+}

 //FIXME: $yearmonth가 올바르지 않을 경우에 처리가 필요.
-if (!$yearmonth) {
+if($serverID !== UniqueConst::$serverID && !$yearmonth){
+    $year = $s_year;
+    $month = $s_month;
+}
+else if (!$yearmonth) {
    $year = $admin['year'];
    $month = $admin['month'] - 1;
 } else {
@@ -75,14 +93,18 @@ if ($month <= 0) {
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 연감</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS("js/map/theme_{$mapTheme}.js")?>
 <?=WebUtil::printJS('js/map.js')?>

+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/map.css')?>
@@ -98,24 +120,19 @@ if ($month <= 0) {
        <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) {
+$dates = $db->queryAllLists('SELECT year, month FROM history WHERE server_id = %s ORDER BY year ASC, month ASC', $serverID);
+foreach($dates as [$hYear, $hMonth]){
+    $value = "".$hYear.StringUtil::padStringAlignRight($hMonth, 2, "0");
+    if ($hYear == $year && $hMonth == $month) {
        echo "
-            <option selected value={$value}>{$history['year']}년 {$history['month']}월</option>";
+            <option selected value={$value}>{$hYear}년 {$hMonth}월</option>";
    } else {
        echo "
-            <option value={$value}>{$history['year']}년 {$history['month']}월</option>";
+            <option value={$value}>{$hYear}년 {$hMonth}월</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);
+$history = $db->queryFirstRow('SELECT log,genlog,nation,power,gen,city FROM history WHERE server_id = %s AND year = %i AND month = %i', $serverID, $year, $month);
 ?>
        </select>
        <input type=submit name=btn value='조회하기'>
@@ -127,7 +144,7 @@ $history = MYDB_fetch_array($result);
    <tr><td colspan=5 align=center id=bg1>중 원 지 도</td></tr>
    <tr height=520>
        <td width=698>
-            <?=getMapHtml();?>
+            <?=getMapHtml($mapTheme);?>
            
        <td width=139 valign=top><div style='background-color:#cccccc;color:black;text-align:center'>국명</div><?=$history['nation']?></td>
        <td width=70 valign=top style='text-align:center'><div style='background-color:#cccccc;color:black;'>국력</div><?=$history['power']?></td>
@@ -152,10 +169,15 @@ $history = MYDB_fetch_array($result);
    <tr><td><?=banner()?> </td></tr>
 </table>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 reloadWorldMap({
-    targetJson:'j_map_history.php?year=<?=$year?>&month=<?=$month?>',
+    targetJson:'j_map_history.php?year=<?=$year?>&month=<?=$month?>&serverID=<?=$serverID?>',
    showMe:false,
-    neutralView:true
+    neutralView:true,
+    useCachedMap:false,
+    year:<?=$year?>,
+    month:<?=$month?>,
 });
 </script>
 </body>
@@ -24,10 +24,14 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<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::printCSS('css/common.css')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('js/ext.kingdoms.js')?>

 </head>

@@ -25,11 +25,18 @@ $sel[$type] = "selected";
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 빙의일람</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>

+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+
 </head>

 <body>
@@ -104,8 +111,8 @@ for ($j=0; $j < $gencount; $j++) {
        <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>".displayCharInfo($general['personal'])."</td>
+        <td align=center>".displaySpecialInfo($general['special'])." / ".displaySpecialInfo($general['special2'])."</td>
        <td align=center>{$general['sum']}</td>
        <td align=center>{$general['leader']}</td>
        <td align=center>{$general['power']}</td>
@@ -14,6 +14,8 @@ $connect=$db->get();
 increaseRefresh("세력도", 2);
 checkTurn();

+$mapTheme = $gameStor->map_theme??'che';
+
 $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);
@@ -26,22 +28,28 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 <head>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 세력도</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS('d_shared/base_map.js')?>
 <?=WebUtil::printJS('js/map.js')?>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 $(function(){

    reloadWorldMap({
        neutralView:true,
-        showMe:true
+        showMe:true,
+        useCachedMap:true
    });

 });
 </script>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/normalize.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
@@ -59,7 +67,7 @@ $(function(){
            <?=getGeneralPublicRecordRecent(34)?>
        </td>
        <td width=698>
-            <?=getMapHtml()?>
+            <?=getMapHtml($mapTheme)?>
        </td>
    </tr>
    <tr>
@@ -12,7 +12,7 @@ increaseRefresh("갱신정보", 2);

 $admin = $gameStor->getValues(['year','month','refresh','maxrefresh','maxonline']);

-$log = getRawFileLogRecent(__dir__.'/logs/_traffic.txt', 11, 100);
+$log = getRawFileLogRecent(__dir__.'/logs/'.UniqueConst::$serverID.'/_traffic.txt', 11, 100);

 $date = [];
 $year = [];
@@ -50,7 +50,9 @@ if ($admin['maxonline'] < $curonline) {
 <html>
 <head>
 <title><?=UniqueConst::$serverName?>: 트래픽정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <style>
@@ -28,7 +28,9 @@ $vote = $admin['vote']?:['-'];
 <html>
 <head>
 <title><?=UniqueConst::$serverName?>: 설문조사</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <style>
@@ -56,7 +56,9 @@ if ($msg2 == "") {
 <html>
 <head>
 <title><?=UniqueConst::$serverName?>: 거래장</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 </head>
@@ -280,7 +282,7 @@ for ($i=0; $i < $count; $i++) {
 ㆍ악용 방지를 위해 50% ~ 200%의 가격에서 거래시작이 가능합니다.<br>
 ㆍ악용 방지를 위해 즉시판매가는 110% 이상, 즉시구매가는 90% 이하의 시세로 가능합니다.<br>
 ㆍ악용 방지를 위해 즉시판매가는 시작판매가의 110% 이상, 즉시구매가는 시작구매가의 90% 이하로 가능합니다.<br>
-ㆍ1인당 도합 1건의 거래와 입찰이 가능합니다. 거상 특기 소유자는 1인당 도합 3건입니다.<br>
+ㆍ1인당 도합 1건의 거래와 입찰이 가능합니다.<br>
 ㆍ기본금쌀 1000은 거래에 사용되지 못합니다.<br>
 ㆍ유찰될 때는 거래 과실자에게 거래금의 1%가 벌금으로 부과됩니다.<br>
 ㆍ<font color=magenta>10단위로 거래가 가능합니다. 1자리는 반올림 처리 됩니다.</font><br>
@@ -74,7 +74,9 @@ $sel[$type] = "selected";

 <head>
 <title><?=UniqueConst::$serverName?>: 감찰부</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>

@@ -154,7 +156,7 @@ for ($i=0; $i < $gencount; $i++) {
            <?=getBatResRecent($gen, 24)?>
        </td>
    </tr>
-<?php if($npc > 1): ?>
+<?php if($npc > 1 || $meLevel >= 5): ?>
    <tr>
        <td align=center id=bg1><font color=orange size=3>개인 기록</font></td>
        <td align=center id=bg1><font color=orange size=3>&nbsp;</font></td>
@@ -55,7 +55,9 @@ if($str3){
    MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<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::printCSS('css/common.css')?>
@@ -297,7 +299,13 @@ for ($i=0; $i < 16; $i++) {
 }

 for ($i=0; $i < 16; $i++) {
-    $gold[$i] = Util::round($myBet[$i] * $bet[$i]);
+    if(!is_numeric($bet[$i])){
+        $gold[$i] = 0;
+    }
+    else{
+        $gold[$i] = Util::round($myBet[$i] * $bet[$i]);
+    }
+    
 }
 ?>
    </tr>
@@ -26,7 +26,9 @@ if($me['level'] < 5) {
 <html>
 <head>
 <title><?=UniqueConst::$serverName?>: 기밀실</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>

@@ -77,7 +77,9 @@ for($i= $lv - 1; $i>=5; $i--){
 <!DOCTYPE html>
 <html>
 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<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::printCSS('css/common.css')?>
@@ -21,9 +21,7 @@ $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);

-$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);
+$myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation']);

 $templates = new \League\Plates\Engine('templates');

@@ -33,7 +31,9 @@ $templates = new \League\Plates\Engine('templates');

 <head>
 <title><?=UniqueConst::$serverName?>: 도시정보</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <style>
@@ -119,27 +119,34 @@ if($me['level'] == 0) {

 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}'";
+
+    $rawSpy = $myNation['spy'];
+
+    if($rawSpy == ''){
+        $spyCities = [];
+    }
+    else if(strpos($rawSpy, '|') !== false || is_numeric($rawSpy)){
+        //TODO: 0.8 버전 이후에는 삭제할 것. 이후 버전은 json으로 변경됨.
+        $spyCities = array_map(function($val){
+            $val = intval($val);
+            return intdiv($val, 10);
+        }, 'intval',explode('|', $myNation['spy']));
+    }
+    else{
+        $spyCities = array_keys(Json::decode($rawSpy));
    }

-    $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);

-    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($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>";
+        }
    }

 }
@@ -163,7 +170,7 @@ if($valid == 0 && $session->userGrade < 5) {


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

 //태수, 군사, 시중
 $gen1 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen1']);
@@ -173,81 +180,7 @@ $gen3 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $cit
 if($city['trade'] == 0) {
    $city['trade'] = "- ";
 }
-?>

-<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=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=46 class=bg1>주민</td>
-        <td align=center width=140><?=$city['pop']?>/<?=$city['pop2']?></td>
-        <td align=center width=46 class=bg1>농업</td>
-        <td align=center width=140><?=$city['agri']?>/<?=$city['agri2']?></td>
-        <td align=center width=46 class=bg1>상업</td>
-        <td align=center width=140><?=$city['comm']?>/<?=$city['comm2']?></td>
-        <td align=center width=46 class=bg1>치안</td>
-        <td align=center width=140><?=$city['secu']?>/<?=$city['secu2']?></td>
-        <td align=center width=46 class=bg1>수비</td>
-        <td align=center width=140><?=$city['def']?>/<?=$city['def2']?></td>
-        <td align=center width=46 class=bg1>성벽</td>
-        <td align=center width=140><?=$city['wall']?>/<?=$city['wall2']?></td>
-    </tr>
-    <tr>
-        <td align=center class=bg1>민심</td>
-        <td align=center><?=$city['rate']?></td>
-        <td align=center class=bg1>시세</td>
-        <td align=center><?=$city['trade']?>%</td>
-        <td align=center class=bg1>인구</td>
-        <td align=center><?=round($city['pop']/$city['pop2']*100, 2)?>%</td>
-        <td align=center class=bg1>태수</td>
-        <td align=center><?=$gen1['name']??'-'?></td>
-        <td align=center class=bg1>군사</td>
-        <td align=center><?=$gen2['name']??'-'?></td>
-        <td align=center class=bg1>시중</td>
-        <td align=center><?=$gen3['name']??'-'?></td>
-    </tr>
-    <tr>
-        <td align=center class=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>
-
-
-<br>
-<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
 $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);
@@ -259,6 +192,9 @@ foreach(getAllNationStaticInfo() as $nation){
    $nationlevel[$nation['nation']] = $nation['level'];
 }

+//도시명	오	적군	0/0(0)	병장(총)	0/0(4)	90병장	0/0	60병장	0/0	수비○	0/0
+$generalsFormat = [];
+

 for($j=0; $j < $gencount; $j++) {
    $general = MYDB_fetch_array($genresult);
@@ -333,7 +269,7 @@ for($j=0; $j < $gencount; $j++) {
        $turnText = '';
    }
    
-    echo $templates->render('cityGeneral', [
+    $generalsFormat[] = [
        'ourGeneral'=>$ourGeneral,
        'isNPC'=>$isNPC,
        'wounded'=>$wounded,
@@ -359,7 +295,159 @@ for($j=0; $j < $gencount; $j++) {
        'nation'=>$nation,
        'nationName'=>$nationName,
        'turnText'=>$turnText
-    ]);
+    ];
+}
+
+$generalsName = array_map(function($gen){return $gen['name'];}, $generalsFormat);
+
+$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'] == 0){
+        continue;
+    }
+    if($general['nation'] != $myNation['nation']){
+        $enemyCnt += 1;
+        $enemyCrew += $general['crew'];
+        if($general['crew'] > 0){
+            $enemyArmedCnt += 1;
+        }
+        continue;
+    }
+
+    $crewTotal += $general['crew'];
+    $genTotal += 1;
+
+    if($general['crew'] == 0){
+        continue;
+    }
+    $armedGenTotal += 1;
+
+    if($general['train'] >= 90 && $general['atmos'] >= 90){
+        $crew90 += $general['crew'];
+        $gen90 += 1;
+    }
+
+    $chkDef = false;
+    if($general['train'] >= 80 && $general['atmos'] >= 80){
+        $crew80 += $general['crew'];
+        $gen80 += 1;
+        if($general['defenceMode'] == 2){
+            $crewDef += $general['crew'];
+            $genDef += 1;
+            $chkDef = true;
+        }
+    }
+
+    if($general['train'] >= 60 && $general['atmos'] >= 60){
+        $crew60 += $general['crew'];
+        $gen60 += 1;
+
+        if($general['defenceMode'] == 1 && !$chkDef){
+            $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'><?=date('m-d H:i:s')?></td>
+    </tr>
+    <tr>
+        <td align=center width=48 class=bg1>주민</td>
+        <td align=center width=112><?=$city['pop']?>/<?=$city['pop2']?></td>
+        <td align=center width=48 class=bg1>농업</td>
+        <td align=center width=108><?=$city['agri']?>/<?=$city['agri2']?></td>
+        <td align=center width=48 class=bg1>상업</td>
+        <td align=center width=108><?=$city['comm']?>/<?=$city['comm2']?></td>
+        <td align=center width=48 class=bg1>치안</td>
+        <td align=center width=108><?=$city['secu']?>/<?=$city['secu2']?></td>
+        <td align=center width=48 class=bg1>수비</td>
+        <td align=center width=108><?=$city['def']?>/<?=$city['def2']?></td>
+        <td align=center width=48 class=bg1>성벽</td>
+        <td align=center width=108><?=$city['wall']?>/<?=$city['wall2']?></td>
+    </tr>
+    <tr>
+        <td align=center class=bg1>민심</td>
+        <td align=center><?=$city['rate']?></td>
+        <td align=center class=bg1>시세</td>
+        <td align=center><?=$city['trade']?>%</td>
+        <td align=center class=bg1>인구</td>
+        <td align=center><?=round($city['pop']/$city['pop2']*100, 2)?>%</td>
+        <td align=center class=bg1>태수</td>
+        <td align=center><?=$gen1['name']??'-'?></td>
+        <td align=center class=bg1>군사</td>
+        <td align=center><?=$gen2['name']??'-'?></td>
+        <td align=center class=bg1>시중</td>
+        <td align=center><?=$gen3['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><?=join(', ', $generalsName)?></td>
+    </tr>
+</table>
+
+<br>
+<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>
@@ -44,8 +44,14 @@ if ($me['level'] >= 5) {
 <!DOCTYPE html>
 <html>
 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 내무부</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
+
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>

@@ -216,10 +222,10 @@ if ($budgetricediff > 0) {
 <table align=center width=1000 class='tb_layout 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 class=bg1>국가 방침 <textarea <?=$read?> maxlength=1000 rows="5" style="color:white;background-color:black;width:830px;" name=msg><?=$nation['msg']?></textarea><input type=<?=$btn?> name=btn value=국가방침></td></tr>
-    <tr><td colspan=2 class=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>870 x 200px 넘는 크기를 점유할 시 통보없이 제한될 수 있습니다.</td></tr>
+    <tr><td colspan=2 align=center bgcolor=orange>국 가 방 침 &amp; 임관 권유 메시지</td></tr>
+    <tr><td colspan=2 class=bg1>국가 방침 <textarea <?=$read?> maxlength=16000 rows="5" style="color:white;background-color:black;width:830px;" name=msg><?=$nation['msg']?></textarea><input type=<?=$btn?> name=btn value=국가방침></td></tr>
+    <tr><td colspan=2 class=bg1>임관 권유 <input type=text <?=$read?> maxlength=1000 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>870px x 200px를 넘어서는 내용은 표시되지 않습니다.</td></tr>
    <tr><td colspan=2 height=10></td></tr>
    <tr><td colspan=2 align=center bgcolor=green>예 산 &amp; 정 책</td></tr>
    <tr>
@@ -13,6 +13,8 @@ $connect=$db->get();

 increaseRefresh("중원정보", 1);

+$mapTheme = $gameStor->map_theme??'che';
+
 $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);
@@ -45,11 +47,11 @@ for($i=0; $i < $nationcount; $i++) {
 }

 $realConflict = [];
-foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE conflict!=%s', '{}') as list(
+foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE conflict!=%s', '{}') as [
    $cityID, 
    $cityName, 
    $rawConflict
-))
+])
 {
    $conflict = Json::decode($rawConflict);
    if (count($conflict)<2) {
@@ -75,23 +77,28 @@ foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE confl
 <head>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 중원 정보</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS('d_shared/base_map.js')?>
 <?=WebUtil::printJS('js/map.js')?>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 $(function(){

    reloadWorldMap({
        neutralView:true,
-        showMe:true
+        showMe:true,
+        useCachedMap:true
    });

 });
 </script>
-<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/map.css')?>
@@ -213,7 +220,7 @@ for($i=0; $i < $nationcount; $i++) {
    </tr>
    <tr>
        <td width=698 height=420>
-            <?=getMapHtml()?>
+            <?=getMapHtml($mapTheme)?>
        </td>
        <td width=139 valign=top><div style='background-color:#cccccc;color:black;text-align:center'>국명</div><?=$nationStr?></td>
        <td width=70 valign=top style='text-align:center'><div style='background-color:#cccccc;color:black;'>국력</div><?=$powerStr?></td>
@@ -9,8 +9,6 @@ if ($type <= 0 || $type > 8) {
    $type = 7;
 }

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -19,7 +17,7 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();

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

 $query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
@@ -43,6 +41,8 @@ if ($me['level'] == 0 || ($me['level'] == 1 && $me['belong'] < $nation['secretli
 $sel = [];
 $sel[$type] = "selected";

+$templates = new \League\Plates\Engine('templates');
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -50,17 +50,22 @@ $sel[$type] = "selected";
    MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 암행부</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
-
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
 </head>

 <body>
 <table align=center width=1000 class='tb_layout bg0'>
    <tr><td>암 행 부<br><?=closeButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
+    <tr><td><form name=form1 method=get>정렬순서 :
        <select name=type size=1>
            <option <?=$sel[1]??''?> value=1>자금</option>
            <option <?=$sel[2]??''?> value=2>군량</option>
@@ -75,50 +80,28 @@ $sel[$type] = "selected";
    </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'];
+foreach($db->queryAllLists('SELECT troop, name FROM troop WHERE nation=%i', $me['nation']) as [$troopID, $tName]){
+    $troopName[$troopID] = $tName;
 }

+$orderSQL = '';
 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;
+    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;
 }
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$gencount = MYDB_num_rows($genresult);

-echo"
-<table align=center class='tb_layout 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']]??'-';
+$generals = $db->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 = %i %l', $me['nation'], $orderSQL);
+
+foreach ($generals as &$general) {
+    $general['cityText'] = CityConst::byID($general['city'])->name;
+    $general['troopText'] = $troopName[$general['troop']]??'-';

    if ($general['level'] == 12) {
        $lbonus = $nation['level'] * 2;
@@ -128,81 +111,129 @@ for ($j=0; $j < $gencount; $j++) {
        $lbonus = 0;
    }
    if ($lbonus > 0) {
-        $lbonus = "<font color=cyan>+{$lbonus}</font>";
+        $lbonusText = "<font color=cyan>+{$lbonus}</font>";
    } else {
-        $lbonus = "";
+        $lbonusText = "";
    }
+    $general['lbonus'] = $lbonus;
+    $general['lbonusText'] = $lbonusText;

    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}";
+        $leader = "<font color=red>{$leader}</font>{$lbonusText}";
        $power = "<font color=red>{$power}</font>";
        $intel = "<font color=red>{$intel}</font>";
    } else {
-        $leader = "{$general['leader']}{$lbonus}";
+        $leader = "{$general['leader']}{$lbonusText}";
        $power = "{$general['power']}";
        $intel = "{$general['intel']}";
    }

+    $general['leaderText'] = $leader;
+    $general['powerText'] = $power;
+    $general['intelText'] = $intel;
+
+    $general['expLevelText'] = getExpLevel($general['experience']);
+
    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']}";
+        $name =  $general['name'];
    }
+    //TODO: npc 코드를 일원화
+    $general['nameText'] = $name;

    switch ($general['mode']) {
-    case 0: $mode = "×"; break;
-    case 1: $mode = "○"; break;
-    case 2: $mode = "◎"; break;
+        case 0: $mode = "×"; break;
+        case 1: $mode = "○"; break;
+        case 2: $mode = "◎"; break;
    }
+    $general['modeText'] = $mode;
+    $general['crewtypeText'] = GameUnitConst::byId($general['crewtype'])->name??'-';

-    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>";
+    
+    if ($general['npc'] < 2) {
+        $turntext = [];
        $turn = getTurn($general, 1, 0);

        for ($i=0; $i < 5; $i++) {
-            $turn[$i] = StringUtil::subStringForWidth($turn[$i], 0, 20);
+            $turn[$i] = StringUtil::subStringForWidth($turn[$i], 0, 41);
            $k = $i+1;
-            echo "
-                &nbsp;$k : $turn[$i]  <br>";
+            $turntext[] = "&nbsp;$k : $turn[$i]";
        }
+        $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 = count($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){
+    $totalGold += $general['gold'];
+    $totalRice += $general['rice'];
+
+    $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/$genCnt, 2)?></td>
+<td class='bg1'>평균 쌀</td><td><?=number_format($totalRice/$genCnt, 2)?></td>
+</tr>
+<tr>
+<td class='bg1'>전체 병력/장수</td><td><?=number_format($crewTotal)?>/<?=number_format($genCnt)?></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>
@@ -29,7 +29,9 @@ if($meLevel == 0) {
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<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::printCSS('css/common.css')?>
@@ -450,15 +452,7 @@ echo "
    </tr>
 ";

-$citylevel = [];
-$citylevel[1] = "수";
-$citylevel[2] = "진";
-$citylevel[3] = "관";
-$citylevel[4] = "이";
-$citylevel[5] = "소";
-$citylevel[6] = "중";
-$citylevel[7] = "대";
-$citylevel[8] = "특";
+$citylevel = getCityLevelList();

 $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),"");
@@ -36,10 +36,16 @@ $sel = [$type => "selected"];
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<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::printCSS('../e_lib/jquery-ui.min.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/jquery-ui.min.js')?>
+<?=WebUtil::printJS('js/ext.expand_city.js')?>

 </head>

@@ -188,11 +194,11 @@ for ($j=0; $j < $citycount; $j++) {
 }
 ?>

-<table align=center width=1000 class='tb_layout bg0'>
+<table align=center width=1000 class='tb_layout bg0 anchor'>
    <tr><td><?=backButton()?></td></tr>
    <tr><td><?=banner()?></td></tr>
 </table>
 </body>
-
+<div id="helper_genlist" style="display:none;"></div>
 </html>

@@ -36,10 +36,16 @@ $sel = [$type => "selected"];
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 세력장수</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>

 </head>

@@ -179,8 +185,8 @@ for($j=0; $j < $gencount; $j++) {
        <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>".displaySpecialInfo($general['special'])." / ".displaySpecialInfo($general['special2'])."</td>
        <td align=center>{$general['belong']}</td>
        <td align=center>{$general['connect']}"; echo "<br>(".getConnect($general['connect']).")</td>
    </tr>";
@@ -26,7 +26,9 @@ if($me['level'] == 0) {
 <html>

 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<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::printCSS('css/common.css')?>
@@ -77,8 +77,14 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
 <!DOCTYPE html>
 <html>
 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 내정보</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>

@@ -21,7 +21,9 @@ $me = MYDB_fetch_array($result);
 <html>
 <head>
 <title><?=UniqueConst::$serverName?>: 회의실</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>

@@ -16,7 +16,9 @@ increaseRefresh("국법", 1);
 <html>
 <head>
 <title><?=UniqueConst::$serverName?>: 국법</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>

@@ -41,7 +41,9 @@ case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "itl"; $tp2 = "
    MessageBox("접속제한이 얼마 남지 않았습니다! 제한량이 모자라다면 참여를 해보세요^^");
 } ?>
 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<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::printCSS('css/common.css')?>
@@ -400,7 +402,7 @@ for($i=0;$i<16;$i+=1){
 }
 $bet = [];
 for ($i=0; $i < 16; $i++) {
-    if($betting['bet'] == 0){
+    if($betting["bet{$i}"] == 0){
        $bet[$i] = '∞';
        continue;
    }
@@ -12,22 +12,72 @@ $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);
+$me = $db->queryFirstRow('SELECT no,nation,troop FROM general WHERE owner=%i', $userID);

-$query = "select * from troop where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$troopcount = MYDB_num_rows($result);
+$troops = [];
+foreach($db->query('SELECT troop,name,no FROM troop WHERE nation = %i', $me['nation']) as $rawTroop){
+    $troops[$rawTroop['troop']] = [
+        'troop'=>$rawTroop['troop'],
+        'name'=>$rawTroop['name'],
+        'no'=>$rawTroop['no'],
+        'users'=>[]
+    ];
+}
+
+foreach($db->query(
+    'SELECT no,name,turntime,troop,city FROM general WHERE troop!=0 AND nation = %i ORDER BY turntime ASC',
+    $me['nation']
+) as $general
+){
+    if(!key_exists($general['troop'], $troops)){
+        trigger_error("올바르지 않은 부대 소속 {$general['no']}, {$general['name']} : {$general['troop']}");
+        continue;
+    }
+
+    $general['cityText'] = CityConst::byID($general['city'])->name;
+
+    $troops[$general['troop']]['users'][] = $general;
+}
+
+if($troops){
+    foreach($db->query(
+        'SELECT no,name,picture,imgsvr,turntime,city,turn0,turn1,turn2,turn3,turn4,turn5,troop FROM general WHERE no IN %li',
+        array_column($troops, 'no')
+    ) as $troopLeader
+    ){
+        $imageTemp = GetImageURL($troopLeader['imgsvr']);
+        
+        $troopLeader['pictureFullPath'] = "$imageTemp/{$troopLeader['picture']}";
+        $troopLeader['cityText'] = CityConst::byID($troopLeader['city'])->name;
+
+        $troopLeader['turnText'] = join('<br>', [
+            '1 : '.((DecodeCommand($troopLeader['turn0'])[0] == 26)?'집합':'~'),
+            '2 : '.((DecodeCommand($troopLeader['turn1'])[0] == 26)?'집합':'~'),
+            '3 : '.((DecodeCommand($troopLeader['turn2'])[0] == 26)?'집합':'~'),
+            '4 : '.((DecodeCommand($troopLeader['turn3'])[0] == 26)?'집합':'~'),
+            '5 : '.((DecodeCommand($troopLeader['turn4'])[0] == 26)?'집합':'~'),
+        ]);
+        $troops[$troopLeader['troop']]['leader'] = $troopLeader;
+    }
+}
+
+uasort($troops, function($lhs, $rhs){
+    return $lhs['leader']['turntime']<=>$rhs['leader']['turntime'];
+})

 ?>
 <!DOCTYPE html>
 <html>
 <head>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<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::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/troops.css')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('js/ext.plugin_troop.js')?>
 </head>

 <body>
@@ -36,7 +86,8 @@ $troopcount = MYDB_num_rows($result);
    <tr><td>부 대 편 성<br><?=backButton()?></td></tr>
 </table>
 <form name=form1 method=post action=c_troop.php>
-<table class='tb_layout bg0'>
+<table id="troop_list" class='tb_layout bg0'>
+    <thead>
    <tr>
        <td width=64  class='bg1 center'>선 택</td>
        <td width=130  class='bg1 center'>부 대 정 보</td>
@@ -44,117 +95,98 @@ $troopcount = MYDB_num_rows($result);
        <td width=576 class='bg1 center' style=table-layout:fixed;word-break:break-all;>장 수</td>
        <td width=130  class='bg1 center' style=table-layout:fixed;word-break:break-all;>부대장행동</td>
    </tr>
+    </thead>
+    <tfoot><tr><td colspan='5'>
+    <?php if(!$troops): ?>
+    <?php elseif($me['troop'] == 0): ?>
+        <input type=submit name=btn value='부 대 가 입'>
+    <?php else: ?>
+        <input type=submit name=btn value='부 대 탈 퇴' onclick='return confirm(\"정말 부대를 탈퇴하시겠습니까?\")'>
+    <?php endif;?>
+    </td></tr></tfoot>
+    <tbody>
 <?php
-for($i=0; $i < $troopcount; $i++) {
-    $troop = MYDB_fetch_array($result);
+foreach ($troops as $troopNo=>$troop) {
+    $troopLeader = $troop['leader'];
+    $genlistText = [];
+    $cityText = $troopLeader['cityText'];
+    $cityID = $troopLeader['city'];
+    $leaderID = $troopLeader['no'];

-    $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>";
-                }
-            }
+    foreach ($troop['users'] as $troopUser) {
+        $spanClass = 'troopUser';
+        if ($troopUser['city'] !== $cityID) {
+            $spanClass.= ' diffCity';
        }
+        if ($troopUser['no'] == $leaderID) {
+            $spanClass.= ' leader';
+        }
+        $genlistText[] = "<span class='$spanClass' data-general-id='{$troopUser['no']}'
+            ><span class='generalName'>{$troopUser['name']}</span><span class='cityText'>【{$troopUser['cityText']}】</span
+            ></span>";
    }
-    $genlist .= "({$gencount}명)";

-    if($me['troop'] == 0) {
-        echo "
+    $genlistText = sprintf('%s (%d명)', join(', ', $genlistText), count($genlistText)); ?>
+
+<?php if ($me['troop'] == 0): ?>
    <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=62>$genlist</td>
-        <td rowspan=2>$turn</td>
+        <td align=center rowspan=2><input type='radio' name='troop' value='<?=$troop['troop']?>'></td>
+        <td align=center><?=$troop['name']?><br>【 <?=$cityText?> 】</td>
+        <td height=64 style='background:no-repeat center url("<?=$troopLeader['pictureFullPath']?>");background-size:64px;'>&nbsp;</td>
+        <td rowspan=2 width=62><?=$genlistText?></td>
+        <td rowspan=2><?=$troopLeader['turnText']?></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><font size=2>【턴】 <?=substr($troopLeader['turntime'], 14)?></font></td>
+        <td align=center><font size=1><?=$troopLeader['name']?></font></td></tr>
+    <tr><td colspan=5>
+
+<?php else: ?>
    <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=576>$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 "
+        <td align=center ><?=$troop['name']?><br>【 <?=$cityText?> 】</td>
+        <td height=64 style='background:no-repeat center url("<?=$troopLeader['pictureFullPath']?>");background-size:64px;'>&nbsp;</td>
+        <td rowspan=2 width=62><?=$genlistText?></td>
+        <td rowspan=2>
+        <?php if ($me['no'] == $troopLeader['no']): ?>
            <select name=gen size=3 style=color:white;background-color:black;font-size:13px;width:128px;>";
-            for($k=0; $k < $genCount; $k++) {
-                $general = MYDB_fetch_array($genresult);
-                echo "
-                <option value={$general['no']}>{$general['name']}</option>";
-            }
-            echo "
+                <?php foreach ($troop['users'] as $troopUser): ?>
+                    <?php if ($troopUser['no'] == $me['no']) {
+        continue;
+    } ?>
+                    <option value='<?=$troopUser['no']?>'><?=$troopUser['name']?></option>
+                <?php endforeach; ?>
            </select><br>
-            <input type=submit name=btn value='부 대 추 방' style=width:130px;height:25px;>";
-        } else {
-            echo $turn;
-        }
-
-        echo "
+            <input type=submit name=btn value='부 대 추 방' style=width:130px;height:25px;>
+        <?php else: ?>
+            <?=$troopLeader['turnText']?>
+        <?php endif; ?>
        </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>";
-    }
-}
+    <tr><td align=center><font size=2>【턴】 <?=substr($troopLeader['turntime'], 14)?></font></td>
+    <td align=center><font size=1><?=$troopLeader['name']?></font></td></tr>
+    <tr><td colspan=5></td></tr>
+<?php endif;

-if ($troopcount == 0) {
-}
-else if($me['troop'] == 0) {
-    echo"
-<input type=submit name=btn value='부 대 가 입'>";
-} else {
-    echo"
-<input type=submit name=btn value='부 대 탈 퇴' onclick='return confirm(\"정말 부대를 탈퇴하시겠습니까?\")'>";
-}
+} //foreach ($troops as $troopNo=>$troop) {
+?>
+
+</tbody>

-echo "
-</td></tr>
 </table>
-<br>";
-
-echo "
+<br>
 <table width=1000 class='tb_layout bg0'>
    <tr>
        <td width=80 id=bg1>부 대 명</td>
-        <td width=130><input type=text style=color:white;background-color:black; size=18 maxlength=9 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 "
+        <td width=130><input type=text style=color:white;background-color:black; size=18 maxlength=9 name=name></td>
+    <?php if($me['troop'] == 0): ?>
+        <td><input type=submit name=btn value='부 대 창 설'></td>
+    <?php else: ?>
+        <td><input type=submit name=btn value='부 대 변 경'></td>
+    <?php endif; ?>
    </tr>
-</table>";
+</table>

-?>
 <table width=1000 class='tb_layout bg0'>
    <tr><td><?=backButton()?></td></tr>
    <tr><td><?=banner()?> </td></tr>
@@ -0,0 +1,473 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+$session = Session::requireLogin()->setReadOnly();
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$startYear = $gameStor->getValue('startyear');
+
+?>
+<!DOCTYPE html>
+<html>
+<head>
+<title><?=UniqueConst::$serverName?>: 전투 시뮬레이터</title>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1100" />
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/battle_simulator.css')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/moment.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('../e_lib/download2.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/battle_simulator.js')?>
+</head>
+<body>
+<div id="container">
+<div class="card mb-3">
+    <div class="card-header">
+        전역 설정
+    </div>
+    <div class="card-body dragpad_battle">
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="input-group">
+                    <input type="number" class="form-control" aria-describedby="text_year" value="<?=$startYear?>" disabled>
+                    <div class="input-group-append">
+                        <span class="input-group-text">년 시작</span>
+                    </div>
+                    <input type="number" class="form-control" id="year" value="<?=$startYear+3?>" min="<?=$startYear?>">
+                    <div class="input-group-append">
+                        <span class="input-group-text">년</span>
+                    </div>
+                    <input type="number" class="form-control" id="month" value="1" min="1" max="12">
+                    <div class="input-group-append">
+                        <span class="input-group-text">월</span>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="btn-toolbar" role="toolbar">
+                    <div class="input-group mr-2" role="group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text">반복 횟수</span>
+                        </div>
+                        <select class="custom-select" id="repeat_cnt">
+                            <option value="1">1회 (로그 표기)</option>
+                            <option value="1000">1000회 (요약 표기)</option>
+                        </select>
+                    </div>
+                    <div class="btn-group mr-2" role="group">
+                        <button type="button" class="btn btn-danger btn-begin_battle">전투</button>
+                    </div>
+                    <div class="btn-group mr-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-prepend">
+                        <span class="input-group-text">국가 성향</span>
+                    </div>
+                    <select class="custom-select form_nation_type" style="width:25ch;">
+                        <?php foreach(getNationTypeList() as $typeID => [$name,$pros,$cons]): ?>
+                            <option value="<?=$typeID?>"><?=$name?> (<?=$pros?>, <?=$cons?>)</option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">기술</span>
+                    </div>
+                    <input type="number" class="form-control form_tech" value="1" min="0" max="12">
+                    <div class="input-group-append">
+                        <span class="input-group-text">등급</span>
+                    </div>
+                </div>
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">국가 규모</span>
+                    </div>
+                    <select class="custom-select form_nation_level">
+                        <?php foreach(getNationLevelList() as $nationLevel => [$name,$chiefCnt,$cityCnt]): ?>
+                            <option value="<?=$nationLevel?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">도시 규모</span>
+                    </div>
+                    <select class="custom-select form_city_level">
+                        <?php foreach(getCityLevelList() as $levelID => $name): ?>
+                            <option value="<?=$levelID?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">수도</span>
+                    </div>
+                    <div class="input-group-append btn-group btn-group-toggle" data-toggle="buttons">
+                        <label class="btn btn-secondary">
+                            <input type="radio" name="is_attacker_capital" class="form_is_capital" value="1" autocomplete="off">Y
+                        </label>
+                        <label class="btn btn-secondary active">
+                            <input type="radio" name="is_attacker_capital" class="form_is_capital" value="2" autocomplete="off" checked>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-left" style="line-height:25px;">출병자 설정</div>
+                <div class="float-sm-right btn-toolbar" role="toolbar">
+                    <div class="btn-group btn-group-sm mr-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-prepend">
+                        <span class="input-group-text">국가 성향</span>
+                    </div>
+                    <select class="custom-select form_nation_type" style="width:25ch;">
+                        <?php foreach(getNationTypeList() as $typeID => [$name,$pros,$cons]): ?>
+                            <option value="<?=$typeID?>"><?=$name?> (<?=$pros?>, <?=$cons?>)</option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">기술</span>
+                    </div>
+                    <input type="number" class="form-control form_tech" value="1" min="0" max="12">
+                    <div class="input-group-append">
+                        <span class="input-group-text">등급</span>
+                    </div>
+                </div>
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">국가 규모</span>
+                    </div>
+                    <select class="custom-select form_nation_level">
+                        <?php foreach(getNationLevelList() as $nationLevel => [$name,$chiefCnt,$cityCnt]): ?>
+                            <option value="<?=$nationLevel?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">도시 규모</span>
+                    </div>
+                    <select class="custom-select form_city_level">
+                        <?php foreach(getCityLevelList() as $levelID => $name): ?>
+                            <option value="<?=$levelID?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">수도</span>
+                    </div>
+                    <div class="input-group-append btn-group btn-group-toggle" data-toggle="buttons">
+                        <label class="btn btn-secondary">
+                            <input type="radio" name="is_defender_capital" class="form_is_capital" value="1" autocomplete="off">Y
+                        </label>
+                        <label class="btn btn-secondary active">
+                            <input type="radio" name="is_defender_capital" class="form_is_capital" value="0" autocomplete="off" checked>N
+                        </label>
+                    </div>
+                </div>
+                <div class="input-group mb-1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">수비</span>
+                    </div>
+                    <input type="number" class="form-control form_def" id="city_def" value="1000" min="10" step="10">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">성벽</span>
+                    </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-left" style="line-height:25px;">수비자 설정</div>
+                <div class="float-sm-right btn-toolbar" role="toolbar">
+                    <div class="btn-group btn-group-sm mr-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-left" style="line-height:25px;">수비자 설정</div>
+                <div class="float-sm-right btn-toolbar" role="toolbar">
+                    <div class="btn-group btn-group-sm mr-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-prepend">
+                        <span class="input-group-text">이름</span>
+                    </div>
+                    <input type="text" class="form-control form_general_name" value="무명" style="width:15ch;">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">직위</span>
+                    </div>
+                    <select class="custom-select form_general_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-prepend">
+                        <span class="input-group-text">Level</span>
+                    </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-prepend">
+                        <span class="input-group-text">통솔</span>
+                    </div>
+                    <input type="number" class="form-control form_leadership" value="50" min="1" max="300" step="1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">무력</span>
+                    </div>
+                    <input type="number" class="form-control form_power" value="50" min="1" max="300" step="1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">지력</span>
+                    </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-prepend">
+                        <span class="input-group-text">명마</span>
+                    </div>
+                    <select class="custom-select form_general_horse">
+                        <?php foreach(range(0, 26) as $horseID): ?>
+                            <option value="<?=$horseID?>"><?=getHorseName($horseID)?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">무기</span>
+                    </div>
+                    <select class="custom-select form_general_weap">
+                        <?php foreach(range(0, 26) as $weapID): ?>
+                            <option value="<?=$weapID?>"><?=getWeapName($weapID)?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">서적</span>
+                    </div>
+                    <select class="custom-select form_general_book">
+                        <?php foreach(range(0, 26) as $bookID): ?>
+                            <option value="<?=$bookID?>"><?=getBookName($bookID)?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">부상</span>
+                    </div>
+                    <input type="number" class="form-control form_injury" value="0" min="0" max="80" step="1">
+                    <div class="input-group-append">
+                        <span class="input-group-text">%(<span class="injury_helptext">건강</span>)</span>
+                    </div>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">군량</span>
+                    </div>
+                    <input type="number" class="form-control form_rice" value="5000" min="50" max="40000" step="50">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">도구</span>
+                    </div>
+                    <select class="custom-select form_general_item">
+                        <?php foreach(range(0, 26) as $bookID): ?>
+                            <option value="<?=$bookID?>"><?=getItemName($bookID)?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="input-group mb-1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">병종</span>
+                    </div>
+                    <select class="custom-select form_crewtype">
+                        <?php foreach(GameUnitConst::all() as $crewTypeID => $crewType): ?>
+                            <?php if($crewTypeID < 0){ continue; } ?>
+                            <option value="<?=$crewTypeID?>"><?=$crewType->name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">병사</span>
+                    </div>
+                    <input type="number" class="form-control form_crew" value="7000" min="100" step="100">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">성격</span>
+                    </div>
+                    <select class="custom-select form_general_character">
+                        <?php foreach(getCharacterList() as $characterID => [$name,$info]): ?>
+                            <option value="<?=$characterID?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">훈련</span>
+                    </div>
+                    <input type="number" class="form-control form_train" value="100" min="40" max="<?=GameConst::$maxTrainByWar?>" step="1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">사기</span>
+                    </div>
+                    <input type="number" class="form-control form_atmos" value="100" min="40" max="<?=GameConst::$maxAtmosByWar?>" step="1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">전특</span>
+                    </div>
+                    <select class="custom-select form_general_special_war">
+                        <option value="0">-</option>
+                        <?php foreach(SpecialityConst::WAR as $specialWarID => [$name,$buff,$cond]): ?>
+                            <option value="<?=$specialWarID?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="input-group mb-1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">보병숙련</span>
+                    </div>
+                    <select class="custom-select form_dex0">
+                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
+                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">궁병숙련</span>
+                    </div>
+                    <select class="custom-select form_dex10">
+                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
+                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">기병숙련</span>
+                    </div>
+                    <select class="custom-select form_dex20">
+                        <?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-1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">귀병숙련</span>
+                    </div>
+                    <select class="custom-select form_dex30">
+                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
+                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">차병숙련</span>
+                    </div>
+                    <select class="custom-select form_dex40">
+                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
+                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend only_defender">
+                        <span class="input-group-text">수비여부</span>
+                    </div>
+                    <select class="custom-select form_defend_mode only_defender">
+                        <option value="2">훈사 80</option>
+                        <option value="3">훈사 60</option>
+                        <option value="0">안함</option>
+                    </select>
+                </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 id='result_killed'></td></tr>
+            <tr><th>받은 피해</th><td id='result_dead'></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>
+</body>
+</html>
@@ -91,11 +91,11 @@ if ($btn == "판매") {
        $msg = "ㆍ<span class='ev_warning'>시작판매가는 50% ~ 200% 이어야 합니다.</span>";
        $valid = 0;
    }
-    if ($topv < $amount*1.1 || $topv > $amount * 2) {
+    if ($topv * 10 < $amount * 11 || $topv > $amount * 2) {
        $msg = "ㆍ<span class='ev_warning'>즉시판매가는 110% ~ 200% 이어야 합니다.</span>";
        $valid = 0;
    }
-    if ($topv < $cost*1.1) {
+    if ($topv * 10 < $cost * 11) {
        $msg = "ㆍ<span class='ev_warning'>즉시판매가는 시작판매가의 110% 이상이어야 합니다.</span>";
        $valid = 0;
    }
@@ -19,11 +19,8 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

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

-$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,`level` FROM general WHERE `owner`=%i', $userID);

 //내가 수뇌부이어야함
 if($me['level'] < 5) {
@@ -32,21 +29,21 @@ if($me['level'] < 5) {
 }

 if($btn == "국가방침") {
-    $msg == mb_substr($msg, 0, 1000);
+    $msg = mb_substr($msg, 0, 16384);
    //$msg = StringUtil::
    $db->update('nation', [
-        'msg'=>BadTag2Code($msg)
+        'msg'=>WebUtil::htmlPurify($msg)
    ], 'nation=%i',$me['nation']);
 } elseif($btn == "임관권유") {
-    $scoutmsg == mb_substr($msg, 0, 500);
+    $scoutmsg = mb_substr($scoutmsg, 0, 1000);
    $db->update('nation', [
-        'scoutmsg'=>BadTag2Code($scoutmsg)
+        'scoutmsg'=>WebUtil::htmlPurify($scoutmsg)
    ], 'nation=%i',$me['nation']);
 } elseif($btn == "세율") {
-    if($rate < 5)  { $rate = 5; }
-    if($rate > 30) { $rate = 30; }
-    $query = "update nation set rate='$rate' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $rate = Util::valueFit($rate, 5, 30);
+    $db->update('nation', [
+        'rate'=>$rate,
+    ], 'nation=%i', $me['nation']);
 } elseif($btn == "지급율") {
    $bill = Util::valueFit($bill, 20, 200);
    $db->update('nation', [
@@ -70,8 +67,9 @@ if($btn == "국가방침") {
        'war'=>1
    ], 'nation=%i',$me['nation']);
 } elseif($btn == "전쟁 허가") {
-    $query = "update nation set war='0' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('nation', [
+        'war'=>0
+    ], 'nation=%i',$me['nation']);
 }

 header('location:b_dipcenter.php');
@@ -37,19 +37,14 @@ if($third < 0)  { $third = 0; }
 if($fourth < 0) { $fourth = 0; }
 if($command > 99) { $command = 0; }
 if($double > 9999) { $double = 9999; }
-if($third > 9999)  { $third = 9999; }
 if($fourth > 9999) { $fourth = 9999; }

 $comStr = EncodeCommand($fourth, $third, $double, $command);

 // 건국
 if($command == 46) {
-    $name = addslashes(SQ2DQ($name));
-    $name = str_replace("|", "", $name);
-    $name = str_replace(" ", "", $name);
-    $name = str_replace("　", "뷁", $name);
+    $name = StringUtil::neutralize($name);
    if($name == "") { $name = "무명"; }
-    $name = StringUtil::subStringForWidth($name, 0, 18);

    $db->update('general', [
        'makenation'=>$name
@@ -72,15 +67,12 @@ if($command == 53) {
    $me = MYDB_fetch_array($result);

    if($me['level'] >= 5) {
-        $nationname = addslashes(SQ2DQ($nationname));
-        $nationname = str_replace("|", "", $nationname);
-        $nationname = str_replace(" ", "", $nationname);
-        $nationname = str_replace("　", "뷁", $nationname);
+        $nationname = StringUtil::neutralize($nationname, 18);
        if($nationname == "") { $nationname = "무명"; }
-        $nationname = StringUtil::subStringForWidth($nationname, 0, 18);
-
-        $query = "update general set makenation='{$nationname}' where level>=5 and nation='{$me['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        
+        $db->update('general', [
+            'makenation'=>$nationname
+        ], 'level>=5 and nation=%i', $me['nation']);

        $count = count($turn);
        $str = "type=type";
@@ -101,11 +93,7 @@ if($command == 61) {
    $me = MYDB_fetch_array($result);

    if($me['level'] >= 5) {
-        $note = addslashes(SQ2DQ($note));
-        $note = str_replace("|", "", $note);
-        $note = str_replace(" ", "", $note);
-        $note = str_replace("　", "뷁", $note);
-        $note = StringUtil::subStringForWidth($note, 0, 90);
+        $note = StringUtil::neutralize($note, 90);

        $query = "update diplomacy set reserved='{$note}' where me='{$me['nation']}' and you='$double'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -39,23 +39,20 @@ if($meLevel < 5){
 }

 if($btn == "임명") {
-    if(!$genlist){
-        header('location:b_myBossInfo.php');
-        exit();
+    if($genlist==0){
+        $general = [];
+    }
+    else{
+        $general = $db->queryFirstRow('SELECT `no`,nation,`level`,leader,`power`,intel FROM general WHERE no = %i', $genlist);
    }

-    $query = "select no,nation,level,leader,power,intel from general where no='$genlist'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
-
-    if(!$general){
+    if($genlist != 0 && !$general){
        header('location:b_myBossInfo.php');
        exit();
    }

    //임명할사람이 군주이면 불가, 내가 수뇌부이어야함, 공석아닌때는 국가가 같아야함
-    if($meLevel < 5 || ($general['nation'] != $me['nation'] && $genlist != 0) || ($general['level'] == 12 && $genlist != 0)) {
-        
+    if($meLevel < 5 || ($genlist != 0 && $general['nation'] != $me['nation']) || ($genlist != 0 && $general['level'] == 12)) {
        header('location:b_myBossInfo.php');
        exit();
    }
@@ -137,8 +134,25 @@ if($btn == "추방") {
            $log[] = "<C>●</><D><b>{$nation['name']}</b></>에서 <R>추방</>당하였습니다.";

            // 재야로, 국가 무소속으로, 명성/공헌 N*10%감소
-            $query = "update general set level=0,nation=0,belong=0,betray=betray+1,makelimit='12',gold='{$general['gold']}',rice='{$general['rice']}',dedication=dedication*(1-0.1*betray),experience=experience*(1-0.1*betray) where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            if($admin['year'] <= $admin['startyear'] && $general['npc'] < 2){
+                $db->update('general', [
+                    'level'=>0,
+                    'nation'=>0,
+                    'belong'=>0,
+                ], 'no=%i', $general['no']);
+            }
+            else{
+                $db->update('general', [
+                    'level'=>0,
+                    'nation'=>0,
+                    'belong'=>0,
+                    'betray'=>$db->sqleval('betray + 1'),
+                    'makelimit'=>12,
+                    'gold'=>$general['gold'],
+                    'rice'=>$general['rice'],
+                    'dedication'=>$db->sqleval('dedication * (1 - 0.1*betray)'),
+                ], 'no=%i', $general['no']);
+            }
        }
        // 부대 처리
        $query = "select no from troop where troop='{$general['troop']}'";
@@ -166,7 +180,7 @@ if($btn == "추방") {
        $query = "update city set gen3='0' where gen3='{$general['no']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

-        if($general['npc'] >= 2 && ($admin['scenario'] == 0 || rand()%100 == 0)) {
+        if($general['npc'] >= 2 && ($admin['scenario'] < 100 || rand()%100 == 0)) {
            switch(rand()%5) {
            case 0: $str = "날 버리다니... 곧 전장에서 복수해주겠다..."; break;
            case 1: $str = "추방이라... 내가 무얼 잘못했단 말인가..."; break;
@@ -241,7 +255,7 @@ if($btn == "임명" && $level >= 5 && $level <= 11) {
        $nation['chemi'] -= 1;
        if($nation['chemi'] < 0) { $nation['chemi'] = 0; }

-        $query = "update nation set chemi='{$nation['chemi']}' where nation='{$general['nation']}'";
+        $query = "update nation set chemi='{$nation['chemi']}' where nation='{$me['nation']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

        //기존 장수 일반으로
@@ -38,9 +38,13 @@ case 3: $tp = "intel";  $tp2 = "설전";   $tp3 = "intel"; break;
 }

 if($btn == '참가') {
-    $query = "select no,name,npc,leader,power,intel,explevel,gold,horse,weap,book from general where no='{$me['no']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
+
+    if($db->queryFirstField('SELECT `no` FROM tournament WHERE `no`=%i', $me['no'])){
+        header('location:b_tournament.php');
+        exit(1); 
+    }
+
+    $general = $db->queryFirstRow('SELECT no,name,npc,leader,power,intel,explevel,gold,horse,weap,book FROM general WHERE `no`=%i', $me['no']);

    //{$admin['develcost']}원 참가비
    if($general['gold'] < $admin['develcost']) { 
@@ -58,14 +58,14 @@ if(!$isVoteAdmin){

 if($btn == "수정") {
    if($title != "") {
-        $gameStor->vote_title = $title;
+        $gameStor->vote_title = WebUtil::htmlPurify($title);
    }
 } elseif($btn == "추가") {
    if($str != "") {
        if(!$admin['vote']){
            $admin['vote'] = [];
        }
-        $admin['vote'][] = $str;
+        $admin['vote'][] = WebUtil::htmlPurify($str);
        $gameStor->vote=$admin['vote'];
    }
 } elseif($btn == "리셋") {
@@ -13,7 +13,9 @@ $db = DB::db();
 <html>
 <head>
 <title>커맨드리스트</title>
-<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <script type="text/javascript">
@@ -0,0 +1,17 @@
+#container{
+    width:1024px;
+    margin:auto;
+}
+
+.defender_add_form .general_detail{
+    display:none;
+}
+
+
+.form_sample{
+    display:none;
+}
+
+input[type=number]{
+    text-align:right;
+}
@@ -1,9 +1,15 @@
@charset "UTF-8";

+/* font-boostring Block */
+html * {max-height:1000000px;}
+
+
 html, body{
    background-color:black;
    color:white;
    line-height:1.3;
+    font-family:'맑은 고딕'; 
+    font-size:13px;
 }

 table { font-family:'맑은 고딕'; }
@@ -181,3 +187,18 @@ div.bar_out div.bar_in{
    float:left;
 }

+.tooltip{
+    font-size:12px;
+    font-family: '맑은 고딕';
+}
+
+.tooltiptext {
+    display: none;
+}
+
+.btn-group-xs > .btn, .btn-xs {
+    padding  : .25rem .4rem;
+    font-size  : .875rem;
+    line-height  : .5;
+    border-radius : .2rem;
+  }
@@ -0,0 +1,94 @@
+
+.rankView {
+    width:1100px;
+    margin:auto;
+    position:relative;
+    font-size:13px;
+}
+
+.rankView h3{
+    text-align:center;
+    margin:0;
+    padding:2px;
+    border-bottom:1px solid gray;
+}
+
+.rankView ul{
+    list-style:none;
+    margin:0;
+    padding:0;
+    box-sizing: border-box;
+    margin-top:-1px;
+    margin-bottom:-1px;
+}
+
+.rankView li{
+    display:inline-block;
+    vertical-align: top;
+    width:110px;
+    height:149px;
+    text-align:center;
+    border-right:1px solid gray;
+    border-top:1px solid gray;
+    margin:0;
+    box-sizing: border-box;
+}
+
+.rankView li.no_value{
+    height:128px;
+}
+
+.rankView li.has_server {
+    height:168px;
+}
+
+.rankView li.no_value.has_server {
+    height:146px;
+}
+
+.rankView .hall_server{
+    border-top:1px solid gray;
+}
+
+.rankView .tooltip .tooltiptext{
+    width:220px;
+    margin-left: -110px;
+}
+
+
+
+.rankView .no_value .hall_value{
+    display:none;
+}
+
+.rankView .hall_nation{
+    font-size:11px;
+    border-top:1px solid gray;
+    border-bottom:1px solid gray;
+}
+
+.rankView .hall_name{
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    resize: vertical;
+    font-size:11px;
+    height:28px;
+}
+
+.rankView .hall_name p{
+    padding:0;
+    margin:0;
+}
+
+.rankView .hall_owner{
+    font-size:95%;
+}
+
+.rankView .hall_value{
+    line-height:13px;
+    box-sizing: border-box;
+    border-top:1px solid gray;
+    padding-top:3px;
+    padding-bottom:3px;
+}
@@ -27,12 +27,51 @@
    position:relative;
 }

+.map_body .map_bglayer1{
+    width:100%;
+    height:100%;
+    position:absolute;
+    left:0;
+    top:0;
+}
+
+.map_body .map_bglayer2{
+    width:100%;
+    height:100%;
+    position:absolute;
+    left:0;
+    top:0;
+}
+
+.map_body .map_bgroad{
+    width:100%;
+    height:100%;
+    position:absolute;
+    left:0;
+    top:0;
+}
+
+.map_body .map_button_stack{
+    position:absolute;
+    right:0;
+    bottom:0;
+}
+
+.map_body .map_toggle_cityname::after{
+    content: "끄기"
+}
+
+.map_body .map_toggle_cityname.active::after{
+    content: "켜기"
+}
+
 .world_map .city_tooltip{
    position: absolute;
    z-index:6;
    display:none;
-    width:120px;
+    min-width:120px;
    border: 0.02em gray solid;
+    white-space: nowrap;
 }
 .world_map .city_name{
    background-color: rgb(30, 164, 255);
@@ -63,13 +102,26 @@

 .world_map.map_detail .city_filler{
    position:absolute;
-    width:100%;
-    height:100%;
+    width:calc(100% + 2px);
+    height:calc(100% + 2px);
    left:-1px;
    top:-1px;
    background:transparent;
 }

+.world_map .city_detail_name{
+    background-color:rgba(0,0,0,0.5);
+    font-size:10px;
+    position:absolute;
+    white-space:nowrap;
+    left:70%;
+    bottom:-10px;
+    color:white;
+}
+
+.world_map.hide_cityname .city_detail_name{
+    display:none;
+}

 .city_base{
    position:absolute;
@@ -314,6 +366,8 @@

 /* Basic */

+
+
 .world_map.map_basic .city_filler{
    position:absolute;
    width:100%;
@@ -17,15 +17,14 @@
 #message_board section{
    overflow-y:auto;
    overflow-x:hidden;
-    max-width:498px;
 }

 .msg_plate{
    width:100%;
-    border-bottom:solid 1px gray;
-    border-left:solid 1px gray;
-    border-right:solid 1px gray;
-    height:64px;
+    outline-style:solid;
+    outline-width:1px;
+    outline-color: gray;
+    min-height:64px;
    font-size:12px;
    word-break:break-all;
    color:white;
@@ -96,7 +95,8 @@
    font-size:12px;
    width:715px;
    margin:0 2px;
-    height:15px;
+    height:20px;
+    border:solid 1px gray;
 }

 #msg_submit{
@@ -116,17 +116,19 @@

 .board_header{
    color:white;
-    border:solid 1px gray;
+    outline-style:solid;
+    outline-width:1px;
+    outline-color: gray;
 }

 .board_side{
    position:absolute;
    height:1370px;
-    width:498px;
+    width:50%;
    overflow-y: hidden;
-    border-left:solid 1px;
-    border-right:solid 1px;
-    border-bottom:solid 1px;
+    outline-style:solid;
+    outline-width:1px;
+    outline-color: gray;
 }

 .msg_body{
@@ -0,0 +1,23 @@
+#troop_list .cityText{
+    display:none;
+}
+
+#troop_list .diffCity .cityText{
+    display:inline;
+}
+
+#troop_list .diffCity {
+    color:red;
+}
+
+#troop_list .leader{
+    color:lightgreen;
+}
+
+#troop_list .leader::before{
+    content:'*';
+}
+
+#troop_list .leader::after{
+    content:'*';
+}
@@ -0,0 +1,7 @@
+<?php
+
+namespace sammo;
+
+class CityConst extends CityConstBase{
+    
+}
@@ -0,0 +1,6 @@
+<?php
+namespace sammo;
+
+class GameConst extends GameConstBase
+{
+}
@@ -1,12 +0,0 @@
-<?php
-namespace sammo;
-
-class GameCustomConst
-{
-    /** @var int 유저 스탯 총합 */
-    public static $defaultStatTotal = _tK_statTotal_;
-    public static $defaultStatMin = _tK_statMin_;
-    public static $defaultStatMax = _tK_statMax_;
-    public static $defaultStatNPCMax = _tK_statNPCMax_;
-    public static $chiefStatMin = _tK_statChiefMin_;
-}
@@ -0,0 +1,6 @@
+<?php
+namespace sammo;
+
+class GameUnitConst extends GameUnitConstBase
+{
+}
@@ -0,0 +1 @@
+Deny from  all
@@ -424,7 +424,7 @@ function addCommand($typename, $value, $valid = 1, $color=0) {
 function commandGroup($typename, $type=0) {
    if($type == 0) {
        echo "
-    <optgroup label='{$typename}' style=color:skyblue;background-color:black;>";
+    <optgroup label='{$typename}' style='color:skyblue;background-color:black;'>";
    } else {
        echo "
    </optgroup>";
@@ -490,7 +490,7 @@ function commandTable() {
    $develcostE = Util::round($develcostE);

    echo "
-<select name=commandtype size=1 style=width:260px;color:white;background-color:black;font-size:12px;>";
+<select name=commandtype size=1 style='height:20px;width:260px;color:white;background-color:black;font-size:12px;'>";
    addCommand("휴 식", 0);
    addCommand("요 양", 50);
    commandGroup("========= 내 정 ==========");
@@ -524,7 +524,7 @@ function commandTable() {
        addCommand("첩보(통솔경험, 자금$develcost3, 군량$develcost3)", 31);
        addCommand("징병(통솔경험)", 11);
        addCommand("모병(통솔경험, 자금x2)", 12);
-        addCommand("훈련(통솔경험, 사기↓)", 13);
+        addCommand("훈련(통솔경험)", 13);
        addCommand("사기진작(통솔경험, 자금↓)", 14);
        //addCommand("전투태세/3턴(통솔경험, 자금↓)", 15);
        addCommand("출병", 16);
@@ -532,7 +532,7 @@ function commandTable() {
        addCommand("첩보(통솔경험, 자금$develcost3, 군량$develcost3)", 31, 0);
        addCommand("징병(통솔경험)", 11, 0);
        addCommand("모병(통솔경험, 자금x2)", 12, 0);
-        addCommand("훈련(통솔경험, 사기↓)", 13, 0);
+        addCommand("훈련(통솔경험)", 13, 0);
        addCommand("사기진작(통솔경험, 자금↓)", 14, 0);
        //addCommand("전투태세/3턴(통솔경험, 자금↓)", 15, 0);
        addCommand("출병", 16, 0);
@@ -699,7 +699,8 @@ function CoreCommandTable() {
    if($city['supply'] == 0) { $valid = 0; }

    echo "
-<select name=commandtype size=1 style=color:white;background-color:black;font-size:13>";
+<select name=commandtype size=1 style='height:20px;color:white;background-color:black;font-size:13px;'>";
+    commandGroup("====== 휴 식 ======");
    addCommand("휴 식", 99);
    commandGroup("", 1);
    commandGroup("====== 인 사 ======");
@@ -821,7 +822,7 @@ function generalInfo($no) {
    $weapname = getWeapName($general['weap']);
    $bookname = getBookName($general['book']);
    $horsename = getHorseName($general['horse']);
-    $itemname = getItemName($general['item']);
+    $itemname = displayItemInfo($general['item']);
    if($general['injury'] > 0) {
        $leader = intdiv($general['leader'] * (100 - $general['injury']), 100);
        $power = intdiv($general['power'] * (100 - $general['injury']), 100);
@@ -847,8 +848,8 @@ function generalInfo($no) {
    else                  { $general['age'] = "<font color=red>{$general['age']} 세</font>"; }

    $general['connect'] = Util::round($general['connect'] / 10) * 10;
-    $special = $general['special'] == 0 ? "{$general['specage']}세" : "<font color=limegreen>".getGenSpecial($general['special'])."</font>";
-    $special2 = $general['special2'] == 0 ? "{$general['specage2']}세" : "<font color=limegreen>".getGenSpecial($general['special2'])."</font>";
+    $special = $general['special'] == 0 ? "{$general['specage']}세" : "<font color=limegreen>".displaySpecialInfo($general['special'])."</font>";
+    $special2 = $general['special2'] == 0 ? "{$general['specage2']}세" : "<font color=limegreen>".displaySpecialInfo($general['special2'])."</font>";

    switch($general['personal']) {
        case  2:    case  4:
@@ -913,7 +914,7 @@ function generalInfo($no) {
        <td style='text-align:center;' class='bg1'><b>병사</b></td>
        <td style='text-align:center;' colspan=2>{$general['crew']}</td>
        <td style='text-align:center;' class='bg1'><b>성격</b></td>
-        <td style='text-align:center;' colspan=2>".getGenChar($general['personal'])."</td>
+        <td style='text-align:center;' colspan=2>".displayCharInfo($general['personal'])."</td>
    </tr>
    <tr>
        <td style='text-align:center;' class='bg1'><b>훈련</b></td>
@@ -1116,22 +1117,19 @@ function nationMsg() {
    $connect=$db->get();
    $userID = Session::getUserID();

-    $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);
+    $msg = $db->queryFirstField(
+        'SELECT msg FROM nation WHERE nation = (SELECT nation FROM general WHERE `owner` = %i)',
+        $userID
+    );

-    $query = "select msg from nation where nation='{$me['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    echo "<font color=orange>".$nation['msg']."</font>";
+    return $msg?:'';
 }

 function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) {
    $db = DB::db();
    $connect=$db->get();

-    $message = explode("|", $msg);
+    $message = explode('|', $msg);
    $count = (count($message) - 2)/2;
    $message[0] = Tag2Code($message[0]);
    $message[1] = Tag2Code($message[1]);
@@ -1150,7 +1148,7 @@ function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) {
        <td width=148 style='text-align:center;' class='bg1'>$when</td>
    </tr>
    <tr>
-        <td width=90 height=64 valign=top><img width='64' height='64' src={$imageTemp}/{$picture} border='0'></td>
+        <td width=90 height=64 valign=top><img width='64' height='64' src='{$imageTemp}/{$picture}' border='0'></td>
        <td width=906 colspan=2>$message[1]</td>
    </tr>";
    for($i=0; $i < $count; $i++) {
@@ -1183,11 +1181,10 @@ function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) {
 function banner() {

    return sprintf(
-        '<font size=2>%s %s / %s <br> %s</font>',
+        '<font size=2>%s %s / %s</font>',
        GameConst::$title,
        VersionGit::$version,
-        GameConst::$banner,
-        GameConst::$helper);
+        GameConst::$banner);
 }

 function addTurn($date, int $turnterm, int $turn=1) {
@@ -1269,7 +1266,7 @@ function increaseRefresh($type="", $cnt=1) {
    $date2 = substr($date, 0, 10);
    $online = getOnlineNum();
    file_put_contents(
-        __dir__."/logs/_{$date2}_refresh.txt",
+        __dir__."/logs/".UniqueConst::$serverID."/_{$date2}_refresh.txt",
        sprintf(
            "%s, %s, %s, %s, %s, %d\n",
            $date,
@@ -1306,7 +1303,7 @@ function increaseRefresh($type="", $cnt=1) {
    }
    if($str != "") {
        file_put_contents(
-            __dir__."/logs/_{$date2}_ipcheck.txt",
+            __dir__."/logs/".UniqueConst::$serverID."/_{$date2}_ipcheck.txt",
            sprintf(
                "%s, %s, %s%s\n",
                $session->userName,
@@ -1341,7 +1338,7 @@ function updateTraffic() {

    $date = date('Y-m-d H:i:s');
    //일시|년|월|총갱신|접속자|최다갱신자
-    file_put_contents(__dir__."/logs/_traffic.txt",
+    file_put_contents(__dir__."/logs/".UniqueConst::$serverID."/_traffic.txt",
        Json::encode([
            $date,
            $admin['year'],
@@ -1816,7 +1813,7 @@ function PreprocessCommand($no) {
    $connect=$db->get();
    $log = [];

-    $query = "select no,name,city,injury,special2,item,turn0 from general where no='$no'";
+    $query = "select no,name,city,injury,special2,item,turn0,rice,crew from general where no='$no'";
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $general = MYDB_fetch_array($result);

@@ -1874,7 +1871,7 @@ function PreprocessCommand($no) {
            $josaUl = JosaUtil::pick($general['item'], '을');
            $log[0] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용하여 치료합니다!";
            pushGenLog($general, $log);
-        } elseif($general['injury'] > 10 && $general['item'] == 1 && $general['turn0'] != EncodeCommand(0, 0, 0, 50)) {
+        } elseif($general['injury'] > 10 && $general['item'] == 1 && DecodeCommand($general['turn0'])[0] != 50) {
            //환약 사용
            $query = "update general set injury=0,item=0 where no='$no'";
            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1891,6 +1888,27 @@ function PreprocessCommand($no) {
            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        }
    }
+
+    
+    if($general['crew'] >= 100){
+        $newRice = $general['rice'] - $general['crew'] / 100;
+        if($newRice >= 0){
+            $db->update('general', [
+                'rice'=>Util::round($newRice)
+            ], 'no=%i',$general['no']);
+        }
+        else{
+            $db->update('city', [
+                'pop'=>$db->sqleval('pop + %i', $general['crew'])
+            ], 'city=%i', $general['city']);
+            $db->update('general', [
+                'crew'=>0,
+                'rice'=>0
+            ], 'no=%i',$general['no']);
+            pushGenLog($general, ["<C>●</>군량이 모자라 병사들이 <R>소집해제</>되었습니다!"]);
+        }
+    }
+
 }


@@ -1913,17 +1931,22 @@ function updateTurntime($no) {
        if($general['npc'] == 1 && $general['deadyear'] > $admin['year']) {
            $general['killturn'] = ($general['deadyear'] - $admin['year']) * 12;
            $general['npc'] = $general['npc_org'];
-            $query = "update general set owner=-1,npc='{$general['npc']}',killturn='{$general['killturn']}',mode=2 where no='$no'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+            $db->update('general', [
+                'owner'=>-1,
+                'npc'=>$general['npc_org'],
+                'killturn'=>$general['killturn'],
+                'mode'=>2,
+                'name2'=>null
+            ], 'no=%i',$no);

            $josaYi = JosaUtil::pick($general['name2'], '이');
            $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name2']}</>{$josaYi} <Y>{$general['name']}</>의 육체에서 <S>유체이탈</>합니다!";
            pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-
-            if($admin['isunited'] == 0) {
-                CheckHall($no);
-            }
        } else {
+
+            storeOldGeneral($general['no'], $admin['year'], $admin['month']);
+
            // 군주였으면 유지 이음
            if($general['level'] == 12) {
                nextRuler($general);
@@ -2015,7 +2038,7 @@ function updateTurntime($no) {
            default: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다."; break;
            }
            // 엔피씨,엠피씨,의병 사망로그
-            if($general['npc'] == 2) {
+            if($general['npc'] == 2 || $general['npc'] == 6) {
                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다.";
            } elseif($general['npc'] >= 3) {
                switch(rand()%10) {
@@ -2063,9 +2086,9 @@ function updateTurntime($no) {

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

-    $type = array(
+    $types = array(
        "experience",
        "dedication",
        "firenum",
@@ -2089,64 +2112,83 @@ function CheckHall($no) {
        "betrate"
    );

-    $query = "select name,nation,picture,
-        experience,dedication,warnum,firenum,killnum,
-        killnum/warnum*10000 as winrate,killcrew,killcrew/deathcrew*10000 as killrate,
-        dex0,dex10,dex20,dex30,dex40,
-        ttw/(ttw+ttd+ttl)*10000 as ttrate, ttw+ttd+ttl as tt,
-        tlw/(tlw+tld+tll)*10000 as tlrate, tlw+tld+tll as tl,
-        tpw/(tpw+tpd+tpl)*10000 as tprate, tpw+tpd+tpl as tp,
-        tiw/(tiw+tid+til)*10000 as tirate, tiw+tid+til as ti,
-        betgold, betwin, betwingold, betwingold/betgold*10000 as betrate
-        from general where no='$no'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
+    $general = $db->queryFirstRow('SELECT name,name2,owner,nation,picture,imgsvr,
+    experience,dedication,warnum,firenum,killnum,
+    killnum/warnum as winrate,killcrew,killcrew/deathcrew as killrate,
+    dex0,dex10,dex20,dex30,dex40,
+    ttw/(ttw+ttd+ttl) as ttrate, ttw+ttd+ttl as tt,
+    tlw/(tlw+tld+tll) as tlrate, tlw+tld+tll as tl,
+    tpw/(tpw+tpd+tpl) as tprate, tpw+tpd+tpl as tp,
+    tiw/(tiw+tid+til) as tirate, tiw+tid+til as ti,
+    betgold, betwin, betwingold, betwingold/betgold as betrate
+    from general where no=%i', $no);

+    if(!$general){
+        return;
+    }
+
+    $unitedDate = date('Y-m-d H:i:s');
    $nation = getNationStaticInfo($general['nation']);

-    for($k=0; $k < 21; $k++) {
-        $query = "select * from hall where type='$k' order by data desc";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $count = MYDB_num_rows($result);
+    $serverCnt = $db->queryFirstField('SELECT count(*) FROM ng_games');
+
+    [$scenarioIdx, $scenarioName, $startTime] = $gameStor->getValuesAsArray(['scenario', 'scenario_text', 'starttime']);
+
+    foreach($types as $idx=>$typeName) {
+        

        //승률,살상률인데 10회 미만 전투시 스킵
-        if(($k == 5 || $k == 7) && $general['warnum']<10) { continue; }
+        if(($typeName === 'winrate' || $typeName === 'killrate') && $general['warnum']<10) { continue; }
        //토너승률인데 50회 미만시 스킵
-        if($k == 13 && $general['tt'] < 50) { continue; }
+        if($typeName === 'ttrate' && $general['tt'] < 50) { continue; }
        //토너승률인데 50회 미만시 스킵
-        if($k == 14 && $general['tl'] < 50) { continue; }
+        if($typeName === 'tlrate' && $general['tl'] < 50) { continue; }
        //토너승률인데 50회 미만시 스킵
-        if($k == 15 && $general['tp'] < 50) { continue; }
+        if($typeName === 'tprate' && $general['tp'] < 50) { continue; }
        //토너승률인데 50회 미만시 스킵
-        if($k == 16 && $general['ti'] < 50) { continue; }
+        if($typeName === 'tirate' && $general['ti'] < 50) { continue; }
        //수익률인데 1000미만시 스킵
-        if($k == 20 && $general['betgold'] < 1000) { continue; }
+        if($typeName === 'betrate' && $general['betgold'] < 1000) { continue; }

-        $rank = 10;
-        for($i=0; $i < $count; $i++) {
-            $ranker = MYDB_fetch_array($result);
-
-            if($general[$type[$k]] >= $ranker['data']) {
-                $rank = $i;
-                break;
-            }
+        if($general[$typeName]<=0){
+            continue;
        }
-        for($i=8; $i >= $rank; $i--) {
-            $j = $i + 1;
-            $query = "select * from hall where type='$k' and rank='$i'";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $ranker = MYDB_fetch_array($result);

-            $query = "update hall set name='{$ranker['name']}', nation='{$ranker['nation']}', data='{$ranker['data']}', color='{$ranker['color']}', picture='{$ranker['picture']}' where type='$k' and rank='$j'";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        }
-        $query = "update hall set name='{$general['name']}', nation='{$nation['name']}', data='{$general[$type[$k]]}', color='{$nation['color']}', picture='{$general['picture']}' where type='$k' and rank='$rank'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $aux = [
+            'name'=>$general['name'],
+            'nationName'=>$nation['name'],
+            'bgColor'=>$nation['color'],
+            'fgColor'=>newColor($nation['color']),
+            'picture'=>$general['picture'],
+            'imgsvr'=>$general['imgsvr'],
+            'startTime'=>$startTime,
+            'unitedTime'=>$unitedDate,
+            'owner_name'=>$general['name2'],
+            'serverID'=>UniqueConst::$serverID,
+            'serverIdx'=>$serverCnt,
+            'serverName'=>UniqueConst::$serverName,
+            'scenarioName'=>$scenarioName,
+        ];
+        $jsonAux = Json::encode($aux);
+
+        $db->insertUpdate('ng_hall', [
+            'server_id'=>UniqueConst::$serverID,
+            'scenario'=>$scenarioIdx,
+            'general_no'=>$no,
+            'type'=>$idx,
+            'value'=>$general[$typeName]??0,
+            'owner'=>$general['owner']??null,
+            'aux'=>$jsonAux
+        ],[
+            'value'=>$general[$typeName]??0,
+            'aux'=>$jsonAux
+        ]);
    }
 }


 function uniqueItem($general, $log, $vote=0) {
+    //TODO: uniqueItem 재 구현
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $connect=$db->get();
@@ -2164,7 +2206,7 @@ function uniqueItem($general, $log, $vote=0) {
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $gen = MYDB_fetch_array($result);

-    if($admin['scenario'] == 0)  { $prob = $gen['cnt'] * 5; }  // 5~6개월에 하나씩 등장
+    if($admin['scenario'] < 100)  { $prob = $gen['cnt'] * 5; }  // 5~6개월에 하나씩 등장
    else { $prob = $gen['cnt']; }  // 1~2개월에 하나씩 등장

    if($vote == 1) { $prob = Util::round($gen['cnt'] * 0.7 / 3); }     // 투표율 70%, 투표 한번에 2~3개 등장
@@ -2275,6 +2317,69 @@ function uniqueItem($general, $log, $vote=0) {
    return $log;
 }

+function checkAbilityEx(int $generalID, ActionLogger $actLog){
+    $db = DB::db();
+    $general = $db->queryFirstRow('SELECT leader,leader2,power,power2,intel,intel2 FROM general WHERE no = %i',$generalID);
+
+    if(!$general){
+        return;
+    }
+
+    if($general['leader2'] < 0){
+        $db->update('general',[
+            'leader2'=>$db->sqleval('leader2 + %i', GameConst::$upgradeLimit),
+            'leader'=>$db->sqleval('leader - 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>통솔</>이 <C>1</> 떨어졌습니다!', ActionLogger::PLAIN);
+        return;
+    }
+
+    if($general['power2'] < 0){
+        $db->update('general',[
+            'power2'=>$db->sqleval('power2 + %i', GameConst::$upgradeLimit),
+            'power'=>$db->sqleval('power - 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>무력</>이 <C>1</> 떨어졌습니다!', ActionLogger::PLAIN);
+        return;
+    }
+
+    if($general['intel2'] < 0){
+        $db->update('general',[
+            'intel2'=>$db->sqleval('intel2 + %i', GameConst::$upgradeLimit),
+            'intel'=>$db->sqleval('intel - 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>지력</>이 <C>1</> 떨어졌습니다!', ActionLogger::PLAIN);
+        return;
+    }
+
+    if($general['leader2'] >= GameConst::$upgradeLimit){
+        $db->update('general',[
+            'leader2'=>$db->sqleval('leader2 - %i', GameConst::$upgradeLimit),
+            'leader'=>$db->sqleval('leader + 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>통솔</>이 <C>1</> 올랐습니다!', ActionLogger::PLAIN);
+        return;
+    }
+
+    if($general['power2'] >= GameConst::$upgradeLimit){
+        $db->update('general',[
+            'power2'=>$db->sqleval('power2 - %i', GameConst::$upgradeLimit),
+            'power'=>$db->sqleval('power + 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>무력</>이 <C>1</> 올랐습니다!', ActionLogger::PLAIN);
+        return;
+    }
+
+    if($general['intel2'] >= GameConst::$upgradeLimit){
+        $db->update('general',[
+            'intel2'=>$db->sqleval('intel2 - %i', GameConst::$upgradeLimit),
+            'intel'=>$db->sqleval('intel + 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>지력</>이 <C>1</> 올랐습니다!', ActionLogger::PLAIN);
+        return;
+    }
+}
+
 function checkAbility($general, $log) {
    $db = DB::db();
    $connect=$db->get();
@@ -2432,6 +2537,11 @@ function deleteNation($general) {
    $josaUn = JosaUtil::pick($nation['name'], '은');
    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<R><b>【멸망】</b></><D><b>{$nation['name']}</b></>{$josaUn} <R>멸망</>했습니다.";

+    $oldNation = $db->queryFirstRow('SELECT * FROM nation WHERE nation=%i', $general['nation']);
+    $oldNationGenerals = $db->queryFirstColumn('SELECT `no` FROM general WHERE nation=%i', $general['nation']);
+    $oldNation['generals'] = $oldNationGenerals;
+    $oldNation['aux'] = Json::decode($oldNation['aux']);
+
    // 전 장수 재야로    // 전 장수 소속 무소속으로
    $query = "update general set belong=0,troop=0,level=0,nation=0,makelimit=12 where nation='{$general['nation']}'";
    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2442,6 +2552,13 @@ function deleteNation($general) {
    $query = "delete from troop where nation='{$general['nation']}'";
    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    // 국가 삭제
+
+    $db->insert('ng_old_nations', [
+        'server_id'=>UniqueConst::$serverID,
+        'nation'=>$general['nation'],
+        'data'=>Json::encode($oldNation)
+    ]);
+
    $query = "delete from nation where nation='{$general['nation']}'";
    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    // 외교 삭제
@@ -2569,6 +2686,9 @@ function searchDistance(int $from, int $maxDist=99, bool $distForm = false) {
 }

 function isNeighbor(int $nation1, int $nation2, bool $includeNoSupply=true) {
+    if($nation1 === $nation2){
+        return false;
+    }
    $db = DB::db();

    $nation1Cities = [];
@@ -2607,6 +2727,60 @@ function CharExperience($exp, $personal) {
    return $exp;
 }

+function getCharExpMultiplier($personal):float{
+    static $table = [
+        0 => 1.1,
+        1 => 1.1,
+        4 => 0.9,
+        5 => 0.9,
+        6 => 1.1,
+        7 => 0.9,
+        10 => 0.9
+    ];
+    return $table[$personal] ?? 1;
+}
+
+function getNationTechMultiplier($nationType):float{
+    static $table = [
+        3 => 1.1,
+        5 => 0.9,
+        6 => 0.9,
+        7 => 0.9,
+        8 => 0.9,
+        12 => 0.9,
+        13 => 1.1,
+    ];
+    return $table[$nationType] ?? 1;
+}
+
+function getNationWallMultiplier($nationType):float{
+    static $table = [
+        3 => 1.1,
+        5 => 1.1,
+        10 => 1.1,
+        11 => 1.1,
+        4 => 0.9,
+        7 => 0.9,
+        8 => 0.9,
+        13 => 0.9,
+    ];
+    return $table[$nationType] ?? 1;
+}
+
+function getNationPeopleMultiplier($nationType):float{
+    static $table = [
+        1 => 0.9,
+        2 => 1.1,
+        3 => 0.9,
+        4 => 1.1,
+        7 => 1.1,
+        9 => 0.9,
+        10 => 1.1,
+    ];
+    return $table[$nationType] ?? 1;
+}
+
+
 function CharDedication($ded, $personal) {
    switch($personal) {
        case 10:
@@ -2617,6 +2791,13 @@ function CharDedication($ded, $personal) {
    return $ded;
 }

+function getCharDedMultiplier($personal):float{
+    static $table = [
+        10 => 0.9
+    ];
+    return $table[$personal] ?? 1;
+}
+
 function CharAtmos($atmos, $personal) {
    switch($personal) {
        case  2:    case  4:
@@ -2665,6 +2846,8 @@ function SabotageInjury($city, $type=0) {
    $connect=$db->get();
    $log = [];

+    $injuryCount = 0;
+
    $admin = $gameStor->getValues(['year', 'month']);

    $query = "select no,name,nation from general where city='$city'";
@@ -2686,8 +2869,11 @@ function SabotageInjury($city, $type=0) {
            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

            pushGenLog($general, $log);
+            $injuryCount += 1;
        }
    }
+
+    return $injuryCount;
 }

 function getRandTurn($term) {
@@ -471,7 +471,7 @@ function processCommand($no) {
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $connect=$db->get();

-    $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
+    $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar from general where no='$no'";
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $general = MYDB_fetch_array($result);
    
@@ -533,7 +533,7 @@ function processCommand($no) {
            }

            //장수정보 재로드
-            $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
+            $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar from general where no='$no'";
            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
            $general = MYDB_fetch_array($result);
        }
@@ -583,7 +583,7 @@ function processCommand($no) {
            case 17: process_17($general); break; //소집해제

            case 21: process_21($general); break; //이동
-            case 22: process_22($general); break; //등용 //TODO:등용장 재 디자인
+            case 22: process_22($general); break; //등용
            case 25: process_25($general); break; //임관
            case 26: process_26($general); break; //집합
            case 28: process_28($general); break; //귀환
@@ -628,7 +628,7 @@ function updateCommand($no, $type=0) {
 update general set
 turn0=turn1,turn1=turn2,turn2=turn3,turn3=turn4,turn4=turn5,turn5=turn6,turn6=turn7,turn7=turn8,turn8=turn9,
 turn9=turn10,turn10=turn11,turn11=turn12,turn12=turn13,turn13=turn14,turn14=turn15,turn15=turn16,turn16=turn17,
-turn17=turn18,turn18=turn19,turn19=turn20,turn20=turn21,turn21=turn22,turn22=turn23,turn23='00000000000000'
+turn17=turn18,turn18=turn19,turn19=turn20,turn20=turn21,turn21=turn22,turn22=turn23,turn23='".EncodeCommand(0, 0, 0, 0)."'
 where no='{$general['no']}'
 ";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -642,7 +642,7 @@ update nation set
 {$turn}4={$turn}5,{$turn}5={$turn}6,
 {$turn}6={$turn}7,{$turn}7={$turn}8,
 {$turn}8={$turn}9,{$turn}9={$turn}10,
-{$turn}10={$turn}11,{$turn}11='00000000000099'
+{$turn}10={$turn}11,{$turn}11='".EncodeCommand(0, 0, 0, 99)."'
 where nation='{$general['nation']}'
 ";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -672,7 +672,7 @@ turn9=turn8,turn8=turn7,
 turn7=turn6,turn6=turn5,
 turn5=turn4,turn4=turn3,
 turn3=turn2,turn2=turn1,
-turn1=turn0,turn0='00000000000000'
+turn1=turn0,turn0='".EncodeCommand(0, 0, 0, 0)."'
 where no='$no'
 ";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -685,7 +685,7 @@ update nation set
 {$turn}7={$turn}6,{$turn}6={$turn}5,
 {$turn}5={$turn}4,{$turn}4={$turn}3,
 {$turn}3={$turn}2,{$turn}2={$turn}1,
-{$turn}1={$turn}0,{$turn}0='00000000000099'
+{$turn}1={$turn}0,{$turn}0='".EncodeCommand(0, 0, 0, 99)."'
 where nation='{$general['nation']}'
 ";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -747,8 +747,9 @@ function command_Other($turn, $commandtype) {
 <!DOCTYPE html>
 <html lang="ko">
 <head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=1024" />
    <script>
 parent.moveProcessing(<?=$commandtype?>, <?=Json::encode($turn)?>);
 </script>
@@ -771,19 +772,10 @@ parent.moveProcessing(<?=$commandtype?>, <?=Json::encode($turn)?>);


 function EncodeCommand($fourth, $third, $double, $command) {
-    $str  = StringUtil::padStringAlignRight((string)$fourth, 4, "0");
-    $str .= StringUtil::padStringAlignRight((string)$third,  4, "0");
-    $str .= StringUtil::padStringAlignRight((string)$double, 4, "0");
-    $str .= StringUtil::padStringAlignRight((string)$command, 2, "0");
-    return $str;
+    return Json::encode([$command, $double, $third, $fourth]);
 }

 function DecodeCommand($str) {
-    $command = [];
-    $command[3] = (int)(substr($str, 0, 4));
-    $command[2] = (int)(substr($str, 4, 4));
-    $command[1] = (int)(substr($str, 8, 4));
-    $command[0] = (int)(substr($str, 12, 2));
-    return $command;
+    return Json::decode($str);
 }

@@ -8,42 +8,43 @@ namespace sammo;
 * Side effect 없이 값의 변환만을 수행하는 함수들의 모음.
 */

-
 function NationCharCall($call) {
-    switch($call) {
-        case '명가':    $type =13; break;
-        case '음양가':  $type =12; break;
-        case '종횡가':  $type =11; break;
-        case '불가':    $type =10; break;
-        case '도적':    $type = 9; break;
-        case '오두미도':$type = 8; break;
-        case '태평도':  $type = 7; break;
-        case '도가':    $type = 6; break;
-        case '묵가':    $type = 5; break;
-        case '덕가':    $type = 4; break;
-        case '병가':    $type = 3; break;
-        case '유가':    $type = 2; break;
-        case '법가':    $type = 1; break;
-        default:        $type = 0; break;
+    static $invTable = [];
+    if(!$invTable){
+        foreach(getNationTypeList() as $typeID => [$name, $pros, $cons]){
+            $invTable[$name] = $typeID;
+        }
    }
-    return $type;
+    return $invTable[$call]??0;
+}
+
+function getCharacterList(){
+    $infoText = [
+        9=>['안전', '사기 -5, 징·모병 비용 -20%'],
+        8=>['유지', '훈련 -5, 징·모병 비용 -20%'],
+        7=>['재간', '명성 -10%, 징·모병 비용 -20%'],
+        6=>['출세', '명성 +10%, 징·모병 비용 +20%'],
+        5=>['할거', '명성 -10%, 훈련 +5'],
+        4=>['정복', '명성 -10%, 사기 +5'],
+        3=>['패권', '훈련 +5, 징·모병 비용 +20%'],
+        2=>['의협', '사기 +5, 징·모병 비용 +20%'],
+        1=>['대의', '명성 +10%, 훈련 -5'],
+        0=>['왕좌', '명성 +10%, 사기 -5'],
+        10=>['은둔', '명성 -10%, 계급 -10%, 사기 -5, 훈련 -5, 단련 성공률 +10%'],
+    ];
+    return $infoText;
 }

 function CharCall($call) {
-    switch($call) {
-        case '은둔':    $type =10; break;
-        case '안전';    $type = 9; break;
-        case '유지';    $type = 8; break;
-        case '재간';    $type = 7; break;
-        case '출세';    $type = 6; break;
-        case '할거';    $type = 5; break;
-        case '정복';    $type = 4; break;
-        case '패권';    $type = 3; break;
-        case '의협';    $type = 2; break;
-        case '대의';    $type = 1; break;
-        case '왕좌';    $type = 0; break;
+    static $invTable = [];
+    if(\key_exists($call, $invTable)){
+        return $invTable[$call];
    }
-    return $type;
+
+    foreach(getCharacterList() as $id => [$name, $info]){
+        $invTable[$name] = $id;
+    }
+    return $invTable[$call];
 }

 function SpecCall($call) {
@@ -119,20 +120,14 @@ function getNationLevel($level) {
 }

 function getGenChar($type) {
-    switch($type) {
-        case 10: $call = '은둔'; break;
-        case  9: $call = '안전'; break;
-        case  8: $call = '유지'; break;
-        case  7: $call = '재간'; break;
-        case  6: $call = '출세'; break;
-        case  5: $call = '할거'; break;
-        case  4: $call = '정복'; break;
-        case  3: $call = '패권'; break;
-        case  2: $call = '의협'; break;
-        case  1: $call = '대의'; break;
-        case  0: $call = '왕좌'; break;
+    return getCharacterList()[$type][0];
+}
+
+function getCharInfo(?int $type):?string {
+    if($type === null){
+        return null;
    }
-    return $call;
+    return getCharacterList()[$type][1]??null;
 }

 function getGenSpecial($type) {
@@ -179,24 +174,69 @@ function getGenSpecial($type) {
    return $call;
 }

-function getNationType($type) {
-    switch($type) {
-        case 13: $call = '명 가'; break;
-        case 12: $call = '음 양 가'; break;
-        case 11: $call = '종 횡 가'; break;
-        case 10: $call = '불 가'; break;
-        case 9: $call = '도 적'; break;
-        case 8: $call = '오 두 미 도'; break;
-        case 7: $call = '태 평 도'; break;
-        case 6: $call = '도 가'; break;
-        case 5: $call = '묵 가'; break;
-        case 4: $call = '덕 가'; break;
-        case 3: $call = '병 가'; break;
-        case 2: $call = '유 가'; break;
-        case 1: $call = '법 가'; break;
-        case 0: $call = '-'; break;
+function getSpecialInfo(?int $type):?string{
+    if($type === null){
+        return null;
    }
-    return $call;
+
+    //앞칸은 '설명을 위해' '그냥' 적어둠
+    $infoText = [
+        0 => ['-', null],
+        1 => ['경작', '[내정] 농지 개간 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+        2 => ['상재', '[내정] 상업 투자 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+        3 => ['발명', '[내정] 기술 연구 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+
+        10 => ['축성', '[내정] 성벽 보수 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+        11 => ['수비', '[내정] 수비 강화 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+        12 => ['통찰', '[내정] 치안 강화 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+
+        20 => ['인덕', '[내정] 주민 선정·정착 장려 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+
+        30 => ['거상', '이것 저것'],
+        31 => ['귀모', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p'],
+
+        40 => ['귀병', '[군사] 귀병 계통 징·모병비 -10%<br>[전투] 계략 성공 확률 +20%p'],
+        41 => ['신산', '[계략] 화계·탈취·파괴·선동 : 성공률 +10%p<br>[전투] 계략 시도 확률 +20%p, 계략 성공 확률 +20%p '],
+        42 => ['환술', '[전투] 계략 성공 확률 +10%p, 계략 성공 시 대미지 +30%'],
+        43 => ['집중', '[전투] 계략 성공 시 대미지 +50%'],
+        44 => ['신중', '[전투] 계략 성공 확률 100%'],
+        45 => ['반계', '[전투] 상대의 계략을 30% 확률로 되돌림, 반목 성공시 대미지 추가(+60% → +100%)'],
+
+        50 => ['보병', '[군사] 보병 계통 징·모병비 -10%<br>[전투] 공격 시 아군 피해 -10%, 수비 시 아군 피해 -20%'],
+        51 => ['궁병', '[군사] 궁병 계통 징·모병비 -10%<br>[전투] 회피 확률 +20%p'],
+        52 => ['기병', '[군사] 기병 계통 징·모병비 -10%<br>[전투] 수비 시 대미지 +10%, 공격 시 대미지 +20%'],
+        53 => ['공성', '[군사] 차병 계통 징·모병비 -10%<br>[전투] 성벽 공격 시 대미지 +100%'],
+
+        60 => ['돌격', '[전투] 상대 회피 불가, 공격 시 전투 페이즈 +1, 공격 시 대미지 +10%'],
+        61 => ['무쌍', '[전투] 대미지 +10%, 공격 시 필살 확률 +10%p'],
+        62 => ['견고', '[전투] 상대 필살 불가, 상대 계략 시도시 성공 확률 -10%p'],
+        63 => ['위압', '[전투] 훈련/사기≥90, 병력≥1,000 일 때 첫 페이즈 위압 발동(적 공격 불가)'],
+
+        70 => ['저격', '[전투] 전투 개시 시 1/3 확률로 저격 발동'],
+        71 => ['필살', '[전투] 필살 확률 +20%p'],
+        72 => ['징병', '[군사] 징·모병비 -50%, 통솔 순수 능력치 보정 +15%'],
+        73 => ['의술', '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 20% 확률로 치료 발동(아군 피해 1/3 감소)'],
+        74 => ['격노', '[전투] 상대방 필살 및 회피 시도시 일정 확률로 격노(필살) 발동, 공격 시 일정 확률로 진노(1페이즈 추가)'],
+        75 => ['척사', '[전투] 지역·도시 병종 상대로 대미지 +10%, 아군 피해 -10%']
+    ];
+
+    return $infoText[$type][1]??null;
+}
+
+function getNationType(?int $type) {
+    if($type === null){
+        return '-';
+    }
+    static $cache = [];
+    if(\key_exists($type, $cache)){
+        return $cache[$type];
+    }
+
+    $text = getNationTypeList()[$type][0]??'-';
+    $text = join(' ', StringUtil::splitString($text));
+    $cache[$type] = $text;
+
+    return $text;
 }


@@ -215,24 +255,12 @@ function getConnect($con) {
    return $conname;
 }

-function getNationType2($type) {
-    switch($type) {
-        case 13: $call = '<font color=cyan>기술↑ 인구↑</font> <font color=magenta>쌀수입↓ 수성↓</font>'; break;
-        case 12: $call = '<font color=cyan>내정↑ 인구↑</font> <font color=magenta>기술↓ 전략↓</font>'; break;
-        case 11: $call = '<font color=cyan>전략↑ 수성↑</font> <font color=magenta>금수입↓ 내정↓</font>'; break;
-        case 10: $call = '<font color=cyan>민심↑ 수성↑</font> <font color=magenta>금수입↓</font>'; break;
-        case 9: $call = '<font color=cyan>계략↑</font> <font color=magenta>금수입↓ 치안↓ 민심↓</font>'; break;
-        case 8: $call = '<font color=cyan>쌀수입↑ 인구↑</font> <font color=magenta>기술↓ 수성↓ 내정↓</font>'; break;
-        case 7: $call = '<font color=cyan>인구↑ 민심↑</font> <font color=magenta>기술↓ 수성↓</font>'; break;
-        case 6: $call = '<font color=cyan>인구↑</font> <font color=magenta>기술↓ 치안↓</font>'; break;
-        case 5: $call = '<font color=cyan>수성↑</font> <font color=magenta>기술↓</font>'; break;
-        case 4: $call = '<font color=cyan>치안↑인구↑ 민심↑</font> <font color=magenta>쌀수입↓ 수성↓</font>'; break;
-        case 3: $call = '<font color=cyan>기술↑ 수성↑</font> <font color=magenta>인구↓ 민심↓</font>'; break;
-        case 2: $call = '<font color=cyan>내정↑ 민심↑</font> <font color=magenta>쌀수입↓</font>'; break;
-        case 1: $call = '<font color=cyan>금수입↑ 치안↑</font> <font color=magenta>인구↓ 민심↓</font>'; break;
-        case 0: $call = '-'; break;
+function getNationType2(?int $type) {
+    if($type === null){
+        return '-';
    }
-    return $call;
+    [$name, $pros, $cons] = getNationTypeList()[$type]??['-', '', ''];
+    return "<font color=cyan>{$pros}</font> <font color=magenta>{$cons}</font>";
 }

 function getLevel($level, $nlevel=8) {
@@ -284,60 +312,43 @@ function getLevel($level, $nlevel=8) {

 function getCall($leader, $power, $intel) {
    $call = '평범';
-    if($leader >= GameConst::$chiefStatMin && $power >= GameConst::$chiefStatMin && $intel >= GameConst::$chiefStatMin) {
-        $call = '만능';
-    } elseif($leader >= GameConst::$chiefStatMin && $power >= GameConst::$chiefStatMin) {
-        $call = '용장';
-    } elseif($leader >= GameConst::$chiefStatMin && $intel >= GameConst::$chiefStatMin) {
-        $call = '지장';
-    } elseif($power >= GameConst::$chiefStatMin && $intel >= GameConst::$chiefStatMin) {
-        $call = '명장';
-    } elseif($leader >= GameConst::$chiefStatMin) {
-        $call = '명사';
-    } elseif($power >= GameConst::$chiefStatMin) {
-        $call = '용맹';
-    } elseif($intel >= GameConst::$chiefStatMin) {
-        $call = '현명';
+
+    if($leader < 40){
+        if($power + $intel < $leader){
+            return '아둔';
+        }
+        if($intel >= GameConst::$chiefStatMin && $power < $intel * 0.8){
+            return '학자';
+        }
+        if($power >= GameConst::$chiefStatMin && $intel < $power * 0.8){
+            return '장사';
+        }
+        return '명사';
    }
-    return $call;
+
+    $maxStat = max($leader, $power, $intel);
+    $sum2Stat = min($leader+$power, $power+$intel, $intel+$leader);
+    if($maxStat >= GameConst::$chiefStatMin + GameConst::$statGradeLevel && $sum2Stat >= $maxStat * 1.7){
+        return '만능';
+    }
+    if($power >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $intel < $power * 0.8){
+        return '용장';
+    }
+    if($intel >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $power < $intel * 0.8){
+        return '명장';
+    }
+    return '평범';
 }

 function getDed($dedication) {
-    if($dedication < 1 ) $level2 = '무품관';
-    elseif($dedication < 10*10) $level2 = '30품관';
-    elseif($dedication < 20*20) $level2 = '29품관';
-    elseif($dedication < 30*30) $level2 = '28품관';
-    elseif($dedication < 40*40) $level2 = '27품관';
-    elseif($dedication < 50*50) $level2 = '26품관';
-    elseif($dedication < 60*60) $level2 = '25품관';
-    elseif($dedication < 70*70) $level2 = '24품관';
-    elseif($dedication < 80*80) $level2 = '23품관';
-    elseif($dedication < 90*90) $level2 = '22품관';
-    elseif($dedication < 100*100) $level2 = '21품관';
-    elseif($dedication < 110*110) $level2 = '20품관';
-    elseif($dedication < 120*120) $level2 = '19품관';
-    elseif($dedication < 130*130) $level2 = '18품관';
-    elseif($dedication < 140*140) $level2 = '17품관';
-    elseif($dedication < 150*150) $level2 = '16품관';
-    elseif($dedication < 160*160) $level2 = '15품관';
-    elseif($dedication < 170*170) $level2 = '14품관';
-    elseif($dedication < 180*180) $level2 = '13품관';
-    elseif($dedication < 190*190) $level2 = '12품관';
-    elseif($dedication < 200*200) $level2 = '11품관'; // 40000
-    elseif($dedication < 210*210) $level2 = '10품관'; // 44100
-    elseif($dedication < 220*220) $level2 =  '9품관'; // 48400
-    elseif($dedication < 230*230) $level2 =  '8품관'; // 52900
-    elseif($dedication < 240*240) $level2 =  '7품관'; // 57600
-    elseif($dedication < 250*250) $level2 =  '6품관'; // 62500
-    elseif($dedication < 260*260) $level2 =  '5품관'; // 67600
-    elseif($dedication < 270*270) $level2 =  '4품관'; // 72900
-    elseif($dedication < 280*280) $level2 =  '3품관'; // 78400
-    elseif($dedication < 290*290) $level2 =  '2품관'; // 84100
-    else {
-        $level2 = '1품관';
+    $dedLevel = getDedLevel($dedication);
+    if($dedLevel == 0){
+        return '무품관';
    }

-    return $level2;
+    //{$maxDedLevel}품관 ~ 1품관
+    $dedInvLevel = GameConst::$maxDedLevel - $dedLevel + 1;
+    return "{$dedInvLevel}품관";
 }


@@ -364,16 +375,18 @@ function getExpLevel($experience) {
    if($experience < 1000) {
        $level = intdiv($experience, 100);
    } else {
-        for($level = 0; $experience > (($level+1)*($level+1)*10); $level++) {
-        }
+        $level = Util::toInt(sqrt($experience/10));
    }

    return $level;
 }

 function getDedLevel($dedication) {
-    for($level = 0; $dedication > (($level+1)*($level+1)*100); $level++) {
-    }
+    $level = Util::valueFit(
+        ceil(sqrt($dedication) / 10), 
+        0, 
+        GameConst::$maxDedLevel
+    );

    return $level;
 }
@@ -390,9 +403,7 @@ function getLevelPer($exp, $level) {
 }

 function getBill(int $dedication) : int{
-    for($level = 0; $dedication > (($level+1)*($level+1)*100); $level++) {
-    }
-
+    $level = getDedLevel($dedication);
    return ($level * 200 + 400);
 }

@@ -400,142 +411,109 @@ function getCost(int $armtype) : int {
    return GameUnitConst::byID($armtype)->cost;
 }

-function TechLimit($startyear, $year, $tech) : int {
-    $limit = 0;
-    if($year < $startyear+ 5 && $tech >=  1000) { $limit = 1; }
-    if($year < $startyear+10 && $tech >=  2000) { $limit = 1; }
-    if($year < $startyear+15 && $tech >=  3000) { $limit = 1; }
-    if($year < $startyear+20 && $tech >=  4000) { $limit = 1; }
-    if($year < $startyear+25 && $tech >=  5000) { $limit = 1; }
-    if($year < $startyear+30 && $tech >=  6000) { $limit = 1; }
-    if($year < $startyear+35 && $tech >=  7000) { $limit = 1; }
-    if($year < $startyear+40 && $tech >=  8000) { $limit = 1; }
-    if($year < $startyear+45 && $tech >=  9000) { $limit = 1; }
-    if($year < $startyear+50 && $tech >= 10000) { $limit = 1; }
-    if($year < $startyear+55 && $tech >= 11000) { $limit = 1; }
-    if($year < $startyear+60 && $tech >= 12000) { $limit = 1; }
-    return $limit;
+function getTechLevel($tech):int{
+    return Util::valueFit(
+        floor($tech / 1000),
+        0, 
+        GameConst::$maxTechLevel
+    );
+}
+
+function TechLimit($startYear, $year, $tech) : bool {
+
+    $relYear = $year - $startYear;
+
+    $relMaxTech = Util::valueFit(
+        floor($relYear / 5) + 1,
+        1, 
+        GameConst::$maxTechLevel
+    );
+
+    $techLevel = getTechLevel($tech);
+
+    return $techLevel >= $relMaxTech;
 }

 function getTechAbil($tech) : int{
-    if($tech < 1000)      { $abil =   0; }
-    elseif($tech < 2000)  { $abil =  25; }
-    elseif($tech < 3000)  { $abil =  50; }
-    elseif($tech < 4000)  { $abil =  75; }
-    elseif($tech < 5000)  { $abil = 100; }
-    elseif($tech < 6000)  { $abil = 125; }
-    elseif($tech < 7000)  { $abil = 150; }
-    elseif($tech < 8000)  { $abil = 175; }
-    elseif($tech < 9000)  { $abil = 200; }
-    elseif($tech < 10000) { $abil = 225; }
-    elseif($tech < 11000) { $abil = 250; }
-    elseif($tech < 12000) { $abil = 275; }
-    else                  { $abil = 300; }
-    return $abil;
+    return getTechLevel($tech) * 25;
 }

 function getTechCost($tech) : float{
-    if($tech < 1000)      { $cost = 1.00; }
-    elseif($tech < 2000)  { $cost = 1.15; }
-    elseif($tech < 3000)  { $cost = 1.30; }
-    elseif($tech < 4000)  { $cost = 1.45; }
-    elseif($tech < 5000)  { $cost = 1.60; }
-    elseif($tech < 6000)  { $cost = 1.75; }
-    elseif($tech < 7000)  { $cost = 1.90; }
-    elseif($tech < 8000)  { $cost = 2.05; }
-    elseif($tech < 9000)  { $cost = 2.20; }
-    elseif($tech < 10000) { $cost = 2.35; }
-    elseif($tech < 11000) { $cost = 2.50; }
-    elseif($tech < 12000) { $cost = 2.65; }
-    else                  { $cost = 2.80; }
-    return $cost;
+    return 1 + getTechLevel($tech) * 0.15;
 }

 function getTechCall($tech) : string {
-    if($tech < 1000)      { $str = '0등급'; }
-    elseif($tech < 2000)  { $str = '1등급'; }
-    elseif($tech < 3000)  { $str = '2등급'; }
-    elseif($tech < 4000)  { $str = '3등급'; }
-    elseif($tech < 5000)  { $str = '4등급'; }
-    elseif($tech < 6000)  { $str = '5등급'; }
-    elseif($tech < 7000)  { $str = '6등급'; }
-    elseif($tech < 8000)  { $str = '7등급'; }
-    elseif($tech < 9000)  { $str = '8등급'; }
-    elseif($tech < 10000) { $str = '9등급'; }
-    elseif($tech < 11000) { $str = '10등급'; }
-    elseif($tech < 12000) { $str = '11등급'; }
-    else                  { $str = '12등급'; }
-    return $str;
+    $techLevel = getTechLevel($tech);
+    return "{$techLevel}등급";
 }

-function getDexCall($dex) : string {
-    if($dex < 2500)        { $str = '<font color="navy">F-</font>'; }
-    elseif($dex <    7500) { $str = '<font color="navy">F</font>'; }
-    elseif($dex <   15000) { $str = '<font color="navy">F+</font>'; }
-    elseif($dex <   25000) { $str = '<font color="skyblue">E-</font>'; }
-    elseif($dex <   37500) { $str = '<font color="skyblue">E</font>'; }
-    elseif($dex <   52500) { $str = '<font color="skyblue">E+</font>'; }
-    elseif($dex <   70000) { $str = '<font color="seagreen">D-</font>'; }
-    elseif($dex <   90000) { $str = '<font color="seagreen">D</font>'; }
-    elseif($dex <  112500) { $str = '<font color="seagreen">D+</font>'; }
-    elseif($dex <  137500) { $str = '<font color="teal">C-</font>'; }
-    elseif($dex <  165000) { $str = '<font color="teal">C</font>'; }
-    elseif($dex <  195000) { $str = '<font color="teal">C+</font>'; }
-    elseif($dex <  227500) { $str = '<font color="limegreen">B-</font>'; }
-    elseif($dex <  262500) { $str = '<font color="limegreen">B</font>'; }
-    elseif($dex <  300000) { $str = '<font color="limegreen">B+</font>'; }
-    elseif($dex <  340000) { $str = '<font color="gold">A-</font>'; }
-    elseif($dex <  382500) { $str = '<font color="gold">A</font>'; }
-    elseif($dex <  427500) { $str = '<font color="gold">A+</font>'; }
-    elseif($dex <  475000) { $str = '<font color="darkorange">S-</font>'; }
-    elseif($dex <  525000) { $str = '<font color="darkorange">S</font>'; }
-    elseif($dex <  577500) { $str = '<font color="darkorange">S+</font>'; }
-    elseif($dex <  632500) { $str = '<font color="tomato">SS-</font>'; }
-    elseif($dex <  690000) { $str = '<font color="tomato">SS</font>'; }
-    elseif($dex <  750000) { $str = '<font color="tomato">SS+</font>'; }
-    elseif($dex <  812500) { $str = '<font color="red">SSS-</font>'; }
-    elseif($dex <  877500) { $str = '<font color="red">SSS</font>'; }
-    elseif($dex <  945000) { $str = '<font color="red">SSS+</font>'; }
-    elseif($dex < 1015000) { $str = '<font color="darkviolet">Z-</font>'; }
-    elseif($dex < 1087500) { $str = '<font color="darkviolet">Z</font>'; }
-    elseif($dex < 1162500) { $str = '<font color="darkviolet">Z+</font>'; }
-    else                   { $str = '<font color="white">?</font>'; }
-    return $str;
+function getDexLevelList(): array{
+    return [
+        [0, 'navy', 'F-'],
+        [2500, 'navy', 'F'],
+        [7500, 'navy', 'F+'],
+        [15000, 'skyblue', 'E-'],
+        [25000, 'skyblue', 'E'],
+        [37500, 'skyblue', 'E+'],
+        [52500, 'seagreen', 'D-'],
+        [70000, 'seagreen', 'D'],
+        [90000, 'seagreen', 'D+'],
+        [112500, 'teal', 'C-'],
+        [137500, 'teal', 'C'],
+        [165000, 'teal', 'C+'],
+        [195000, 'limegreen', 'B-'],
+        [227500, 'limegreen', 'B'],
+        [262500, 'limegreen', 'B+'],
+        [300000, 'gold', 'A-'],
+        [340000, 'gold', 'A'],
+        [382500, 'gold', 'A+'],
+        [427500, 'darkorange', 'S-'],
+        [475000, 'darkorange', 'S'],
+        [525000, 'darkorange', 'S+'],
+        [577500, 'tomato', 'SS-'],
+        [632500, 'tomato', 'SS'],
+        [690000, 'tomato', 'SS+'],
+        [750000, 'red', 'SSS-'],
+        [812500, 'red', 'SSS'],
+        [877500, 'red', 'SSS+'],
+        [945000, 'darkviolet', 'Z-'],
+        [1015000, 'darkviolet', 'Z'],
+        [1087500, 'darkviolet', 'Z+'],
+        [1162500, 'white', '?']
+    ];
 }

-function getDexLevel($dex) : int {
-    if($dex < 2500)        { $lvl =  0; }
-    elseif($dex <    7500) { $lvl =  1; }
-    elseif($dex <   15000) { $lvl =  2; }
-    elseif($dex <   25000) { $lvl =  3; }
-    elseif($dex <   37500) { $lvl =  4; }
-    elseif($dex <   52500) { $lvl =  5; }
-    elseif($dex <   70000) { $lvl =  6; }
-    elseif($dex <   90000) { $lvl =  7; }
-    elseif($dex <  112500) { $lvl =  8; }
-    elseif($dex <  137500) { $lvl =  9; }
-    elseif($dex <  165000) { $lvl = 10; }
-    elseif($dex <  195000) { $lvl = 11; }
-    elseif($dex <  227500) { $lvl = 12; }
-    elseif($dex <  262500) { $lvl = 13; }
-    elseif($dex <  300000) { $lvl = 14; }
-    elseif($dex <  340000) { $lvl = 15; }
-    elseif($dex <  382500) { $lvl = 16; }
-    elseif($dex <  427500) { $lvl = 17; }
-    elseif($dex <  475000) { $lvl = 18; }
-    elseif($dex <  525000) { $lvl = 19; }
-    elseif($dex <  577500) { $lvl = 20; }
-    elseif($dex <  632500) { $lvl = 21; }
-    elseif($dex <  690000) { $lvl = 22; }
-    elseif($dex <  750000) { $lvl = 23; }
-    elseif($dex <  812500) { $lvl = 24; }
-    elseif($dex <  877500) { $lvl = 25; }
-    elseif($dex <  945000) { $lvl = 26; }
-    elseif($dex < 1015000) { $lvl = 27; }
-    elseif($dex < 1087500) { $lvl = 28; }
-    elseif($dex < 1162500) { $lvl = 29; }
-    else                   { $lvl = 30; }
-    return $lvl;
+function getDexCall(int $dex) : string {
+    if($dex < 0){
+        throw new \InvalidArgumentException();
+    }
+
+    $color = null;
+    $name = null;
+    foreach(getDexLevelList() as $dexLevel => [$dexKey, $nextColor, $nextName]){
+        if($dex < $dexKey){
+            break;
+        }
+        $color = $nextColor;
+        $name = $nextName;
+    }
+
+    return "<font color='{$color}'>{$name}</font>";
+}
+
+function getDexLevel(int $dex) : int {
+    if($dex < 0){
+        throw new \InvalidArgumentException();
+    }
+
+    $retVal = null;
+    foreach(getDexLevelList() as $dexLevel => [$dexKey, $nextColor, $nextName]){
+        if($dex < $dexKey){
+            break;
+        }
+        $retVal = $dexLevel;
+    }
+    return $dexLevel;
 }

 function getDexLog($dex1, $dex2) {
@@ -544,7 +522,7 @@ function getDexLog($dex1, $dex2) {
 }


-function getWeapName($weap) : string {
+function getWeapName($weap) : ?string {
    switch($weap) {
        case  0: $weapname = '-'; break;
        case  1: $weapname = '단도(+1)'; break;
@@ -578,7 +556,7 @@ function getWeapName($weap) : string {
    return $weapname;
 }

-function getWeapEff($weap) : int{
+function getWeapEff($weap) : ?int{
    switch($weap) {
        case  7: $weap =  7; break;
        case  8: $weap =  7; break;
@@ -605,7 +583,7 @@ function getWeapEff($weap) : int{
    return $weap;
 }

-function getBookName($book) : string {
+function getBookName($book) : ?string {
    switch($book) {
        case  0: $bookname = '-'; break;
        case  1: $bookname = '효경전(+1)'; break;
@@ -639,7 +617,7 @@ function getBookName($book) : string {
    return $bookname;
 }

-function getBookEff($book) : int {
+function getBookEff($book) : ?int {
    switch($book) {
        case  7: $book =  7; break;
        case  8: $book =  7; break;
@@ -666,7 +644,7 @@ function getBookEff($book) : int {
    return $book;
 }

-function getHorseName($horse) : string {
+function getHorseName($horse) : ?string {
    switch($horse) {
        case  0: $horsename = '-'; break;
        case  1: $horsename = '노기(+1)'; break;
@@ -700,7 +678,7 @@ function getHorseName($horse) : string {
    return $horsename;
 }

-function getHorseEff($horse) : int {
+function getHorseEff($horse) : ?int {
    switch($horse) {
        case  7: $horse =  7; break;
        case  8: $horse =  7; break;
@@ -727,7 +705,7 @@ function getHorseEff($horse) : int {
    return $horse;
 }

-function getItemName($item) : string {
+function getItemName($item) : ?string {
    switch($item) {
        case  0: $itemname = '-'; break;
        case  1: $itemname = '환약(치료)'; break;
@@ -757,10 +735,45 @@ function getItemName($item) : string {
        case 24: $itemname = '태평청령(의술)'; break;
        case 25: $itemname = '태평요술(회피)'; break;
        case 26: $itemname = '둔갑천서(회피)'; break;
+        default: $itemname = null;
    }
    return $itemname;
 }

+function getItemInfo(?int $item):?string{
+    $itemInfo = [
+        1=>['환약(치료)', '[군사] 턴 실행 전 부상 회복. 1회용'],
+        2=>['수극(저격)', '[전투] 전투 개시 전 20% 확률로 저격 시도. 1회용'],
+        3=>['탁주(사기)', '[전투] 사기 보정 +3. 1회용'],
+        4=>['청주(훈련)', '[전투] 훈련 보정 +3. 1회용'],
+        5=>['이추(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +10%p. 1회용'],
+        6=>['향낭(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p. 1회용'],
+        
+        7=>['오석산(치료)', '[군사] 턴 실행 전 부상 회복.'],
+        8=>['무후행군(치료)', '[군사] 턴 실행 전 부상 회복.'],
+        9=>['도소연명(치료)', '[군사] 턴 실행 전 부상 회복.'],
+        10=>['칠엽청점(치료)', '[군사] 턴 실행 전 부상 회복.'],
+        11=>['정력견혈(치료)', '[군사] 턴 실행 전 부상 회복.'],
+        12=>['과실주(훈련)', '[전투] 훈련 보정 +5'],
+        13=>['이강주(훈련)', '[전투] 훈련 보정 +5'],
+        14=>['의적주(사기)', '[전투] 사기 보정 +5'],
+        15=>['두강주(사기)', '[전투] 사기 보정 +5'],
+        16=>['보령압주(사기)', '[전투] 사기 보정 +5'],
+        17=>['철벽서(훈련)', '[전투] 훈련 보정 +7'],
+        18=>['단결도(훈련)', '[전투] 훈련 보정 +7'],
+        19=>['춘화첩(사기)', '[전투] 사기 보정 +7'],
+        20=>['초선화(사기)', '[전투] 사기 보정 +7'],
+        21=>['육도(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p'],
+        22=>['삼략(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p'],
+        23=>['청낭서(의술)', '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 20% 확률로 치료 발동(아군 피해 1/3 감소)'],
+        24=>['태평청령(의술)', '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 20% 확률로 치료 발동(아군 피해 1/3 감소)'],
+        25=>['태평요술(회피)', '[전투] 회피 확률 +20%p'],
+        26=>['둔갑천서(회피)', '[전투] 회피 확률 +20%p'],
+    ];
+
+    return $itemInfo[$item][1]??null;
+}
+
 function getItemCost2($weap) : int {
    switch($weap) {
        case  0: $weapcost = 0; break;
@@ -791,7 +804,10 @@ function getItemCost($weap) : int {



-function ConvertLog(string $str, $type=1) : string {
+function ConvertLog(?string $str, $type=1) : string {
+    if(!$str){
+        return '';
+    }
    //TODO: 이 함수는 없애야 한다. CSS로 대신하자
    if($type > 0) {
        $str = str_replace("<1>", "<font size=1>", $str);
@@ -5,6 +5,51 @@ namespace sammo;
 * 게임 룰에 해당하는 함수 모음
 */

+function getNationLevelList():array{
+    $table = [
+        0 => ['방랑군', 2, 0],
+        1 => ['호족', 2, 1],
+        2 => ['군벌', 4, 2],
+        3 => ['주자사', 4, 5],
+        4 => ['주목', 6, 8],
+        5 => ['공', 6, 11],
+        6 => ['왕', 8, 16],
+        7 => ['황제', 8, 21],
+    ];
+    return $table;
+}
+
+function getNationTypeList():array{
+    $table = [
+        13=>['명가', '기술↑ 인구↑', '쌀수입↓ 수성↓'],
+        12=>['음양가', '내정↑ 인구↑', '기술↓ 전략↓'],
+        11=>['종횡가', '전략↑ 수성↑', '금수입↓ 내정↓'],
+        10=>['불가', '민심↑ 수성↑', '금수입↓'],
+        9=>['도적', '계략↑', '금수입↓ 치안↓ 민심↓'],
+        8=>['오두미도', '쌀수입↑ 인구↑', '기술↓ 수성↓ 내정↓'],
+        7=>['태평도', '인구↑ 민심↑', '기술↓ 수성↓'],
+        6=>['도가', '인구↑', '기술↓ 치안↓'],
+        5=>['묵가', '수성↑', '기술↓'],
+        4=>['덕가', '치안↑인구↑ 민심↑', '쌀수입↓ 수성↓'],
+        3=>['병가', '기술↑ 수성↑', '인구↓ 민심↓'],
+        2=>['유가', '내정↑ 민심↑', '쌀수입↓'],
+        1=>['법가', '금수입↑ 치안↑', '인구↓ 민심↓'],
+    ];
+    return $table;
+}
+
+function getCityLevelList():array{
+    return [
+        1 => '수',
+        2 => '진',
+        3 => '관',
+        4 => '이',
+        5 => '소',
+        6 => '중',
+        7 => '대',
+        8 => '특'
+    ];
+}

 /**
 * 게임 내부에 사용하는 유틸리티 함수들을 분리
@@ -115,22 +160,37 @@ function getSpecial2($leader, $power, $intel, $nodex=1, $dex0=0, $dex10=0, $dex2
 }

 function getGenDex($general, $type) {
-    $type = intdiv($type, 10) * 10;
-    return $general["dex{$type}"];
+    //XXX: 지금은 동작하지만.. 병종 구성이 보궁기귀차 에서 바뀌면...
+    $ntype = GameUnitConst::byId($type)->armType * 10;
+    return $general["dex{$ntype}"]??0;
 }

 function addGenDex($no, $atmos, $train, $type, $exp) {
+    //XXX: 지금은 동작하지만.. 병종 구성이 보궁기귀차 에서 바뀌면...
    $db = DB::db();
-    $connect=$db->get();

-    $type = intdiv($type, 10) * 10;
-    $dexType = "dex{$type}";
-    if($type == 30) { $exp = Util::round($exp * 0.90); }     //귀병은 90%효율
-    elseif($type == 40) { $exp = Util::round($exp * 0.90); } //차병은 90%효율
-    $exp = Util::round($exp * ($atmos+$train) / 200); // 사기 + 훈련 / 200
+    $armType = GameUnitConst::byId($type)->armType;
+    if($armType == GameUnitConst::T_CASTLE){
+        $armType = GameUnitConst::T_SIEGE;
+    }

-    $query = "update general set {$dexType}={$dexType}+{$exp} where no='$no'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    if($armType < 0){
+        return;
+    }
+    
+    $ntype = $armType*10;
+    $dexType = "dex{$ntype}";
+    if($armType == GameUnitConst::T_WIZARD) {
+        $exp = Util::round($exp * 0.90); 
+    }
+    else if($armType == GameUnitConst::T_SIEGE) {
+        $exp = Util::round($exp * 0.90);
+    }
+    $exp = Util::round($exp * ($atmos + $train) / 200); // 사기 + 훈련 / 200
+
+    $db->update('general', [
+        $dexType=>$db->sqleval('%b + %i', $dexType, $exp)
+    ], 'no=%i', $no);
 }


@@ -144,7 +204,7 @@ function SetNationFront($nationNo) {
    $db = DB::db();
    $enemyCities = $db->queryFirstColumn(
        'SELECT city from city where nation IN 
-            (SELECT you from diplomacy where me = %i and (state=0 or (state=1 and term<=3)))'
+            (SELECT you from diplomacy where me = %i and (state=0 or (state=1 and term<=5)))'
        , $nationNo
    );
    if($enemyCities) {
@@ -314,27 +374,6 @@ function preUpdateMonthly() {
    $query = "update city set nation='0',gen1='0',gen2='0',gen3='0',conflict='{}',term=0,front=0 where rate<='30' and supply='0'";
    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

-    // 우선 병사수/100 만큼 소비
-    $query = "update general set rice=rice-round(crew/100) where crew>=100";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-    // 쌀이 마이너스인 장수들 소집해제
-    $query = "select no,name,rice,crew,city from general where rice<0";
-    $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);
-
-        // 주민으로 돌아감
-        $query = "update city set pop=pop+'{$general['crew']}' where city='{$general['city']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        $query = "update general set crew=0,rice=0 where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        pushGenLog($general, ["<C>●</>군량이 모자라 병사들이 <R>소집해제</>되었습니다!"]);
-    }
-
    //접률감소
    $query = "update general set connect=floor(connect*0.99)";
    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -395,23 +434,33 @@ function preUpdateMonthly() {
    }

    //첩보-1
-    $query = "select nation,spy from nation where spy!=''";
-    $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);
-        $spy = "";  $k = 0; 
-        $cities = [];
-        if($nation['spy'] != "") { $cities = explode("|", (string)$nation['spy']); }
-        while(count($cities)) {
-            $cities[$k]--;
-            if($cities[$k]%10 != 0) { $spy .= (string)$cities[$k]; }
-            $k++;
-            if($k >= count($cities)) { break; }
-            if($cities[$k-1]%10 != 0) { $spy .= "|"; }
+    foreach($db->queryAllLists("SELECT nation, spy FROM nation WHERE spy!='' AND spy!='{}'") as [$nationNo, $rawSpy]){
+        if (strpos($rawSpy, '|') !== false || is_numeric($rawSpy)) {
+           //TODO: 0.8 버전 이후에는 삭제할 것. 이후 버전은 json으로 변경됨.
+           $spyInfo = [];
+           foreach(explode('|', $rawSpy) as $value){
+               $value = intval($value);
+               $cityNo = intdiv($value, 10);
+               $remainMonth = $value % 10;
+               $spyInfo[$cityNo] = $remainMonth;
+           }
        }
-        $query = "update nation set spy='$spy' where nation='{$nation['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        else{
+            $spyInfo = Json::decode($rawSpy);
+        }
+
+        foreach($spyInfo as $cityNo => $remainMonth){
+            if($remainMonth <= 1){
+                unset($spyInfo[$cityNo]);
+            }
+            else{
+                $spyInfo[$cityNo] -= 1;
+            }
+        }
+
+        $db->update('nation', [
+            'spy'=>Json::encode($spyInfo, Json::EMPTY_ARRAY_IS_DICT)
+        ], 'nation=%i', $nationNo);
    }
    
    return true;
@@ -427,6 +476,15 @@ function postUpdateMonthly() {

    $history = [];

+    //도시 수 측정
+    $cityNations = [];
+    foreach($db->queryAllLists('SELECT city, name, nation FROM city') as [$cityID, $cityName, $cityNation]){
+        if(!key_exists($cityNation, $cityNations)){
+            $cityNations[$cityNation] = [];
+        }
+        $cityNations[$cityNation][] = $cityName;
+    }
+
    //각 국가 전월 장수수 대비 당월 장수수로 단합도 산정
    //각 국가 장수수를 구하고 국력 산정
 //    $query = "select nation,gennum from nation where level>0";
@@ -438,34 +496,33 @@ function postUpdateMonthly() {
 // 접속률
 // 숙련도
 // 명성,공헌
-    $query = "
-select
-A.nation,
-A.gennum, A.gennum2, A.chemi,
-round((
-    round(((A.gold+A.rice)+(select sum(gold+rice) from general where nation=A.nation))/100)
-    +A.tech
-    +if(A.level=0,0,(
-        select round(
-            sum(pop)*sum(pop+agri+comm+secu+wall+def)/sum(pop2+agri2+comm2+secu2+wall2+def2)/100
-        ) from city where nation=A.nation and supply=1
-    ))
-    +(select sum(leader+power+intel) from general where nation=A.nation)
-    +(select round(sum(dex0+dex10+dex20+dex30+dex40)/1000) from general where nation=A.nation)
-    +(select round(sum(experience+dedication)/100) from general where nation=A.nation)
-    +(select round(avg(connect)) from general where nation=A.nation)
-)/10)
-as power
-from nation A
-group by A.nation
-";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nationCount = MYDB_num_rows($result);
-    $genNum = [];
-    for($i=0; $i < $nationCount; $i++) {
-        $nation = MYDB_fetch_array($result);
+    $nations = $db->query('SELECT
+    A.nation,
+    A.gennum, A.gennum2, A.chemi, A.aux,
+    round((
+        round(((A.gold+A.rice)+(select sum(gold+rice) from general where nation=A.nation))/100)
+        +A.tech
+        +if(A.level=0,0,(
+            select round(
+                sum(pop)*sum(pop+agri+comm+secu+wall+def)/sum(pop2+agri2+comm2+secu2+wall2+def2)/100
+            ) from city where nation=A.nation and supply=1
+        ))
+        +(select sum(leader+power+intel) from general where nation=A.nation)
+        +(select round(sum(dex0+dex10+dex20+dex30+dex40)/1000) from general where nation=A.nation)
+        +(select round(sum(experience+dedication)/100) from general where nation=A.nation)
+        +(select round(avg(connect)) from general where nation=A.nation)
+    )/10)
+    as power,
+    (select sum(crew) from general where nation=A.nation) as totalCrew
+    from nation A
+    group by A.nation');
+    foreach($nations as $nation) {
        $genNum[$nation['nation']] = $nation['gennum'];

+        $aux = Json::decode($nation['aux']);
+        
+        
+
        if($nation['gennum'] > $nation['gennum2']) {
            // 장수가 증가했을때
            $nation['chemi'] -= ceil(($nation['gennum'] - $nation['gennum2']) / $nation['gennum'] * 100);
@@ -479,9 +536,21 @@ group by A.nation
        if($nation['chemi'] > 100) { $nation['chemi'] = 100; }

        //약간의 랜덤치 부여 (95% ~ 105%)
+        
        $nation['power'] = Util::round($nation['power'] * (rand()%101 + 950) / 1000);
-        $query = "update nation set power='{$nation['power']}',gennum2='{$nation['gennum']}',chemi='{$nation['chemi']}' where nation='{$nation['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $aux['maxPower'] = max($aux['maxPower']??0, $nation['power']);
+        $aux['maxCrew'] = max($aux['maxCrew']??0, Util::toInt($nation['totalCrew']));
+
+        if(count($cityNations[$nation['nation']]??[]) > count($aux['maxCities']??[])){
+            $aux['maxCities'] = $cityNations[$nation['nation']];
+        }
+
+        $db->update('nation', [
+            'power'=>$nation['power'],
+            'gennum2'=>$nation['gennum'],
+            'chemi'=>$nation['chemi'],
+            'aux'=>Json::encode($aux)
+        ], 'nation=%i', $nation['nation']);
    }

    // 전쟁기한 세팅
@@ -685,10 +754,23 @@ function checkMerge() {
        if($newGenCount < GameConst::$initialNationGenLimit) { $newGenCount = GameConst::$initialNationGenLimit; }
        $newTotalTech = $younation['totaltech'] + $mynation['totaltech'];
        $newTech = Util::round($newTotalTech / $newGenCount);
+
+        // 국가 백업
+        $oldNation = $db->queryFirstRow('SELECT * FROM nation WHERE nation=%i', $me['nation']);
+        $oldNationGenerals = $db->queryFirstColumn('SELECT `no` FROM general WHERE nation=%i', $me['nation']);
+        $oldNation['generals'] = $oldNationGenerals;
+        $oldNation['aux'] = Json::decode($oldNation['aux']);
+
        // 자금 통합, 외교제한 5년, 기술유지
        $query = "update nation set name='{$you['makenation']}',gold=gold+'{$mynation['gold']}',rice=rice+'{$mynation['rice']}',surlimit='24',totaltech='$newTotalTech',tech='$newTech',gennum='{$newGenCount}' where nation='{$younation['nation']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        //국가 삭제
+        $db->insert('ng_old_nations', [
+            'server_id'=>UniqueConst::$serverID,
+            'nation'=>$me['nation'],
+            'data'=>Json::encode($oldNation)
+        ]);
+
        $query = "delete from nation where nation='{$me['nation']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        // 아국 모든 도시들 상대국 소속으로
@@ -804,6 +886,12 @@ function checkSurrender() {
        $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>【혼란】</b></>통합에 반대하는 세력들로 인해 <D><b>{$younation['name']}</b></>에 혼란이 일고 있습니다.";
        pushNationHistory($younation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$mynation['name']}</b></>{$josaWa} 합병");

+        // 국가 백업
+        $oldNation = $db->queryFirstRow('SELECT * FROM nation WHERE nation=%i', $me['nation']);
+        $oldNationGenerals = $db->queryFirstColumn('SELECT `no` FROM general WHERE nation=%i', $me['nation']);
+        $oldNation['generals'] = $oldNationGenerals;
+        $oldNation['aux'] = Json::decode($oldNation['aux']);
+
        $newGenCount = $gencount + $gencount2;
        if($newGenCount < GameConst::$initialNationGenLimit) { $newGenCount = GameConst::$initialNationGenLimit; }
        $newTotalTech = $younation['totaltech'] + $mynation['totaltech'];
@@ -818,6 +906,13 @@ function checkSurrender() {
        $query = "update city set pop=pop*0.95,agri=agri*0.95,comm=comm*0.95,secu=secu*0.95,rate=rate*0.95,def=def*0.95,wall=wall*0.95 where nation='{$you['nation']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        //국가 삭제
+
+        $db->insert('ng_old_nations', [
+            'server_id'=>UniqueConst::$serverID,
+            'nation'=>$me['nation'],
+            'data'=>Json::encode($oldNation)
+        ]);
+
        $query = "delete from nation where nation='{$me['nation']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        // 군주가 있는 위치 구함
@@ -943,53 +1038,79 @@ function updateNationState() {
 function checkStatistic() {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();

    $admin = $gameStor->getValues(['year', 'month']);

    $nationHists = [];
    $specialHists = [];
    $personalHists = [];
-    $specialHists2 = [0];
+    $specialHists2 = [];
+    $crewtypeHists = [];

    $etc = '';

-    $query = "select avg(gold) as avggold, avg(rice) as avgrice, avg(dex0+dex10+dex20+dex30) as avgdex, max(dex0+dex10+dex20+dex30) as maxdex, avg(experience+dedication) as avgexpded, max(experience+dedication) as maxexpded from general";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
-    $general['avggold'] = Util::round($general['avggold']);
-    $general['avgrice'] = Util::round($general['avgrice']);
-    $general['avgdex'] = Util::round($general['avgdex']);
-    $general['avgexpded'] = Util::round($general['avgexpded']);
-    $etc .= "평균 금/쌀 ({$general['avggold']}/{$general['avgrice']}), 평균/최고 숙련({$general['avgdex']}/{$general['maxdex']}), 평균/최고 경험공헌({$general['avgexpded']}/{$general['maxexpded']}), ";
+    $auxData = [
+        'generals'=>[],
+        'nations'=>[],
+    ];

-    $query = "select min(tech) as mintech, max(tech) as maxtech, avg(tech) as avgtech, min(power) as minpower, max(power) as maxpower, avg(power) as avgpower from nation where level>0";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-    $nation['avgtech'] = Util::round($nation['avgtech']);
-    $nation['avgpower'] = Util::round($nation['avgpower']);
-    $etc .= "최저/평균/최고 기술({$nation['mintech']}/{$nation['avgtech']}/{$nation['maxtech']}), ";
-    $etc .= "최저/평균/최고 국력({$nation['minpower']}/{$nation['avgpower']}/{$nation['maxpower']}), ";
+    $avgGeneral = $db->queryFirstRow(
+        'SELECT avg(gold) as avggold, avg(rice) as avgrice, avg(dex0+dex10+dex20+dex30) as avgdex, 
+        max(dex0+dex10+dex20+dex30) as maxdex, avg(experience+dedication) as avgexpded, max(experience+dedication) as maxexpded
+        FROM general'
+    );
+    $auxData['generals']['avg'] = $avgGeneral;
+
+    $avgGeneral['avggold'] = Util::round($avgGeneral['avggold']);
+    $avgGeneral['avgrice'] = Util::round($avgGeneral['avgrice']);
+    $avgGeneral['avgdex'] = Util::round($avgGeneral['avgdex']);
+    $avgGeneral['avgexpded'] = Util::round($avgGeneral['avgexpded']);
+    $etc .= "평균 금/쌀 ({$avgGeneral['avggold']}/{$avgGeneral['avgrice']}), 평균/최고 숙련({$avgGeneral['avgdex']}/{$avgGeneral['maxdex']}), 평균/최고 경험공헌({$avgGeneral['avgexpded']}/{$avgGeneral['maxexpded']}), ";
+
+    $avgNation = $db->queryFirstRow(
+        'SELECT min(tech) as mintech, max(tech) as maxtech, avg(tech) as avgtech,
+        min(power) as minpower, max(power) as maxpower, avg(power) as avgpower from nation where level>0');
+    $auxData['nations']['avg'] = $avgNation;
+
+    $avgNation['avgtech'] = Util::round($avgNation['avgtech']);
+    $avgNation['avgpower'] = Util::round($avgNation['avgpower']);
+    $etc .= "최저/평균/최고 기술({$avgNation['mintech']}/{$avgNation['avgtech']}/{$avgNation['maxtech']}), ";
+    $etc .= "최저/평균/최고 국력({$avgNation['minpower']}/{$avgNation['avgpower']}/{$avgNation['maxpower']}), ";
    
    $nationName = '';
-    $power_hist = '';
+    $powerHist = '';

-    $query = "select nation,name,type,power,gennum,round((gold+rice)/100) as goldrice 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);
-    for($i=0; $i < $nationCount; $i++) {
-        $nation = MYDB_fetch_array($result);
+    $nations = Util::convertArrayToDict(
+        $db->query(
+            'SELECT nation,name,type,power,gennum,gold+rice as goldrice from nation where level>0 order by power desc', 'nation'
+        ),
+        'nation'
+    );
+    $nationCount = count($nations);

-        $query = "select sum(leader+power+intel) as abil,round(sum(gold+rice)/100) as goldrice,round(sum(dex0+dex10+dex20+dex30)/1000) as dex,round(sum(experience+dedication)/100) as expded from general where nation='{$nation['nation']}'";
-        $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $general = MYDB_fetch_array($result2);
+    $nationGeneralInfos = Util::convertArrayToDict(
+        $db->query(
+            'SELECT nation, sum(leader+power+intel) as abil,sum(gold+rice) as goldrice,
+            sum(dex0+dex10+dex20+dex30) as dex,sum(experience+dedication) as expded
+            from general GROUP BY nation'
+        ),
+        'nation'
+    );

-        $query = "select count(*) as cnt,round(sum(pop)/100) as pop,round(sum(pop2)/100) as pop2 from city where nation='{$nation['nation']}'";
-        $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $city = MYDB_fetch_array($result2);
+    $nationCityInfos = Util::convertArrayToDict(
+        $db->query('SELECT nation, count(*) as cnt, sum(pop) as pop,sum(pop2) as pop2 from city GROUP BY nation'),
+        'nation'
+    );
+
+    foreach($nations as $nationNo=>&$nation) {
+        $general = $nationGeneralInfos[$nationNo];
+        $city = $nationCityInfos[$nationNo];
        
+        $nation['generalInfo'] = $general;
+        $nation['cityInfo'] = $city;
+
        $nationName .= $nation['name'].'('.getNationType($nation['type']).'), ';
-        $power_hist .= "{$nation['name']}({$nation['power']}/{$nation['gennum']}/{$city['cnt']}/{$city['pop']}/{$city['pop2']}/{$nation['goldrice']}/{$general['goldrice']}/{$general['abil']}/{$general['dex']}/{$general['expded']}), ";
+        $powerHist .= "{$nation['name']}({$nation['power']}/{$nation['gennum']}/{$city['cnt']}/{$city['pop']}/{$city['pop2']}/{$nation['goldrice']}/{$general['goldrice']}/{$general['abil']}/{$general['dex']}/{$general['expded']}), ";

        if(!isset($nationHists[$nation['type']])){
            $nationHists[$nation['type']] = 0;
@@ -997,26 +1118,21 @@ function checkStatistic() {
        $nationHists[$nation['type']]++;
    }

+    $auxData['nations']['all'] = $nations;
+
    $nationHist = '';
    for($i=1; $i <= 13; $i++) {
        if(!Util::array_get($nationHists[$i])) { $nationHists[$i] = '-'; }
        $nationHist .= getNationType($i)."({$nationHists[$i]}), ";
    }

-    $query = "select no from general where npc <= 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $genCount = MYDB_num_rows($result);
+    $generals = $db->query('SELECT `no`,npc,personal,special,special2,crewtype FROM general');

-    $query = "select no from general where npc > 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $npcCount = MYDB_num_rows($result);
-
-    $query = "select personal,special,special2 from general";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $generalCount = MYDB_num_rows($result);
-    for($i=0; $i < $generalCount; $i++) {
-        $general = MYDB_fetch_array($result);
+    $genCount = 0;
+    $npcCount = 0;
+    $generalCount = count($generals);

+    foreach($generals as $general) {
        if(!isset($personalHists[$general['personal']])){
            $personalHists[$general['personal']] = 0;
        }
@@ -1029,70 +1145,112 @@ function checkStatistic() {
            $specialHists2[$general['special2']] = 0;
        }

+        if($general['npc'] < 2){
+            $genCount+=1;
+        }
+        else{
+            $npcCount+=1;
+        }
+
        $personalHists[$general['personal']]++;
        $specialHists[$general['special']]++;
        $specialHists2[$general['special2']]++;
    }

+    foreach($db->queryAllLists(
+        'SELECT crewtype, count(crewtype) AS cnt FROM general WHERE crew>=100 OR deathnum>0 GROUP BY crewtype'
+        ) as [$crewtype, $cnt]
+    ){
+        $crewtypeHists[$crewtype] = $cnt;
+    }
+
+    $auxData['generals']['hists'] = [
+        'personal' => $personalHists,
+        'special' => $specialHists,
+        'special2' => $specialHists2,
+        'crewtype' => $crewtypeHists,
+        'userCnt' => $genCount,
+        'npcCnt' => $npcCount,
+    ];
+
    $generalCountStr = "{$generalCount}({$genCount}+{$npcCount})";

-    $personalHist = '';
-    for($i=0; $i < 11; $i++) {
-        if(!Util::array_get($personalHists[$i])) { $personalHists[$i] = '-'; }
-        $personalHist .= getGenChar($i)."({$personalHists[$i]}), ";
-    }
-    $specialHist = '';
-    for($i=0; $i < 40; $i++) {
-        $call = getGenSpecial($i);
-        if($call) {
-            if(!Util::array_get($specialHists[$i])) { $specialHists[$i] = '-'; }
+    $personalHistStr = join(', ', array_map(function($histPair){
+        [$histKey, $cnt] = $histPair;
+        return getGenChar($histKey).'('.$cnt.')';
+    }, Util::convertDictToArray($personalHists)));

-            $specialHist .= $call."({$specialHists[$i]}), ";
-        }
-    }
-    $specialHist .= '// ';
-    $specialHist .= "-({$specialHists2[0]}), ";
-    for($i=40; $i < 80; $i++) {
-        $call = getGenSpecial($i);
-        if($call) {
-            if(!Util::array_get($specialHists2[$i])) { $specialHists2[$i] = '-'; }
+    $specialHistsStr = join(', ', array_map(function($histPair){
+        [$histKey, $cnt] = $histPair;
+        return getGenSpecial($histKey).'('.$cnt.')';
+    }, Util::convertDictToArray($specialHists)));

-            $specialHist .= $call."({$specialHists2[$i]}), ";
-        }
-    }
+    $specialHists2Str = join(', ', array_map(function($histPair){
+        [$histKey, $cnt] = $histPair;
+        return getGenSpecial($histKey).'('.$cnt.')';
+    }, Util::convertDictToArray($specialHists2)));

-    $crewtype = '';
-    $types = array(0, 1, 2, 3, 4, 5, 10, 11, 12, 13, 14, 20, 21, 22, 23, 24, 25, 26, 27, 30, 31, 32, 33, 34, 35, 36, 37, 38, 40, 41, 42, 43);
-    $count = count($types);
-    foreach(GameUnitConst::all() as $unit){
-        $userCnt = DB::db()->queryFirstField(
-            "SELECT count(*) as type from general where crewtype=%i and crew>=100",
-            $unit->id
+    $specialHistsAllStr = "$specialHistsStr // $specialHists2Str";
+
+    $crewtypeHistsStr = join(', ', array_map(function($histPair){
+        [$histKey, $cnt] = $histPair;
+        return getGenSpecial($histKey).'('.$cnt.')';
+    }, Util::convertDictToArray($crewtypeHists)));
+    
+    $db->insert('statistic', [
+        'year'=>$admin['year'],
+        'month'=>$admin['month'],
+        'nation_count'=>$nationCount,
+        'nation_name'=>$nationName,
+        'nation_hist'=>$nationHist,
+        'gen_count'=>$generalCountStr,
+        'personal_hist'=>$personalHistStr,
+        'special_hist'=>$specialHistsAllStr,
+        'power_hist'=>$powerHist,
+        'crewtype'=>$crewtypeHistsStr,
+        'etc'=>$etc,
+        'aux'=>Json::encode($auxData)
+    ]);
+
+}
+
+
+function convForOldGeneral(array $general, int $year, int $month){
+    return [
+        'server_id'=>UniqueConst::$serverID,
+        'general_no'=>$general['no'],
+        'owner'=>$general['owner'],
+        'name'=>$general['name'],
+        'last_yearmonth'=>$year*100+$month,
+        'turntime'=>$general['turntime'],
+        'data'=>Json::encode($general)
+    ];
+}
+
+function storeOldGeneral(int $no, int $year, int $month){
+    $db = DB::db();
+    $general = $db->queryFirstRow('SELECT * FROM general WHERE `no` = %i', $no);
+    if(!$general){
+        return;
+    }
+    $data = convForOldGeneral($general, $year, $month);
+    $db->insertUpdate(
+        'ng_old_generals',
+        $data,
+        $data
+    );
+}
+
+function storeOldGenerals(int $nation, int $year, int $month){
+    $db = DB::db();
+    foreach($db->query('SELECT * FROM general WHERE nation = %i',$nation) as $general){
+        $data = convForOldGeneral($general, $year, $month);
+        $db->insertUpdate(
+            'ng_old_generals',
+            $data,
+            $data
        );
-        $crewtype .= "{$unit->name}({$userCnt}), ";
    }
-    for($i=0; $i < $count; $i++) {
-        
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $general = MYDB_fetch_array($result);
-
-        
-    }
-
-
-    $query = "
-        insert into statistic (
-            year, month,
-            nation_count, nation_name, nation_hist,
-            gen_count, personal_hist, special_hist, power_hist,
-            crewtype, etc
-        ) values (
-            '{$admin['year']}', '{$admin['month']}',
-            '$nationCount', '$nationName', '$nationHist',
-            '$generalCountStr', '$personalHist', '$specialHist', '$power_hist',
-            '$crewtype', '$etc'
-        )";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 }

 function checkEmperior() {
@@ -1106,183 +1264,223 @@ function checkEmperior() {
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $count = MYDB_num_rows($result);

-    if($count == 1 && $admin['isunited'] == 0) {
-        $nation = MYDB_fetch_array($result);
+    if ($count != 1 || $admin['isunited'] != 0) {
+       return;
+    }

-        $query = "select city from city where nation='{$nation['nation']}'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $count = MYDB_num_rows($result);
+    $nation = MYDB_fetch_array($result);

-        $query = "select city from city";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $allcount = MYDB_num_rows($result);
+    $count = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i', $nation['nation']);
+    if(!$count){
+        return;
+    }
+    $allcount = $db->queryFirstField('SELECT count(city) FROM city');

-        if($count == $allcount) {
+    if ($count != $allcount) {
+        return;
+    }

-            $josaYi = JosaUtil::pick($nation['name'], '이');
+    checkStatistic();

-            pushNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일");
+    $josaYi = JosaUtil::pick($nation['name'], '이');

-            $gameStor->isunited = 2;
-            $gameStor->conlimit = $gameStor->conlimit*100;
+    pushNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일");

-            $query = "select no from general where npc<2 and age>=45";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $count = MYDB_num_rows($result);
+    $gameStor->isunited = 2;
+    $gameStor->conlimit = $gameStor->conlimit*100;

-            for($i=0; $i < $count; $i++) {
-                $general = MYDB_fetch_array($result);
-                CheckHall($general['no']);
-            }
+    $query = "select no from general where npc<2 and age>=40";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $count = MYDB_num_rows($result);

-            $query = "select nation,name,type,color,gold,rice,power,gennum from nation where nation='{$nation['nation']}'";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $nation = MYDB_fetch_array($result);
+    for($i=0; $i < $count; $i++) {
+        $general = MYDB_fetch_array($result);
+        CheckHall($general['no']);
+    }

-            $query = "select SUM(pop) as totalpop,SUM(pop2) as maxpop from city where nation='{$nation['nation']}'"; // 도시 이름 목록
-            $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $city = MYDB_fetch_array($cityresult);
-            $pop = "{$city['totalpop']} / {$city['maxpop']}";
-            $poprate = round($city['totalpop']/$city['maxpop']*100, 2);
-            $poprate .= " %";
+    $query = "select nation,name,type,color,gold,rice,power,gennum from nation where nation='{$nation['nation']}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $nation = MYDB_fetch_array($result);

-            $query = "select name,picture,belong 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);
+    $query = "select SUM(pop) as totalpop,SUM(pop2) as maxpop from city where nation='{$nation['nation']}'"; // 도시 이름 목록
+    $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $city = MYDB_fetch_array($cityresult);
+    $pop = "{$city['totalpop']} / {$city['maxpop']}";
+    $poprate = round($city['totalpop']/$city['maxpop']*100, 2);
+    $poprate .= " %";

-            $query = "select name,picture,belong 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);
+    $query = "select name,picture,belong 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);

-            $query = "select name,picture,belong 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);
+    $query = "select name,picture,belong 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);

-            $query = "select name,picture,belong 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);
+    $query = "select name,picture,belong 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);

-            $query = "select name,picture,belong 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 name,picture,belong 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);

-            $query = "select name,picture,belong 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 name,picture,belong 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 name,picture,belong 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 name,picture,belong 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 name,picture,belong 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 name,picture,belong 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 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),"");
-            $tigernum = MYDB_num_rows($tigerresult);
-            $tigerstr = '';
-            for($i=0; $i < $tigernum; $i++) {
-                $tiger = MYDB_fetch_array($tigerresult);
-                if($tiger['killnum'] > 0) {
-                    $tigerstr .= "{$tiger['name']}【{$tiger['killnum']}】, ";
-                }
-            }
+    $query = "select name,picture,belong 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 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),"");
-            $eaglenum = MYDB_num_rows($eagleresult);
-            $eaglestr = '';
-            for($i=0; $i < $eaglenum; $i++) {
-                $eagle = MYDB_fetch_array($eagleresult);
-                if($eagle['firenum'] > 0) {
-                    $eaglestr .= "{$eagle['name']}【{$eagle['firenum']}】, ";
-                }
-            }
+    $oldNation = $db->queryFirstRow('SELECT * FROM nation WHERE nation=%i', $nation['nation']);
+    $oldNationGenerals = $db->queryFirstColumn('SELECT `no` FROM general WHERE nation=%i', $nation['nation']);
+    $oldNation['generals'] = $oldNationGenerals;

-            $log = ["<C>●</>{$admin['year']}년 {$admin['month']}월: <D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일하였습니다."];
-
-            $query = "select no,name from general where nation='{$nation['nation']}' order by dedication desc";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $gencount = MYDB_num_rows($result);
-            $gen = '';
-            for($i=0; $i < $gencount; $i++) {
-                $general = MYDB_fetch_array($result);
-                $gen .= "{$general['name']}, ";
-
-                pushGenLog($general, $log);
-            }
-
-            $nation['type'] = getNationType($nation['type']);
-
-            $query = "select MAX(nation_count) as nc,MAX(gen_count) as gc from statistic";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $stat = MYDB_fetch_array($result);
-
-            $query = "select count(*) as cnt from general";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $gencount = MYDB_fetch_array($result);
-
-            $statNC = "1 / {$stat['nc']}";
-            $statGC = "{$gencount['cnt']} / {$stat['gc']}";
-
-            $query = "select nation_count,nation_name,nation_hist from statistic where nation_count='{$stat['nc']}' limit 0,1";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $statNation = MYDB_fetch_array($result);
-
-            $query = "select gen_count,personal_hist,special_hist from statistic order by no desc limit 0,1";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $statGeneral = MYDB_fetch_array($result);
-
-            $nationHistory = DB::db()->queryFirstField('SELECT `history` FROM `nation` WHERE `nation` = %i', $nation['nation']);
-
-            $db->insert('emperior', [
-                'phase'=>'-',
-                'nation_count'=>$statNC,
-                'nation_name'=>$statNation['nation_name'],
-                'nation_hist'=>$statNation['nation_hist'],
-                'gen_count'=>$statGC,
-                'personal_hist'=>$statGeneral['personal_hist'],
-                'special_hist'=>$statGeneral['special_hist'],
-                'name'=>$nation['name'],
-                'type'=>$nation['type'],
-                'color'=>$nation['color'],
-                'year'=>$admin['year'],
-                'month'=>$admin['month'],
-                'power'=>$nation['power'],
-                'gennum'=>$nation['gennum'],
-                'citynum'=>$allcount,
-                'pop'=>$pop,
-                'poprate'=>$poprate,
-                'gold'=>$nation['gold'],
-                'rice'=>$nation['rice'],
-                'l12name'=>$level12['name'],
-                'l12pic'=>$level12['picture'],
-                'l11name'=>$level11['name'],
-                'l11pic'=>$level11['picture'],
-                'l10name'=>$level10['name'],
-                'l10pic'=>$level10['picture'],
-                'l9name'=>$level9['name'],
-                'l9pic'=>$level9['picture'],
-                'l8name'=>$level8['name'],
-                'l8pic'=>$level8['picture'],
-                'l7name'=>$level7['name'],
-                'l7pic'=>$level7['picture'],
-                'l6name'=>$level6['name'],
-                'l6pic'=>$level6['picture'],
-                'l5name'=>$level5['name'],
-                'l5pic'=>$level5['picture'],
-                'tiger'=>$tigerstr,
-                'eagle'=>$eaglestr,
-                'gen'=>$gen,
-                'history'=>$nationHistory
-            ]);
-
-            $history = ["<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【통일】</b></><D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일하였습니다."];
-            pushWorldHistory($history, $admin['year'], $admin['month']);
-
-            //연감 월결산
-            LogHistory();
+    $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),"");
+    $tigernum = MYDB_num_rows($tigerresult);
+    $tigerstr = '';
+    for($i=0; $i < $tigernum; $i++) {
+        $tiger = MYDB_fetch_array($tigerresult);
+        if($tiger['killnum'] > 0) {
+            $tigerstr .= "{$tiger['name']}【{$tiger['killnum']}】, ";
        }
    }
+
+    $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),"");
+    $eaglenum = MYDB_num_rows($eagleresult);
+    $eaglestr = '';
+    for($i=0; $i < $eaglenum; $i++) {
+        $eagle = MYDB_fetch_array($eagleresult);
+        if($eagle['firenum'] > 0) {
+            $eaglestr .= "{$eagle['name']}【{$eagle['firenum']}】, ";
+        }
+    }
+
+    $log = ["<C>●</>{$admin['year']}년 {$admin['month']}월: <D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일하였습니다."];
+
+    $query = "select no,name from general where nation='{$nation['nation']}' order by dedication desc";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gencount = MYDB_num_rows($result);
+    $gen = '';
+    for($i=0; $i < $gencount; $i++) {
+        $general = MYDB_fetch_array($result);
+        $gen .= "{$general['name']}, ";
+
+        pushGenLog($general, $log);
+    }
+
+    $nation['type'] = getNationType($nation['type']);
+
+    $query = "select MAX(nation_count) as nc,MAX(gen_count) as gc from statistic";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $stat = MYDB_fetch_array($result);
+
+    $query = "select count(*) as cnt from general";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gencount = MYDB_fetch_array($result);
+
+    $statNC = "1 / {$stat['nc']}";
+    $statGC = "{$gencount['cnt']} / {$stat['gc']}";
+
+    $query = "select nation_count,nation_name,nation_hist from statistic where nation_count='{$stat['nc']}' limit 0,1";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $statNation = MYDB_fetch_array($result);
+
+    $query = "select gen_count,personal_hist,special_hist,aux from statistic order by no desc limit 0,1";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $statGeneral = MYDB_fetch_array($result);
+
+    $oldNation = $db->queryFirstRow('SELECT * FROM nation WHERE nation=%i', $nation['nation']);
+    $oldNation['generals'] = $db->queryFirstColumn('SELECT `no` FROM general WHERE nation=%i', $nation['nation']);
+    $oldNation['aux'] = Json::decode($oldNation['aux']);
+
+    storeOldGenerals(0, $admin['year'], $admin['month']);
+    storeOldGenerals($nation['nation'], $admin['year'], $admin['month']);
+
+    $db->insert('ng_old_nations', [
+        'server_id'=>UniqueConst::$serverID,
+        'nation'=>$nation['nation'],
+        'data'=>Json::encode($oldNation)
+    ]);
+
+    $noNationGeneral = $db->queryFirstColumn('SELECT `no` FROM general WHERE nation=0');
+    $db->insert('ng_old_nations', [
+        'server_id'=>UniqueConst::$serverID,
+        'nation'=>0,
+        'data'=>Json::encode([
+            'nation'=>0,
+            'name'=>'재야',
+            'generals'=>$noNationGeneral
+        ])
+    ]);
+
+    $nationHistory = DB::db()->queryFirstField('SELECT `history` FROM `nation` WHERE `nation` = %i', $nation['nation']);
+
+    $serverCnt = $db->queryFirstField('SELECT count(*) FROM ng_games');
+    $serverName = UniqueConst::$serverName;
+
+    $db->update('ng_games', [
+        'winner_nation'=>$nation['nation']
+    ], 'server_id=%s', UniqueConst::$serverID);
+
+    $db->insert('emperior', [
+        'phase'=>$serverName.$serverCnt.'기',
+        'server_id'=>UniqueConst::$serverID,
+        'nation_count'=>$statNC,
+        'nation_name'=>$statNation['nation_name'],
+        'nation_hist'=>$statNation['nation_hist'],
+        'gen_count'=>$statGC,
+        'personal_hist'=>$statGeneral['personal_hist'],
+        'special_hist'=>$statGeneral['special_hist'],
+        'name'=>$nation['name'],
+        'type'=>$nation['type'],
+        'color'=>$nation['color'],
+        'year'=>$admin['year'],
+        'month'=>$admin['month'],
+        'power'=>$nation['power'],
+        'gennum'=>$nation['gennum'],
+        'citynum'=>$allcount,
+        'pop'=>$pop,
+        'poprate'=>$poprate,
+        'gold'=>$nation['gold'],
+        'rice'=>$nation['rice'],
+        'l12name'=>$level12['name'],
+        'l12pic'=>$level12['picture'],
+        'l11name'=>$level11['name'],
+        'l11pic'=>$level11['picture'],
+        'l10name'=>$level10['name'],
+        'l10pic'=>$level10['picture'],
+        'l9name'=>$level9['name'],
+        'l9pic'=>$level9['picture'],
+        'l8name'=>$level8['name'],
+        'l8pic'=>$level8['picture'],
+        'l7name'=>$level7['name'],
+        'l7pic'=>$level7['picture'],
+        'l6name'=>$level6['name'],
+        'l6pic'=>$level6['picture'],
+        'l5name'=>$level5['name'],
+        'l5pic'=>$level5['picture'],
+        'tiger'=>$tigerstr,
+        'eagle'=>$eaglestr,
+        'gen'=>$gen,
+        'history'=>$nationHistory,
+        'aux'=>$statGeneral['aux']
+    ]);
+
+    $history = ["<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【통일】</b></><D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일하였습니다."];
+    pushWorldHistory($history, $admin['year'], $admin['month']);
+
+    //연감 월결산
+    LogHistory();
 }
--- a/Show More
+++ b/Show More