fix: 전투 시뮬레이터 UI 깨짐 수정

- 항상 통제 가능한 localStorage 기준으로 변경

.eslintrc.cjs

@@ -1,27 +1,42 @@
 module.exports = {
-  root: true,
-  parser: "vue-eslint-parser",
-  parserOptions: {
-    "project": "./tsconfig.json"
-  },
-  ignorePatterns: ['*.test.ts', '.eslintrc.cjs', 'webpack.config.cjs', '*.js'],
-  overrides: [{
-    files: ['*.ts', '*.tsx', "*.vue"],
-  }],
-  plugins: [
-    "@typescript-eslint",
+    root: true,
+    parser: "vue-eslint-parser",
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    ignorePatterns: ['*.test.ts', '.eslintrc.cjs', 'webpack.config.cjs', '*.js'],
+    overrides: [{
+        files: ['*.ts', '*.tsx', "*.vue"],
+    }],
+    plugins: [
+        "@typescript-eslint"
+    ],
 
-  ],
-  extends: [
-    "eslint:recommended",
-    'plugin:vue/essential',
-    '@vue/typescript',
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  rules: {
-    '@typescript-eslint/no-floating-promises': 'error',
-    "vue/no-multiple-template-root": "off",
-    "vue/no-v-for-template-key": "off",
-  }
-}
+    extends: [
+        "eslint:recommended",
+        "plugin:vue/vue3-essential",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    parserOptions: {
+        "sourceType": "module",
+        "project": "./tsconfig.json",
+        "ecmaVersion": 2021,
+        "parser": "@typescript-eslint/parser",
+        extraFileExtensions: ['.vue']
+    },
+    rules: {
+        '@typescript-eslint/no-floating-promises': 'error',
+    },
+    settings: {
+        'import/resolver': {
+            alias: {
+                map: [
+                    ['@', './hwe/ts'],
+                    ['@util', './hwe/ts/util'],
+                    ['@scss', './hwe/scss'],
+                ]
+            }
+        }
+    },
+};

.gitignore

@@ -27,6 +27,7 @@ hwe/.htaccess
 
 d_shared
 
+/d_pic
 d_pic/*.jpg
 d_pic/*.gif
 d_pic/*.png
@@ -64,4 +65,4 @@ vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/*
 ingame/js/*
 ingame/css/*
 gateway/js/*
-gateway/css/*
+gateway/css/*

.phan/config.php

@@ -15,20 +15,34 @@ return [
     // Note that the **only** effect of choosing `'5.6'` is to infer
     // that functions removed in php 7.0 exist.
     // (See `backward_compatibility_checks` for additional options)
-    "target_php_version" => '7.4',
+    "target_php_version" => '8.0',
     'backward_compatibility_checks ' => true,
-    'minimum_severity'=>\Phan\Issue::SEVERITY_CRITICAL,
+    'minimum_severity' => \Phan\Issue::SEVERITY_NORMAL,
 
     'file_list' => [
         'f_config/config.php',
+        'hwe/_119_b.php',
+        'hwe/_119.php',
         'hwe/a_bestGeneral.php',
-        'hwe/a_emperior.php',
+        'hwe/_admin1.php',
+        'hwe/_admin1_submit.php',
+        'hwe/_admin2.php',
+        'hwe/_admin2_submit.php',
+        'hwe/_admin4.php',
+        'hwe/_admin4_submit.php',
+        'hwe/_admin5.php',
+        'hwe/_admin5_submit.php',
+        'hwe/_admin7.php',
+        'hwe/_admin8.php',
+        'hwe/_admin_force_rehall.php',
         'hwe/a_emperior_detail.php',
+        'hwe/a_emperior.php',
         'hwe/a_genList.php',
         'hwe/a_hallOfFame.php',
         'hwe/a_history.php',
         'hwe/a_kingdomList.php',
         'hwe/a_npcList.php',
+        'hwe/api.php',
         'hwe/a_status.php',
         'hwe/a_traffic.php',
         'hwe/a_vote.php',
@@ -41,13 +55,11 @@ return [
         'hwe/b_dipcenter.php',
         'hwe/b_diplomacy.php',
         'hwe/b_genList.php',
-        'hwe/v_inheritPoint.php',
         'hwe/b_myBossInfo.php',
         'hwe/b_myCityInfo.php',
         'hwe/b_myGenInfo.php',
         'hwe/b_myKingdomInfo.php',
         'hwe/b_myPage.php',
-        'hwe/b_npc_control.php',
         'hwe/b_processing.php',
         'hwe/b_tournament.php',
         'hwe/b_troop.php',
@@ -55,7 +67,6 @@ return [
         'hwe/c_dipcenter.php',
         'hwe/c_tournament.php',
         'hwe/c_vote.php',
-        'hwe/func.php',
         'hwe/func_auction.php',
         'hwe/func_command.php',
         'hwe/func_converter.php',
@@ -64,16 +75,15 @@ return [
         'hwe/func_legacy.php',
         'hwe/func_map.php',
         'hwe/func_message.php',
+        'hwe/func.php',
         'hwe/func_process.php',
         'hwe/func_string.php',
         'hwe/func_template.php',
         'hwe/func_time_event.php',
         'hwe/func_tournament.php',
         'hwe/index.php',
-        'hwe/install.php',
         'hwe/install_db.php',
-        'hwe/join.php',
-        'hwe/join_post.php',
+        'hwe/install.php',
         'hwe/j_adjust_icon.php',
         'hwe/j_autoreset.php',
         'hwe/j_basic_info.php',
@@ -91,21 +101,20 @@ return [
         'hwe/j_export_simulator_object.php',
         'hwe/j_general_log_old.php',
         'hwe/j_general_set_permission.php',
-        'hwe/j_general_turn.php',
-        'hwe/j_getChiefTurn.php',
         'hwe/j_get_basic_general_list.php',
+        'hwe/j_getChiefTurn.php',
         'hwe/j_get_city_list.php',
         'hwe/j_get_general_list.php',
         'hwe/j_get_nation_general_list.php',
-        'hwe/j_get_reserved_command.php',
         'hwe/j_get_select_npc_token.php',
         'hwe/j_get_select_pool.php',
         'hwe/j_image_upload.php',
-        'hwe/j_install.php',
         'hwe/j_install_db.php',
+        'hwe/j_install.php',
         'hwe/j_load_scenarios.php',
-        'hwe/j_map.php',
         'hwe/j_map_history.php',
+        'hwe/j_map.php',
+        'hwe/j_map_recent.php',
         'hwe/j_msg_contact_list.php',
         'hwe/j_msg_decide_opt.php',
         'hwe/j_msg_delete.php',
@@ -123,26 +132,20 @@ return [
         'hwe/j_set_npc_control.php',
         'hwe/j_simulate_battle.php',
         'hwe/j_troop.php',
+        'hwe/j_update_picked_general.php',
         'hwe/j_vacation.php',
         'hwe/lib.php',
         'hwe/process_war.php',
+        'hwe/proc.php',
+        'hwe/readme.php',
+        'hwe/recent_map.php',
         'hwe/select_general_from_pool.php',
         'hwe/select_npc.php',
-        'hwe/t_board.php',
         'hwe/t_diplomacy.php',
-        'hwe/_119.php',
-        'hwe/_119_b.php',
-        'hwe/_admin1.php',
-        'hwe/_admin1_submit.php',
-        'hwe/_admin2.php',
-        'hwe/_admin2_submit.php',
-        'hwe/_admin4.php',
-        'hwe/_admin4_submit.php',
-        'hwe/_admin5.php',
-        'hwe/_admin5_submit.php',
-        'hwe/_admin7.php',
-        'hwe/_admin8.php',
-        'hwe/_admin_force_rehall.php',
+        'hwe/v_board.php',
+        'hwe/v_inheritPoint.php',
+        'hwe/v_join.php',
+        'hwe/v_NPCControl.php',
     ],
 
     // A list of directories that should be parsed for class and
@@ -153,9 +156,9 @@ return [
     // Thus, both first-party and third-party code being used by
     // your application should be included in this list.
     'directory_list' => [
-    	'hwe/d_setting',
-    	'hwe/sammo',
-    	'd_setting',
+        'hwe/d_setting',
+        'hwe/sammo',
+        'd_setting',
         'src/sammo',
         'src/kakao',
         'vendor'
@@ -179,6 +182,7 @@ return [
 
     'suppress_issue_types' => [
         'PhanUnreferencedUseNormal',
+        'PhanTypeArraySuspiciousNullable',
     ],
 
     // A list of plugin files to execute.
@@ -195,4 +199,4 @@ return [
         'PregRegexCheckerPlugin',
         'PrintfCheckerPlugin',
     ],
-];
+];

403.html

@@ -5,7 +5,7 @@
         <title>닫혀 있습니다.</title>
         <script>
             setTimeout(function(){
-                window.location = window.location+'/../';
+                window.location.href = '../';
             }, 5000);
         </script>
         <style>
@@ -13,7 +13,7 @@
                 background-color:black;
                 color:yellow;
             }
-            
+
         </style>
     </head>
     <body>

composer.json

@@ -8,7 +8,7 @@
     ],
     "config": {
         "platform": {
-            "php": "7.4"
+            "php": "8.0"
         }
     },
     "require": {
@@ -16,7 +16,6 @@
         "sergeytsalkov/meekrodb": "^2.3",
         "league/plates": "^3.3",
         "guzzlehttp/guzzle": "^6.3",
-        "scssphp/scssphp": "^1.0",
         "monolog/monolog": "^1.23",
         "firephp/firephp-core": "^0.4.0",
         "vlucas/valitron": "^1.4",
@@ -51,5 +50,5 @@
             "f_config/config.php"
         ]
     }
-    
+
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "317938cff7b30806f4e385a70f4943fc",
+    "content-hash": "94cfbcb22b9f475e421ad5009391006f",
     "packages": [
         {
             "name": "brandonwamboldt/utilphp",
@@ -122,16 +122,16 @@
         },
         {
             "name": "composer/semver",
-            "version": "3.2.5",
+            "version": "3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9"
+                "reference": "83e511e247de329283478496f7a1e114c9517506"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9",
-                "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9",
+                "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506",
+                "reference": "83e511e247de329283478496f7a1e114c9517506",
                 "shasum": ""
             },
             "require": {
@@ -183,7 +183,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.2.5"
+                "source": "https://github.com/composer/semver/tree/3.2.6"
             },
             "funding": [
                 {
@@ -199,7 +199,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-24T12:41:47+00:00"
+            "time": "2021-10-25T11:34:17+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -267,34 +267,30 @@
         },
         {
             "name": "doctrine/inflector",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210"
+                "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/9cf661f4eb38f7c881cac67c75ea9b00bf97b210",
-                "reference": "9cf661f4eb38f7c881cac67c75ea9b00bf97b210",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
+                "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^7.0",
-                "phpstan/phpstan": "^0.11",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-strict-rules": "^0.11",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "doctrine/coding-standard": "^8.2",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpstan/phpstan-strict-rules": "^0.12",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+                "vimeo/psalm": "^4.10"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
@@ -342,7 +338,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.x"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.4"
             },
             "funding": [
                 {
@@ -358,7 +354,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-29T15:13:26+00:00"
+            "time": "2021-10-22T20:16:43+00:00"
         },
         {
             "name": "erusev/parsedown",
@@ -674,16 +670,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.4.1",
+            "version": "1.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d"
+                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d",
-                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
                 "shasum": ""
             },
             "require": {
@@ -695,7 +691,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -711,10 +707,25 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
                 }
             ],
             "description": "Guzzle promises library",
@@ -723,22 +734,36 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.4.1"
+                "source": "https://github.com/guzzle/promises/tree/1.5.1"
             },
-            "time": "2021-03-07T09:25:29+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-10-22T20:56:57+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.8.2",
+            "version": "1.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "dc960a912984efb74d0a90222870c72c87f10c91"
+                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91",
-                "reference": "dc960a912984efb74d0a90222870c72c87f10c91",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
+                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
                 "shasum": ""
             },
             "require": {
@@ -775,13 +800,34 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
                 },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
                 {
                     "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
                     "homepage": "https://github.com/Tobion"
                 }
             ],
@@ -798,22 +844,36 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.8.2"
+                "source": "https://github.com/guzzle/psr7/tree/1.8.3"
             },
-            "time": "2021-04-26T09:17:50+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-10-05T13:56:00+00:00"
         },
         {
             "name": "illuminate/bus",
-            "version": "v8.61.0",
+            "version": "v8.69.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/bus.git",
-                "reference": "808097c0dfd893309bd77b00139586c516b965c9"
+                "reference": "be400399687b97d5558a224e970060fd5d5f2735"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/bus/zipball/808097c0dfd893309bd77b00139586c516b965c9",
-                "reference": "808097c0dfd893309bd77b00139586c516b965c9",
+                "url": "https://api.github.com/repos/illuminate/bus/zipball/be400399687b97d5558a224e970060fd5d5f2735",
+                "reference": "be400399687b97d5558a224e970060fd5d5f2735",
                 "shasum": ""
             },
             "require": {
@@ -853,20 +913,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2021-08-10T16:49:48+00:00"
+            "time": "2021-10-21T19:19:36+00:00"
         },
         {
             "name": "illuminate/collections",
-            "version": "v8.61.0",
+            "version": "v8.69.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/collections.git",
-                "reference": "18fa841df912ec56849351dd6ca8928e8a98b69d"
+                "reference": "05f286ec5fd2dd286e8384577047efc375c8954c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/collections/zipball/18fa841df912ec56849351dd6ca8928e8a98b69d",
-                "reference": "18fa841df912ec56849351dd6ca8928e8a98b69d",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/05f286ec5fd2dd286e8384577047efc375c8954c",
+                "reference": "05f286ec5fd2dd286e8384577047efc375c8954c",
                 "shasum": ""
             },
             "require": {
@@ -907,20 +967,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2021-09-08T12:48:16+00:00"
+            "time": "2021-10-22T18:01:46+00:00"
         },
         {
             "name": "illuminate/container",
-            "version": "v8.61.0",
+            "version": "v8.69.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/container.git",
-                "reference": "862b64ea4ab56e307a1676104a1b93295d347ad0"
+                "reference": "ef73feb5216ef97ab7023cf59c0c8dbbd5505a9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/container/zipball/862b64ea4ab56e307a1676104a1b93295d347ad0",
-                "reference": "862b64ea4ab56e307a1676104a1b93295d347ad0",
+                "url": "https://api.github.com/repos/illuminate/container/zipball/ef73feb5216ef97ab7023cf59c0c8dbbd5505a9d",
+                "reference": "ef73feb5216ef97ab7023cf59c0c8dbbd5505a9d",
                 "shasum": ""
             },
             "require": {
@@ -958,20 +1018,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2021-09-09T13:55:23+00:00"
+            "time": "2021-09-15T14:32:50+00:00"
         },
         {
             "name": "illuminate/contracts",
-            "version": "v8.61.0",
+            "version": "v8.69.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
-                "reference": "ab4bb4ec3b36905ccf972c84f9aaa2bdd1153913"
+                "reference": "e76f4bce73a2a1656add24bd5210ebc4b8af49c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/ab4bb4ec3b36905ccf972c84f9aaa2bdd1153913",
-                "reference": "ab4bb4ec3b36905ccf972c84f9aaa2bdd1153913",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/e76f4bce73a2a1656add24bd5210ebc4b8af49c0",
+                "reference": "e76f4bce73a2a1656add24bd5210ebc4b8af49c0",
                 "shasum": ""
             },
             "require": {
@@ -1006,20 +1066,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2021-09-08T12:09:40+00:00"
+            "time": "2021-10-22T18:01:46+00:00"
         },
         {
             "name": "illuminate/database",
-            "version": "v8.61.0",
+            "version": "v8.69.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/database.git",
-                "reference": "acc11d6839ddb3b694bc6585177fa5141b70c693"
+                "reference": "43c7ffb6299ae55b000b286cf1278afd268ef29f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/database/zipball/acc11d6839ddb3b694bc6585177fa5141b70c693",
-                "reference": "acc11d6839ddb3b694bc6585177fa5141b70c693",
+                "url": "https://api.github.com/repos/illuminate/database/zipball/43c7ffb6299ae55b000b286cf1278afd268ef29f",
+                "reference": "43c7ffb6299ae55b000b286cf1278afd268ef29f",
                 "shasum": ""
             },
             "require": {
@@ -1033,7 +1093,7 @@
                 "symfony/console": "^5.1.4"
             },
             "suggest": {
-                "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6|^3.0).",
+                "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.2).",
                 "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
                 "illuminate/console": "Required to use the database commands (^8.0).",
                 "illuminate/events": "Required to use the observers with Eloquent (^8.0).",
@@ -1074,20 +1134,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2021-09-13T18:43:43+00:00"
+            "time": "2021-10-29T19:46:53+00:00"
         },
         {
             "name": "illuminate/events",
-            "version": "v8.61.0",
+            "version": "v8.69.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/events.git",
-                "reference": "7def78033f29cd0c0383513b27c291d233a7f90e"
+                "reference": "b7f06cafb6c09581617f2ca05d69e9b159e5a35d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/events/zipball/7def78033f29cd0c0383513b27c291d233a7f90e",
-                "reference": "7def78033f29cd0c0383513b27c291d233a7f90e",
+                "url": "https://api.github.com/repos/illuminate/events/zipball/b7f06cafb6c09581617f2ca05d69e9b159e5a35d",
+                "reference": "b7f06cafb6c09581617f2ca05d69e9b159e5a35d",
                 "shasum": ""
             },
             "require": {
@@ -1129,11 +1189,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2021-08-16T21:45:47+00:00"
+            "time": "2021-09-15T14:32:50+00:00"
         },
         {
             "name": "illuminate/macroable",
-            "version": "v8.61.0",
+            "version": "v8.69.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/macroable.git",
@@ -1179,7 +1239,7 @@
         },
         {
             "name": "illuminate/pipeline",
-            "version": "v8.61.0",
+            "version": "v8.69.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/pipeline.git",
@@ -1227,16 +1287,16 @@
         },
         {
             "name": "illuminate/support",
-            "version": "v8.61.0",
+            "version": "v8.69.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "b0a21c41163381dd9a5abbd68fe85ed7b4247d30"
+                "reference": "a8851b7001530d3c11626a81449ed9b63dd10db7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/b0a21c41163381dd9a5abbd68fe85ed7b4247d30",
-                "reference": "b0a21c41163381dd9a5abbd68fe85ed7b4247d30",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/a8851b7001530d3c11626a81449ed9b63dd10db7",
+                "reference": "a8851b7001530d3c11626a81449ed9b63dd10db7",
                 "shasum": ""
             },
             "require": {
@@ -1246,7 +1306,7 @@
                 "illuminate/collections": "^8.0",
                 "illuminate/contracts": "^8.0",
                 "illuminate/macroable": "^8.0",
-                "nesbot/carbon": "^2.31",
+                "nesbot/carbon": "^2.53.1",
                 "php": "^7.3|^8.0",
                 "voku/portable-ascii": "^1.4.8"
             },
@@ -1255,8 +1315,8 @@
             },
             "suggest": {
                 "illuminate/filesystem": "Required to use the composer class (^8.0).",
-                "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^1.3|^2.0).",
-                "ramsey/uuid": "Required to use Str::uuid() (^4.0).",
+                "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^1.3|^2.0.2).",
+                "ramsey/uuid": "Required to use Str::uuid() (^4.2.2).",
                 "symfony/process": "Required to use the composer class (^5.1.4).",
                 "symfony/var-dumper": "Required to use the dd function (^5.1.4).",
                 "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.2)."
@@ -1291,7 +1351,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2021-09-13T18:43:43+00:00"
+            "time": "2021-10-29T13:34:03+00:00"
         },
         {
             "name": "league/plates",
@@ -1490,16 +1550,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.53.1",
+            "version": "2.54.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "f4655858a784988f880c1b8c7feabbf02dfdf045"
+                "reference": "eed83939f1aed3eee517d03a33f5ec587ac529b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f4655858a784988f880c1b8c7feabbf02dfdf045",
-                "reference": "f4655858a784988f880c1b8c7feabbf02dfdf045",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/eed83939f1aed3eee517d03a33f5ec587ac529b5",
+                "reference": "eed83939f1aed3eee517d03a33f5ec587ac529b5",
                 "shasum": ""
             },
             "require": {
@@ -1510,6 +1570,7 @@
                 "symfony/translation": "^3.4 || ^4.0 || ^5.0"
             },
             "require-dev": {
+                "doctrine/dbal": "^2.0 || ^3.0",
                 "doctrine/orm": "^2.7",
                 "friendsofphp/php-cs-fixer": "^3.0",
                 "kylekatarnls/multi-tester": "^2.0",
@@ -1580,7 +1641,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-06T09:29:23+00:00"
+            "time": "2021-11-01T21:22:20+00:00"
         },
         {
             "name": "netresearch/jsonmapper",
@@ -1773,20 +1834,20 @@
         },
         {
             "name": "nette/utils",
-            "version": "v3.2.2",
+            "version": "v3.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "967cfc4f9a1acd5f1058d76715a424c53343c20c"
+                "reference": "9cd80396ca58d7969ab44fc7afcf03624dfa526e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/967cfc4f9a1acd5f1058d76715a424c53343c20c",
-                "reference": "967cfc4f9a1acd5f1058d76715a424c53343c20c",
+                "url": "https://api.github.com/repos/nette/utils/zipball/9cd80396ca58d7969ab44fc7afcf03624dfa526e",
+                "reference": "9cd80396ca58d7969ab44fc7afcf03624dfa526e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2 <8.1"
+                "php": ">=7.2 <8.2"
             },
             "conflict": {
                 "nette/di": "<3.0.6"
@@ -1852,9 +1913,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v3.2.2"
+                "source": "https://github.com/nette/utils/tree/v3.2.5"
             },
-            "time": "2021-03-03T22:53:25+00:00"
+            "time": "2021-09-20T10:50:11+00:00"
         },
         {
             "name": "pguardiario/phpuri",
@@ -1886,16 +1947,16 @@
         },
         {
             "name": "phan/phan",
-            "version": "5.0.0",
+            "version": "5.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phan/phan.git",
-                "reference": "f36b6b9a2f4143a25f35ce94d712ceb0527e9d90"
+                "reference": "d724bbb8fc3ba89179868bb5220ecdf6a9c1636b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phan/phan/zipball/f36b6b9a2f4143a25f35ce94d712ceb0527e9d90",
-                "reference": "f36b6b9a2f4143a25f35ce94d712ceb0527e9d90",
+                "url": "https://api.github.com/repos/phan/phan/zipball/d724bbb8fc3ba89179868bb5220ecdf6a9c1636b",
+                "reference": "d724bbb8fc3ba89179868bb5220ecdf6a9c1636b",
                 "shasum": ""
             },
             "require": {
@@ -1912,7 +1973,7 @@
                 "symfony/console": "^3.2|^4.0|^5.0",
                 "symfony/polyfill-mbstring": "^1.11.0",
                 "symfony/polyfill-php80": "^1.20.0",
-                "tysonandre/var_representation_polyfill": "^0.0.2"
+                "tysonandre/var_representation_polyfill": "^0.0.2|^0.1.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^8.5.0"
@@ -1959,9 +2020,9 @@
             ],
             "support": {
                 "issues": "https://github.com/phan/phan/issues",
-                "source": "https://github.com/phan/phan/tree/5.0.0"
+                "source": "https://github.com/phan/phan/tree/5.2.1"
             },
-            "time": "2021-08-01T18:17:28+00:00"
+            "time": "2021-09-15T00:08:40+00:00"
         },
         {
             "name": "php-extended/php-system",
@@ -2110,16 +2171,16 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.2.2",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
                 "shasum": ""
             },
             "require": {
@@ -2130,7 +2191,8 @@
                 "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "mockery/mockery": "~1.3.2"
+                "mockery/mockery": "~1.3.2",
+                "psalm/phar": "^4.8"
             },
             "type": "library",
             "extra": {
@@ -2160,22 +2222,22 @@
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
             "support": {
                 "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
             },
-            "time": "2020-09-03T19:13:55+00:00"
+            "time": "2021-10-19T17:43:47+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.4.0",
+            "version": "1.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
+                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae",
+                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae",
                 "shasum": ""
             },
             "require": {
@@ -2183,7 +2245,8 @@
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "*"
+                "ext-tokenizer": "*",
+                "psalm/phar": "^4.8"
             },
             "type": "library",
             "extra": {
@@ -2209,26 +2272,26 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1"
             },
-            "time": "2020-09-17T18:55:26+00:00"
+            "time": "2021-10-02T14:08:47+00:00"
         },
         {
             "name": "psr/container",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "php": ">=7.4.0"
             },
             "type": "library",
             "autoload": {
@@ -2257,9 +2320,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.1"
+                "source": "https://github.com/php-fig/container/tree/1.1.2"
             },
-            "time": "2021-03-05T17:36:06+00:00"
+            "time": "2021-11-05T16:50:12+00:00"
         },
         {
             "name": "psr/http-message",
@@ -2461,23 +2524,23 @@
         },
         {
             "name": "sabre/event",
-            "version": "5.1.2",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/event.git",
-                "reference": "c120bec57c17b6251a496efc82b732418b49d50a"
+                "reference": "d7da22897125d34d7eddf7977758191c06a74497"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/event/zipball/c120bec57c17b6251a496efc82b732418b49d50a",
-                "reference": "c120bec57c17b6251a496efc82b732418b49d50a",
+                "url": "https://api.github.com/repos/sabre-io/event/zipball/d7da22897125d34d7eddf7977758191c06a74497",
+                "reference": "d7da22897125d34d7eddf7977758191c06a74497",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "~2.16.1",
+                "friendsofphp/php-cs-fixer": "~2.17.1",
                 "phpstan/phpstan": "^0.12",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
             },
@@ -2523,80 +2586,7 @@
                 "issues": "https://github.com/sabre-io/event/issues",
                 "source": "https://github.com/fruux/sabre-event"
             },
-            "time": "2020-10-03T11:02:22+00:00"
-        },
-        {
-            "name": "scssphp/scssphp",
-            "version": "v1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/scssphp/scssphp.git",
-                "reference": "b83594e2323c5d6e80785df3f91b9d1d32aad530"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/b83594e2323c5d6e80785df3f91b9d1d32aad530",
-                "reference": "b83594e2323c5d6e80785df3f91b9d1d32aad530",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "ext-json": "*",
-                "php": ">=5.6.0"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4",
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4",
-                "sass/sass-spec": "*",
-                "squizlabs/php_codesniffer": "~3.5",
-                "symfony/phpunit-bridge": "^5.1",
-                "twbs/bootstrap": "~5.0",
-                "twbs/bootstrap4": "4.6.0",
-                "zurb/foundation": "~6.5"
-            },
-            "suggest": {
-                "ext-iconv": "Can be used as fallback when ext-mbstring is not available",
-                "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
-            },
-            "bin": [
-                "bin/pscss"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "ScssPhp\\ScssPhp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Anthon Pang",
-                    "email": "apang@softwaredevelopment.ca",
-                    "homepage": "https://github.com/robocoder"
-                },
-                {
-                    "name": "Cédric Morin",
-                    "email": "cedric@yterium.com",
-                    "homepage": "https://github.com/Cerdic"
-                }
-            ],
-            "description": "scssphp is a compiler for SCSS written in PHP.",
-            "homepage": "http://scssphp.github.io/scssphp/",
-            "keywords": [
-                "css",
-                "less",
-                "sass",
-                "scss",
-                "stylesheet"
-            ],
-            "support": {
-                "issues": "https://github.com/scssphp/scssphp/issues",
-                "source": "https://github.com/scssphp/scssphp/tree/v1.6.0"
-            },
-            "time": "2021-07-02T16:28:10+00:00"
+            "time": "2021-11-04T06:51:17+00:00"
         },
         {
             "name": "sergeytsalkov/meekrodb",
@@ -2648,16 +2638,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.3.6",
+            "version": "v5.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2"
+                "reference": "d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/51b71afd6d2dc8f5063199357b9880cea8d8bfe2",
-                "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2",
+                "url": "https://api.github.com/repos/symfony/console/zipball/d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3",
+                "reference": "d4e409d9fbcfbf71af0e5a940abb7b0b4bad0bd3",
                 "shasum": ""
             },
             "require": {
@@ -2727,7 +2717,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.3.6"
+                "source": "https://github.com/symfony/console/tree/v5.3.10"
             },
             "funding": [
                 {
@@ -2743,7 +2733,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-27T19:10:22+00:00"
+            "time": "2021-10-26T09:30:15+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -2814,16 +2804,16 @@
         },
         {
             "name": "symfony/lock",
-            "version": "v4.4.27",
+            "version": "v4.4.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/lock.git",
-                "reference": "6ca476d4ac992802f2a4043929f68f1818449486"
+                "reference": "567d29b1bc6e3937652054dafc069151d17824a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/6ca476d4ac992802f2a4043929f68f1818449486",
-                "reference": "6ca476d4ac992802f2a4043929f68f1818449486",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/567d29b1bc6e3937652054dafc069151d17824a9",
+                "reference": "567d29b1bc6e3937652054dafc069151d17824a9",
                 "shasum": ""
             },
             "require": {
@@ -2872,7 +2862,7 @@
                 "semaphore"
             ],
             "support": {
-                "source": "https://github.com/symfony/lock/tree/v4.4.27"
+                "source": "https://github.com/symfony/lock/tree/v4.4.33"
             },
             "funding": [
                 {
@@ -2888,7 +2878,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-23T15:41:52+00:00"
+            "time": "2021-10-05T20:27:01+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -3620,16 +3610,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.3.3",
+            "version": "v5.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1"
+                "reference": "d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
-                "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
+                "url": "https://api.github.com/repos/symfony/string/zipball/d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c",
+                "reference": "d70c35bb20bbca71fc4ab7921e3c6bda1a82a60c",
                 "shasum": ""
             },
             "require": {
@@ -3683,7 +3673,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.3.3"
+                "source": "https://github.com/symfony/string/tree/v5.3.10"
             },
             "funding": [
                 {
@@ -3699,20 +3689,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-27T11:44:38+00:00"
+            "time": "2021-10-27T18:21:46+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v5.3.7",
+            "version": "v5.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "4d595a6d15fd3a2c67f6f31d14d15d3b7356d7a6"
+                "reference": "6ef197aea2ac8b9cd63e0da7522b3771714035aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/4d595a6d15fd3a2c67f6f31d14d15d3b7356d7a6",
-                "reference": "4d595a6d15fd3a2c67f6f31d14d15d3b7356d7a6",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/6ef197aea2ac8b9cd63e0da7522b3771714035aa",
+                "reference": "6ef197aea2ac8b9cd63e0da7522b3771714035aa",
                 "shasum": ""
             },
             "require": {
@@ -3778,7 +3768,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v5.3.7"
+                "source": "https://github.com/symfony/translation/tree/v5.3.10"
             },
             "funding": [
                 {
@@ -3794,7 +3784,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-08-26T08:22:53+00:00"
+            "time": "2021-10-10T06:43:24+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -3876,16 +3866,16 @@
         },
         {
             "name": "tysonandre/var_representation_polyfill",
-            "version": "0.0.2",
+            "version": "0.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TysonAndre/var_representation_polyfill.git",
-                "reference": "3f17999ee1f257319ddc6721dd26ebbc5d175f33"
+                "reference": "0a942e74e18af5514749895507bc6ca7ab96399a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TysonAndre/var_representation_polyfill/zipball/3f17999ee1f257319ddc6721dd26ebbc5d175f33",
-                "reference": "3f17999ee1f257319ddc6721dd26ebbc5d175f33",
+                "url": "https://api.github.com/repos/TysonAndre/var_representation_polyfill/zipball/0a942e74e18af5514749895507bc6ca7ab96399a",
+                "reference": "0a942e74e18af5514749895507bc6ca7ab96399a",
                 "shasum": ""
             },
             "require": {
@@ -3896,6 +3886,9 @@
                 "phan/phan": "^4.0",
                 "phpunit/phpunit": "^8.5.0"
             },
+            "suggest": {
+                "ext-var_representation": "*"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -3914,16 +3907,16 @@
                     "name": "Tyson Andre"
                 }
             ],
-            "description": "Polyfill for var_representation",
+            "description": "Polyfill for var_representation: convert a variable to a string in a way that fixes the shortcomings of var_export",
             "keywords": [
                 "var_export",
                 "var_representation"
             ],
             "support": {
                 "issues": "https://github.com/TysonAndre/var_representation_polyfill/issues",
-                "source": "https://github.com/TysonAndre/var_representation_polyfill/tree/0.0.2"
+                "source": "https://github.com/TysonAndre/var_representation_polyfill/tree/0.1.1"
             },
-            "time": "2021-06-26T18:55:02+00:00"
+            "time": "2021-08-16T00:12:50+00:00"
         },
         {
             "name": "vlucas/valitron",
@@ -4181,7 +4174,7 @@
     "platform": [],
     "platform-dev": [],
     "platform-overrides": {
-        "php": "7.4"
+        "php": "8.0"
     },
     "plugin-api-version": "2.0.0"
 }

css/config.css

@@ -2,7 +2,7 @@
 body {
     color: white;
     background-color: black;
-    font-family: '맑은 고딕';
+    font-family: 'Pretendard';
 }
 
 table {
@@ -14,10 +14,9 @@ table {
     border-right-color: black;
     border-bottom-color: black;
     padding: 0px;
-    font-size: 13px;
+    font-size: 14px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕';
 }
 
 th,
@@ -30,10 +29,9 @@ td {
     border-right-color: black;
     border-bottom-color: black;
     padding: 0px;
-    font-size: 13px;
+    font-size: 14px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕';
 }
 
 a.just_link {
@@ -70,11 +68,9 @@ a.just_link {
     border-right-color: black;
     border-bottom-color: black;
     padding: 0px;
-    font-size: 13px;
+    font-size: 14px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕';
-    ;
 }
 
 .obj_fill {
@@ -87,8 +83,7 @@ button.with_skin {
     padding: 0 4px;
     background-color: black;
     color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
+    font-size: 14px;
 }
 
 button.with_skin:disabled {
@@ -98,8 +93,7 @@ button.with_skin:disabled {
 input.with_skin {
     background-color: black;
     color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
+    font-size: 14px;
 }
 
 input.with_skin:disabled {
@@ -111,7 +105,7 @@ input.with_skin:disabled {
 }
 
 .font1 {
-    font-size: 13px;
+    font-size: 14px;
 }
 
 .font2 {

css/install.css

@@ -7,10 +7,10 @@ body, html{
     margin-top: 70px;
 }
 
-h1.title { 
+h1.title {
    font-size: 50px;
-   font-family: 'Passion One', cursive; 
-   font-weight: 400; 
+   font-family: 'Pretendard', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic';
+   font-weight: 400;
 }
 
 hr{

css/join.css

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

f_config/config.php

@@ -15,35 +15,35 @@ ini_set("session.gc_maxlifetime", '604800');    // seconds
 function getFriendlyErrorType($type)
 {
     switch ($type) {
-        case E_ERROR: // 1 // 
+        case E_ERROR: // 1 //
             return 'E_ERROR';
-        case E_WARNING: // 2 // 
+        case E_WARNING: // 2 //
             return 'E_WARNING';
-        case E_PARSE: // 4 // 
+        case E_PARSE: // 4 //
             return 'E_PARSE';
-        case E_NOTICE: // 8 // 
+        case E_NOTICE: // 8 //
             return 'E_NOTICE';
-        case E_CORE_ERROR: // 16 // 
+        case E_CORE_ERROR: // 16 //
             return 'E_CORE_ERROR';
-        case E_CORE_WARNING: // 32 // 
+        case E_CORE_WARNING: // 32 //
             return 'E_CORE_WARNING';
-        case E_COMPILE_ERROR: // 64 // 
+        case E_COMPILE_ERROR: // 64 //
             return 'E_COMPILE_ERROR';
-        case E_COMPILE_WARNING: // 128 // 
+        case E_COMPILE_WARNING: // 128 //
             return 'E_COMPILE_WARNING';
-        case E_USER_ERROR: // 256 // 
+        case E_USER_ERROR: // 256 //
             return 'E_USER_ERROR';
-        case E_USER_WARNING: // 512 // 
+        case E_USER_WARNING: // 512 //
             return 'E_USER_WARNING';
-        case E_USER_NOTICE: // 1024 // 
+        case E_USER_NOTICE: // 1024 //
             return 'E_USER_NOTICE';
-        case E_STRICT: // 2048 // 
+        case E_STRICT: // 2048 //
             return 'E_STRICT';
-        case E_RECOVERABLE_ERROR: // 4096 // 
+        case E_RECOVERABLE_ERROR: // 4096 //
             return 'E_RECOVERABLE_ERROR';
-        case E_DEPRECATED: // 8192 // 
+        case E_DEPRECATED: // 8192 //
             return 'E_DEPRECATED';
-        case E_USER_DEPRECATED: // 16384 // 
+        case E_USER_DEPRECATED: // 16384 //
             return 'E_USER_DEPRECATED';
     }
     return "{$type}";
@@ -134,7 +134,7 @@ function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, in
         getExceptionTraceAsString($e)
     );
 }
-set_error_handler("\sammo\logErrorByCustomHandler");
+set_error_handler("\\sammo\\logErrorByCustomHandler");
 
 
 function logExceptionByCustomHandler(\Throwable $e)
@@ -151,3 +151,28 @@ function logExceptionByCustomHandler(\Throwable $e)
     throw $e;
 }
 set_exception_handler('\\sammo\\logExceptionByCustomHandler');
+
+function getAPIExecutorClass($path){
+
+    static $basePath = __NAMESPACE__.'\\API\\';
+    if(is_string($path)){
+    }
+    else if(is_array($path)){
+        $path = join('\\', $path);
+    }
+    else{
+        throw new \InvalidArgumentException("{$path}는 올바른 API 지시자가 아님");
+    }
+
+    $classPath = str_replace('/', '\\', $basePath.$path);
+
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+    throw new \InvalidArgumentException("{$path}는 올바른 API 경로가 아님");
+}
+
+function buildAPIExecutorClass($type, string $rootPath, array $args):\sammo\BaseAPI{
+    $class = getAPIExecutorClass($type);
+    return new $class($rootPath, $args);
+}

f_install/install.php

@@ -1,199 +1,191 @@
 <?php
+
 namespace sammo;
 
-require(__DIR__.'/../vendor/autoload.php');
+require(__DIR__ . '/../vendor/autoload.php');
 
 ?>
 <!DOCTYPE html>
 <html lang="ko">
+
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>설치</title>
-    <?=WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?=WebUtil::printJS('../dist_js/vendors.js') ?>
-    <?=WebUtil::printJS('../dist_js/install.js')?>
-    <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-    <?=WebUtil::printCSS('../css/install.css')?>
+    <?php /* NOTE: 설치 이전에는 ServConfig가 준비되어있지 않으므로 예외로 수동 지정 */ ?>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/vendors.js') ?>
+    <?= WebUtil::printCSS('../dist_js/gateway/vendor.css') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/common_ts.js') ?>
+    <?= WebUtil::printCSS('../dist_js/gateway/common_ts.css') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/install.js') ?>
+    <?= WebUtil::printCSS('../dist_js/gateway/install.css') ?>
+
+    <?= WebUtil::printCSS('../css/install.css') ?>
+
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
     <div class="container">
         <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 설치</h1>
         <div class="row justify-content-md-center">
 
-        <div class="col col-12 col-md-10 col-lg-7">
-        <div class="card" id="db_form_card" style="display:none">
-            <h3 class="card-header">
-                설치(DB 설정)
-            </h3>
-            <div class="card-body">
-                <form id="db_form" method="post" action="#">
-                    <div class="form-group row">
-                        <label for="db_host" class="col-sm-4 col-form-label">DB호스트</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="db_host" id="db_host"
-                             placeholder="호스트" value="localhost" />
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="db_port" class="col-sm-4 col-form-label">DB포트</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="db_port" id="db_port"
-                             placeholder="접속 포트" value="3306" />
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="db_id" class="col-sm-4 col-form-label">DB계정명</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="db_id" id="db_id"  placeholder="DB계정"/>
-                        </div>
-                    </div>
-
-
-                    <div class="form-group row">
-                        <label for="db_pw" class="col-sm-4 col-form-label">DB비밀번호</label>
-                        <div class="col-sm-8">
-                            <input type="password" class="form-control" name="db_pw" id="db_pw"
-                             placeholder="DB비밀번호"/>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="db_name" class="col-sm-4 col-form-label">DB명</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="db_name" id="db_name"
-                             placeholder="DB명(예:sammo)"/>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="serv_host" class="col-sm-4 col-form-label">접속 경로</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="serv_host" id="serv_host"
-                            placeholder="접속경로(예:http://www.example.com)"/>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="shared_icon_path" class="col-sm-4 col-form-label">공용 아이콘 주소</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="shared_icon_path" id="shared_icon_path"
-                            placeholder="공용 아이콘 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)"
-                            value="../image/icons" />
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="game_image_path" class="col-sm-4 col-form-label">게임 이미지 주소</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="game_image_path" id="game_image_path"
-                            placeholder="게임 이미지 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)"
-                            value="../image/game" />
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="image_request_key" class="col-sm-4 col-form-label">이미지 갱신 키</label>
-                        <div class="input-group col-sm-8">
-                            <input type="text" class="form-control" name="image_request_key" id="image_request_key"
-                            placeholder="이미지 서버의 hook/HashKey.php의 값과 동일하게"
-                            value="" />
-                            <div class="input-group-append">
-                                <button id="btn_random_generate_key" class="btn btn-secondary" type="button">랜덤 생성</button>
+            <div class="col col-12 col-md-10 col-lg-7">
+                <div class="card" id="db_form_card" style="display:none">
+                    <h3 class="card-header">
+                        설치(DB 설정)
+                    </h3>
+                    <div class="card-body">
+                        <form id="db_form" method="post" action="#">
+                            <div class="form-group row">
+                                <label for="db_host" class="col-sm-4 col-form-label">DB호스트</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="db_host" id="db_host" placeholder="호스트" value="localhost" />
+                                </div>
                             </div>
-                        </div>
-                    </div>
 
-                    <hr style="width:100%; border-top: 1px solid lightgray;">
+                            <div class="form-group row">
+                                <label for="db_port" class="col-sm-4 col-form-label">DB포트</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="db_port" id="db_port" placeholder="접속 포트" value="3306" />
+                                </div>
+                            </div>
 
-                    <div class="form-group row">
-                        <label for="kakao_rest_key" class="col-sm-4 col-form-label">카카오 API Rest Key</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="kakao_rest_key" id="kakao_rest_key"
-                            placeholder="카카오톡 API의 Rest Key"
-                            value="" />
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label for="db_id" class="col-sm-4 col-form-label">DB계정명</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="db_id" id="db_id" placeholder="DB계정" />
+                                </div>
+                            </div>
 
-                    <div class="form-group row">
-                        <label for="kakao_admin_key" class="col-sm-4 col-form-label">카카오 API Admin Key</label>
-                        <div class="col-sm-8">
-                            <input type="text" class="form-control" name="kakao_admin_key" id="kakao_admin_key"
-                            placeholder="카카오톡 API의 Admin Key"
-                            value="" />
-                        </div>
-                    </div>
 
-                    <div class="form-group row">
-                        <div class="col-sm-4"></div>
-                        <div class="col-sm-8">
-                            <button type="submit"
-                            class="btn btn-primary btn-lg btn-block login-button">설정 파일 생성</button>
-                        </div>
+                            <div class="form-group row">
+                                <label for="db_pw" class="col-sm-4 col-form-label">DB비밀번호</label>
+                                <div class="col-sm-8">
+                                    <input type="password" class="form-control" name="db_pw" id="db_pw" placeholder="DB비밀번호" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="db_name" class="col-sm-4 col-form-label">DB명</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="db_name" id="db_name" placeholder="DB명(예:sammo)" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="serv_host" class="col-sm-4 col-form-label">접속 경로</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="serv_host" id="serv_host" placeholder="접속경로(예:http://www.example.com)" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="shared_icon_path" class="col-sm-4 col-form-label">공용 아이콘 주소</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="shared_icon_path" id="shared_icon_path" placeholder="공용 아이콘 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)" value="../image/icons" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="game_image_path" class="col-sm-4 col-form-label">게임 이미지 주소</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="game_image_path" id="game_image_path" placeholder="게임 이미지 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)" value="../image/game" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="image_request_key" class="col-sm-4 col-form-label">이미지 갱신 키</label>
+                                <div class="input-group col-sm-8">
+                                    <input type="text" class="form-control" name="image_request_key" id="image_request_key" placeholder="이미지 서버의 hook/HashKey.php의 값과 동일하게" value="" />
+                                    <div class="input-group-text">
+                                        <button id="btn_random_generate_key" class="btn btn-secondary" type="button">랜덤 생성</button>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <hr style="width:100%; border-top: 1px solid lightgray;">
+
+                            <div class="form-group row">
+                                <label for="kakao_rest_key" class="col-sm-4 col-form-label">카카오 API Rest Key</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="kakao_rest_key" id="kakao_rest_key" placeholder="카카오톡 API의 Rest Key" value="" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="kakao_admin_key" class="col-sm-4 col-form-label">카카오 API Admin Key</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="kakao_admin_key" id="kakao_admin_key" placeholder="카카오톡 API의 Admin Key" value="" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <div class="col-sm-4"></div>
+                                <div class="col-sm-8">
+                                    <button type="submit" class="btn btn-primary btn-lg btn-block login-button">설정 파일 생성</button>
+                                </div>
+                            </div>
+                        </form>
                     </div>
-                </form>
+                </div>
+                <!--DB 폼 끝-->
+
+                <div class="card" id="admin_form_card" style="display:none">
+                    <h3 class="card-header">
+                        설치(관리자 생성)
+                    </h3>
+                    <div class="card-body">
+                        <form id="admin_form" method="post" action="#">
+                            <div class="form-group row">
+                                <label for="username" class="col-sm-3 col-form-label">계정명</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control" name="username" id="username" placeholder="계정명" />
+                                </div>
+                            </div>
+
+
+                            <div class="form-group row">
+                                <label for="password" class="col-sm-3 col-form-label">비밀번호</label>
+                                <div class="col-sm-9">
+                                    <input type="password" class="form-control" name="password" id="password" placeholder="비밀번호" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="confirm_password" class="col-sm-3 col-form-label">비밀번호 확인</label>
+                                <div class="col-sm-9">
+                                    <input type="password" class="form-control" name="confirm_password" id="confirm_password" placeholder="비밀번호 확인" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="nickname" class="col-sm-3 col-form-label">닉네임</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control" name="nickname" id="nickname" placeholder="닉네임" value="운영자" />
+                                </div>
+                            </div>
+
+                            <input type="hidden" id="global_salt" name="global_salt">
+
+                            <div class="form-group row">
+                                <div class="col-sm-3"></div>
+                                <div class="col-sm-9">
+                                    <button type="submit" class="btn btn-primary btn-lg btn-block login-button">관리자 계정 생성</button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+                <!--ADMIN 폼 끝-->
+
+                <!-- TODO: conf_kakao.php -->
+
             </div>
-        </div><!--DB 폼 끝-->
-
-        <div class="card" id="admin_form_card" style="display:none">
-            <h3 class="card-header">
-                설치(관리자 생성)
-            </h3>
-            <div class="card-body">
-                <form id="admin_form" method="post" action="#">
-                    <div class="form-group row">
-                        <label for="username" class="col-sm-3 col-form-label">계정명</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="username" id="username"
-                              placeholder="계정명"/>
-                        </div>
-                    </div>
-
-
-                    <div class="form-group row">
-                        <label for="password" class="col-sm-3 col-form-label">비밀번호</label>
-                        <div class="col-sm-9">
-                            <input type="password" class="form-control" name="password" id="password"
-                             placeholder="비밀번호"/>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="confirm_password" class="col-sm-3 col-form-label">비밀번호 확인</label>
-                        <div class="col-sm-9">
-                            <input type="password" class="form-control" name="confirm_password" id="confirm_password"
-                             placeholder="비밀번호 확인"/>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="nickname" class="col-sm-3 col-form-label">닉네임</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="nickname" id="nickname"
-                             placeholder="닉네임" value="운영자"/>
-                        </div>
-                    </div>
-
-                    <input type="hidden" id="global_salt" name="global_salt">
-
-                    <div class="form-group row">
-                        <div class="col-sm-3"></div>
-                        <div class="col-sm-9">
-                            <button type="submit"
-                             class="btn btn-primary btn-lg btn-block login-button">관리자 계정 생성</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div><!--ADMIN 폼 끝-->
-
-        <!-- TODO: conf_kakao.php -->
-
-        </div>
         </div>
     </div>
 </body>
-</html>
+
+</html>

f_install/sql/common_schema.sql

@@ -58,7 +58,7 @@ CREATE TABLE `member_log` (
 	INDEX `action` (`member_no`, `action_type`, `date`),
 	INDEX `member` (`member_no`, `date`)
 )
-ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+ENGINE=Aria DEFAULT CHARSET=utf8mb4;
 
 ###################
 # KV storage
@@ -72,4 +72,19 @@ CREATE TABLE if not exists `storage` (
 	UNIQUE INDEX `key` (`namespace`, `key`)
 )
 COLLATE='utf8mb4_general_ci'
-ENGINE=MyISAM
+ENGINE=Aria;
+
+CREATE TABLE `login_token` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`user_id` INT(11) NOT NULL,
+	`base_token` VARCHAR(20) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`reg_ip` VARCHAR(40) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`reg_date` DATETIME NOT NULL,
+	`expire_date` DATETIME NOT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE INDEX `by_token` (`base_token`),
+	INDEX `by_date` (`user_id`, `expire_date`)
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE=Aria
+;

f_install/templates/RootDB.orig.php

@@ -10,6 +10,7 @@ use Illuminate\Container\Container;
 class RootDB
 {
     private static $uDB = null;
+    private static ?Capsule $uIlluminate = null;
 
     private static $host = '_tK_host_';
     private static $user = '_tK_user_';

hwe/_119.php

@@ -24,7 +24,8 @@ $plock = $db->queryFirstField('SELECT plock FROM plock');
 <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')?>
+<?= WebUtil::printDist('ts', 'common', true) ?>
+<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
     <form action=_119_b.php method=post>
@@ -35,4 +36,3 @@ $plock = $db->queryFirstField('SELECT plock FROM plock');
     </form>
 </body>
 </html>
-

hwe/_admin1.php

@@ -22,7 +22,8 @@ $admin = getAdmin();
 <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')?>
+<?= WebUtil::printDist('ts', 'common', true) ?>
+<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
 <table align=center width=1000 class="tb_layout bg0">

hwe/_admin2.php

@@ -23,7 +23,8 @@ $db = DB::db();
     <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') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 
 <body>
@@ -50,7 +51,7 @@ $db = DB::db();
                     <?php
 
                     echo "
-            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:13px'>";
+            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>";
                     $generalList = $db->query('SELECT `no`, `name`, npc, `block` FROM general ORDER BY npc, binary(`name`)');
 
                     foreach ($generalList as $general) {
@@ -73,7 +74,7 @@ $db = DB::db();
         </td>
         <td width=100 align=center>아이템 지급</td>
         <td width=504>
-            <select name=weapon size=1 style='color:white;background-color:black;font-size:13px'>";
+            <select name=weapon size=1 style='color:white;background-color:black;font-size:14px'>";
                     foreach (GameConst::$allItems as $itemCategories) {
                         foreach ($itemCategories as $item => $cnt) {
                             if ($cnt == 0) {

hwe/_admin2_submit.php

@@ -342,6 +342,7 @@ switch ($btn) {
         }
         break;
     case "랜덤턴":
+        $turnterm = $gameStor->turnterm;
         foreach ($genlist as $generalID) {
             $turntime = getRandTurn($turnterm);
             $db->update('general', [

hwe/_admin4.php

@@ -23,8 +23,9 @@ $ipGroupList = Util::arrayGroupBy(
     'ip_c'
 );
 
-function colorBlockedName($general){
-    if(!$general['blocked']){
+function colorBlockedName($general)
+{
+    if (!$general['blocked']) {
         return $general['name'];
     }
     return "<span style='color:magenta;'>{$general['name']}</span>";
@@ -40,7 +41,8 @@ function colorBlockedName($general){
     <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') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 
 <body>
@@ -61,7 +63,7 @@ function colorBlockedName($general){
                     <?php
 
                     echo "
-            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:13px'>";
+            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>";
 
                     foreach ($db->query('SELECT no,name,npc,block,con from general where ip!=\'\' order by npc,ip') as $general) {
                         $style = "style=;";
@@ -106,15 +108,15 @@ function colorBlockedName($general){
                 <td align=center width=180>최근로그인</td>
                 <td align=center width=129>IP</td>
                 <td align=center width=100>ID</td>
-            </tr>    
-<?php foreach($ipGroupList as $ipGroupC=>$users): ?>
-    <tr>
-        <td><?=join('<br>',array_map('\sammo\colorBlockedName', $users))?></td>
-        <td><?=join('<br>',array_column($users, 'lastconnect'))?></td>
-        <td><?=join('<br>',array_column($users, 'ip'))?></td>
-        <td><?=join('<br>',array_column($users, 'owner'))?></td>
-    </tr>
-<?php endforeach; ?>
+            </tr>
+            <?php foreach ($ipGroupList as $ipGroupC => $users) : ?>
+                <tr>
+                    <td><?= join('<br>', array_map('\sammo\colorBlockedName', $users)) ?></td>
+                    <td><?= join('<br>', array_column($users, 'lastconnect')) ?></td>
+                    <td><?= join('<br>', array_column($users, 'ip')) ?></td>
+                    <td><?= join('<br>', array_column($users, 'owner')) ?></td>
+                </tr>
+            <?php endforeach; ?>
         </table>
         <?php
         //NOTE: password의 md5 해시가 같은지 확인하는 방식으로는 앞으로 잡아낼 수 없다. 폐기

hwe/_admin5.php

@@ -39,7 +39,8 @@ $sel2[$type2] = "selected";
     <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') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 
 <body>
@@ -211,7 +212,7 @@ GROUP BY B.nation
                 $query .= " order by avg(B.dex5) desc";
                 break;
         }
-        foreach($db->query($query) as $nation){
+        foreach ($db->query($query) as $nation) {
             $gen = $db->queryFirstRow('SELECT COUNT(*) as cnt,
             ROUND(AVG(gold)) as avgg,
             ROUND(AVG(rice)) as avgr,
@@ -220,7 +221,7 @@ GROUP BY B.nation
                                     ROUND(AVG(intel), 1) as avgi,
                                     ROUND(AVG(explevel), 1) as avge,
             SUM(crew) as crew
-from general where nation=%i',$nation['nation']);
+from general where nation=%i', $nation['nation']);
 
             $city = $db->queryFirstRow('SELECT COUNT(*) as cnt,
             SUM(pop) as pop,    SUM(pop_max) as pop_max,
@@ -311,7 +312,7 @@ from city where nation=%i', $nation['nation']);
             ?>
         </tr>
         <?php
-        foreach($db->query('SELECT * from statistic where month=1 or no=1') as $stat){
+        foreach ($db->query('SELECT * from statistic where month=1 or no=1') as $stat) {
             echo "
     <tr>
         <td align=center>{$stat['year']}</td>

hwe/_admin7.php

@@ -86,7 +86,8 @@ $generalObj = General::createGeneralObjFromDB($gen);
     <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') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 
 <body>

hwe/_admin8.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -25,75 +26,97 @@ $sel[$type] = "selected";
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
-<title>외교정보</title>
-<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')?>
+    <title>외교정보</title>
+    <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::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>외 교 정 보<br><?=closeButton()?></td></tr>
-    <tr><td>
-        <form name=form1 method=post>
-        정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[0]??''?> value=0>상태</option>
-        </select>
-        <input type=submit name=btn value='정렬하기'>
-        </form>
-    </td></tr>
-</table>
-<table width=1000 align=center class='tb_layout bg0'>
-    <tr><td colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>외 교 정 보<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>
+                    정렬순서 :
+                    <select name=type size=1>
+                        <option <?= $sel[0] ?? '' ?> value=0>상태</option>
+                    </select>
+                    <input type=submit name=btn value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <table width=1000 align=center class='tb_layout bg0'>
+        <tr>
+            <td colspan=9 align=center bgcolor=blue>외 교 관 계</td>
+        </tr>
+        <tr>
+            <td width=130 align=center class='bg1'>국 가 명</td>
+            <td width=130 align=center class='bg1'>국 가 명</td>
+            <td width=80 align=center class='bg1'>상 태</td>
+            <td width=60 align=center class='bg1'>기 간</td>
+        </tr>
+        <?php
+
+        $nationName = [];
+        $nationColor = [];
+        foreach (getAllNationStaticInfo() as $nation) {
+            $nationName[$nation['nation']] = $nation['name'];
+            $nationColor[$nation['nation']] = $nation['color'];
+        }
+
+
+        foreach ($db->query('SELECT * from diplomacy where me < you order by state desc') as $dip) {
+            $me = $dip['me'];
+            $you = $dip['you'];
+
+            if ($dip['state'] == 2) {
+                continue;
+            }
+
+            switch ($dip['state']) {
+                case 0:
+                    $state = "<font color=red>교 전</font>";
+                    break;
+                case 1:
+                    $state = "<font color=magenta>선포중</font>";
+                    break;
+                case 2:
+                    $state = "통 상";
+                    break;
+                case 7:
+                    $state = "<font color=green>불가침</font>";
+                    break;
+            }
+
+            $date = TimeUtil::now();
+
+            echo "
     <tr>
-        <td width=130 align=center class='bg1'>국 가 명</td>
-        <td width=130 align=center class='bg1'>국 가 명</td>
-        <td width=80  align=center class='bg1'>상 태</td>
-        <td width=60  align=center class='bg1'>기 간</td>
-    </tr>
-<?php
-
-$nationName = [];
-$nationColor = [];
-foreach (getAllNationStaticInfo() as $nation) {
-    $nationName[$nation['nation']] = $nation['name'];
-    $nationColor[$nation['nation']] = $nation['color'];
-}
-
-
-foreach($db->query('SELECT * from diplomacy where me < you order by state desc') as $dip){
-    $me = $dip['me'];
-    $you = $dip['you'];
-
-    if ($dip['state'] == 2) {
-        continue;
-    }
-
-    switch ($dip['state']) {
-        case 0: $state = "<font color=red>교 전</font>"; break;
-        case 1: $state = "<font color=magenta>선포중</font>"; break;
-        case 2: $state = "통 상"; break;
-        case 7: $state = "<font color=green>불가침</font>"; break;
-    }
-
-    $date = TimeUtil::now();
-
-    echo "
-    <tr>
-        <td align=center style=color:".newColor($nationColor[$me]).";background-color:{$nationColor[$me]};>$nationName[$me]</td>
-        <td align=center style=color:".newColor($nationColor[$you]).";background-color:{$nationColor[$you]};>$nationName[$you]</td>
+        <td align=center style=color:" . newColor($nationColor[$me]) . ";background-color:{$nationColor[$me]};>$nationName[$me]</td>
+        <td align=center style=color:" . newColor($nationColor[$you]) . ";background-color:{$nationColor[$you]};>$nationName[$you]</td>
         <td align=center>$state</td>
         <td align=center>{$dip['term']} 개월</td>
     </tr>";
-}
-?>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+        }
+        ?>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>

hwe/_admin_force_rehall.php

@@ -26,5 +26,7 @@ foreach ($db->queryFirstColumn(
 }
 
 foreach(General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
-    $genObj->mergeTotalInheritancePoint();
+    $genObj->mergeTotalInheritancePoint(true);
+    applyInheritanceUser($genObj->getVar('owner'));
+    $genObj->clearInheritancePoint();
 }

hwe/a_bestGeneral.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -14,325 +15,369 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("명장일람", 1);
-$templates = new \League\Plates\Engine(__DIR__.'/templates');
+$templates = new \League\Plates\Engine(__DIR__ . '/templates');
 
 ?>
 <!DOCTYPE html>
 <html>
 
 <head>
-<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('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
+    <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('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printCSS('css/hallOfFame.css') ?>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('ts', 'common') ?>
 </head>
 
 <body>
-<table align=center width=1100 class='tb_layout bg0'>
-    <tr><td>명 장 일 람<br><?=closeButton()?></td></tr>
-</table>
-<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='유저 보기'>
-        <input type=submit name=btn value='NPC 보기'>
-    </td></tr>
-</form>
-</table>
-<div style="margin:auto;width:1100px;">
-<?php
+    <table align=center width=1100 class='tb_layout bg0'>
+        <tr>
+            <td>명 장 일 람<br><?= closeButton() ?></td>
+        </tr>
+    </table>
+    <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='유저 보기'>
+                    <input type=submit name=btn value='NPC 보기'>
+                </td>
+            </tr>
+        </form>
+    </table>
+    <div style="margin:auto;width:1100px;">
+        <?php
 
-$ownerNameList = [];
-if($gameStor->isunited){
-    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
-        $ownerNameList[$ownerID] = $ownerName;
-    }
-}
-
-$nationName = [0=>'재야'];
-$nationColor = [0=>'#000000'];
-foreach (getAllNationStaticInfo() as $nation) {
-    $nationName[$nation['nation']] = $nation['name'];
-    $nationColor[$nation['nation']] = $nation['color'];
-}
-
-$types = [
-    ["명 성", "int", function($v){$v['value'] = $v['experience']; return $v; }],
-    ["계 급", "int", function($v){$v['value'] = $v['dedication']; return $v; }],
-    ["계 략 성 공", "int", function($v) use ($gameStor){
-        $v['value'] = $v['firenum'];
-        if($gameStor->isunited){
-            return $v;
-        }
-        $v['nationName'] = '???';
-        $v['pictureFullPath'] = GetImageURL(0)."/default.jpg";
-        $v['name'] = '???';
-        $v['ownerName'] = null;
-        $v['bgColor'] = GameConst::$basecolor4;
-        $v['fgColor'] = newColor($v['bgColor']);
-        return $v;
-    }],
-    ["전 투 횟 수", "int", function($v){$v['value'] = $v['warnum']; return $v; }],
-    ["승 리", "int", function($v){$v['value'] = $v['killnum']; return $v; }],
-    ["승 률", "percent", function($v){
-        if($v['warnum'] < 10){
-            $v['value'] = 0;
-        }
-        else{
-            $v['value'] = $v['killnum'] / max(1, $v['warnum']);
-        }
-        return $v;
-    }],
-    ["점 령", "int", function($v){$v['value'] = $v['occupied']; return $v; }],
-    ["사 살", "int", function($v){$v['value'] = $v['killcrew']; return $v; }],
-    ["살 상 률", "percent", function($v){
-        if($v['warnum'] < 10){
-            $v['value'] = 0;
-        }
-        else{
-            $v['value'] = $v['killcrew'] / max(1, $v['deathcrew']);
-        }
-        return $v;
-    }],
-    ["대 인 사 살", "int", function($v){$v['value'] = $v['killcrew_person']; return $v; }],
-    ["대 인 살 상 률", "percent", function($v){
-        if($v['warnum'] < 10){
-            $v['value'] = 0;
-        }
-        else{
-            $v['value'] = $v['killcrew_person'] / max(1, $v['deathcrew_person']);
-        }
-        return $v;
-    }],
-    ["보 병 숙 련 도", "int", function($v){$v['value'] = $v['dex1']; return $v; }],
-    ["궁 병 숙 련 도", "int", function($v){$v['value'] = $v['dex2']; return $v; }],
-    ["기 병 숙 련 도", "int", function($v){$v['value'] = $v['dex3']; return $v; }],
-    ["귀 병 숙 련 도", "int", function($v){$v['value'] = $v['dex4']; return $v; }],
-    ["차 병 숙 련 도", "int", function($v){$v['value'] = $v['dex5']; return $v; }],
-    ["전 력 전 승 률", "percent", function($v){
-        $totalCnt = $v['ttw']+$v['ttd']+$v['ttl'];
-        if($totalCnt < 50){
-            $v['value'] = 0;
-        }
-        else{
-            $v['value'] = $v['ttw']/max(1, $totalCnt);
-        }
-        return $v;
-    }],
-    ["통 솔 전 승 률", "percent", function($v){
-        $totalCnt = $v['tlw']+$v['tld']+$v['tll'];
-        if($totalCnt < 50){
-            $v['value'] = 0;
-        }
-        else{
-            $v['value'] = $v['tlw']/max(1, $totalCnt);
-        }
-        return $v;
-    }],
-    ["일 기 토 승 률", "percent", function($v){
-        $totalCnt = $v['tsw']+$v['tsd']+$v['tsl'];
-        if($totalCnt < 50){
-            $v['value'] = 0;
-        }
-        else{
-            $v['value'] = $v['tsw']/max(1, $totalCnt);
-        }
-        return $v;
-    }],
-    ["설 전 승 률", "percent", function($v){
-        $totalCnt = $v['tiw']+$v['tid']+$v['til'];
-        if($totalCnt < 50){
-            $v['value'] = 0;
-        }
-        else{
-            $v['value'] = $v['tiw']/max(1, $totalCnt);
+        $ownerNameList = [];
+        if ($gameStor->isunited) {
+            foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+                $ownerNameList[$ownerID] = $ownerName;
+            }
         }
 
-        return $v;
-    }],
-    ["베 팅 투 자 액", "int", function($v){$v['value'] = $v['betgold']; return $v; }],
-    ["베 팅 당 첨", "int", function($v){$v['value'] = $v['betwin']; return $v; }],
-    ["베 팅 수 익 금", "int", function($v){$v['value'] = $v['betwingold']; return $v; }],
-    ["베 팅 수 익 률", "percent", function($v){
-        if($v['betgold'] < GameConst::$defaultGold){
-            $v['value'] = 0;
+        $nationName = [0 => '재야'];
+        $nationColor = [0 => '#000000'];
+        foreach (getAllNationStaticInfo() as $nation) {
+            $nationName[$nation['nation']] = $nation['name'];
+            $nationColor[$nation['nation']] = $nation['color'];
         }
-        else{
-            $v['value'] = $v['betwingold']/max(1, $v['betgold']);
-        }
-        return $v;
-    }],
-];
 
-$generals = [];
-foreach($db->query(
-    "SELECT nation,no,name,owner_name as ownerName, owner, picture, imgsvr,
+        $types = [
+            ["명 성", "int", function ($v) {
+                $v['value'] = $v['experience'];
+                return $v;
+            }],
+            ["계 급", "int", function ($v) {
+                $v['value'] = $v['dedication'];
+                return $v;
+            }],
+            ["계 략 성 공", "int", function ($v) use ($gameStor) {
+                $v['value'] = $v['firenum'];
+                if ($gameStor->isunited) {
+                    return $v;
+                }
+                $v['nationName'] = '???';
+                $v['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
+                $v['name'] = '???';
+                $v['ownerName'] = null;
+                $v['bgColor'] = GameConst::$basecolor4;
+                $v['fgColor'] = newColor($v['bgColor']);
+                return $v;
+            }],
+            ["전 투 횟 수", "int", function ($v) {
+                $v['value'] = $v['warnum'];
+                return $v;
+            }],
+            ["승 리", "int", function ($v) {
+                $v['value'] = $v['killnum'];
+                return $v;
+            }],
+            ["승 률", "percent", function ($v) {
+                if ($v['warnum'] < 10) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['killnum'] / max(1, $v['warnum']);
+                }
+                return $v;
+            }],
+            ["점 령", "int", function ($v) {
+                $v['value'] = $v['occupied'];
+                return $v;
+            }],
+            ["사 살", "int", function ($v) {
+                $v['value'] = $v['killcrew'];
+                return $v;
+            }],
+            ["살 상 률", "percent", function ($v) {
+                if ($v['warnum'] < 10) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['killcrew'] / max(1, $v['deathcrew']);
+                }
+                return $v;
+            }],
+            ["대 인 사 살", "int", function ($v) {
+                $v['value'] = $v['killcrew_person'];
+                return $v;
+            }],
+            ["대 인 살 상 률", "percent", function ($v) {
+                if ($v['warnum'] < 10) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['killcrew_person'] / max(1, $v['deathcrew_person']);
+                }
+                return $v;
+            }],
+            ["보 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex1'];
+                return $v;
+            }],
+            ["궁 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex2'];
+                return $v;
+            }],
+            ["기 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex3'];
+                return $v;
+            }],
+            ["귀 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex4'];
+                return $v;
+            }],
+            ["차 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex5'];
+                return $v;
+            }],
+            ["전 력 전 승 률", "percent", function ($v) {
+                $totalCnt = $v['ttw'] + $v['ttd'] + $v['ttl'];
+                if ($totalCnt < 50) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['ttw'] / max(1, $totalCnt);
+                }
+                return $v;
+            }],
+            ["통 솔 전 승 률", "percent", function ($v) {
+                $totalCnt = $v['tlw'] + $v['tld'] + $v['tll'];
+                if ($totalCnt < 50) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['tlw'] / max(1, $totalCnt);
+                }
+                return $v;
+            }],
+            ["일 기 토 승 률", "percent", function ($v) {
+                $totalCnt = $v['tsw'] + $v['tsd'] + $v['tsl'];
+                if ($totalCnt < 50) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['tsw'] / max(1, $totalCnt);
+                }
+                return $v;
+            }],
+            ["설 전 승 률", "percent", function ($v) {
+                $totalCnt = $v['tiw'] + $v['tid'] + $v['til'];
+                if ($totalCnt < 50) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['tiw'] / max(1, $totalCnt);
+                }
+
+                return $v;
+            }],
+            ["베 팅 투 자 액", "int", function ($v) {
+                $v['value'] = $v['betgold'];
+                return $v;
+            }],
+            ["베 팅 당 첨", "int", function ($v) {
+                $v['value'] = $v['betwin'];
+                return $v;
+            }],
+            ["베 팅 수 익 금", "int", function ($v) {
+                $v['value'] = $v['betwingold'];
+                return $v;
+            }],
+            ["베 팅 수 익 률", "percent", function ($v) {
+                if ($v['betgold'] < GameConst::$defaultGold) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['betwingold'] / max(1, $v['betgold']);
+                }
+                return $v;
+            }],
+        ];
+
+        $generals = [];
+        foreach ($db->query(
+            "SELECT nation,no,name,owner_name as ownerName, owner, picture, imgsvr,
     experience, dedication,
     dex1, dex2, dex3, dex4, dex5,
     horse, weapon, book, item
-    FROM general WHERE %l", $btn == "NPC 보기"?"npc>=2":"npc<2") as $general
-){
-    $generalID = $general['no'];
-    $general['bgColor'] = $nationColor[$general['nation']]??GameConst::$basecolor4;
-    $general['fgColor'] = newColor($general['bgColor']);
-    $general['nationName'] = $nationName[$general['nation']];
+    FROM general WHERE %l",
+            $btn == "NPC 보기" ? "npc>=2" : "npc<2"
+        ) as $general) {
+            $generalID = $general['no'];
+            $general['bgColor'] = $nationColor[$general['nation']] ?? GameConst::$basecolor4;
+            $general['fgColor'] = newColor($general['bgColor']);
+            $general['nationName'] = $nationName[$general['nation']];
 
-    if(key_exists('picture', $general)){
-        $imageTemp = GetImageURL($general['imgsvr']);
-        $general['pictureFullPath'] = "$imageTemp/{$general['picture']}";
-    }
-    else{
-        $general['pictureFullPath'] = GetImageURL(0)."/default.jpg";
-    }
-
-    $generals[$generalID] = $general;
-}
-
-foreach($db->queryAllLists('SELECT general_id, `type`, `value` FROM rank_data') as [$generalID, $typeKey, $value]){
-    if(!key_exists($generalID, $generals)){
-        continue;
-    }
-     $generals[$generalID][$typeKey] = $value;
-}
-
-$templates = new \League\Plates\Engine('templates');
-
-foreach($types as $idx=>[$typeName, $typeValue, $typeFunc]){
-    $validCnt = 0;
-    $typeGenerals = array_map(function($general) use($typeValue, $typeFunc, &$validCnt, $ownerNameList){
-        $general['ownerName'] = $ownerNameList[$general['owner']]??null;
-        $general = ($typeFunc)($general);
-        $value = $general['value'];
-
-        if($value > 0){
-            $validCnt+=1;
-        }
-
-        if($typeValue == 'percent'){
-            $general['printValue'] = number_format($value*100, 2).'%';
-        }
-        else {
-            $general['printValue'] = number_format($value);
-        }
-        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))
-    ]);
-}
-?>
-</div>
-<div style="margin:auto;width:1100px;margin-top:5px;">
-<?php
-//유니크 아이템 소유자
-$itemTypes = [
-    'horse'=>'명 마',
-    'weapon'=>'명 검',
-    'book'=>'명 서',
-    'item'=>'도 구'
-];
-
-$simpleItemTypes = array_keys($itemTypes); array_map(function($itemType){return $itemType[1];}, $itemTypes);
-$itemOwners = [];
-
-foreach($generals as $general){
-    foreach($itemTypes as $itemType=>$itemTypeName){
-        $itemClassName = $general[$itemType];
-        $itemClass = buildItemClass($itemClassName);
-        if($itemClass->isBuyable()){
-            continue;
-        }
-
-        if(key_exists($itemClassName, $itemOwners)){
-            $itemOwners[$itemClassName][] = $general;
-        }
-        else{
-            $itemOwners[$itemClassName] = [$general];
-        }
-
-    }
-}
-
-foreach(GameConst::$allItems as $itemType=>$itemList){
-    $itemNameType = $itemTypes[$itemType];
-    $itemList = array_reverse($itemList, true);
-
-
-    $itemRanker = [];
-    foreach($itemList as $itemClassName=>$itemCnt){
-        if($itemCnt==0){
-            continue;
-        }
-        $itemClass = buildItemClass($itemClassName);
-
-        if($itemClass->isBuyable()){
-            continue;
-        }
-
-        $info = $itemClass->getInfo();
-        $name = $itemClass->getName();
-
-
-        if($info){
-            $name = $templates->render('tooltip', [
-                'text'=>$name,
-                'info'=>$info,
-            ]);
-        }
-        foreach(Util::range($itemCnt) as $itemIdx){
-            if(($itemOwners[$itemClassName][$itemIdx]??null) === null){
-                $emptyCard = [
-                    'rankName' => $name,
-                    'pictureFullPath' => GetImageURL(0)."/default.jpg",
-                    'value'=>$itemClassName,
-                    'name'=>'미발견',
-                    'bgColor'=>GameConst::$basecolor4,
-                    'fgColor'=>newColor(GameConst::$basecolor4),
-                ];
-                $itemRanker[] = $emptyCard;
-                continue;
+            if (key_exists('picture', $general)) {
+                $imageTemp = GetImageURL($general['imgsvr']);
+                $general['pictureFullPath'] = "$imageTemp/{$general['picture']}";
+            } else {
+                $general['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
             }
 
-            $general = $itemOwners[$itemClassName][$itemIdx];
-
-            $card = [
-                'rankName' => $name,
-                'pictureFullPath' => $general['pictureFullPath'],
-                'value'=>$itemClassName,
-                'nationName'=>$general['nationName'],
-                'name'=>$general['name'],
-                'bgColor'=>$general['bgColor'],
-                'fgColor'=>$general['fgColor'],
-            ];
-            $itemRanker[] = $card;
+            $generals[$generalID] = $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>
+        foreach ($db->queryAllLists('SELECT general_id, `type`, `value` FROM rank_data') as [$generalID, $typeKey, $value]) {
+            if (!key_exists($generalID, $generals)) {
+                continue;
+            }
+            $generals[$generalID][$typeKey] = $value;
+        }
+
+        $templates = new \League\Plates\Engine('templates');
+
+        foreach ($types as $idx => [$typeName, $typeValue, $typeFunc]) {
+            $validCnt = 0;
+            $typeGenerals = array_map(function ($general) use ($typeValue, $typeFunc, &$validCnt, $ownerNameList) {
+                $general['ownerName'] = $ownerNameList[$general['owner']] ?? null;
+                $general = ($typeFunc)($general);
+                $value = $general['value'];
+
+                if ($value > 0) {
+                    $validCnt += 1;
+                }
+
+                if ($typeValue == 'percent') {
+                    $general['printValue'] = number_format($value * 100, 2) . '%';
+                } else {
+                    $general['printValue'] = number_format($value);
+                }
+                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))
+            ]);
+        }
+        ?>
+    </div>
+    <div style="margin:auto;width:1100px;margin-top:5px;">
+        <?php
+        //유니크 아이템 소유자
+        $itemTypes = [
+            'horse' => '명 마',
+            'weapon' => '명 검',
+            'book' => '명 서',
+            'item' => '도 구'
+        ];
+
+        $simpleItemTypes = array_keys($itemTypes);
+        array_map(function ($itemType) {
+            return $itemType[1];
+        }, $itemTypes);
+        $itemOwners = [];
+
+        foreach ($generals as $general) {
+            foreach ($itemTypes as $itemType => $itemTypeName) {
+                $itemClassName = $general[$itemType];
+                $itemClass = buildItemClass($itemClassName);
+                if ($itemClass->isBuyable()) {
+                    continue;
+                }
+
+                if (key_exists($itemClassName, $itemOwners)) {
+                    $itemOwners[$itemClassName][] = $general;
+                } else {
+                    $itemOwners[$itemClassName] = [$general];
+                }
+            }
+        }
+
+        foreach (GameConst::$allItems as $itemType => $itemList) {
+            $itemNameType = $itemTypes[$itemType];
+            $itemList = array_reverse($itemList, true);
+
+
+            $itemRanker = [];
+            foreach ($itemList as $itemClassName => $itemCnt) {
+                if ($itemCnt == 0) {
+                    continue;
+                }
+                $itemClass = buildItemClass($itemClassName);
+
+                if ($itemClass->isBuyable()) {
+                    continue;
+                }
+
+                $info = $itemClass->getInfo();
+                $name = $itemClass->getName();
+
+
+                if ($info) {
+                    $name = $templates->render('tooltip', [
+                        'text' => $name,
+                        'info' => $info,
+                    ]);
+                }
+                foreach (Util::range($itemCnt) as $itemIdx) {
+                    if (($itemOwners[$itemClassName][$itemIdx] ?? null) === null) {
+                        $emptyCard = [
+                            'rankName' => $name,
+                            'pictureFullPath' => GetImageURL(0) . "/default.jpg",
+                            'value' => $itemClassName,
+                            'name' => '미발견',
+                            'bgColor' => GameConst::$basecolor4,
+                            'fgColor' => newColor(GameConst::$basecolor4),
+                        ];
+                        $itemRanker[] = $emptyCard;
+                        continue;
+                    }
+
+                    $general = $itemOwners[$itemClassName][$itemIdx];
+
+                    $card = [
+                        'rankName' => $name,
+                        'pictureFullPath' => $general['pictureFullPath'],
+                        'value' => $itemClassName,
+                        'nationName' => $general['nationName'],
+                        'name' => $general['name'],
+                        'bgColor' => $general['bgColor'],
+                        'fgColor' => $general['fgColor'],
+                    ];
+                    $itemRanker[] = $card;
+                }
+            }
+
+            echo $templates->render('hallOfFrame', [
+                'typeName' => $itemNameType,
+                'generals' => $itemRanker
+            ]);
+        }
+        ?>
+    </div>
+    <table align=center width=1100 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>

hwe/a_emperior.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -12,118 +13,123 @@ increaseRefresh("왕조일람", 1);
 <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::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <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('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('ts', 'common') ?>
 
 </head>
 
 <body>
-<table align=center width=1000 class="tb_layout bg0">
-    <tr><td>역 대 왕 조<br>
-        <button onclick=window.close()>창 닫기</button><br>
-    </td></tr>
-</table>
+    <table align=center width=1000 class="tb_layout bg0">
+        <tr>
+            <td>역 대 왕 조<br>
+                <button onclick=window.close()>창 닫기</button><br>
+            </td>
+        </tr>
+    </table>
 
-<?php
+    <?php
 
-$showCurrentNation = true;
+    $showCurrentNation = true;
 
-$emperiors = $db->query('SELECT * FROM emperior ORDER BY `no` DESC');
+    $emperiors = $db->query('SELECT * FROM emperior ORDER BY `no` DESC');
 
-if($emperiors){
-    $serverID = $emperior[0]['server_id']??($emperior[0]['serverID']??null);
-    if($serverID == UniqueConst::$serverID){
-        $showCurrentNation = false;
+    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']);
-?>
+    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_history.php"><button type='button'>역사 보기</button></a>
-        </td>
-    </tr>
-</table>
+        <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_history.php"><button type='button'>역사 보기</button></a>
+                </td>
+            </tr>
+        </table>
 
-<?php
-}
+    <?php
+    }
 
-foreach($emperiors as $emperior){
-    $serverID = $emperior['server_id']??($emperior['serverID']??null);
-?>
+    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>
+        <table align=center width=1000 style="margin-top:10px;" class='tb_layout bg0'>
+            <tr>
+                <td bgcolor=skyblue align=center colspan=8>
+                    <font size=5><?= $emperior['phase'] ?></font>
 
-            <a href="a_emperior_detail.php?select=<?=$emperior['no']?>"><button type='button'>자세히</button></a>
+                    <a href="a_emperior_detail.php?select=<?= $emperior['no'] ?>"><button type='button'>자세히</button></a>
 
-            <?php if($emperior['server_id']): ?>
-            <a href="a_history.php?serverID=<?=$emperior['server_id']?>"><button type='button'>역사 보기</button></a>
-            <?php endif ?>
-        </td>
-    </tr>
-    <tr>
-        <td align=center style='color:<?=newColor($emperior['color'])?>;background-color:<?=$emperior['color']?>' colspan=8>
-            <font size=5><?=$emperior['name']?> (<?=$emperior['year']?>年 <?=$emperior['month']?>月)</font>
-        </td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center width=80>국 력</td>
-        <td align=center width=170><?=$emperior['power']?></td>
-        <td class='bg1' align=center width=80>장 수</td>
-        <td align=center width=170><?=$emperior['gennum']?></td>
-        <td class='bg1' align=center width=80>속 령</td>
-        <td align=center width=170><?=$emperior['citynum']?></td>
-        <td class='bg1' align=center width=80>성 향</td>
-        <td align=center width=170><?=$emperior['type']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>황 제</td>
-        <td align=center><?=$emperior['l12name']?></td>
-        <td class='bg1' align=center>승 상</td>
-        <td align=center><?=$emperior['l11name']?></td>
-        <td class='bg1' align=center>표 기 장 군</td>
-        <td align=center><?=$emperior['l10name']?></td>
-        <td class='bg1' align=center>사 공</td>
-        <td align=center><?=$emperior['l9name']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>거 기 장 군</td>
-        <td align=center><?=$emperior['l8name']?></td>
-        <td class='bg1' align=center>태 위</td>
-        <td align=center><?=$emperior['l7name']?></td>
-       <td class='bg1' align=center>위 장 군</td>
-        <td align=center><?=$emperior['l6name']?></td>
-        <td class='bg1' align=center>사 도</td>
-        <td align=center><?=$emperior['l5name']?></td>
-    </tr>
-</table>
+                    <?php if ($emperior['server_id']) : ?>
+                        <a href="a_history.php?serverID=<?= $emperior['server_id'] ?>"><button type='button'>역사 보기</button></a>
+                    <?php endif ?>
+                </td>
+            </tr>
+            <tr>
+                <td align=center style='color:<?= newColor($emperior['color']) ?>;background-color:<?= $emperior['color'] ?>' colspan=8>
+                    <font size=5><?= $emperior['name'] ?> (<?= $emperior['year'] ?>年 <?= $emperior['month'] ?>月)</font>
+                </td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center width=80>국 력</td>
+                <td align=center width=170><?= $emperior['power'] ?></td>
+                <td class='bg1' align=center width=80>장 수</td>
+                <td align=center width=170><?= $emperior['gennum'] ?></td>
+                <td class='bg1' align=center width=80>속 령</td>
+                <td align=center width=170><?= $emperior['citynum'] ?></td>
+                <td class='bg1' align=center width=80>성 향</td>
+                <td align=center width=170><?= $emperior['type'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>황 제</td>
+                <td align=center><?= $emperior['l12name'] ?></td>
+                <td class='bg1' align=center>승 상</td>
+                <td align=center><?= $emperior['l11name'] ?></td>
+                <td class='bg1' align=center>표 기 장 군</td>
+                <td align=center><?= $emperior['l10name'] ?></td>
+                <td class='bg1' align=center>사 공</td>
+                <td align=center><?= $emperior['l9name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>거 기 장 군</td>
+                <td align=center><?= $emperior['l8name'] ?></td>
+                <td class='bg1' align=center>태 위</td>
+                <td align=center><?= $emperior['l7name'] ?></td>
+                <td class='bg1' align=center>위 장 군</td>
+                <td align=center><?= $emperior['l6name'] ?></td>
+                <td class='bg1' align=center>사 도</td>
+                <td align=center><?= $emperior['l5name'] ?></td>
+            </tr>
+        </table>
 
 
 
-<?php
-}
-?>
+    <?php
+    }
+    ?>
 
-<table style="margin-top:10px;" align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+    <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>

hwe/a_emperior_detail.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -13,8 +14,8 @@ $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);
+$emperior = $db->queryFirstRow('SELECT * FROM emperior WHERE `no`=%i', $select);
+$serverID = $emperior['server_id'] ?? ($emperior['serverID'] ?? null);
 
 ?>
 
@@ -22,193 +23,199 @@ $serverID = $emperior['server_id']??($emperior['serverID']??null);
 <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('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <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::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 
 </head>
 
 <body>
-<table align=center width=1000 class="tb_layout bg0">
-    <tr><td>역 대 왕 조<br>
-        <button onclick=window.close()>창 닫기</button>
-        <div style="float:right;"><a href="a_emperior.php"><button type='button'>전체보기</button></a><div>
-    </td></tr>
+    <table align=center width=1000 class="tb_layout bg0">
+        <tr>
+            <td>역 대 왕 조<br>
+                <button onclick=window.close()>창 닫기</button>
+                <div style="float:right;"><a href="a_emperior.php"><button type='button'>전체보기</button></a>
+                    <div>
+            </td>
+        </tr>
 
-</table>
+    </table>
 
-<?php
+    <?php
 
-if($emperior):
-?>
+    if ($emperior) :
+    ?>
 
 
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr>
-        <td bgcolor=skyblue align=center colspan=6>
-            <font size=5><?=$emperior['phase']?></font>
-        </td>
-    </tr>
-    <tr>
-        <td class='bg1' width=98 align=center>국 가 수<br>(최종 / 최대)</td>
-        <td align=center width=398 colspan=2><?=$emperior['nation_count']?></td>
-        <td class='bg1' width=98 align=center>장 수 수<br>(최종 / 최대)</td>
-        <td align=center width=398 colspan=2><?=$emperior['gen_count']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>등 장 국 가</td>
-        <td colspan=5><?=$emperior['nation_name']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>국가별 성향</td>
-        <td colspan=5><?=$emperior['nation_hist']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>장 수 성 격</td>
-        <td colspan=5><?=$emperior['personal_hist']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>장 수 특 기</td>
-        <td colspan=5><?=$emperior['special_hist']?></td>
-    </tr>
-    <tr>
-        <td align=center style=color:<?=newColor($emperior['color'])?>; bgcolor=<?=$emperior['color']?> colspan=6>
-            <font size=5><?=$emperior['name']?> (<?=$emperior['year']?>年 <?=$emperior['month']?>月)</font>
-        </td>
-    </tr>
-    <tr>
-        <td class='bg1' width=98 align=center>국 력</td>
-        <td align=center width=398 colspan=2><?=$emperior['power']?></td>
-        <td class='bg1' width=98 align=center>성 향</td>
-        <td align=center width=398 colspan=2><?=$emperior['type']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' width=98 align=center>장 수</td>
-        <td align=center width=398 colspan=2><?=$emperior['gennum']?></td>
-        <td class='bg1' width=98 align=center>속 령</td>
-        <td align=center width=398 colspan=2><?=$emperior['citynum']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>총 인 구</td>
-        <td align=center colspan=2><?=$emperior['pop']?></td>
-        <td class='bg1' align=center>인 구 율</td>
-        <td align=center colspan=2><?=$emperior['poprate']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>국 고</td>
-        <td align=center colspan=2><?=$emperior['gold']?></td>
-        <td class='bg1' align=center>병 량</td>
-        <td align=center colspan=2><?=$emperior['rice']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>황 제</td>
-        <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l12name']?></td>
-        <td class='bg1' align=center>승 상</td>
-        <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l11name']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>위 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l10name']?></td>
-        <td class='bg1' align=center>사 공</td>
-        <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l9name']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>표 기 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l8name']?></td>
-        <td class='bg1' align=center>태 위</td>
-        <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l7name']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>거 기 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l6name']?></td>
-        <td class='bg1' align=center>사 도</td>
-        <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l5name']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>오 호 장 군</td>
-        <td colspan=5><?=$emperior['tiger']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>건 안 칠 자</td>
-        <td colspan=5><?=$emperior['eagle']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>장 수 들<br>(공헌도 순서)</td>
-        <td colspan=5><?=$emperior['gen']?></td>
-    </tr>
-    <tr>
-        <td class='bg1' align=center>역 사 기 록</td>
-        <td colspan=5><?=formatHistoryToHTML(Json::decode($emperior['history']))?></td>
-    </tr>
-</table>
+        <table align=center width=1000 class='tb_layout bg0'>
+            <tr>
+                <td bgcolor=skyblue align=center colspan=6>
+                    <font size=5><?= $emperior['phase'] ?></font>
+                </td>
+            </tr>
+            <tr>
+                <td class='bg1' width=98 align=center>국 가 수<br>(최종 / 최대)</td>
+                <td align=center width=398 colspan=2><?= $emperior['nation_count'] ?></td>
+                <td class='bg1' width=98 align=center>장 수 수<br>(최종 / 최대)</td>
+                <td align=center width=398 colspan=2><?= $emperior['gen_count'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>등 장 국 가</td>
+                <td colspan=5><?= $emperior['nation_name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>국가별 성향</td>
+                <td colspan=5><?= $emperior['nation_hist'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>장 수 성 격</td>
+                <td colspan=5><?= $emperior['personal_hist'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>장 수 특 기</td>
+                <td colspan=5><?= $emperior['special_hist'] ?></td>
+            </tr>
+            <tr>
+                <td align=center style=color:<?= newColor($emperior['color']) ?>; bgcolor=<?= $emperior['color'] ?> colspan=6>
+                    <font size=5><?= $emperior['name'] ?> (<?= $emperior['year'] ?>年 <?= $emperior['month'] ?>月)</font>
+                </td>
+            </tr>
+            <tr>
+                <td class='bg1' width=98 align=center>국 력</td>
+                <td align=center width=398 colspan=2><?= $emperior['power'] ?></td>
+                <td class='bg1' width=98 align=center>성 향</td>
+                <td align=center width=398 colspan=2><?= $emperior['type'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' width=98 align=center>장 수</td>
+                <td align=center width=398 colspan=2><?= $emperior['gennum'] ?></td>
+                <td class='bg1' width=98 align=center>속 령</td>
+                <td align=center width=398 colspan=2><?= $emperior['citynum'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>총 인 구</td>
+                <td align=center colspan=2><?= $emperior['pop'] ?></td>
+                <td class='bg1' align=center>인 구 율</td>
+                <td align=center colspan=2><?= $emperior['poprate'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>국 고</td>
+                <td align=center colspan=2><?= $emperior['gold'] ?></td>
+                <td class='bg1' align=center>병 량</td>
+                <td align=center colspan=2><?= $emperior['rice'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>황 제</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l12name'] ?></td>
+                <td class='bg1' align=center>승 상</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l11name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>위 장 군</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l10name'] ?></td>
+                <td class='bg1' align=center>사 공</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l9name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>표 기 장 군</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l8name'] ?></td>
+                <td class='bg1' align=center>태 위</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l7name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>거 기 장 군</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l6name'] ?></td>
+                <td class='bg1' align=center>사 도</td>
+                <td width=64>&nbsp;</td>
+                <td width=332><?= $emperior['l5name'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>오 호 장 군</td>
+                <td colspan=5><?= $emperior['tiger'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>건 안 칠 자</td>
+                <td colspan=5><?= $emperior['eagle'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>장 수 들<br>(공헌도 순서)</td>
+                <td colspan=5><?= $emperior['gen'] ?></td>
+            </tr>
+            <tr>
+                <td class='bg1' align=center>역 사 기 록</td>
+                <td colspan=5><?= formatHistoryToHTML(Json::decode($emperior['history'])) ?></td>
+            </tr>
+        </table>
 
-<?php
-endif;
+    <?php
+    endif;
 
-$showServers = $emperior;
+    $showServers = $emperior;
 
-if(!$serverID){
-    $serverID = UniqueConst::$serverID;
-}
-
-if($showServers){
-    $nations = $db->query('SELECT * FROM ng_old_nations WHERE server_id=%s ORDER BY date DESC', $serverID);
-    foreach($nations as $nation){
-        if(!$nation['nation']??null){
-            continue;
-        }
-        $nation += Json::decode($nation['data']);
-
-        $nation['typeName'] = getNationType($nation['type']);
-        $nation['levelName'] = getNationLevel($nation['level']);
-        /** @var int[]|null $nationGenerals */
-        $nationGenerals = $nation['generals'];
-
-        if($nationGenerals){
-            $generals = $db->query('SELECT `general_no`, `name`, `last_yearmonth` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nationGenerals);
-
-            if(count($generals) != count($nationGenerals) && $serverID == UniqueConst::$serverID){
-                $liveGenerals = $nationGenerals;
-                foreach($generals as $general){
-                    if(in_array($general['general_no'], $nationGenerals)){
-                        unset($nationGenerals[$general['general_no']]);
-                    }
-                }
-                $liveGenerals = $db->query('SELECT `no`as`general_no`, `name` FROM general WHERE no IN %li', $liveGenerals);
-                $nation['generalsFull'] = array_merge($liveGenerals, $generals);
-            }
-            else{
-                $nation['generalsFull'] = $generals;
-            }
-        }
-        else{
-            $nation['generalsFull'] = [];
-        }
-
-        if(key_exists('aux', $nation) && !is_array($nation['aux'])){
-            $nation += Json::decode($nation['aux']);
-        }
-
-        echo $templates->render('oldNation', $nation);
+    if (!$serverID) {
+        $serverID = UniqueConst::$serverID;
     }
-}
-?>
 
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+    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']);
+            /** @var int[]|null $nationGenerals */
+            $nationGenerals = $nation['generals'];
+
+            if ($nationGenerals) {
+                $generals = $db->query('SELECT `general_no`, `name`, `last_yearmonth` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nationGenerals);
+
+                if (count($generals) != count($nationGenerals) && $serverID == UniqueConst::$serverID) {
+                    $liveGenerals = $nationGenerals;
+                    foreach ($generals as $general) {
+                        if (in_array($general['general_no'], $nationGenerals)) {
+                            unset($nationGenerals[$general['general_no']]);
+                        }
+                    }
+                    $liveGenerals = $db->query('SELECT `no`as`general_no`, `name` FROM general WHERE no IN %li', $liveGenerals);
+                    $nation['generalsFull'] = array_merge($liveGenerals, $generals);
+                } else {
+                    $nation['generalsFull'] = $generals;
+                }
+            } else {
+                $nation['generalsFull'] = [];
+            }
+
+            if (key_exists('aux', $nation) && !is_array($nation['aux'])) {
+                $nation += 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>

hwe/a_genList.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -28,8 +29,8 @@ if ($type <= 0 || $type > 15) {
 }
 
 $ownerNameList = [];
-if($gameStor->isunited){
-    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+if ($gameStor->isunited) {
+    foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
         $ownerNameList[$ownerID] = $ownerName;
     }
 }
@@ -39,74 +40,78 @@ if($gameStor->isunited){
 <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('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
+    <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') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('ts', 'common') ?>
 
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>장 수 일 람<br><?=closeButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
-        <select id='viewType' name='type' size=1>
-            <option value=1>국가</option>
-            <option value=2>통솔</option>
-            <option value=3>무력</option>
-            <option value=4>지력</option>
-            <option value=5>명성</option>
-            <option value=6>계급</option>
-            <option value=7>관직</option>
-            <option value=8>삭턴</option>
-            <option value=9>벌점</option>
-            <option value=10>Lv</option>
-            <option value=11>성격</option>
-            <option value=12>내특</option>
-            <option value=13>전특</option>
-            <option value=14>연령</option>
-            <option value=15>NPC</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<?php
-$nationname = [];
-$nationlevel = [];
-$nationname[0] = "-";
-foreach (getAllNationStaticInfo() as $nation) {
-    $nationname[$nation['nation']] = $nation['name'];
-    $nationlevel[$nation['nation']] = $nation['level'];
-}
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>장 수 일 람<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>정렬순서 :
+                    <select id='viewType' name='type' size=1>
+                        <option value=1>국가</option>
+                        <option value=2>통솔</option>
+                        <option value=3>무력</option>
+                        <option value=4>지력</option>
+                        <option value=5>명성</option>
+                        <option value=6>계급</option>
+                        <option value=7>관직</option>
+                        <option value=8>삭턴</option>
+                        <option value=9>벌점</option>
+                        <option value=10>Lv</option>
+                        <option value=11>성격</option>
+                        <option value=12>내특</option>
+                        <option value=13>전특</option>
+                        <option value=14>연령</option>
+                        <option value=15>NPC</option>
+                    </select>
+                    <input type=submit value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <?php
+    $nationname = [];
+    $nationlevel = [];
+    $nationname[0] = "-";
+    foreach (getAllNationStaticInfo() as $nation) {
+        $nationname[$nation['nation']] = $nation['name'];
+        $nationlevel[$nation['nation']] = $nation['level'];
+    }
 
 
-[$orderKey, $orderDesc] = [
-    1=>['nation', false],
-    2=>['leadership', true],
-    3=>['strength', true],
-    4=>['intel', true],
-    5=>['experience', true],
-    6=>['dedication', true],
-    7=>['officer_level', true],
-    8=>['killturn', false],
-    9=>['connect', true],
-    10=>['experience', true],
-    11=>['personal', true],
-    12=>['special', true],
-    13=>['special2', true],
-    14=>['age', true],
-    15=>['npc', true],
-][$type];
+    [$orderKey, $orderDesc] = [
+        1 => ['nation', false],
+        2 => ['leadership', true],
+        3 => ['strength', true],
+        4 => ['intel', true],
+        5 => ['experience', true],
+        6 => ['dedication', true],
+        7 => ['officer_level', true],
+        8 => ['killturn', false],
+        9 => ['connect', true],
+        10 => ['experience', true],
+        11 => ['personal', true],
+        12 => ['special', true],
+        13 => ['special2', true],
+        14 => ['age', true],
+        15 => ['npc', true],
+    ][$type];
 
-$generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect from general order by %b %l', $orderKey, $orderDesc?'desc':'');
+    $generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect from general order by %b %l', $orderKey, $orderDesc ? 'desc' : '');
 
-echo"
+    echo "
 <table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td width=64  align=center class='bg1'>얼 굴</td>
@@ -125,90 +130,94 @@ echo"
         <td width=45 align=center class='bg1'>삭턴</td>
         <td width=70 align=center class='bg1'>벌점</td>
     </tr>";
-foreach($generalList as $general){
-    $nation = $nationname[$general['nation']];
+    foreach ($generalList as $general) {
+        $nation = $nationname[$general['nation']];
 
-    $lbonus = calcLeadershipBonus($general['officer_level'], $nationlevel[$general['nation']]??0);
-    if ($lbonus > 0) {
-        $lbonusText = "<font color=cyan>+{$lbonus}</font>";
-    } else {
-        $lbonusText = "";
-    }
+        $lbonus = calcLeadershipBonus($general['officer_level'], $nationlevel[$general['nation']] ?? 0);
+        if ($lbonus > 0) {
+            $lbonusText = "<font color=cyan>+{$lbonus}</font>";
+        } else {
+            $lbonusText = "";
+        }
 
-    if ($general['injury'] > 0) {
-        $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100);
-        $strength = intdiv($general['strength'] * (100 - $general['injury']), 100);
-        $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leadership = "<font color=red>{$leadership}</font>{$lbonusText}";
-        $strength = "<font color=red>{$strength}</font>";
-        $intel = "<font color=red>{$intel}</font>";
-    } else {
-        $leadership = "{$general['leadership']}{$lbonusText}";
-        $strength = "{$general['strength']}";
-        $intel = "{$general['intel']}";
-    }
+        if ($general['injury'] > 0) {
+            $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100);
+            $strength = intdiv($general['strength'] * (100 - $general['injury']), 100);
+            $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
+            $leadership = "<font color=red>{$leadership}</font>{$lbonusText}";
+            $strength = "<font color=red>{$strength}</font>";
+            $intel = "<font color=red>{$intel}</font>";
+        } else {
+            $leadership = "{$general['leadership']}{$lbonusText}";
+            $strength = "{$general['strength']}";
+            $intel = "{$general['intel']}";
+        }
 
 
 
-    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']}";
-    }
+        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']}";
+        }
 
-    if(key_exists($general['owner'], $ownerNameList)){
-        $name = $name.'<br><small>('.$ownerNameList[$general['owner']].')</small>';
-    }
+        if (key_exists($general['owner'], $ownerNameList)) {
+            $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
+        }
 
-    $general['connect'] = Util::round($general['connect'], -1);
+        $general['connect'] = Util::round($general['connect'], -1);
 
-    $imageTemp = GetImageURL($general['imgsvr']);
-    echo "
+        $imageTemp = GetImageURL($general['imgsvr']);
+        echo "
     <tr data-general-id='{$general['no']}'
         data-general-wounded='{$general['injury']}'
         data-general-leadership='{$general['leadership']}'
         data-general-leadership-bonus='{$lbonus}'
         data-general-strength='{$general['strength']}'
         data-general-intel='{$general['intel']}'
-        data-is-npc='".($general['npc']>=2?'true':'false')."'
+        data-is-npc='" . ($general['npc'] >= 2 ? 'true' : 'false') . "'
     >
         <td align=center><img class='generalIcon' width='64' height='64' src='{$imageTemp}/{$general['picture']}'></img></td>
         <td align=center>$name</td>
         <td align=center>{$general['age']}세</td>
-        <td align=center>".displayCharInfo($general['personal'])."</td>
-        <td align=center>".displaySpecialDomesticInfo($general['special'])." / ".displaySpecialWarInfo($general['special2'])."</td>
-        <td align=center>Lv ".getExpLevel($general['experience'])."</td>
+        <td align=center>" . displayCharInfo($general['personal']) . "</td>
+        <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>
+        <td align=center>Lv " . getExpLevel($general['experience']) . "</td>
         <td align=center>{$nation}</td>
-        <td align=center>".getHonor($general['experience'])."</td>
-        <td align=center>".getDed($general['dedication'])."</td>
+        <td align=center>" . getHonor($general['experience']) . "</td>
+        <td align=center>" . getDed($general['dedication']) . "</td>
         <td align=center>";
-    echo getOfficerLevelText($general['officer_level']);
-    echo "</td>
+        echo getOfficerLevelText($general['officer_level']);
+        echo "</td>
         <td align=center>$leadership</td>
         <td align=center>$strength</td>
         <td align=center>$intel</td>
         <td align=center>{$general['killturn']}</td>
         <td align=center>{$general['connect']}";
-    echo "<br>【".getConnect($general['connect'])."】</td>
+        echo "<br>【" . getConnect($general['connect']) . "】</td>
     </tr>";
-}
-echo "
+    }
+    echo "
 </table>
 ";
 
-?>
+    ?>
 
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-<script type="text/javascript">
-$(document).ready(function() {
-    $("#viewType").val("<?=$type?>").attr("selected", "selected");
-});
-</script>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $("#viewType").val("<?= $type ?>").attr("selected", "selected");
+        });
+    </script>
 </body>
 
-</html>
+</html>

hwe/a_hallOfFame.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -12,13 +13,13 @@ $db = DB::db();
 
 increaseRefresh("명예의전당", 1);
 
-$scenarioList = (function(){
+$scenarioList = (function () {
     $db = DB::db();
-    $scenarioList= [];
-    foreach($db->query('SELECT season, scenario_name as name, count(scenario) as cnt, scenario from ng_games group by season, scenario order by season desc, scenario asc') as $scenarioInfo){
+    $scenarioList = [];
+    foreach ($db->query('SELECT season, scenario_name as name, count(scenario) as cnt, scenario from ng_games group by season, scenario order by season desc, scenario asc') as $scenarioInfo) {
         $seasonIdx = $scenarioInfo['season'];
         $scenarioIdx = $scenarioInfo['scenario'];
-        if(!key_exists($seasonIdx, $scenarioList)){
+        if (!key_exists($seasonIdx, $scenarioList)) {
             $scenarioList[$seasonIdx] = [];
         }
         $scenarioList[$seasonIdx][$scenarioIdx] = $scenarioInfo;
@@ -28,11 +29,10 @@ $scenarioList = (function(){
 
 
 
-if($scenarioIdx && key_exists($scenarioIdx, $scenarioList[$seasonIdx]??[])){
+if ($scenarioIdx && key_exists($scenarioIdx, $scenarioList[$seasonIdx] ?? [])) {
     $searchScenarioName = $scenarioList[$seasonIdx][$scenarioIdx]['name'];
     $searchFilter = $db->sqleval('season = %i AND scenario = %i', $seasonIdx, $scenarioIdx);
-}
-else{
+} else {
     $searchScenarioName = '* 모두 *';
     $searchFilter = $db->sqleval('season = %i', $seasonIdx);
 }
@@ -42,133 +42,129 @@ else{
 <html>
 
 <head>
-<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('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJs('dist_js/hallOfFame.js')?>
+    <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('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printCSS('css/hallOfFame.css') ?>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('ts', ['common', 'hallOfFame']) ?>
 </head>
 
 <body>
-<table align=center width=1100 class='tb_layout bg0'>
-    <tr><td>명 예 의 전 당<br><?=closeButton()?></td></tr>
-    <tr><td>
-시나리오 검색 : <select id="by_scenario" name="by_scenario">
-<?php foreach($scenarioList as $iterSeasonIdx=>$subScenarioList): ?>
-    <option
-        data-season="<?=$iterSeasonIdx?>"
-        value=""
-        <?=($iterSeasonIdx == $seasonIdx && $scenarioIdx === null)?"selected='selected'":''?>
-    >* 시즌 : <?=$iterSeasonIdx?> 종합 *</option>
-    <?php foreach($subScenarioList as $info): ?>
-        <option
-        data-season="<?=$iterSeasonIdx?>"
-            value="<?=$info['scenario']?>"
-            <?=($iterSeasonIdx == $seasonIdx && $info['scenario']===$scenarioIdx)?"selected='selected'":''?>
-        ><?=$info['name']?>(<?=$info['cnt']?>회)</option>
-    <?php endforeach; ?>
-<?php endforeach; ?>
-?>
-</select>
-</td></tr>
-</table>
-<div style="margin:auto;width:1100px;">
-<?php
-$types = [
-    'experience'=>['명 성', 'int'],
-    'dedication'=>['계 급', 'int'],
-    'firenum'=>['계 략 성 공', 'int'],
-    'warnum'=>['전 투 횟 수', 'int'],
-    'killnum'=>['승 리', 'int'],
-    'winrate'=>['승 률', 'percent'],
-    'occupied'=>['점 령', 'int'],
-    'killcrew'=>['사 살', 'int'],
-    'killrate'=>['살 상 률', 'percent'],
-    'killcrew_person'=>['대 인 사 살', 'int'],
-    'killrate_person'=>['대 인 살 상 률', 'percent'],
-    'dex1'=>['보 병 숙 련 도', 'int'],
-    'dex2'=>['궁 병 숙 련 도', 'int'],
-    'dex3'=>['기 병 숙 련 도', 'int'],
-    'dex4'=>['귀 병 숙 련 도', 'int'],
-    'dex5'=>['차 병 숙 련 도', 'int'],
-    'ttrate'=>['전 력 전 승 률', 'percent'],
-    'tlrate'=>['통 솔 전 승 률', 'percent'],
-    'tsrate'=>['일 기 토 승 률', 'percent'],
-    'tirate'=>['설 전 승 률', 'percent'],
-    'betgold'=>['베 팅 투 자 액', 'int'],
-    'betwin'=>['베 팅 당 첨', 'int'],
-    'betwingold'=>['베 팅 수 익 금', 'int'],
-    'betrate'=>['베 팅 수 익 률', 'percent'],
-];
+    <table align=center width=1100 class='tb_layout bg0'>
+        <tr>
+            <td>명 예 의 전 당<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                시나리오 검색 : <select id="by_scenario" name="by_scenario">
+                    <?php foreach ($scenarioList as $iterSeasonIdx => $subScenarioList) : ?>
+                        <option data-season="<?= $iterSeasonIdx ?>" value="" <?= ($iterSeasonIdx == $seasonIdx && $scenarioIdx === null) ? "selected='selected'" : '' ?>>* 시즌 : <?= $iterSeasonIdx ?> 종합 *</option>
+                        <?php foreach ($subScenarioList as $info) : ?>
+                            <option data-season="<?= $iterSeasonIdx ?>" value="<?= $info['scenario'] ?>" <?= ($iterSeasonIdx == $seasonIdx && $info['scenario'] === $scenarioIdx) ? "selected='selected'" : '' ?>><?= $info['name'] ?>(<?= $info['cnt'] ?>회)</option>
+                        <?php endforeach; ?>
+                    <?php endforeach; ?>
+                    ?>
+                </select>
+            </td>
+        </tr>
+    </table>
+    <div style="margin:auto;width:1100px;">
+        <?php
+        $types = [
+            'experience' => ['명 성', 'int'],
+            'dedication' => ['계 급', 'int'],
+            'firenum' => ['계 략 성 공', 'int'],
+            'warnum' => ['전 투 횟 수', 'int'],
+            'killnum' => ['승 리', 'int'],
+            'winrate' => ['승 률', 'percent'],
+            'occupied' => ['점 령', 'int'],
+            'killcrew' => ['사 살', 'int'],
+            'killrate' => ['살 상 률', 'percent'],
+            'killcrew_person' => ['대 인 사 살', 'int'],
+            'killrate_person' => ['대 인 살 상 률', 'percent'],
+            'dex1' => ['보 병 숙 련 도', 'int'],
+            'dex2' => ['궁 병 숙 련 도', 'int'],
+            'dex3' => ['기 병 숙 련 도', 'int'],
+            'dex4' => ['귀 병 숙 련 도', 'int'],
+            'dex5' => ['차 병 숙 련 도', 'int'],
+            'ttrate' => ['전 력 전 승 률', 'percent'],
+            'tlrate' => ['통 솔 전 승 률', 'percent'],
+            'tsrate' => ['일 기 토 승 률', 'percent'],
+            'tirate' => ['설 전 승 률', 'percent'],
+            'betgold' => ['베 팅 투 자 액', 'int'],
+            'betwin' => ['베 팅 당 첨', 'int'],
+            'betwingold' => ['베 팅 수 익 금', 'int'],
+            'betrate' => ['베 팅 수 익 률', 'percent'],
+        ];
 
-$templates = new \League\Plates\Engine('templates');
+        $templates = new \League\Plates\Engine('templates');
 
-$ownerNameList = [];
-foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
-    $ownerNameList[$ownerID] = $ownerName;
-}
-
-foreach($types as $typeName=>[$typeDescribe, $typeValue]) {
-    $hallResult = $db->query('SELECT * FROM hall WHERE `type`=%s AND %? ORDER BY `value` DESC LIMIT 10', $typeName, $searchFilter);
-
-    $hallResult = array_map(function($general)use($typeValue, $ownerNameList){
-        $aux = Json::decode($general['aux']);
-        $general += $aux;
-
-        if(key_exists($general['owner'], $ownerNameList)){
-            $general['ownerName'] = $ownerNameList[$general['owner']];
+        $ownerNameList = [];
+        foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+            $ownerNameList[$ownerID] = $ownerName;
         }
 
-        if(!key_exists('bgColor', $general)){
-            if(!key_exists('color', $general)){
-                $general['bgColor'] = GameConst::$basecolor4;
-            }
-            else{
-                $general['bgColor'] = $general['color'];
-            }
-        }
+        foreach ($types as $typeName => [$typeDescribe, $typeValue]) {
+            $hallResult = $db->query('SELECT * FROM hall WHERE `type`=%s AND %? ORDER BY `value` DESC LIMIT 10', $typeName, $searchFilter);
 
-        if(!key_exists('fgColor', $general)){
-            $general['fgColor'] = newColor($general['bgColor']);
-        }
+            $hallResult = array_map(function ($general) use ($typeValue, $ownerNameList) {
+                $aux = Json::decode($general['aux']);
+                $general += $aux;
 
-        if(key_exists('picture', $general)){
-            $imageTemp = GetImageURL($general['imgsvr']);
-            $general['pictureFullPath'] = "$imageTemp/{$general['picture']}";
-        }
-        else{
-            $general['pictureFullPath'] = GetImageURL(0)."/default.jpg";
-        }
+                if (key_exists($general['owner'], $ownerNameList)) {
+                    $general['ownerName'] = $ownerNameList[$general['owner']];
+                }
 
-        if(!key_exists('printValue', $general)){
-            $value = $general['value'];
-            if($typeValue == 'percent'){
-                $general['printValue'] = number_format($value*100, 2).'%';
-            }
-            else {
-                $general['printValue'] = number_format($value);
-            }
+                if (!key_exists('bgColor', $general)) {
+                    if (!key_exists('color', $general)) {
+                        $general['bgColor'] = GameConst::$basecolor4;
+                    } else {
+                        $general['bgColor'] = $general['color'];
+                    }
+                }
+
+                if (!key_exists('fgColor', $general)) {
+                    $general['fgColor'] = newColor($general['bgColor']);
+                }
+
+                if (key_exists('picture', $general)) {
+                    $imageTemp = GetImageURL($general['imgsvr']);
+                    $general['pictureFullPath'] = "$imageTemp/{$general['picture']}";
+                } else {
+                    $general['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
+                }
+
+                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' => $typeDescribe,
+                'generals' => $hallResult
+            ]);
         }
-
-        return $general;
-    }, $hallResult);
-
-    echo $templates->render('hallOfFrame', [
-        'typeName'=>$typeDescribe,
-        'generals'=>$hallResult
-    ]);
-}
-?>
-</div>
-<table align=center width=1100 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+        ?>
+    </div>
+    <table align=center width=1100 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>

hwe/a_history.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -14,15 +15,15 @@ $userID = Session::getUserID();
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 
-if(!$serverID){
+if (!$serverID) {
     $serverID = UniqueConst::$serverID;
 }
 
-if($serverID === UniqueConst::$serverID){
+if ($serverID === UniqueConst::$serverID) {
     increaseRefresh("연감", 1);
 }
 
-$admin = $gameStor->getValues(['startyear','year','month','map_theme']);
+$admin = $gameStor->getValues(['startyear', 'year', 'month', 'map_theme']);
 
 $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner = %i', $userID);
 
@@ -37,7 +38,7 @@ if ($con >= 2) {
 [$s_year, $s_month] = $db->queryFirstList('SELECT year, month FROM ng_history WHERE server_id = %s ORDER BY year ASC, month ASC LIMIT 1', $serverID);
 $s = $s_year * 12 + $s_month;
 
-if($s_year === null){
+if ($s_year === null) {
     echo '인자 에러';
     exit();
 }
@@ -45,19 +46,17 @@ if($s_year === null){
 [$e_year, $e_month] = $db->queryFirstList('SELECT year, month FROM ng_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';
+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($serverID !== UniqueConst::$serverID && !$yearmonth){
+if ($serverID !== UniqueConst::$serverID && !$yearmonth) {
     $year = $s_year;
     $month = $s_month;
-}
-else if (!$yearmonth) {
+} else if (!$yearmonth) {
     $year = $admin['year'];
     $month = $admin['month'] - 1;
 } else {
@@ -70,7 +69,7 @@ else if (!$yearmonth) {
         $month += 1;
     }
 }
-$now = ($year*12) + $month;
+$now = ($year * 12) + $month;
 
 if ($now < $s) {
     $now = $s;
@@ -95,106 +94,122 @@ $nations = Json::decode($history['nations']);
 <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::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS("js/map/theme_{$mapTheme}.js")?>
-<?=WebUtil::printJS('dist_js/history.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printCSS('css/map.css')?>
-<?=WebUtil::printCSS('css/history.css')?>
-<script>
-var startYear = <?=$s_year?>;
-var startMonth = <?=$s_month?>;
-var lastYear = <?=$e_year?>;
-var lastMonth = <?=$e_month?>;
-var selectYear = <?=$year?>;
-var selectMonth = <?=$month?>;
-var nations = <?=$nations?$history['nations']:'{}'?>;
-</script>
+    <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('../d_shared/common_path.js') ?>
+    <?= WebUtil::printJS("js/map/theme_{$mapTheme}.js") ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printCSS('css/map.css') ?>
+    <?= WebUtil::printCSS('css/history.css') ?>
+    <?= WebUtil::printDist('ts', ['common', 'history']) ?>
+
+    <script>
+        var startYear = <?= $s_year ?>;
+        var startMonth = <?= $s_month ?>;
+        var lastYear = <?= $e_year ?>;
+        var lastMonth = <?= $e_month ?>;
+        var selectYear = <?= $year ?>;
+        var selectMonth = <?= $month ?>;
+        var nations = <?= $nations ? $history['nations'] : '{}' ?>;
+    </script>
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>연 감<br><?=closeButton()?></td></tr>
-    <tr><td>
-        <form name=form1 method=post>
-        연월 선택 :
-        <input type=submit name=btn value="◀◀ 이전달">
-        <select id='yearmonth' name=yearmonth size=1>
-            <option selected='selected'><?=$year?>년 <?=$month?>월</option>
-            <option><?=$e_year?>년 12월</option>
-        </select>
-        <input type=submit name=btn value='조회하기'>
-        <input type=submit name=btn value="다음달 ▶▶">
-        </form>
-    </td></tr>
-</table>
-<table align=center width=1000 height=520 class='tb_layout bg0'>
-    <thead><tr><th colspan=5 align=center class='bg1'>중 원 지 도</th></tr></thead>
-    <tbody>
-    <tr height=520>
-        <td width=698>
-            <?=getMapHtml($mapTheme)?>
-        </td>
-        <td id='nation_list_frame'>
-            <table id='nation_list'>
-                <thead>
-                    <tr>
-                        <th width=130>국명</th>
-                        <th width=70>국력</th>
-                        <th width=45>장수</th>
-                        <th width=45>속령</th>
-                    </tr>
-                </thead>
-                <tbody>
-<?php foreach($nations as $nation): ?>
-                    <tr>
-                        <td><span style='color:<?=newColor($nation['color'])?>;background-color:<?=$nation['color']?>'><?=$nation['name']?></td>
-                        <td style='text-align:right'><?=number_format($nation['power'])?></td>
-                        <td style='text-align:right'><?=number_format($nation['gennum'])?></td>
-                        <td style='text-align:right'><?=number_format(count($nation['cities']??[]))?></td>
-                    </tr>
-<?php endforeach; ?>
-                </tbody>
-                <tfoot></tfoot>
-            </table>
-        </td>
-    </tr>
-    <tr><th colspan=5 align=center class='bg1'>중 원 정 세</th></tr>
-    <tr>
-        <td colspan=5 valign=top>
-            <?=formatHistoryToHTML(Json::decode($history['global_history']))?>
-        </td>
-    </tr>
-    <tr><th colspan=5 align=center class='bg1'>장 수 동 향</th></tr>
-    <tr>
-        <td colspan=5 valign=top>
-            <?=formatHistoryToHTML(Json::decode($history['global_action']))?>
-        </td>
-    </tr>
-    </tbody>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <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?>&serverID=<?=$serverID?>',
-    showMe:false,
-    neutralView:true,
-    useCachedMap:false,
-    year:<?=$year?>,
-    month:<?=$month?>,
-});
-</script>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>연 감<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>
+                    연월 선택 :
+                    <input type=submit name=btn value="◀◀ 이전달">
+                    <select id='yearmonth' name=yearmonth size=1>
+                        <option selected='selected'><?= $year ?>년 <?= $month ?>월</option>
+                        <option><?= $e_year ?>년 12월</option>
+                    </select>
+                    <input type=submit name=btn value='조회하기'>
+                    <input type=submit name=btn value="다음달 ▶▶">
+                </form>
+            </td>
+        </tr>
+    </table>
+    <table align=center width=1000 height=520 class='tb_layout bg0'>
+        <thead>
+            <tr>
+                <th colspan=5 align=center class='bg1'>중 원 지 도</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr height=520>
+                <td width=698>
+                    <?= getMapHtml($mapTheme) ?>
+                </td>
+                <td id='nation_list_frame'>
+                    <table id='nation_list'>
+                        <thead>
+                            <tr>
+                                <th width=130>국명</th>
+                                <th width=70>국력</th>
+                                <th width=45>장수</th>
+                                <th width=45>속령</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <?php foreach ($nations as $nation) : ?>
+                                <tr>
+                                    <td><span style='color:<?= newColor($nation['color']) ?>;background-color:<?= $nation['color'] ?>'><?= $nation['name'] ?></td>
+                                    <td style='text-align:right'><?= number_format($nation['power']) ?></td>
+                                    <td style='text-align:right'><?= number_format($nation['gennum']) ?></td>
+                                    <td style='text-align:right'><?= number_format(count($nation['cities'] ?? [])) ?></td>
+                                </tr>
+                            <?php endforeach; ?>
+                        </tbody>
+                        <tfoot></tfoot>
+                    </table>
+                </td>
+            </tr>
+            <tr>
+                <th colspan=5 align=center class='bg1'>중 원 정 세</th>
+            </tr>
+            <tr>
+                <td colspan=5 valign=top>
+                    <?= formatHistoryToHTML(Json::decode($history['global_history'])) ?>
+                </td>
+            </tr>
+            <tr>
+                <th colspan=5 align=center class='bg1'>장 수 동 향</th>
+            </tr>
+            <tr>
+                <td colspan=5 valign=top>
+                    <?= formatHistoryToHTML(Json::decode($history['global_action'])) ?>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <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 ?>&serverID=<?= $serverID ?>',
+            showMe: false,
+            neutralView: true,
+            useCachedMap: false,
+            year: <?= $year ?>,
+            month: <?= $month ?>,
+        });
+    </script>
 </body>
-</html>
+
+</html>

hwe/a_kingdomList.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -15,144 +16,151 @@ increaseRefresh("세력일람", 2);
 $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
 
 $con = checkLimit($me['con']);
-if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
+if ($con >= 2) {
+    printLimitMsg($me['turntime']);
+    exit();
+}
 ?>
 <!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::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/extKingdoms.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-
+    <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('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('ts', ['common', 'extKingdoms']) ?>
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>세 력 일 람<br><?=closeButton()?></td></tr>
-</table>
-<?php
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>세 력 일 람<br><?= closeButton() ?></td>
+        </tr>
+    </table>
+    <?php
 
-$nations = getAllNationStaticInfo();
-uasort($nations, function($lhs, $rhs){return $rhs['power']<=>$lhs['power'];});
+    $nations = getAllNationStaticInfo();
+    uasort($nations, function ($lhs, $rhs) {
+        return $rhs['power'] <=> $lhs['power'];
+    });
 
-$nations[0] = getNationStaticInfo(0);
+    $nations[0] = getNationStaticInfo(0);
 
-foreach($db->query('SELECT npc,name,city,nation,officer_level,penalty,permission FROM general ORDER BY dedication DESC') as $general){
-    $nationID = $general['nation'];
+    foreach ($db->query('SELECT npc,name,city,nation,officer_level,penalty,permission FROM general ORDER BY dedication DESC') as $general) {
+        $nationID = $general['nation'];
 
-    if(!key_exists('generals', $nations[$nationID])){
-        $nations[$nationID]['generals'] = [];
-    }
-    $nations[$nationID]['generals'][] = $general;
-}
-
-foreach ($db->queryAllLists('SELECT city, name, nation FROM city') as [$cityID, $cityName, $nationID]) {
-    if(!key_exists('cities', $nations[$nationID])){
-        $nations[$nationID]['cities'] = [];
-    }
-    $nations[$nationID]['cities'][$cityID] = $cityName;
-}
-
-foreach ($nations as $nation) {
-    if ($nation['nation'] == 0) {
-        //재야 도시, 장수
-        continue;
-    }
-    $generals = $nation['generals'];
-
-    $chiefs = [];
-    $ambassadors = [];
-    $auditors = [];
-    foreach($generals as $general){
-        $officerLevel = $general['officer_level'];
-        if($officerLevel >= 5){
-            $chiefs[$officerLevel] = $general;
-        }
-        $generalPermission = checkSecretPermission($general, false);
-        if($generalPermission == 4){
-            $ambassadors[] = $general['name'];
-        }
-        else if($generalPermission == 3){
-            $auditors[] = $general['name'];
+        if (!key_exists('generals', $nations[$nationID])) {
+            $nations[$nationID]['generals'] = [];
         }
+        $nations[$nationID]['generals'][] = $general;
     }
 
-    echo "
+    foreach ($db->queryAllLists('SELECT city, name, nation FROM city') as [$cityID, $cityName, $nationID]) {
+        if (!key_exists('cities', $nations[$nationID])) {
+            $nations[$nationID]['cities'] = [];
+        }
+        $nations[$nationID]['cities'][$cityID] = $cityName;
+    }
+
+    foreach ($nations as $nation) {
+        if ($nation['nation'] == 0) {
+            //재야 도시, 장수
+            continue;
+        }
+        $generals = $nation['generals'];
+
+        $chiefs = [];
+        $ambassadors = [];
+        $auditors = [];
+        foreach ($generals as $general) {
+            $officerLevel = $general['officer_level'];
+            if ($officerLevel >= 5) {
+                $chiefs[$officerLevel] = $general;
+            }
+            $generalPermission = checkSecretPermission($general, false);
+            if ($generalPermission == 4) {
+                $ambassadors[] = $general['name'];
+            } else if ($generalPermission == 3) {
+                $auditors[] = $general['name'];
+            }
+        }
+
+        echo "
 <table align=center width=1000 class='tb_layout bg2'>
     <tr>
-        <td colspan=8 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 {$nation['name']} 】</td>
+        <td colspan=8 align=center style=color:" . newColor($nation['color']) . "; bgcolor={$nation['color']}>【 {$nation['name']} 】</td>
     </tr>
     <tr>
         <td width=80 align=center class='bg1'>성 향</td>
-        <td width=170 align=center><font color=yellow>".getNationType($nation['type'])."</font></td>
+        <td width=170 align=center><font color=yellow>" . getNationType($nation['type']) . "</font></td>
         <td width=80 align=center class='bg1'>작 위</td>
-        <td width=170 align=center>".getNationLevel($nation['level'])."</td>
+        <td width=170 align=center>" . getNationLevel($nation['level']) . "</td>
         <td width=80 align=center class='bg1'>국 력</td>
         <td width=170 align=center>{$nation['power']}</td>
         <td width=80 align=center class='bg1'>장수 / 속령</td>
-        <td width=170 align=center>{$nation['gennum']} / ".count($nation['cities']??[])."</td>
+        <td width=170 align=center>{$nation['gennum']} / " . count($nation['cities'] ?? []) . "</td>
     ";
-    for($chiefLevel = 12; $chiefLevel >= 5; $chiefLevel--){
-        if($chiefLevel % 4 == 0){
-            echo '</tr><tr>';
-        }
-        $chief = $chiefs[$chiefLevel]??['name'=>'-','npc'=>0];
-        $officerLevelText = getOfficerLevelText($chiefLevel, $nation['level']);
-        $chiefText = getColoredName($chief['name'], $chief['npc']);
-        echo "<td class='center bg1'>{$officerLevelText}</td>
+        for ($chiefLevel = 12; $chiefLevel >= 5; $chiefLevel--) {
+            if ($chiefLevel % 4 == 0) {
+                echo '</tr><tr>';
+            }
+            $chief = $chiefs[$chiefLevel] ?? ['name' => '-', 'npc' => 0];
+            $officerLevelText = getOfficerLevelText($chiefLevel, $nation['level']);
+            $chiefText = getColoredName($chief['name'], $chief['npc']);
+            echo "<td class='center bg1'>{$officerLevelText}</td>
         <td class='center'>{$chiefText}</td>";
-    }
-    echo "</tr>
+        }
+        echo "</tr>
     <tr>
         <td align=center class='bg1'>외교권자</td><td colspan=5>";
-    echo join(', ', $ambassadors);
-    echo "</td><td align=center class='bg1'>조언자</td><td align=center >";
-    echo count($auditors).'명';
-    echo "</td></tr>
+        echo join(', ', $ambassadors);
+        echo "</td><td align=center class='bg1'>조언자</td><td align=center >";
+        echo count($auditors) . '명';
+        echo "</td></tr>
     <tr>
         <td colspan=8>";
-    if($nation['level'] > 0) {
-        echo "속령 일람 : ";
+        if ($nation['level'] > 0) {
+            echo "속령 일람 : ";
 
-        foreach($nation['cities'] as $cityID => $cityName) {
-            if($cityID == $nation['capital']) {
-                echo "<font color=cyan>[{$cityName}]</font>, ";
-            } else {
-                echo "{$cityName}, ";
+            foreach ($nation['cities'] as $cityID => $cityName) {
+                if ($cityID == $nation['capital']) {
+                    echo "<font color=cyan>[{$cityName}]</font>, ";
+                } else {
+                    echo "{$cityName}, ";
+                }
             }
-        }
-    } else {
-        $cityName = CityConst::byID($chiefs[12]['city'])->name;
+        } else {
+            $cityName = CityConst::byID($chiefs[12]['city'])->name;
 
-        echo "현재 위치 : <font color=yellow>{$cityName}</font>";
-    }
-    echo"
+            echo "현재 위치 : <font color=yellow>{$cityName}</font>";
+        }
+        echo "
         </td>
     </tr>
     <tr>
         <td colspan=8> 장수 일람 : ";
-    foreach($generals as $general){
-        if($general['npc'] >= 2) { echo "<font color=cyan>{$general['name']}</font>, "; }
-        elseif($general['npc'] == 1) { echo "<font color=skyblue>{$general['name']}</font>, "; }
-        else { echo "{$general['name']}, "; }
-    }
-    echo"
+        foreach ($generals as $general) {
+            if ($general['npc'] >= 2) {
+                echo "<font color=cyan>{$general['name']}</font>, ";
+            } elseif ($general['npc'] == 1) {
+                echo "<font color=skyblue>{$general['name']}</font>, ";
+            } else {
+                echo "{$general['name']}, ";
+            }
+        }
+        echo "
         </td>
     </tr>
 </table>
 <br>";
-}
+    }
 
-//재야
-echo "
+    //재야
+    echo "
 <table align=center width=1000 class='tb_layout bg2'>
     <tr>
         <td colspan=5 align=center>【 재 야 】</td>
@@ -162,33 +170,37 @@ echo "
         <td width=123 align=center class='bg1'>장 수</td>
         <td width=123 align=center>{$nations[0]['gennum']}</td>
         <td width=123 align=center class='bg1'>속 령</td>
-        <td width=123 align=center>".count($nations[0]['cities']??[])."</td>
+        <td width=123 align=center>" . count($nations[0]['cities'] ?? []) . "</td>
     </tr>
     <tr>
         <td colspan=5> 속령 일람 : ";
-foreach($nations[0]['cities']??[] as $cityName) {
-    echo "{$cityName}, ";
-}
-echo"
+    foreach ($nations[0]['cities'] ?? [] as $cityName) {
+        echo "{$cityName}, ";
+    }
+    echo "
         </td>
     </tr>
     <tr>
         <td colspan=5> 장수 일람 : ";
-    foreach($nations[0]['generals'] as $general) {
+    foreach ($nations[0]['generals'] as $general) {
         $generalText = getColoredName($general['name'], $general['npc']);
         echo "{$generalText}, ";
     }
-    echo"
+    echo "
         </td>
     </tr>
 </table>";
 
-?>
+    ?>
 
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>
 
-</html>
+</html>

hwe/a_npcList.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -6,7 +7,7 @@ include "func.php";
 
 $type = Util::getReq('type', 'int', 1);
 
-if($type <= 0 || $type > 8){
+if ($type <= 0 || $type > 8) {
     $type = 1;
 }
 
@@ -22,111 +23,117 @@ $sel[$type] = "selected";
 <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::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-
+    <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('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>빙 의 일 람<br><?=closeButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[1]??''?> value=1>이름</option>
-            <option <?=$sel[2]??''?> value=2>국가</option>
-            <option <?=$sel[3]??''?> value=3>종능</option>
-            <option <?=$sel[4]??''?> value=4>통솔</option>
-            <option <?=$sel[5]??''?> value=5>무력</option>
-            <option <?=$sel[6]??''?> value=6>지력</option>
-            <option <?=$sel[7]??''?> value=7>명성</option>
-            <option <?=$sel[8]??''?> value=8>계급</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<?php
-$nationName = [];
-$nationName[0] = "-";
-foreach (getAllNationStaticInfo() as $nation) {
-    $nationName[$nation['nation']] = $nation['name'];
-}
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>빙 의 일 람<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>정렬순서 :
+                    <select name=type size=1>
+                        <option <?= $sel[1] ?? '' ?> value=1>이름</option>
+                        <option <?= $sel[2] ?? '' ?> value=2>국가</option>
+                        <option <?= $sel[3] ?? '' ?> value=3>종능</option>
+                        <option <?= $sel[4] ?? '' ?> value=4>통솔</option>
+                        <option <?= $sel[5] ?? '' ?> value=5>무력</option>
+                        <option <?= $sel[6] ?? '' ?> value=6>지력</option>
+                        <option <?= $sel[7] ?? '' ?> value=7>명성</option>
+                        <option <?= $sel[8] ?? '' ?> value=8>계급</option>
+                    </select>
+                    <input type=submit value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <?php
+    $nationName = [];
+    $nationName[0] = "-";
+    foreach (getAllNationStaticInfo() as $nation) {
+        $nationName[$nation['nation']] = $nation['name'];
+    }
 
-$generalList = $db->query('SELECT npc,nation,name,owner_name,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1');
-$generalListFromPool = $db->query('SELECT npc,nation,name,owner_name,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general JOIN select_pool on general.no = select_pool.general_id where npc=0');
+    $generalList = $db->query('SELECT npc,nation,name,owner_name,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general where npc=1');
+    $generalListFromPool = $db->query('SELECT npc,nation,name,owner_name,special,special2,personal,leadership,strength,intel,leadership+strength+intel as sum,explevel,experience,dedication from general JOIN select_pool on general.no = select_pool.general_id where npc=0');
 
-if($generalListFromPool){
-    $generalList = array_merge($generalListFromPool, $generalList);
-}
+    if ($generalListFromPool) {
+        $generalList = array_merge($generalListFromPool, $generalList);
+    }
 
-$sortType = [
-    1 => ['name', true],
-    2 => ['nation', true],
-    3 => ['sum', false],
-    4 => ['leadership', false],
-    5 => ['strength', false],
-    6 => ['intel', false],
-    7 => ['experience', false],
-    8 => ['dedication', false],
-];
+    $sortType = [
+        1 => ['name', true],
+        2 => ['nation', true],
+        3 => ['sum', false],
+        4 => ['leadership', false],
+        5 => ['strength', false],
+        6 => ['intel', false],
+        7 => ['experience', false],
+        8 => ['dedication', false],
+    ];
 
-[$sortKey, $isAsc] = $sortType[$type];
+    [$sortKey, $isAsc] = $sortType[$type];
 
-if($isAsc){
-    usort($generalList, function($lhs, $rhs)use($sortKey){
-        return $lhs[$sortKey] <=> $rhs[$sortKey];
-    });
-}
-else{
-    usort($generalList, function($lhs, $rhs)use($sortKey){
-        return $rhs[$sortKey] <=> $lhs[$sortKey];
-    });
-}
+    if ($isAsc) {
+        usort($generalList, function ($lhs, $rhs) use ($sortKey) {
+            return $lhs[$sortKey] <=> $rhs[$sortKey];
+        });
+    } else {
+        usort($generalList, function ($lhs, $rhs) use ($sortKey) {
+            return $rhs[$sortKey] <=> $lhs[$sortKey];
+        });
+    }
 
-?>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr>
-        <td width=102  align=center class='bg1'>희생된 장수</td>
-        <td width=102  align=center class='bg1'>악령 이름</td>
-        <td width=68  align=center class='bg1'>레벨</td>
-        <td width=118 align=center class='bg1'>국가</td>
-        <td width=68  align=center class='bg1'>성격</td>
-        <td width=88  align=center class='bg1'>특기</td>
-        <td width=68  align=center class='bg1'>종능</td>
-        <td width=68  align=center class='bg1'>통솔</td>
-        <td width=68  align=center class='bg1'>무력</td>
-        <td width=68  align=center class='bg1'>지력</td>
-        <td width=78  align=center class='bg1'>명성</td>
-        <td width=78  align=center class='bg1'>계급</td>
-    </tr>
-<?php foreach($generalList as $general): ?>
-    <tr>
-        <td align=center><?=getColoredName($general['name'], $general['npc'])?></td>
-        <td align=center><?=$general['owner_name']?></td>
-        <td align=center>Lv <?=$general['explevel']?></td>
-        <td align=center><?=$nationName[$general['nation']]?></td>
-        <td align=center><?=displayCharInfo($general['personal'])?></td>
-        <td align=center><?=displaySpecialDomesticInfo($general['special'])?> / <?=displaySpecialWarInfo($general['special2'])?></td>
-        <td align=center><?=$general['sum']?></td>
-        <td align=center><?=$general['leadership']?></td>
-        <td align=center><?=$general['strength']?></td>
-        <td align=center><?=$general['intel']?></td>
-        <td align=center><?=$general['experience']?></td>
-        <td align=center><?=$general['dedication']?></td>
-    </tr>
-<?php endforeach; ?>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+    ?>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td width=102 align=center class='bg1'>희생된 장수</td>
+            <td width=102 align=center class='bg1'>악령 이름</td>
+            <td width=68 align=center class='bg1'>레벨</td>
+            <td width=118 align=center class='bg1'>국가</td>
+            <td width=68 align=center class='bg1'>성격</td>
+            <td width=88 align=center class='bg1'>특기</td>
+            <td width=68 align=center class='bg1'>종능</td>
+            <td width=68 align=center class='bg1'>통솔</td>
+            <td width=68 align=center class='bg1'>무력</td>
+            <td width=68 align=center class='bg1'>지력</td>
+            <td width=78 align=center class='bg1'>명성</td>
+            <td width=78 align=center class='bg1'>계급</td>
+        </tr>
+        <?php foreach ($generalList as $general) : ?>
+            <tr>
+                <td align=center><?= getColoredName($general['name'], $general['npc']) ?></td>
+                <td align=center><?= $general['owner_name'] ?></td>
+                <td align=center>Lv <?= $general['explevel'] ?></td>
+                <td align=center><?= $nationName[$general['nation']] ?></td>
+                <td align=center><?= displayCharInfo($general['personal']) ?></td>
+                <td align=center><?= displaySpecialDomesticInfo($general['special']) ?> / <?= displaySpecialWarInfo($general['special2']) ?></td>
+                <td align=center><?= $general['sum'] ?></td>
+                <td align=center><?= $general['leadership'] ?></td>
+                <td align=center><?= $general['strength'] ?></td>
+                <td align=center><?= $general['intel'] ?></td>
+                <td align=center><?= $general['experience'] ?></td>
+                <td align=center><?= $general['dedication'] ?></td>
+            </tr>
+        <?php endforeach; ?>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>
 
-</html>
+</html>

hwe/a_status.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -13,69 +14,75 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("세력도", 2);
 TurnExecutionHelper::executeAllCommand();
 
-$mapTheme = $gameStor->map_theme??'che';
+$mapTheme = $gameStor->map_theme ?? 'che';
 
 $me = $db->queryFirstRow('SELECT con,turntime from general where owner=%i', $userID);
 
 $con = checkLimit($me['con']);
-if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
+if ($con >= 2) {
+    printLimitMsg($me['turntime']);
+    exit();
+}
 ?>
 <!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::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printJS('d_shared/base_map.js')?>
-<?=WebUtil::printJS('dist_js/map.js')?>
-<script>
-window.serverNick = '<?=DB::prefix()?>';
-window.serverID = '<?=UniqueConst::$serverID?>';
-$(function(){
+    <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/normalize.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printCSS('css/map.css') ?>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printJS('d_shared/base_map.js') ?>
+    <?= WebUtil::printDist('ts', ['common', 'map']) ?>
+    <script>
+        window.serverNick = '<?= DB::prefix() ?>';
+        window.serverID = '<?= UniqueConst::$serverID ?>';
+        $(function() {
 
-    reloadWorldMap({
-        neutralView: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')?>
-<?=WebUtil::printCSS('css/map.css')?>
+            reloadWorldMap({
+                neutralView: true,
+                showMe: true,
+                useCachedMap: true
+            });
 
+        });
+    </script>
 </head>
 
 <body>
-<table align=center width=1200 class='tb_layout bg0'>
-    <tr><td>세 력 도<br><?=closeButton()?></td></tr>
-</table>
-<table align=center width=1200 height=520 class='tb_layout bg0'>
-    <tr height=520>
-        <td width=498 valign=top>
-            <?=formatHistoryToHTML(getGlobalActionLogRecent(34))?>
-        </td>
-        <td width=698>
-            <?=getMapHtml($mapTheme)?>
-        </td>
-    </tr>
-    <tr>
-        <td colspan=2 valign=top>
-            <?=formatHistoryToHTML(getGlobalHistoryLogRecent(34))?>
-        </td>
-    </tr>
-</table>
-<table align=center width=1200 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+    <table align=center width=1200 class='tb_layout bg0'>
+        <tr>
+            <td>세 력 도<br><?= closeButton() ?></td>
+        </tr>
+    </table>
+    <table align=center width=1200 height=520 class='tb_layout bg0'>
+        <tr height=520>
+            <td width=498 valign=top>
+                <?= formatHistoryToHTML(getGlobalActionLogRecent(34)) ?>
+            </td>
+            <td width=698>
+                <?= getMapHtml($mapTheme) ?>
+            </td>
+        </tr>
+        <tr>
+            <td colspan=2 valign=top>
+                <?= formatHistoryToHTML(getGlobalHistoryLogRecent(34)) ?>
+            </td>
+        </tr>
+    </table>
+    <table align=center width=1200 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
 
-</html>
+</html>

hwe/a_traffic.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -9,9 +10,9 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("갱신정보", 2);
 
-$admin = $gameStor->getValues(['year','month','refresh','maxrefresh','maxonline']);
+$admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxrefresh', 'maxonline']);
 
-$log = getRawFileLogRecent(__DIR__.'/logs/'.UniqueConst::$serverID.'/_traffic.txt', 11, 100);
+$log = getRawFileLogRecent(__DIR__ . '/logs/' . UniqueConst::$serverID . '/_traffic.txt', 11, 100);
 
 $date = [];
 $year = [];
@@ -20,7 +21,7 @@ $refresh = [];
 $online = [];
 
 $curonline = getOnlineNum();
-foreach($log as $i=>$value){
+foreach ($log as $i => $value) {
     $parse = Json::decode($value);
     $date[$i]    = $parse[0];
     $year[$i]    = $parse[1];
@@ -47,154 +48,180 @@ if ($admin['maxonline'] < $curonline) {
 ?>
 <!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=1024" />
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<style>
-.big_bar{
-    float:left;
-    position:relative;
-    height:30px;
-}
-.big_bar span{
-    float:right;
-    padding:0;
-    margin:0;
-    line-height:30px;
-    padding-right:1ch;
-}
+    <title><?= UniqueConst::$serverName ?>: 트래픽정보</title>
+    <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') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <style>
+        .big_bar {
+            float: left;
+            position: relative;
+            height: 30px;
+        }
 
-.little_bar{
-    float:left;
-    position:relative;
-    height:17px;
-}
+        .big_bar span {
+            float: right;
+            padding: 0;
+            margin: 0;
+            line-height: 30px;
+            padding-right: 1ch;
+        }
 
-span.out_bar{
-    line-height:30px;
-    margin-left:1ch;
-}
-</style>
+        .little_bar {
+            float: left;
+            position: relative;
+            height: 17px;
+        }
+
+        span.out_bar {
+            line-height: 30px;
+            margin-left: 1ch;
+        }
+    </style>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
+
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>트 래 픽 정 보<br><?=closeButton()?></td></tr>
-</table>
-<br>
-<table align=center width=1016>
-    <tr><td align=left>
-        <table align=center class='tb_layout bg0'>
-            <tr><td colspan=4 align=center class='bg2'><font size=5>접 속 량</font></td></tr>
-<?php
-$refresh[] = $admin['refresh'];
-foreach($refresh as $i=>$value){
-    $w = round($value / $admin['maxrefresh'] * 100, 1);
-    $color = getTrafficColor($w);
-    $dt = substr($date[$i], 11, 5); ?>
-            <tr height=30>
-                <td width=100 align=center><?=$year[$i]?>년 <?=$month[$i]?>월</td>
-                <td width=60 align=center class='bg2'><?=$dt?></td>
-                <td width=2 align=center class='bg1'></td>
-                <td width=320>
-                    <?php if($w == 0): ?>
-                        <span class="out_bar"><?=$value?></span>
-                    <?php elseif($w < 10): ?>
-                        <div class='big_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'></div><span class="out_bar"><?=$value?></span>
-                    <?php else:?>
-                        <div class='big_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'><span><?=$value?></span></div>
-                    <?php endif;?>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>트 래 픽 정 보<br><?= closeButton() ?></td>
+        </tr>
+    </table>
+    <br>
+    <table align=center width=1016>
+        <tr>
+            <td align=left>
+                <table align=center class='tb_layout bg0'>
+                    <tr>
+                        <td colspan=4 align=center class='bg2'>
+                            <font size=5>접 속 량</font>
+                        </td>
+                    </tr>
+                    <?php
+                    $refresh[] = $admin['refresh'];
+                    foreach ($refresh as $i => $value) {
+                        $w = round($value / $admin['maxrefresh'] * 100, 1);
+                        $color = getTrafficColor($w);
+                        $dt = substr($date[$i], 11, 5); ?>
+                        <tr height=30>
+                            <td width=100 align=center><?= $year[$i] ?>년 <?= $month[$i] ?>월</td>
+                            <td width=60 align=center class='bg2'><?= $dt ?></td>
+                            <td width=2 align=center class='bg1'></td>
+                            <td width=320>
+                                <?php if ($w == 0) : ?>
+                                    <span class="out_bar"><?= $value ?></span>
+                                <?php elseif ($w < 10) : ?>
+                                    <div class='big_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'></div><span class="out_bar"><?= $value ?></span>
+                                <?php else : ?>
+                                    <div class='big_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'><span><?= $value ?></span></div>
+                                <?php endif; ?>
 
+                            </td>
+                        </tr>
+                    <?php
+                    }
+                    ?>
+                    <tr>
+                        <td colspan=4 height=5 align=center class='bg1'></td>
+                    </tr>
+                    <tr>
+                        <td colspan=4 height=30 align=center class='bg0'>최고기록: <?= $admin['maxrefresh'] ?></td>
+                    </tr>
+
+
+                </table>
+            </td>
+            <td align=right>
+                <table align=center class='tb_layout bg0'>
+                    <tr>
+                        <td colspan=4 align=center class='bg2'>
+                            <font size=5>접 속 자</font>
+                        </td>
+                    </tr>
+                    <?php
+                    $online[] = $curonline;
+                    foreach ($online as $i => $value) {
+                        $w = round($value / $admin['maxonline'] * 100, 1);
+                        $color = getTrafficColor($w);
+                        $dt = substr($date[$i], 11, 5); ?>
+                        <tr height=30>
+                            <td width=100 align=center><?= $year[$i] ?>년 <?= $month[$i] ?>월</td>
+                            <td width=60 align=center class='bg2'><?= $dt ?></td>
+                            <td width=2 align=center class='bg1'></td>
+                            <td width=320>
+                                <?php if ($w == 0) : ?>
+                                    <span class="out_bar"><?= $value ?></span>
+                                <?php elseif ($w < 10) : ?>
+                                    <div class='big_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'></div><span class="out_bar"><?= $value ?></span>
+                                <?php else : ?>
+                                    <div class='big_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'><span><?= $value ?></span></div>
+                                <?php endif; ?>
+
+                            </td>
+                        </tr>
+                    <?php
+                    }
+                    ?>
+                    <tr>
+                        <td colspan=4 height=5 align=center class='bg1'></td>
+                    </tr>
+                    <tr>
+                        <td colspan=4 height=30 align=center class='bg0'>최고기록: <?= $admin['maxonline'] ?></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+    <br>
+    <table align=center class='tb_layout bg0'>
+        <tr>
+            <td colspan=3 align=center class='bg2'>
+                <font size=5>주 의 대 상 자 (순간과도갱신)</font>
+            </td>
+        </tr>
+        <?php
+        $max_refresh = $db->queryFirstRow('SELECT sum(refresh) as refresh, sum(`connect`) as `connect` from general');
+        $max_refresh['name'] = '접속자 총합';
+
+        $refresh_result = array_merge([$max_refresh], $db->query('SELECT `name`,refresh,`connect` FROM general ORDER BY refresh DESC LIMIT 5'));
+
+        foreach ($refresh_result as $i => $user) {
+            $w = round($user['refresh'] / max(1, $max_refresh['refresh']) * 100, 1);
+            $w2 = round(100 - $w, 1);
+            $color = getTrafficColor($w);
+        ?>
+            <tr>
+                <td width=98 align=center><?= $user['name'] ?></td>
+                <td width=98 align=center><?= $user['connect'] ?>(<?= $user['refresh'] ?>)</td>
+                <td width=798>
+                    <?php if ($w == 0) : ?>
+                    <?php elseif ($w < 10) : ?>
+                        <div class='little_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'></div>
+                    <?php else : ?>
+                        <div class='little_bar' style='width:<?= $w ?>%;background-color:<?= $color ?>;'></div>
+                    <?php endif; ?>
                 </td>
             </tr>
-<?php
-}
-?>
-            <tr><td colspan=4 height=5 align=center class='bg1'></td></tr>
-            <tr>
-                <td colspan=4 height=30 align=center class='bg0'>최고기록: <?=$admin['maxrefresh']?></td>
-            </tr>
-
-
-        </table>
-    </td>
-    <td align=right>
-        <table align=center class='tb_layout bg0'>
-            <tr><td colspan=4 align=center class='bg2'><font size=5>접 속 자</font></td></tr>
-<?php
-$online[] = $curonline;
-foreach($online as $i=>$value){
-    $w = round($value / $admin['maxonline'] * 100, 1);
-    $color = getTrafficColor($w);
-    $dt = substr($date[$i], 11, 5); ?>
-            <tr height=30>
-                <td width=100 align=center><?=$year[$i]?>년 <?=$month[$i]?>월</td>
-                <td width=60 align=center class='bg2'><?=$dt?></td>
-                <td width=2 align=center class='bg1'></td>
-                <td width=320>
-                    <?php if($w == 0): ?>
-                        <span class="out_bar"><?=$value?></span>
-                    <?php elseif($w < 10): ?>
-                        <div class='big_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'></div><span class="out_bar"><?=$value?></span>
-                    <?php else:?>
-                        <div class='big_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'><span><?=$value?></span></div>
-                    <?php endif;?>
-
-                </td>
-            </tr>
-<?php
-}
-?>
-            <tr><td colspan=4 height=5 align=center class='bg1'></td></tr>
-            <tr>
-                <td colspan=4 height=30 align=center class='bg0'>최고기록: <?=$admin['maxonline']?></td>
-            </tr>
-        </table>
-    </td></tr>
-</table>
-<br>
-<table align=center class='tb_layout bg0'>
-    <tr><td colspan=3 align=center class='bg2'><font size=5>주 의 대 상 자 (순간과도갱신)</font></td></tr>
-<?php
-$max_refresh = $db->queryFirstRow('SELECT sum(refresh) as refresh, sum(`connect`) as `connect` from general');
-$max_refresh['name'] = '접속자 총합';
-
-$refresh_result = array_merge([$max_refresh], $db->query('SELECT `name`,refresh,`connect` FROM general ORDER BY refresh DESC LIMIT 5'));
-
-foreach ($refresh_result as $i=>$user) {
-    $w = round($user['refresh'] / max(1, $max_refresh['refresh']) * 100, 1);
-    $w2 = round(100 - $w, 1);
-    $color = getTrafficColor($w);
-?>
-    <tr>
-        <td width=98  align=center><?=$user['name']?></td>
-        <td width=98  align=center><?=$user['connect']?>(<?=$user['refresh']?>)</td>
-        <td width=798>
-            <?php if($w == 0): ?>
-            <?php elseif($w < 10): ?>
-                <div class='little_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'></div>
-            <?php else:?>
-                <div class='little_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'></div>
-            <?php endif;?>
-        </td>
-    </tr>
-<?php
-}
-?>
-</table>
-<br>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+        <?php
+        }
+        ?>
+    </table>
+    <br>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
+
 </html>
 
 <?php
@@ -203,7 +230,7 @@ function getTrafficColor($per)
     $r = getHex($per);
     $b = getHex(100 - $per);
     $color = $r . "00" . $b;
-    return '#'.$color;
+    return '#' . $color;
 }
 
 function getHex($dec)
@@ -217,9 +244,37 @@ function getHex($dec)
 function getHexCode($hex)
 {
     switch ($hex) {
-    case  0: return "0";    case  1: return "1";    case  2: return "2";    case  3: return "3";
-    case  4: return "4";    case  5: return "5";    case  6: return "6";    case  7: return "7";
-    case  8: return "8";    case  9: return "9";    case 10: return "A";    case 11: return "B";
-    case 12: return "C";    case 13: return "D";    case 14: return "E";    case 15: return "F";
+        case  0:
+            return "0";
+        case  1:
+            return "1";
+        case  2:
+            return "2";
+        case  3:
+            return "3";
+        case  4:
+            return "4";
+        case  5:
+            return "5";
+        case  6:
+            return "6";
+        case  7:
+            return "7";
+        case  8:
+            return "8";
+        case  9:
+            return "9";
+        case 10:
+            return "A";
+        case 11:
+            return "B";
+        case 12:
+            return "C";
+        case 13:
+            return "D";
+        case 14:
+            return "E";
+        case 15:
+            return "F";
     }
 }

hwe/a_vote.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -11,154 +12,160 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("설문조사", 1);
 
-$isVoteAdmin = in_array('vote', $session->acl[DB::prefix()]??[]);
+$isVoteAdmin = in_array('vote', $session->acl[DB::prefix()] ?? []);
 $isVoteAdmin = $isVoteAdmin || $session->userGrade >= 5;
 
 $me = $db->queryFirstRow('SELECT no,vote from general where owner=%i', $userID);
 
-$admin = $gameStor->getValues(['develcost','voteopen','vote_title','vote','votecomment']);
-$vote_title = $admin['vote_title']??'-';
-$vote = $admin['vote']?:['-'];
+$admin = $gameStor->getValues(['develcost', 'voteopen', 'vote_title', 'vote', 'votecomment']);
+$vote_title = $admin['vote_title'] ?? '-';
+$vote = $admin['vote'] ?: ['-'];
 
 ?>
 <!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=1024" />
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<style>
-.little_bar{
-    float:left;
-    position:relative;
-    height:17px;
-    line-height:17px;
-    text-align:center;
-}
-</style>
-<script type="text/javascript">
-function captureKey(e) {
-    if(e.keyCode == 13 && e.srcElement.type == 'text') {
-        form1.btn.value = '댓글';
-        form1.btn.click();
-        return false;
-    }
-}
-</script>
+    <title><?= UniqueConst::$serverName ?>: 설문조사</title>
+    <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') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <style>
+        .little_bar {
+            float: left;
+            position: relative;
+            height: 17px;
+            line-height: 17px;
+            text-align: center;
+        }
+    </style>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('ts', ['common']) ?>
+    <script type="text/javascript">
+        function captureKey(e) {
+            if (e.keyCode == 13 && e.srcElement.type == 'text') {
+                form1.btn.value = '댓글';
+                form1.btn.click();
+                return false;
+            }
+        }
+    </script>
 
 </head>
-<body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>설 문 조 사<br><?=closeButton()?></td></tr>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-<form name=form1 action=c_vote.php method=post>
-    <tr><td colspan=3 align=center class='bg2'><font size=5>설 문 조 사 (<?=$admin['develcost']*5?>금과 추첨으로 유니크템 증정!)</font></td></tr>
-<?php
 
-if ($isVoteAdmin) {
-    echo "
+<body>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>설 문 조 사<br><?= closeButton() ?></td>
+        </tr>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <form name=form1 action=c_vote.php method=post>
+            <tr>
+                <td colspan=3 align=center class='bg2'>
+                    <font size=5>설 문 조 사 (<?= $admin['develcost'] * 5 ?>금과 추첨으로 유니크템 증정!)</font>
+                </td>
+            </tr>
+            <?php
+
+            if ($isVoteAdmin) {
+                echo "
     <tr>
         <td width=48  align=center><input type=submit name=btn value='알림'></td>
         <td width=98  align=center><input type=submit name=btn value='수정'></td>
         <td width=848 align=left><input type=text name=title style=width:848px;></td>
     </tr>
     ";
-}
+            }
 
-$vote_title = Tag2Code($vote_title);
-echo "
+            $vote_title = Tag2Code($vote_title);
+            echo "
     <tr>
         <td colspan=2 width=148 align=center class='bg1'>제 목</td>
         <td width=848 align=left>&nbsp;{$vote_title}</td>
     </tr>
 ";
 
-$voteCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote>0 AND npc<2');
-$allCount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc<2');
+            $voteCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote>0 AND npc<2');
+            $allCount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc<2');
 
-$percentage = round($voteCount / $allCount * 100, 1);
+            $percentage = round($voteCount / $allCount * 100, 1);
 
-$voteTypeCount = count($vote);
-for ($i=1; $i < $voteTypeCount; $i++) {
-    echo "
+            $voteTypeCount = count($vote);
+            for ($i = 1; $i < $voteTypeCount; $i++) {
+                echo "
     <tr>
-        <td width=48 align=center style=color:".getNewColor($i)."; bgcolor=".getVoteColor($i).">{$i}.</td>
+        <td width=48 align=center style=color:" . getNewColor($i) . "; bgcolor=" . getVoteColor($i) . ">{$i}.</td>
         <td width=98 align=center>
     ";
-    if ($me['vote'] == 0 && $me['no'] > 0) {
-        echo "
+                if ($me['vote'] == 0 && $me['no'] > 0) {
+                    echo "
             <input type=radio name=sel value={$i}>
         ";
-    } elseif ($admin['voteopen'] >= 1 || $isVoteAdmin) {
-        $vCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote=%i', $i);
+                } elseif ($admin['voteopen'] >= 1 || $isVoteAdmin) {
+                    $vCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote=%i', $i);
 
-        $per = @round($vCount / $voteCount * 100, 1);
-        echo "{$vCount} 표 ({$per}%)";
-    } else {
-        echo "추후공개";
-    }
-    $vote[$i] = Tag2Code($vote[$i]);
-    echo "
+                    $per = @round($vCount / $voteCount * 100, 1);
+                    echo "{$vCount} 표 ({$per}%)";
+                } else {
+                    echo "추후공개";
+                }
+                $vote[$i] = Tag2Code($vote[$i]);
+                echo "
         </td>
         <td align=left>&nbsp;{$vote[$i]}</td>
     </tr>
     ";
-}
+            }
 
-echo "
+            echo "
     <tr>
 ";
-if ($me['vote'] == 0 && $me['no'] > 0) {
-    echo "
+            if ($me['vote'] == 0 && $me['no'] > 0) {
+                echo "
         <td align=center>투표</td>
         <td align=center><input type=submit name=btn value='투표'></td>
     ";
-} else {
-    echo "
+            } else {
+                echo "
         <td colspan=2 align=center>결산</td>
     ";
-}
-echo "
+            }
+            echo "
         <td align=left>&nbsp;투표율 : {$voteCount} / {$allCount} ({$percentage} %)</td>
     </tr>
 ";
 
-if ($isVoteAdmin) {
-    echo "
+            if ($isVoteAdmin) {
+                echo "
     <tr>
         <td align=center><input type=submit name=btn value='리셋'></td>
         <td align=center><input type=submit name=btn value='추가'></td>
         <td align=left><input type=text name=str style=width:848px;></td>
     </tr>
     ";
-}
+            }
 
-if ($admin['votecomment']) {
-    $comment = $admin['votecomment'];
-    $commentCount = count($comment);
-} else {
-    $commentCount = 0;
-}
-echo "
+            if ($admin['votecomment']) {
+                $comment = $admin['votecomment'];
+                $commentCount = count($comment);
+            } else {
+                $commentCount = 0;
+            }
+            echo "
 </table>
 <table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td colspan=4 align=center class='bg1'>댓 글</td>
     </tr>
 ";
-for ($i=0; $i < $commentCount; $i++) {
-    $cmt = $comment[$i];
-    $cmt[2] = Tag2Code($cmt[2]);
-    $j = $i+1;
-    echo "
+            for ($i = 0; $i < $commentCount; $i++) {
+                $cmt = $comment[$i];
+                $cmt[2] = Tag2Code($cmt[2]);
+                $j = $i + 1;
+                echo "
     <tr>
         <td width=28  align=center>{$j}.</td>
         <td width=130  align=center>{$cmt[0]}</td>
@@ -166,202 +173,205 @@ for ($i=0; $i < $commentCount; $i++) {
         <td width=712 align=left>&nbsp;{$cmt[2]}</td>
     </tr>
     ";
-}
-if ($me['no'] > 0) {
-    echo "
+            }
+            if ($me['no'] > 0) {
+                echo "
     <tr>
         <td width=158 colspan=2 align=center>-</td>
         <td width=130  align=center><input type=submit name=btn value='댓글'></td>
         <td align=left><input type=text name=comment maxlength=60 style=width:700px; onkeydown='return captureKey(event)'></td>
     </tr>
     ";
-}
-?>
-</table>
-<br>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td colspan=3 align=center class='bg2'><font size=5>
-        전 체 통 계
-<?php
-if ($isVoteAdmin) {
-    echo "
+            }
+            ?>
+    </table>
+    <br>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td colspan=3 align=center class='bg2'>
+                <font size=5>
+                    전 체 통 계
+                    <?php
+                    if ($isVoteAdmin) {
+                        echo "
         <input type=submit name=btn value='숨김'>
         <input type=submit name=btn value='전체통계만'>
         <input type=submit name=btn value='전부'>";
-}
-echo "
+                    }
+                    echo "
     </font></td></tr>";
 
-if ($admin['voteopen'] >= 1 || $isVoteAdmin) {
-    echo "
+                    if ($admin['voteopen'] >= 1 || $isVoteAdmin) {
+                        echo "
     <tr>
         <td width=130  align=center>전 체</td>
         <td width=128 align=center>{$voteCount} / {$allCount} ({$percentage} %)</td>
         <td width=742>
     ";
 
-    $memCount = max(1, $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2'));
+                        $memCount = max(1, $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2'));
 
-    $totalVote = [];
-    $nationVoteCount = [];
-    $nationVote = [];
+                        $totalVote = [];
+                        $nationVoteCount = [];
+                        $nationVote = [];
 
-    foreach ($db->query("SELECT nation, vote, count(`no`) as cnt FROM general WHERE npc<2 GROUP BY nation, vote") as $row) {
-        $nation = $row['nation'];
-        $ownVote = $row['vote'];
-        $cnt = $row['cnt'];
+                        foreach ($db->query("SELECT nation, vote, count(`no`) as cnt FROM general WHERE npc<2 GROUP BY nation, vote") as $row) {
+                            $nation = $row['nation'];
+                            $ownVote = $row['vote'];
+                            $cnt = $row['cnt'];
 
-        if (!isset($totalVote[$ownVote])) {
-            $totalVote[$ownVote] = 0;
-        }
+                            if (!isset($totalVote[$ownVote])) {
+                                $totalVote[$ownVote] = 0;
+                            }
 
-        if (!isset($nationVoteCount[$nation])) {
-            $nationVoteCount[$nation] = 0;
-            $nationVote[$nation] = [];
-        }
+                            if (!isset($nationVoteCount[$nation])) {
+                                $nationVoteCount[$nation] = 0;
+                                $nationVote[$nation] = [];
+                            }
 
-        if (!isset($nationVote[$nation][$ownVote])) {
-            $nationVote[$nation][$ownVote] = 0;
-        }
+                            if (!isset($nationVote[$nation][$ownVote])) {
+                                $nationVote[$nation][$ownVote] = 0;
+                            }
 
-        $totalVote[$ownVote] += $cnt;
-        $nationVoteCount[$nation] += $cnt;
-        $nationVote[$nation][$ownVote] += $cnt;
-    }
+                            $totalVote[$ownVote] += $cnt;
+                            $nationVoteCount[$nation] += $cnt;
+                            $nationVote[$nation][$ownVote] += $cnt;
+                        }
 
-    $totalPer = 0;
-    for ($i=0; $i < $voteTypeCount; $i++) {
-        $per = round(($totalVote[$i]??0) * 100 / $memCount, 1);
-        if($i == $voteTypeCount-1){
-            $per = 100-$totalPer;
-        }
-        else{
-            $totalPer += $per;
-        }
+                        $totalPer = 0;
+                        for ($i = 0; $i < $voteTypeCount; $i++) {
+                            $per = round(($totalVote[$i] ?? 0) * 100 / $memCount, 1);
+                            if ($i == $voteTypeCount - 1) {
+                                $per = 100 - $totalPer;
+                            } else {
+                                $totalPer += $per;
+                            }
 
 
-//        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-?>
-        <?php if($per == 0): ?>
-        <?php elseif($per < 10): ?>
-            <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($i)?>;background-color:<?=getVoteColor($i)?>;'></div>
-        <?php else:?>
-            <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($i)?>;background-color:<?=getVoteColor($i)?>;'><?=$totalVote[$i]?></div>
-        <?php endif;?>
-<?php
-    }
+                            //        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
+                    ?>
+                            <?php if ($per == 0) : ?>
+                            <?php elseif ($per < 10) : ?>
+                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'></div>
+                            <?php else : ?>
+                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'><?= $totalVote[$i] ?></div>
+                            <?php endif; ?>
+                        <?php
+                        }
 
-    echo "
+                        echo "
         </td>
     </tr>
     ";
-}
+                    }
 
-if ($admin['voteopen'] >= 2 || $isVoteAdmin) {
-    $memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=0 AND npc <2');
-    if ($memCount == 0) {
-        $memCount = 1;
-    }
+                    if ($admin['voteopen'] >= 2 || $isVoteAdmin) {
+                        $memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=0 AND npc <2');
+                        if ($memCount == 0) {
+                            $memCount = 1;
+                        }
 
-    if (!isset($nationVoteCount[0])) {
-        $nationVoteCount[0] = 0;
-    }
-    $percentage = round($nationVoteCount[0] / $memCount * 100, 1);
+                        if (!isset($nationVoteCount[0])) {
+                            $nationVoteCount[0] = 0;
+                        }
+                        $percentage = round($nationVoteCount[0] / $memCount * 100, 1);
 
-    echo "
+                        echo "
     <tr>
         <td align=center bgcolor=black>재 야</td>
         <td align=center>{$nationVoteCount[0]} / {$memCount} ({$percentage} %)</td>
         <td>
     ";
 
-    $totalPer = 0;
-    for ($i=0; $i < $voteTypeCount; $i++) {
-        $per = round(Util::array_get($nationVote[0][$i], 0) / $memCount * 100, 1);
-        if($i == $voteTypeCount-1){
-            $per = 100-$totalPer;
-        }
-        else{
-            $totalPer += $per;
-        }
-//        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-?>
-            <?php if($per == 0): ?>
-            <?php elseif($per < 10): ?>
-                <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($i)?>;background-color:<?=getVoteColor($i)?>;'></div>
-            <?php else:?>
-                <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($i)?>;background-color:<?=getVoteColor($i)?>;'><?=$nationVote[0][$i]?></div>
-            <?php endif;?>
-<?php
-    }
+                        $totalPer = 0;
+                        for ($i = 0; $i < $voteTypeCount; $i++) {
+                            $per = round(Util::array_get($nationVote[0][$i], 0) / $memCount * 100, 1);
+                            if ($i == $voteTypeCount - 1) {
+                                $per = 100 - $totalPer;
+                            } else {
+                                $totalPer += $per;
+                            }
+                            //        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
+                        ?>
+                            <?php if ($per == 0) : ?>
+                            <?php elseif ($per < 10) : ?>
+                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'></div>
+                            <?php else : ?>
+                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'><?= $nationVote[0][$i] ?></div>
+                            <?php endif; ?>
+                            <?php
+                        }
 
-    echo "
+                        echo "
         </td>
     </tr>
     ";
 
-    foreach($db->query('SELECT nation,color,name,gennum from nation order by gennum desc') as $i=>$nation){
-        $memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc<2', $nation['nation']);
+                        foreach ($db->query('SELECT nation,color,name,gennum from nation order by gennum desc') as $i => $nation) {
+                            $memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc<2', $nation['nation']);
 
 
 
-        $voteCount = $nationVoteCount[$nation['nation']] ?? 0;
-        if($memCount == 0){
-            $percentage = 100;
-        }
-        else{
-            $percentage = round($voteCount / $memCount * 100, 1);
-        }
+                            $voteCount = $nationVoteCount[$nation['nation']] ?? 0;
+                            if ($memCount == 0) {
+                                $percentage = 100;
+                            } else {
+                                $percentage = round($voteCount / $memCount * 100, 1);
+                            }
 
 
-        echo "
+                            echo "
     <tr>
-        <td align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>{$nation['name']}</td>
+        <td align=center style=color:" . newColor($nation['color']) . "; bgcolor={$nation['color']}>{$nation['name']}</td>
         <td align=center>{$voteCount} / {$memCount} ({$percentage} %)</td>
         <td align=center>
         ";
 
-        $totalPer = 0;
-        for ($k=0; $k < $voteTypeCount; $k++) {
-            if($memCount == 0){
-                $per = 0;
-                continue;
-            }
+                            $totalPer = 0;
+                            for ($k = 0; $k < $voteTypeCount; $k++) {
+                                if ($memCount == 0) {
+                                    $per = 0;
+                                    continue;
+                                }
 
-            $per = round(($nationVote[$nation['nation']][$k]??0) / $memCount * 100, 1);
+                                $per = round(($nationVote[$nation['nation']][$k] ?? 0) / $memCount * 100, 1);
 
-            if($i == $voteTypeCount-1){
-                $per = 100-$totalPer;
-            }
-            else{
-                $totalPer += $per;
-            }
+                                if ($i == $voteTypeCount - 1) {
+                                    $per = 100 - $totalPer;
+                                } else {
+                                    $totalPer += $per;
+                                }
 
-//            if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-?>
-            <?php if($per == 0): ?>
-            <?php elseif($per < 10): ?>
-                <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($k)?>;background-color:<?=getVoteColor($k)?>;'></div>
-            <?php else:?>
-                <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($k)?>;background-color:<?=getVoteColor($k)?>;'><?=$nationVote[$nation['nation']][$k]??0?></div>
-            <?php endif;?>
-<?php
-        }
+                                //            if($per < 5) { $vote['cnt'] = "&nbsp;"; }
+                            ?>
+                                <?php if ($per == 0) : ?>
+                                <?php elseif ($per < 10) : ?>
+                                    <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($k) ?>;background-color:<?= getVoteColor($k) ?>;'></div>
+                                <?php else : ?>
+                                    <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($k) ?>;background-color:<?= getVoteColor($k) ?>;'><?= $nationVote[$nation['nation']][$k] ?? 0 ?></div>
+                                <?php endif; ?>
+                    <?php
+                            }
 
-        echo "
+                            echo "
         </td>
     </tr>
         ";
-    }
-}
-?>
-</form>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+                        }
+                    }
+                    ?>
+                    </form>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
+
 </html>
 
 <?php
@@ -372,15 +382,31 @@ function getVoteColor($type)
     }
 
     switch ($type) {
-    default:
-    case 0: $color = "black"; break;
-    case 1: $color = "red"; break;
-    case 2: $color = "orange"; break;
-    case 3: $color = "yellow"; break;
-    case 4: $color = "green"; break;
-    case 5: $color = "blue"; break;
-    case 6: $color = "navy"; break;
-    case 7: $color = "purple"; break;
+        default:
+        case 0:
+            $color = "black";
+            break;
+        case 1:
+            $color = "red";
+            break;
+        case 2:
+            $color = "orange";
+            break;
+        case 3:
+            $color = "yellow";
+            break;
+        case 4:
+            $color = "green";
+            break;
+        case 5:
+            $color = "blue";
+            break;
+        case 6:
+            $color = "navy";
+            break;
+        case 7:
+            $color = "purple";
+            break;
     }
 
     return $color;
@@ -393,9 +419,15 @@ function getNewColor($type)
     }
 
     switch ($type) {
-    case 2: $color = "black"; break;
-    case 3: $color = "black"; break;
-    default:$color = "white"; break;
+        case 2:
+            $color = "black";
+            break;
+        case 3:
+            $color = "black";
+            break;
+        default:
+            $color = "white";
+            break;
     }
 
     return $color;

hwe/b_auction.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -44,63 +45,73 @@ if ($msg2 == "") {
 ?>
 <!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=1024" />
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-</head>
-<body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>거 래 장<br><?=closeButton()?></td></tr>
-    <tr><td align=center class='bg2'><font color=orange size=6><b>거 래 장</b></font><input type=button value='갱신' onclick="location.replace('b_auction.php')"></td></tr>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-<form method=post action=c_auction.php>
-    <tr><td colspan=11 align=center bgcolor=orange><font size=5>팝 니 다</font></td></tr>
-    <tr align=center class='bg1'>
-        <td width=68>거래번호</td>
-        <td width=48>선택</td>
-        <td width=98>판매자</td>
-        <td width=118>물품</td>
-        <td width=88>수량</td>
-        <td width=88>시작판매가</td>
-        <td width=88>현재판매가</td>
-        <td width=88>즉시판매가</td>
-        <td width=48>단가</td>
-        <td width=98>구매 예정자</td>
-        <td width=148>거래종료</td>
-    </tr>
-<?php
-$chk = 0;
-foreach($db->query('SELECT * from auction where type=0 order by expire') as $auction){
-    $radio = "";
-    $alert = "";
-    $alert2 = "";
-    if ($auction['no1'] == $me['no']) {
-        $radio = " disabled";
-    } elseif ($auction['no2'] > 0 && $auction['amount'] * 2 <= $auction['value']) {
-        $radio = " disabled";
-        $alert = "<font color=red>";
-        $alert2 = "</font>";
-    } elseif ($auction['no2'] > 0 && $auction['topv'] <= $auction['value']) {
-        $radio = " disabled";
-        $alert = "<font color=red>";
-        $alert2 = "</font>";
-    } elseif ($chk == 0) {
-        $radio = " checked";
-        $chk = 1;
-    }
-    $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
-    $pv = substr((string)$pv, 0, 4);
 
-    echo "
+<head>
+    <title><?= UniqueConst::$serverName ?>: 거래장</title>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('ts', ['common']) ?>
+</head>
+
+<body>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>거 래 장<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td align=center class='bg2'>
+                <font color=orange size=6><b>거 래 장</b></font><input type=button value='갱신' onclick="location.replace('b_auction.php')">
+            </td>
+        </tr>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <form method=post action=c_auction.php>
+            <tr>
+                <td colspan=11 align=center bgcolor=orange>
+                    <font size=5>팝 니 다</font>
+                </td>
+            </tr>
+            <tr align=center class='bg1'>
+                <td width=68>거래번호</td>
+                <td width=48>선택</td>
+                <td width=98>판매자</td>
+                <td width=118>물품</td>
+                <td width=88>수량</td>
+                <td width=88>시작판매가</td>
+                <td width=88>현재판매가</td>
+                <td width=88>즉시판매가</td>
+                <td width=48>단가</td>
+                <td width=98>구매 예정자</td>
+                <td width=148>거래종료</td>
+            </tr>
+            <?php
+            $chk = 0;
+            foreach ($db->query('SELECT * from auction where type=0 order by expire') as $auction) {
+                $radio = "";
+                $alert = "";
+                $alert2 = "";
+                if ($auction['no1'] == $me['no']) {
+                    $radio = " disabled";
+                } elseif ($auction['no2'] > 0 && $auction['amount'] * 2 <= $auction['value']) {
+                    $radio = " disabled";
+                    $alert = "<font color=red>";
+                    $alert2 = "</font>";
+                } elseif ($auction['no2'] > 0 && $auction['topv'] <= $auction['value']) {
+                    $radio = " disabled";
+                    $alert = "<font color=red>";
+                    $alert2 = "</font>";
+                } elseif ($chk == 0) {
+                    $radio = " checked";
+                    $chk = 1;
+                }
+                $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
+                $pv = substr((string)$pv, 0, 4);
+
+                echo "
     <tr align=center>
         <td>{$auction['no']}</td>
         <td><input type=radio name=sel value={$auction['no']}{$radio}></td>
@@ -115,79 +126,83 @@ foreach($db->query('SELECT * from auction where type=0 order by expire') as $auc
         <td>{$auction['expire']}</td>
     </tr>
     ";
-}
-?>
-    <tr height=25>
-        <td align=center class='bg1'>등록결과</td>
-        <td colspan=10><?=ConvertLog($msg)?></td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'>입찰등록</td>
-        <td colspan=10>
-            　지불할 금액: <input type=text style=color:white;background-color:black; size=6 maxlength=6 name=value>
-            <input type=<?=$btn?> name=btn value='구매시도' onclick='return confirm("정말 입찰하시겠습니까?");'>
-        </td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'>거래등록</td>
-        <td colspan=10>
-            　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
-            　물품: 쌀
-            　판매량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
-            　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=500>
-            　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=2000>
-            <input type=<?=$btn?> name=btn value='판매' onclick='return confirm("정말 판매하시겠습니까?");'>
-        </td>
-    </tr>
-    <tr>
-        <td colspan=11>
-            ㆍ<font color=cyan>Hint</font>) 거래자가 판매(물품 판매, 금 수령), 입찰자가 구매(물품 구입, 금 지불).<br>
-            ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 높을수록 판매자 유리.<br>
-            ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 낮을수록 입찰자 유리.<br>
-        </td>
-    </tr>
-</form>
-</table>
-<br>
-<table align=center width=1000 class='tb_layout bg0'>
-<form method=post action=c_auction.php>
-    <tr><td colspan=11 align=center bgcolor=skyblue><font size=5>삽 니 다</font></td></tr>
-    <tr align=center class='bg1'>
-        <td width=68>거래번호</td>
-        <td width=48>선택</td>
-        <td width=98>구매자</td>
-        <td width=118>물품</td>
-        <td width=88>수량</td>
-        <td width=88>시작구매가</td>
-        <td width=88>현재구매가</td>
-        <td width=88>즉시구매가</td>
-        <td width=48>단가</td>
-        <td width=98>판매 예정자</td>
-        <td width=148>거래종료</td>
-    </tr>
-<?php
-$chk = 0;
-foreach($db->query('SELECT * from auction where type=1 order by expire') as $auction){
-    $radio = "";
-    $alert = "";
-    $alert2 = "";
-    if ($auction['no1'] == $me['no']) {
-        $radio = " disabled";
-    } elseif ($auction['no2'] > 0 && $auction['amount'] >= $auction['value'] * 2) {
-        $radio = " disabled";
-        $alert = "<font color=red>";
-        $alert2 = "</font>";
-    } elseif ($auction['no2'] > 0 && $auction['topv'] >= $auction['value']) {
-        $radio = " disabled";
-        $alert = "<font color=red>";
-        $alert2 = "</font>";
-    } elseif ($chk == 0) {
-        $radio = " checked";
-        $chk = 1;
-    }
-    $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
-    $pv = substr((string)$pv, 0, 4);
-    echo "
+            }
+            ?>
+            <tr height=25>
+                <td align=center class='bg1'>등록결과</td>
+                <td colspan=10><?= ConvertLog($msg) ?></td>
+            </tr>
+            <tr>
+                <td align=center class='bg1'>입찰등록</td>
+                <td colspan=10>
+                    　지불할 금액: <input type=text style=color:white;background-color:black; size=6 maxlength=6 name=value>
+                    <input type=<?= $btn ?> name=btn value='구매시도' onclick='return confirm("정말 입찰하시겠습니까?");'>
+                </td>
+            </tr>
+            <tr>
+                <td align=center class='bg1'>거래등록</td>
+                <td colspan=10>
+                    　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
+                    　물품: 쌀
+                    　판매량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
+                    　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=500>
+                    　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=2000>
+                    <input type=<?= $btn ?> name=btn value='판매' onclick='return confirm("정말 판매하시겠습니까?");'>
+                </td>
+            </tr>
+            <tr>
+                <td colspan=11>
+                    ㆍ<font color=cyan>Hint</font>) 거래자가 판매(물품 판매, 금 수령), 입찰자가 구매(물품 구입, 금 지불).<br>
+                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 높을수록 판매자 유리.<br>
+                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 낮을수록 입찰자 유리.<br>
+                </td>
+            </tr>
+        </form>
+    </table>
+    <br>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <form method=post action=c_auction.php>
+            <tr>
+                <td colspan=11 align=center bgcolor=skyblue>
+                    <font size=5>삽 니 다</font>
+                </td>
+            </tr>
+            <tr align=center class='bg1'>
+                <td width=68>거래번호</td>
+                <td width=48>선택</td>
+                <td width=98>구매자</td>
+                <td width=118>물품</td>
+                <td width=88>수량</td>
+                <td width=88>시작구매가</td>
+                <td width=88>현재구매가</td>
+                <td width=88>즉시구매가</td>
+                <td width=48>단가</td>
+                <td width=98>판매 예정자</td>
+                <td width=148>거래종료</td>
+            </tr>
+            <?php
+            $chk = 0;
+            foreach ($db->query('SELECT * from auction where type=1 order by expire') as $auction) {
+                $radio = "";
+                $alert = "";
+                $alert2 = "";
+                if ($auction['no1'] == $me['no']) {
+                    $radio = " disabled";
+                } elseif ($auction['no2'] > 0 && $auction['amount'] >= $auction['value'] * 2) {
+                    $radio = " disabled";
+                    $alert = "<font color=red>";
+                    $alert2 = "</font>";
+                } elseif ($auction['no2'] > 0 && $auction['topv'] >= $auction['value']) {
+                    $radio = " disabled";
+                    $alert = "<font color=red>";
+                    $alert2 = "</font>";
+                } elseif ($chk == 0) {
+                    $radio = " checked";
+                    $chk = 1;
+                }
+                $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
+                $pv = substr((string)$pv, 0, 4);
+                echo "
     <tr align=center>
         <td>{$auction['no']}</td>
         <td><input type=radio name=sel value={$auction['no']}{$radio}></td>
@@ -202,73 +217,90 @@ foreach($db->query('SELECT * from auction where type=1 order by expire') as $auc
         <td>{$auction['expire']}</td>
     </tr>
     ";
-}
-?>
-    <tr height=25>
-        <td align=center class='bg1'>등록결과</td>
-        <td colspan=10><?=ConvertLog($msg2)?></td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'>입찰등록</td>
-        <td colspan=10>
-            　수령할 금액: <input type=text style=color:white;background-color:black; size=6 maxlength=6 name=value>
-            <input type=<?=$btn?> name=btn value='판매시도' onclick='return confirm("정말 입찰하시겠습니까?");'>
-        </td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'>거래등록</td>
-        <td colspan=10>
-            　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
-            　물품: 쌀
-            　구입량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
-            　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=2000>
-            　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=500>
-            <input type=<?=$btn?> name=btn value='구매' onclick='return confirm("정말 구매하시겠습니까?");'>
-        </td>
-    </tr>
-    <tr>
-        <td colspan=11>
-            ㆍ<font color=cyan>Hint</font>) 거래자가 구매(물품 구매, 금 지불), 입찰자가 판매(물품 판매, 금 수령).<br>
-            ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 낮을수록 구매자 유리.<br>
-            ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 높을수록 입찰자 유리.<br>
-        </td>
-    </tr>
-</form>
-</table>
-<br>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td align=center class='bg2'><font size=5>최 근 기 록</font></td></tr>
-    <tr><td>
-    <?=getAuctionLogRecent(20)?>
-    </td></tr>
-    <tr><td align=center class='bg2'><font size=5>도 움 말</font></td></tr>
-    <tr><td>
-        <font color=white size=2>
-ㆍ판매거래는 거래자가 판매할 물품을 거래하면, 구입을 희망하는 사람이 현재가보다 높게 입찰하여 구입하는 방식입니다.<br>
-ㆍ<font color=cyan>Hint</font>) 쌀이 귀한 경우는 입찰자가 많아서 자연스레 단가가 오르게 됩니다. (해당 물품을 사려는 가격이 오름)<br>
-ㆍ<font color=cyan>Hint</font>) 쌀이 흔한 경우는 초기 가격을 낮게 책정해야 판매가 가능할 겁니다.<br>
-ㆍ구매거래는 거래자가 구입할 물품을 거래하면, 판매를 희망하는 사람이 현재가보다 낮게 입찰하여 판매하는 방식입니다.<br>
-ㆍ<font color=cyan>Hint</font>) 쌀이 흔한 경우는 입찰자가 많아서 자연스레 단가가 내리게 됩니다. (해당 물품을 팔려는 가격이 내림)<br>
-ㆍ<font color=cyan>Hint</font>) 쌀이 귀한 경우는 초기 가격을 높게 책정해야 구입이 가능할 겁니다.<br>
-ㆍ마감임박때 입찰하는 경우 입찰후 1턴 후로 종료시간이 연장됩니다.<br>
-ㆍ즉시구매가로 입찰하는 경우 입찰후 1턴 후로 종료시간이 결정됩니다.<br>
-ㆍ악용 방지를 위해 50% ~ 200%의 가격에서 거래시작이 가능합니다.<br>
-ㆍ악용 방지를 위해 즉시판매가는 110% 이상, 즉시구매가는 90% 이하의 시세로 가능합니다.<br>
-ㆍ악용 방지를 위해 즉시판매가는 시작판매가의 110% 이상, 즉시구매가는 시작구매가의 90% 이하로 가능합니다.<br>
-ㆍ1인당 도합 1건의 거래와 입찰이 가능합니다.<br>
-ㆍ기본금쌀 1000은 거래에 사용되지 못합니다.<br>
-ㆍ유찰될 때는 거래 과실자에게 거래금의 1%가 벌금으로 부과됩니다.<br>
-ㆍ<font color=magenta>10단위로 거래가 가능합니다. 1자리는 반올림 처리 됩니다.</font><br>
-ㆍ<font color=red>★ 최고가 거래 ★</font> 혹은 <font color=red>★ 최저가 거래 ★</font> 는 암거래 및 악용의 가능성이니 감시 부탁드립니다.<br>
-ㆍ거래와 입찰은 취소가 불가능하니 주의하세요!<br>
-ㆍ<font color=cyan>Hint</font>) 단가는 금/쌀로 쌀1을 거래하기 위한 금의 양입니다.<br>
-ㆍ<font color=cyan>Hint</font>) 단가가 높으면(>1.00) 쌀이 비싸므로 판매가 이득입니다.<br>
-ㆍ<font color=cyan>Hint</font>) 단가가 낮으면(<1.00) 금이 비싸므로 구매가 이득입니다.<br>
-ㆍ즐거운 거래!
-        </font>
-    </td></tr>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+            }
+            ?>
+            <tr height=25>
+                <td align=center class='bg1'>등록결과</td>
+                <td colspan=10><?= ConvertLog($msg2) ?></td>
+            </tr>
+            <tr>
+                <td align=center class='bg1'>입찰등록</td>
+                <td colspan=10>
+                    　수령할 금액: <input type=text style=color:white;background-color:black; size=6 maxlength=6 name=value>
+                    <input type=<?= $btn ?> name=btn value='판매시도' onclick='return confirm("정말 입찰하시겠습니까?");'>
+                </td>
+            </tr>
+            <tr>
+                <td align=center class='bg1'>거래등록</td>
+                <td colspan=10>
+                    　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
+                    　물품: 쌀
+                    　구입량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
+                    　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=2000>
+                    　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=500>
+                    <input type=<?= $btn ?> name=btn value='구매' onclick='return confirm("정말 구매하시겠습니까?");'>
+                </td>
+            </tr>
+            <tr>
+                <td colspan=11>
+                    ㆍ<font color=cyan>Hint</font>) 거래자가 구매(물품 구매, 금 지불), 입찰자가 판매(물품 판매, 금 수령).<br>
+                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 낮을수록 구매자 유리.<br>
+                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 높을수록 입찰자 유리.<br>
+                </td>
+            </tr>
+        </form>
+    </table>
+    <br>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td align=center class='bg2'>
+                <font size=5>최 근 기 록</font>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <?= getAuctionLogRecent(20) ?>
+            </td>
+        </tr>
+        <tr>
+            <td align=center class='bg2'>
+                <font size=5>도 움 말</font>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <font color=white size=2>
+                    ㆍ판매거래는 거래자가 판매할 물품을 거래하면, 구입을 희망하는 사람이 현재가보다 높게 입찰하여 구입하는 방식입니다.<br>
+                    ㆍ<font color=cyan>Hint</font>) 쌀이 귀한 경우는 입찰자가 많아서 자연스레 단가가 오르게 됩니다. (해당 물품을 사려는 가격이 오름)<br>
+                    ㆍ<font color=cyan>Hint</font>) 쌀이 흔한 경우는 초기 가격을 낮게 책정해야 판매가 가능할 겁니다.<br>
+                    ㆍ구매거래는 거래자가 구입할 물품을 거래하면, 판매를 희망하는 사람이 현재가보다 낮게 입찰하여 판매하는 방식입니다.<br>
+                    ㆍ<font color=cyan>Hint</font>) 쌀이 흔한 경우는 입찰자가 많아서 자연스레 단가가 내리게 됩니다. (해당 물품을 팔려는 가격이 내림)<br>
+                    ㆍ<font color=cyan>Hint</font>) 쌀이 귀한 경우는 초기 가격을 높게 책정해야 구입이 가능할 겁니다.<br>
+                    ㆍ마감임박때 입찰하는 경우 입찰후 1턴 후로 종료시간이 연장됩니다.<br>
+                    ㆍ즉시구매가로 입찰하는 경우 입찰후 1턴 후로 종료시간이 결정됩니다.<br>
+                    ㆍ악용 방지를 위해 50% ~ 200%의 가격에서 거래시작이 가능합니다.<br>
+                    ㆍ악용 방지를 위해 즉시판매가는 110% 이상, 즉시구매가는 90% 이하의 시세로 가능합니다.<br>
+                    ㆍ악용 방지를 위해 즉시판매가는 시작판매가의 110% 이상, 즉시구매가는 시작구매가의 90% 이하로 가능합니다.<br>
+                    ㆍ1인당 도합 1건의 거래와 입찰이 가능합니다.<br>
+                    ㆍ기본금쌀 1000은 거래에 사용되지 못합니다.<br>
+                    ㆍ유찰될 때는 거래 과실자에게 거래금의 1%가 벌금으로 부과됩니다.<br>
+                    ㆍ<font color=magenta>10단위로 거래가 가능합니다. 1자리는 반올림 처리 됩니다.</font><br>
+                    ㆍ<font color=red>★ 최고가 거래 ★</font> 혹은 <font color=red>★ 최저가 거래 ★</font> 는 암거래 및 악용의 가능성이니 감시 부탁드립니다.<br>
+                    ㆍ거래와 입찰은 취소가 불가능하니 주의하세요!<br>
+                    ㆍ<font color=cyan>Hint</font>) 단가는 금/쌀로 쌀1을 거래하기 위한 금의 양입니다.<br>
+                    ㆍ<font color=cyan>Hint</font>) 단가가 높으면(>1.00) 쌀이 비싸므로 판매가 이득입니다.<br>
+                    ㆍ<font color=cyan>Hint</font>) 단가가 낮으면(<1.00) 금이 비싸므로 구매가 이득입니다.<br>
+                        ㆍ즐거운 거래!
+                </font>
+            </td>
+        </tr>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>

hwe/b_battleCenter.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -6,7 +7,7 @@ include "func.php";
 
 $v = new Validator($_POST + $_GET);
 $v->rule('required', 'gen')
-->rule('integer', 'gen');
+    ->rule('integer', 'gen');
 
 $btn = Util::getReq('btn');
 $gen = Util::getReq('gen', 'int', 0);
@@ -14,24 +15,24 @@ $reqQueryType = Util::getReq('query_type', 'string', null);
 
 // $queryTypeText, $reqArgType(0=>None, 1=>AdditionalColumn, 2=>rankVal, 3=>aux), $comp
 $queryMap = [
-    'turntime' => ['최근턴', 0, function($lhs, $rhs){
-        return -($lhs['turntime']<=>$rhs['turntime']);
+    'turntime' => ['최근턴', 0, function ($lhs, $rhs) {
+        return - ($lhs['turntime'] <=> $rhs['turntime']);
     }],
-    'recent_war' => ['최근전투', 1, function($lhs, $rhs){
-        return -($lhs['recent_war']<=>$rhs['recent_war']);
+    'recent_war' => ['최근전투', 1, function ($lhs, $rhs) {
+        return - ($lhs['recent_war'] <=> $rhs['recent_war']);
     }],
-    'name' => ['장수명', 0, function($lhs, $rhs){
-        if($lhs['npc'] !== $rhs['npc']){
-            return $lhs['npc']<=>$rhs['npc'];
+    'name' => ['장수명', 0, function ($lhs, $rhs) {
+        if ($lhs['npc'] !== $rhs['npc']) {
+            return $lhs['npc'] <=> $rhs['npc'];
         }
-        return $lhs['name']<=>$rhs['name'];
+        return $lhs['name'] <=> $rhs['name'];
     }],
-    'warnum' => ['전투수', 2, function($lhs, $rhs){
-        return -($lhs['warnum']<=>$rhs['warnum']);
+    'warnum' => ['전투수', 2, function ($lhs, $rhs) {
+        return - ($lhs['warnum'] <=> $rhs['warnum']);
     }]
 ];
 
-if($reqQueryType === null || !key_exists($reqQueryType, $queryMap)){
+if ($reqQueryType === null || !key_exists($reqQueryType, $queryMap)) {
     $reqQueryType = Util::array_first_key($queryMap);
 }
 
@@ -60,11 +61,10 @@ if ($con >= 2) {
 }
 
 $permission = checkSecretPermission($me);
-if($permission < 0){
+if ($permission < 0) {
     echo '국가에 소속되어있지 않습니다.';
     die();
-}
-else if ($permission < 1) {
+} else if ($permission < 1) {
     echo "권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.";
     die();
 }
@@ -80,34 +80,33 @@ if ($btn == '정렬하기') {
 
 
 [$queryTypeText, $reqArgType, $comp] = $queryMap[$reqQueryType];
-if($reqArgType===0){
+if ($reqArgType === 0) {
     $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level FROM general WHERE nation = %i', $nationID);
-}
-else if($reqArgType===1){
+} else if ($reqArgType === 1) {
     $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, %b FROM general WHERE nation = %i', $reqQueryType, $nationID);
-}
-else if($reqArgType===2){
-    $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, value as %b
+} else if ($reqArgType === 2) {
+    $generalBasicList = $db->query(
+        'SELECT no, name, npc, turntime, officer_level, value as %b
         FROM general LEFT JOIN rank_data
         ON general.no = rank_data.general_id
         WHERE rank_data.type = %s AND general.nation = %i',
-        $reqQueryType, $reqQueryType, $nationID
+        $reqQueryType,
+        $reqQueryType,
+        $nationID
     );
-}
-else if($reqArgType===3){
-    $generalBasicList = array_map(function($arr){
+} else if ($reqArgType === 3) {
+    $generalBasicList = array_map(function ($arr) {
         $arr['aux'] = Json::decode($arr['aux']);
         return $arr;
     }, $db->query('SELECT no, name, npc, turntime, officer_level, aux FROM general WHERE nation = %i', $nationID));
-}
-else{
+} else {
     throw new \sammo\MustNotBeReachedException();
 }
 
 
 usort($generalBasicList, $comp);
 
-if(!$gen){
+if (!$gen) {
     $gen = $generalBasicList[0]['no'];
 }
 $showGeneral = General::createGeneralObjFromDB($gen);
@@ -116,83 +115,103 @@ $showGeneral = General::createGeneralObjFromDB($gen);
 <html>
 
 <head>
-<title><?=UniqueConst::$serverName?>: 감찰부</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <title><?= UniqueConst::$serverName ?>: 감찰부</title>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('ts', ['common']) ?>
 
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>감 찰 부<br><?=closeButton()?></td></tr>
-    <tr><td>
-        <form name=form1 method=post>
-        정렬순서 :
-        <select name='query_type' size=1>
-<?php foreach($queryMap as $queryType => [$queryTypeText,]): ?>
-    <option  <?=$queryType==$reqQueryType?'selected':''?> value='<?=$queryType?>'><?=$queryTypeText?></option>
-<?php endforeach; ?>
-        </select>
-        <input type=submit name=btn value='정렬하기'>
-        대상장수 :
-        <select name=gen size=1>
-<?php foreach($generalBasicList as $general): ?>
-    <option <?=$gen==$general['no']?'selected':''?> value='<?=$general['no']?>'><?=$general['officer_level']>4?"*{$general['name']}*":$general['name']?> (<?=substr($general['turntime'], 14, 5)?>)</option>
-<?php endforeach; ?>
-        </select>
-        <input type=submit name=btn value='조회하기'>
-        </form>
-    </td></tr>
-</table>
-<table width=1000 align=center class='tb_layout bg0'>
-    <tr>
-        <td width=50% align=center class='bg1'><font color=skyblue size=3>장 수 정 보</font></td>
-        <td width=50% align=center class='bg1'><font color=orange size=3>장 수 열 전</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?php generalInfo($showGeneral); generalInfo2($showGeneral); ?>
-        </td>
-        <td valign=top>
-            <?=formatHistoryToHTML(getGeneralHistoryLogAll($gen))?>
-        </td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'><font color=orange size=3>전투 기록</font></td>
-        <td align=center class='bg1'><font color=orange size=3>전투 결과</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?=formatHistoryToHTML(getBattleDetailLogRecent($gen, 24))?>
-        </td>
-        <td valign=top>
-            <?=formatHistoryToHTML(getBattleResultRecent($gen, 24))?>
-        </td>
-    </tr>
-<?php if($showGeneral->getNPCType() > 1 || $permission >= 2): ?>
-    <tr>
-        <td align=center class='bg1'><font color=orange size=3>개인 기록</font></td>
-        <td align=center class='bg1'><font color=orange size=3>&nbsp;</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?=formatHistoryToHTML(getGeneralActionLogRecent($gen, 24))?>
-        </td>
-        <td valign=top>
-        </td>
-    </tr>
-<?php endif; ?>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>감 찰 부<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>
+                    정렬순서 :
+                    <select name='query_type' size=1>
+                        <?php foreach ($queryMap as $queryType => [$queryTypeText,]) : ?>
+                            <option <?= $queryType == $reqQueryType ? 'selected' : '' ?> value='<?= $queryType ?>'><?= $queryTypeText ?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <input type=submit name=btn value='정렬하기'>
+                    대상장수 :
+                    <select name=gen size=1>
+                        <?php foreach ($generalBasicList as $general) : ?>
+                            <option <?= $gen == $general['no'] ? 'selected' : '' ?> value='<?= $general['no'] ?>'><?= $general['officer_level'] > 4 ? "*{$general['name']}*" : $general['name'] ?> (<?= substr($general['turntime'], 14, 5) ?>)</option>
+                        <?php endforeach; ?>
+                    </select>
+                    <input type=submit name=btn value='조회하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <table width=1000 align=center class='tb_layout bg0'>
+        <tr>
+            <td width=50% align=center class='bg1'>
+                <font color=skyblue size=3>장 수 정 보</font>
+            </td>
+            <td width=50% align=center class='bg1'>
+                <font color=orange size=3>장 수 열 전</font>
+            </td>
+        </tr>
+        <tr>
+            <td valign=top>
+                <?php generalInfo($showGeneral);
+                generalInfo2($showGeneral); ?>
+            </td>
+            <td valign=top>
+                <?= formatHistoryToHTML(getGeneralHistoryLogAll($gen)) ?>
+            </td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>
+                <font color=orange size=3>전투 기록</font>
+            </td>
+            <td align=center class='bg1'>
+                <font color=orange size=3>전투 결과</font>
+            </td>
+        </tr>
+        <tr>
+            <td valign=top>
+                <?= formatHistoryToHTML(getBattleDetailLogRecent($gen, 24)) ?>
+            </td>
+            <td valign=top>
+                <?= formatHistoryToHTML(getBattleResultRecent($gen, 24)) ?>
+            </td>
+        </tr>
+        <?php if ($showGeneral->getNPCType() > 1 || $permission >= 2) : ?>
+            <tr>
+                <td align=center class='bg1'>
+                    <font color=orange size=3>개인 기록</font>
+                </td>
+                <td align=center class='bg1'>
+                    <font color=orange size=3>&nbsp;</font>
+                </td>
+            </tr>
+            <tr>
+                <td valign=top>
+                    <?= formatHistoryToHTML(getGeneralActionLogRecent($gen, 24)) ?>
+                </td>
+                <td valign=top>
+                </td>
+            </tr>
+        <?php endif; ?>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>

hwe/b_betting.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -26,7 +27,7 @@ $me = $db->queryFirstRow('SELECT no,tournament,con,turntime from general where o
 $myBetTotal = array_sum($myBet);
 $globalBetTotal = array_sum($globalBet);
 
-$admin = $gameStor->getValues(['tournament','phase','tnmt_type','develcost']);
+$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'develcost']);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -35,21 +36,42 @@ if ($con >= 2) {
 }
 
 switch ($admin['tnmt_type']) {
-default: throw new \RuntimeException('Invalid tnmt_type');
-case 0: $tnmt_type = "<font color=cyan>전력전</font>"; $tp = "total"; $tp2 = "종합"; $tp3 = "total"; break;
-case 1: $tnmt_type = "<font color=cyan>통솔전</font>"; $tp = "leadership"; $tp2 = "통솔"; $tp3 = "leadership"; break;
-case 2: $tnmt_type = "<font color=cyan>일기토</font>"; $tp = "strength"; $tp2 = "무력"; $tp3 = "strength"; break;
-case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "intel"; $tp2 = "지력"; $tp3 = "intel"; break;
+    default:
+        throw new \RuntimeException('Invalid tnmt_type');
+    case 0:
+        $tnmt_type = "<font color=cyan>전력전</font>";
+        $tp = "total";
+        $tp2 = "종합";
+        $tp3 = "total";
+        break;
+    case 1:
+        $tnmt_type = "<font color=cyan>통솔전</font>";
+        $tp = "leadership";
+        $tp2 = "통솔";
+        $tp3 = "leadership";
+        break;
+    case 2:
+        $tnmt_type = "<font color=cyan>일기토</font>";
+        $tp = "strength";
+        $tp2 = "무력";
+        $tp3 = "strength";
+        break;
+    case 3:
+        $tnmt_type = "<font color=cyan>설전</font>";
+        $tp = "intel";
+        $tp2 = "지력";
+        $tp3 = "intel";
+        break;
 }
 
 $str1 = getTournament($admin['tournament']);
 $str2 = getTournamentTime();
-if($str2){
-    $str2 = ', '.$str2;
+if ($str2) {
+    $str2 = ', ' . $str2;
 }
 $str3 = getTournamentTerm();
-if($str3){
-    $str3 = ', '.$str3;
+if ($str3) {
+    $str3 = ', ' . $str3;
 }
 
 ?>
@@ -58,305 +80,346 @@ if($str3){
 <?php if ($con == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
+
 <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('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/betting.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <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('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('ts', ['common', 'betting']) ?>
 </head>
 
 <body>
-<table align=center width=1120 class='tb_layout bg0'>
-    <tr><td>베 팅 장<br><?=closeButton()?></td></tr>
-</table>
-<table align=center width=1120 class='tb_layout bg0'>
-    <tr><td colspan=16><input type=button value='갱신' onclick='location.reload()'></td></tr>
-    <tr><td colspan=16 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.$str2.$str3?>)</font></td></tr>
-    <tr><td height=50 colspan=16 align=center class='bg2'><font color=limegreen size=6>16강 상황</font><br><font color=orange size=3>(전체 금액 : <?=$globalBetTotal?> / 내 투자 금액 : <?=$myBetTotal?>)</font></td></tr>
-</table>
-<table align=center width=1120 class='mimic_flex bg0' style='border:solid 1px gray;font-size:10px;'>
-    <tr align=center><td height=10 colspan=16></td></tr>
-    <tr align=center>
-<?php
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=60 order by grp, grp_no LIMIT 1');
-while(count($generalList) < 1){
-    $generalList[] = [
-        'name'=>'-',
-        'npc'=>0,
-        'win'=>0
-    ];
-}
-foreach($generalList as $i=>$general){
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    echo "<td colspan=16>{$general['name']}</td>";
-}
+    <table align=center width=1120 class='tb_layout bg0'>
+        <tr>
+            <td>베 팅 장<br><?= closeButton() ?></td>
+        </tr>
+    </table>
+    <table align=center width=1120 class='tb_layout bg0'>
+        <tr>
+            <td colspan=16><input type=button value='갱신' onclick='location.reload()'></td>
+        </tr>
+        <tr>
+            <td colspan=16 align=center>
+                <font color=white size=6><?= $tnmt_type ?> (<?= $str1 . $str2 . $str3 ?>)</font>
+            </td>
+        </tr>
+        <tr>
+            <td height=50 colspan=16 align=center class='bg2'>
+                <font color=limegreen size=6>16강 상황</font><br>
+                <font color=orange size=3>(전체 금액 : <?= $globalBetTotal ?> / 내 투자 금액 : <?= $myBetTotal ?>)</font>
+            </td>
+        </tr>
+    </table>
+    <table align=center width=1120 class='mimic_flex bg0' style='border:solid 1px gray;font-size:10px;'>
+        <tr align=center>
+            <td height=10 colspan=16></td>
+        </tr>
+        <tr align=center>
+            <?php
+            $generalList = $db->query('SELECT npc,name,win from tournament where grp>=60 order by grp, grp_no LIMIT 1');
+            while (count($generalList) < 1) {
+                $generalList[] = [
+                    'name' => '-',
+                    'npc' => 0,
+                    'win' => 0
+                ];
+            }
+            foreach ($generalList as $i => $general) {
+                if ($general['name'] == "") {
+                    $general['name'] = "-";
+                }
+                if ($general['npc'] >= 2) {
+                    $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
+                } elseif ($general['npc'] == 1) {
+                    $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
+                }
+                echo "<td colspan=16>{$general['name']}</td>";
+            }
 
-echo "
+            echo "
     </tr>
     <tr align=center>";
 
-$cent = [];
-$line = [];
-$gen = [];
-for ($i=0; $i < 1; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=50 order by grp, grp_no LIMIT 2');
-while(count($generalList) < 2){
-    $generalList[] = [
-        'name'=>'-',
-        'npc'=>0,
-        'win'=>0
-    ];
-}
-foreach($generalList as $i=>$general){
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 1; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━━━━━━━━━━━━━━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━━━━━━━━━━━━━━━━━━━┓"."</font>";
-    echo "<td colspan=16>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+            $cent = [];
+            $line = [];
+            $gen = [];
+            for ($i = 0; $i < 1; $i++) {
+                $cent[$i] = "<font color=white>";
+            }
+            $generalList = $db->query('SELECT npc,name,win from tournament where grp>=50 order by grp, grp_no LIMIT 2');
+            while (count($generalList) < 2) {
+                $generalList[] = [
+                    'name' => '-',
+                    'npc' => 0,
+                    'win' => 0
+                ];
+            }
+            foreach ($generalList as $i => $general) {
+                if ($general['name'] == "") {
+                    $general['name'] = "-";
+                }
+                if ($general['npc'] >= 2) {
+                    $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
+                } elseif ($general['npc'] == 1) {
+                    $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
+                }
+                if ($general['win'] > 0) {
+                    $line[$i] = "<font color=red>";
+                    $cent[intdiv($i, 2)] = "<font color=red>";
+                } else {
+                    $line[$i] = "<font color=white>";
+                }
+                $gen[$i] = $general['name'];
+            }
+            for ($i = 0; $i < 1; $i++) {
+                $cent[$i] = $cent[$i] . "┻" . "</font>";
+                $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━━━━━━━━━━━━━━━━━━━" . "</font>";
+                $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━━━━━━━━━━━━━━━━━━━┓" . "</font>";
+                echo "<td colspan=16>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+            }
+            echo "
     </tr>
     <tr align=center>";
 
-for ($i=0; $i < 2; $i++) {
-    echo "<td colspan=8>{$gen[$i]}</td>";
-}
+            for ($i = 0; $i < 2; $i++) {
+                echo "<td colspan=8>{$gen[$i]}</td>";
+            }
 
-echo "
+            echo "
     </tr>
     <tr align=center>";
 
-for ($i=0; $i < 2; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=40 order by grp, grp_no LIMIT 4');
-while(count($generalList) < 4){
-    $generalList[] = [
-        'name'=>'-',
-        'npc'=>0,
-        'win'=>0
-    ];
-}
-foreach($generalList as $i=>$general){
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 2; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━━━━━┓"."</font>";
-    echo "<td colspan=8>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+            for ($i = 0; $i < 2; $i++) {
+                $cent[$i] = "<font color=white>";
+            }
+            $generalList = $db->query('SELECT npc,name,win from tournament where grp>=40 order by grp, grp_no LIMIT 4');
+            while (count($generalList) < 4) {
+                $generalList[] = [
+                    'name' => '-',
+                    'npc' => 0,
+                    'win' => 0
+                ];
+            }
+            foreach ($generalList as $i => $general) {
+                if ($general['name'] == "") {
+                    $general['name'] = "-";
+                }
+                if ($general['npc'] >= 2) {
+                    $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
+                } elseif ($general['npc'] == 1) {
+                    $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
+                }
+                if ($general['win'] > 0) {
+                    $line[$i] = "<font color=red>";
+                    $cent[intdiv($i, 2)] = "<font color=red>";
+                } else {
+                    $line[$i] = "<font color=white>";
+                }
+                $gen[$i] = $general['name'];
+            }
+            for ($i = 0; $i < 2; $i++) {
+                $cent[$i] = $cent[$i] . "┻" . "</font>";
+                $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━━━━━" . "</font>";
+                $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━━━━━┓" . "</font>";
+                echo "<td colspan=8>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+            }
+            echo "
     </tr>
     <tr align=center>";
 
-for ($i=0; $i < 4; $i++) {
-    echo "<td colspan=4>{$gen[$i]}</td>";
-}
+            for ($i = 0; $i < 4; $i++) {
+                echo "<td colspan=4>{$gen[$i]}</td>";
+            }
 
-echo "
+            echo "
     </tr>
     <tr align=center>";
 
-for ($i=0; $i < 4; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=30 order by grp, grp_no LIMIT 8');
-while(count($generalList) < 8){
-    $generalList[] = [
-        'name'=>'-',
-        'npc'=>0,
-        'win'=>0
-    ];
-}
-foreach($generalList as $i=>$general){
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 4; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━┓"."</font>";
-    echo "<td colspan=4>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+            for ($i = 0; $i < 4; $i++) {
+                $cent[$i] = "<font color=white>";
+            }
+            $generalList = $db->query('SELECT npc,name,win from tournament where grp>=30 order by grp, grp_no LIMIT 8');
+            while (count($generalList) < 8) {
+                $generalList[] = [
+                    'name' => '-',
+                    'npc' => 0,
+                    'win' => 0
+                ];
+            }
+            foreach ($generalList as $i => $general) {
+                if ($general['name'] == "") {
+                    $general['name'] = "-";
+                }
+                if ($general['npc'] >= 2) {
+                    $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
+                } elseif ($general['npc'] == 1) {
+                    $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
+                }
+                if ($general['win'] > 0) {
+                    $line[$i] = "<font color=red>";
+                    $cent[intdiv($i, 2)] = "<font color=red>";
+                } else {
+                    $line[$i] = "<font color=white>";
+                }
+                $gen[$i] = $general['name'];
+            }
+            for ($i = 0; $i < 4; $i++) {
+                $cent[$i] = $cent[$i] . "┻" . "</font>";
+                $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━" . "</font>";
+                $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━┓" . "</font>";
+                echo "<td colspan=4>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+            }
+            echo "
     </tr>
     <tr align=center>";
 
-for ($i=0; $i < 8; $i++) {
-    echo "<td colspan=2>{$gen[$i]}</td>";
-}
+            for ($i = 0; $i < 8; $i++) {
+                echo "<td colspan=2>{$gen[$i]}</td>";
+            }
 
-echo "
+            echo "
     </tr>
     <tr align=center>";
 
-for ($i=0; $i < 8; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=20 order by grp, grp_no LIMIT 16');
-while(count($generalList) < 16){
-    $generalList[] = [
-        'name'=>'-',
-        'npc'=>0,
-        'win'=>0
-    ];
-}
-foreach($generalList as $i=>$general){
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 8; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━┓"."</font>";
-    echo "<td colspan=2>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+            for ($i = 0; $i < 8; $i++) {
+                $cent[$i] = "<font color=white>";
+            }
+            $generalList = $db->query('SELECT npc,name,win from tournament where grp>=20 order by grp, grp_no LIMIT 16');
+            while (count($generalList) < 16) {
+                $generalList[] = [
+                    'name' => '-',
+                    'npc' => 0,
+                    'win' => 0
+                ];
+            }
+            foreach ($generalList as $i => $general) {
+                if ($general['name'] == "") {
+                    $general['name'] = "-";
+                }
+                if ($general['npc'] >= 2) {
+                    $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
+                } elseif ($general['npc'] == 1) {
+                    $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
+                }
+                if ($general['win'] > 0) {
+                    $line[$i] = "<font color=red>";
+                    $cent[intdiv($i, 2)] = "<font color=red>";
+                } else {
+                    $line[$i] = "<font color=white>";
+                }
+                $gen[$i] = $general['name'];
+            }
+            for ($i = 0; $i < 8; $i++) {
+                $cent[$i] = $cent[$i] . "┻" . "</font>";
+                $line[$i * 2] =     $line[$i * 2] . "┏━━" . "</font>";
+                $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━┓" . "</font>";
+                echo "<td colspan=2>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+            }
+            echo "
     </tr>
     <tr align=center>";
 
-for ($i=0; $i < 16; $i++) {
-    echo "<td width=70>{$gen[$i]}</td>";
-}
+            for ($i = 0; $i < 16; $i++) {
+                echo "<td width=70>{$gen[$i]}</td>";
+            }
 
-$bet = [];
-$gold = [];
+            $bet = [];
+            $gold = [];
 
-for ($i=0; $i < 16; $i++) {
-    if($globalBet[$i] == 0){
-        $bet[$i] = "∞";
-    }
-    else{
-        $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
-    }
-}
+            for ($i = 0; $i < 16; $i++) {
+                if ($globalBet[$i] == 0) {
+                    $bet[$i] = "∞";
+                } else {
+                    $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
+                }
+            }
 
-for ($i=0; $i < 16; $i++) {
-    if(!is_numeric($bet[$i])){
-        $gold[$i] = 0;
-    }
-    else{
-        $gold[$i] = Util::round($myBet[$i] * $bet[$i]);
-    }
-
-}
-?>
-    </tr>
-</table>
-<table align=center width=1120 class='tb_layout bg0'>
-    <tr align=center><td height=10 colspan=16></td></tr>
-<?php
-echo "
+            for ($i = 0; $i < 16; $i++) {
+                if (!is_numeric($bet[$i])) {
+                    $gold[$i] = 0;
+                } else {
+                    $gold[$i] = Util::round($myBet[$i] * $bet[$i]);
+                }
+            }
+            ?>
+        </tr>
+    </table>
+    <table align=center width=1120 class='tb_layout bg0'>
+        <tr align=center>
+            <td height=10 colspan=16></td>
+        </tr>
+        <?php
+        echo "
     <tr align=center>";
 
-for ($i=0; $i < 16; $i++) {
-    echo "<td width=70><font color=skyblue>{$bet[$i]}</font></td>";
-}
-?>
-    </tr>
-    <tr align=center>
-        <td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td>
-        <td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td><td>×</td>
-    </tr>
-    <tr align=center>
-<?php
-for ($i=0; $i < 16; $i++) {
-    echo "<td><font color=orange>{$myBet[$i]}</font></td>";
-}
-?>
-    </tr>
-    <tr align=center>
-        <td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td>
-        <td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td><td>∥</td>
-    </tr>
-    <tr align=center>
-<?php
-for ($i=0; $i < 16; $i++) {
-    echo "<td><font color=cyan>{$gold[$i]}</font></td>";
-}
+        for ($i = 0; $i < 16; $i++) {
+            echo "<td width=70><font color=skyblue>{$bet[$i]}</font></td>";
+        }
+        ?>
+        </tr>
+        <tr align=center>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+            <td>×</td>
+        </tr>
+        <tr align=center>
+            <?php
+            for ($i = 0; $i < 16; $i++) {
+                echo "<td><font color=orange>{$myBet[$i]}</font></td>";
+            }
+            ?>
+        </tr>
+        <tr align=center>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+            <td>∥</td>
+        </tr>
+        <tr align=center>
+            <?php
+            for ($i = 0; $i < 16; $i++) {
+                echo "<td><font color=cyan>{$gold[$i]}</font></td>";
+            }
 
-echo "
+            echo "
     </tr>
     <tr align=center><td height=10 colspan=16></td></tr>";
 
-if ($admin['tournament'] == 6) {
-    echo "
+            if ($admin['tournament'] == 6) {
+                echo "
     <tr align=center>";
 
-    for ($i=0; $i < 16; $i++) {
-        echo "
+                for ($i = 0; $i < 16; $i++) {
+                    echo "
         <td>
             <select size=1 id='target_{$i}' style=color:white;background-color:black;>
                 <option style=color:white; value=10>금10</option>
@@ -368,127 +431,165 @@ if ($admin['tournament'] == 6) {
                 <option style=color:white; value=1000>최대</option>
             </select>
         </td>";
-    }
+                }
 
-    echo "
+                echo "
     </tr>
     <tr align=center>";
 
-    for ($i=0; $i < 16; $i++) {
-        echo "
+                for ($i = 0; $i < 16; $i++) {
+                    echo "
         <td><input type=button class='submitBtn' data-target='{$i}' value=베팅! style=width:100%;color:white;background-color:black;></td>";
-    }
+                }
 
-    echo "</tr>";
-}
+                echo "</tr>";
+            }
 
-?>
-    <tr align=center>
-        <td height=30 colspan=16>
-            <font color=skyblue size=4>배당률</font> × <font color=orange size=4>베팅금</font> = <font color=cyan size=4>적중시 환수금</font><br>
-            <font color=skyblue size=4>( 베팅후 500원 이하일땐 베팅이 불가능합니다. )</font>
-        </td>
-    </tr>
-    <tr align=center><td height=10 colspan=16></td></tr>
-</table>
-<table align=center width=1120 class='tb_layout bg0'>
-    <tr align=center><td height=50 colspan=4 class='bg2'><font color=yellow size=6>토너먼트 랭킹</font></td></tr>
-    <tr align=center><td colspan=4 class='bg2'><font color=skyblue size=3>순위 / 장수명 / 능력치 / 경기수 / 승리 / 무승부 / 패배 / 집계점수 / 우승횟수</font></td></tr>
-    <tr align=center>
-<?php
+            ?>
+        <tr align=center>
+            <td height=30 colspan=16>
+                <font color=skyblue size=4>배당률</font> × <font color=orange size=4>베팅금</font> = <font color=cyan size=4>적중시 환수금</font><br>
+                <font color=skyblue size=4>( 베팅후 500원 이하일땐 베팅이 불가능합니다. )</font>
+            </td>
+        </tr>
+        <tr align=center>
+            <td height=10 colspan=16></td>
+        </tr>
+    </table>
+    <table align=center width=1120 class='tb_layout bg0'>
+        <tr align=center>
+            <td height=50 colspan=4 class='bg2'>
+                <font color=yellow size=6>토너먼트 랭킹</font>
+            </td>
+        </tr>
+        <tr align=center>
+            <td colspan=4 class='bg2'>
+                <font color=skyblue size=3>순위 / 장수명 / 능력치 / 경기수 / 승리 / 무승부 / 패배 / 집계점수 / 우승횟수</font>
+            </td>
+        </tr>
+        <tr align=center>
+            <?php
 
-$tournamentType = [
-    '전 력 전'=>[
-        '종합',
-        function(General $general){return $general->getVar('leadership')+$general->getVar('strength')+$general->getVar('intel');},
-        'tt',
-    ],
-    '통 솔 전'=>[
-        '통솔',
-        function(General $general){return $general->getVar('leadership');},
-        'tl',
-    ],
-    '일 기 토'=>[
-        '무력',
-        function(General $general){return $general->getVar('strength');},
-        'ts',
-    ],
-    '설 전'=>[
-        '지력',
-        function(General $general){return $general->getVar('intel');},
-        'ti',
-    ],
-];
+            $tournamentType = [
+                '전 력 전' => [
+                    '종합',
+                    function (General $general) {
+                        return $general->getVar('leadership') + $general->getVar('strength') + $general->getVar('intel');
+                    },
+                    'tt',
+                ],
+                '통 솔 전' => [
+                    '통솔',
+                    function (General $general) {
+                        return $general->getVar('leadership');
+                    },
+                    'tl',
+                ],
+                '일 기 토' => [
+                    '무력',
+                    function (General $general) {
+                        return $general->getVar('strength');
+                    },
+                    'ts',
+                ],
+                '설 전' => [
+                    '지력',
+                    function (General $general) {
+                        return $general->getVar('intel');
+                    },
+                    'ti',
+                ],
+            ];
 
-$type1 = array("전 력 전", "통 솔 전", "일 기 토", "설 전");
-$type2 = array("종합", "통솔", "무력", "지력");
-$type3 = array("tt", "tl", "ts", "ti");
-$type4 = array("total", "leadership", "strength", "intel");
+            $type1 = array("전 력 전", "통 솔 전", "일 기 토", "설 전");
+            $type2 = array("종합", "통솔", "무력", "지력");
+            $type3 = array("tt", "tl", "ts", "ti");
+            $type4 = array("total", "leadership", "strength", "intel");
 
-foreach($tournamentType as $tournamentTypeText=>[$statTypeText,$statFunc,$rankColumn]): ?>
-        <td>
-            <table align=center width=280 class='tb_layout bg0'>
-                <tr><td colspan=9 align=center style=color:white;background-color:black;><font size=4><?=$tournamentTypeText?></font></td></tr>
-                <tr class='bg1'><td align=center>순</td><td align=center>장수</td><td align=center><?=$statTypeText?></td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>勝</td></tr>
-<?php
-    $prizeColumn = "{$rankColumn}p";
-    $gameColumn = "{$rankColumn}g";
-    $winColumn = "{$rankColumn}w";
-    $drawColumn = "{$rankColumn}d";
-    $loseColumn = "{$rankColumn}l";
-    $tournamentRankerList = General::createGeneralObjListFromDB(
-        $db->queryFirstColumn('SELECT general_id FROM rank_data WHERE `type`= %s ORDER BY value DESC LIMIT 40', $gameColumn),
-        [$prizeColumn, $gameColumn, $winColumn, $drawColumn, $loseColumn,'leadership', 'strength', 'intel', 'no', 'npc', 'name'],
-        0
-    );
-    usort($tournamentRankerList, function(General $lhs, General $rhs) use($gameColumn, $winColumn, $drawColumn, $loseColumn){
-        $result = -($lhs->getRankVar($gameColumn) <=> $rhs->getRankVar($gameColumn));
-        if($result !== 0) return $result;
-        $result = -(
-            ($lhs->getRankVar($winColumn)+$lhs->getRankVar($drawColumn)+$lhs->getRankVar($loseColumn))
-            <=>
-            ($rhs->getRankVar($winColumn)+$rhs->getRankVar($drawColumn)+$rhs->getRankVar($loseColumn))
-        );
-        if($result !== 0) return $result;
-        $result = -($lhs->getRankVar($winColumn) <=> $rhs->getRankVar($winColumn));
-        if($result !== 0) return $result;
-        $result = -($lhs->getRankVar($drawColumn) <=> $rhs->getRankVar($drawColumn));
-        if($result !== 0) return $result;
-        return $lhs->getRankVar($loseColumn) <=> $rhs->getRankVar($loseColumn);
-    });
-    $tournamentRankerList = array_splice($tournamentRankerList, 0, 30);
-    foreach($tournamentRankerList as $rank=>$ranker){
-        printRow(
-            $rank,
-            $ranker->getNPCType(),
-            $ranker->getName(),
-            ($statFunc)($ranker),
-            $ranker->getRankVar($winColumn)+$ranker->getRankVar($drawColumn)+$ranker->getRankVar($loseColumn),
-            $ranker->getRankVar($winColumn),
-            $ranker->getRankVar($drawColumn),
-            $ranker->getRankVar($loseColumn),
-            $ranker->getRankVar($gameColumn),
-            $ranker->getRankVar($prizeColumn),
-            0
-        );
-    }
-?>
-    </table></td>
-<?php endforeach; ?>
-    </tr>
-    <tr>
-        <td colspan=16>
-ㆍ토너먼트의 16강 대진표가 완성되면, 베팅 기간이 주어집니다.<br>
-ㆍ유저들의 베팅 상황에 따라 배당률이 실시간 결정되며, 자신의 베팅금에 따른 예상 환급금을 알 수 있습니다.<br>
-ㆍ베팅은 16슬롯에 각각 베팅 가능하며, 도합 최대 금 1000씩 베팅 가능합니다.<br>
-ㆍ소지금 500원 이하일땐 베팅이 불가능합니다.
-ㆍ삼모와 더불어 토너먼트, 베팅기능으로 즐거운 삼모 되세요!<br>
-        </td>
-    </tr>
-</table>
-<table align=center width=1120 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+            foreach ($tournamentType as $tournamentTypeText => [$statTypeText, $statFunc, $rankColumn]) : ?>
+                <td>
+                    <table align=center width=280 class='tb_layout bg0 f_tnum'>
+                        <tr>
+                            <td colspan=9 align=center style=color:white;background-color:black;>
+                                <font size=4><?= $tournamentTypeText ?></font>
+                            </td>
+                        </tr>
+                        <tr class='bg1'>
+                            <td align=center>순</td>
+                            <td align=center>장수</td>
+                            <td align=center><?= $statTypeText ?></td>
+                            <td align=center>경</td>
+                            <td align=center>승</td>
+                            <td align=center>무</td>
+                            <td align=center>패</td>
+                            <td align=center>점</td>
+                            <td align=center>勝</td>
+                        </tr>
+                        <?php
+                        $prizeColumn = "{$rankColumn}p";
+                        $gameColumn = "{$rankColumn}g";
+                        $winColumn = "{$rankColumn}w";
+                        $drawColumn = "{$rankColumn}d";
+                        $loseColumn = "{$rankColumn}l";
+                        $tournamentRankerList = General::createGeneralObjListFromDB(
+                            $db->queryFirstColumn('SELECT general_id FROM rank_data WHERE `type`= %s ORDER BY value DESC LIMIT 40', $gameColumn),
+                            [$prizeColumn, $gameColumn, $winColumn, $drawColumn, $loseColumn, 'leadership', 'strength', 'intel', 'no', 'npc', 'name'],
+                            0
+                        );
+                        usort($tournamentRankerList, function (General $lhs, General $rhs) use ($gameColumn, $winColumn, $drawColumn, $loseColumn) {
+                            $result = - ($lhs->getRankVar($gameColumn) <=> $rhs->getRankVar($gameColumn));
+                            if ($result !== 0) return $result;
+                            $result = - (
+                                ($lhs->getRankVar($winColumn) + $lhs->getRankVar($drawColumn) + $lhs->getRankVar($loseColumn))
+                                <=>
+                                ($rhs->getRankVar($winColumn) + $rhs->getRankVar($drawColumn) + $rhs->getRankVar($loseColumn))
+                            );
+                            if ($result !== 0) return $result;
+                            $result = - ($lhs->getRankVar($winColumn) <=> $rhs->getRankVar($winColumn));
+                            if ($result !== 0) return $result;
+                            $result = - ($lhs->getRankVar($drawColumn) <=> $rhs->getRankVar($drawColumn));
+                            if ($result !== 0) return $result;
+                            return $lhs->getRankVar($loseColumn) <=> $rhs->getRankVar($loseColumn);
+                        });
+                        $tournamentRankerList = array_splice($tournamentRankerList, 0, 30);
+                        foreach ($tournamentRankerList as $rank => $ranker) {
+                            printRow(
+                                $rank,
+                                $ranker->getNPCType(),
+                                $ranker->getName(),
+                                ($statFunc)($ranker),
+                                $ranker->getRankVar($winColumn) + $ranker->getRankVar($drawColumn) + $ranker->getRankVar($loseColumn),
+                                $ranker->getRankVar($winColumn),
+                                $ranker->getRankVar($drawColumn),
+                                $ranker->getRankVar($loseColumn),
+                                $ranker->getRankVar($gameColumn),
+                                $ranker->getRankVar($prizeColumn),
+                                0
+                            );
+                        }
+                        ?>
+                    </table>
+                </td>
+            <?php endforeach; ?>
+        </tr>
+        <tr>
+            <td colspan=16>
+                ㆍ토너먼트의 16강 대진표가 완성되면, 베팅 기간이 주어집니다.<br>
+                ㆍ유저들의 베팅 상황에 따라 배당률이 실시간 결정되며, 자신의 베팅금에 따른 예상 환급금을 알 수 있습니다.<br>
+                ㆍ베팅은 16슬롯에 각각 베팅 가능하며, 도합 최대 금 1000씩 베팅 가능합니다.<br>
+                ㆍ소지금 500원 이하일땐 베팅이 불가능합니다.
+                ㆍ삼모와 더불어 토너먼트, 베팅기능으로 즐거운 삼모 되세요!<br>
+            </td>
+        </tr>
+    </table>
+    <table align=center width=1120 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>

hwe/b_chiefcenter.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -10,98 +11,75 @@ $generalObj = General::createGeneralObjFromDB($session->generalID);
 ?>
 <!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::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/chiefCenter.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printCSS('css/chiefCenter.css')?>
-<script type="text/javascript">
-var maxChiefTurn = <?=GameConst::$maxChiefTurn?>;
-</script>
+    <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('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printCSS('css/chiefCenter.css') ?>
+    <script type="text/javascript">
+        var maxChiefTurn = <?= GameConst::$maxChiefTurn ?>;
+    </script>
+    <?= WebUtil::printDist('ts', ['common', 'chiefCenter']) ?>
 
 </head>
 
 <body>
-<div id='container' class='tb_layout bg0' style='width:1000px;margin:auto;border:solid 1px #888888;'>
-<div class='tb_layout bg0'>사 령 부<button type='button' id='reloadTable'>갱신</button><br>
-<?=backButton()?></div>
-<div style='background-color:skyblue;text-align:center;'>수뇌부 일정</div>
-<div class="chiefSubTable" style='height:<?=22*(GameConst::$maxChiefTurn+1)?>px;'
-    ><div class='chiefTurnIdxPanel'
-        ><div class='bg1 chiefTurnIdx'>.</div
-<?php foreach(Util::range(GameConst::$maxChiefTurn) as $idx):?>
-        ><div class='bg0 chiefTurnIdx'><?=$idx+1?></div
-<?php endforeach; ?>
-    ></div
-<?php foreach([12, 10, 8, 6] as $chiefIdx): ?>
-    ><div class='bg2 chiefPlate' style='flex-grow:1;' id='chief_<?=$chiefIdx?>'
-        ><div class='bg1 chiefNamePlate'><span class='chiefLevelText'>-</span> : <span class='chiefName'>&nbsp;</span></div
-<?php   foreach(Util::range(GameConst::$maxChiefTurn) as $turnIdx): ?>
-        ><div class='chiefTurnBox turn<?=$turnIdx?>'
-            ><div class='chiefTurnTime'>&nbsp;</div
-            ><div class='chiefTurnPad'><span class='chiefTurnText'>&nbsp;</span></div
-        ></div
-<?php   endforeach; ?>
-    ></div
-<?php endforeach; ?>
-    ><div class='chiefTurnIdxPanel tail'
-        ><div class='bg1 chiefTurnIdx'>.</div
-<?php foreach(Util::range(GameConst::$maxChiefTurn) as $idx):?>
-        ><div class='bg0 chiefTurnIdx'><?=$idx+1?></div
-<?php endforeach; ?>
-    ></div
-></div
-><div id='controlPlate' style='display:flex;flex-flow:row wrap;justify-content:center;'
-    ><div style='width:400px;text-align:right;'
-        ><?=chiefTurnTable()
-    ?></div
-    ><div style='width:400px;display: flex;justify-content: center;flex-direction: column;'
-        ><div
-            ><input type='button' id='turnPush' style='visibility:hidden;background-color:<?=GameConst::$basecolor2?>;color:white;font-size:13px;' value='미루기▼'
-            ><input type='button' id='turnPull' style='visibility:hidden;background-color:<?=GameConst::$basecolor2?>;color:white;font-size:13px;' value='▲당기기'
-        ></div
-        ><div
-            ><?=chiefCommandTable($generalObj)
-            ?><br><input type='button' id='setCommand' style='visibility:hidden;background-color:<?=GameConst::$basecolor2?>;color:white;font-size:13px;' value='실 행'
-        ></div
-    ></div
-></div
-><div class="chiefSubTable" style='height:<?=22*(GameConst::$maxChiefTurn+1)?>px;'
-    ><div class='chiefTurnIdxPanel'
-        ><div class='bg1 chiefTurnIdx'>.</div
-<?php foreach(Util::range(GameConst::$maxChiefTurn) as $idx):?>
-        ><div class='bg0 chiefTurnIdx'><?=$idx+1?></div
-<?php endforeach; ?>
-    ></div
-<?php foreach([11, 9, 7, 5] as $chiefIdx): ?>
-    ><div class='bg2 chiefPlate' style='flex-grow:1;' id='chief_<?=$chiefIdx?>'
-        ><div class='bg1 chiefNamePlate'><span class='chiefLevelText'>-</span> : <span class='chiefName'>&nbsp;</span></div
-<?php   foreach(Util::range(GameConst::$maxChiefTurn) as $turnIdx): ?>
-        ><div class='chiefTurnBox turn<?=$turnIdx?>'
-            ><div class='chiefTurnTime'>&nbsp;</div
-            ><div class='chiefTurnPad'><span class='chiefTurnText'>&nbsp;</span></div
-        ></div
-<?php   endforeach; ?>
-    ></div
-<?php endforeach; ?>
-    ><div class='chiefTurnIdxPanel tail'
-        ><div class='bg1 chiefTurnIdx'>.</div
-<?php foreach(Util::range(GameConst::$maxChiefTurn) as $idx):?>
-        ><div class='bg0 chiefTurnIdx'><?=$idx+1?></div
-<?php endforeach; ?>
-    ></div
-></div
-><div
-    ><?=backButton()
-    ?><?=banner()
-?></div>
-</div>
+    <div id='container' class='tb_layout bg0' style='width:1000px;margin:auto;border:solid 1px #888888;'>
+        <div class='tb_layout bg0'>사 령 부<button type='button' id='reloadTable'>갱신</button><br>
+            <?= backButton() ?></div>
+        <div style='background-color:skyblue;text-align:center;'>수뇌부 일정</div>
+        <div class="chiefSubTable" style='height:<?= 22 * (GameConst::$maxChiefTurn + 1) ?>px;'>
+            <div class='chiefTurnIdxPanel'>
+                <div class='bg1 chiefTurnIdx'>.</div <?php foreach (Util::range(GameConst::$maxChiefTurn) as $idx) : ?>>
+                <div class='bg0 chiefTurnIdx'><?= $idx + 1 ?></div <?php endforeach; ?>>
+            </div <?php foreach ([12, 10, 8, 6] as $chiefIdx) : ?>>
+            <div class='bg2 chiefPlate' style='flex-grow:1;' id='chief_<?= $chiefIdx ?>'>
+                <div class='bg1 chiefNamePlate'><span class='chiefLevelText'>-</span> : <span class='chiefName'>&nbsp;</span></div <?php foreach (Util::range(GameConst::$maxChiefTurn) as $turnIdx) : ?>>
+                <div class='chiefTurnBox turn<?= $turnIdx ?>'>
+                    <div class='chiefTurnTime'>&nbsp;</div>
+                    <div class='chiefTurnPad'><span class='chiefTurnText'>&nbsp;</span></div>
+                </div <?php endforeach; ?>>
+            </div <?php endforeach; ?>>
+            <div class='chiefTurnIdxPanel tail'>
+                <div class='bg1 chiefTurnIdx'>.</div <?php foreach (Util::range(GameConst::$maxChiefTurn) as $idx) : ?>>
+                <div class='bg0 chiefTurnIdx'><?= $idx + 1 ?></div <?php endforeach; ?>>
+            </div>
+        </div>
+        <div id='controlPlate' style='display:flex;flex-flow:row wrap;justify-content:center;'>
+            <div style='width:400px;text-align:right;'><?= chiefTurnTable()
+                                                        ?></div>
+            <div style='width:400px;display: flex;justify-content: center;flex-direction: column;'>
+                <div><input type='button' id='turnPush' style='visibility:hidden;background-color:<?= GameConst::$basecolor2 ?>;color:white;font-size:14px;' value='미루기▼'><input type='button' id='turnPull' style='visibility:hidden;background-color:<?= GameConst::$basecolor2 ?>;color:white;font-size:14px;' value='▲당기기'></div>
+                <div><?= chiefCommandTable($generalObj)
+                        ?><br><input type='button' id='setCommand' style='visibility:hidden;background-color:<?= GameConst::$basecolor2 ?>;color:white;font-size:14px;' value='실 행'></div>
+            </div>
+        </div>
+        <div class="chiefSubTable" style='height:<?= 22 * (GameConst::$maxChiefTurn + 1) ?>px;'>
+            <div class='chiefTurnIdxPanel'>
+                <div class='bg1 chiefTurnIdx'>.</div <?php foreach (Util::range(GameConst::$maxChiefTurn) as $idx) : ?>>
+                <div class='bg0 chiefTurnIdx'><?= $idx + 1 ?></div <?php endforeach; ?>>
+            </div <?php foreach ([11, 9, 7, 5] as $chiefIdx) : ?>>
+            <div class='bg2 chiefPlate' style='flex-grow:1;' id='chief_<?= $chiefIdx ?>'>
+                <div class='bg1 chiefNamePlate'><span class='chiefLevelText'>-</span> : <span class='chiefName'>&nbsp;</span></div <?php foreach (Util::range(GameConst::$maxChiefTurn) as $turnIdx) : ?>>
+                <div class='chiefTurnBox turn<?= $turnIdx ?>'>
+                    <div class='chiefTurnTime'>&nbsp;</div>
+                    <div class='chiefTurnPad'><span class='chiefTurnText'>&nbsp;</span></div>
+                </div <?php endforeach; ?>>
+            </div <?php endforeach; ?>>
+            <div class='chiefTurnIdxPanel tail'>
+                <div class='bg1 chiefTurnIdx'>.</div <?php foreach (Util::range(GameConst::$maxChiefTurn) as $idx) : ?>>
+                <div class='bg0 chiefTurnIdx'><?= $idx + 1 ?></div <?php endforeach; ?>>
+            </div>
+        </div>
+        <div><?= backButton()
+                ?><?= banner()
+        ?></div>
+    </div>
 </body>
-</html>
+
+</html>

hwe/b_currentCity.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -16,10 +17,10 @@ $db = DB::db();
 increaseRefresh("현재도시", 1);
 
 $me = $db->queryFirstRow('SELECT no,nation,officer_level,city from general where owner=%i', $userID);
-$myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation'])??[
-    'nation'=>0,
-    'level'=>0,
-    'spy'=>''
+$myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation']) ?? [
+    'nation' => 0,
+    'level' => 0,
+    'spy' => ''
 ];
 
 $templates = new \League\Plates\Engine('templates');
@@ -29,116 +30,126 @@ $templates = new \League\Plates\Engine('templates');
 <html>
 
 <head>
-<title><?=UniqueConst::$serverName?>: 도시정보</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/currentCity.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../e_lib/select2/select2.min.css')?>
-<?=WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<style>
-#general_list tr td{
-    text-align:center;
-}
+    <title><?= UniqueConst::$serverName ?>: 도시정보</title>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../e_lib/select2/select2.min.css') ?>
+    <?= WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <style>
+        #general_list tr td {
+            text-align: center;
+        }
 
-#general_list tr td:last-child{
-    text-align:left;
-    padding-left:1em;
-}
+        #general_list tr td:last-child {
+            text-align: left;
+            padding-left: 1em;
+        }
 
-.general_turn_text{
-    font-size:x-small;
-}
-</style>
+        .general_turn_text {
+            font-size: x-small;
+        }
+    </style>
+    <?= WebUtil::printDist('ts', ['common', 'currentCity']) ?>
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>도 시 정 보<br><?=backButton()?></td></tr>
-</table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>도 시 정 보<br><?= backButton() ?></td>
+        </tr>
+    </table>
 
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr>
-        <td width=998>
-            <form name=cityselect method=get>
-                <div style='text-align:center;'>도시선택 :
-                <select id="citySelector" name=citylist size=1 style='display:inline-block;min-width:400px;'>
-<?php
-if(!$citylist){
-    $citylist = $me['city'];
-}
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td width=998>
+                <form name=cityselect method=get>
+                    <div style='text-align:center;'>도시선택 :
+                        <select id="citySelector" name=citylist size=1 style='display:inline-block;min-width:400px;'>
+                            <?php
+                            if (!$citylist) {
+                                $citylist = $me['city'];
+                            }
 
-// 재야일때는 현재 도시만
-$valid = 0;
-if($me['officer_level'] == 0) {
-    $city = $db->queryFirstRow('SELECT city,name,nation from city where city=%i', $me['city']);
-    echo "
+                            // 재야일때는 현재 도시만
+                            $valid = 0;
+                            if ($me['officer_level'] == 0) {
+                                $city = $db->queryFirstRow('SELECT city,name,nation from city where city=%i', $me['city']);
+                                echo "
                     <option value={$city['city']}";
-    if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
-    echo ">【".StringUtil::padString($city['name'], 4, '_')."】";
-    if($city['nation'] == 0) echo "공백지";
-    elseif($me['nation'] == $city['nation']) echo "본국";
-    else echo "타국";
-    echo "</option>";
-} else {
-    // 아국 도시들 선택
-    foreach($db->query('SELECT city,name,nation from city where nation=%i', $me['nation']) as $city){
-        echo "
+                                if ($city['city'] == $citylist) {
+                                    echo " selected";
+                                    $valid = 1;
+                                }
+                                echo ">【" . StringUtil::padString($city['name'], 4, '_') . "】";
+                                if ($city['nation'] == 0) echo "공백지";
+                                elseif ($me['nation'] == $city['nation']) echo "본국";
+                                else echo "타국";
+                                echo "</option>";
+                            } else {
+                                // 아국 도시들 선택
+                                foreach ($db->query('SELECT city,name,nation from city where nation=%i', $me['nation']) as $city) {
+                                    echo "
                         <option value={$city['city']}";
-        if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
-        echo ">【".StringUtil::padString($city['name'], 4, '_')."】";
-        if($city['nation'] == 0) echo "공백지";
-        elseif($me['nation'] == $city['nation']) echo "본국";
-        else echo "타국";
-        echo "</option>";
-    }
+                                    if ($city['city'] == $citylist) {
+                                        echo " selected";
+                                        $valid = 1;
+                                    }
+                                    echo ">【" . StringUtil::padString($city['name'], 4, '_') . "】";
+                                    if ($city['nation'] == 0) echo "공백지";
+                                    elseif ($me['nation'] == $city['nation']) echo "본국";
+                                    else echo "타국";
+                                    echo "</option>";
+                                }
 
-    // 아국 장수가 있는 타국 도시들 선택
-    foreach ($db->query('SELECT distinct A.city,B.name,B.nation from general A,city B where A.city=B.city and A.nation=%i and B.nation!=%i', $me['nation'], $me['nation']) as $city){
-        echo "
+                                // 아국 장수가 있는 타국 도시들 선택
+                                foreach ($db->query('SELECT distinct A.city,B.name,B.nation from general A,city B where A.city=B.city and A.nation=%i and B.nation!=%i', $me['nation'], $me['nation']) as $city) {
+                                    echo "
                         <option value={$city['city']}";
-        if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
-        echo ">【".StringUtil::padString($city['name'], 4, '_')."】";
-        if($city['nation'] == 0) echo "공백지";
-        elseif($me['nation'] == $city['nation']) echo "본국";
-        else echo "타국";
-        echo "</option>";
-    }
-}
+                                    if ($city['city'] == $citylist) {
+                                        echo " selected";
+                                        $valid = 1;
+                                    }
+                                    echo ">【" . StringUtil::padString($city['name'], 4, '_') . "】";
+                                    if ($city['nation'] == 0) echo "공백지";
+                                    elseif ($me['nation'] == $city['nation']) echo "본국";
+                                    else echo "타국";
+                                    echo "</option>";
+                                }
+                            }
 
-if($myNation['level'] > 0) {
-    // 첩보도시도 목록에 추가
+                            if ($myNation['level'] > 0) {
+                                // 첩보도시도 목록에 추가
 
-    $rawSpy = $myNation['spy'];
+                                $rawSpy = $myNation['spy'];
 
-    if($rawSpy == ''){
-        $spyCities = [];
-    }
-    else{
-        $spyCities = array_keys(Json::decode($rawSpy));
-    }
+                                if ($rawSpy == '') {
+                                    $spyCities = [];
+                                } else {
+                                    $spyCities = array_keys(Json::decode($rawSpy));
+                                }
 
 
-    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>";
-        }
-    }
+                                if ($spyCities) {
+                                    foreach ($db->query('SELECT city,name,nation FROM city WHERE city in %li', $spyCities) as $city) {
+                                        echo "<option value={$city['city']}";
+                                        if ($city['city'] == $citylist) {
+                                            echo " selected";
+                                            $valid = 1;
+                                        }
+                                        echo ">【" . StringUtil::padString($city['name'], 4, '_') . "】";
+                                        if ($city['nation'] == 0) echo "공백지";
+                                        elseif ($me['nation'] == $city['nation']) echo "본국";
+                                        else echo "타국";
+                                        echo "</option>";
+                                    }
+                                }
+                            }
 
-}
-
-echo "
+                            echo "
                 </select></div>
                 <p align=center>명령 화면에서 도시를 클릭하셔도 됩니다.</p>
             </form>
@@ -147,378 +158,379 @@ echo "
 </table>
 <br>";
 
-unset($city);
+                            unset($city);
 
-// 첩보된 도시까지만 허용
+                            // 첩보된 도시까지만 허용
 
-$showDetailedInfo = false;
-if($valid){
-    $showDetailedInfo = true;
-}
+                            $showDetailedInfo = false;
+                            if ($valid) {
+                                $showDetailedInfo = true;
+                            }
 
-if(!key_exists($citylist, CityConst::all())){
-    $citylist = $me['city'];
-    $showDetailedInfo = true;
-    $valid = 1;
-}
+                            if (!key_exists($citylist, CityConst::all())) {
+                                $citylist = $me['city'];
+                                $showDetailedInfo = true;
+                                $valid = 1;
+                            }
 
-if($userGrade >= 5){
-    $valid = true;
-    $showDetailedInfo = true;
-}
+                            if ($userGrade >= 5) {
+                                $valid = true;
+                                $showDetailedInfo = true;
+                            }
 
-if(!$valid) {
-    $ownCities = Util::convertArrayToSetLike($db->queryFirstColumn('SELECT city FROM city WHERE nation = %i AND nation != 0', $me['nation']));
-    foreach(array_keys(CityConst::byID($citylist)->path) as $pathID){
-        if(key_exists($pathID, $ownCities)){
-            $showDetailedInfo = true;
-            break;
-        }
-    }
-}
+                            if (!$valid) {
+                                $ownCities = Util::convertArrayToSetLike($db->queryFirstColumn('SELECT city FROM city WHERE nation = %i AND nation != 0', $me['nation']));
+                                foreach (array_keys(CityConst::byID($citylist)->path) as $pathID) {
+                                    if (key_exists($pathID, $ownCities)) {
+                                        $showDetailedInfo = true;
+                                        break;
+                                    }
+                                }
+                            }
 
 
-$city = $db->queryFirstRow('SELECT * FROM city WHERE city=%i', $citylist);
-$cityNation = getNationStaticInfo($city['nation']);
+                            $city = $db->queryFirstRow('SELECT * FROM city WHERE city=%i', $citylist);
+                            $cityNation = getNationStaticInfo($city['nation']);
 
-//태수, 군사, 종사
-$officer = [
-    4=>['name'=>'-', 'npc'=>0],
-    3=>['name'=>'-', 'npc'=>0],
-    2=>['name'=>'-', 'npc'=>0]
-];
+                            //태수, 군사, 종사
+                            $officer = [
+                                4 => ['name' => '-', 'npc' => 0],
+                                3 => ['name' => '-', 'npc' => 0],
+                                2 => ['name' => '-', 'npc' => 0]
+                            ];
 
-foreach($db->query('SELECT `name`, npc, `officer_level` FROM general WHERE `officer_city` = %i', $city['city']) as $officerInfo){
-    $officer[$officerInfo['officer_level']] = $officerInfo;
-}
+                            foreach ($db->query('SELECT `name`, npc, `officer_level` FROM general WHERE `officer_city` = %i', $city['city']) as $officerInfo) {
+                                $officer[$officerInfo['officer_level']] = $officerInfo;
+                            }
 
-if($city['trade'] === null) {
-    $city['trade'] = "- ";
-}
+                            if ($city['trade'] === null) {
+                                $city['trade'] = "- ";
+                            }
 
-$dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'], 2)[0];
-if($showDetailedInfo){
-    $generals = $db->query(
-        'SELECT %l from general where city=%i order by turntime',
-        Util::formatListOfBackticks($dbColumns),
-        $city['city']
-    );
-}
-else{
-    $generals = [];
-}
+                            $dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'], 2)[0];
+                            if ($showDetailedInfo) {
+                                $generals = $db->query(
+                                    'SELECT %l from general where city=%i order by turntime',
+                                    Util::formatListOfBackticks($dbColumns),
+                                    $city['city']
+                                );
+                            } else {
+                                $generals = [];
+                            }
 
-if($valid){
-    $city['trustText'] = round($city['trust'], 1);
-    $city['popRateText'] = round($city['pop']/$city['pop_max']*100, 2);
-}
-else{
-    $city['agri'] = '?';
-    $city['comm'] = '?';
-    $city['pop'] = '?';
-    $city['secu'] = '?';
-    $city['trustText'] = '?';
-    $city['popRateText'] = '?';
+                            if ($valid) {
+                                $city['trustText'] = round($city['trust'], 1);
+                                $city['popRateText'] = round($city['pop'] / $city['pop_max'] * 100, 2);
+                            } else {
+                                $city['agri'] = '?';
+                                $city['comm'] = '?';
+                                $city['pop'] = '?';
+                                $city['secu'] = '?';
+                                $city['trustText'] = '?';
+                                $city['popRateText'] = '?';
 
-    if($city['nation'] != 0){
-        $city['def'] = '?';
-        $city['wall'] = '?';
-    }
-}
+                                if ($city['nation'] != 0) {
+                                    $city['def'] = '?';
+                                    $city['wall'] = '?';
+                                }
+                            }
 
 
-$generalTurnList = [];
+                            $generalTurnList = [];
 
-if($generals){
-    foreach($db->queryAllLists(
-        'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
-        array_column($generals, 'no')
-        ) as [$generalID, $turnIdx, $brief]
-    ){
-        if(!key_exists($generalID, $generalTurnList)){
-            $generalTurnList[$generalID] = [];
-        }
-        $generalTurnList[$generalID][$turnIdx] = $brief;
-    }
-}
+                            if ($generals) {
+                                foreach ($db->queryAllLists(
+                                    'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
+                                    array_column($generals, 'no')
+                                ) as [$generalID, $turnIdx, $brief]) {
+                                    if (!key_exists($generalID, $generalTurnList)) {
+                                        $generalTurnList[$generalID] = [];
+                                    }
+                                    $generalTurnList[$generalID][$turnIdx] = $brief;
+                                }
+                            }
 
 
-$nationname = [];
-$nationlevel = [];
-foreach(getAllNationStaticInfo() as $nation){
-    $nationname[$nation['nation']] = $nation['name'];
-    $nationlevel[$nation['nation']] = $nation['level'];
-}
+                            $nationname = [];
+                            $nationlevel = [];
+                            foreach (getAllNationStaticInfo() as $nation) {
+                                $nationname[$nation['nation']] = $nation['name'];
+                                $nationlevel[$nation['nation']] = $nation['level'];
+                            }
 
-//도시명	오	적군	0/0(0)	병장(총)	0/0(4)	90병장	0/0	60병장	0/0	수비○	0/0
-$generalsFormat = [];
+                            //도시명	오	적군	0/0(0)	병장(총)	0/0(4)	90병장	0/0	60병장	0/0	수비○	0/0
+                            $generalsFormat = [];
 
 
-foreach($generals as $general){
-    $nationInfo = getNationStaticInfo($general['nation']);
+                            foreach ($generals as $general) {
+                                $nationInfo = getNationStaticInfo($general['nation']);
 
-    if($general['nation'] != 0 && $general['nation'] == $myNation['nation']){
-        $ourGeneral = true;
-    }
-    else{
-        $ourGeneral = false;
-    }
+                                if ($general['nation'] != 0 && $general['nation'] == $myNation['nation']) {
+                                    $ourGeneral = true;
+                                } else {
+                                    $ourGeneral = false;
+                                }
 
-    if($userGrade == 6){
-        $ourGeneral = true;
-    }
+                                if ($userGrade == 6) {
+                                    $ourGeneral = true;
+                                }
 
-    $isNPC = $general['npc']>1;
-    $wounded = $general['injury'];
+                                $isNPC = $general['npc'] > 1;
+                                $wounded = $general['injury'];
 
 
-    $name = $general['name'];
-    $nameText = formatName($name, $general['npc']);
+                                $name = $general['name'];
+                                $nameText = formatName($name, $general['npc']);
 
-    $leadership = $general['leadership'];
-    $strength = $general['strength'];
-    $intel = $general['intel'];
+                                $leadership = $general['leadership'];
+                                $strength = $general['strength'];
+                                $intel = $general['intel'];
 
-    $leadershipText = formatWounded($leadership, $general['injury']);
-    $strengthText = formatWounded($strength, $general['injury']);
-    $intelText = formatWounded($intel, $general['injury']);
+                                $leadershipText = formatWounded($leadership, $general['injury']);
+                                $strengthText = formatWounded($strength, $general['injury']);
+                                $intelText = formatWounded($intel, $general['injury']);
 
-    $officerLevel = $general['officer_level'];
-    $officerLevelText = getOfficerLevelText($officerLevel);
+                                $officerLevel = $general['officer_level'];
+                                $officerLevelText = getOfficerLevelText($officerLevel);
 
-    $leadershipBonus = calcLeadershipBonus($officerLevel, $nationInfo['level']);
-    $leadershipBonusText = formatLeadershipBonus($leadershipBonus);
+                                $leadershipBonus = calcLeadershipBonus($officerLevel, $nationInfo['level']);
+                                $leadershipBonusText = formatLeadershipBonus($leadershipBonus);
 
-    if($ourGeneral){
-        $defenceTrain = $general['defence_train'];
-        $defenceTrainText = formatDefenceTrain($defenceTrain);
-        $crewType = $general['crewtype'];
-        $crewTypeText = GameUnitConst::byId($crewType)->name;
-        $crew = $general['crew'];
-        $train = $general['train'];
-        $atmos = $general['atmos'];
-    }
-    else{
-        $defenceTrain = 0;
-        $defenceTrainText = '';
-        $crewType = 0;
-        $crewTypeText = '';
-        $crew = $general['crew'];
-        $train = -1;
-        $atmos = -1;
+                                if ($ourGeneral) {
+                                    $defenceTrain = $general['defence_train'];
+                                    $defenceTrainText = formatDefenceTrain($defenceTrain);
+                                    $crewType = $general['crewtype'];
+                                    $crewTypeText = GameUnitConst::byId($crewType)->name;
+                                    $crew = $general['crew'];
+                                    $train = $general['train'];
+                                    $atmos = $general['atmos'];
+                                } else {
+                                    $defenceTrain = 0;
+                                    $defenceTrainText = '';
+                                    $crewType = 0;
+                                    $crewTypeText = '';
+                                    $crew = $general['crew'];
+                                    $train = -1;
+                                    $atmos = -1;
 
-        if(!$valid){
-            $crew = -1;
-        }
-    }
+                                    if (!$valid) {
+                                        $crew = -1;
+                                    }
+                                }
 
-    $nation = $general['nation'];
-    $nationName = $nationInfo['name'];
+                                $nation = $general['nation'];
+                                $nationName = $nationInfo['name'];
 
-    if($ourGeneral && !$isNPC){
-        $turnText = [];
-        $generalObj = new General($general, null, null, null, null, null, false);
-        foreach($generalTurnList[$generalObj->getID()] as $turnRawIdx=>$turn){
-            $turnIdx = $turnRawIdx+1;
-            $turnText[] = "{$turnIdx} : $turn";
-        }
-        $turnText = join('<br>', $turnText);
-    }
-    else{
-        $turnText = '';
-    }
+                                if ($ourGeneral && !$isNPC) {
+                                    $turnText = [];
+                                    $generalObj = new General($general, null, null, null, null, null, false);
+                                    foreach ($generalTurnList[$generalObj->getID()] as $turnRawIdx => $turn) {
+                                        $turnIdx = $turnRawIdx + 1;
+                                        $turnText[] = "{$turnIdx} : $turn";
+                                    }
+                                    $turnText = join('<br>', $turnText);
+                                } else {
+                                    $turnText = '';
+                                }
 
-    $generalsFormat[] = [
-        'ourGeneral'=>$ourGeneral,
-        'iconPath'=>GetImageURL($general['imgsvr']).'/'.$general['picture'],
-        'isNPC'=>$isNPC,
-        'wounded'=>$wounded,
-        'name'=>$name,
-        'nameText'=>$nameText,
-        'leadership'=>$leadership,
-        'leadershipText'=>$leadershipText,
-        'leadershipBonus'=>$leadershipBonus,
-        'leadershipBonusText'=>$leadershipBonusText,
-        'officerLevel'=>$officerLevel,
-        'officerLevelText'=>$officerLevelText,
-        'strength'=>$strength,
-        'strengthText'=>$strengthText,
-        'intel'=>$intel,
-        'intelText'=>$intelText,
-        'defenceTrain'=>$defenceTrain,
-        'defenceTrainText'=>$defenceTrainText,
-        'crewType'=>$crewType,
-        'crewTypeText'=>$crewTypeText,
-        'crew'=>$crew,
-        'train'=>$train,
-        'atmos'=>$atmos,
-        'nation'=>$nation,
-        'nationName'=>$nationName,
-        'turnText'=>$turnText
-    ];
-}
+                                $generalsFormat[] = [
+                                    'ourGeneral' => $ourGeneral,
+                                    'iconPath' => GetImageURL($general['imgsvr']) . '/' . $general['picture'],
+                                    'isNPC' => $isNPC,
+                                    'wounded' => $wounded,
+                                    'name' => $name,
+                                    'nameText' => $nameText,
+                                    'leadership' => $leadership,
+                                    'leadershipText' => $leadershipText,
+                                    'leadershipBonus' => $leadershipBonus,
+                                    'leadershipBonusText' => $leadershipBonusText,
+                                    'officerLevel' => $officerLevel,
+                                    'officerLevelText' => $officerLevelText,
+                                    'strength' => $strength,
+                                    'strengthText' => $strengthText,
+                                    'intel' => $intel,
+                                    'intelText' => $intelText,
+                                    'defenceTrain' => $defenceTrain,
+                                    'defenceTrainText' => $defenceTrainText,
+                                    'crewType' => $crewType,
+                                    'crewTypeText' => $crewTypeText,
+                                    'crew' => $crew,
+                                    'train' => $train,
+                                    'atmos' => $atmos,
+                                    'nation' => $nation,
+                                    'nationName' => $nationName,
+                                    'turnText' => $turnText
+                                ];
+                            }
 
-$generalsName = array_map(function($gen){return getColoredName($gen['name'], $gen['npc']);}, $generals);
+                            $generalsName = array_map(function ($gen) {
+                                return getColoredName($gen['name'], $gen['npc']);
+                            }, $generals);
 
-$enemyCrew = 0;
-$enemyCnt = 0;
-$enemyArmedCnt = 0;
-$crew90 = 0;
-$gen90 = 0;
-$crew80 = 0;
-$gen80 = 0;
-$crew60 = 0;
-$gen60 = 0;
+                            $enemyCrew = 0;
+                            $enemyCnt = 0;
+                            $enemyArmedCnt = 0;
+                            $crew90 = 0;
+                            $gen90 = 0;
+                            $crew80 = 0;
+                            $gen80 = 0;
+                            $crew60 = 0;
+                            $gen60 = 0;
 
-$crewDef = 0;
-$genDef = 0 ;
+                            $crewDef = 0;
+                            $genDef = 0;
 
-$crewTotal = 0;
-$armedGenTotal = 0;
-$genTotal = 0;
+                            $crewTotal = 0;
+                            $armedGenTotal = 0;
+                            $genTotal = 0;
 
 
-foreach($generalsFormat as $general){
-    if(!$general['nation'] || !$myNation['nation']){
-        continue;
-    }
-    if($general['nation'] != $myNation['nation']){
-        $enemyCnt += 1;
-        if($general['crew'] >= 0){
-            $enemyCrew += $general['crew'];
-        }
-        if($general['crew'] > 0){
-            $enemyArmedCnt += 1;
-        }
-        continue;
-    }
+                            foreach ($generalsFormat as $general) {
+                                if (!$general['nation'] || !$myNation['nation']) {
+                                    continue;
+                                }
+                                if ($general['nation'] != $myNation['nation']) {
+                                    $enemyCnt += 1;
+                                    if ($general['crew'] >= 0) {
+                                        $enemyCrew += $general['crew'];
+                                    }
+                                    if ($general['crew'] > 0) {
+                                        $enemyArmedCnt += 1;
+                                    }
+                                    continue;
+                                }
 
-    $crewTotal += $general['crew'];
-    $genTotal += 1;
+                                $crewTotal += $general['crew'];
+                                $genTotal += 1;
 
-    if($general['crew'] == 0){
-        continue;
-    }
-    $armedGenTotal += 1;
+                                if ($general['crew'] == 0) {
+                                    continue;
+                                }
+                                $armedGenTotal += 1;
 
-    $minTrain = min($general['train'], $general['atmos']);
+                                $minTrain = min($general['train'], $general['atmos']);
 
-    if($minTrain >= 90){
-        $crew90 += $general['crew'];
-        $gen90 += 1;
-    }
+                                if ($minTrain >= 90) {
+                                    $crew90 += $general['crew'];
+                                    $gen90 += 1;
+                                }
 
-    $chkDef = false;
+                                $chkDef = false;
 
-    if($minTrain >= 80){
-        $crew80 += $general['crew'];
-        $gen80 += 1;
-    }
+                                if ($minTrain >= 80) {
+                                    $crew80 += $general['crew'];
+                                    $gen80 += 1;
+                                }
 
-    if($minTrain >= 60){
-        $crew60 += $general['crew'];
-        $gen60 += 1;
-    }
+                                if ($minTrain >= 60) {
+                                    $crew60 += $general['crew'];
+                                    $gen60 += 1;
+                                }
 
-    if($minTrain >= $general['defenceTrain']){
-        $crewDef += $general['crew'];
-        $genDef += 1;
-        $chkDef = true;
-    }
+                                if ($minTrain >= $general['defenceTrain']) {
+                                    $crewDef += $general['crew'];
+                                    $genDef += 1;
+                                    $chkDef = true;
+                                }
+                            }
 
+                            ?>
 
+                            <table align=center width=1000 class='tb_layout bg0'>
+                                <tr>
+                                    <td><?= backButton() ?></td>
+                                </tr>
+                            </table>
 
-}
+                            <table align=center width=1000 class='tb_layout bg2'>
+                                <tr>
+                                    <td colspan=11 align=center style='color:<?= newColor($cityNation['color']) ?>; background:<?= $cityNation['color'] ?>'>【 <?= CityConst::$regionMap[$city['region']] ?> | <?= CityConst::$levelMap[$city['level']] ?> 】 <?= $city['name'] ?></td>
+                                    <td style='color:<?= newColor($cityNation['color']) ?>; background:<?= $cityNation['color'] ?>' class='center'><?= 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['pop_max'] ?></td>
+                                    <td align=center width=48 class=bg1>농업</td>
+                                    <td align=center width=108><?= $city['agri'] ?>/<?= $city['agri_max'] ?></td>
+                                    <td align=center width=48 class=bg1>상업</td>
+                                    <td align=center width=108><?= $city['comm'] ?>/<?= $city['comm_max'] ?></td>
+                                    <td align=center width=48 class=bg1>치안</td>
+                                    <td align=center width=108><?= $city['secu'] ?>/<?= $city['secu_max'] ?></td>
+                                    <td align=center width=48 class=bg1>수비</td>
+                                    <td align=center width=108><?= $city['def'] ?>/<?= $city['def_max'] ?></td>
+                                    <td align=center width=48 class=bg1>성벽</td>
+                                    <td align=center width=108><?= $city['wall'] ?>/<?= $city['wall_max'] ?></td>
+                                </tr>
+                                <tr>
+                                    <td align=center class=bg1>민심</td>
+                                    <td align=center><?= $city['trustText'] ?></td>
+                                    <td align=center class=bg1>시세</td>
+                                    <td align=center><?= $city['trade'] ?>%</td>
+                                    <td align=center class=bg1>인구</td>
+                                    <td align=center><?= $city['popRateText'] ?>%</td>
+                                    <td align=center class=bg1>태수</td>
+                                    <td align=center><?= $officer[4]['name'] ?></td>
+                                    <td align=center class=bg1>군사</td>
+                                    <td align=center><?= $officer[3]['name'] ?></td>
+                                    <td align=center class=bg1>종사</td>
+                                    <td align=center><?= $officer[2]['name'] ?></td>
+                                </tr>
+                                <tr>
+                                    <td align=center class=bg1>도시명</td>
+                                    <td align=center><?= $city['name'] ?></td>
+                                    <td align=center class=bg1>적군</td>
+                                    <td align=center><?= number_format($enemyCrew) ?>/<?= number_format($enemyArmedCnt) ?>(<?= number_format($enemyCnt) ?>)</td>
+                                    <td align=center class=bg1>병장(총)</td>
+                                    <td align=center><?= number_format($crewTotal) ?>/<?= number_format($armedGenTotal) ?>(<?= number_format($genTotal) ?>)</td>
+                                    <td align=center class=bg1>90병장</td>
+                                    <td align=center><?= number_format($crew90) ?>/<?= number_format($gen90) ?></td>
+                                    <td align=center class=bg1>60병장</td>
+                                    <td align=center><?= number_format($crew60) ?>/<?= number_format($gen60) ?></td>
+                                    <td align=center class=bg1>수비○</td>
+                                    <td align=center><?= number_format($crewDef) ?>/<?= number_format($genDef) ?></td>
+                                </tr>
+                                <tr>
+                                    <td align=center class=bg1>장수</td>
+                                    <td colspan=11><?= $showDetailedInfo ? join(', ', $generalsName) : '<span style="color:gray">알 수 없음</span>' ?></td>
+                                </tr>
+                            </table>
 
-?>
-
-<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['pop_max']?></td>
-        <td align=center width=48 class=bg1>농업</td>
-        <td align=center width=108><?=$city['agri']?>/<?=$city['agri_max']?></td>
-        <td align=center width=48 class=bg1>상업</td>
-        <td align=center width=108><?=$city['comm']?>/<?=$city['comm_max']?></td>
-        <td align=center width=48 class=bg1>치안</td>
-        <td align=center width=108><?=$city['secu']?>/<?=$city['secu_max']?></td>
-        <td align=center width=48 class=bg1>수비</td>
-        <td align=center width=108><?=$city['def']?>/<?=$city['def_max']?></td>
-        <td align=center width=48 class=bg1>성벽</td>
-        <td align=center width=108><?=$city['wall']?>/<?=$city['wall_max']?></td>
-    </tr>
-    <tr>
-        <td align=center class=bg1>민심</td>
-        <td align=center><?=$city['trustText']?></td>
-        <td align=center class=bg1>시세</td>
-        <td align=center><?=$city['trade']?>%</td>
-        <td align=center class=bg1>인구</td>
-        <td align=center><?=$city['popRateText']?>%</td>
-        <td align=center class=bg1>태수</td>
-        <td align=center><?=$officer[4]['name']?></td>
-        <td align=center class=bg1>군사</td>
-        <td align=center><?=$officer[3]['name']?></td>
-        <td align=center class=bg1>종사</td>
-        <td align=center><?=$officer[2]['name']?></td>
-    </tr>
-    <tr>
-        <td align=center class=bg1>도시명</td>
-        <td align=center><?=$city['name']?></td>
-        <td align=center class=bg1>적군</td>
-        <td align=center><?=number_format($enemyCrew)?>/<?=number_format($enemyArmedCnt)?>(<?=number_format($enemyCnt)?>)</td>
-        <td align=center class=bg1>병장(총)</td>
-        <td align=center><?=number_format($crewTotal)?>/<?=number_format($armedGenTotal)?>(<?=number_format($genTotal)?>)</td>
-        <td align=center class=bg1>90병장</td>
-        <td align=center><?=number_format($crew90)?>/<?=number_format($gen90)?></td>
-        <td align=center class=bg1>60병장</td>
-        <td align=center><?=number_format($crew60)?>/<?=number_format($gen60)?></td>
-        <td align=center class=bg1>수비○</td>
-        <td align=center><?=number_format($crewDef)?>/<?=number_format($genDef)?></td>
-    </tr>
-    <tr>
-        <td align=center class=bg1>장수</td>
-        <td colspan=11><?=$showDetailedInfo?join(', ', $generalsName):'<span style="color:gray">알 수 없음</span>'?></td>
-    </tr>
-</table>
-
-<br>
-<?php if($showDetailedInfo): ?>
-<table align=center class='tb_layout bg0'>
-<thead>
-    <tr>
-        <td width=64 align=center class=bg1>얼 굴</td>
-        <td width=128 align=center class=bg1>이 름</td>
-        <td width=48 align=center class=bg1>통솔</td>
-        <td width=48 align=center class=bg1>무력</td>
-        <td width=48 align=center class=bg1>지력</td>
-        <td width=78 align=center class=bg1>관 직</td>
-        <td width=28 align=center class=bg1>守</td>
-        <td width=78 align=center class=bg1>병 종</td>
-        <td width=78 align=center class=bg1>병 사</td>
-        <td width=48 align=center class=bg1>훈련</td>
-        <td width=48 align=center class=bg1>사기</td>
-        <td width=280 align=center class=bg1>명 령</td>
-    </tr></thead>
-    <tbody class='bg0' id='general_list'>
-<?php
-foreach($generalsFormat as $general){
-    echo $templates->render('cityGeneral', $general);
-}
-?>
-</tbody>
-</table>
-<?php endif; ?>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+                            <br>
+                            <?php if ($showDetailedInfo) : ?>
+                                <table align=center class='tb_layout bg0'>
+                                    <thead>
+                                        <tr>
+                                            <td width=64 align=center class=bg1>얼 굴</td>
+                                            <td width=128 align=center class=bg1>이 름</td>
+                                            <td width=48 align=center class=bg1>통솔</td>
+                                            <td width=48 align=center class=bg1>무력</td>
+                                            <td width=48 align=center class=bg1>지력</td>
+                                            <td width=78 align=center class=bg1>관 직</td>
+                                            <td width=28 align=center class=bg1>守</td>
+                                            <td width=78 align=center class=bg1>병 종</td>
+                                            <td width=78 align=center class=bg1>병 사</td>
+                                            <td width=48 align=center class=bg1>훈련</td>
+                                            <td width=48 align=center class=bg1>사기</td>
+                                            <td width=280 align=center class=bg1>명 령</td>
+                                        </tr>
+                                    </thead>
+                                    <tbody class='bg0' id='general_list'>
+                                        <?php
+                                        foreach ($generalsFormat as $general) {
+                                            echo $templates->render('cityGeneral', $general);
+                                        }
+                                        ?>
+                                    </tbody>
+                                </table>
+                            <?php endif; ?>
+                            <table align=center width=1000 class='tb_layout bg0'>
+                                <tr>
+                                    <td><?= backButton() ?></td>
+                                </tr>
+                                <tr>
+                                    <td><?= banner() ?> </td>
+                                </tr>
+                            </table>
 </body>
-</html>
+
+</html>

hwe/b_dipcenter.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -26,11 +27,10 @@ if ($con >= 2) {
 }
 
 $permission = checkSecretPermission($me);
-if($permission < 0){
+if ($permission < 0) {
     echo '국가에 소속되어있지 않습니다.';
     die();
-}
-else if ($permission < 1) {
+} else if ($permission < 1) {
     echo "권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.";
     die();
 }
@@ -43,246 +43,227 @@ if ($me['officer_level'] >= 5) {
     $read = "readonly";
 }
 
-$nationStor->cacheValues(['notice', 'scout_msg']);
+$nationStor->cacheValues(['notice', 'scout_msg', 'available_war_setting_cnt']);
 
 ?>
 <!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>
-<script>
-var editable = <?=(($me['officer_level']>=5||$permission==4)?'true':'false')?>;
-var storedData = <?=Json::encode([
-    "nationMsg"=>$nationStor->notice??'',
-    "scoutMsg"=>$nationStor->scout_msg??''
-])?>;
-</script>
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/dipcenter.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../e_lib/summernote/summernote-bs4.css')?>
-<?=WebUtil::printCSS('dist_css/vendors.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printCSS('css/dipcenter.css')?>
-<link href="https://fonts.googleapis.com/css?family=Nanum+Gothic|Nanum+Myeongjo|Nanum+Pen+Script" rel="stylesheet">
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <title><?= UniqueConst::$serverName ?>: 내무부</title>
+    <?= WebUtil::printStaticValues([
+        'editable' => ($me['officer_level'] >= 5 || $permission == 4),
+        'nationMsg' => $nationStor->notice ?? '',
+        'scoutMsg' => $nationStor->scout_msg ?? '',
+    ]) ?>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('vue', 'v_dipcenter', true) ?>
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>내 무 부<br><?=backButton()?></td></tr>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
-    <tr>
-        <td width=130 align=center class=bg1>국 가 명</td>
-        <td width=50  align=center class=bg1>국력</td>
-        <td width=40  align=center class=bg1>장수</td>
-        <td width=40  align=center class=bg1>속령</td>
-        <td width=80  align=center class=bg1>상태</td>
-        <td width=60  align=center class=bg1>기간</td>
-        <td width=100 align=center class=bg1>종 료 시 점</td>
-    </tr>
-<?php
-$admin = $gameStor->getValues(['year','month']);
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>내 무 부<br><?= backButton() ?></td>
+        </tr>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td colspan=9 align=center bgcolor=blue>외 교 관 계</td>
+        </tr>
+        <tr>
+            <td width=130 align=center class=bg1>국 가 명</td>
+            <td width=50 align=center class=bg1>국력</td>
+            <td width=40 align=center class=bg1>장수</td>
+            <td width=40 align=center class=bg1>속령</td>
+            <td width=80 align=center class=bg1>상태</td>
+            <td width=60 align=center class=bg1>기간</td>
+            <td width=100 align=center class=bg1>종 료 시 점</td>
+        </tr>
+        <?php
+        $admin = $gameStor->getValues(['year', 'month']);
 
-$cityCntList = Util::convertPairArrayToDict($db->queryAllLists('SELECT nation, count(city) FROM city GROUP BY nation'));
-$dipStateList = Util::convertArrayToDict($db->query('SELECT you,state,term FROM diplomacy WHERE me = %i', $nationID), 'you');
+        $cityCntList = Util::convertPairArrayToDict($db->queryAllLists('SELECT nation, count(city) FROM city GROUP BY nation'));
+        $dipStateList = Util::convertArrayToDict($db->query('SELECT you,state,term FROM diplomacy WHERE me = %i', $nationID), 'you');
 
-$nationsList = getAllNationStaticInfo();
-uasort($nationsList, function(array $lhs, array $rhs){
-    return -($lhs['power']<=>$rhs['power']);
-});
+        $nationsList = getAllNationStaticInfo();
+        uasort($nationsList, function (array $lhs, array $rhs) {
+            return - ($lhs['power'] <=> $rhs['power']);
+        });
 
-foreach($nationsList as $staticNation):
-    //속령수
-    $staticNationID = $staticNation['nation'];
-    $cityCnt = $cityCntList[$staticNation['nation']]??0;
+        foreach ($nationsList as $staticNation) :
+            //속령수
+            $staticNationID = $staticNation['nation'];
+            $cityCnt = $cityCntList[$staticNation['nation']] ?? 0;
 
-    $dipStateText = '-';
-    $dipTermText = '-';
-    $dipEndDateText = '-';
-    if($staticNationID !== $nationID){
-        $diplomacyState = $dipStateList[$staticNationID];
+            $dipStateText = '-';
+            $dipTermText = '-';
+            $dipEndDateText = '-';
+            if ($staticNationID !== $nationID) {
+                $diplomacyState = $dipStateList[$staticNationID];
 
-        $dipStateText = [
-            0 => "<font color=red>교 전</font>",
-            1 => "<font color=magenta>선포중</font>",
-            2 => "통 상",
-            7 => "<font color=green>불가침</font>",
-        ][$diplomacyState['state']];
+                $dipStateText = [
+                    0 => "<font color=red>교 전</font>",
+                    1 => "<font color=magenta>선포중</font>",
+                    2 => "통 상",
+                    7 => "<font color=green>불가침</font>",
+                ][$diplomacyState['state']];
 
-        if($diplomacyState['term']){
-            $dipEndMonth = $admin['month'] + $diplomacyState['term'] - 1;
-            $dipEndYear = $admin['year'] + intdiv($dipEndMonth, 12);
-            $dipEndMonth = $dipEndMonth % 12 + 1;
+                if ($diplomacyState['term']) {
+                    $dipEndMonth = $admin['month'] + $diplomacyState['term'] - 1;
+                    $dipEndYear = $admin['year'] + intdiv($dipEndMonth, 12);
+                    $dipEndMonth = $dipEndMonth % 12 + 1;
 
-            $dipTermText = $diplomacyState['term'].'개월';
-            $dipEndDateText = "{$dipEndYear}年 {$dipEndMonth}月";
-        }
+                    $dipTermText = $diplomacyState['term'] . '개월';
+                    $dipEndDateText = "{$dipEndYear}年 {$dipEndMonth}月";
+                }
+            }
+        ?>
+
+            <tr>
+                <td class='center' style='color:<?= newColor($staticNation['color']) ?>;background-color:<?= $staticNation['color'] ?>'><?= $staticNation['name'] ?></td>
+                <td class='center'><?= $staticNation['power'] ?></td>
+                <td class='center'><?= $staticNation['gennum'] ?></td>
+                <td class='center'><?= $cityCnt ?></td>
+                <td class='center'><?= $dipStateText ?></td>
+                <td class='center'><?= $dipTermText ?></td>
+                <td class='center'><?= $dipEndDateText ?></td>
+            </tr>
+        <?php endforeach; ?>
+    </table>
+
+    <?php
+    // 수입 연산
+    $cityList = $db->query('SELECT * FROM city WHERE nation=%i', $nationID);
+    $dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID);
+
+    $goldIncome  = getGoldIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
+    $warIncome  = getWarGoldIncome($nation['type'], $cityList);
+    $totalGoldIncome = $goldIncome + $warIncome;
+
+    $riceIncome = getRiceIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
+    $wallIncome = getWallIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
+    $totalRiceIncome = $riceIncome + $wallIncome;
+
+    $outcome = getOutcome($nation['bill'], $dedicationList);
+
+    $budgetgold = $nation['gold'] + $totalGoldIncome - $outcome;
+    $budgetrice = $nation['rice'] + $totalRiceIncome - $outcome;
+    $budgetgolddiff = $totalGoldIncome - $outcome;
+    $budgetricediff = $totalRiceIncome - $outcome;
+
+    if ($budgetgolddiff > 0) {
+        $budgetgolddiff = '+' . number_format($budgetgolddiff);
+    } else {
+        $budgetgolddiff = number_format($budgetgolddiff);
+    }
+    if ($budgetricediff > 0) {
+        $budgetricediff = '+' . number_format($budgetricediff);
+    } else {
+        $budgetricediff = number_format($budgetricediff);
     }
-?>
 
-<tr>
-    <td class='center' style='color:<?=newColor($staticNation['color'])?>;background-color:<?=$staticNation['color']?>'><?=$staticNation['name']?></td>
-    <td class='center'><?=$staticNation['power']?></td>
-    <td class='center'><?=$staticNation['gennum']?></td>
-    <td class='center'><?=$cityCnt?></td>
-    <td class='center'><?=$dipStateText?></td>
-    <td class='center'><?=$dipTermText?></td>
-    <td class='center'><?=$dipEndDateText?></td>
-</tr>
-<?php endforeach; ?>
-</table>
+    ?>
+    <div class='tb_layout bg0' style='margin:auto;width: 1000px;' id="editorForm">
 
-<?php
-// 수입 연산
-$cityList = $db->query('SELECT * FROM city WHERE nation=%i', $nationID);
-$dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID);
+    </div>
+    <table class="tb_layout bg0" style="margin:auto;">
+        <form name=form1 method=post action=c_dipcenter.php>
 
-$goldIncome  = getGoldIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
-$warIncome  = getWarGoldIncome($nation['type'], $cityList);
-$totalGoldIncome = $goldIncome + $warIncome;
-
-$riceIncome = getRiceIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
-$wallIncome = getWallIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
-$totalRiceIncome = $riceIncome + $wallIncome;
-
-$outcome = getOutcome($nation['bill'], $dedicationList);
-
-$budgetgold = $nation['gold'] + $totalGoldIncome - $outcome;
-$budgetrice = $nation['rice'] + $totalRiceIncome - $outcome;
-$budgetgolddiff = $totalGoldIncome - $outcome;
-$budgetricediff = $totalRiceIncome - $outcome;
-
-if ($budgetgolddiff > 0) {
-    $budgetgolddiff = '+'.number_format($budgetgolddiff);
-} else {
-    $budgetgolddiff = number_format($budgetgolddiff);
-}
-if ($budgetricediff > 0) {
-    $budgetricediff = '+'.number_format($budgetricediff);
-} else {
-    $budgetricediff = number_format($budgetricediff);
-}
-
-?>
-<table width=1000 class='tb_layout bg0' style='margin:auto;'>
-<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'><div id='noticeForm'>
-        <div class='bg1' style="display: flex; justify-content: space-around">
-            <div style='flex: 1 1 auto;'>
-                국가 방침
-            </div>
-            <div>
-                <input type='submit' class='submit' name=btn value='국가방침 수정'><input type='button' class='cancel_edit' value='취소'>
-            </div>
-        </div>
-        <input type='hidden' class='input_form' name='msg' data-global='nationMsg'>
-        <div class='edit_form viewer'></div>
-    </div></td></tr>
-    <tr><td colspan='2'><div id='scoutMsgForm'>
-        <div class='bg1' style="display: flex; justify-content: space-around">
-            <div style='flex: 1 1 auto;'>
-                임관 권유
-            </div>
-            <div>
-                <input type='submit' class='submit' name=btn value='임관 권유문 수정'><input type='button' class='cancel_edit' value='취소'>
-            </div>
-        </div>
-        <div style='border-bottom:solid gray 0.5px;'>870px x 200px를 넘어서는 내용은 표시되지 않습니다.</div>
-        <input type='hidden' class='input_form' name='scoutMsg' data-global='scoutMsg'>
-        <div style="width:870px;margin-left:auto;">
-            <div class='edit_form viewer'></div>
-        </div>
-        </div>
-
-    </div></td></tr>
-    <tr><td colspan=2 align=center bgcolor=green>예 산 &amp; 정 책</td></tr>
-    <tr>
-        <td colspan=2>
-            <table width=998 class='tb_layout bg0'>
-                <tr>
-                    <td colspan=2 align=center class=bg1>자금 예산</td>
-                    <td colspan=2 align=center class=bg1>병량 예산</td>
-                </tr>
-                <tr>
-                    <td width=248 align=right class=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
-                    <td width=248 align=center><?=number_format($nation['gold'])?></td>
-                    <td width=248 align=right class=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
-                    <td width=248 align=center><?=number_format($nation['rice'])?></td>
-                </tr>
-                <tr>
-                    <td align=right class=bg1>단기수입&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+<?=number_format($warIncome)?></td>
-                    <td align=right class=bg1>둔전수입&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+<?=number_format($wallIncome)?></td>
-                </tr>
-                <tr>
-                    <td align=right class=bg1>세 금&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+<?=number_format($goldIncome)?></td>
-                    <td align=right class=bg1>세 곡&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+<?=number_format($riceIncome)?></td>
-                </tr>
-                <tr>
-                    <td align=right class=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+<?=number_format($totalGoldIncome)?> / -<?=number_format($outcome)?></td>
-                    <td align=right class=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+<?=number_format($totalRiceIncome)?> / -<?=number_format($outcome)?></td>
-                </tr>
-                <tr>
-                    <td align=right class=bg1>국고 예산&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center><?=number_format($budgetgold)?> (<?=$budgetgolddiff?>)</td>
-                    <td align=right class=bg1>병량 예산&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center><?=number_format($budgetrice)?> (<?=$budgetricediff?>)</td>
-                </tr>
-                <tr>
-                    <td align=right class=bg1>세율 (5 ~ 30%)&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center><input type=text <?=$read?> name=rate style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['rate']?>>% <input type=<?=$btn?> name=btn value=세율></td>
-                    <td align=right class=bg1>봉급 지급률 (20 ~ 200%)&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center><input type=text <?=$read?> name=bill style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['bill']?>>% <input type=<?=$btn?> name=btn value=지급률></td>
-                </tr>
-                <tr>
-                    <td align=right class=bg1>기밀 권한 (1 ~ 99년)&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center><input type=text <?=$read?> name=secretlimit style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['secretlimit']?>>년 <input type=<?=$btn?> name=btn value=기밀권한></td>
-                    <td align=right class=bg1>임관&amp;전쟁 변경 가능</td>
-                    <td align=center>무제한</td>
-                </tr>
-                <tr>
-                    <td colspan=4 align=center>
-<?php
-if ($nation['scout'] == 0) {
-    echo "
+            <tr>
+                <td colspan=2 align=center bgcolor=green>예 산 &amp; 정 책</td>
+            </tr>
+            <tr>
+                <td colspan=2>
+                    <table width=998 class='tb_layout bg0'>
+                        <tr>
+                            <td colspan=2 align=center class=bg1>자금 예산</td>
+                            <td colspan=2 align=center class=bg1>병량 예산</td>
+                        </tr>
+                        <tr>
+                            <td width=248 align=right class=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
+                            <td width=248 align=center><?= number_format($nation['gold']) ?></td>
+                            <td width=248 align=right class=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
+                            <td width=248 align=center><?= number_format($nation['rice']) ?></td>
+                        </tr>
+                        <tr>
+                            <td align=right class=bg1>단기수입&nbsp;&nbsp;&nbsp;</td>
+                            <td align=center>+<?= number_format($warIncome) ?></td>
+                            <td align=right class=bg1>둔전수입&nbsp;&nbsp;&nbsp;</td>
+                            <td align=center>+<?= number_format($wallIncome) ?></td>
+                        </tr>
+                        <tr>
+                            <td align=right class=bg1>세 금&nbsp;&nbsp;&nbsp;</td>
+                            <td align=center>+<?= number_format($goldIncome) ?></td>
+                            <td align=right class=bg1>세 곡&nbsp;&nbsp;&nbsp;</td>
+                            <td align=center>+<?= number_format($riceIncome) ?></td>
+                        </tr>
+                        <tr>
+                            <td align=right class=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
+                            <td align=center>+<?= number_format($totalGoldIncome) ?> / -<?= number_format($outcome) ?></td>
+                            <td align=right class=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
+                            <td align=center>+<?= number_format($totalRiceIncome) ?> / -<?= number_format($outcome) ?></td>
+                        </tr>
+                        <tr>
+                            <td align=right class=bg1>국고 예산&nbsp;&nbsp;&nbsp;</td>
+                            <td align=center><?= number_format($budgetgold) ?> (<?= $budgetgolddiff ?>)</td>
+                            <td align=right class=bg1>병량 예산&nbsp;&nbsp;&nbsp;</td>
+                            <td align=center><?= number_format($budgetrice) ?> (<?= $budgetricediff ?>)</td>
+                        </tr>
+                        <tr>
+                            <td align=right class=bg1>세율 (5 ~ 30%)&nbsp;&nbsp;&nbsp;</td>
+                            <td align=center><input type=text <?= $read ?> name=rate style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?= $nation['rate'] ?>>% <input type=<?= $btn ?> name=btn value=세율></td>
+                            <td align=right class=bg1>봉급 지급률 (20 ~ 200%)&nbsp;&nbsp;&nbsp;</td>
+                            <td align=center><input type=text <?= $read ?> name=bill style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?= $nation['bill'] ?>>% <input type=<?= $btn ?> name=btn value=지급률></td>
+                        </tr>
+                        <tr>
+                            <td align=right class=bg1>기밀 권한 (1 ~ 99년)&nbsp;&nbsp;&nbsp;</td>
+                            <td align=center><input type=text <?= $read ?> name=secretlimit style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?= $nation['secretlimit'] ?>>년 <input type=<?= $btn ?> name=btn value=기밀권한></td>
+                            <td align=right class=bg1>전쟁 허용/금지 변경 가능</td>
+                            <td align=center><?= $nationStor->getValue('available_war_setting_cnt') ?>회(월 +<?= GameConst::$incAvailableWarSettingCnt ?>회, 최대<?= GameConst::$maxAvailableWarSettingCnt ?>회)</td>
+                        </tr>
+                        <tr>
+                            <td colspan=4 align=center>
+                                <?php
+                                if ($nation['scout'] == 0) {
+                                    echo "
     <input type=$btn name=btn value='임관 금지'>";
-} else {
-    echo "
+                                } else {
+                                    echo "
     <input type=$btn name=btn value='임관 허가'>";
-}
+                                }
 
-if ($nation['war'] == 0) {
-    echo "
+                                if ($nation['war'] == 0) {
+                                    echo "
     <input type=$btn name=btn value='전쟁 금지'>";
-} else {
-    echo "
+                                } else {
+                                    echo "
     <input type=$btn name=btn value='전쟁 허가'>";
-}
-?>
-                    </td>
-                </tr>
-            </table>
-    <tr><td colspan=2>기밀 권한이란, 암행부를 열람할 수 있는 일반 장수의 최소 사관 년수를 의미합니다.</td></tr>
-    <tr><td colspan=2 height=10></td></tr>
-</form>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+                                }
+                                ?>
+                            </td>
+                        </tr>
+                    </table>
+            <tr>
+                <td colspan=2>기밀 권한이란, 암행부를 열람할 수 있는 일반 장수의 최소 사관 년수를 의미합니다.</td>
+            </tr>
+            <tr>
+                <td colspan=2 height=10></td>
+            </tr>
+        </form>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>

hwe/b_diplomacy.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -12,20 +13,20 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("중원정보", 1);
 
-$mapTheme = $gameStor->map_theme??'che';
+$mapTheme = $gameStor->map_theme ?? 'che';
 
 $me = $db->queryFirstRow('SELECT no,nation FROM general WHERE owner=%i', $userID);
 $myNationID = $me['nation'];
 
-$nations = array_filter(getAllNationStaticInfo(), function(array $nation){
+$nations = array_filter(getAllNationStaticInfo(), function (array $nation) {
     return $nation['level'];
 });
-uasort($nations, function(array $lhs, array $rhs){
-    return -($lhs['power']<=>$rhs['power']);
+uasort($nations, function (array $lhs, array $rhs) {
+    return - ($lhs['power'] <=> $rhs['power']);
 });
 $nationCnt = count($nations);
 
-foreach($db->queryAllLists('SELECT nation, count(city) FROM city WHERE nation != 0 GROUP BY nation') as [$nationID, $cityCnt]){
+foreach ($db->queryAllLists('SELECT nation, count(city) FROM city WHERE nation != 0 GROUP BY nation') as [$nationID, $cityCnt]) {
     $nations[$nationID]['city_cnt'] = $cityCnt;
 }
 
@@ -34,10 +35,9 @@ foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE confl
     $cityID,
     $cityName,
     $rawConflict
-])
-{
+]) {
     $rawConflict = Json::decode($rawConflict);
-    if (count($rawConflict)<2) {
+    if (count($rawConflict) < 2) {
         continue;
     }
 
@@ -45,12 +45,12 @@ foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE confl
 
 
     $conflict = [];
-    foreach ($rawConflict as $nationID=>$killnum) {
+    foreach ($rawConflict as $nationID => $killnum) {
         $conflict[$nationID] = [
-            'killnum'=>$killnum,
-            'percent'=>round(100*$killnum / $sum, 1),
-            'name'=>$nations[$nationID]['name'],
-            'color'=>$nations[$nationID]['color']
+            'killnum' => $killnum,
+            'percent' => round(100 * $killnum / $sum, 1),
+            'name' => $nations[$nationID]['name'],
+            'color' => $nations[$nationID]['color']
         ];
     }
 
@@ -58,8 +58,8 @@ foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE confl
 };
 
 $diplomacyList = [];
-foreach($db->queryAllLists('SELECT me, you, state FROM diplomacy') as [$me, $you, $state]){
-    if(!key_exists($me, $diplomacyList)){
+foreach ($db->queryAllLists('SELECT me, you, state FROM diplomacy') as [$me, $you, $state]) {
+    if (!key_exists($me, $diplomacyList)) {
         $diplomacyList[$me] = [];
     }
 
@@ -72,156 +72,165 @@ $cellWidth = intdiv(888, max(1, $nationCnt));
 $defaultStateChar = '?';
 $sameNationStateChar = '＼';
 $infomativeStateCharMap = [
-    0=>'<span style="color:red;">★</span>',
-    1=>'<span style="color:magenta;">▲</span>',
-    2=>'ㆍ',
-    7=>'<span style="color:green;">@</span>'
+    0 => '<span style="color:red;">★</span>',
+    1 => '<span style="color:magenta;">▲</span>',
+    2 => 'ㆍ',
+    7 => '<span style="color:green;">@</span>'
 ];
 $neutralStateCharMap = [
-    0=>'<span style="color:red;">★</span>',
-    1=>'<span style="color:magenta;">▲</span>'
+    0 => '<span style="color:red;">★</span>',
+    1 => '<span style="color:magenta;">▲</span>'
 ];
 
 ?>
 <!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::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printJS('d_shared/base_map.js')?>
-<?=WebUtil::printJS('dist_js/map.js')?>
-<script>
-window.serverNick = '<?=DB::prefix()?>';
-window.serverID = '<?=UniqueConst::$serverID?>';
-$(function(){
+    <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('../d_shared/common_path.js') ?>
+    <?= WebUtil::printJS('d_shared/base_map.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printCSS('css/map.css') ?>
+    <?= WebUtil::printCSS('css/history.css') ?>
+    <?= WebUtil::printDist('ts', ['common', 'map']) ?>
+    <script>
+        window.serverNick = '<?= DB::prefix() ?>';
+        window.serverID = '<?= UniqueConst::$serverID ?>';
+        $(function() {
 
-    reloadWorldMap({
-        neutralView:true,
-        showMe:true,
-        useCachedMap:true
-    });
-
-});
-</script>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printCSS('css/map.css')?>
-<?=WebUtil::printCSS('css/history.css')?>
+            reloadWorldMap({
+                neutralView: true,
+                showMe: true,
+                useCachedMap: true
+            });
 
+        });
+    </script>
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>중 원 정 보<br><?=backButton()?></td></tr>
-</table>
-<br>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td colspan=<?=$nationCnt+1?> align=center bgcolor=blue>외 교 현 황</td></tr>
-    <tr>
-        <td align=center width=130 style=background-color:<?=GameConst::$basecolor2?>;>&nbsp;</td>
-<?php foreach($nations as $nation): ?>
-    <td align=center width=<?=$cellWidth?> style='background-color:<?=$nation['color']?>;color:<?=newColor($nation['color'])?>'><?=$nation['name']?></td>
-<?php endforeach; ?>
-</tr>
-<?php foreach($nations as $me=>$meNation): ?>
-<tr style='text-align:center;'>
-<td align=center style='background-color:<?=$meNation['color']?>;color:<?=newColor($meNation['color'])?>'><?=$meNation['name']?></td>
-<?php    foreach(array_keys($nations) as $you): ?>
-<td <?=($me==$myNationID||$you==$myNationID)?'style="background-color:'.GameConst::$basecolor3.'"':''?>><?php
-if($me==$you){
-    echo $sameNationStateChar;
-}
-else if($me==$myNationID || $you==$myNationID || $session->userGrade >= 5){
-    echo $infomativeStateCharMap[$diplomacyList[$me][$you]]??$defaultStateChar;
-}
-else{
-    echo $neutralStateCharMap[$diplomacyList[$me][$you]]??$defaultStateChar;
-}
-?></td>
-<?php    endforeach; ?>
-</tr>
-<?php endforeach; ?>
-    <tr><td colspan=<?=$nationCnt+1?> align=center>불가침 : <font color=limegreen>@</font>, 통상 : ㆍ, 선포 : <font color=magenta>▲</font>, 교전 : <font color=red>★</font></td></tr>
-</table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>중 원 정 보<br><?= backButton() ?></td>
+        </tr>
+    </table>
+    <br>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td colspan=<?= $nationCnt + 1 ?> align=center bgcolor=blue>외 교 현 황</td>
+        </tr>
+        <tr>
+            <td align=center width=130 style=background-color:<?= GameConst::$basecolor2 ?>;>&nbsp;</td>
+            <?php foreach ($nations as $nation) : ?>
+                <td align=center width=<?= $cellWidth ?> style='background-color:<?= $nation['color'] ?>;color:<?= newColor($nation['color']) ?>'><?= $nation['name'] ?></td>
+            <?php endforeach; ?>
+        </tr>
+        <?php foreach ($nations as $me => $meNation) : ?>
+            <tr style='text-align:center;'>
+                <td align=center style='background-color:<?= $meNation['color'] ?>;color:<?= newColor($meNation['color']) ?>'><?= $meNation['name'] ?></td>
+                <?php foreach (array_keys($nations) as $you) : ?>
+                    <td <?= ($me == $myNationID || $you == $myNationID) ? 'style="background-color:' . GameConst::$basecolor3 . '"' : '' ?>><?php
+                                                                                                                            if ($me == $you) {
+                                                                                                                                echo $sameNationStateChar;
+                                                                                                                            } else if ($me == $myNationID || $you == $myNationID || $session->userGrade >= 5) {
+                                                                                                                                echo $infomativeStateCharMap[$diplomacyList[$me][$you]] ?? $defaultStateChar;
+                                                                                                                            } else {
+                                                                                                                                echo $neutralStateCharMap[$diplomacyList[$me][$you]] ?? $defaultStateChar;
+                                                                                                                            }
+                                                                                                                            ?></td>
+                <?php endforeach; ?>
+            </tr>
+        <?php endforeach; ?>
+        <tr>
+            <td colspan=<?= $nationCnt + 1 ?> align=center>불가침 : <font color=limegreen>@</font>, 통상 : ㆍ, 선포 : <font color=magenta>▲</font>, 교전 : <font color=red>★</font>
+            </td>
+        </tr>
+    </table>
 
-<?php if ($realConflict) : ?>
+    <?php if ($realConflict) : ?>
 
-<br>
-<table align='center' width=1000 class='tb_layout bg0'>
-    <tr><td colspan=2 align=center bgcolor=magenta>분 쟁 현 황</td></tr>
-    <?php foreach($realConflict as list($cityID, $cityName, $conflict)): ?>
-    <tr>
-        <td align=center width=48><?=$cityName?></td>
-        <td style='width:948px;position:relative;'>
-            <table class='tb_layout bg0' style='width:100%;'>
-            <?php foreach($conflict as $item): ?>
+        <br>
+        <table align='center' width=1000 class='tb_layout bg0'>
+            <tr>
+                <td colspan=2 align=center bgcolor=magenta>분 쟁 현 황</td>
+            </tr>
+            <?php foreach ($realConflict as list($cityID, $cityName, $conflict)) : ?>
                 <tr>
-                    <td
-                        width=130
-                        align=right
-                        style='color:<?=newColor($item['color'])?>;background-color:<?=$item['color']?>;'
-                    ><?=$item['name']?>&nbsp;</td>
-                    <td width=48 align=right><?=(float)$item['percent']?> %&nbsp;</td>
-                    <td width=*><div
-                        style='display:inline-block;width:<?=$item['percent']?>%;background-color:<?=$item['color']?>;'
-                    >&nbsp;</div></td>
+                    <td align=center width=48><?= $cityName ?></td>
+                    <td style='width:948px;position:relative;'>
+                        <table class='tb_layout bg0' style='width:100%;'>
+                            <?php foreach ($conflict as $item) : ?>
+                                <tr>
+                                    <td width=130 align=right style='color:<?= newColor($item['color']) ?>;background-color:<?= $item['color'] ?>;'><?= $item['name'] ?>&nbsp;</td>
+                                    <td width=48 align=right><?= (float)$item['percent'] ?> %&nbsp;</td>
+                                    <td width=*>
+                                        <div style='display:inline-block;width:<?= $item['percent'] ?>%;background-color:<?= $item['color'] ?>;'>&nbsp;</div>
+                                    </td>
+                                </tr>
+                            <?php endforeach; ?>
+                        </table>
+
+                    </td>
                 </tr>
             <?php endforeach; ?>
-            </table>
+            <tr>
+                <td colspan=2 height=5 class='bg1'></td>
+            </tr>
+        </table>
 
-        </td>
-    </tr>
-    <?php endforeach; ?>
-    <tr><td colspan=2 height=5 class='bg1'></td></tr>
-</table>
+    <?php endif; ?>
 
-<?php endif; ?>
+    <br>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td colspan=5 align=center bgcolor=green>
+                <font size=3>중 원 지 도</font>
+            </td>
+        </tr>
+        <tr>
+            <td width=698 height=420>
+                <?= getMapHtml($mapTheme) ?>
+            </td>
+            <td id='nation_list_frame'>
+                <table id='nation_list'>
+                    <thead>
+                        <tr>
+                            <th width=130>국명</th>
+                            <th width=70>국력</th>
+                            <th width=45>장수</th>
+                            <th width=45>속령</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <?php foreach ($nations as $nation) : ?>
+                            <tr>
+                                <td><span style='color:<?= newColor($nation['color']) ?>;background-color:<?= $nation['color'] ?>'><?= $nation['name'] ?></td>
+                                <td style='text-align:right'><?= number_format($nation['power']) ?></td>
+                                <td style='text-align:right'><?= number_format($nation['gennum']) ?></td>
+                                <td style='text-align:right'><?= number_format($nation['city_cnt']) ?></td>
+                            </tr>
+                        <?php endforeach; ?>
+                    </tbody>
+                    <tfoot></tfoot>
+                </table>
+            </td>
+        </tr>
+    </table>
+    <br>
 
-<br>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr>
-        <td colspan=5 align=center bgcolor=green><font size=3>중 원 지 도</font></td>
-    </tr>
-    <tr>
-        <td width=698 height=420>
-            <?=getMapHtml($mapTheme)?>
-        </td>
-        <td id='nation_list_frame'>
-            <table id='nation_list'>
-                <thead>
-                    <tr>
-                        <th width=130>국명</th>
-                        <th width=70>국력</th>
-                        <th width=45>장수</th>
-                        <th width=45>속령</th>
-                    </tr>
-                </thead>
-                <tbody>
-<?php foreach($nations as $nation): ?>
-                    <tr>
-                        <td><span style='color:<?=newColor($nation['color'])?>;background-color:<?=$nation['color']?>'><?=$nation['name']?></td>
-                        <td style='text-align:right'><?=number_format($nation['power'])?></td>
-                        <td style='text-align:right'><?=number_format($nation['gennum'])?></td>
-                        <td style='text-align:right'><?=number_format($nation['city_cnt'])?></td>
-                    </tr>
-<?php endforeach; ?>
-                </tbody>
-                <tfoot></tfoot>
-            </table>
-        </td>
-    </tr>
-</table>
-<br>
-
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>

hwe/b_genList.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -29,11 +30,10 @@ if ($con >= 2) {
 }
 
 $permission = checkSecretPermission($me);
-if($permission < 0){
+if ($permission < 0) {
     echo '국가에 소속되어있지 않습니다.';
     die();
-}
-else if ($permission < 1) {
+} else if ($permission < 1) {
     echo "권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.";
     die();
 }
@@ -48,198 +48,235 @@ $templates = new \League\Plates\Engine('templates');
 <?php if ($con == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
+
 <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('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
+    <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') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>암 행 부<br><?=closeButton()?></td></tr>
-    <tr><td><form name=form1 method=get>정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[1]??''?> value=1>자금</option>
-            <option <?=$sel[2]??''?> value=2>군량</option>
-            <option <?=$sel[3]??''?> value=3>도시</option>
-            <option <?=$sel[4]??''?> value=4>병종</option>
-            <option <?=$sel[5]??''?> value=5>병사</option>
-            <option <?=$sel[6]??''?> value=6>삭제턴</option>
-            <option <?=$sel[7]??''?> value=7>턴</option>
-            <option <?=$sel[8]??''?> value=8>부대</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<?php
-$troopName = [];
-foreach($db->queryAllLists('SELECT troop_leader, name FROM troop WHERE nation=%i', $me['nation']) as [$troopID, $tName]){
-    $troopName[$troopID] = $tName;
-}
-
-$orderSQL = '';
-switch ($type) {
-    case 1: $orderSQL = "order by gold desc"; break;
-    case 2: $orderSQL = "order by rice desc"; break;
-    case 3: $orderSQL = "order by city"; break;
-    case 4: $orderSQL = "order by crewtype desc"; break;
-    case 5: $orderSQL = "order by crew desc"; break;
-    case 6: $orderSQL = "order by killturn"; break;
-    case 7: $orderSQL = "order by turntime"; break;
-    case 8: $orderSQL = "order by troop desc"; break;
-}
-
-$generals = $db->query(
-    'SELECT npc,defence_train,no,officer_level,troop,city,injury,leadership,strength,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,nation from general WHERE nation = %i %l',
-    $me['nation'],
-    $orderSQL
-);
-
-$generalTurnList = [];
-
-foreach($db->queryAllLists(
-    'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
-    array_column($generals, 'no')
-    ) as [$generalID, $turnIdx, $brief]
-){
-    if(!key_exists($generalID, $generalTurnList)){
-        $generalTurnList[$generalID] = [];
-    }
-    $generalTurnList[$generalID][$turnIdx] = $brief;
-}
-
-$genCntEff = 0;
-foreach ($generals as &$general) {
-    $general['cityText'] = CityConst::byID($general['city'])->name;
-    $general['troopText'] = $troopName[$general['troop']]??'-';
-
-    if($general['npc'] != 5){
-        $genCntEff += 1;
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>암 행 부<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=get>정렬순서 :
+                    <select name=type size=1>
+                        <option <?= $sel[1] ?? '' ?> value=1>자금</option>
+                        <option <?= $sel[2] ?? '' ?> value=2>군량</option>
+                        <option <?= $sel[3] ?? '' ?> value=3>도시</option>
+                        <option <?= $sel[4] ?? '' ?> value=4>병종</option>
+                        <option <?= $sel[5] ?? '' ?> value=5>병사</option>
+                        <option <?= $sel[6] ?? '' ?> value=6>삭제턴</option>
+                        <option <?= $sel[7] ?? '' ?> value=7>턴</option>
+                        <option <?= $sel[8] ?? '' ?> value=8>부대</option>
+                    </select>
+                    <input type=submit value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <?php
+    $troopName = [];
+    foreach ($db->queryAllLists('SELECT troop_leader, name FROM troop WHERE nation=%i', $me['nation']) as [$troopID, $tName]) {
+        $troopName[$troopID] = $tName;
     }
 
-    $lbonus = calcLeadershipBonus($general['officer_level'], $nationLevel);
-    if ($lbonus > 0) {
-        $lbonusText = "<font color=cyan>+{$lbonus}</font>";
-    } else {
-        $lbonusText = "";
-    }
-    $general['lbonus'] = $lbonus;
-    $general['lbonusText'] = $lbonusText;
-
-    if ($general['injury'] > 0) {
-        $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100);
-        $strength = intdiv($general['strength'] * (100 - $general['injury']), 100);
-        $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leadership = "<font color=red>{$leadership}</font>{$lbonusText}";
-        $strength = "<font color=red>{$strength}</font>";
-        $intel = "<font color=red>{$intel}</font>";
-    } else {
-        $leadership = "{$general['leadership']}{$lbonusText}";
-        $strength = "{$general['strength']}";
-        $intel = "{$general['intel']}";
+    $orderSQL = '';
+    switch ($type) {
+        case 1:
+            $orderSQL = "order by gold desc";
+            break;
+        case 2:
+            $orderSQL = "order by rice desc";
+            break;
+        case 3:
+            $orderSQL = "order by city";
+            break;
+        case 4:
+            $orderSQL = "order by crewtype desc";
+            break;
+        case 5:
+            $orderSQL = "order by crew desc";
+            break;
+        case 6:
+            $orderSQL = "order by killturn";
+            break;
+        case 7:
+            $orderSQL = "order by turntime";
+            break;
+        case 8:
+            $orderSQL = "order by troop desc";
+            break;
     }
 
-    $general['leadershipText'] = $leadership;
-    $general['strengthText'] = $strength;
-    $general['intelText'] = $intel;
+    $generals = $db->query(
+        'SELECT npc,defence_train,no,officer_level,troop,city,injury,leadership,strength,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,nation from general WHERE nation = %i %l',
+        $me['nation'],
+        $orderSQL
+    );
 
-    $general['expLevelText'] = getExpLevel($general['experience']);
+    $generalTurnList = [];
 
-    $general['nameText'] = getColoredName($general['name'], $general['npc']);
-
-    $general['modeText'] = formatDefenceTrain($general['defence_train']);
-    $general['crewtypeText'] = GameUnitConst::byId($general['crewtype'])->name??'-';
-
-
-    if ($general['npc'] < 2) {
-        $turntext = [];
-        foreach($generalTurnList[$general['no']] as $turnRawIdx=>$turn){
-            $turn = StringUtil::subStringForWidth($turn, 0, 41);
-            $turnIdx = $turnRawIdx+1;
-            $turntext[] = "&nbsp;$turnIdx : $turn";
+    foreach ($db->queryAllLists(
+        'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
+        array_column($generals, 'no')
+    ) as [$generalID, $turnIdx, $brief]) {
+        if (!key_exists($generalID, $generalTurnList)) {
+            $generalTurnList[$generalID] = [];
         }
-        $general['turntext'] = join("<br>\n", $turntext);
-    }
-}
-unset($general);
-
-$genCnt = countPureGeneralFromRawList($generals);
-$totalGold = 0;
-$totalRice = 0;
-$crew90 = 0;
-$gen90 = 0;
-$crew80 = 0;
-$gen80 = 0;
-$crew60 = 0;
-$gen60 = 0;
-$crewTotal = 0;
-//$genTotal = 0;
-foreach($generals as $general){
-    if($general['npc']==5){
-        continue;
-    }
-    $totalGold += $general['gold'];
-    $totalRice += $general['rice'];
-
-    $crewTotal += $general['crew'];
-
-    if($general['crew'] == 0){
-        continue;
-    }
-    if($general['train'] >= 90 && $general['atmos'] >= 90){
-        $crew90 += $general['crew'];
-        $gen90 += 1;
+        $generalTurnList[$generalID][$turnIdx] = $brief;
     }
 
-    if($general['train'] >= 80 && $general['atmos'] >= 80){
-        $crew80 += $general['crew'];
-        $gen80 += 1;
+    $genCntEff = 0;
+    foreach ($generals as &$general) {
+        $general['cityText'] = CityConst::byID($general['city'])->name;
+        $general['troopText'] = $troopName[$general['troop']] ?? '-';
+
+        if ($general['npc'] != 5) {
+            $genCntEff += 1;
+        }
+
+        $lbonus = calcLeadershipBonus($general['officer_level'], $nationLevel);
+        if ($lbonus > 0) {
+            $lbonusText = "<font color=cyan>+{$lbonus}</font>";
+        } else {
+            $lbonusText = "";
+        }
+        $general['lbonus'] = $lbonus;
+        $general['lbonusText'] = $lbonusText;
+
+        if ($general['injury'] > 0) {
+            $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100);
+            $strength = intdiv($general['strength'] * (100 - $general['injury']), 100);
+            $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
+            $leadership = "<font color=red>{$leadership}</font>{$lbonusText}";
+            $strength = "<font color=red>{$strength}</font>";
+            $intel = "<font color=red>{$intel}</font>";
+        } else {
+            $leadership = "{$general['leadership']}{$lbonusText}";
+            $strength = "{$general['strength']}";
+            $intel = "{$general['intel']}";
+        }
+
+        $general['leadershipText'] = $leadership;
+        $general['strengthText'] = $strength;
+        $general['intelText'] = $intel;
+
+        $general['expLevelText'] = getExpLevel($general['experience']);
+
+        $general['nameText'] = getColoredName($general['name'], $general['npc']);
+
+        $general['modeText'] = formatDefenceTrain($general['defence_train']);
+        $general['crewtypeText'] = GameUnitConst::byId($general['crewtype'])->name ?? '-';
+
+
+        if ($general['npc'] < 2) {
+            $turntext = [];
+            foreach ($generalTurnList[$general['no']] as $turnRawIdx => $turn) {
+                $turn = StringUtil::subStringForWidth($turn, 0, 41);
+                $turnIdx = $turnRawIdx + 1;
+                $turntext[] = "&nbsp;$turnIdx : $turn";
+            }
+            $general['turntext'] = join("<br>\n", $turntext);
+        }
     }
+    unset($general);
 
-    if($general['train'] >= 60 && $general['atmos'] >= 60){
-        $crew60 += $general['crew'];
-        $gen60 += 1;
+    $genCnt = countPureGeneralFromRawList($generals);
+    $totalGold = 0;
+    $totalRice = 0;
+    $crew90 = 0;
+    $gen90 = 0;
+    $crew80 = 0;
+    $gen80 = 0;
+    $crew60 = 0;
+    $gen60 = 0;
+    $crewTotal = 0;
+    //$genTotal = 0;
+    foreach ($generals as $general) {
+        if ($general['npc'] == 5) {
+            continue;
+        }
+        $totalGold += $general['gold'];
+        $totalRice += $general['rice'];
+
+        $crewTotal += $general['crew'];
+
+        if ($general['crew'] == 0) {
+            continue;
+        }
+        if ($general['train'] >= 90 && $general['atmos'] >= 90) {
+            $crew90 += $general['crew'];
+            $gen90 += 1;
+        }
+
+        if ($general['train'] >= 80 && $general['atmos'] >= 80) {
+            $crew80 += $general['crew'];
+            $gen80 += 1;
+        }
+
+        if ($general['train'] >= 60 && $general['atmos'] >= 60) {
+            $crew60 += $general['crew'];
+            $gen60 += 1;
+        }
     }
-}
-?>
+    ?>
 
-<table style='width:1000px;margin:5px auto' class='tb_layout bg0'>
-<thead>
-<colgroup>
-<col style="width:120px;"><col>
-<col style="width:120px;"><col>
-<col style="width:120px;"><col>
-<col style="width:120px;"><col>
-</colgroup>
-</thead>
-<tbody>
-<tr>
-<td class='bg1'>전체 금</td><td><?=number_format($totalGold)?></td>
-<td class='bg1'>전체 쌀</td><td><?=number_format($totalRice)?></td>
-<td class='bg1'>평균 금</td><td><?=number_format($totalGold/$genCntEff, 2)?></td>
-<td class='bg1'>평균 쌀</td><td><?=number_format($totalRice/$genCntEff, 2)?></td>
-</tr>
-<tr>
-<td class='bg1'>전체 병력/장수</td><td><?=number_format($crewTotal)?>/<?=number_format($genCntEff)?></td>
-<td class='bg1'>훈사 90 병력/장수</td><td><?=number_format($crew90)?>/<?=number_format($gen90)?></td>
-<td class='bg1'>훈사 80 병력/장수</td><td><?=number_format($crew80)?>/<?=number_format($gen80)?></td>
-<td class='bg1'>훈사 60 병력/장수</td><td><?=number_format($crew60)?>/<?=number_format($gen60)?></td>
-</tr>
-</tbody>
-</table>
+    <table style='width:1000px;margin:5px auto' class='tb_layout bg0'>
+        <thead>
+            <colgroup>
+                <col style="width:120px;">
+                <col>
+                <col style="width:120px;">
+                <col>
+                <col style="width:120px;">
+                <col>
+                <col style="width:120px;">
+                <col>
+            </colgroup>
+        </thead>
+        <tbody>
+            <tr>
+                <td class='bg1'>전체 금</td>
+                <td><?= number_format($totalGold) ?></td>
+                <td class='bg1'>전체 쌀</td>
+                <td><?= number_format($totalRice) ?></td>
+                <td class='bg1'>평균 금</td>
+                <td><?= number_format($totalGold / $genCntEff, 2) ?></td>
+                <td class='bg1'>평균 쌀</td>
+                <td><?= number_format($totalRice / $genCntEff, 2) ?></td>
+            </tr>
+            <tr>
+                <td class='bg1'>전체 병력/장수</td>
+                <td><?= number_format($crewTotal) ?>/<?= number_format($genCntEff) ?></td>
+                <td class='bg1'>훈사 90 병력/장수</td>
+                <td><?= number_format($crew90) ?>/<?= number_format($gen90) ?></td>
+                <td class='bg1'>훈사 80 병력/장수</td>
+                <td><?= number_format($crew80) ?>/<?= number_format($gen80) ?></td>
+                <td class='bg1'>훈사 60 병력/장수</td>
+                <td><?= number_format($crew60) ?>/<?= number_format($gen60) ?></td>
+            </tr>
+        </tbody>
+    </table>
 
-<?=$templates->render('generalList', ['generals'=>$generals])?>
+    <?= $templates->render('generalList', ['generals' => $generals]) ?>
 
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>

hwe/b_myBossInfo.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -17,7 +18,7 @@ $me = $db->queryFirstRow('SELECT no,nation,officer_level from general where owne
 $nationID = $me['nation'];
 
 $meLevel = $me['officer_level'];
-if($meLevel == 0) {
+if ($meLevel == 0) {
     echo "재야입니다.";
     exit();
 }
@@ -29,181 +30,198 @@ $nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nati
 <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::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printJS('dist_js/bossInfo.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../e_lib/select2/select2.min.css')?>
-<?=WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<script type="text/javascript">
-var chiefStatMin = <?=GameConst::$chiefStatMin?>;
-var myLevel = <?=$meLevel?>;
-</script>
+    <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('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../e_lib/select2/select2.min.css') ?>
+    <?= WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <script type="text/javascript">
+        var chiefStatMin = <?= GameConst::$chiefStatMin ?>;
+        var myLevel = <?= $meLevel ?>;
+    </script>
+    <?= WebUtil::printDist('ts', ['common', 'bossInfo']) ?>
 
-<?php
+    <?php
 
-$ambassadors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'ambassador\' AND nation = %i', $nationID);
-$auditors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'auditor\' AND nation = %i', $nationID);
-$candidateAmbassadors = [];
-$candidateAuditors = [];
-foreach($ambassadors as $ambassador){
-    $candidateAmbassadors[] = $ambassador;
-}
-foreach($auditors as $auditor){
-    $candidateAuditors[] = $auditor;
-}
-foreach($db->query('SELECT no, name, nation, officer_level, penalty, permission FROM general WHERE nation = %i AND permission = \'normal\' AND officer_level != 12', $nationID) as $candidate){
-    $maxPermission = checkSecretMaxPermission($candidate);
-    if($maxPermission == 4){
-        $candidateAmbassadors[] = $candidate;
+    $ambassadors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'ambassador\' AND nation = %i', $nationID);
+    $auditors = $db->query('SELECT no, name, officer_level, penalty, permission FROM general WHERE permission = \'auditor\' AND nation = %i', $nationID);
+    $candidateAmbassadors = [];
+    $candidateAuditors = [];
+    foreach ($ambassadors as $ambassador) {
+        $candidateAmbassadors[] = $ambassador;
     }
-    if($maxPermission >= 3){
-        $candidateAuditors[] = $candidate;
+    foreach ($auditors as $auditor) {
+        $candidateAuditors[] = $auditor;
+    }
+    foreach ($db->query('SELECT no, name, nation, officer_level, penalty, permission FROM general WHERE nation = %i AND permission = \'normal\' AND officer_level != 12', $nationID) as $candidate) {
+        $maxPermission = checkSecretMaxPermission($candidate);
+        if ($maxPermission == 4) {
+            $candidateAmbassadors[] = $candidate;
+        }
+        if ($maxPermission >= 3) {
+            $candidateAuditors[] = $candidate;
+        }
     }
-}
 
-?>
-<script>
-var candidateAmbassadors = <?=Json::encode(array_map(function($value){
-    return [
-        'id'=>$value['no'],
-        'text'=>$value['name'],
-        "selected"=>($value['permission']!='normal')
-    ];
-}, $candidateAmbassadors))?>;
+    ?>
+    <script>
+        var candidateAmbassadors = <?= Json::encode(array_map(function ($value) {
+                                        return [
+                                            'id' => $value['no'],
+                                            'text' => $value['name'],
+                                            "selected" => ($value['permission'] != 'normal')
+                                        ];
+                                    }, $candidateAmbassadors)) ?>;
 
-var candidateAuditors = <?=Json::encode(array_map(function($value){
-    return [
-        'id'=>$value['no'],
-        'text'=>$value['name'],
-        "selected"=>($value['permission']!='normal')
-    ];
-}, $candidateAuditors))?>;
-</script>
+        var candidateAuditors = <?= Json::encode(array_map(function ($value) {
+                                    return [
+                                        'id' => $value['no'],
+                                        'text' => $value['name'],
+                                        "selected" => ($value['permission'] != 'normal')
+                                    ];
+                                }, $candidateAuditors)) ?>;
+    </script>
 
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>인 사 부<br><?=backButton()?></td></tr>
-</table>
-<br>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>인 사 부<br><?= backButton() ?></td>
+        </tr>
+    </table>
+    <br>
 
-<?php
-
-$lv = getNationChiefLevel($nation['level']);
-if($meLevel >= 5) { $btn = "button"; }
-else { $btn = "hidden"; }
-
-$level = Util::convertArrayToDict(
-    $db->query(
-        'SELECT name,officer_level,city,picture,imgsvr,belong from general where nation=%i and officer_level>=%i order by officer_level desc',
-        $nationID, $lv
-    ),
-    'officer_level'
-);
-
-
-$tigers = $db->query('SELECT value, name
-    FROM rank_data LEFT JOIN general ON rank_data.general_id = general.no
-    WHERE rank_data.nation_id = %i AND rank_data.type = "killnum" AND value > 0 ORDER BY value DESC LIMIT 5',
-    $nationID
-);// 오호장군
-$tigerstr = join(', ', array_map(function($arr){
-    $number = number_format($arr['value']);
-    return "{$arr['name']}【{$number}】";
-}, $tigers));
-
-$eagles = $db->query('SELECT value, name
-    FROM rank_data LEFT JOIN general ON rank_data.general_id = general.no
-    WHERE rank_data.nation_id = %i AND rank_data.type = "firenum" AND value > 0 ORDER BY value DESC LIMIT 7',
-    $nationID
-);// 건안칠자
-$eaglestr = join(', ', array_map(function($arr){
-    $number = number_format($arr['value']);
-    return "{$arr['name']}【{$number}】";
-}, $eagles));
-
-?>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr>
-        <td align=center style='color:<?=newColor($nation['color'])?>; background-color:<?=$nation['color']?>' colspan=6>
-            <font size=5>【 <?=$nation['name']?> 】</font>
-        </td>
-    </tr>
-<?php
-for($i=12; $i >= $lv; $i-=2) {
-    $i1 = $i;   $i2 = $i - 1;
-    $imageTemp1 = GetImageURL($level[$i1]['imgsvr']??0);
-    $imageTemp2 = GetImageURL($level[$i2]['imgsvr']??0);
-    ?>
-    <tr>
-        <td width=98 align=center class='bg1'><font size=4><?=getOfficerLevelText($i1, $nation['level'])?></font></td>
-        <td width=64 class='generalIcon' height=64 style='background:no-repeat center url("<?=$imageTemp1?>/<?=$level[$i1]['picture']??'default.jpg'?>");background-size:64px;'></td>
-        <td width=332><font size=4><?=$level[$i1]['name']??'-'?>(<?=$level[$i1]['belong']??'-'?>년)</font></td>
-        <td width=98 align=center class='bg1'><font size=4><?=getOfficerLevelText($i2, $nation['level'])?></font></td>
-        <td width=64 class='generalIcon' height=64 style='background:no-repeat center url("<?=$imageTemp2?>/<?=$level[$i2]['picture']??'default.jpg'?>");background-size:64px;'></td>
-        <td width=332><font size=4><?=$level[$i2]['name']??'-'?>(<?=$level[$i2]['belong']??'-'?>년)</font></td>
-    </tr>
     <?php
-}
 
-?>
-<tr>
-    <td width=98 align=center class='bg1'>오호장군【승전】</td>
-    <td colspan=5><?=$tigerstr?></td>
-    </tr>
-    <tr>
-        <td width=98 align=center class='bg1'>건안칠자【계략】</td>
-        <td colspan=5><?=$eaglestr?></td>
-    </tr>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td colspan=6 height=5></td></tr>
-    <tr><td colspan=2 align=center bgcolor=red>추 방</td></tr>
-    <tr>
-        <td width=498 align=right class='bg1'>대상 장수</td>
-        <td width=498>
-<?php
-
-if($meLevel >= 5){
-    $candidateStrength = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and strength>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
-    $candidateIntel = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and intel>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
-    $candidateAny = $db->query('SELECT no,name,officer_level,city,npc,leadership,strength,intel,killturn from general where nation=%i and officer_level!=12  order by npc,binary(name)', $nationID); //추방 때문에 조금 더 김
-}
-else{
-    $candidateStrength = [];
-    $candidateIntel = [];
-    $candidateAny = [];
-}
-
-
-if($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $meLevel)) {
-    echo "
-            <select id='genlist_kick' size=1 style=color:white;background-color:black;>";
-
-    foreach($candidateAny as $general) {
-        if($general['no'] === $me['no']){
-            continue;
-        }
-        echo "
-                <option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} <small>({$general['leadership']}/{$general['strength']}/{$general['intel']}, {$general['killturn']}턴)</small></option>";
+    $lv = getNationChiefLevel($nation['level']);
+    if ($meLevel >= 5) {
+        $btn = "button";
+    } else {
+        $btn = "hidden";
     }
 
-    echo "
+    $level = Util::convertArrayToDict(
+        $db->query(
+            'SELECT name,officer_level,city,picture,imgsvr,belong from general where nation=%i and officer_level>=%i order by officer_level desc',
+            $nationID,
+            $lv
+        ),
+        'officer_level'
+    );
+
+
+    $tigers = $db->query(
+        'SELECT value, name
+    FROM rank_data LEFT JOIN general ON rank_data.general_id = general.no
+    WHERE rank_data.nation_id = %i AND rank_data.type = "killnum" AND value > 0 ORDER BY value DESC LIMIT 5',
+        $nationID
+    ); // 오호장군
+    $tigerstr = join(', ', array_map(function ($arr) {
+        $number = number_format($arr['value']);
+        return "{$arr['name']}【{$number}】";
+    }, $tigers));
+
+    $eagles = $db->query(
+        'SELECT value, name
+    FROM rank_data LEFT JOIN general ON rank_data.general_id = general.no
+    WHERE rank_data.nation_id = %i AND rank_data.type = "firenum" AND value > 0 ORDER BY value DESC LIMIT 7',
+        $nationID
+    ); // 건안칠자
+    $eaglestr = join(', ', array_map(function ($arr) {
+        $number = number_format($arr['value']);
+        return "{$arr['name']}【{$number}】";
+    }, $eagles));
+
+    ?>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td align=center style='color:<?= newColor($nation['color']) ?>; background-color:<?= $nation['color'] ?>' colspan=6>
+                <font size=5>【 <?= $nation['name'] ?> 】</font>
+            </td>
+        </tr>
+        <?php
+        for ($i = 12; $i >= $lv; $i -= 2) {
+            $i1 = $i;
+            $i2 = $i - 1;
+            $imageTemp1 = GetImageURL($level[$i1]['imgsvr'] ?? 0);
+            $imageTemp2 = GetImageURL($level[$i2]['imgsvr'] ?? 0);
+        ?>
+            <tr>
+                <td width=98 align=center class='bg1'>
+                    <font size=4><?= getOfficerLevelText($i1, $nation['level']) ?></font>
+                </td>
+                <td width=64 class='generalIcon' height=64 style='background:no-repeat center url("<?= $imageTemp1 ?>/<?= $level[$i1]['picture'] ?? 'default.jpg' ?>");background-size:64px;'></td>
+                <td width=332>
+                    <font size=4><?= $level[$i1]['name'] ?? '-' ?>(<?= $level[$i1]['belong'] ?? '-' ?>년)</font>
+                </td>
+                <td width=98 align=center class='bg1'>
+                    <font size=4><?= getOfficerLevelText($i2, $nation['level']) ?></font>
+                </td>
+                <td width=64 class='generalIcon' height=64 style='background:no-repeat center url("<?= $imageTemp2 ?>/<?= $level[$i2]['picture'] ?? 'default.jpg' ?>");background-size:64px;'></td>
+                <td width=332>
+                    <font size=4><?= $level[$i2]['name'] ?? '-' ?>(<?= $level[$i2]['belong'] ?? '-' ?>년)</font>
+                </td>
+            </tr>
+        <?php
+        }
+
+        ?>
+        <tr>
+            <td width=98 align=center class='bg1'>오호장군【승전】</td>
+            <td colspan=5><?= $tigerstr ?></td>
+        </tr>
+        <tr>
+            <td width=98 align=center class='bg1'>건안칠자【계략】</td>
+            <td colspan=5><?= $eaglestr ?></td>
+        </tr>
+    </table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td colspan=6 height=5></td>
+        </tr>
+        <tr>
+            <td colspan=2 align=center bgcolor=red>추 방</td>
+        </tr>
+        <tr>
+            <td width=498 align=right class='bg1'>대상 장수</td>
+            <td width=498>
+                <?php
+
+                if ($meLevel >= 5) {
+                    $candidateStrength = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and strength>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
+                    $candidateIntel = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and intel>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
+                    $candidateAny = $db->query('SELECT no,name,officer_level,city,npc,leadership,strength,intel,killturn from general where nation=%i and officer_level!=12  order by npc,binary(name)', $nationID); //추방 때문에 조금 더 김
+                } else {
+                    $candidateStrength = [];
+                    $candidateIntel = [];
+                    $candidateAny = [];
+                }
+
+
+                if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $meLevel)) {
+                    echo "
+            <select id='genlist_kick' size=1 style=color:white;background-color:black;>";
+
+                    foreach ($candidateAny as $general) {
+                        if ($general['no'] === $me['no']) {
+                            continue;
+                        }
+                        echo "
+                <option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} <small>({$general['leadership']}/{$general['strength']}/{$general['intel']}, {$general['killturn']}턴)</small></option>";
+                    }
+
+                    echo "
             </select>
             <input type=$btn id='btn_kick' value=추방>";
-}
+                }
 
-$officerLevelText = getOfficerLevelText(11, $nation['level']);
-echo "
+                $officerLevelText = getOfficerLevelText(11, $nation['level']);
+                echo "
         </td>
     </tr>
 </table>
@@ -211,112 +229,121 @@ echo "
     <tr><td colspan=4 height=5></td></tr>
     <tr><td colspan=4 align=center bgcolor=blue>수 뇌 부 임 명</td></tr>
     <tr>
-        <td width=98  align=right class='bg1'>".getOfficerLevelText(12, $nation['level'])."</td>
-        <td width=398>{$level[12]['name']} 【".CityConst::byID($level[12]['city'])->name."】</td>
+        <td width=98  align=right class='bg1'>" . getOfficerLevelText(12, $nation['level']) . "</td>
+        <td width=398>{$level[12]['name']} 【" . CityConst::byID($level[12]['city'])->name . "】</td>
         <td width=98  align=right class='bg1'>{$officerLevelText}</td>
         <td width=398>
 ";
 
-if($meLevel >= 5 && !isOfficerSet($nation['chief_set'], 11)) {
-    echo "
+                if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], 11)) {
+                    echo "
             <select id='genlist_11' size=1 maxlength=15 style=color:white;background-color:black;>
                 <option value=0 data-officer_level='0' data-name=''>____공석____</option>";
 
-    foreach($candidateAny as $general) {
-        if($general['officer_level'] == 11) {
-            echo "<option style=color:red; selected data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } elseif($general['officer_level'] > 1) {
-            echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } else {
-            echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        }
-    }
+                    foreach ($candidateAny as $general) {
+                        if ($general['officer_level'] == 11) {
+                            echo "<option style=color:red; selected data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                        } elseif ($general['officer_level'] > 1) {
+                            echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                        } else {
+                            echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                        }
+                    }
 
-    echo "
+                    echo "
             </select>
             <input class='btn_appoint' type=$btn data-officer_level='11' data-officer_level_text='{$officerLevelText}' value=임명>";
-} else {
-    if(key_exists(11, $level)){
-        echo "{$level[11]['name']} 【".CityConst::byID($level[11]['city'])->name."】";
-    }
-
-}
-echo "
+                } else {
+                    if (key_exists(11, $level)) {
+                        echo "{$level[11]['name']} 【" . CityConst::byID($level[11]['city'])->name . "】";
+                    }
+                }
+                echo "
         </td>
     </tr>
 ";
 
-for($i=10; $i >= $lv; $i--) {
-    if($i % 2 == 0) { echo "<tr>"; }
-    $officerLevelText = getOfficerLevelText($i, $nation['level']);
-    echo "
+                for ($i = 10; $i >= $lv; $i--) {
+                    if ($i % 2 == 0) {
+                        echo "<tr>";
+                    }
+                    $officerLevelText = getOfficerLevelText($i, $nation['level']);
+                    echo "
         <td width=98 align=right class='bg1'>{$officerLevelText}</td>
         <td width=398>
     ";
 
 
-    if($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $i)) {
-        echo "
+                    if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $i)) {
+                        echo "
             <select id='genlist_{$i}' size=1 style=color:white;background-color:black;>
                 <option value=0 data-officer_level='0' data-name=''>____공석____</option>";
 
-        foreach(($i%2==0?$candidateStrength:$candidateIntel) as $general) {
-            if($general['officer_level'] == $i) {
-                echo "<option style=color:red; selected data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-            } elseif($general['officer_level'] > 1) {
-                echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-            } else {
-                echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-            }
-        }
+                        foreach (($i % 2 == 0 ? $candidateStrength : $candidateIntel) as $general) {
+                            if ($general['officer_level'] == $i) {
+                                echo "<option style=color:red; selected data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } elseif ($general['officer_level'] > 1) {
+                                echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } else {
+                                echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            }
+                        }
 
-        echo "
+                        echo "
             </select>
             <input class='btn_appoint' type=$btn data-officer_level='{$i}' data-officer_level_text='$officerLevelText' value=임명>";
-    } else {
-        $general = $level[$i]??null;
-        if($general){
-            echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
-        }
-    }
-    echo "</td>";
-    if($i % 2 == 1) { echo "</tr>"; }
-}
-echo "
+                    } else {
+                        $general = $level[$i] ?? null;
+                        if ($general) {
+                            echo "{$general['name']} 【" . CityConst::byID($general['city'])->name . "】";
+                        }
+                    }
+                    echo "</td>";
+                    if ($i % 2 == 1) {
+                        echo "</tr>";
+                    }
+                }
+                echo "
     <tr><td colspan=4>※ <font color=red>빨간색</font>은 현재 임명중인 장수, <font color=orange>노란색</font>은 다른 관직에 임명된 장수, 하얀색은 일반 장수를 뜻합니다.</td></tr>
 </table>
 
 ";
 
-if($meLevel == 12):
-?>
-<table align='center' width='1000' class='tb_layout bg0'>
-    <tr><td colspan='4' height='5'></td></tr>
-<tr><td colspan='4' align='center' bgcolor='purple'>외 교 권 자 임 명</td></tr>
-    <tr>
-        <td width=98  align=right class='bg1'>외교권자</td>
-        <td width=398>
-<select id="selectAmbassador" multiple="multiple">
-</select>
-    <button id='changeAmbassador' type='button'>임명</button>
-        </td>
-        <td width=98  align=right class='bg1'>조언자</td>
-        <td width=398>
-<select id="selectAuditor" multiple="multiple">
-</select>
-        <button id='changeAuditor' type='button'>임명</button>
-        </td>
-    </tr>
-</table>
-<?php
-endif;
-?>
-<table align=center width=1000 id='officer_list' class='tb_layout bg0'>
-    <tr><td colspan=5 height=5></td></tr>
-<?php
-if($meLevel >= 5) {
-    $officerLevelText = getOfficerLevelText(4, $nation['level']);
-    echo "
+                if ($meLevel == 12) :
+                ?>
+                    <table align='center' width='1000' class='tb_layout bg0'>
+                        <tr>
+                            <td colspan='4' height='5'></td>
+                        </tr>
+                        <tr>
+                            <td colspan='4' align='center' bgcolor='purple'>외 교 권 자 임 명</td>
+                        </tr>
+                        <tr>
+                            <td width=98 align=right class='bg1'>외교권자</td>
+                            <td width=398>
+                                <select id="selectAmbassador" multiple="multiple">
+                                </select>
+                                <button id='changeAmbassador' type='button'>임명</button>
+                            </td>
+                            <td width=98 align=right class='bg1'>조언자</td>
+                            <td width=398>
+                                <select id="selectAuditor" multiple="multiple">
+                                </select>
+                                <button id='changeAuditor' type='button'>임명</button>
+                            </td>
+                        </tr>
+                    </table>
+                <?php
+                endif;
+                ?>
+                <table align=center width=1000 id='officer_list' class='tb_layout bg0'>
+                    <tr>
+                        <td colspan=5 height=5></td>
+                    </tr>
+                    <?php
+                    if ($meLevel >= 5) {
+                        $officerLevelText = getOfficerLevelText(4, $nation['level']);
+                        echo "
     <tr><td colspan=5 align=center bgcolor=orange>도 시 관 직 임 명</td></tr>
     <tr>
         <td colspan=3 align=right class='bg2'>{$officerLevelText} 임명</td>
@@ -324,142 +351,142 @@ if($meLevel >= 5) {
             <select id='citylist_4' size=1 style=color:white;background-color:black;>
     ";
 
-    $cityList = $db->query('SELECT city,name,region,officer_set FROM city WHERE nation=%i ORDER BY region,level DESC,binary(name)', $nationID);
-    $region = 0;
-    foreach($cityList as $city){
-        if(isOfficerSet($city['officer_set'], 4)){
-            continue;
-        }
+                        $cityList = $db->query('SELECT city,name,region,officer_set FROM city WHERE nation=%i ORDER BY region,level DESC,binary(name)', $nationID);
+                        $region = 0;
+                        foreach ($cityList as $city) {
+                            if (isOfficerSet($city['officer_set'], 4)) {
+                                continue;
+                            }
 
-        if($region != $city['region']) {
-            if($region != 0) {
-                echo "</optgroup>";
-            }
-            echo "<optgroup label=' 【 ".CityConst::$regionMap[$city['region']]." 】 ' style=color:skyblue;>";
-            $region = $city['region'];
-        }
+                            if ($region != $city['region']) {
+                                if ($region != 0) {
+                                    echo "</optgroup>";
+                                }
+                                echo "<optgroup label=' 【 " . CityConst::$regionMap[$city['region']] . " 】 ' style=color:skyblue;>";
+                                $region = $city['region'];
+                            }
 
-        echo "<option value='{$city['city']}' style=color:white;><span class='name_field'>{$city['name']}</span></option>";
-    }
-    echo "</optgroup>";
+                            echo "<option value='{$city['city']}' style=color:white;><span class='name_field'>{$city['name']}</span></option>";
+                        }
+                        echo "</optgroup>";
 
-    echo "
+                        echo "
             </select>
             <select id='genlist_4' size=1 style=color:white;background-color:black;>
                 <option value=0 data-officer_level='0' data-name=''>____공석____</option>
     ";
 
-    foreach($candidateStrength as $general) {
-        if($general['officer_level'] == 4) {
-            echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } elseif($general['officer_level'] > 1) {
-            echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } else {
-            echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        }
-    }
+                        foreach ($candidateStrength as $general) {
+                            if ($general['officer_level'] == 4) {
+                                echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } elseif ($general['officer_level'] > 1) {
+                                echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } else {
+                                echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            }
+                        }
 
-    echo "
+                        echo "
             </select>
             <input class='btn_appoint' type=$btn data-officer_level='4' data-officer_level_text='{$officerLevelText}' value=임명>
         </td>
     </tr>";
-    $officerLevelText = getOfficerLevelText(3, $nation['level']);
-    echo "<tr>
+                        $officerLevelText = getOfficerLevelText(3, $nation['level']);
+                        echo "<tr>
         <td colspan=3 align=right class='bg2'>{$officerLevelText} 임명</td>
         <td colspan=2>
             <select id='citylist_3' size=1 style=color:white;background-color:black;>
     ";
 
-    $region = 0;
-    foreach($cityList as $city){
-        if(isOfficerSet($city['officer_set'], 3)){
-            continue;
-        }
+                        $region = 0;
+                        foreach ($cityList as $city) {
+                            if (isOfficerSet($city['officer_set'], 3)) {
+                                continue;
+                            }
 
-        if($region != $city['region']) {
-            if($region != 0) {
-                echo "</optgroup>";
-            }
-            echo "<optgroup label=' 【 ".CityConst::$regionMap[$city['region']]." 】 ' style=color:skyblue;>";
-            $region = $city['region'];
-        }
+                            if ($region != $city['region']) {
+                                if ($region != 0) {
+                                    echo "</optgroup>";
+                                }
+                                echo "<optgroup label=' 【 " . CityConst::$regionMap[$city['region']] . " 】 ' style=color:skyblue;>";
+                                $region = $city['region'];
+                            }
 
-        echo "<option value='{$city['city']}' style=color:white;><span class='name_field'>{$city['name']}</span></option>";
-    }
-    echo "</optgroup>";
+                            echo "<option value='{$city['city']}' style=color:white;><span class='name_field'>{$city['name']}</span></option>";
+                        }
+                        echo "</optgroup>";
 
-    echo "
+                        echo "
             </select>
             <select id='genlist_3' size=1 style=color:white;background-color:black;>
                 <option value=0 data-officer_level='0' data-name=''>____공석____</option>
     ";
 
-    foreach($candidateIntel as $general) {
-        if($general['officer_level'] == 3) {
-            echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } elseif($general['officer_level'] > 1) {
-            echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } else {
-            echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        }
-    }
+                        foreach ($candidateIntel as $general) {
+                            if ($general['officer_level'] == 3) {
+                                echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } elseif ($general['officer_level'] > 1) {
+                                echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } else {
+                                echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            }
+                        }
 
-    echo "
+                        echo "
             </select>
             <input class='btn_appoint' type=$btn data-officer_level='3'  data-officer_level_text='{$officerLevelText}' value=임명>
         </td>
     </tr>";
-    $officerLevelText = getOfficerLevelText(2, $nation['level']);
-    echo "<tr>
+                        $officerLevelText = getOfficerLevelText(2, $nation['level']);
+                        echo "<tr>
         <td colspan=3 align=right class='bg2'>{$officerLevelText} 임명</td>
         <td colspan=2>
             <select id='citylist_2' size=1 style=color:white;background-color:black;>
     ";
 
-    $region = 0;
-    foreach($cityList as $city){
-        if(isOfficerSet($city['officer_set'], 2)){
-            continue;
-        }
+                        $region = 0;
+                        foreach ($cityList as $city) {
+                            if (isOfficerSet($city['officer_set'], 2)) {
+                                continue;
+                            }
 
-        if($region != $city['region']) {
-            if($region != 0) {
-                echo "</optgroup>";
-            }
-            echo "<optgroup label=' 【 ".CityConst::$regionMap[$city['region']]." 】 ' style=color:skyblue;>";
-            $region = $city['region'];
-        }
+                            if ($region != $city['region']) {
+                                if ($region != 0) {
+                                    echo "</optgroup>";
+                                }
+                                echo "<optgroup label=' 【 " . CityConst::$regionMap[$city['region']] . " 】 ' style=color:skyblue;>";
+                                $region = $city['region'];
+                            }
 
-        echo "<option value='{$city['city']}' style=color:white;><span class='name_field'>{$city['name']}</span></option>";
-    }
-    echo "</optgroup>";
+                            echo "<option value='{$city['city']}' style=color:white;><span class='name_field'>{$city['name']}</span></option>";
+                        }
+                        echo "</optgroup>";
 
-    echo "
+                        echo "
             </select>
             <select id='genlist_2' size=1 style=color:white;background-color:black;>
                 <option value=0>____<span class='name_field'>공석</span>____</option>
     ";
 
-    foreach ($candidateAny as $general) {
-        if($general['officer_level'] == 2) {
-            echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } elseif($general['officer_level'] > 1) {
-            echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        } else {
-            echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【".CityConst::byID($general['city'])->name."】</option>";
-        }
-    }
+                        foreach ($candidateAny as $general) {
+                            if ($general['officer_level'] == 2) {
+                                echo "<option style=color:red; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } elseif ($general['officer_level'] > 1) {
+                                echo "<option style=color:orange; data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            } else {
+                                echo "<option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} 【" . CityConst::byID($general['city'])->name . "】</option>";
+                            }
+                        }
 
-    echo "
+                        echo "
             </select>
             <input class='btn_appoint' type=$btn data-officer_level='2'  data-officer_level_text='{$officerLevelText}' value=임명>
         </td>
     </tr>
     <tr><td colspan=5>※ <font color=red>빨간색</font>은 현재 임명중인 장수, <font color=orange>노란색</font>은 다른 관직에 임명된 장수, 하얀색은 일반 장수를 뜻합니다.</td></tr>
     ";
-}
-echo "
+                    }
+                    echo "
     <tr>
         <td width=158 align=center class='bg1' colspan=2><font size=4>도 시</font></td>
         <td width=278 align=center class='bg1'><font size=4>태 수 (사관) 【현재도시】</font></td>
@@ -468,59 +495,73 @@ echo "
     </tr>
 ";
 
-$citylevel = getCityLevelList();
+                    $citylevel = getCityLevelList();
 
-$officerList = [];
+                    $officerList = [];
 
-foreach($db->query('SELECT no,name,npc,city,officer_level,officer_city,belong FROM general WHERE nation = %i AND 2 <= officer_level AND officer_level <= 4', $nationID) as $officer){
-    $officerCityID = $officer['officer_city'];
-    if(!key_exists($officerCityID, $officerList)){
-        $officerList[$officerCityID] = [];
-    }
-    $officerList[$officerCityID][$officer['officer_level']] = $officer;
-}
+                    foreach ($db->query('SELECT no,name,npc,city,officer_level,officer_city,belong FROM general WHERE nation = %i AND 2 <= officer_level AND officer_level <= 4', $nationID) as $officer) {
+                        $officerCityID = $officer['officer_city'];
+                        if (!key_exists($officerCityID, $officerList)) {
+                            $officerList[$officerCityID] = [];
+                        }
+                        $officerList[$officerCityID][$officer['officer_level']] = $officer;
+                    }
 
-$region = 0;
-$dummyOfficer = [
-    'name'=>'-',
-    'belong'=>0,
-];
+                    $region = 0;
+                    $dummyOfficer = [
+                        'name' => '-',
+                        'belong' => 0,
+                    ];
 
-$textColor = newColor($nation['color']);
-$nationColor = $nation['color'];
+                    $textColor = newColor($nation['color']);
+                    $nationColor = $nation['color'];
 
-foreach($db->query('SELECT city,name,level,region,officer_set from city where nation=%i order by region,level desc,binary(name)', $nationID) as $city) {
-    $cityID = $city['city'];
-    $cityOfficerList = $officerList[$cityID]??[];
-?>
-<?php if($region != $city['region']): ?>
-    <tr><td colspan=5 height=3 class='bg1'></td></tr>
-    <tr><td colspan=5 class='bg1'><font size=4 color=skyblue> 【 <?=CityConst::$regionMap[$city['region']]?> 】 </font></td></tr>
-<?php endif; $region = $city['region']; ?>
-<tr>
-<td width=78 align=center style='color:<?=$textColor?>;background-color:<?=$nationColor?>;font-size:1.2em;'>【<?=$citylevel[$city['level']]?>】</td>
-<td width=78 align=right  style='color:<?=$textColor?>;background-color:<?=$nationColor?>;font-size:1.2em;'><?=$city['name']?>&nbsp;&nbsp;</td>
+                    foreach ($db->query('SELECT city,name,level,region,officer_set from city where nation=%i order by region,level desc,binary(name)', $nationID) as $city) {
+                        $cityID = $city['city'];
+                        $cityOfficerList = $officerList[$cityID] ?? [];
+                    ?>
+                        <?php if ($region != $city['region']) : ?>
+                            <tr>
+                                <td colspan=5 height=3 class='bg1'></td>
+                            </tr>
+                            <tr>
+                                <td colspan=5 class='bg1'>
+                                    <font size=4 color=skyblue> 【 <?= CityConst::$regionMap[$city['region']] ?> 】 </font>
+                                </td>
+                            </tr>
+                        <?php endif;
+                        $region = $city['region']; ?>
+                        <tr>
+                            <td width=78 align=center style='color:<?= $textColor ?>;background-color:<?= $nationColor ?>;font-size:1.2em;'>【<?= $citylevel[$city['level']] ?>】</td>
+                            <td width=78 align=right style='color:<?= $textColor ?>;background-color:<?= $nationColor ?>;font-size:1.2em;'><?= $city['name'] ?>&nbsp;&nbsp;</td>
 
-<?php foreach(Util::range(4, 1, -1) as $officerLevel): ?>
-<?php     if(key_exists($officerLevel, $cityOfficerList)):
-$officer = $cityOfficerList[$officerLevel];
-?>
-<td style="color:<?=isOfficerSet($city['officer_set'], $officerLevel)?'orange':'white'?>;"><?=$officer['name']?>(<?=$officer['belong']?>년) 【<?=CityConst::byID($officer['city'])->name?>】</td>
-<?php     else: ?>
-<td>-</td>
-<?php     endif; ?>
-<?php endforeach; ?>
-</tr>
-<?php
+                            <?php foreach (Util::range(4, 1, -1) as $officerLevel) : ?>
+                                <?php if (key_exists($officerLevel, $cityOfficerList)) :
+                                    $officer = $cityOfficerList[$officerLevel];
+                                ?>
+                                    <td style="color:<?= isOfficerSet($city['officer_set'], $officerLevel) ? 'orange' : 'white' ?>;"><?= $officer['name'] ?>(<?= $officer['belong'] ?>년) 【<?= CityConst::byID($officer['city'])->name ?>】</td>
+                                <?php else : ?>
+                                    <td>-</td>
+                                <?php endif; ?>
+                            <?php endforeach; ?>
+                        </tr>
+                    <?php
 
-}
-?>
-    <tr><td colspan=5>※ <font color=orange>노란색</font>은 변경 불가능, 하얀색은 변경 가능 관직입니다.</td></tr>
-</table>
-<br>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+                    }
+                    ?>
+                    <tr>
+                        <td colspan=5>※ <font color=orange>노란색</font>은 변경 불가능, 하얀색은 변경 가능 관직입니다.</td>
+                    </tr>
+                </table>
+                <br>
+                <table align=center width=1000 class='tb_layout bg0'>
+                    <tr>
+                        <td><?= backButton() ?></td>
+                    </tr>
+                    <tr>
+                        <td><?= banner() ?></td>
+                    </tr>
+                </table>
 </body>
-</html>
+
+</html>

hwe/b_myCityInfo.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -31,121 +32,165 @@ $sel = [$type => "selected"];
 <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('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/extExpandCity.js')?>
-
+    <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') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('ts', ['common', 'extExpandCity']) ?>
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>세 력 도 시<br><?=backButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[1]??''?> value=1>기본</option>
-            <option <?=$sel[2]??''?> value=2>인구</option>
-            <option <?=$sel[3]??''?> value=3>인구율</option>
-            <option <?=$sel[4]??''?> value=4>민심</option>
-            <option <?=$sel[5]??''?> value=5>농업</option>
-            <option <?=$sel[6]??''?> value=6>상업</option>
-            <option <?=$sel[7]??''?> value=7>치안</option>
-            <option <?=$sel[8]??''?> value=8>수비</option>
-            <option <?=$sel[9]??''?> value=9>성벽</option>
-            <option <?=$sel[10]??''?> value=10>시세</option>
-            <option <?=$sel[11]??''?> value=11>지역</option>
-            <option <?=$sel[12]??''?> value=12>규모</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<?php
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>세 력 도 시<br><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>정렬순서 :
+                    <select name=type size=1>
+                        <option <?= $sel[1] ?? '' ?> value=1>기본</option>
+                        <option <?= $sel[2] ?? '' ?> value=2>인구</option>
+                        <option <?= $sel[3] ?? '' ?> value=3>인구율</option>
+                        <option <?= $sel[4] ?? '' ?> value=4>민심</option>
+                        <option <?= $sel[5] ?? '' ?> value=5>농업</option>
+                        <option <?= $sel[6] ?? '' ?> value=6>상업</option>
+                        <option <?= $sel[7] ?? '' ?> value=7>치안</option>
+                        <option <?= $sel[8] ?? '' ?> value=8>수비</option>
+                        <option <?= $sel[9] ?? '' ?> value=9>성벽</option>
+                        <option <?= $sel[10] ?? '' ?> value=10>시세</option>
+                        <option <?= $sel[11] ?? '' ?> value=11>지역</option>
+                        <option <?= $sel[12] ?? '' ?> value=12>규모</option>
+                    </select>
+                    <input type=submit value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <?php
 
-$nation = getNationStaticInfo($me['nation']);  //국가정보
+    $nation = getNationStaticInfo($me['nation']);  //국가정보
 
-$officerList = [];
-foreach($db->query('SELECT no,name,npc,city,officer_level,officer_city,belong FROM general WHERE nation = %i AND 2 <= officer_level AND officer_level <= 4', $nationID) as $officer){
-    $officerCityID = $officer['officer_city'];
-    if(!key_exists($officerCityID, $officerList)){
-        $officerList[$officerCityID] = [];
-    }
-    $officerList[$officerCityID][$officer['officer_level']] = $officer;
-}
-
-
-$cityList = $db->query('SELECT *,pop/pop_max as poprate from city where nation=%i', $nationID);
-
-
-switch ($type) {
-    case  1: break;
-    case  2: usort($cityList, function($lhs, $rhs){return $rhs['pop'] <=> $lhs['pop'];}); break;
-    case  3: usort($cityList, function($lhs, $rhs){return $rhs['poprate'] <=> $lhs['poprate'];}); break;
-    case  4: usort($cityList, function($lhs, $rhs){return $rhs['trust'] <=> $lhs['trust'];}); break;
-    case  5: usort($cityList, function($lhs, $rhs){return $rhs['agri'] <=> $lhs['agri'];}); break;
-    case  6: usort($cityList, function($lhs, $rhs){return $rhs['comm'] <=> $lhs['comm'];}); break;
-    case  7: usort($cityList, function($lhs, $rhs){return $rhs['secu'] <=> $lhs['secu'];}); break;
-    case  8: usort($cityList, function($lhs, $rhs){return $rhs['def'] <=> $lhs['def'];}); break;
-    case  9: usort($cityList, function($lhs, $rhs){return $rhs['wall'] <=> $lhs['wall'];}); break;
-    case 10: usort($cityList, function($lhs, $rhs){return $rhs['trade'] <=> $lhs['trade'];}); break;
-    case 11: usort($cityList, function($lhs, $rhs){
-        $cmpTrust = $lhs['region'] <=> $rhs['region'];
-        if($cmpTrust != 0){
-            return $cmpTrust;
+    $officerList = [];
+    foreach ($db->query('SELECT no,name,npc,city,officer_level,officer_city,belong FROM general WHERE nation = %i AND 2 <= officer_level AND officer_level <= 4', $nationID) as $officer) {
+        $officerCityID = $officer['officer_city'];
+        if (!key_exists($officerCityID, $officerList)) {
+            $officerList[$officerCityID] = [];
         }
-        return $rhs['level']<=>$lhs['level'];
-    }); break;
-    case 12: usort($cityList, function($lhs, $rhs){
-        $cmpTrust = $rhs['level'] <=> $lhs['level'];
-        if($cmpTrust != 0){
-            return $cmpTrust;
+        $officerList[$officerCityID][$officer['officer_level']] = $officer;
+    }
+
+
+    $cityList = $db->query('SELECT *,pop/pop_max as poprate from city where nation=%i', $nationID);
+
+
+    switch ($type) {
+        case  1:
+            break;
+        case  2:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['pop'] <=> $lhs['pop'];
+            });
+            break;
+        case  3:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['poprate'] <=> $lhs['poprate'];
+            });
+            break;
+        case  4:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['trust'] <=> $lhs['trust'];
+            });
+            break;
+        case  5:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['agri'] <=> $lhs['agri'];
+            });
+            break;
+        case  6:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['comm'] <=> $lhs['comm'];
+            });
+            break;
+        case  7:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['secu'] <=> $lhs['secu'];
+            });
+            break;
+        case  8:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['def'] <=> $lhs['def'];
+            });
+            break;
+        case  9:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['wall'] <=> $lhs['wall'];
+            });
+            break;
+        case 10:
+            usort($cityList, function ($lhs, $rhs) {
+                return $rhs['trade'] <=> $lhs['trade'];
+            });
+            break;
+        case 11:
+            usort($cityList, function ($lhs, $rhs) {
+                $cmpTrust = $lhs['region'] <=> $rhs['region'];
+                if ($cmpTrust != 0) {
+                    return $cmpTrust;
+                }
+                return $rhs['level'] <=> $lhs['level'];
+            });
+            break;
+        case 12:
+            usort($cityList, function ($lhs, $rhs) {
+                $cmpTrust = $rhs['level'] <=> $lhs['level'];
+                if ($cmpTrust != 0) {
+                    return $cmpTrust;
+                }
+                return $lhs['region'] <=> $rhs['region'];
+            });
+            break;
+    }
+
+    $region = 0;
+    $level = 0;
+
+    foreach ($cityList as $city) {
+        $cityID = $city['city'];
+        if ($city['city'] == $nation['capital']) {
+            $city['name'] = "<font color=cyan>[{$city['name']}]</font>";
         }
-        return $lhs['region']<=>$rhs['region'];
-    }); break;
-}
 
-$region = 0;
-$level = 0;
+        $officerQuery = [];
+        $officerName = [
+            2 => '-',
+            3 => '-',
+            4 => '-'
+        ];
 
-foreach($cityList as $city){
-    $cityID = $city['city'];
-    if ($city['city'] == $nation['capital']) {
-        $city['name'] = "<font color=cyan>[{$city['name']}]</font>";
-    }
+        $cityOfficerList = $officerList[$cityID] ?? [];
+        foreach ($cityOfficerList as $cityOfficer) {
+            $officerName[$cityOfficer['officer_level']] = getColoredName($cityOfficer['name'], $cityOfficer['npc']);
+        }
 
-    $officerQuery = [];
-    $officerName = [
-        2=>'-',
-        3=>'-',
-        4=>'-'
-    ];
+        if ($type == 10 && $city['region'] != $region) {
+            echo "<br>";
+            $region = $city['region'];
+        } elseif ($type == 11 && $city['level'] != $level) {
+            echo "<br>";
+            $level = $city['level'];
+        }
 
-    $cityOfficerList = $officerList[$cityID]??[];
-    foreach($cityOfficerList as $cityOfficer){
-        $officerName[$cityOfficer['officer_level']] = getColoredName($cityOfficer['name'], $cityOfficer['npc']);
-    }
+        if ($city['trade'] === null) {
+            $city['trade'] = "- ";
+        }
 
-    if ($type == 10 && $city['region'] != $region) {
-        echo "<br>";
-        $region = $city['region'];
-    } elseif ($type == 11 && $city['level'] != $level) {
-        echo "<br>";
-        $level = $city['level'];
-    }
-
-    if ($city['trade'] === null) {
-        $city['trade'] = "- ";
-    }
-
-    echo "
+        echo "
 <table align=center width=1000 class='tb_layout bg2'>
     <tr>
-        <td colspan=12 style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}><font size=2>【 ".CityConst::$regionMap[$city['region']]." | ".CityConst::$levelMap[$city['level']]." 】 {$city['name']}</font></td>
+        <td colspan=12 style=color:" . newColor($nation['color']) . "; bgcolor={$nation['color']}><font size=2>【 " . CityConst::$regionMap[$city['region']] . " | " . CityConst::$levelMap[$city['level']] . " 】 {$city['name']}</font></td>
     </tr>
     <tr>
         <td align=center width=46 class='bg1'>주민</td>
@@ -163,46 +208,51 @@ foreach($cityList as $city){
     </tr>
     <tr>
         <td align=center class='bg1'>민심</td>
-        <td align=center>".round($city['trust'], 1)."</td>
+        <td align=center>" . round($city['trust'], 1) . "</td>
         <td align=center class='bg1'>시세</td>
         <td align=center>{$city['trade']}%</td>
         <td align=center class='bg1'>인구</td>
-        <td align=center>".round($city['pop']/$city['pop_max']*100, 2)." %</td>
+        <td align=center>" . round($city['pop'] / $city['pop_max'] * 100, 2) . " %</td>
         <td align=center class='bg1'>태수</td>
         <td align=center>";
-    echo $officerName[4];
-    echo "</td>
+        echo $officerName[4];
+        echo "</td>
         <td align=center class='bg1'>군사</td>
         <td align=center>";
-    echo $officerName[3];
-    echo "</td>
+        echo $officerName[3];
+        echo "</td>
         <td align=center class='bg1'>종사</td>
         <td align=center>";
-    echo $officerName[2];
-    echo "</td>
+        echo $officerName[2];
+        echo "</td>
     </tr>
     <tr>
         <td align=center class='bg1'>장수</td>
         <td colspan=11>";
-    $generalList = $db->query('SELECT npc, name FROM general WHERE city = %i AND nation = %i', $city['city'], $me['nation']);
-    if (!$generalList) {
-        echo "-";
-    }
-    foreach($generalList as $general) {
-        echo getColoredName($general['name'], $general['npc']).', ';
-    }
-    echo "
+        $generalList = $db->query('SELECT npc, name FROM general WHERE city = %i AND nation = %i', $city['city'], $me['nation']);
+        if (!$generalList) {
+            echo "-";
+        }
+        foreach ($generalList as $general) {
+            echo getColoredName($general['name'], $general['npc']) . ', ';
+        }
+        echo "
         </td>
     </tr>
 </table>
 ";
-}
-?>
+    }
+    ?>
 
-<table align=center width=1000 class='tb_layout bg0 anchor'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+    <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>
+
+</html>

hwe/b_myGenInfo.php

@@ -1,11 +1,12 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
 include "func.php";
 
 $type = Util::getReq('type', 'int', 1);
-if($type <= 0 || $type > 15) {
+if ($type <= 0 || $type > 15) {
     $type = 1;
 }
 
@@ -20,7 +21,7 @@ increaseRefresh("세력장수", 1);
 
 $me = $db->queryFirstRow('SELECT no,nation,officer_level from general where owner=%i', $userID);
 
-if($me['officer_level'] == 0) {
+if ($me['officer_level'] == 0) {
     echo "재야입니다.";
     exit();
 }
@@ -28,8 +29,8 @@ if($me['officer_level'] == 0) {
 $sel = [$type => "selected"];
 
 $ownerNameList = [];
-if($gameStor->isunited){
-    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+if ($gameStor->isunited) {
+    foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
         $ownerNameList[$ownerID] = $ownerName;
     }
 }
@@ -40,68 +41,71 @@ if($gameStor->isunited){
 <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('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-
+    <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') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>세 력 장 수<br><?=backButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[1]??''?> value=1>관직</option>
-            <option <?=$sel[2]??''?> value=2>계급</option>
-            <option <?=$sel[3]??''?> value=3>명성</option>
-            <option <?=$sel[4]??''?> value=4>통솔</option>
-            <option <?=$sel[5]??''?> value=5>무력</option>
-            <option <?=$sel[6]??''?> value=6>지력</option>
-            <option <?=$sel[7]??''?> value=7>자금</option>
-            <option <?=$sel[8]??''?> value=8>군량</option>
-            <option <?=$sel[9]??''?> value=9>병사</option>
-            <option <?=$sel[10]??''?> value=10>벌점</option>
-            <option <?=$sel[11]??''?> value=11>성격</option>
-            <option <?=$sel[12]??''?> value=12>내특</option>
-            <option <?=$sel[13]??''?> value=13>전특</option>
-            <option <?=$sel[14]??''?> value=14>사관</option>
-            <option <?=$sel[15]??''?> value=15>NPC</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<?php
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>세 력 장 수<br><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>정렬순서 :
+                    <select name=type size=1>
+                        <option <?= $sel[1] ?? '' ?> value=1>관직</option>
+                        <option <?= $sel[2] ?? '' ?> value=2>계급</option>
+                        <option <?= $sel[3] ?? '' ?> value=3>명성</option>
+                        <option <?= $sel[4] ?? '' ?> value=4>통솔</option>
+                        <option <?= $sel[5] ?? '' ?> value=5>무력</option>
+                        <option <?= $sel[6] ?? '' ?> value=6>지력</option>
+                        <option <?= $sel[7] ?? '' ?> value=7>자금</option>
+                        <option <?= $sel[8] ?? '' ?> value=8>군량</option>
+                        <option <?= $sel[9] ?? '' ?> value=9>병사</option>
+                        <option <?= $sel[10] ?? '' ?> value=10>벌점</option>
+                        <option <?= $sel[11] ?? '' ?> value=11>성격</option>
+                        <option <?= $sel[12] ?? '' ?> value=12>내특</option>
+                        <option <?= $sel[13] ?? '' ?> value=13>전특</option>
+                        <option <?= $sel[14] ?? '' ?> value=14>사관</option>
+                        <option <?= $sel[15] ?? '' ?> value=15>NPC</option>
+                    </select>
+                    <input type=submit value='정렬하기'>
+                </form>
+            </td>
+        </tr>
+    </table>
+    <?php
 
-$nationLevel = DB::db()->queryFirstField('select level from nation where nation = %i', $me['nation']);
+    $nationLevel = DB::db()->queryFirstField('select level from nation where nation = %i', $me['nation']);
 
-[$orderKey, $orderDesc] = [
-    1=>['officer_level', true],
-    2=>['dedication', true],
-    3=>['experience', true],
-    4=>['leadership', true],
-    5=>['strength', true],
-    6=>['intel', true],
-    7=>['gold', true],
-    8=>['rice', true],
-    9=>['crew', true],
-    10=>['connect', true],
-    11=>['personal', true],
-    12=>['special', true],
-    13=>['special2', true],
-    14=>['belong', true],
-    15=>['npc', true],
-][$type];
+    [$orderKey, $orderDesc] = [
+        1 => ['officer_level', true],
+        2 => ['dedication', true],
+        3 => ['experience', true],
+        4 => ['leadership', true],
+        5 => ['strength', true],
+        6 => ['intel', true],
+        7 => ['gold', true],
+        8 => ['rice', true],
+        9 => ['crew', true],
+        10 => ['connect', true],
+        11 => ['personal', true],
+        12 => ['special', true],
+        13 => ['special2', true],
+        14 => ['belong', true],
+        15 => ['npc', true],
+    ][$type];
 
-$generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect,gold,rice,crew,belong from general where nation = %i order by %b %l', $me['nation'], $orderKey, $orderDesc?'desc':'');
+    $generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect,gold,rice,crew,belong from general where nation = %i order by %b %l', $me['nation'], $orderKey, $orderDesc ? 'desc' : '');
 
-echo"
+    echo "
 <table align=center class='tb_layout bg0'>
     <tr>
         <td width=64 align=center class='bg1'>얼 굴</td>
@@ -120,66 +124,77 @@ echo"
         <td width=48 align=center class='bg1'>사 관</td>
         <td width=70 align=center class='bg1'>벌점</td>
     </tr>";
-foreach($generalList as $general){
+    foreach ($generalList as $general) {
 
-    $lbonus = calcLeadershipBonus($general['officer_level'], $nationLevel);
-    if($lbonus > 0) {
-        $lbonus = "<font color=cyan>+{$lbonus}</font>";
-    } else {
-        $lbonus = "";
-    }
+        $lbonus = calcLeadershipBonus($general['officer_level'], $nationLevel);
+        if ($lbonus > 0) {
+            $lbonus = "<font color=cyan>+{$lbonus}</font>";
+        } else {
+            $lbonus = "";
+        }
 
-    if($general['injury'] > 0) {
-        $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100);
-        $strength = intdiv($general['strength'] * (100 - $general['injury']), 100);
-        $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leadership = "<font color=red>{$leadership}</font>{$lbonus}";
-        $strength = "<font color=red>{$strength}</font>";
-        $intel = "<font color=red>{$intel}</font>";
-    } else {
-        $leadership = "{$general['leadership']}{$lbonus}";
-        $strength = "{$general['strength']}";
-        $intel = "{$general['intel']}";
-    }
+        if ($general['injury'] > 0) {
+            $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100);
+            $strength = intdiv($general['strength'] * (100 - $general['injury']), 100);
+            $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
+            $leadership = "<font color=red>{$leadership}</font>{$lbonus}";
+            $strength = "<font color=red>{$strength}</font>";
+            $intel = "<font color=red>{$intel}</font>";
+        } else {
+            $leadership = "{$general['leadership']}{$lbonus}";
+            $strength = "{$general['strength']}";
+            $intel = "{$general['intel']}";
+        }
 
-    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']}"; }
+        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']}";
+        }
 
-    if(key_exists($general['owner'], $ownerNameList)){
-        $name = $name.'<br><small>('.$ownerNameList[$general['owner']].')</small>';
-    }
+        if (key_exists($general['owner'], $ownerNameList)) {
+            $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
+        }
 
-    $imageTemp = GetImageURL($general['imgsvr']);
-    echo "
+        $imageTemp = GetImageURL($general['imgsvr']);
+        echo "
     <tr>
         <td align=center class='generalIcon' style='background:no-repeat center url(\"{$imageTemp}/{$general['picture']}\");background-size:64px;' height=64></td>
         <td align=center>$name</td>
-        <td align=center>"; echo getOfficerLevelText($general['officer_level'], $nationLevel); echo "</td>
-        <td align=center>".getDed($general['dedication'])."</td>
-        <td align=center>".getHonor($general['experience'])."</td>
-        <td align=center>".getBill($general['dedication'])."</td>
+        <td align=center>";
+        echo getOfficerLevelText($general['officer_level'], $nationLevel);
+        echo "</td>
+        <td align=center>" . getDed($general['dedication']) . "</td>
+        <td align=center>" . getHonor($general['experience']) . "</td>
+        <td align=center>" . getBill($general['dedication']) . "</td>
         <td align=center>$leadership</td>
         <td align=center>$strength</td>
         <td align=center>$intel</td>
         <td align=center>{$general['gold']}</td>
         <td align=center>{$general['rice']}</td>
-        <td align=center>".displayCharInfo($general['personal'])."</td>
-        <td align=center>".displaySpecialDomesticInfo($general['special'])." / ".displaySpecialWarInfo($general['special2'])."</td>
+        <td align=center>" . displayCharInfo($general['personal']) . "</td>
+        <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>
         <td align=center>{$general['belong']}</td>
-        <td align=center>{$general['connect']}"; echo "<br>(".getConnect($general['connect']).")</td>
+        <td align=center>{$general['connect']}";
+        echo "<br>(" . getConnect($general['connect']) . ")</td>
     </tr>";
-}
+    }
     echo "
 </table>
 ";
 
-?>
+    ?>
 
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>
 
-</html>
+</html>

hwe/b_myKingdomInfo.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -14,7 +15,7 @@ increaseRefresh("세력정보", 1);
 
 $nationID = $db->queryFirstField('SELECT nation FROM general WHERE owner=%i', $userID);
 
-if($nationID == 0) {
+if ($nationID == 0) {
     echo "재야입니다.";
     exit();
 }
@@ -23,138 +24,140 @@ if($nationID == 0) {
 <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::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-
+    <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('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>세 력 정 보<br><?=backButton()?></td></tr>
-</table>
-<br>
-<?php
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>세 력 정 보<br><?= backButton() ?></td>
+        </tr>
+    </table>
+    <br>
+    <?php
 
-$nation = $db->queryFirstRow('SELECT nation,gennum,power,rate,bill,type,gold,rice,color,name,level,tech,capital FROM nation WHERE nation=%i', $nationID);   //국가정보
-$cityList = $db->query('SELECT * FROM city WHERE nation=%i', $nationID);
+    $nation = $db->queryFirstRow('SELECT nation,gennum,power,rate,bill,type,gold,rice,color,name,level,tech,capital FROM nation WHERE nation=%i', $nationID);   //국가정보
+    $cityList = $db->query('SELECT * FROM city WHERE nation=%i', $nationID);
 
-$currPop = 0;
-$maxPop = 0;
-$cityNames = [];
+    $currPop = 0;
+    $maxPop = 0;
+    $cityNames = [];
 
-foreach($cityList as $city){
-    $currPop += $city['pop'];
-    $maxPop += $city['pop_max'];
-    if($city['city'] == $nation['capital']){
-        $cityNames[] = "<span style='color:cyan;'>{$city['name']}</span>";
+    foreach ($cityList as $city) {
+        $currPop += $city['pop'];
+        $maxPop += $city['pop_max'];
+        if ($city['city'] == $nation['capital']) {
+            $cityNames[] = "<span style='color:cyan;'>{$city['name']}</span>";
+        } else {
+            $cityNames[] = $city['name'];
+        }
     }
-    else{
-        $cityNames[] = $city['name'];
+
+    [$currCrew, $maxCrew] = $db->queryFirstList('SELECT sum(crew), sum(leadership)*100 FROM general WHERE nation=%i AND npc != 5', $nation['nation']);
+    $dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID);
+
+    $goldIncome  = getGoldIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
+    $warIncome  = getWarGoldIncome($nation['type'], $cityList);
+    $totalGoldIncome = $goldIncome + $warIncome;
+
+    $riceIncome = getRiceIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
+    $wallIncome = getWallIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
+    $totalRiceIncome = $riceIncome + $wallIncome;
+
+    $outcome = getOutcome($nation['bill'], $dedicationList);
+
+    $budgetgold = $nation['gold'] + $totalGoldIncome - $outcome;
+    $budgetrice = $nation['rice'] + $totalRiceIncome - $outcome;
+    $budgetgolddiff = $totalGoldIncome - $outcome;
+    $budgetricediff = $totalRiceIncome - $outcome;
+
+    if ($budgetgolddiff > 0) {
+        $budgetgolddiff = '+' . number_format($budgetgolddiff);
+    } else {
+        $budgetgolddiff = number_format($budgetgolddiff);
+    }
+    if ($budgetricediff > 0) {
+        $budgetricediff = '+' . number_format($budgetricediff);
+    } else {
+        $budgetricediff = number_format($budgetricediff);
     }
-}
 
-[$currCrew, $maxCrew] = $db->queryFirstList('SELECT sum(crew), sum(leadership)*100 FROM general WHERE nation=%i AND npc != 5', $nation['nation']);
-$dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID);
+    ?>
+    <table align=center width=1000 class='tb_layout bg2'>
+        <tr>
+            <td colspan=8 align=center style='color:<?= newColor($nation['color']) ?>;background-color:<?= $nation['color'] ?>'>【<?= $nation['name'] ?>】</td>
+        </tr>
+        <tr>
+            <td width=98 align=center class='bg1'>총주민</td>
+            <td width=198 align=center><?= number_format($currPop) ?>/<?= number_format($maxPop) ?></td>
+            <td width=98 align=center class='bg1'>총병사</td>
+            <td width=198 align=center><?= number_format($currCrew) ?>/<?= number_format($maxCrew) ?></td>
+            <td width=98 align=center class='bg1'>국 력</td>
+            <td width=298 align=center colspan=3><?= $nation['power'] ?></td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>국 고</td>
+            <td align=center><?= number_format($nation['gold']) ?></td>
+            <td align=center class='bg1'>병 량</td>
+            <td align=center><?= number_format($nation['rice']) ?></td>
+            <td align=center class='bg1'>세 율</td>
+            <td align=center colspan=3><?= $nation['rate'] ?> %</td>
+            </td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>세금/단기</td>
+            <td align=center>+<?= number_format($goldIncome) ?> / +<?= number_format($warIncome) ?></td>
+            <td align=center class='bg1'>세곡/둔전</td>
+            <td align=center>+<?= number_format($riceIncome) ?> / +<?= number_format($wallIncome) ?></td>
+            <td align=center class='bg1'>지급률</td>
+            <td align=center colspan=3><?= $nation['bill'] ?> %</td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>수입/지출</td>
+            <td align=center>+<?= number_format($totalGoldIncome) ?> / -<?= number_format($outcome) ?></td>
+            <td align=center class='bg1'>수입/지출</td>
+            <td align=center>+<?= number_format($totalRiceIncome) ?> / -<?= number_format($outcome) ?></td>
+            <td align=center class='bg1'>속 령</td>
+            <td width=98 align=center><?= count($cityList) ?></td>
+            <td width=98 align=center class='bg1'>장 수</td>
+            <td width=98 align=center><?= $nation['gennum'] ?></td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>국고 예산</td>
+            <td align=center><?= number_format($budgetgold) ?> (<?= $budgetgolddiff ?>)</td>
+            <td align=center class='bg1'>병량 예산</td>
+            <td align=center><?= number_format($budgetrice) ?> (<?= $budgetricediff ?>)</td>
+            <td align=center class='bg1'>기술력</td>
+            <td align=center><?= number_format(floor($nation['tech'])) ?></td>
+            <td align=center class='bg1'>작 위</td>
+            <td align=center><?= getNationLevel($nation['level']) ?></td>
+        </tr>
+        <tr>
+            <td align=center valign=top class='bg1'> 속령일람 :</td>
+            <td colspan=7><?= join(', ', $cityNames) ?></td>
+        </tr>
+        <tr>
+            <td align=center valign=top class='bg1'>국가열전</td>
+            <td colspan=7 class='bg0'><?= formatHistoryToHTML(getNationHistoryLogAll($nation['nation'])) ?></td>
+        </tr>
+    </table>
+    <br>
 
-$goldIncome  = getGoldIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
-$warIncome  = getWarGoldIncome($nation['type'], $cityList);
-$totalGoldIncome = $goldIncome + $warIncome;
-
-$riceIncome = getRiceIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
-$wallIncome = getWallIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
-$totalRiceIncome = $riceIncome + $wallIncome;
-
-$outcome = getOutcome($nation['bill'], $dedicationList);
-
-$budgetgold = $nation['gold'] + $totalGoldIncome - $outcome;
-$budgetrice = $nation['rice'] + $totalRiceIncome - $outcome;
-$budgetgolddiff = $totalGoldIncome - $outcome;
-$budgetricediff = $totalRiceIncome - $outcome;
-
-if ($budgetgolddiff > 0) {
-    $budgetgolddiff = '+'.number_format($budgetgolddiff);
-} else {
-    $budgetgolddiff = number_format($budgetgolddiff);
-}
-if ($budgetricediff > 0) {
-    $budgetricediff = '+'.number_format($budgetricediff);
-} else {
-    $budgetricediff = number_format($budgetricediff);
-}
-
-?>
-<table align=center width=1000 class='tb_layout bg2'>
-    <tr>
-        <td colspan=8 align=center style='color:<?=newColor($nation['color'])?>;background-color:<?=$nation['color']?>'>【<?=$nation['name']?>】</td>
-    </tr>
-    <tr>
-        <td width=98 align=center class='bg1'>총주민</td>
-        <td width=198 align=center><?=number_format($currPop)?>/<?=number_format($maxPop)?></td>
-        <td width=98 align=center class='bg1'>총병사</td>
-        <td width=198 align=center><?=number_format($currCrew)?>/<?=number_format($maxCrew)?></td>
-        <td width=98 align=center class='bg1'>국 력</td>
-        <td width=298 align=center colspan=3><?=$nation['power']?></td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'>국 고</td>
-        <td align=center><?=number_format($nation['gold'])?></td>
-        <td align=center class='bg1'>병 량</td>
-        <td align=center><?=number_format($nation['rice'])?></td>
-        <td align=center class='bg1'>세 율</td>
-        <td align=center colspan=3><?=$nation['rate']?> %</td>
-        </td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'>세금/단기</td>
-        <td align=center>+<?=number_format($goldIncome)?> / +<?=number_format($warIncome)?></td>
-        <td align=center class='bg1'>세곡/둔전</td>
-        <td align=center>+<?=number_format($riceIncome)?> / +<?=number_format($wallIncome)?></td>
-        <td align=center class='bg1'>지급률</td>
-        <td align=center colspan=3><?=$nation['bill']?> %</td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'>수입/지출</td>
-        <td align=center>+<?=number_format($totalGoldIncome)?> / -<?=number_format($outcome)?></td>
-        <td align=center class='bg1'>수입/지출</td>
-        <td align=center>+<?=number_format($totalRiceIncome)?> / -<?=number_format($outcome)?></td>
-        <td align=center class='bg1'>속 령</td>
-        <td width=98 align=center><?=count($cityList)?></td>
-        <td width=98 align=center class='bg1'>장 수</td>
-        <td width=98 align=center><?=$nation['gennum']?></td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'>국고 예산</td>
-        <td align=center><?=number_format($budgetgold)?> (<?=$budgetgolddiff?>)</td>
-        <td align=center class='bg1'>병량 예산</td>
-        <td align=center><?=number_format($budgetrice)?> (<?=$budgetricediff?>)</td>
-        <td align=center class='bg1'>기술력</td>
-        <td align=center><?=number_format(floor($nation['tech']))?></td>
-        <td align=center class='bg1'>작 위</td>
-        <td align=center><?=getNationLevel($nation['level'])?></td>
-    </tr>
-    <tr>
-        <td align=center valign=top class='bg1'> 속령일람 :</td>
-        <td colspan=7><?=join(', ', $cityNames)?></td>
-    </tr>
-    <tr>
-        <td align=center valign=top class='bg1'>국가열전</td>
-        <td colspan=7 class='bg0'><?=formatHistoryToHTML(getNationHistoryLogAll($nation['nation']))?></td>
-    </tr>
-</table>
-<br>
-
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
+    </table>
 </body>
 
-</html>
+</html>

hwe/b_myPage.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -28,137 +29,178 @@ if ($myset > 0) {
 }
 
 $targetTime = addTurn($me->getVar('lastrefresh'), $gameStor->turnterm, 2);
-if($gameStor->turntime <= $gameStor->opentime){
+if ($gameStor->turntime <= $gameStor->opentime) {
     //서버 가오픈시 할 수 있는 행동
-    if($me->getNPCType() == 0){
+    if ($me->getNPCType() == 0) {
         $showDieImmediatelyBtn = true;
-        if($targetTime <= TimeUtil::now()){
+        if ($targetTime <= TimeUtil::now()) {
             $availableDieImmediately = true;
         }
     }
 }
 
-$use_treatment = $me->getAuxVar('use_treatment')??10;
-$use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn')??1;
+$use_treatment = $me->getAuxVar('use_treatment') ?? 10;
+$use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
 ?>
 <!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>
-<script>
-var availableDieImmediately = <?=$availableDieImmediately?'true':'false'?>;
-</script>
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printJS('dist_js/myPage.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=500" />
+    <title><?= UniqueConst::$serverName ?>: 내정보</title>
+    <script>
+        var availableDieImmediately = <?= $availableDieImmediately ? 'true' : 'false' ?>;
+    </script>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('ts', ['myPage']) ?>
 </head>
 
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>내 정 보<br><?=backButton()?></td></tr>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr>
-        <td width=50%>
-            <?php generalInfo($me); ?>
-            <?php generalInfo2($me); ?>
-        </td>
-        <td width=50% valign=top style="padding-left:4ch;">
-                토너먼트 【
-                <input type=radio class='tnmt' name=tnmt value=0 <?=$me->getVar('tnmt')==0?"checked":""; ?>>수동참여
-                <input type=radio class='tnmt' name=tnmt value=1 <?=$me->getVar('tnmt')==1?"checked":""; ?>>자동참여
-                】<br>
-               ∞<span style='color:orange'>개막직전 남는자리가 있을경우 랜덤하게 참여합니다.</span><br><br>
-
-               환약 사용 【<select id='use_treatment' name='use_treatment'>
-                <option value=10 <?=($use_treatment==10)?"selected":""; ?>>경상</option>
-                <option value=21 <?=($use_treatment==21)?"selected":""; ?>>중상</option>
-                <option value=41 <?=($use_treatment==41)?"selected":""; ?>>심각</option>
-                <option value=61 <?=($use_treatment==61)?"selected":""; ?>>위독</option>
-                <option value=100 <?=($use_treatment==100)?"selected":""; ?>>사용안함</option>
-                </select>】<br>
-               ∞<span style='color:orange'>부상을 입었을 때 환약을 사용하는 기준입니다.</span><br><br>
-<?php if(($gameStor->autorun_user['options']['chief'])??false) : ?>
-               자동 사령턴 허용 【<select id='use_auto_nation_turn' name='use_auto_nation_turn'>
-                <option value=1 <?=$use_auto_nation_turn?"selected":""; ?>>허용</option>
-                <option value=0 <?=(!$use_auto_nation_turn)?"selected":""; ?>>허용 안함</option>
-                </select>】<br>
-               ∞<span style='color:orange'>수뇌가 되었을 때 휴식 턴이어도 적당한 턴을 알아서 넣는 것을 허용합니다.</span><br><br>
-<?php endif; ?>
-                수비 【<select id='defence_train' name='defence_train'>
-<?php foreach([90, 80, 60, 40] as $targetDefenceTrain): ?>
-                <option value='<?=$targetDefenceTrain?>' <?=$me->getVar('defence_train')==$targetDefenceTrain?"selected":""; ?>><?=formatDefenceTrain($targetDefenceTrain)?>(훈사<?=$targetDefenceTrain?>)</option>
-<?php endforeach; ?>
-                <option value=999 <?=$me->getVar('defence_train')==999?"selected":""; ?>><?=formatDefenceTrain(999)?>[훈련, 사기 -3]</option>
-                </select>
-                】<br><br>
-                <input type=<?=$submit?> id='set_my_setting' name=btn style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px; value=설정저장><br>
-                ∞<span style='color:orange'>설정저장은 이달중 <?=$myset?>회 남았습니다.</span><br><br>
-            <?php if(!($gameStor->autorun_user['limit_minutes']??false)): ?>
-            휴 가 신 청<br>
-            <button type="button" id='vacation' style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>휴가 신청</button><br><br>
-            <?php endif; ?>
-            <!--빙의 해제용 삭턴 조절<br>
-            <a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>빙의 해체 요청</button></a>-->
-
-<?php if($showDieImmediatelyBtn): ?>
-            가오픈 기간 내 장수 삭제 (<?=substr($targetTime, 0, 19)?> 부터)<br>
-            <a href="c_die_immediately.php" id='die_immediately'><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>장수 삭제</button></a><br><br>
-<?php endif; ?>
-
-<?php if($gameStor->npcmode==2 && $me->getNPCType()==0): ?>
-            다른 장수 선택 (<?=substr($me->getAuxVar('next_change')??TimeUtil::now(), 0, 19)?> 부터)<br>
-            <a href="select_general_from_pool.php" id='select_general_from_pool'><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>다른 장수 선택</button></a><br><br>
-<?php endif; ?>
-
-            개인용 CSS<br>
-            <textarea id='custom_css' style='color:white;background-color:black;width:420px;height:150px;'></textarea>
-        </td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'><font color=skyblue size=3>개인 기록</font></td>
-        <td align=center class='bg1'><font color=orange size=3>전투 기록</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <div id='generalActionPlate'>
-            <?=formatHistoryToHTML(getGeneralActionLogRecent($generalID, 24), 'generalAction')?>
+    <div id="container" class="bg0">
+        <div class="row gx-0">
+            <div class="col">내 정 보<br><?= backButton() ?></div>
+        </div>
+        <div class="row gx-0">
+            <div class="col col-12 col-md-6">
+                <div class="row">
+                    <div class="col"><?php generalInfo($me); ?><?php generalInfo2($me); ?></div>
+                </div>
             </div>
-            <button type="button" class="load_old_log btn btn-secondary btn-block" data-log_type="generalAction">이전 로그 불러오기</button>
-        </td>
-        <td valign=top>
-            <div id='battleDetailPlate'>
-            <?=formatHistoryToHTML(getBattleDetailLogRecent($generalID, 24), 'battleDetail')?>
+
+            <div class="col col-12 col-md-6">
+                <div class="row">
+                    <div class="col" style='padding-left:4ch;'>
+                        토너먼트 【
+                        <input type=radio class='tnmt' name=tnmt value=0 <?= $me->getVar('tnmt') == 0 ? "checked" : ""; ?>>수동참여
+                        <input type=radio class='tnmt' name=tnmt value=1 <?= $me->getVar('tnmt') == 1 ? "checked" : ""; ?>>자동참여
+                        】<br>
+                        ∞<span style='color:orange'>개막직전 남는자리가 있을경우 랜덤하게 참여합니다.</span><br><br>
+
+                        환약 사용 【<select id='use_treatment' name='use_treatment'>
+                            <option value=10 <?= ($use_treatment == 10) ? "selected" : ""; ?>>경상</option>
+                            <option value=21 <?= ($use_treatment == 21) ? "selected" : ""; ?>>중상</option>
+                            <option value=41 <?= ($use_treatment == 41) ? "selected" : ""; ?>>심각</option>
+                            <option value=61 <?= ($use_treatment == 61) ? "selected" : ""; ?>>위독</option>
+                            <option value=100 <?= ($use_treatment == 100) ? "selected" : ""; ?>>사용안함</option>
+                        </select>】<br>
+                        ∞<span style='color:orange'>부상을 입었을 때 환약을 사용하는 기준입니다.</span><br><br>
+                        <?php if (($gameStor->autorun_user['options']['chief']) ?? false) : ?>
+                            자동 사령턴 허용 【<select id='use_auto_nation_turn' name='use_auto_nation_turn'>
+                                <option value=1 <?= $use_auto_nation_turn ? "selected" : ""; ?>>허용</option>
+                                <option value=0 <?= (!$use_auto_nation_turn) ? "selected" : ""; ?>>허용 안함</option>
+                            </select>】<br>
+                            ∞<span style='color:orange'>수뇌가 되었을 때 휴식 턴이어도 적당한 턴을 알아서 넣는 것을 허용합니다.</span><br><br>
+                        <?php endif; ?>
+                        수비 【<select id='defence_train' name='defence_train'>
+                            <?php foreach ([90, 80, 60, 40] as $targetDefenceTrain) : ?>
+                                <option value='<?= $targetDefenceTrain ?>' <?= $me->getVar('defence_train') == $targetDefenceTrain ? "selected" : ""; ?>><?= formatDefenceTrain($targetDefenceTrain) ?>(훈사<?= $targetDefenceTrain ?>)</option>
+                            <?php endforeach; ?>
+                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>[훈련, 사기 -3]</option>
+                        </select>
+                        】<br><br>
+                        <input type=<?= $submit ?> id='set_my_setting' name=btn style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px; value=설정저장><br>
+                        ∞<span style='color:orange'>설정저장은 이달중 <?= $myset ?>회 남았습니다.</span><br><br>
+                        <?php if (!($gameStor->autorun_user['limit_minutes'] ?? false)) : ?>
+                            휴 가 신 청<br>
+                            <button type="button" id='vacation' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>휴가 신청</button><br><br>
+                        <?php endif; ?>
+                        <!--빙의 해제용 삭턴 조절<br>
+            <a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>빙의 해체 요청</button></a>-->
+
+                        <?php if ($showDieImmediatelyBtn) : ?>
+                            가오픈 기간 내 장수 삭제 (<?= substr($targetTime, 0, 19) ?> 부터)<br>
+                            <a href="c_die_immediately.php" id='die_immediately'><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>장수 삭제</button></a><br><br>
+                        <?php endif; ?>
+
+                        <?php if ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>
+                            다른 장수 선택 (<?= substr($me->getAuxVar('next_change') ?? TimeUtil::now(), 0, 19) ?> 부터)<br>
+                            <a href="select_general_from_pool.php" id='select_general_from_pool'><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>다른 장수 선택</button></a><br><br>
+                        <?php endif; ?>
+
+                        <div class="row">
+                            <div class="col-4 text-end">500px/1000px 모드<br>(모바일 전용, 즉시 설정)</div>
+                            <div class="col-8">
+                                <div class="btn-group" role="group" aria-label="500px/1000px 모드 설정">
+                                    <input type="radio" class="btn-check" name="screenMode" value="auto" id="screenMode_auto" autocomplete="off">
+                                    <label class="btn btn-primary" for="screenMode_auto">자동</label>
+
+                                    <input type="radio" class="btn-check" name="screenMode" value="500px" id="screenMode_500px" autocomplete="off">
+                                    <label class="btn btn-primary" for="screenMode_500px">500px</label>
+
+                                    <input type="radio" class="btn-check" name="screenMode" value="1000px" id="screenMode_1000px" autocomplete="off">
+                                    <label class="btn btn-primary" for="screenMode_1000px">1000px</label>
+                                </div>
+                            </div>
+                        </div>
+                        <br>
+
+                        개인용 CSS<br>
+                        <textarea id='custom_css' style='color:white;background-color:black;width:420px;height:150px;'></textarea>
+                    </div>
+                </div>
             </div>
-            <button type="button" class="load_old_log btn btn-secondary btn-block" data-log_type="battleDetail">이전 로그 불러오기</button>
-        </td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'><font color=skyblue size=3>장수 열전</font></td>
-        <td align=center class='bg1'><font color=orange size=3>전투 결과</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?=formatHistoryToHTML(getGeneralHistoryLogAll($generalID))?>
-        </td>
-        <td valign=top>
-            <div id='battleResultPlate'>
-            <?=formatHistoryToHTML(getBattleResultRecent($generalID, 24), 'battleResult')?>
+            <div class="col col-12 col-md-6">
+                <div class="row gx-0">
+                    <div class="col bg1 text-center">
+                        <h4 style='color:skyblue'>개인 기록</h4>
+                    </div>
+                </div>
+                <div class="row gx-0">
+                    <div id='generalActionPlate'>
+                        <?= formatHistoryToHTML(getGeneralActionLogRecent($generalID, 24), 'generalAction') ?>
+                    </div>
+                    <button type="button" class="load_old_log btn btn-secondary" data-log_type="generalAction">이전 로그 불러오기</button>
+                </div>
             </div>
-            <button type="button" class="load_old_log btn btn-secondary btn-block" data-log_type="battleResult">이전 로그 불러오기</button>
-        </td>
-    </tr>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
+            <div class="col col-12 col-md-6">
+                <div class="row gx-0">
+                    <div class="col bg1 text-center">
+                        <h4 style='color:orange'>전투 기록</h4>
+                    </div>
+                </div>
+                <div class="row gx-0">
+                    <div id='battleDetailPlate'>
+                        <?= formatHistoryToHTML(getBattleDetailLogRecent($generalID, 24), 'battleDetail') ?>
+                    </div>
+                    <button type="button" class="load_old_log btn btn-secondary" data-log_type="battleDetail">이전 로그 불러오기</button>
+                </div>
+            </div>
+
+            <div class="col col-12 col-md-6">
+                <div class="row gx-0">
+                    <div class="col bg1 text-center">
+                        <h4 style='color:skyblue'>장수 열전</h4>
+                    </div>
+                </div>
+                <div class="row gx-0">
+                    <?= formatHistoryToHTML(getGeneralHistoryLogAll($generalID)) ?>
+                </div>
+            </div>
+            <div class="col col-12 col-md-6">
+                <div class="row gx-0">
+                    <div class="col bg1 text-center">
+                        <h4 style='color:orange'>전투 결과</h4>
+                    </div>
+                </div>
+                <div class="row gx-0">
+                    <div id='battleResultPlate'>
+                        <?= formatHistoryToHTML(getBattleResultRecent($generalID, 24), 'battleResult') ?>
+                    </div>
+                    <button type="button" class="load_old_log btn btn-secondary" data-log_type="battleResult">이전 로그 불러오기</button>
+                </div>
+            </div>
+        </div>
+        <div class="row  gx-0">
+            <div class="col "><?= backButton() ?></div>
+        </div>
+        <div class="row bg0 gx-0">
+            <div class="col bg0"><?= banner() ?></div>
+        </div>
+    </div>
 </body>
-</html>
+
+</html>

hwe/b_processing.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -12,19 +13,18 @@ $isChiefTurn = Util::getReq('is_chief', 'bool', false);
 function die_redirect()
 {
     global $isChiefTurn;
-    if(!$isChiefTurn){
+    if (!$isChiefTurn) {
         header('location:index.php', true, 303);
-    }
-    else{
+    } else {
         header('location:b_chiefcenter.php', true, 303);
     }
     die();
 }
 
-if(!$turnList || !$commandType){
+if (!$turnList || !$commandType) {
     die_redirect();
 }
-if(!is_array($turnList)){
+if (!is_array($turnList)) {
     die_redirect();
 }
 
@@ -32,11 +32,11 @@ $session = Session::requireGameLogin()->setReadOnly();
 
 $db = DB::db();
 
-if(!$isChiefTurn && !in_array($commandType, Util::array_flatten(GameConst::$availableGeneralCommand))){
+if (!$isChiefTurn && !in_array($commandType, Util::array_flatten(GameConst::$availableGeneralCommand))) {
     die_redirect();
 }
 
-if($isChiefTurn && !in_array($commandType, Util::array_flatten(GameConst::$availableChiefCommand))){
+if ($isChiefTurn && !in_array($commandType, Util::array_flatten(GameConst::$availableChiefCommand))) {
     die_redirect();
 }
 
@@ -44,23 +44,22 @@ $gameStor = KVStorage::getStorage($db, 'game_env')->turnOnCache();
 $env = $gameStor->getAll();
 $general = General::createGeneralObjFromDB($session->generalID);
 
-if(!$isChiefTurn){
+if (!$isChiefTurn) {
     $commandObj = buildGeneralCommandClass($commandType, $general, $env);
-}
-else{
-    if($general->getVar('officer_level') < 5){
+} else {
+    if ($general->getVar('officer_level') < 5) {
         die_redirect();
     }
     $commandObj = buildNationCommandClass($commandType, $general, $env, new LastTurn());
 }
 
 
-if($commandObj->isArgValid()){
+if ($commandObj->isArgValid()) {
     //인자가 필요없는 타입의 경우 processing에서 '전혀' 처리하지 않음!
     die_redirect();
 }
 
-if(!$commandObj->hasPermissionToReserve()){
+if (!$commandObj->hasPermissionToReserve()) {
     die_redirect();
 }
 
@@ -70,56 +69,63 @@ $cssList = $commandObj->getCSSFiles();
 
 <!DOCTYPE html>
 <html>
+
 <head>
-<title><?=$commandObj->getName()?></title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printJS('d_shared/base_map.js')?>
-<?=WebUtil::printJS('dist_js/processing.js')?>
-<script>
-window.serverNick = '<?=DB::prefix()?>';
-window.serverID = '<?=UniqueConst::$serverID?>';
-window.command = '<?=$commandType?>';
-window.turnList = [<?=join(', ',$turnList)?>];
-window.isChiefTurn = <?=$isChiefTurn?'true':'false'?>;
-var jsPlugins = <?=Json::encode($jsList)?>;
-</script>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../e_lib/select2/select2.min.css')?>
-<?=WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printCSS('css/main.css')?>
-<?=WebUtil::printCSS('css/map.css')?>
-<?=WebUtil::printCSS('css/processing.css')?>
-
-<?php
-foreach($cssList as $css){
-    print(WebUtil::printCSS($css));
-}
-?>
+    <title><?= $commandObj->getName() ?></title>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printJS('d_shared/base_map.js') ?>
+    <script>
+        window.serverNick = '<?= DB::prefix() ?>';
+        window.serverID = '<?= UniqueConst::$serverID ?>';
+        window.command = '<?= $commandType ?>';
+        window.turnList = [<?= join(', ', $turnList) ?>];
+        window.isChiefTurn = <?= $isChiefTurn ? 'true' : 'false' ?>;
+        var jsPlugins = <?= Json::encode($jsList) ?>;
+    </script>
+    <?= WebUtil::printCSS('../e_lib/select2/select2.min.css') ?>
+    <?= WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printCSS('css/main.css') ?>
+    <?= WebUtil::printCSS('css/map.css') ?>
+    <?= WebUtil::printCSS('css/processing.css') ?>
+    <?php
+    foreach ($cssList as $css) {
+        print(WebUtil::printCSS($css));
+    }
+    ?>
+    <?= WebUtil::printDist('ts', ['common', 'processing']) ?>
 </head>
+
 <body class="img_back">
-<table class="tb_layout bg0" style="width:1000px;margin:auto;">
-    <tr><td class="bg1" style='text-align:center;'><?=$commandObj->getName()?></td></tr>
-    <tr><td>
-    <input type=button value='돌아가기' onclick="history.back();"><br>
-</td></tr></table>
+    <table class="tb_layout bg0" style="width:1000px;margin:auto;">
+        <tr>
+            <td class="bg1" style='text-align:center;'><?= $commandObj->getName() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <input type=button value='돌아가기' onclick="history.back();"><br>
+            </td>
+        </tr>
+    </table>
 
-<div class="tb_layout bg0" style="width:1000px;margin:auto;padding-bottom:2em;border:solid 1px gray;">
-<?=$commandObj->getForm()?>
-</div>
+    <div class="tb_layout bg0" style="width:1000px;margin:auto;padding-bottom:2em;border:solid 1px gray;">
+        <?= $commandObj->getForm() ?>
+    </div>
 
-<table class="tb_layout bg0" style="width:1000px;margin:auto;">
-    <tr><td>
-    <input type=button value='돌아가기' onclick="history.back();"><br>
-    <?=banner()?>
-</td></tr></table>
+    <table class="tb_layout bg0" style="width:1000px;margin:auto;">
+        <tr>
+            <td>
+                <input type=button value='돌아가기' onclick="history.back();"><br>
+                <?= banner() ?>
+            </td>
+        </tr>
+    </table>
 
 
 </body>
-</html>
+
+</html>

hwe/b_tournament.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -15,7 +16,7 @@ TurnExecutionHelper::executeAllCommand();
 
 $me = $db->queryFirstRow('select no,tournament,con,turntime from general where owner=%i', $userID);
 
-$admin = $gameStor->getValues(['tournament','phase','tnmt_msg','tnmt_type','develcost','tnmt_trig']);
+$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -24,11 +25,32 @@ if ($con >= 2) {
 }
 
 switch ($admin['tnmt_type']) {
-default: throw new \RuntimeException('invalid tnmt_type');
-case 0: $tnmt_type = "<font color=cyan>전력전</font>"; $tp = "total"; $tp2 = "종합"; $tp3 = "total"; break;
-case 1: $tnmt_type = "<font color=cyan>통솔전</font>"; $tp = "leadership"; $tp2 = "통솔"; $tp3 = "leadership"; break;
-case 2: $tnmt_type = "<font color=cyan>일기토</font>"; $tp = "strength"; $tp2 = "무력"; $tp3 = "strength"; break;
-case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "intel"; $tp2 = "지력"; $tp3 = "intel"; break;
+    default:
+        throw new \RuntimeException('invalid tnmt_type');
+    case 0:
+        $tnmt_type = "<font color=cyan>전력전</font>";
+        $tp = "total";
+        $tp2 = "종합";
+        $tp3 = "total";
+        break;
+    case 1:
+        $tnmt_type = "<font color=cyan>통솔전</font>";
+        $tp = "leadership";
+        $tp2 = "통솔";
+        $tp3 = "leadership";
+        break;
+    case 2:
+        $tnmt_type = "<font color=cyan>일기토</font>";
+        $tp = "strength";
+        $tp2 = "무력";
+        $tp3 = "strength";
+        break;
+    case 3:
+        $tnmt_type = "<font color=cyan>설전</font>";
+        $tp = "intel";
+        $tp2 = "지력";
+        $tp3 = "intel";
+        break;
 }
 
 ?>
@@ -37,355 +59,406 @@ case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "intel"; $tp2 = "
 <?php if ($con == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다! 제한량이 모자라다면 참여를 해보세요^^");
 } ?>
+
 <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')?>
+    <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::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 
 <body>
-<table align=center width=2000 class='tb_layout bg0'>
-    <tr><td>삼모전 토너먼트<br><?=closeButton()?></td></tr>
-</table>
-<table align=center class='tb_layout bg0'>
-<?php
-if ($session->userGrade >= 5) {
-    $sel = [];
-    echo "
+    <table align=center width=2000 class='tb_layout bg0'>
+        <tr>
+            <td>삼모전 토너먼트<br><?= closeButton() ?></td>
+        </tr>
+    </table>
+    <table align=center class='tb_layout bg0'>
+        <?php
+        if ($session->userGrade >= 5) {
+            $sel = [];
+            echo "
 <form method=post action=c_tournament.php>
     <tr><td colspan=8><input type=textarea size=150 style=color:white;background-color:black; name=msg><input type=submit name=btn value='메시지'></td></tr>
     <tr><td colspan=8>
         <input type=button value='갱신' onclick='location.reload()'>";
 
-    switch ($admin['tnmt_trig']) {
-    case 0: $sel[0] = "selected"; break;
-    case 1: $sel[1] = "selected"; break;
-    case 2: $sel[2] = "selected"; break;
-    case 3: $sel[3] = "selected"; break;
-    case 4: $sel[4] = "selected"; break;
-    case 5: $sel[5] = "selected"; break;
-    case 6: $sel[6] = "selected"; break;
-    case 7: $sel[7] = "selected"; break;
-    }
+            switch ($admin['tnmt_trig']) {
+                case 0:
+                    $sel[0] = "selected";
+                    break;
+                case 1:
+                    $sel[1] = "selected";
+                    break;
+                case 2:
+                    $sel[2] = "selected";
+                    break;
+                case 3:
+                    $sel[3] = "selected";
+                    break;
+                case 4:
+                    $sel[4] = "selected";
+                    break;
+                case 5:
+                    $sel[5] = "selected";
+                    break;
+                case 6:
+                    $sel[6] = "selected";
+                    break;
+                case 7:
+                    $sel[7] = "selected";
+                    break;
+            }
 
-    if ($admin['tournament'] == 0) {
+            if ($admin['tournament'] == 0) {
         ?>
-            <select name=auto size=1 style=color:white;background-color:black;>
-                <option style=color:white; value=0>수동진행</option>
-                <option style=color:white; value=1>12분 05일</option>
-                <option style=color:white; value=2>07분 10시</option>
-                <option style=color:white; value=3>03분 04시</option>
-                <option style=color:white; value=4>01분 82분</option>
-                <option style=color:white; value=5>30초 41분</option>
-                <option style=color:white; value=6>15초 21분</option>
-                <option style=color:white; value=7>05초 07분</option>
-            </select>
-            <select name=type size=1 style=color:white;background-color:black;>
-                <option style=color:white; value=0>전력전</option>
-                <option style=color:white; value=1>통솔전</option>
-                <option style=color:white; value=2>일기토</option>
-                <option style=color:white; value=3>설전</option>
-            </select>
-            <input type=submit name=btn value='개최'>
-            <select name=trig size=1 style=color:white;background-color:black;>
-                <option style=color:white; value=0 <?=$sel[0]??''?>>수동진행</option>
-                <option style=color:white; value=1 <?=$sel[1]??''?>>12분 05일</option>
-                <option style=color:white; value=2 <?=$sel[2]??''?>>07분 10시</option>
-                <option style=color:white; value=3 <?=$sel[3]??''?>>03분 04시</option>
-                <option style=color:white; value=4 <?=$sel[4]??''?>>01분 82분</option>
-                <option style=color:white; value=5 <?=$sel[5]??''?>>30초 41분</option>
-                <option style=color:white; value=6 <?=$sel[6]??''?>>15초 21분</option>
-                <option style=color:white; value=7 <?=$sel[7]??''?>>05초 07분</option>
-            </select>
-            <input type=submit name=btn value='자동개최설정'>
-            <input type=submit name=btn value='포상'>
-            <input type=submit name=btn value='회수'>
+                <select name=auto size=1 style=color:white;background-color:black;>
+                    <option style=color:white; value=0>수동진행</option>
+                    <option style=color:white; value=1>12분 05일</option>
+                    <option style=color:white; value=2>07분 10시</option>
+                    <option style=color:white; value=3>03분 04시</option>
+                    <option style=color:white; value=4>01분 82분</option>
+                    <option style=color:white; value=5>30초 41분</option>
+                    <option style=color:white; value=6>15초 21분</option>
+                    <option style=color:white; value=7>05초 07분</option>
+                </select>
+                <select name=type size=1 style=color:white;background-color:black;>
+                    <option style=color:white; value=0>전력전</option>
+                    <option style=color:white; value=1>통솔전</option>
+                    <option style=color:white; value=2>일기토</option>
+                    <option style=color:white; value=3>설전</option>
+                </select>
+                <input type=submit name=btn value='개최'>
+                <select name=trig size=1 style=color:white;background-color:black;>
+                    <option style=color:white; value=0 <?= $sel[0] ?? '' ?>>수동진행</option>
+                    <option style=color:white; value=1 <?= $sel[1] ?? '' ?>>12분 05일</option>
+                    <option style=color:white; value=2 <?= $sel[2] ?? '' ?>>07분 10시</option>
+                    <option style=color:white; value=3 <?= $sel[3] ?? '' ?>>03분 04시</option>
+                    <option style=color:white; value=4 <?= $sel[4] ?? '' ?>>01분 82분</option>
+                    <option style=color:white; value=5 <?= $sel[5] ?? '' ?>>30초 41분</option>
+                    <option style=color:white; value=6 <?= $sel[6] ?? '' ?>>15초 21분</option>
+                    <option style=color:white; value=7 <?= $sel[7] ?? '' ?>>05초 07분</option>
+                </select>
+                <input type=submit name=btn value='자동개최설정'>
+                <input type=submit name=btn value='포상'>
+                <input type=submit name=btn value='회수'>
         <?php
-    } else {
-        echo "<input type=submit name=btn value='중단' onclick='return confirm(\"진짜 중단하시겠습니까?\")'>";
-    }
+            } else {
+                echo "<input type=submit name=btn value='중단' onclick='return confirm(\"진짜 중단하시겠습니까?\")'>";
+            }
 
-    switch ($admin['tournament']) {
-    case 1:
-        echo "<input type=submit name=btn value='랜덤투입'>";
-        echo "<input type=submit name=btn value='랜덤전부투입'>";
-        break;
-    case 2: echo "<input type=submit name=btn value='예선'><input type=submit name=btn value='예선전부'>"; break;
-    case 3: echo "<input type=submit name=btn value='추첨'><input type=submit name=btn value='추첨전부'>"; break;
-    case 4: echo "<input type=submit name=btn value='본선'><input type=submit name=btn value='본선전부'>"; break;
-    case 5: echo "<input type=submit name=btn value='배정'>"; break;
-    case 6: echo "<input type=submit name=btn value='베팅마감'>"; break;
-    case 7: echo "<input type=submit name=btn value='16강'>"; break;
-    case 8: echo "<input type=submit name=btn value='8강'>"; break;
-    case 9: echo "<input type=submit name=btn value='4강'>"; break;
-    case 10: echo "<input type=submit name=btn value='결승'>"; break;
-    }
+            switch ($admin['tournament']) {
+                case 1:
+                    echo "<input type=submit name=btn value='랜덤투입'>";
+                    echo "<input type=submit name=btn value='랜덤전부투입'>";
+                    break;
+                case 2:
+                    echo "<input type=submit name=btn value='예선'><input type=submit name=btn value='예선전부'>";
+                    break;
+                case 3:
+                    echo "<input type=submit name=btn value='추첨'><input type=submit name=btn value='추첨전부'>";
+                    break;
+                case 4:
+                    echo "<input type=submit name=btn value='본선'><input type=submit name=btn value='본선전부'>";
+                    break;
+                case 5:
+                    echo "<input type=submit name=btn value='배정'>";
+                    break;
+                case 6:
+                    echo "<input type=submit name=btn value='베팅마감'>";
+                    break;
+                case 7:
+                    echo "<input type=submit name=btn value='16강'>";
+                    break;
+                case 8:
+                    echo "<input type=submit name=btn value='8강'>";
+                    break;
+                case 9:
+                    echo "<input type=submit name=btn value='4강'>";
+                    break;
+                case 10:
+                    echo "<input type=submit name=btn value='결승'>";
+                    break;
+            }
 
-    echo "
+            echo "
     </td></tr>
 </form>";
-} elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) {
-    echo "<form method=post action=c_tournament.php><tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'><input type=submit name=btn value='참가' onclick='return confirm(\"참가비 금{$admin['develcost']}이 필요합니다. 참가하시겠습니까?\")'></td></tr></form>";
-} else {
-    echo "<tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'></td></tr>";
-}
+        } elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) {
+            echo "<form method=post action=c_tournament.php><tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'><input type=submit name=btn value='참가' onclick='return confirm(\"참가비 금{$admin['develcost']}이 필요합니다. 참가하시겠습니까?\")'></td></tr></form>";
+        } else {
+            echo "<tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'></td></tr>";
+        }
 
-$str1 = getTournament($admin['tournament']);
-$str2 = getTournamentTime();
-if($str2){
-    $str2 = ', '.$str2;
-}
-$str3 = getTournamentTerm();
-if($str3){
-    $str3 = ', '.$str3;
-}
-?>
-    <tr><td colspan=8>운영자 메세지 : <font color=orange size=5><?=$admin['tnmt_msg']?></font></td></tr>
-    <tr><td colspan=8 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.$str2.$str3?>)</font></td></tr>
-    <tr><td colspan=8 align=center class='bg2'><font color=magenta size=5>16강 승자전</font></td></tr>
-    <tr><td height=10 colspan=8 align=center></td></tr>
-<?php
+        $str1 = getTournament($admin['tournament']);
+        $str2 = getTournamentTime();
+        if ($str2) {
+            $str2 = ', ' . $str2;
+        }
+        $str3 = getTournamentTerm();
+        if ($str3) {
+            $str3 = ', ' . $str3;
+        }
+        ?>
+        <tr>
+            <td colspan=8>운영자 메세지 : <font color=orange size=5><?= $admin['tnmt_msg'] ?></font>
+            </td>
+        </tr>
+        <tr>
+            <td colspan=8 align=center>
+                <font color=white size=6><?= $tnmt_type ?> (<?= $str1 . $str2 . $str3 ?>)</font>
+            </td>
+        </tr>
+        <tr>
+            <td colspan=8 align=center class='bg2'>
+                <font color=magenta size=5>16강 승자전</font>
+            </td>
+        </tr>
+        <tr>
+            <td height=10 colspan=8 align=center></td>
+        </tr>
+        <?php
 
-echo "
+        echo "
     <tr>
         <td colspan=8>
             <table align=center width=2000 class='bg0 mimic_flex'>
                <tr align=center>";
 
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=60 order by grp, grp_no LIMIT 1');
-while(count($generalList) < 1){
-    $generalList[] = [
-        'name'=>'-',
-        'npc'=>0,
-        'win'=>0
-    ];
-}
-foreach($generalList as $i=>$general){
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    echo "<td colspan=16>{$general['name']}</td>";
-}
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=60 order by grp, grp_no LIMIT 1');
+        while (count($generalList) < 1) {
+            $generalList[] = [
+                'name' => '-',
+                'npc' => 0,
+                'win' => 0
+            ];
+        }
+        foreach ($generalList as $i => $general) {
+            if ($general['name'] == "") {
+                $general['name'] = "-";
+            }
+            if ($general['npc'] >= 2) {
+                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
+            } elseif ($general['npc'] == 1) {
+                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
+            }
+            echo "<td colspan=16>{$general['name']}</td>";
+        }
 
-echo "
+        echo "
                 </tr>
                 <tr align=center>";
 
-$cent = [];
-for ($i=0; $i < 1; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-$line = [];
-$gen = [];
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=50 order by grp, grp_no LIMIT 2');
-while(count($generalList) < 2){
-    $generalList[] = [
-        'name'=>'-',
-        'npc'=>0,
-        'win'=>0
-    ];
-}
-foreach($generalList as $i=>$general){
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 1; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓"."</font>";
-    echo "<td colspan=16>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+        $cent = [];
+        for ($i = 0; $i < 1; $i++) {
+            $cent[$i] = "<font color=white>";
+        }
+        $line = [];
+        $gen = [];
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=50 order by grp, grp_no LIMIT 2');
+        while (count($generalList) < 2) {
+            $generalList[] = [
+                'name' => '-',
+                'npc' => 0,
+                'win' => 0
+            ];
+        }
+        foreach ($generalList as $i => $general) {
+            if ($general['name'] == "") {
+                $general['name'] = "-";
+            }
+            if ($general['npc'] >= 2) {
+                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
+            } elseif ($general['npc'] == 1) {
+                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
+            }
+            if ($general['win'] > 0) {
+                $line[$i] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
+            } else {
+                $line[$i] = "<font color=white>";
+            }
+            $gen[$i] = $general['name'];
+        }
+        for ($i = 0; $i < 1; $i++) {
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" . "</font>";
+            $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓" . "</font>";
+            echo "<td colspan=16>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+        }
+        echo "
                 </tr>
                 <tr align=center>";
 
-for ($i=0; $i < 2; $i++) {
-    echo "<td colspan=8>{$gen[$i]}</td>";
-}
+        for ($i = 0; $i < 2; $i++) {
+            echo "<td colspan=8>{$gen[$i]}</td>";
+        }
 
-echo "
+        echo "
                 </tr>
                 <tr align=center>";
-for ($i=0; $i < 2; $i++) {
-    $cent[$i] = "<font color=white>";
-}
+        for ($i = 0; $i < 2; $i++) {
+            $cent[$i] = "<font color=white>";
+        }
 
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=40 order by grp, grp_no LIMIT 4');
-while(count($generalList) < 4){
-    $generalList[] = [
-        'name'=>'-',
-        'npc'=>0,
-        'win'=>0
-    ];
-}
-foreach($generalList as $i=>$general){
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 2; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━━━━━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━━━━━━━━━━┓"."</font>";
-    echo "<td colspan=8>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=40 order by grp, grp_no LIMIT 4');
+        while (count($generalList) < 4) {
+            $generalList[] = [
+                'name' => '-',
+                'npc' => 0,
+                'win' => 0
+            ];
+        }
+        foreach ($generalList as $i => $general) {
+            if ($general['name'] == "") {
+                $general['name'] = "-";
+            }
+            if ($general['npc'] >= 2) {
+                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
+            } elseif ($general['npc'] == 1) {
+                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
+            }
+            if ($general['win'] > 0) {
+                $line[$i] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
+            } else {
+                $line[$i] = "<font color=white>";
+            }
+            $gen[$i] = $general['name'];
+        }
+        for ($i = 0; $i < 2; $i++) {
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━━━━━━━━━━" . "</font>";
+            $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━━━━━━━━━━┓" . "</font>";
+            echo "<td colspan=8>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+        }
+        echo "
                 </tr>
                 <tr align=center>";
 
-for ($i=0; $i < 4; $i++) {
-    echo "<td colspan=4>{$gen[$i]}</td>";
-}
+        for ($i = 0; $i < 4; $i++) {
+            echo "<td colspan=4>{$gen[$i]}</td>";
+        }
 
-echo "
+        echo "
                 </tr>
                 <tr align=center>";
 
-for ($i=0; $i < 4; $i++) {
-    $cent[$i] = "<font color=white>";
-}
+        for ($i = 0; $i < 4; $i++) {
+            $cent[$i] = "<font color=white>";
+        }
 
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=30 order by grp, grp_no LIMIT 8');
-while(count($generalList) < 8){
-    $generalList[] = [
-        'name'=>'-',
-        'npc'=>0,
-        'win'=>0
-    ];
-}
-foreach($generalList as $i=>$general){
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 4; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━┓"."</font>";
-    echo "<td colspan=4>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=30 order by grp, grp_no LIMIT 8');
+        while (count($generalList) < 8) {
+            $generalList[] = [
+                'name' => '-',
+                'npc' => 0,
+                'win' => 0
+            ];
+        }
+        foreach ($generalList as $i => $general) {
+            if ($general['name'] == "") {
+                $general['name'] = "-";
+            }
+            if ($general['npc'] >= 2) {
+                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
+            } elseif ($general['npc'] == 1) {
+                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
+            }
+            if ($general['win'] > 0) {
+                $line[$i] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
+            } else {
+                $line[$i] = "<font color=white>";
+            }
+            $gen[$i] = $general['name'];
+        }
+        for ($i = 0; $i < 4; $i++) {
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━" . "</font>";
+            $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━┓" . "</font>";
+            echo "<td colspan=4>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+        }
+        echo "
                 </tr>
                 <tr align=center>";
 
-for ($i=0; $i < 8; $i++) {
-    echo "<td colspan=2>{$gen[$i]}</td>";
-}
+        for ($i = 0; $i < 8; $i++) {
+            echo "<td colspan=2>{$gen[$i]}</td>";
+        }
 
-echo "
+        echo "
                 </tr>
                 <tr align=center>";
 
-for ($i=0; $i < 8; $i++) {
-    $cent[$i] = "<font color=white>";
-}
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=20 order by grp, grp_no LIMIT 16');
-while(count($generalList) < 16){
-    $generalList[] = [
-        'name'=>'-',
-        'npc'=>0,
-        'win'=>0
-    ];
-}
-foreach($generalList as $i=>$general){
-    if ($general['name'] == "") {
-        $general['name'] = "-";
-    }
-    if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
-    } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
-    }
-    if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
-        $line[$i] = "<font color=white>";
-    }
-    $gen[$i] = $general['name'];
-}
-for ($i=0; $i < 8; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━"."</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━┓"."</font>";
-    echo "<td colspan=2>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
-}
-echo "
+        for ($i = 0; $i < 8; $i++) {
+            $cent[$i] = "<font color=white>";
+        }
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=20 order by grp, grp_no LIMIT 16');
+        while (count($generalList) < 16) {
+            $generalList[] = [
+                'name' => '-',
+                'npc' => 0,
+                'win' => 0
+            ];
+        }
+        foreach ($generalList as $i => $general) {
+            if ($general['name'] == "") {
+                $general['name'] = "-";
+            }
+            if ($general['npc'] >= 2) {
+                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
+            } elseif ($general['npc'] == 1) {
+                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
+            }
+            if ($general['win'] > 0) {
+                $line[$i] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
+            } else {
+                $line[$i] = "<font color=white>";
+            }
+            $gen[$i] = $general['name'];
+        }
+        for ($i = 0; $i < 8; $i++) {
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━" . "</font>";
+            $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━┓" . "</font>";
+            echo "<td colspan=2>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
+        }
+        echo "
                 </tr>
                 <tr align=center>";
 
-for ($i=0; $i < 16; $i++) {
-    echo "<td width=125>{$gen[$i]}</td>";
-}
+        for ($i = 0; $i < 16; $i++) {
+            echo "<td width=125>{$gen[$i]}</td>";
+        }
 
-echo"
+        echo "
                 </tr>";
-$globalBet = $db->queryFirstList('SELECT * FROM betting WHERE general_id = 0')??[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ];
-$globalBet = array_splice($globalBet, -16);
-$globalBetTotal = array_sum($globalBet);
-$admin = $gameStor->getValues(['tournament', 'phase']);
-$bet = [];
-for ($i=0; $i < 16; $i++) {
-    if($globalBet[$i] == 0){
-        $bet[$i] = '∞';
-        continue;
-    }
-    $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
-}
+        $globalBet = $db->queryFirstList('SELECT * FROM betting WHERE general_id = 0') ?? [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,];
+        $globalBet = array_splice($globalBet, -16);
+        $globalBetTotal = array_sum($globalBet);
+        $admin = $gameStor->getValues(['tournament', 'phase']);
+        $bet = [];
+        for ($i = 0; $i < 16; $i++) {
+            if ($globalBet[$i] == 0) {
+                $bet[$i] = '∞';
+                continue;
+            }
+            $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
+        }
 
-echo "
+        echo "
                 <tr align=center>";
 
-for ($i=0; $i < 16; $i++) {
-    echo "<td><font color=skyblue>{$bet[$i]}</font></td>";
-}
+        for ($i = 0; $i < 16; $i++) {
+            echo "<td><font color=skyblue>{$bet[$i]}</font></td>";
+        }
 
-echo "
+        echo "
                 </tr>
                 <tr align=center><td height=10 colspan=16></td></tr>
                 <tr align=center><td colspan=16><font color=skyblue size=4>배당률이 낮을수록 베팅된 금액이 많고 유저들이 우승후보로 많이 선택한 장수입니다.</font></td></tr>
@@ -393,87 +466,94 @@ echo "
         </td>
     </tr>";
 
-if ($admin['tournament'] >= 7 || $admin['tournament'] == 0) {
-    printFighting($admin['tournament'], $admin['phase']);
-}
-echo "
+        if ($admin['tournament'] >= 7 || $admin['tournament'] == 0) {
+            printFighting($admin['tournament'], $admin['phase']);
+        }
+        echo "
     <tr><td height=10 colspan=8 align=center></td></tr>
     <tr><td colspan=8 align=center class='bg2'><font color=orange size=5>조별 본선 순위</font></td></tr>
     <tr>";
 
-$num = array("一", "二", "三", "四", "五", "六", "七", "八");
+        $num = array("一", "二", "三", "四", "五", "六", "七", "八");
 
-for ($i=0; $i < 8; $i++) {
-    $grp = $i + 10;
-    echo "
+        for ($i = 0; $i < 8; $i++) {
+            $grp = $i + 10;
+            echo "
         <td>
             <table align=center width=250 class='tb_layout bg0'>
                 <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
                 <tr class='bg1'><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
 
-    $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq',$grp);
-    foreach($generalList as $k=>$general) {
-        printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
-    }
-    foreach(Util::range(count($generalList), 4) as $idx){
-        printRow($idx, '', '', '', '', '', '', '', '', '', '');
-    }
-    echo "
+            $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq', $grp);
+            foreach ($generalList as $k => $general) {
+                printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
+            }
+            foreach (Util::range(count($generalList), 4) as $idx) {
+                printRow($idx, '', '', '', '', '', '', '', '', '', '');
+            }
+            echo "
             </table>
         </td>";
-}
-echo "</tr>";
-if ($admin['tournament'] == 4 || $admin['tournament'] == 5) {
-    printFighting($admin['tournament'], $admin['phase']);
-}
-echo "
+        }
+        echo "</tr>";
+        if ($admin['tournament'] == 4 || $admin['tournament'] == 5) {
+            printFighting($admin['tournament'], $admin['phase']);
+        }
+        echo "
     <tr><td colspan=8 align=center class='bg2'><font color=yellow size=5>조별 예선 순위</font></td></tr>
     <tr>";
 
-for ($i=0; $i < 8; $i++) {
-    $grp = $i;
-    echo "
+        for ($i = 0; $i < 8; $i++) {
+            $grp = $i;
+            echo "
         <td>
             <table align=center width=250 class='tb_layout bg0'>
                 <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
                 <tr class='bg1'><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
 
-    $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq',$grp);
-    foreach($generalList as $k=>$general) {
-        printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
-    }
-    foreach(Util::range(count($generalList), 8) as $idx){
-        printRow($idx, '', '', '', '', '', '', '', '', '', '');
-    }
-    echo "
+            $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq', $grp);
+            foreach ($generalList as $k => $general) {
+                printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
+            }
+            foreach (Util::range(count($generalList), 8) as $idx) {
+                printRow($idx, '', '', '', '', '', '', '', '', '', '');
+            }
+            echo "
             </table>
         </td>";
-}
+        }
 
-if ($admin['tournament'] == 2 || $admin['tournament'] == 3) {
-    printFighting($admin['tournament'], $admin['phase']);
-}
+        if ($admin['tournament'] == 2 || $admin['tournament'] == 3) {
+            printFighting($admin['tournament'], $admin['phase']);
+        }
 
-?>
-    </tr>
-    <tr><td colspan=8>
-        <font color=white size=2>
-ㆍ예선은 홈&amp;어웨이 풀리그로 진행됩니다. (총 14경기)<br>
-ㆍ상위 4명이 본선에 진출하게 되며 조추첨을 통해 조가 배정됩니다.<br>
-ㆍ각 조1위가 시드1로 랜덤하게 조에 배정되며, 역시 각 조2위가 시드2로 랜덤하게 조에 배정됩니다.<br>
-ㆍ그후 남은 3, 4위는 완전 랜덤하게 모든 조에 랜덤하게 배정됩니다.<br>
-ㆍ본선은 개인당 3경기를 치르게 되며 승점(승3, 무1, 패0), 득실, 참가순서(시드)에 따라 순위를 매깁니다.<br>
-ㆍ각 조 1, 2위는 16강에 지정된 위치에 배정됩니다.<br>
-ㆍ16강부터는 1경기 토너먼트로 진행됩니다.<br>
-ㆍ참가비는 금20~140이며, 성적에 따라 금과 약간의 명성이 포상으로 주어집니다.<br>
-ㆍ16강자 100, 8강자 300, 4강자 600, 준우승자 1200, 우승자 2000 (220년 기준)<br>
-ㆍ즐거운 삼토!
-        </font>
-    </td></tr>
-</table>
-<table align=center width=2000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
+        ?>
+        </tr>
+        <tr>
+            <td colspan=8>
+                <font color=white size=2>
+                    ㆍ예선은 홈&amp;어웨이 풀리그로 진행됩니다. (총 14경기)<br>
+                    ㆍ상위 4명이 본선에 진출하게 되며 조추첨을 통해 조가 배정됩니다.<br>
+                    ㆍ각 조1위가 시드1로 랜덤하게 조에 배정되며, 역시 각 조2위가 시드2로 랜덤하게 조에 배정됩니다.<br>
+                    ㆍ그후 남은 3, 4위는 완전 랜덤하게 모든 조에 랜덤하게 배정됩니다.<br>
+                    ㆍ본선은 개인당 3경기를 치르게 되며 승점(승3, 무1, 패0), 득실, 참가순서(시드)에 따라 순위를 매깁니다.<br>
+                    ㆍ각 조 1, 2위는 16강에 지정된 위치에 배정됩니다.<br>
+                    ㆍ16강부터는 1경기 토너먼트로 진행됩니다.<br>
+                    ㆍ참가비는 금20~140이며, 성적에 따라 금과 약간의 명성이 포상으로 주어집니다.<br>
+                    ㆍ16강자 100, 8강자 300, 4강자 600, 준우승자 1200, 우승자 2000 (220년 기준)<br>
+                    ㆍ즐거운 삼토!
+                </font>
+            </td>
+        </tr>
+    </table>
+    <table align=center width=2000 class='tb_layout bg0'>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
 </body>
-</html>
+
+</html>

hwe/b_troop.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -14,19 +15,18 @@ increaseRefresh("부대편성", 1);
 $me = $db->queryFirstRow('SELECT no,nation,troop FROM general WHERE owner=%i', $userID);
 
 $troops = [];
-foreach($db->query('SELECT troop_leader,name FROM troop WHERE nation = %i', $me['nation']) as $rawTroop){
+foreach ($db->query('SELECT troop_leader,name FROM troop WHERE nation = %i', $me['nation']) as $rawTroop) {
     $troops[$rawTroop['troop_leader']] = [
-        'name'=>$rawTroop['name'],
-        'users'=>[]
+        'name' => $rawTroop['name'],
+        'users' => []
     ];
 }
 
-foreach($db->query(
+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)){
+) as $general) {
+    if (!key_exists($general['troop'], $troops)) {
         trigger_error("올바르지 않은 부대 소속 {$general['no']}, {$general['name']} : {$general['troop']}");
         continue;
     }
@@ -36,33 +36,32 @@ foreach($db->query(
     $troops[$general['troop']]['users'][] = $general;
 }
 
-if($troops){
+if ($troops) {
     $troopLeaders = $db->query(
         'SELECT no,name,picture,imgsvr,turntime,city,troop FROM general WHERE no IN %li',
         array_keys($troops)
     );
     $generalTurnList = [];
 
-    foreach($db->queryAllLists(
+    foreach ($db->queryAllLists(
         'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
         array_column($troopLeaders, 'no')
-        ) as [$generalID, $turnIdx, $brief]
-    ){
-        if(!key_exists($generalID, $generalTurnList)){
+    ) as [$generalID, $turnIdx, $brief]) {
+        if (!key_exists($generalID, $generalTurnList)) {
             $generalTurnList[$generalID] = [];
         }
         $generalTurnList[$generalID][$turnIdx] = $brief;
     }
 
-    foreach($troopLeaders as $troopLeader){
+    foreach ($troopLeaders as $troopLeader) {
         $imageTemp = GetImageURL($troopLeader['imgsvr']);
 
         $troopLeader['pictureFullPath'] = "$imageTemp/{$troopLeader['picture']}";
         $troopLeader['cityText'] = CityConst::byID($troopLeader['city'])->name;
 
         $turnText = [];
-        foreach($generalTurnList[$troopLeader['no']] as $rawTurnIdx => $brief){
-            if($brief != '집합'){
+        foreach ($generalTurnList[$troopLeader['no']] as $rawTurnIdx => $brief) {
+            if ($brief != '집합') {
                 $brief = '~';
             }
             $turnIdx = $rawTurnIdx + 1;
@@ -73,142 +72,159 @@ if($troops){
     }
 }
 
-uasort($troops, function($lhs, $rhs){
-    return $lhs['leader']['turntime']<=>$rhs['leader']['turntime'];
+uasort($troops, function ($lhs, $rhs) {
+    return $lhs['leader']['turntime'] <=> $rhs['leader']['turntime'];
 })
 
 ?>
 <!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::preloadJS('dist_js/troop.js')?>
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printCSS('dist_css/troop.css')?>
-<script>
 
-</script>
+<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('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('ts', ['common', 'troop'], true) ?>
 </head>
 
 <body>
-<div style="width:1000px;margin:auto;">
-<table width=1000 class='tb_layout bg0'>
-    <tr><td>부 대 편 성<br><?=backButton()?></td></tr>
-</table>
-<table id="troop_list" class='tb_layout bg0'>
-    <thead>
-    <tr>
-        <td width=64  class='bg1 center'>선 택</td>
-        <td width=130  class='bg1 center'>부 대 정 보</td>
-        <td width=100  class='bg1 center'>부 대 장</td>
-        <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=button id='btnJoinTroop' value='부 대 가 입'>
-    <?php else: ?>
-        <input type=button id="btnLeaveTroop" value='부 대 탈 퇴'>
-    <?php endif;?>
-    </td></tr></tfoot>
-    <tbody>
-<?php
-foreach ($troops as $troopNo=>$troop) {
-    $troopLeader = $troop['leader'];
-    $genlistText = [];
-    $cityText = $troopLeader['cityText'];
-    $cityID = $troopLeader['city'];
-    $leaderID = $troopLeader['no'];
+    <div style="width:1000px;margin:auto;">
+        <table width=1000 class='tb_layout bg0'>
+            <tr>
+                <td>부 대 편 성<br><?= backButton() ?></td>
+            </tr>
+        </table>
+        <table id="troop_list" class='tb_layout bg0'>
+            <thead>
+                <tr>
+                    <td width=64 class='bg1 center'>선 택</td>
+                    <td width=130 class='bg1 center'>부 대 정 보</td>
+                    <td width=100 class='bg1 center'>부 대 장</td>
+                    <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=button id='btnJoinTroop' value='부 대 가 입'>
+                        <?php else : ?>
+                            <input type=button id="btnLeaveTroop" value='부 대 탈 퇴'>
+                        <?php endif; ?>
+                    </td>
+                </tr>
+            </tfoot>
+            <tbody>
+                <?php
+                foreach ($troops as $troopNo => $troop) {
+                    $troopLeader = $troop['leader'];
+                    $genlistText = [];
+                    $cityText = $troopLeader['cityText'];
+                    $cityID = $troopLeader['city'];
+                    $leaderID = $troopLeader['no'];
 
-    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']}'
+                    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>";
-    }
+                    }
 
-    $genlistText = sprintf('%s (%d명)', join(', ', $genlistText), count($genlistText)); ?>
+                    $genlistText = sprintf('%s (%d명)', join(', ', $genlistText), count($genlistText)); ?>
 
-<?php if ($me['troop'] == 0): ?>
-    <tr>
-        <td align=center rowspan=2><input type='radio' class='troopId' name='troop' value='<?=$troopNo?>'></td>
-        <td align=center><?=$troop['name']?><br>【 <?=$cityText?> 】</td>
-        <td height=64 class='generalIcon' 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($troopLeader['turntime'], 14, 5)?></font></td>
-        <td align=center><font size=1><?=$troopLeader['name']?></font></td></tr>
-    <tr><td colspan=5>
+                    <?php if ($me['troop'] == 0) : ?>
+                        <tr>
+                            <td align=center rowspan=2><input type='radio' class='troopId' name='troop' value='<?= $troopNo ?>'></td>
+                            <td align=center><?= $troop['name'] ?><br>【 <?= $cityText ?> 】</td>
+                            <td height=64 class='generalIcon' 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($troopLeader['turntime'], 14, 5) ?></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>【 <?=$cityText?> 】</td>
-        <td height=64 class='generalIcon' 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 id='genNo' name=gen size=3 style=color:white;background-color:black;font-size:13px;width:128px;>";
-                <?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=button id='btnKickTroop' value='부 대 추 방' style=width:130px;height:25px;>
-        <?php else: ?>
-            <?=$troopLeader['turnText']?>
-        <?php endif; ?>
-        </td>
-    </tr>
-    <tr><td align=center><font size=2>【턴】 <?=substr($troopLeader['turntime'], 14, 5)?></font></td>
-    <td align=center><font size=1><?=$troopLeader['name']?></font></td></tr>
-    <tr><td colspan=5></td></tr>
-<?php endif;
+                            <?php else : ?>
+                        <tr>
+                            <td align=center rowspan=2>&nbsp;</td>
+                            <td align=center><?= $troop['name'] ?><br>【 <?= $cityText ?> 】</td>
+                            <td height=64 class='generalIcon' 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 id='genNo' name=gen size=3 style=color:white;background-color:black;font-size:14px;width:128px;>";
+                                        <?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=button id='btnKickTroop' value='부 대 추 방' style=width:130px;height:25px;>
+                                <?php else : ?>
+                                    <?= $troopLeader['turnText'] ?>
+                                <?php endif; ?>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td align=center>
+                                <font size=2>【턴】 <?= substr($troopLeader['turntime'], 14, 5) ?></font>
+                            </td>
+                            <td align=center>
+                                <font size=1><?= $troopLeader['name'] ?></font>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan=5></td>
+                        </tr>
+                <?php endif;
+                    } //foreach ($troops as $troopNo=>$troop) {
+                ?>
 
-} //foreach ($troops as $troopNo=>$troop) {
-?>
+            </tbody>
 
-</tbody>
+        </table>
+        <br>
+        <table width=1000 class='tb_layout bg0'>
+            <tr>
+                <td width=80 class='bg1'>부 대 명</td>
+                <td width=130><input type=text style=color:white;background-color:black; size=18 maxlength=18 id='nameplate'></td>
+                <?php if ($me['troop'] == 0) : ?>
+                    <td><input type=button id='btnCreateTroop' value='부 대 창 설'></td>
+                <?php else : ?>
+                    <td><input type=button id='btnChangeTroopName' value='부 대 변 경'></td>
+                <?php endif; ?>
+            </tr>
+        </table>
 
-</table>
-<br>
-<table width=1000 class='tb_layout bg0'>
-    <tr>
-        <td width=80 class='bg1'>부 대 명</td>
-        <td width=130><input type=text style=color:white;background-color:black; size=18 maxlength=18 id='nameplate'></td>
-    <?php if($me['troop'] == 0): ?>
-        <td><input type=button id='btnCreateTroop' value='부 대 창 설'></td>
-    <?php else: ?>
-        <td><input type=button id='btnChangeTroopName' value='부 대 변 경'></td>
-    <?php endif; ?>
-    </tr>
-</table>
-
-<table width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-</div>
-<?=WebUtil::printJS('dist_js/troop.js')?>
+        <table width=1000 class='tb_layout bg0'>
+            <tr>
+                <td><?= backButton() ?></td>
+            </tr>
+            <tr>
+                <td><?= banner() ?> </td>
+            </tr>
+        </table>
+    </div>
 </body>
-</html>
+
+</html>

hwe/battle_simulator.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -14,535 +15,510 @@ $year = $gameStor->year;
 
 $me = $db->queryFirstRow('SELECT no, nation, city FROM general WHERE owner =%i', Session::getUserID());
 
-if($me){
+if ($me) {
     $generalID = $me['no'];
     $nationID = $me['nation'];
     $city = $db->queryFirstRow('SELECT city, level, def, wall FROM city WHERE city = %i', $me['city']);
-}
-else{
+} else {
     $generalID = 0;
     $nationID = 0;
     $city = [
-        'city'=>0,
-        'level'=>5,
-        'def'=>1000,
-        'wall'=>1000,
+        'city' => 0,
+        'level' => 5,
+        'def' => 1000,
+        'wall' => 1000,
     ];
 }
 
-if($nationID){
+if ($nationID) {
     $nation = $db->queryFirstRow('SELECT level, type, tech, capital FROM nation WHERE nation = %i', $nationID);
-}
-else{
+} else {
     $nation = null;
 }
 
 ?>
 <!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('dist_js/vendors.js')?>
-<script>
-var defaultSpecialDomestic = '<?=GameConst::$defaultSpecialDomestic?>';
-var city = <?=Json::encode($city)?>;
-var nation = <?=Json::encode($nation)?>;
-</script>
-<?=WebUtil::printJS('dist_js/battle_simulator.js')?>
+    <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('../d_shared/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printCSS('css/battle_simulator.css') ?>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <script>
+        var defaultSpecialDomestic = '<?= GameConst::$defaultSpecialDomestic ?>';
+        var city = <?= Json::encode($city) ?>;
+        var nation = <?= Json::encode($nation) ?>;
+    </script>
+    <?= WebUtil::printDist('ts', ['common', 'battle_simulator']) ?>
 </head>
+
 <body>
-<div id="container">
-<div class="card mb-3">
-    <div class="card-header">
-        전역 설정
-    </div>
-    <div class="card-body dragpad_battle">
-        <div class="row">
-            <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="<?=$year?>" 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 id="container">
+        <div class="card mb-3">
             <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(GameConst::$availableNationType as $typeID): ?>
-                            <?php $nationTypeClass = buildNationTypeClass($typeID) ?>
-                            <option value="<?=$typeID?>"><?=$nationTypeClass->getName()?> (<?=$nationTypeClass::$pros?>, <?=$nationTypeClass::$cons?>)</option>
-                        <?php endforeach; ?>
-                    </select>
-                    <div class="input-group-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="0" autocomplete="off">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-success btn-general-import-server">서버에서 가져오기</button>
-                    </div>
-                    <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 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-text"> 년 시작 </div>
+                            <input type="number" class="form-control" id="year" value="<?= $year ?>" min="<?= $startYear ?>">
+                            <div class="input-group-text"> 년 </div>
+                            <input type="number" class="form-control" id="month" value="1" min="1" max="12">
+                            <div class="input-group-text"> 월 </div>
+                        </div>
                     </div>
-                    <select class="custom-select form_nation_type" style="width:25ch;">
-                        <?php foreach(GameConst::$availableNationType as $typeID): ?>
-                            <?php $nationTypeObj = buildNationTypeClass($typeID) ?>
-                            <option value="<?=$typeID?>"><?=$nationTypeObj->getName()?> (<?=$nationTypeObj::$pros?>, <?=$nationTypeObj::$cons?>)</option>
-                        <?php endforeach; ?>
-                    </select>
-                    <div class="input-group-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">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 class="col-sm-6">
+                        <div class="btn-toolbar" role="toolbar">
+                            <div class="input-group me-2" role="group">
+                                <div class="input-group-text">
+                                    반복 횟수
+                                </div>
+                                <select class="form-select" id="repeat_cnt">
+                                    <option value="1">1회 (로그 표기)</option>
+                                    <option value="1000">1000회 (요약 표기)</option>
+                                </select>
+                            </div>
+                            <div class="btn-group me-2" role="group">
+                                <button type="button" class="btn btn-danger btn-begin_battle">전투</button>
+                            </div>
+                            <div class="btn-group me-2" role="group">
+                                <button type="button" class="btn btn-info btn-battle-save">모두 저장</button>
+                                <input type="file" class="form_load_battle_file" accept=".json" style="display: none;" />
+                                <button type="button" class="btn btn-primary btn-battle-load">모두 불러오기</button>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-        <div class="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-success btn-general-import-server">서버에서 가져오기</button>
+        <div class="row">
+            <div class="col-sm">
+                <div class="card mb-2 attacker_nation">
+                    <div class="card-header">
+                        출병국 설정
                     </div>
-                    <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_officer_level" style="width:8ch;">
-                        <option value="1">일반</option>
-                        <option value="4">태수</option>
-                        <option value="3">군사</option>
-                        <option value="2">종사</option>
-                        <option value="10">무장 수뇌</option>
-                        <option value="9">지장 수뇌</option>
-                        <option value="11">참모</option>
-                        <option value="12">군주</option>
-                    </select>
-                    <div class="input-group-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 class="card-body nation_detail dragpad_battle">
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">국가 성향
+                            </div>
+                            <select class="form-select form_nation_type" style="width:25ch;">
+                                <?php foreach (GameConst::$availableNationType as $typeID) : ?>
+                                    <?php $nationTypeClass = buildNationTypeClass($typeID) ?>
+                                    <option value="<?= $typeID ?>"><?= $nationTypeClass->getName() ?> (<?= $nationTypeClass::$pros ?>, <?= $nationTypeClass::$cons ?>)</option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">기술 </div>
+                            <input type="number" class="form-control form_tech" value="1" min="0" max="12">
+                            <div class="input-group-text">등급 </div>
+                        </div>
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">국가 규모 </div>
+                            <select class="form-select form_nation_level">
+                                <?php foreach (getNationLevelList() as $nationLevel => [$name, $chiefCnt, $cityCnt]) : ?>
+                                    <option value="<?= $nationLevel ?>"><?= $name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">도시 규모
+                            </div>
+                            <select class="form-select form_city_level">
+                                <?php foreach (getCityLevelList() as $levelID => $name) : ?>
+                                    <option value="<?= $levelID ?>"><?= $name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">수도
+                            </div>
+                            <div class="btn-group" role="group" aria-label="수도">
+                                <input type="radio" class="btn-check" name="is_attacker_capital" value="1" id="is_attacker_capital_1" autocomplete="off">
+                                <label class="btn btn-secondary" for="is_attacker_capital_1">Y</label>
 
+                                <input type="radio" class="btn-check" name="is_attacker_capital" value="0" id="is_attacker_capital_0" autocomplete="off" checked>
+                                <label class="btn btn-secondary" for="is_attacker_capital_0">N</label>
+                            </div>
+
+                        </div>
+                        <div class="input-group mb-1">
+
+                        </div>
+                    </div>
                 </div>
-                <div class="input-group mb-1">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">통솔</span>
+                <div class="card mb-2 attacker_form general_form" data-general_no='1'>
+                    <div class="card-header">
+                        <div class="float-sm-start" style="line-height:25px;">출병자 설정</div>
+                        <div class="float-sm-end btn-toolbar" role="toolbar">
+                            <div class="btn-group btn-group-sm me-2" role="group">
+                                <button type="button" class="btn btn-success btn-general-import-server">서버에서 가져오기</button>
+                            </div>
+                            <div class="btn-group btn-group-sm me-2" role="group">
+                                <button type="button" class="btn btn-info btn-general-save">저장</button>
+                                <input type="file" class="form_load_general_file" accept=".json" style="display: none;" />
+                                <button type="button" class="btn btn-primary btn-general-load">불러오기</button>
+                            </div>
+                        </div>
                     </div>
-                    <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_strength" 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><!-- <div class="col-sm"> -->
+            <div class="col-sm defender-column">
+                <div class="card mb-2 defender_nation">
+                    <div class="card-header">
+                        수비국 설정
                     </div>
-                    <select class="custom-select form_general_horse">
-                        <option value='None'>-</option>
-                        <?php foreach(GameConst::$allItems['horse'] as $horseID=>$cnt): ?>
-                            <option value="<?=$horseID?>"><?=getItemName($horseID)?></option>
-                        <?php endforeach; ?>
-                    </select>
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">무기</span>
+                    <div class="card-body dragpad_battle">
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">국가 성향
+                            </div>
+                            <select class="form-select form_nation_type" style="width:25ch;">
+                                <?php foreach (GameConst::$availableNationType as $typeID) : ?>
+                                    <?php $nationTypeObj = buildNationTypeClass($typeID) ?>
+                                    <option value="<?= $typeID ?>"><?= $nationTypeObj->getName() ?> (<?= $nationTypeObj::$pros ?>, <?= $nationTypeObj::$cons ?>)</option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">기술
+                            </div>
+                            <input type="number" class="form-control form_tech" value="1" min="0" max="12">
+                            <div class="input-group-text">등급
+                            </div>
+                        </div>
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">국가 규모
+                            </div>
+                            <select class="form-select form_nation_level">
+                                <?php foreach (getNationLevelList() as $nationLevel => [$name, $chiefCnt, $cityCnt]) : ?>
+                                    <option value="<?= $nationLevel ?>"><?= $name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">도시 규모
+                            </div>
+                            <select class="form-select form_city_level">
+                                <?php foreach (getCityLevelList() as $levelID => $name) : ?>
+                                    <option value="<?= $levelID ?>"><?= $name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">수도
+                            </div>
+                            <div class="btn-group" role="group" aria-label="수도">
+                                <input type="radio" class="btn-check" name="is_defender_capital" value="1" id="is_defender_capital_1" autocomplete="off">
+                                <label class="btn btn-secondary" for="is_defender_capital_1">Y</label>
+
+                                <input type="radio" class="btn-check" name="is_defender_capital" value="0" id="is_defender_capital_0" autocomplete="off" checked>
+                                <label class="btn btn-secondary" for="is_defender_capital_0">N</label>
+                            </div>
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">수비
+                            </div>
+                            <input type="number" class="form-control form_def" id="city_def" value="1000" min="10" step="10">
+                            <div class="input-group-text">성벽
+                            </div>
+                            <input type="number" class="form-control form_wall" id="city_wall" value="1000" min="0" step="10">
+                        </div>
                     </div>
-                    <select class="custom-select form_general_weap">
-                        <option value='None'>-</option>
-                    <?php foreach(GameConst::$allItems['weapon'] as $weaponID=>$cnt): ?>
-                            <option value="<?=$weaponID?>"><?=getItemName($weaponID)?></option>
-                        <?php endforeach; ?>
-                    </select>
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">서적</span>
-                    </div>
-                    <select class="custom-select form_general_book">
-                        <option value='None'>-</option>
-                        <?php foreach(GameConst::$allItems['book'] as $bookID=>$cnt): ?>
-                            <option value="<?=$bookID?>"><?=getItemName($bookID)?></option>
-                        <?php endforeach; ?>
-                    </select>
                 </div>
-                <div class="input-group mb-3">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">부상</span>
+                <div class="card mb-2 defender_add_form">
+                    <div class="card-header">
+                        <div class="float-sm-start" style="line-height:25px;">수비자 설정</div>
+                        <div class="float-sm-end btn-toolbar" role="toolbar">
+                            <div class="btn-group btn-group-sm me-2" role="group">
+                                <button type="button" class="btn btn-dark btn-reorder_defender">수비 순서대로 정렬</button>
+                            </div>
+                            <div class="btn-group btn-group-sm" role="group">
+                                <button type="button" class="btn btn-success add-defender">추가</button>
+                            </div>
+                        </div>
                     </div>
-                    <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">
-                        <option value='None'>-</option>
-                        <?php foreach(GameConst::$allItems['item'] as $itemID=>$cnt): ?>
-                            <option value="<?=$itemID?>"><?=getItemName($itemID)?></option>
-                        <?php endforeach; ?>
-                    </select>
                 </div>
-                <div class="input-group mb-1">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">병종</span>
+                <div class="card mb-2 form_sample">
+                    <div class="card-header">
+                        <div class="float-sm-start" style="line-height:25px;">수비자 설정</div>
+                        <div class="float-sm-end btn-toolbar" role="toolbar">
+                            <div class="btn-group btn-group-sm me-2" role="group">
+                                <button type="button" class="btn btn-success btn-general-import-server">서버에서 가져오기</button>
+                            </div>
+                            <div class="btn-group btn-group-sm me-2" role="group">
+                                <button type="button" class="btn btn-info btn-general-save">저장</button>
+                                <input type="file" class="form_load_general_file" accept=".json" style="display: none;" />
+                                <button type="button" class="btn btn-primary btn-general-load">불러오기</button>
+                            </div>
+                            <div class="btn-group btn-group-sm" role="group">
+                                <button type="button" class="btn btn-warning copy-defender">복제</button>
+                                <button type="button" class="btn btn-danger delete-defender">제거</button>
+                            </div>
+                        </div>
                     </div>
-                    <select class="custom-select form_crewtype">
-                        <?php foreach(GameUnitConst::all() as $crewTypeID => $crewType): ?>
-                            <?php if($crewType->armType === GameUnitConst::T_CASTLE){ continue; } ?>
-                            <option value="<?=$crewTypeID?>"><?=$crewType->name?></option>
-                        <?php endforeach; ?>
-                    </select>
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">병사</span>
+                    <div class="card-body general_detail">
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">이름
+                            </div>
+                            <input type="text" class="form-control form_general_name" value="무명" style="width:15ch;">
+                            <div class="input-group-text">직위
+                            </div>
+                            <select class="form-select form_officer_level" style="width:8ch;">
+                                <option value="1">일반</option>
+                                <option value="4">태수</option>
+                                <option value="3">군사</option>
+                                <option value="2">종사</option>
+                                <option value="10">무장 수뇌</option>
+                                <option value="9">지장 수뇌</option>
+                                <option value="11">참모</option>
+                                <option value="12">군주</option>
+                            </select>
+                            <div class="input-group-text">Level
+                            </div>
+                            <input type="number" class="form-control form_exp_level" value="20" min="0" max="300" step="1">
+
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">통솔
+                            </div>
+                            <input type="number" class="form-control form_leadership" value="50" min="1" max="300" step="1">
+                            <div class="input-group-text">무력
+                            </div>
+                            <input type="number" class="form-control form_strength" value="50" min="1" max="300" step="1">
+                            <div class="input-group-text">지력
+                            </div>
+                            <input type="number" class="form-control form_intel" value="50" min="1" max="300" step="1">
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">명마
+                            </div>
+                            <select class="form-select form_general_horse">
+                                <option value='None'>-</option>
+                                <?php foreach (GameConst::$allItems['horse'] as $horseID => $cnt) : ?>
+                                    <option value="<?= $horseID ?>"><?= getItemName($horseID) ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">무기
+                            </div>
+                            <select class="form-select form_general_weap">
+                                <option value='None'>-</option>
+                                <?php foreach (GameConst::$allItems['weapon'] as $weaponID => $cnt) : ?>
+                                    <option value="<?= $weaponID ?>"><?= getItemName($weaponID) ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">서적
+                            </div>
+                            <select class="form-select form_general_book">
+                                <option value='None'>-</option>
+                                <?php foreach (GameConst::$allItems['book'] as $bookID => $cnt) : ?>
+                                    <option value="<?= $bookID ?>"><?= getItemName($bookID) ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">부상
+                            </div>
+                            <input type="number" class="form-control form_injury" value="0" min="0" max="80" step="1">
+                            <div class="input-group-text">%(<span class="injury_helptext">건강</span>)
+                            </div>
+                            <div class="input-group-text">군량
+                            </div>
+                            <input type="number" class="form-control form_rice" value="5000" min="50" max="40000" step="50">
+                            <div class="input-group-text">도구
+                            </div>
+                            <select class="form-select form_general_item">
+                                <option value='None'>-</option>
+                                <?php foreach (GameConst::$allItems['item'] as $itemID => $cnt) : ?>
+                                    <option value="<?= $itemID ?>"><?= getItemName($itemID) ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">병종
+                            </div>
+                            <select class="form-select form_crewtype">
+                                <?php foreach (GameUnitConst::all() as $crewTypeID => $crewType) : ?>
+                                    <?php if ($crewType->armType === GameUnitConst::T_CASTLE) {
+                                        continue;
+                                    } ?>
+                                    <option value="<?= $crewTypeID ?>"><?= $crewType->name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">병사
+                            </div>
+                            <input type="number" class="form-control form_crew" value="7000" min="100" step="100">
+                            <div class="input-group-text">성격
+                            </div>
+                            <select class="form-select form_general_character">
+                                <?php foreach (getCharacterList(false) as $characterID => [$name, $info]) : ?>
+                                    <option value="<?= $characterID ?>"><?= $name ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">훈련
+                            </div>
+                            <input type="number" class="form-control form_train" value="100" min="40" max="<?= GameConst::$maxTrainByWar ?>" step="1">
+                            <div class="input-group-text">사기
+                            </div>
+                            <input type="number" class="form-control form_atmos" value="100" min="40" max="<?= GameConst::$maxAtmosByWar ?>" step="1">
+                            <div class="input-group-text">전특
+                            </div>
+                            <select class="form-select form_general_special_war">
+                                <?php foreach (SpecialityHelper::getSpecialWarList(false) as $specialWarID => $specialObj) : ?>
+                                    <option value="<?= $specialWarID ?>"><?= $specialObj->getName() ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">보병숙련
+                            </div>
+                            <select class="form-select form_dex1">
+                                <?php foreach (getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]) : ?>
+                                    <option value="<?= $dexAmount ?>"><?= "{$name} (" . number_format($dexAmount) . ")" ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">궁병숙련
+                            </div>
+                            <select class="form-select form_dex2">
+                                <?php foreach (getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]) : ?>
+                                    <option value="<?= $dexAmount ?>"><?= "{$name} (" . number_format($dexAmount) . ")" ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">기병숙련
+                            </div>
+                            <select class="form-select form_dex3">
+                                <?php foreach (getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]) : ?>
+                                    <option value="<?= $dexAmount ?>"><?= "{$name} (" . number_format($dexAmount) . ")" ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                        </div>
+                        <div class="input-group mb-3">
+                            <div class="input-group-text">귀병숙련
+                            </div>
+                            <select class="form-select form_dex4">
+                                <?php foreach (getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]) : ?>
+                                    <option value="<?= $dexAmount ?>"><?= "{$name} (" . number_format($dexAmount) . ")" ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text">차병숙련
+                            </div>
+                            <select class="form-select form_dex5">
+                                <?php foreach (getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]) : ?>
+                                    <option value="<?= $dexAmount ?>"><?= "{$name} (" . number_format($dexAmount) . ")" ?></option>
+                                <?php endforeach; ?>
+                            </select>
+                            <div class="input-group-text only_defender">수비여부
+                            </div>
+                            <select class="form-select form_defence_train only_defender">
+                                <option value="90">훈사 90</option>
+                                <option value="80">훈사 80</option>
+                                <option value="60">훈사 60</option>
+                                <option value="40">훈사 40</option>
+                                <option value="999">안함</option>
+                            </select>
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">전투 수
+                            </div>
+                            <input type="number" class="form-control form_warnum" value="0" step="1">
+                            <div class="input-group-text">승리 수
+                            </div>
+                            <input type="number" class="form-control form_killnum" value="0" step="1">
+                            <div class="input-group-text">사살 수
+                            </div>
+                            <input type="number" class="form-control form_killcrew" value="0" step="1">
+                        </div>
                     </div>
-                    <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(false) 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">
-                        <?php foreach(SpecialityHelper::getSpecialWarList(false) as $specialWarID =>$specialObj): ?>
-                            <option value="<?=$specialWarID?>"><?=$specialObj->getName()?></option>
-                        <?php endforeach; ?>
-                    </select>
-                </div>
-                <div class="input-group mb-1">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">보병숙련</span>
-                    </div>
-                    <select class="custom-select form_dex1">
-                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
-                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
-                        <?php endforeach; ?>
-                    </select>
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">궁병숙련</span>
-                    </div>
-                    <select class="custom-select form_dex2">
-                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
-                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
-                        <?php endforeach; ?>
-                    </select>
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">기병숙련</span>
-                    </div>
-                    <select class="custom-select form_dex3">
-                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
-                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
-                        <?php endforeach; ?>
-                    </select>
-                </div>
-                <div class="input-group mb-3">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">귀병숙련</span>
-                    </div>
-                    <select class="custom-select form_dex4">
-                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
-                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
-                        <?php endforeach; ?>
-                    </select>
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">차병숙련</span>
-                    </div>
-                    <select class="custom-select form_dex5">
-                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
-                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
-                        <?php endforeach; ?>
-                    </select>
-                    <div class="input-group-prepend only_defender">
-                        <span class="input-group-text">수비여부</span>
-                    </div>
-                    <select class="custom-select form_defence_train only_defender">
-                        <option value="90">훈사 90</option>
-                        <option value="80">훈사 80</option>
-                        <option value="60">훈사 60</option>
-                        <option value="40">훈사 40</option>
-                        <option value="999">안함</option>
-                    </select>
-                </div>
-                <div class="input-group mb-1">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">전투 수</span>
-                    </div>
-                    <input type="number" class="form-control form_warnum" value="0" step="1">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">승리 수</span>
-                    </div>
-                    <input type="number" class="form-control form_killnum" value="0" step="1">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text">사살 수</span>
-                    </div>
-                    <input type="number" class="form-control form_killcrew" value="0" step="1">
-                </div>
-            </div>
+
+
+            </div><!-- <div class="col-sm"> -->
         </div>
-
-
-    </div><!-- <div class="col-sm"> -->
-</div>
-<div class="card mb-3">
-    <div class="card-header">
-        전투 요약
-    </div>
-    <table class="table">
-        <tbody id="battle_result_summary">
-            <tr><th style='width:18ch;'>전투 일시</th><td id='result_datetime'></td></tr>
-            <tr><th>전투 횟수</th><td id='result_warcnt'></td></tr>
-            <tr><th>전투 페이즈</th><td id='result_phase'></td></tr>
-            <tr><th>준 피해</th><td><span id='result_killed'>0</span><span id='result_varKilled'> (<span id='result_minKilled'>0</span> ~ <span id='result_maxKilled'>0</span>)</span></td></tr>
-            <tr><th>받은 피해</th><td><span id='result_dead'>0</span><span id='result_varDead'> (<span id='result_minDead'>0</span> ~ <span id='result_maxDead'>0</span>)</span></td></tr>
-            <tr><th>출병자 군량 소모</th><td id='result_attackerRice'></td></tr>
-            <tr><th>수비자 군량 소모</th><td id='result_defenderRice'></td></tr>
-            <tr><th>공격자 스킬</th><td id='result_attackerSkills'></td></tr>
-            <tr class='result_defenderSkills'><th>수비자1 스킬</th><td></td></tr>
-        </tbody>
-    </table>
-</div>
-<div class="row">
-    <div class="col-sm">
         <div class="card mb-3">
             <div class="card-header">
-                마지막 전투 로그
+                전투 요약
             </div>
-            <div class="card-body" id="generalBattleResultLog">
+            <table class="table">
+                <tbody id="battle_result_summary">
+                    <tr>
+                        <th style='width:18ch;'>전투 일시</th>
+                        <td id='result_datetime'></td>
+                    </tr>
+                    <tr>
+                        <th>전투 횟수</th>
+                        <td id='result_warcnt'></td>
+                    </tr>
+                    <tr>
+                        <th>전투 페이즈</th>
+                        <td id='result_phase'></td>
+                    </tr>
+                    <tr>
+                        <th>준 피해</th>
+                        <td><span id='result_killed'>0</span><span id='result_varKilled'> (<span id='result_minKilled'>0</span> ~ <span id='result_maxKilled'>0</span>)</span></td>
+                    </tr>
+                    <tr>
+                        <th>받은 피해</th>
+                        <td><span id='result_dead'>0</span><span id='result_varDead'> (<span id='result_minDead'>0</span> ~ <span id='result_maxDead'>0</span>)</span></td>
+                    </tr>
+                    <tr>
+                        <th>출병자 군량 소모</th>
+                        <td id='result_attackerRice'></td>
+                    </tr>
+                    <tr>
+                        <th>수비자 군량 소모</th>
+                        <td id='result_defenderRice'></td>
+                    </tr>
+                    <tr>
+                        <th>공격자 스킬</th>
+                        <td id='result_attackerSkills'></td>
+                    </tr>
+                    <tr class='result_defenderSkills'>
+                        <th>수비자1 스킬</th>
+                        <td></td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <div class="row">
+            <div class="col-sm">
+                <div class="card mb-3">
+                    <div class="card-header">
+                        마지막 전투 로그
+                    </div>
+                    <div class="card-body" id="generalBattleResultLog">
 
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm">
+                <div class="card mb-3">
+                    <div class="card-header">
+                        마지막 전투 상세 로그
+                    </div>
+                    <div class="card-body" id="generalBattleDetailLog">
+
+                    </div>
+                </div>
             </div>
         </div>
     </div>
-    <div class="col-sm">
-        <div class="card mb-3">
-            <div class="card-header">
-                마지막 전투 상세 로그
-            </div>
-            <div class="card-body" id="generalBattleDetailLog">
-
+    <div id="importModal" class="modal" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">장수 목록</h5>
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <select id="modalSelector"></select>
+                    <p>타국 장수를 선택한 경우 숙련과 아이템은 0으로 초기화됩니다.</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-primary" id='importFromDB'>가져오기</button>
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+                </div>
             </div>
         </div>
     </div>
-</div>
-</div>
-<div id="importModal" class="modal" tabindex="-1" role="dialog">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">장수 목록</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-          <select id="modalSelector"></select>
-        <p>타국 장수를 선택한 경우 숙련과 아이템은 0으로 초기화됩니다.</p>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-primary" id='importFromDB'>가져오기</button>
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">닫기</button>
-      </div>
-    </div>
-  </div>
-</div>
 </body>
+
 </html>

hwe/c_dipcenter.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -6,8 +7,8 @@ include "func.php";
 // $btn, $msg, $scoutmsg, $rate, $bill, $secretlimit
 
 $btn = Util::getPost('btn');
-$msg = Util::getPost('msg');
-$scoutmsg = Util::getPost('scoutMsg');
+//$msg = Util::getPost('msg');
+//$scoutmsg = Util::getPost('scoutMsg');
 $rate = Util::getPost('rate', 'int');
 $bill = Util::getPost('bill', 'int');
 $secretlimit = Util::getPost('secretlimit', 'int');
@@ -22,11 +23,10 @@ $me = $db->queryFirstRow('SELECT `no`,nation,`officer_level`,permission,penalty
 
 //내가 수뇌부이어야함
 $permission = checkSecretPermission($me);
-if($permission < 0){
+if ($permission < 0) {
     header('location:b_myBossInfo.php', true, 303);
     exit();
-}
-else if ($me['officer_level'] < 5 && $permission != 4) {
+} else if ($me['officer_level'] < 5 && $permission != 4) {
     header('location:b_myBossInfo.php', true, 303);
     exit();
 }
@@ -34,44 +34,52 @@ else if ($me['officer_level'] < 5 && $permission != 4) {
 $nationID = $me['nation'];
 $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
 
-if($btn == "국가방침 수정") {
+/*if ($btn == "국가방침 수정") {
     $msg = mb_substr($msg, 0, 16384);
     //$msg = StringUtil::
     $nationStor->notice = WebUtil::htmlPurify($msg);
-} elseif($btn == "임관 권유문 수정") {
+} elseif ($btn == "임관 권유문 수정") {
     $scoutmsg = mb_substr($scoutmsg, 0, 1000);
     $nationStor->scout_msg = WebUtil::htmlPurify($scoutmsg);
-} elseif($btn == "세율") {
+} else*/if ($btn == "세율") {
     $rate = Util::valueFit($rate, 5, 30);
     $db->update('nation', [
-        'rate'=>$rate,
+        'rate' => $rate,
     ], 'nation=%i', $nationID);
-} elseif($btn == "지급률") {
+} elseif ($btn == "지급률") {
     $bill = Util::valueFit($bill, 20, 200);
     $db->update('nation', [
-        'bill'=>$bill
-    ], 'nation=%i',$nationID);
-} elseif($btn == "기밀권한") {
+        'bill' => $bill
+    ], 'nation=%i', $nationID);
+} elseif ($btn == "기밀권한") {
     $secretlimit = Util::valueFit($secretlimit, 1, 99);
     $db->update('nation', [
-        'secretlimit'=>$secretlimit
-    ], 'nation=%i',$nationID);
-} elseif($btn == "임관 금지") {
+        'secretlimit' => $secretlimit
+    ], 'nation=%i', $nationID);
+} elseif ($btn == "임관 금지") {
     $db->update('nation', [
-        'scout'=>1
-    ], 'nation=%i',$nationID);
-} elseif($btn == "임관 허가") {
+        'scout' => 1
+    ], 'nation=%i', $nationID);
+} elseif ($btn == "임관 허가") {
     $db->update('nation', [
-        'scout'=>0
-    ], 'nation=%i',$nationID);
-} elseif($btn == "전쟁 금지") {
-    $db->update('nation', [
-        'war'=>1
-    ], 'nation=%i',$nationID);
-} elseif($btn == "전쟁 허가") {
-    $db->update('nation', [
-        'war'=>0
-    ], 'nation=%i',$nationID);
+        'scout' => 0
+    ], 'nation=%i', $nationID);
+} elseif ($btn == "전쟁 금지") {
+    $avilableCnt = $nationStor->getValue('available_war_setting_cnt') ?? 0;
+    if ($avilableCnt > 0) {
+        $db->update('nation', [
+            'war' => 1
+        ], 'nation=%i', $nationID);
+        $nationStor->setValue('available_war_setting_cnt', $avilableCnt - 1);
+    }
+} elseif ($btn == "전쟁 허가") {
+    $avilableCnt = $nationStor->getValue('available_war_setting_cnt') ?? 0;
+    if ($avilableCnt > 0) {
+        $db->update('nation', [
+            'war' => 0
+        ], 'nation=%i', $nationID);
+        $nationStor->setValue('available_war_setting_cnt', $avilableCnt - 1);
+    }
 }
 
 header('location:b_dipcenter.php');

hwe/c_tournament.php

@@ -36,15 +36,15 @@ if($btn == '참가') {
 
     if($db->queryFirstField('SELECT `no` FROM tournament WHERE `no`=%i', $me['no'])){
         header('location:b_tournament.php');
-        exit(1); 
+        exit(1);
     }
 
     $general = $db->queryFirstRow('SELECT no,name,npc,leadership,strength,intel,explevel,gold,horse,weapon,book FROM general WHERE `no`=%i', $me['no']);
 
     //{$admin['develcost']}원 참가비
-    if($general['gold'] < $admin['develcost']) { 
+    if($general['gold'] < $admin['develcost']) {
         header('location:b_tournament.php');
-        exit(1); 
+        exit(1);
     }
     $general['gold'] -= $admin['develcost'];
 
@@ -66,7 +66,7 @@ if($btn == '참가') {
     }
 
     $fullGrpCnt = 8 - count($freeSlot);
-    
+
     if($freeSlot) {
         $grp = Util::choiceRandom(array_keys($freeSlot));
         $grpMemberCount = $db->queryFirstField('SELECT count(*) FROM tournament WHERE grp=%i', $grp);
@@ -96,12 +96,12 @@ if($btn == '참가') {
         $gameStor->phase = 0;
     }
     header('location:b_tournament.php');
-    die(); 
+    die();
 }
 
-if($session->userGrade < 5) { 
+if($session->userGrade < 5) {
     header('location:b_tournament.php');
-    exit(); 
+    exit();
 }
 
 if($btn == "자동개최설정") {
@@ -157,10 +157,10 @@ if($btn == "자동개최설정") {
 
 } elseif($btn == "랜덤전부투입") {
     $grpIn = [];
-    
+
     foreach($db->queryAllLists('SELECT grp, count(*) FROM tournament WHERE 0 <= grp AND grp < 8 GROUP BY grp') as [$grpIdx, $cnt]){
         $grpIn[$grpIdx] = $cnt;
-        
+
     }
     $code = [];
     foreach(Util::range(8) as $grpIdx){
@@ -201,38 +201,38 @@ if($btn == "자동개최설정") {
 
     $gameStor->tournament = 2;
     $gameStor->phase = 0;
-} elseif($btn == "무명전부투입") { 
-    fillLowGenAll();
-} elseif($btn == "예선") { 
+} elseif($btn == "무명전부투입") {
+    fillLowGenAll($admin['tnmt_type']);
+} elseif($btn == "예선") {
     qualify($admin['tnmt_type'], $admin['tournament'], $admin['phase']);
-} elseif($btn == "예선전부") { 
+} elseif($btn == "예선전부") {
     qualifyAll($admin['tnmt_type'], $admin['tournament'], $admin['phase']);
-} elseif($btn == "추첨") { 
+} elseif($btn == "추첨") {
     selection($admin['tnmt_type'], $admin['tournament'], $admin['phase']);
-} elseif($btn == "추첨전부") { 
+} elseif($btn == "추첨전부") {
     selectionAll($admin['tnmt_type'], $admin['tournament'], $admin['phase']);
-} elseif($btn == "본선") { 
+} elseif($btn == "본선") {
     finallySingle($admin['tnmt_type'], $admin['tournament'], $admin['phase']);
-} elseif($btn == "본선전부") { 
+} elseif($btn == "본선전부") {
     finallyAll($admin['tnmt_type'], $admin['tournament'], $admin['phase']);
-} elseif($btn == "배정") { 
+} elseif($btn == "배정") {
     final16set();
 } elseif($btn == "베팅마감") {
     $dt = date("Y-m-d H:i:s", time() + 60);
     $gameStor->tournament=7;
     $gameStor->phase=0;
     $gameStor->tnmt_time = $dt;
-} elseif($btn == "16강") { 
+} elseif($btn == "16강") {
     finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 16);
-} elseif($btn == "8강") { 
+} elseif($btn == "8강") {
     finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 8);
-} elseif($btn == "4강") { 
+} elseif($btn == "4강") {
     finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 4);
-} elseif($btn == "결승") { 
+} elseif($btn == "결승") {
     finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 2);
-} elseif($btn == "포상") { 
+} elseif($btn == "포상") {
     setGift($admin['tnmt_type'], $admin['tournament'], $admin['phase']);
-} elseif($btn == "회수") { 
+} elseif($btn == "회수") {
     setRefund();
 } elseif($btn == "메시지") {
     $gameStor->tnmt_msg = $msg;

hwe/css/battle_simulator.css

@@ -6,12 +6,12 @@
 }
 
 .defender_add_form .general_detail{
-    display:none;
+    display:none !important;
 }
 
 
 .form_sample{
-    display:none;
+    display:none !important;
 }
 
 input[type=number]{

hwe/css/chiefCenter.css

@@ -11,7 +11,7 @@
     width:50px;
     color:white;
     background-color:black;
-    font-size:13px;
+    font-size:14px;
 }
 
 .chiefTurnIdx{
@@ -42,20 +42,20 @@
 }
 
 .chiefTurnBox .turnHeader{
-    font-weight: bold;
+    font-weight: 500;
     text-align: center;
 }
 
 .chiefNamePlate{
     border-top:solid 0.67px #888888;
-    font-weight: bold;
+    font-weight: 500;
     text-align: center;
     flex-grow: 1;
     line-height:21px;
 }
 
 .turnIdxHeader{
-    font-weight: bold;
+    font-weight: 500;
     text-align: center;
     width:20px;
 }
@@ -63,7 +63,7 @@
 .chiefTurnTime{
     border-top:solid 0.67px #888888;
     border-right:solid 0.67px #888888;
-    font-weight: bold;
+    font-weight: 500;
     background: black;
     text-align: center;
     width:44px;

hwe/css/common.css

@@ -1,36 +1,18 @@
-@charset "UTF-8";
-
-/* font-boostring Block */
-
 html * {
     max-height: 1000000px;
 }
 
 html,
 body {
+    font-family: 'Pretendard', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic';
     background-color: black;
     color: white;
     line-height: 1.3;
-    font-family: '맑은 고딕';
-    font-size: 13px;
-}
-
-table {
-    font-family: '맑은 고딕';
-}
-
-font {
-    font-family: '맑은 고딕';
+    font-size: 14px;
 }
 
 input {
-    font-family: '맑은 고딕';
-    font-size: 13px;
-}
-
-select {
-    font-family: '굴림';
-    line-height: 100%;
+    font-size: 14px;
 }
 
 .center {
@@ -53,9 +35,8 @@ table.mimic_flex {
 table.tb_layout {
     border-collapse: collapse;
     padding: 0px;
-    font-size: 13px;
+    font-size: 14px;
     word-break: break-all;
-    font-family: '맑은 고딕';
 }
 
 .tb_layout td,
@@ -63,8 +44,6 @@ table.tb_layout {
     border: solid 1px gray;
     padding: 0px;
     word-break: break-all;
-    font-family: '맑은 고딕';
-    ;
 }
 
 div.bar_out {
@@ -206,8 +185,7 @@ div.bar_out div.bar_in {
 }
 
 .tooltip {
-    font-size: 12px;
-    font-family: '맑은 고딕';
+    font-size: 12.5px;
 }
 
 .tooltip_copyable_info .tooltiptext {
@@ -249,11 +227,6 @@ div.bar_out div.bar_in {
     padding: 0;
 }
 
-.commandBasic {
-    background-color: black;
-    color: white;
-}
-
 .compensatePositive {
     color: skyblue;
 }
@@ -262,10 +235,6 @@ div.bar_out div.bar_in {
     color: orange;
 }
 
-.compensateNeutral {
-    color: white;
-}
-
 .commandBasic.commandImpossible {
     background-color: red;
     color: white;

hwe/css/hallOfFame.css

@@ -4,7 +4,7 @@
     width:1100px;
     margin:auto;
     position:relative;
-    font-size:13px;
+    font-size:14px;
 }
 
 .rankView h3{

hwe/css/install.css

@@ -1,2 +1,4 @@
-@charset "UTF-8";
 
+.form-group{
+    margin-bottom: 1em;
+}

hwe/css/main.css

@@ -1,100 +0,0 @@
-@charset "UTF-8";
-
-body { 
-color:white;
- background-color:black;
-  border-width:1px; 
-  border-color:gray; background-position:center; background-repeat:repeat-y; 
-}
-
-#container {
-    width:1000px;
-    margin: 0 auto;
-}
-
-.buttonPlate{
-    width:1000px;
-    height:60px;
-}
-
-.toolbarButton {
-    float:left;
-    background-color:#225500;
-    color:white;
-    width:125px;
-    height:30px;
-    font-weight:bold;
-    font-size:13px;
-    margin:0;
-    display:block;
-}
-
-.commandButton {
-    float:left;
-    width:100px;
-    height:30px;
-    font-weight:bold;
-    font-size:13px;
-    margin:0;
-    display:block;
-}
-
-.commandButton:disabled::before{
-    content:'【'
-}
-
-.commandButton:disabled::after{
-    content:'】'
-}
-
-.commandButton:disabled{
-    background-color:transparent !important;
-    color:gray !important;
-    border-color:transparent !important;
-}
-
-.toolbarButton2 {
-    float:left;
-    background-color:#225500;
-    color:magenta;
-    width:125px;
-    height:30px;
-    font-weight:bold;
-    font-size:13px;
-    margin:0;
-    display:block;
-}
-
-.nation_info td{
-    height:18px;
-}
-
-#generalTurnSelector{
-    width:50px;
-    color:white;
-    background-color:black;
-    font-size:13px;
-}
-
-#sidebar{
-    position:fixed;
-    right:0;
-    top: 50%;
-    transform: translateY(-50%);
-}
-
-#sidebar button{
-    /*width:100px;*/
-}
-
-.turn_pad{
-    white-space:nowrap;
-    font-weight:lighter;
-    max-width: 162px;
-    width: 162px;
-
-}
-
-.turn_pad .turn_text{
-    display:inline-block;
-}

hwe/css/map.css

@@ -3,8 +3,9 @@
 .world_map{
     width:700px;
     background:black;
-    font-size:13px;
+    font-size:14px;
     color:white;
+    position: relative;
 }
 
 .map_title{
@@ -25,7 +26,7 @@
     width:160px;
     display:block;
     line-height:20px;
-    font-size:13px;
+    font-size:14px;
     font-weight:bold;
 }
 
@@ -33,6 +34,7 @@
     width:700px;
     height:500px;
     position:relative;
+    overflow: hidden;
 }
 
 .map_body .map_bglayer1{
@@ -88,7 +90,7 @@
 
 .world_map .city_tooltip{
     position: absolute;
-    z-index:6;
+    z-index:16;
     display:none;
     min-width:120px;
     border: 0.02em gray solid;
@@ -99,7 +101,7 @@
     z-index: 6;
     line-height:15px;
     height:15px;
-    
+
 }
 .world_map .nation_name{
     background-color: rgb(30, 164, 255);
@@ -491,4 +493,9 @@
 
 .map_basic .city_base .city_state.city_state_good{
     background-color:blue;
+}
+
+.btn.btn-minimum{
+    padding-top: 1px;
+    padding-bottom: 1px;
 }

hwe/css/msg.css

@@ -1,202 +0,0 @@
-@charset "UTF-8";
-
-/*임시용 */
-
-#container{
-    width:1000px;
-    margin:auto;
-    font-size:13px;
-}
-/*임시용 끝*/
-
-#message_board{
-    height:1370px;
-    position:relative;
-}
-
-#message_board section{
-    overflow-y:auto;
-    overflow-x:hidden;
-}
-
-.msg_plate{
-    width:100%;
-    outline-style:solid;
-    outline-width:1px;
-    outline-color: gray;
-    min-height:64px;
-    font-size:12px;
-    word-break:break-all;
-    color:white;
-}
-
-.msg_plate_private{
-    background-color:#5d1e1a;
-}
-
-.msg_plate_private.msg_plate_dest{
-    background-color:#5d461a;
-}
-
-.msg_plate_public{
-    background-color:#141c65;
-
-}
-
-.msg_plate_national, .msg_plate_diplomacy{
-    background-color:#00582c;
-}
-
-.msg_plate_national.msg_plate_dest, .msg_plate_diplomacy.msg_plate_dest {
-    background-color:#704615;
-}
-
-.msg_plate_national.msg_plate_src, .msg_plate_diplomacy.msg_plate_src {
-    background-color:#70153b;
-}
-
-.public_message{
-    height:667px;
-}
-
-.diplomacy_message{
-    flex: 1;
-}
-
-.national_message{
-    height:667px;
-}
-
-.private_message{
-    flex: 1;
-}
-
-.msg_icon{
-    float:left;
-    width:64px;
-    height:64px;
-    border-right:solid 1px gray;
-}
-
-.msg_time{
-    font-size:0.75em;
-    font-weight:normal;
-}
-
-.msg_header{
-    font-weight: bold;
-    margin-bottom:3px;
-    color:white;
-    position: relative;
-}
-
-.message_input_form{
-    position:relative;
-}
-
-#msg_input{
-    color:white;
-    background-color:black;
-    font-size:12px;
-    width:715px;
-    margin:0 2px;
-    height:20px;
-    border:solid 1px gray;
-}
-
-#msg_submit{
-    position:absolute;
-    right:0;
-    margin-right:2px;
-}
-
-#mailbox_list{
-    float:left;
-    color:white;
-    background-color:black;
-    font-size:12px;
-    width:160px;
-    height:20px;
-}
-
-.board_header{
-    color:white;
-    outline-style:solid;
-    outline-width:1px;
-    outline-color: gray;
-}
-
-.board_side{
-    position:absolute;
-    height:1370px;
-    width:50%;
-    overflow-y: hidden;
-    outline-style:solid;
-    outline-width:1px;
-    outline-color: gray;
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: column;
-}
-.board_side > div{
-    height: 1.2em;
-}
-
-.msg_invalid{
-    color:rgba(255,255,255,0.5);
-}
-
-.msg_body{
-    padding-left:64px;
-}
-
-.msg_target{
-    margin:2px 2px 0 2px;
-    padding:2px 3px;
-    display:inline-block;
-    box-shadow: 2px 2px black;
-    border-radius: 3px;
-}
-
-.btn-delete-msg{
-    position: absolute;
-    right: 0;
-    top: 0;
-    margin:2px 2px 0 2px;
-    font-size:8px;
-}
-
-/*
-.public_message .msg_target{
-    box-shadow: 2px 2px darkslategrey;
-}
-*/
-
-.msg_target.msg_bright{
-    color:black;
-}
-
-.msg_target.msg_dark{
-    color:white;
-}
-
-.msg_from_to{
-    display:inline-block;
-}
-
-.msg_content{
-    margin-left:10px;
-    margin-right:5px;
-    overflow:hidden;
-}
-
-.msg_prompt{
-    text-align:right;
-    margin-top:5px;
-    margin-right:5px;
-}
-
-#mailbox_list option{
-    color:white;
-    background-color:black;
-}

hwe/d_setting/templates/allButton.php.orig

@@ -1,22 +1,18 @@
-<div class="buttonPlate bg1">
-    <div>
-        <a href="a_status.php" target="_blank"><button class="toolbarButton">세력도</button></a>
-        <a href="a_kingdomList.php" target="_blank"><button class="toolbarButton">세력일람</button></a>
-        <a href="a_genList.php" target="_blank"><button class="toolbarButton">장수일람</button></a>
-        <a href="a_bestGeneral.php" target="_blank"><button class="toolbarButton">명장일람</button></a>
-        <a href="a_history.php" target="_blank"><button class="toolbarButton">연감</button></a>
-        <a href="a_hallOfFame.php" target="_blank"><button class="toolbarButton">명예의전당</button></a>
-        <a href="a_emperior.php" target="_blank"><button class="toolbarButton">왕조일람</button></a>
-        <a href="a_traffic.php" target="_blank"><button class="toolbarButton">접속량정보</button></a>
-    </div>
-    <div>
-        <a href="/bbs/board" target="_blank"><button class="toolbarButton2">삼모게시판</button></a>
-        <a href="/bbs/tip" target="_blank"><button class="toolbarButton">팁/강좌</button></a>
-        <a href="/bbs/news" target="_blank"><button class="toolbarButton">삼국 일보</button></a>
-        <a href="/bbs/history2" target="_blank"><button class="toolbarButton">개인 열전</button></a>
-        <a href="/bbs/history3" target="_blank"><button class="toolbarButton">국가 열전</button></a>
-        <a href="/bbs/patch" target="_blank"><button class="toolbarButton">패치 내역</button></a>
-        <a href="../i_other/help.php" target="_blank"><button class="toolbarButton">튜토리얼</button></a>
-        <a href="<?=$site?>" target="_blank"><button class="toolbarButton"><?=$call?></button></a>
-    </div>
+<div class="buttonPlate">
+        <a href="a_status.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">세력도</button></a>
+        <a href="a_kingdomList.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">세력일람</button></a>
+        <a href="a_genList.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">장수일람</button></a>
+        <a href="a_bestGeneral.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">명장일람</button></a>
+        <a href="a_history.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">연감</button></a>
+        <a href="a_hallOfFame.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">명예의전당</button></a>
+        <a href="a_emperior.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">왕조일람</button></a>
+        <a href="a_traffic.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">접속량정보</button></a>
+        <a href="/bbs/board" target="_blank"><button type="button" class="toolbarButton2">삼모게시판</button></a>
+        <a href="/bbs/tip" target="_blank"><button type="button" class="toolbarButton">팁/강좌</button></a>
+        <a href="/bbs/news" target="_blank"><button type="button" class="toolbarButton">삼국 일보</button></a>
+        <a href="/bbs/history2" target="_blank"><button type="button" class="toolbarButton">개인 열전</button></a>
+        <a href="/bbs/history3" target="_blank"><button type="button" class="toolbarButton">국가 열전</button></a>
+        <a href="/bbs/patch" target="_blank"><button type="button" class="toolbarButton">패치 내역</button></a>
+        <a href="battle_simulator.php" target="_blank"><button type="button" class="toolbarButton">전투 시뮬레이터</button></a>
+        <a href="<?=$site?>" target="_blank" class="open-window"><button type="button" class="toolbarButton"><?=$call?></button></a>
 </div>

hwe/func.php

@@ -218,9 +218,9 @@ function myNationInfo(General $generalObj)
         <td colspan=4 ";
 
     if (!$nationID) {
-        echo "style='color:white;background-color:000000;font-weight:bold;font-size:13px;text-align:center;'>【재 야】";
+        echo "style='color:white;background-color:000000;font-weight:bold;font-size:14px;text-align:center;'>【재 야】";
     } else {
-        echo "style='color:" . newColor($nation['color']) . ";background-color:{$nation['color']};font-weight:bold;font-size:13px;text-align:center'>국가【 {$nation['name']} 】";
+        echo "style='color:" . newColor($nation['color']) . ";background-color:{$nation['color']};font-weight:bold;font-size:14px;text-align:center'>국가【 {$nation['name']} 】";
     }
 
     echo "
@@ -461,6 +461,40 @@ function commandGroup($typename, $type = 0)
     }
 }
 
+function getCommandTable(General $general)
+{
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $gameStor->turnOnCache();
+    $env = $gameStor->getAll();
+
+    $result = [];
+    foreach (GameConst::$availableGeneralCommand as $commandCategory => $commandList) {
+        $subList = [];
+        foreach ($commandList as $commandClassName) {
+            $commandObj = buildGeneralCommandClass($commandClassName, $general, $env);
+            if (!$commandObj->canDisplay()) {
+                continue;
+            }
+            $subList[] = [
+                'value' => Util::getClassNameFromObj($commandObj),
+                'compensation' => $commandObj->getCompensationStyle(),
+                'possible' => $commandObj->hasMinConditionMet(),
+                'title' => $commandObj->getCommandDetailTitle(),
+                'simpleName' => $commandObj->getName(),
+                'reqArg' => $commandObj::$reqArg,
+            ];
+        }
+
+        $result[] = [
+            'category' => $commandCategory,
+            'values' => $subList
+        ];
+    }
+
+    return $result;
+}
+
 function printCommandTable(General $generalObj)
 {
     $db = DB::db();
@@ -519,7 +553,7 @@ function chiefCommandTable(General $generalObj)
     $env = $gameStor->getAll();
 
 ?>
-    <select id='chiefCommandList' name='commandtype' size=1 style='height:20px;color:white;background-color:black;font-size:13px;display:inline-block;'>";
+    <select id='chiefCommandList' name='commandtype' size=1 style='height:20px;color:white;background-color:black;font-size:14px;display:inline-block;'>";
         <?php
 
         //보정(Pros,Cons) 여부.
@@ -686,7 +720,7 @@ function generalInfo(General $generalObj)
     echo "<table width=498 class='tb_layout bg2'>
     <tr>
         <td width=64 height=64 rowspan=3 class='generalIcon' style='text-align:center;background:no-repeat center url(\"{$imagePath}\");background-size:64px;'>&nbsp;</td>
-        <td colspan=9 height=16 style=text-align:center;color:" . newColor($nation['color']) . ";background-color:{$nation['color']};font-weight:bold;font-size:13px;>{$generalObj->getName()} 【 {$officerLevelText} | {$call} | {$color}{$injury}</span> 】 " . $generalObj->getTurnTime($generalObj::TURNTIME_HMS) . "</td>
+        <td colspan=9 height=16 style=text-align:center;color:" . newColor($nation['color']) . ";background-color:{$nation['color']};font-weight:bold;font-size:14px;>{$generalObj->getName()} 【 {$officerLevelText} | {$call} | {$color}{$injury}</span> 】 " . $generalObj->getTurnTime($generalObj::TURNTIME_HMS) . "</td>
     </tr>
     <tr height=16>
         <td style='text-align:center;' class='bg1'><b>통솔</b></td>
@@ -848,7 +882,7 @@ function generalInfo2(General $generalObj)
         <td style='text-align:center;'>{$generalObj->getRankVar('deathcrew')}</td>
     </tr>
 </table>
-<table width=498 class='tb_layout bg2'>
+<table width=498 class='tb_layout bg2 f_tnum'>
     <tr><td style='text-align:center;' colspan=4 class='bg1'><b>숙 련 도</b></td></tr>
     <tr height=16>
         <td width=64 style='text-align:center;' class='bg1'><b>보병</b></td>
@@ -1348,17 +1382,29 @@ function triggerTournament()
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    $admin = $gameStor->getValues(['tournament', 'tnmt_trig']);
+    [$tournament, $tnmt_trig, $tnmt_pattern] = $gameStor->getValuesAsArray(['tournament', 'tnmt_trig', 'tnmt_pattern']);
 
     //현재 토너먼트 없고, 자동개시 걸려있을때, 40%확률
-    if ($admin['tournament'] == 0 && $admin['tnmt_trig'] > 0 && rand() % 100 < 40) {
-        $type = rand() % 5; //  0 : 전력전, 1 : 통솔전, 2 : 일기토, 3 : 설전
-        //전력전 40%, 통, 일, 설 각 20%
-        if ($type > 3) {
-            $type = 0;
-        }
-        startTournament($admin['tnmt_trig'], $type);
+    if ($tournament != 0) {
+        return;
     }
+    if ($tnmt_trig == 0) {
+        return;
+    }
+    if (!Util::randBool(0.4)) {
+        return;
+    }
+
+    if (!$tnmt_pattern) {
+        // 0 : 전력전, 1 : 통솔전, 2 : 일기토, 3 : 설전
+        //전력전 40%, 통, 일, 설 각 20%
+        $tnmt_pattern = [0, 0, 1, 2, 3];
+        shuffle($tnmt_pattern);
+    }
+
+    $tnmt_type = array_pop($tnmt_pattern);
+    $gameStor->setValue('tnmt_pattern', $tnmt_pattern);
+    startTournament($tnmt_trig, $tnmt_type);
 }
 
 function CheckHall($no)
@@ -1603,8 +1649,18 @@ function giveRandomUniqueItem(General $general, string $acquireType): bool
         return false;
     }
 
+
+
     if ($general->getAuxVar('inheritRandomUnique')) {
-        $general->setAuxVar('inheritRandomUnique', null);
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        [$year, $month, $initYear, $initMonth] = $gameStor->getValuesAsArray(['year', 'month', 'init_year', 'init_month']);
+
+        $relMonthByInit = Util::joinYearMonth($year, $month) - Util::joinYearMonth($initYear, $initMonth);
+        $availableBuyUnique = $relMonthByInit >= GameConst::$minMonthToAllowInheritItem;
+
+        if($availableBuyUnique){
+            $general->setAuxVar('inheritRandomUnique', null);
+        }
     }
 
     [$itemType, $itemCode] = Util::choiceRandomUsingWeightPair($availableUnique);
@@ -1640,7 +1696,7 @@ function rollbackInheritUniqueTrial(General $general, string $itemKey, string $r
     $itemTrials = $general->getAuxVar('inheritUniqueTrial');
     LogText("선택유니크 롤백:{$ownerID}", [$itemKey, $itemTrials]);
     unset($itemTrials[$itemKey]);
-    if(count($itemTrials) == 0){
+    if (count($itemTrials) == 0) {
         $itemTrials = null;
     }
     $general->setAuxVar('inheritUniqueTrial', $itemTrials);
@@ -1840,21 +1896,30 @@ function tryUniqueItemLottery(General $general, string $acquireType = '아이템
         return false;
     }
 
-    $inheritUnique = $general->getAuxVar('inheritUniqueTrial');
-    if ($acquireType != '설문조사' && $inheritUnique && count($inheritUnique)) {
-        LogText("유니크 준비?? {$general->getID()}", $inheritUnique);
-        $trialResult = tryInheritUniqueItem($general, $acquireType);
-        if ($trialResult) {
-            return true;
+    $itemTypeCnt = count(GameConst::$allItems);
+
+
+    [$startYear, $year, $month, $initYear, $initMonth] = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'init_year', 'init_month']);
+    $relYear = $year - $startYear;
+    $maxTrialCountByYear = 1;
+    foreach (GameConst::$maxUniqueItemLimit as $tmpVals) {
+        [$targetYear, $targetTrialCnt] = $tmpVals;
+        if ($relYear < $targetYear) {
+            break;
         }
+        $maxTrialCountByYear = $targetTrialCnt;
     }
 
-    $itemTypeCnt = count(GameConst::$allItems);
-    $trialCnt = $itemTypeCnt;
+    $trialCnt = Util::valueFit($itemTypeCnt, null, $maxTrialCountByYear);
+    $maxCnt = $itemTypeCnt;
+
+    $relMonthByInit = Util::joinYearMonth($year, $month) - Util::joinYearMonth($initYear, $initMonth);
+    $availableBuyUnique = $relMonthByInit >= GameConst::$minMonthToAllowInheritItem;
 
     foreach ($general->getItems() as $item) {
         if (!$item->isBuyable()) {
             $trialCnt -= 1;
+            $maxCnt -= 1;
         }
     }
 
@@ -1866,10 +1931,17 @@ function tryUniqueItemLottery(General $general, string $acquireType = '아이템
             $userLogger = new UserLogger($general->getVar('owner'));
             $userLogger->push(sprintf("유니크를 얻을 공간이 없어 %d 포인트 반환", GameConst::$inheritItemRandomPoint), "inheritPoint");
         }
+        tryRollbackInheritUniqueItem($general);
         return false;
     }
 
-
+    $inheritUnique = $general->getAuxVar('inheritUniqueTrial');
+    if ($acquireType != '설문조사' && $inheritUnique && count($inheritUnique) && $availableBuyUnique) {
+        $trialResult = tryInheritUniqueItem($general, $acquireType);
+        if ($trialResult) {
+            return true;
+        }
+    }
 
     $scenario = $gameStor->scenario;
     $genCount = $db->queryFirstField('SELECT count(*) FROM general WHERE npc<2');
@@ -1894,12 +1966,12 @@ function tryUniqueItemLottery(General $general, string $acquireType = '아이템
     $prob /= sqrt(2);
     $moreProb = pow(2, 1 / 4);
 
-    if ($general->getAuxVar('inheritRandomUnique')) {
+    if ($general->getAuxVar('inheritRandomUnique') && $availableBuyUnique) {
         //포인트로 랜덤 유니크 획득
         $prob = 1;
     }
 
-    foreach (Util::range($trialCnt) as $_idx) {
+    foreach (Util::range($maxCnt) as $_idx) {
         if (Util::randBool($prob)) {
             $result = true;
             break;
@@ -1907,10 +1979,10 @@ function tryUniqueItemLottery(General $general, string $acquireType = '아이템
         $prob *= $moreProb;
     }
     if (!$result) {
-        LogText("{$general->getName()}, {$general->getID()} 유니크 실패 {$trialCnt}", $prob);
+        LogText("{$general->getName()}, {$general->getID()} 유니크 실패 {$maxCnt}", $prob);
         return false;
     }
-    LogText("{$general->getName()}, {$general->getID()} 유니크 성공 {$trialCnt}", $prob);
+    LogText("{$general->getName()}, {$general->getID()} 유니크 성공 {$maxCnt}", $prob);
 
     return giveRandomUniqueItem($general, $acquireType);
 }

hwe/func_command.php

@@ -63,7 +63,7 @@ function pullGeneralCommand(int $generalID, int $turnCnt=1){
     if($turnCnt >= GameConst::$maxTurn){
         return;
     }
-    
+
     $db = DB::db();
 
     $db->update('general_turn', [
@@ -96,7 +96,7 @@ function repeatGeneralCommand(int $generalId, int $turnCnt){
     foreach($turnList as $turnItem){
         $turnIdx = $turnItem['turn_idx'];
         $turnTarget = iterator_to_array(Util::range($turnIdx+$turnCnt, GameConst::$maxTurn, $turnCnt));
-        
+
         $db->update('general_turn', [
             'action'=>$turnItem['action'],
             'arg'=>$turnItem['arg'],
@@ -116,7 +116,7 @@ function pushNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
         return;
     }
     if($turnCnt < 0){
-        pullNationCommand($nationID, $officerLevel, -$turnCnt);   
+        pullNationCommand($nationID, $officerLevel, -$turnCnt);
         return;
     }
     if($turnCnt >= GameConst::$maxChiefTurn){
@@ -153,7 +153,7 @@ function pullNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
     if($turnCnt >= GameConst::$maxChiefTurn){
         return;
     }
-    
+
     $db = DB::db();
 
     $db->update('nation_turn', [
@@ -269,7 +269,7 @@ function checkCommandArg(?array $arg):?string{
 }
 
 function setGeneralCommand(int $generalID, array $rawTurnList, string $command, ?array $arg = null):array{
-    
+
     $turnList = [];
     foreach($rawTurnList as $turnIdx){
         if(!is_int($turnIdx) || $turnIdx < -3 || $turnIdx >= GameConst::$maxTurn){

hwe/func_converter.php

@@ -357,31 +357,6 @@ function buildNationCommandClass(?string $type, General $generalObj, array $env,
     return new $class($generalObj, $env, $lastTurn, $arg);
 }
 
-function getAPIExecutorClass($path){
-
-    static $basePath = __NAMESPACE__.'\\API\\';
-    if(is_string($path)){
-    }
-    else if(is_array($path)){
-        $path = join('\\', $path);
-    }
-    else{
-        throw new \InvalidArgumentException("{$path}는 올바른 API 지시자가 아님");
-    }
-
-    $classPath = str_replace('/', '\\', $basePath.$path);
-
-    if(class_exists($classPath)){
-        return $classPath;
-    }
-    throw new \InvalidArgumentException("{$path}는 올바른 API 경로가 아님");
-}
-
-function buildAPIExecutorClass($type, string $rootPath, array $args):\sammo\BaseAPI{
-    $class = getAPIExecutorClass($type);
-    return new $class($rootPath, $args);
-}
-
 function getWarUnitTriggerClass(string $type){
     static $basePath = __NAMESPACE__.'\\WarUnitTrigger\\';
     $classPath = ($basePath.$type);

hwe/func_gamerule.php

@@ -167,14 +167,15 @@ function checkSupply()
     }
 }
 
-function updateGeneralNumber(){
+function updateGeneralNumber()
+{
     $db = DB::db();
-    foreach($db->queryAllLists('SELECT nation, count(*) FROM general WHERE npc != 5 GROUP BY nation') as [$nationID, $gennum]){
-        if($nationID === 0){
+    foreach ($db->queryAllLists('SELECT nation, count(*) FROM general WHERE npc != 5 GROUP BY nation') as [$nationID, $gennum]) {
+        if ($nationID === 0) {
             continue;
         }
         $db->update('nation', [
-            'gennum'=>$gennum
+            'gennum' => $gennum
         ], 'nation=%i', $nationID);
     }
     refreshNationStaticInfo();
@@ -370,7 +371,11 @@ function postUpdateMonthly()
                 sum(pop)*sum(pop+agri+comm+secu+wall+def)/sum(pop_max+agri_max+comm_max+secu_max+wall_max+def_max)/100
             ) from city where nation=A.nation and supply=1
         ))
-        +(select sum(leadership+strength+intel) from general where nation=A.nation)
+        +(select SUM((ra.value + 1000)/(rb.value + 1000)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)*2 + (SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/2)
+                FROM general AS g
+                LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = \'killcrew_person\'
+                LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = \'deathcrew_person\'
+                WHERE g.nation = A.nation)
         +(select round(sum(dex1+dex2+dex3+dex4+dex5)/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)
@@ -386,7 +391,7 @@ function postUpdateMonthly()
         $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
         $genNum[$nationID] = $nation['gennum'];
 
-        $powerValues = $maxPowerValues[$nationID]??[];
+        $powerValues = $maxPowerValues[$nationID] ?? [];
 
         //약간의 랜덤치 부여 (95% ~ 105%)
 
@@ -405,7 +410,7 @@ function postUpdateMonthly()
     }
 
     // 전쟁기한 세팅
-    foreach($db->query('SELECT me, you, dead, term FROM diplomacy WHERE state = 0') as $dip) {
+    foreach ($db->query('SELECT me, you, dead, term FROM diplomacy WHERE state = 0') as $dip) {
         $genCount = $genNum[$dip['me']];
         // 25% 참여율일때 두당 10턴에 4000명 소모한다고 계산
         // 4000 / 10 * 0.25 = 100
@@ -420,7 +425,7 @@ function postUpdateMonthly()
     }
 
     //개전국 로그
-    foreach($db->query('SELECT me, you FROM diplomacy WHERE state = 1 AND term <= 1 AND me < you') as $dip){
+    foreach ($db->query('SELECT me, you FROM diplomacy WHERE state = 1 AND term <= 1 AND me < you') as $dip) {
         $nation1 = getNationStaticInfo($dip['me']);
         $name1 = $nation1['name'];
         $nation2 = getNationStaticInfo($dip['you']);
@@ -432,14 +437,13 @@ function postUpdateMonthly()
     }
     //휴전국 로그
     $stopWarList = [];
-    foreach($db->queryAllLists('SELECT me,you FROM diplomacy WHERE state=0 AND term <= 1 ORDER BY me desc, you desc') as [$me, $you]){
-        if($me < $you){
+    foreach ($db->queryAllLists('SELECT me,you FROM diplomacy WHERE state=0 AND term <= 1 ORDER BY me desc, you desc') as [$me, $you]) {
+        if ($me < $you) {
             $key = "{$me}_{$you}";
-        }
-        else{
+        } else {
             $key = "{$you}_{$me}";
         }
-        if(!key_exists($key, $stopWarList)){
+        if (!key_exists($key, $stopWarList)) {
             $stopWarList[$key] = true;
             continue;
         }
@@ -455,8 +459,8 @@ function postUpdateMonthly()
 
         $globalLogger->pushGlobalHistoryLog("<R><b>【휴전】</b></><D><b>$name1</b></>{$josaWa} <D><b>$name2</b></>{$josaYi} <S>휴전</>합니다.");
         $db->update('diplomacy', [
-            'state'=>2,
-            'term'=>0,
+            'state' => 2,
+            'term' => 0,
         ], '(me=%i AND you=%i) OR (you=%i AND me=%i)', $me, $you, $me, $you);
     }
 
@@ -464,19 +468,34 @@ function postUpdateMonthly()
 
     //사상자 초기화, 외교 기한-1
     $db->update('diplomacy', [
-        'dead'=>$db->sqleval('if(state!=0, 0, dead)'),
-        'term'=>$db->sqleval('greatest(0, term-1)'),
+        'dead' => $db->sqleval('if(state!=0, 0, dead)'),
+        'term' => $db->sqleval('greatest(0, term-1)'),
     ], true);
     //불가침 끝나면 통상으로
     $db->update('diplomacy', [
-        'state'=>2,
+        'state' => 2,
     ], 'state = 7 AND term = 0');
     //선포 끝나면 교전으로
     $db->update('diplomacy', [
-        'state'=>0,
-        'term'=>6,
+        'state' => 0,
+        'term' => 6,
     ], 'state = 1 AND term = 0');
 
+    $availableWarSettingCnt = KVStorage::getValuesFromInterNamespace($db, 'nation_env', 'available_war_setting_cnt');
+    foreach ($nations as $nation) {
+        $nationID = $nation['nation'];
+        if(!key_exists($nationID, $availableWarSettingCnt)){
+            $availableWarSettingCnt[$nationID] = 0;
+        }
+    }
+    foreach($availableWarSettingCnt as $nationID=>$cnt){
+        if($cnt >= GameConst::$maxAvailableWarSettingCnt){
+            continue;
+        }
+        $cnt = Util::valueFit($cnt + GameConst::$incAvailableWarSettingCnt, 0, GameConst::$maxAvailableWarSettingCnt);
+        (KVStorage::getStorage($db, $nationID, 'nation_env'))->setValue('available_war_setting_cnt', $cnt);
+    }
+
     //초반이후 방랑군 자동 해체
     if ($admin['year'] >= $admin['startyear'] + 2) {
         checkWander();
@@ -567,8 +586,8 @@ function updateNationState()
 
             $updateVals = [
                 'level' => $nationlevel,
-                'gold'=>$db->sqleval('gold + %i', $nationlevel*1000),
-                'rice'=>$db->sqleval('rice + %i', $nationlevel*1000),
+                'gold' => $db->sqleval('gold + %i', $nationlevel * 1000),
+                'rice' => $db->sqleval('rice + %i', $nationlevel * 1000),
             ];
 
             switch ($nationlevel) {
@@ -624,14 +643,25 @@ function updateNationState()
                     $targetKillTurn
                 );
                 $nationGenList = General::createGeneralObjListFromDB($nationGenIDList, ['belong', 'npc', 'aux'], 2);
-                $chiefObj = null;
+                $chiefID = null;
 
                 $uniqueLotteryWeightList = [];
+
+                [$startYear, $year] = $gameStor->getValuesAsArray(['startyear', 'year']);
+                $relYear = $year - $startYear;
+                $maxTrialCountByYear = 1;
+                foreach (GameConst::$maxUniqueItemLimit as $tmpVals) {
+                    [$targetYear, $targetTrialCnt] = $tmpVals;
+                    if ($relYear < $targetYear) {
+                        break;
+                    }
+                    $maxTrialCountByYear = $targetTrialCnt;
+                }
                 foreach ($nationGenList as $nationGen) {
                     if ($nationGen->getVar('officer_level') == 12) {
-                        $chiefObj = $nationGen;
+                        $chiefID = $nationGen->getID();
                     }
-                    $trialCnt = count(GameConst::$allItems);
+                    $trialCnt = min($maxTrialCountByYear, count(GameConst::$allItems));
 
                     foreach ($nationGen->getItems() as $item) {
                         if (!$item->isBuyable()) {
@@ -670,8 +700,10 @@ function updateNationState()
                     $winnerObj->applyDB($db);
                 }
 
-                if($chiefObj){
+                if ($chiefID) {
+                    $chiefObj = General::createGeneralObjFromDB($chiefID, ['belong', 'npc', 'aux'], 2);
                     $chiefObj->increaseInheritancePoint('unifier', 250 * $levelDiff);
+                    $chiefObj->applyDB($db);
                 }
             }
         }
@@ -699,9 +731,9 @@ function updateNationState()
                     $nation['nation']
                 );
                 $npcObj->setAffinity(999)->setStat(10, 10, 10)
-                ->setSpecialSingle('척사')->setEgo('che_은둔')
-                ->setKillturn(70)->setGoldRice(0, 0)
-                ->setNPCType(5)->fillRemainSpecAsZero($admin);
+                    ->setSpecialSingle('척사')->setEgo('che_은둔')
+                    ->setKillturn(70)->setGoldRice(0, 0)
+                    ->setNPCType(5)->fillRemainSpecAsZero($admin);
                 $npcObj->build($admin);
                 $npcID = $npcObj->getGeneralID();
 
@@ -990,13 +1022,15 @@ function checkEmperior()
     $nationLogger = new ActionLogger(0, $nationID, $admin['year'], $admin['month']);
     $nationLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>{$josaYi} 전토를 통일");
 
-    foreach(General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
-        if($genObj->getNationID() == $nationID){
-            if($genObj->getVar('officer_level') > 4){
+    foreach (General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2')) as $genObj) {
+        if ($genObj->getNationID() == $nationID) {
+            if ($genObj->getVar('officer_level') > 4) {
                 $genObj->increaseInheritancePoint('unifier', 2000);
             };
         }
-        $genObj->mergeTotalInheritancePoint();
+        $genObj->mergeTotalInheritancePoint(true);
+        applyInheritanceUser($genObj->getVar('owner'));
+        $genObj->clearInheritancePoint();
     }
 
     $gameStor->isunited = 2;
@@ -1008,7 +1042,7 @@ function checkEmperior()
 
     [$totalPop, $totalMaxPop] = $db->queryFirstList('SELECT SUM(pop), SUM(pop_max) FROM city');
     $pop = "{$totalPop} / {$totalMaxPop}";
-    $poprate = round($totalPop / $totalMaxPop * 100, 2). " %";
+    $poprate = round($totalPop / $totalMaxPop * 100, 2) . " %";
 
     $chiefs = Util::convertArrayToDict(
         $db->query(
@@ -1150,29 +1184,32 @@ function checkEmperior()
     LogHistory();
 }
 
-function resetInheritanceUser(int $userID, bool $isRebirth=false):float{
+function applyInheritanceUser(int $userID, bool $isRebirth = false): float
+{
+    //FIXME: 은퇴, 사망, 천통 시점에 바로 반영한다면 여기가 아니라 general class로 이동하는 것이 옳음
+    //또한 굳이 merge, apply, clean 3단계를 거쳐야 할 이유도 없음
     $rebirthDegraded = [
-        'dex'=>0.5,
+        'dex' => 0.5,
     ];
 
     $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$userID}");
     $totalPoint = 0;
     $allPoints = $inheritStor->getAll();
-    if(!$allPoints || count($allPoints) == 0){
+    if (!$allPoints || count($allPoints) == 0) {
         //비었으므로 리셋 안함
         return 0;
     }
-    if(count($allPoints) == 1 && key_exists('previous', $allPoints)){
+    if (count($allPoints) == 1 && key_exists('previous', $allPoints)) {
         //이미 리셋되었으므로 리셋 안함
         return $allPoints['previous'][0];
     }
 
     $userLogger = new UserLogger($userID);
 
-    $previousPoint = ($allPoints['previous']??[0,0])[0];
+    $previousPoint = ($allPoints['previous'] ?? [0, 0])[0];
 
-    foreach($allPoints as $key=>[$value,]){
-        if($isRebirth && key_exists($key, $rebirthDegraded)){
+    foreach ($allPoints as $key => [$value,]) {
+        if ($isRebirth && key_exists($key, $rebirthDegraded)) {
             $value *= $rebirthDegraded[$key];
         }
         $keyText = General::INHERITANCE_KEY[$key][2];
@@ -1188,13 +1225,14 @@ function resetInheritanceUser(int $userID, bool $isRebirth=false):float{
     return $totalPoint;
 }
 
-function updateMaxDomesticCritical(General $general, $score){
-    $maxDomesticCritical = $general->getAuxVar('max_domestic_critical')??0;
+function updateMaxDomesticCritical(General $general, $score)
+{
+    $maxDomesticCritical = $general->getAuxVar('max_domestic_critical') ?? 0;
     $maxDomesticCritical += $score / 2;
     $general->setAuxVar('max_domestic_critical', $maxDomesticCritical);
 
     $oldMaxDomesticCritical = $general->getInheritancePoint('max_domestic_critical');
-    if($maxDomesticCritical > $oldMaxDomesticCritical){
+    if ($maxDomesticCritical > $oldMaxDomesticCritical) {
         $general->setInheritancePoint('max_domestic_critical', $maxDomesticCritical);
     }
-}
+}

hwe/func_history.php

@@ -77,12 +77,6 @@ function pushProcessLog($log) {
     pushRawFileLog(__DIR__."/logs/".UniqueConst::$serverID."/_{$date}_processlog.txt", $log);
 }
 
-
-function pushStepLog($log) {
-    $date = date('Y_m_d');
-    pushRawFileLog(__DIR__."/logs/".UniqueConst::$serverID."/_{$date}_steplog.txt", $log);
-}
-
 function pushLockLog($log) {
     $date = date('Y_m_d');
     pushRawFileLog(__DIR__."/logs/".UniqueConst::$serverID."/_{$date}_locklog.txt", $log);
@@ -105,15 +99,15 @@ function formatHistoryToHTML(array $history, ?string $type=null):string{
     $result = [];
     if($type){
         foreach($history as $seq=>$item){
-            $result[] = "<div class='log_{$type}' id='log_{$type}_{$seq}' data-seq='{$seq}'>".ConvertLog($item).'</div>';        
+            $result[] = "<div class='log_{$type}' id='log_{$type}_{$seq}' data-seq='{$seq}'>".ConvertLog($item).'</div>';
         }
     }
     else{
         foreach($history as $seq=>$item){
-            $result[] = '<div>'.ConvertLog($item).'</div>';        
+            $result[] = '<div>'.ConvertLog($item).'</div>';
         }
     }
-    
+
     return join('', $result);
 }
 
@@ -242,7 +236,7 @@ function pushGeneralHistoryLog(int $generalID, ?array $history, $year=null, $mon
         return;
     }
     $db = DB::db();
-    
+
     if($year === null || $month === null){
         $gameStor = KVStorage::getStorage($db, 'game_env');
         list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
@@ -278,7 +272,7 @@ function pushNationHistoryLog(int $nationID, ?array $history, ?int $year=null, ?
         return;
     }
     $db = DB::db();
-    
+
     if($year === null || $month === null){
         $gameStor = KVStorage::getStorage($db, 'game_env');
         list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
@@ -304,7 +298,7 @@ function pushGlobalHistoryLog(?array $history, $year=null, $month=null) {
         return;
     }
     $db = DB::db();
-    
+
     if($year === null || $month === null){
         $gameStor = KVStorage::getStorage($db, 'game_env');
         list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
@@ -325,8 +319,8 @@ function getGlobalHistoryLogWithDate(int $year, int $month):array {
     $db = DB::db();
 
     $texts = $db->queryFirstColumn(
-        'SELECT `text` from world_history where nation_id = 0 AND year = %i and month = %i order by id desc', 
-        $year, 
+        'SELECT `text` from world_history where nation_id = 0 AND year = %i and month = %i order by id desc',
+        $year,
         $month
     );
 
@@ -342,7 +336,7 @@ function pushGlobalActionLog(?array $history, ?int $year=null, ?int $month=null)
         return;
     }
     $db = DB::db();
-    
+
     if($year === null || $month === null){
         $gameStor = KVStorage::getStorage($db, 'game_env');
         list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
@@ -366,8 +360,8 @@ function getGlobalActionLogWithDate(int $year, int $month):array {
     $db = DB::db();
 
     $texts = $db->queryFirstColumn(
-        'SELECT `text` from general_record where general_id = 0 AND log_type = "history" AND year = %i and month = %i order by id desc', 
-        $year, 
+        'SELECT `text` from general_record where general_id = 0 AND log_type = "history" AND year = %i and month = %i order by id desc',
+        $year,
         $month
     );
 
@@ -378,8 +372,6 @@ function getGlobalActionLogWithDate(int $year, int $month):array {
 }
 
 function LogHistory($isFirst=0) {
-    if(STEP_LOG) pushStepLog(TimeUtil::now().', LogHistory Start');
-
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $obj = $gameStor->getValues(['startyear', 'year', 'month']);
@@ -401,16 +393,16 @@ function LogHistory($isFirst=0) {
         if($map['month'] == 0){
             $map['month'] = 12;
             $map['year'] -= 1;
-        }       
+        }
     }
 
     $year = $map['year'];
     $month = $map['month'];
 
-    
+
     $globalHistory = getGlobalHistoryLogWithDate($year, $month);
     $globalAction = getGlobalActionLogWithDate($year, $month);
-    
+
     $nations = getAllNationStaticInfo();
     $nations[0] = getNationStaticInfo(0);
 
@@ -426,8 +418,6 @@ function LogHistory($isFirst=0) {
         return -($lhs['power']<=>$rhs['power']);
     });
 
-    if(STEP_LOG) pushStepLog(TimeUtil::now().', contents collected');
-    
     $db->insert('ng_history', [
         'server_id' => UniqueConst::$serverID,
         'year' => $year,
@@ -438,6 +428,5 @@ function LogHistory($isFirst=0) {
         'nations' => Json::encode($nations),
     ]);
 
-    if(STEP_LOG) pushStepLog(TimeUtil::now().', LogHistory Finish');
     return true;
 }

hwe/func_legacy.php

@@ -1,67 +1,83 @@
 <?php
+
 namespace sammo;
 
-function printLimitMsg($turntime) {
+function printLimitMsg($turntime)
+{
     //FIXME: template로 이동.
 ?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>접속제한</title>
-<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>
-<body>
-<font size=4><b>
-접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 접속 가능 시각 : <?=$turntime?>)<br>
-(자신의 턴이 되면 다시 접속 가능합니다. 당신의 건강을 위해 잠시 쉬어보시는 것은 어떨까요? ^^)<br>
-</b></font>
-</body>
-</html>
+    <!DOCTYPE html>
+    <html>
+
+    <head>
+        <title>접속제한</title>
+        <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::printDist('ts', 'common', true) ?>
+        <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    </head>
+
+    <body>
+        <font size=4><b>
+                접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 접속 가능 시각 : <?= $turntime ?>)<br>
+                (자신의 턴이 되면 다시 접속 가능합니다. 당신의 건강을 위해 잠시 쉬어보시는 것은 어떨까요? ^^)<br>
+            </b></font>
+    </body>
+
+    </html>
 <?php
 }
 
 
-function bar($per, $h=7) {
-    if($h == 7) { $bd = 0; $h =  7; $h2 =  5; }
-    else        { $bd = 1; $h = 12; $h2 =  8; }
+function bar($per, $h = 7)
+{
+    if ($h == 7) {
+        $bd = 0;
+        $h =  7;
+        $h2 =  5;
+    } else {
+        $bd = 1;
+        $h = 12;
+        $h2 =  8;
+    }
 
     $per = round($per, 1);
-    
+
     $str = "<div class='bar_out' style='height:{$h}px;'>
-    <div class='bar_in' style='background:url(".ServConfig::$gameImagePath."/pr{$h2}.gif)'></div>
-    <div style='width:{$per}%;background:url(".ServConfig::$gameImagePath."/pb{$h2}.gif)'></div>
+    <div class='bar_in' style='background:url(" . ServConfig::$gameImagePath . "/pr{$h2}.gif)'></div>
+    <div style='width:{$per}%;background:url(" . ServConfig::$gameImagePath . "/pb{$h2}.gif)'></div>
     </div>";
     return $str;
 }
 
 
-function optionsForCities(callable $infoCall=null) {
+function optionsForCities(callable $infoCall = null)
+{
 
-    if(!$infoCall){
-        return join('', array_map(function($city){
+    if (!$infoCall) {
+        return join('', array_map(function ($city) {
             return "<option value='{$city->id}'>{$city->name}</option>";
         }, CityConst::all()));
     }
 
     $infoList = [];
     $noInfoList = [];
-    foreach(CityConst::all() as $city){
+    foreach (CityConst::all() as $city) {
         $info = $infoCall($city);
-        if(!$info){
+        if (!$info) {
             $noInfoList[] = "<option value='{$city->id}'>{$city->name}</option>";
             continue;
         }
         $infoList[] = "<option value='{$city->id}'>{$city->name} ({$info})</option>";
     }
 
-    return join('', array_merge($infoList, $noInfoList));    
+    return join('', array_merge($infoList, $noInfoList));
 }
 
-function Submit($url, $msg="", $msg2="") {
+function Submit($url, $msg = "", $msg2 = "")
+{
     echo "a";   // 파폭 버그 때문
     echo "
 <form method=post name=f1 action='{$url}'>
@@ -73,49 +89,56 @@ function Submit($url, $msg="", $msg2="") {
 }
 
 
-function GetNationColors() {
-    $colors = array("#FF0000", "#800000", "#A0522D", "#FF6347", "#FFA500", "#FFDAB9", "#FFD700", "#FFFF00",
+function GetNationColors()
+{
+    $colors = array(
+        "#FF0000", "#800000", "#A0522D", "#FF6347", "#FFA500", "#FFDAB9", "#FFD700", "#FFFF00",
         "#7CFC00", "#00FF00", "#808000", "#008000", "#2E8B57", "#008080", "#20B2AA", "#6495ED", "#7FFFD4",
         "#AFEEEE", "#87CEEB", "#00FFFF", "#00BFFF", "#0000FF", "#000080", "#483D8B", "#7B68EE", "#BA55D3",
-        "#800080", "#FF00FF", "#FFC0CB", "#F5F5DC", "#E0FFFF", "#FFFFFF", "#A9A9A9");
+        "#800080", "#FF00FF", "#FFC0CB", "#F5F5DC", "#E0FFFF", "#FFFFFF", "#A9A9A9"
+    );
     return $colors;
 }
 
 
-function backButton() {
-    return "
-<input type=button value='돌아가기' onclick=location.replace('./')><br>
-";
+function backButton()
+{
+    return "<button type='button' class='btn btn-primary back_btn' onclick=location.replace('./')>돌아가기</button><br>";
 }
 
-function CoreBackButton() {
-    return "
-<input type=button value='돌아가기' onclick=location.replace('b_chiefcenter.php')><br>
-";
+function CoreBackButton()
+{
+    return "<button type='button' class='btn btn-primary back_btn' onclick=location.replace('b_chiefcenter.php')>돌아가기</button><br>";
 }
 
-function closeButton() {
-    return "
-<input type=button value='창 닫기' onclick=window.close()><br>
-";
+function closeButton()
+{
+    return "<button type='button' class='btn btn-primary back_btn' onclick=window.close()>창 닫기</button><br>";
 }
 
 
-function printCitiesBasedOnDistance(int $cityNo, int $maxDistance=1):string {
+function printCitiesBasedOnDistance(int $cityNo, int $maxDistance = 1): string
+{
     $distanceList = searchDistance($cityNo, $maxDistance, true);
     $result = [];
 
-    for($dist = 1; $dist <= $maxDistance; $dist++){
-        $cityList = array_map(function($cityID){
+    for ($dist = 1; $dist <= $maxDistance; $dist++) {
+        $cityList = array_map(function ($cityID) {
             return CityConst::byID($cityID)->name;
         }, Util::array_get($distanceList[$dist], []));
 
         $cityStr = join(', ', $cityList);
 
-        switch($dist) {
-            case 1: $color = "magenta"; break;
-            case 2: $color = "orange"; break;
-            default: $color = "yellow"; break;
+        switch ($dist) {
+            case 1:
+                $color = "magenta";
+                break;
+            case 2:
+                $color = "orange";
+                break;
+            default:
+                $color = "yellow";
+                break;
         }
 
         $result[] = "{$dist}칸 떨어진 도시 : <span style='color:{$color};font-weight:bold;'>{$cityStr}</span>";
@@ -124,7 +147,8 @@ function printCitiesBasedOnDistance(int $cityNo, int $maxDistance=1):string {
 }
 
 
-function info($type=0) {
+function info($type = 0)
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
@@ -135,15 +159,14 @@ function info($type=0) {
     $gencount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc < 2');
     $npccount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc >= 2');
 
-    switch($type) {
-    case 0:
-        return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)<br> 등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
-    case 1:
-        return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
-    case 2:
-        return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)";
-    case 3:
-        return "등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
+    switch ($type) {
+        case 0:
+            return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)<br> 등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
+        case 1:
+            return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
+        case 2:
+            return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)";
+        case 3:
+            return "등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
     }
 }
-

hwe/func_template.php

@@ -5,16 +5,16 @@ namespace sammo;
 
 /**
  * 템플릿 생성과 관련된 함수들을 모아두는 파일
- * 
+ *
  * NOTE: 아직 converter와 명확한 구분이 되어있지 않음.
  * TODO: legacy template들을 전부 template 폴더로 모아둘 필요 있음
  * TODO: side effect를 제거
  */
 
- /**
-  * 관리자 권한이 필요함을 출력.
-  * @return void 
-  */
+/**
+ * 관리자 권한이 필요함을 출력.
+ * @return void
+ */
 function requireAdminPermissionHTML()
 {
     ob_start();
@@ -28,7 +28,8 @@ function requireAdminPermissionHTML()
         <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') ?>
+        <?= WebUtil::printDist('ts', 'common', true) ?>
+        <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     </head>
 
     <body>
@@ -41,28 +42,6 @@ function requireAdminPermissionHTML()
     return ob_get_clean();
 }
 
-function turnTable()
-{
-
-    $turnList = [];
-    $turnList[] = "<option selected value='0'>1턴</option>";
-    foreach (Util::range(1, GameConst::$maxTurn) as $turnIdx) {
-        $turnText = $turnIdx + 1;
-        $turnList[] = "<option value='{$turnIdx}'>{$turnText}턴</option>";
-    }
-
-    $turnText = join("\n", $turnList);
-
-    return "
-<select id='generalTurnSelector' name=turn[] size=11 multiple>
-    <option value='-3'>전체</option>
-    <option value='-1'>홀턴</option>
-    <option value='-2'>짝턴</option>
-    {$turnText}
-</select>
-";
-}
-
 function chiefTurnTable()
 {
     $turnList = [];
@@ -140,7 +119,7 @@ function displaySpecialDomesticInfo(?string $type): string
     ]);
 }
 
-function allButton(bool $seizeNPCMode)
+function allButton(bool $seizeNPCMode, array $opts = [])
 {
     if ($seizeNPCMode) {
         $site = "a_npcList.php";
@@ -157,14 +136,14 @@ function allButton(bool $seizeNPCMode)
     }
 
 
-    return $templates->render('allButton', [
+    return $templates->render('allButton', array_merge([
         'call' => $call,
         'site' => $site
-    ]);
+    ], $opts));
 }
 
 
-function commandButton()
+function commandButton(array $opts = [])
 {
     $session = Session::getInstance();
     $userID = Session::getUserID();
@@ -194,14 +173,14 @@ function commandButton()
         $showSecret = false;
     }
 
-    return $templates->render('commandButton', [
+    return $templates->render('commandButton', array_merge([
         'bgColor' => $bgColor,
         'fgColor' => $fgColor,
         'meLevel' => $me['officer_level'],
         'nationLevel' => $nation['level'],
         'showSecret' => $showSecret,
         'permission' => $permission,
-    ]);
+    ], $opts));
 }
 
 function formatWounded(int $value, int $wound): string
@@ -217,13 +196,13 @@ function formatDefenceTrain(int $value): string
 {
     if ($value === 999) {
         return "×";
-    } else if ($value >= 90){
+    } else if ($value >= 90) {
         return "☆";
     } else if ($value >= 80) {
         return "◎";
     } else if ($value >= 60) {
         return "○";
-    } else{
+    } else {
         return "△";
     }
 }
@@ -272,3 +251,51 @@ function getInvitationList(array $nationList)
         'nationList' => $nationList
     ]);
 }
+
+
+function getAutorunInfo($autorunOption)
+{
+    $templates = new \League\Plates\Engine(__DIR__ . '/templates');
+    $auto_info = [];
+    foreach ($autorunOption['options'] as $auto_option => $value) {
+        assert($value);
+        switch ($auto_option) {
+            case 'develop':
+                $auto_info['내정'] = '내정';
+                break;
+            case 'warp':
+                $auto_info['순간이동'] = '순간이동';
+                break;
+            case 'recruit':
+                $auto_info['징병'] = $auto_info['징병'] ?? '징병';
+                break;
+            case 'recruit_high':
+                $auto_info['징병'] = '모병';
+                break;
+            case 'train':
+                $auto_info['훈사'] = '훈련/사기진작';
+                break;
+            case 'battle':
+                $auto_info['출병'] = '출병';
+                break;
+            case 'chief':
+                $auto_info['사령턴'] = '사령턴';
+                break;
+        }
+    }
+    $limit = Util::toInt($autorunOption['limit_minutes']);
+    if ($limit >= 43200) {
+        $auto_info['제한'] = '항상 유효';
+    } else if ($limit % 60 == 0) {
+        $auto_info['제한'] = ($limit / 60) . '시간 유효';
+    } else {
+        $auto_info['제한'] = ($limit) . '분 유효';
+    }
+    $auto_info = join(', ', array_values($auto_info));
+    return $templates->render('tooltip', [
+        'text' => '자율행동',
+        'info' => $auto_info,
+        'style' => 'text-decoration:underline',
+        'copyable_info' => true
+    ]);
+}

hwe/func_tournament.php

@@ -1,248 +1,359 @@
 <?php
+
 namespace sammo;
 
 
-function processTournament() {
+function processTournament()
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     $admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'tnmt_auto', 'tnmt_time']);
     $now = new \DateTime();
-    $admin['now'] = $now->format('Y-m-d H:i:s');
-    $admin['offset'] = $now->getTimestamp() - (new \DateTime($admin['tnmt_time']))->getTimestamp();
+    $offset = $now->getTimestamp() - (new \DateTime($admin['tnmt_time']))->getTimestamp();
 
     //수동일땐 무시
-    if($admin['tnmt_auto'] == 0) { return; }
+    if ($admin['tnmt_auto'] == 0) {
+        return;
+    }
 
     $type  = $admin['tnmt_type'];
     $tnmt  = $admin['tournament'];
     $phase = $admin['phase'];
 
+    if ($offset < 0) {
+        return;
+    }
+
     //현시간이 스탬프 지나친경우
-    if($admin['offset'] >= 0)  {
-        switch($admin['tnmt_auto']) {
-        case 1: $unit = 720; break;
-        case 2: $unit = 420; break;
-        case 3: $unit = 180; break;
-        case 4: $unit =  60; break;
-        case 5: $unit =  30; break;
-        case 6: $unit =  15; break;
-        case 7: $unit =   5; break;
-        default: throw new MustNotBeReachedException();
-        }
+    switch ($admin['tnmt_auto']) {
+        case 1:
+            $unit = 720;
+            break;
+        case 2:
+            $unit = 420;
+            break;
+        case 3:
+            $unit = 180;
+            break;
+        case 4:
+            $unit =  60;
+            break;
+        case 5:
+            $unit =  30;
+            break;
+        case 6:
+            $unit =  15;
+            break;
+        case 7:
+            $unit =   5;
+            break;
+        default:
+            throw new MustNotBeReachedException();
+    }
 
-        //업데이트 횟수
-        $iter = intdiv($admin['offset'], $unit) + 1;
+    //업데이트 횟수
+    $iter = intdiv($offset, $unit) + 1;
 
-        for($i=0; $i < $iter; $i++) {
-            switch($tnmt) {
+    for ($i = 0; $i < $iter; $i++) {
+        switch ($tnmt) {
             case 1: //신청 마감
-                fillLowGenAll();
-                $tnmt = 2;  $phase = 0;
+                fillLowGenAll($type);
+                $tnmt = 2;
+                $phase = 0;
                 break;
             case 2: //예선중
-                qualify($type, $tnmt, $phase);        $phase++;
-                if($phase >= 56) { $tnmt = 3; $phase = 0; }
+                qualify($type, $tnmt, $phase);
+                $phase++;
+                if ($phase >= 56) {
+                    $tnmt = 3;
+                    $phase = 0;
+                }
                 break;
             case 3: //추첨중
-                selectionAll($type, $tnmt, $phase);   $phase+=8;
-                if($phase >= 32) { $tnmt = 4; $phase = 0; }
+                selectionAll($type, $tnmt, $phase);
+                $phase += 8;
+                if ($phase >= 32) {
+                    $tnmt = 4;
+                    $phase = 0;
+                }
                 break;
             case 4: //본선중
-                finallySingle($type, $tnmt, $phase);        $phase++;
-                if($phase >= 6) { $tnmt = 5; $phase = 0; }
+                finallySingle($type, $tnmt, $phase);
+                $phase++;
+                if ($phase >= 6) {
+                    $tnmt = 5;
+                    $phase = 0;
+                }
                 break;
             case 5: //배정중
                 final16set();
-                $tnmt = 6; $phase = 0;
+                $tnmt = 6;
+                $phase = 0;
+                startBetting();
                 break;
             case 6: //베팅중
-                $tnmt = 7; $phase = 0;
+                $tnmt = 7;
+                $phase = 0;
                 break;
             case 7: //16강중
-                finalFight($type, $tnmt, $phase, 16); $phase++;
-                if($phase >= 8) { $tnmt = 8; $phase = 0; }
+                finalFight($type, $tnmt, $phase, 16);
+                $phase++;
+                if ($phase >= 8) {
+                    $tnmt = 8;
+                    $phase = 0;
+                }
                 break;
             case 8: //8강중
-                finalFight($type, $tnmt, $phase, 8);  $phase++;
-                if($phase >= 4) { $tnmt = 9; $phase = 0; }
+                finalFight($type, $tnmt, $phase, 8);
+                $phase++;
+                if ($phase >= 4) {
+                    $tnmt = 9;
+                    $phase = 0;
+                }
                 break;
             case 9: //4강중
-                finalFight($type, $tnmt, $phase, 4);  $phase++;
-                if($phase >= 2) { $tnmt = 10; $phase = 0; }
+                finalFight($type, $tnmt, $phase, 4);
+                $phase++;
+                if ($phase >= 2) {
+                    $tnmt = 10;
+                    $phase = 0;
+                }
                 break;
             case 10: //결승중
                 finalFight($type, $tnmt, $phase, 2);
-                $tnmt = 0; $phase = 0;
+                $tnmt = 0;
+                $phase = 0;
                 setGift($type, $tnmt, $phase);
                 $i = $iter;
                 break;
-            }
+        }
 
-            //베팅은 무조건 60페이즈후 진행(최대 1시간)
-            if($tnmt == 6) {
-                $betTerm = $unit * 60;
-                if($betTerm > 3600) { $betTerm = 3600; }
-                //처리 초 더한 날짜
-                $dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i + $betTerm);
+        //베팅은 무조건 60페이즈후 진행(최대 1시간)
+        if ($tnmt == 6) {
+            $betTerm = $unit * 60;
+            if ($betTerm > 3600) {
+                $betTerm = 3600;
+            }
+            //처리 초 더한 날짜
+            $dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i + $betTerm);
+            $gameStor->tournament = $tnmt;
+            $gameStor->phase = $phase;
+            $gameStor->tnmt_time = $dt;
+            return;
+        }
+
+        if ($admin['tnmt_auto'] == 1) {
+            //처리 초 더한 날짜
+            $dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i);
+            $hr = substr($dt, 11, 2);
+            //지정시간대 넘어가면 중단 20~24시
+            if ($hr < 20) {
+                $dt = substr($dt, 0, 11) . "20:00:00";
                 $gameStor->tournament = $tnmt;
                 $gameStor->phase = $phase;
                 $gameStor->tnmt_time = $dt;
                 return;
             }
-
-            if($admin['tnmt_auto'] == 1) {
-                //처리 초 더한 날짜
-                $dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i);
-                $hr = substr($dt, 11, 2);
-                //지정시간대 넘어가면 중단 20~24시
-                if($hr < 20) {
-                    $dt = substr($dt, 0, 11)."20:00:00";
-                    $gameStor->tournament = $tnmt;
-                    $gameStor->phase = $phase;
-                    $gameStor->tnmt_time = $dt;
-                    return;
-                }
-            }
         }
-
-        $second = $unit * $iter;
-        $gameStor->tournament = $tnmt;
-        $gameStor->phase = $phase;
-        $gameStor->tnmt_time = (new \DateTimeImmutable($admin['tnmt_time']))->add(new \DateInterval("PT{$second}S"))->format('Y-m-d H:i:s');
     }
+
+    $second = $unit * $iter;
+    $gameStor->tournament = $tnmt;
+    $gameStor->phase = $phase;
+    $gameStor->tnmt_time = (new \DateTimeImmutable($admin['tnmt_time']))->add(new \DateInterval("PT{$second}S"))->format('Y-m-d H:i:s');
 }
 
-function getTournamentTerm() {
+function getTournamentTerm()
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     $tnmt_auto = $gameStor->tnmt_auto;
 
-    switch($tnmt_auto) {
-    case 0: $str = ''; break;
-    case 1: $str = "경기당 12분"; break;
-    case 2: $str = "경기당 7분"; break;
-    case 3: $str = "경기당 3분"; break;
-    case 4: $str = "경기당 1분"; break;
-    case 5: $str = "경기당 30초"; break;
-    case 6: $str = "경기당 15초"; break;
-    case 7: $str = "경기당 5초"; break;
+    switch ($tnmt_auto) {
+        case 0:
+            $str = '';
+            break;
+        case 1:
+            $str = "경기당 12분";
+            break;
+        case 2:
+            $str = "경기당 7분";
+            break;
+        case 3:
+            $str = "경기당 3분";
+            break;
+        case 4:
+            $str = "경기당 1분";
+            break;
+        case 5:
+            $str = "경기당 30초";
+            break;
+        case 6:
+            $str = "경기당 15초";
+            break;
+        case 7:
+            $str = "경기당 5초";
+            break;
     }
     return $str;
 }
 
-function getTournamentTime() {
+function getTournamentTime()
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     list($tnmt, $tnmt_time) = $gameStor->getValuesAsArray(['tournament', 'tnmt_time']);
     $dt = substr($tnmt_time, 11, 5);
-    switch($tnmt) {
-    case 1: $tnmt = "개막시간 {$dt}"; break;
-    case 2: $tnmt = "다음경기 {$dt}"; break;
-    case 3: $tnmt = "다음추첨 {$dt}"; break;
-    case 4: $tnmt = "다음경기 {$dt}"; break;
-    case 5: $tnmt = "16강배정 {$dt}"; break;
-    case 6: $tnmt = "베팅마감 {$dt}"; break;
-    case 7: case 8: case 9: case 10:
-            $tnmt = "다음경기 {$dt}"; break;
-    default: $tnmt = ""; break;
+    switch ($tnmt) {
+        case 1:
+            $tnmt = "개막시간 {$dt}";
+            break;
+        case 2:
+            $tnmt = "다음경기 {$dt}";
+            break;
+        case 3:
+            $tnmt = "다음추첨 {$dt}";
+            break;
+        case 4:
+            $tnmt = "다음경기 {$dt}";
+            break;
+        case 5:
+            $tnmt = "16강배정 {$dt}";
+            break;
+        case 6:
+            $tnmt = "베팅마감 {$dt}";
+            break;
+        case 7:
+        case 8:
+        case 9:
+        case 10:
+            $tnmt = "다음경기 {$dt}";
+            break;
+        default:
+            $tnmt = "";
+            break;
     }
     return $tnmt;
 }
 
-function getTournament(int $tnmt) {
+function getTournament(int $tnmt)
+{
     return [
-        "<font color=magenta>경기 없음</font>",
-        "<font color=orange>참가 모집중</font>",
-        "<font color=orange>예선 진행중</font>",
-        "<font color=orange>본선 추첨중</font>",
-        "<font color=orange>본선 진행중</font>",
-        "<font color=orange>16강 배정중</font>",
-        "<font color=orange>베팅 진행중</font>",
-        "<font color=orange>16강 진행중</font>",
-        "<font color=orange>8강 진행중</font>",
-        "<font color=orange>4강 진행중</font>",
-        "<font color=orange>결승 진행중</font>",
-    ][$tnmt]??"TOURNAMENT_TYPE_ERR_{$tnmt}";
+        "<span style='color:magenta;'>경기 없음</span>",
+        "<span style='color:orange;'>참가 모집중</span>",
+        "<span style='color:orange;'>예선 진행중</span>",
+        "<span style='color:orange;'>본선 추첨중</span>",
+        "<span style='color:orange;'>본선 진행중</span>",
+        "<span style='color:orange;'>16강 배정중</span>",
+        "<span style='color:orange;'>베팅 진행중</span>",
+        "<span style='color:orange;'>16강 진행중</span>",
+        "<span style='color:orange;'>8강 진행중</span>",
+        "<span style='color:orange;'>4강 진행중</span>",
+        "<span style='color:orange;'>결승 진행중</span>",
+    ][$tnmt] ?? "TOURNAMENT_TYPE_ERR_{$tnmt}";
 }
 
-function printRow($k, $npc, $name, $abil, $tgame, $win, $draw, $lose, $gd, $gl, $prmt) {
+function printRow($k, $npc, $name, $abil, $tgame, $win, $draw, $lose, $gd, $gl, $prmt)
+{
     $k += 1;
-    if($prmt > 0) { $name = "<font color=orange>".$name."</font>"; }
-    elseif($npc >= 2) { $name = "<font color=cyan>".$name."</font>"; }
-    elseif($npc == 1) { $name = "<font color=skyblue>".$name."</font>"; }
+    if ($prmt > 0) {
+        $name = "<font color=orange>" . $name . "</font>";
+    } elseif ($npc >= 2) {
+        $name = "<font color=cyan>" . $name . "</font>";
+    } elseif ($npc == 1) {
+        $name = "<font color=skyblue>" . $name . "</font>";
+    }
     echo "<tr align=center><td class='bg2'>$k</td><td style='font-size:80%;'>$name</td><td>$abil</td><td>$tgame</td><td>$win</td><td>$draw</td><td>$lose</td><td>$gd</td><td>$gl</td></tr>";
 }
 
-function printFighting($tournament, $phase) {
+function printFighting($tournament, $phase)
+{
     $code = $tournament * 100 + $phase;
-    if($code == 0) {
+    if ($code == 0) {
         echo "<tr valign=top>";
         echo "<td>&nbsp;</td>";
         echo "<td>&nbsp;</td>";
         echo "<td>&nbsp;</td>";
-        echo "<td>".getTnmtFightLogAll(50)."</td>";
+        echo "<td>" . getTnmtFightLogAll(50) . "</td>";
         echo "<td>&nbsp;</td>";
         echo "<td>&nbsp;</td>";
         echo "<td>&nbsp;</td>";
         echo "<td>&nbsp;</td>";
         echo "</tr>";
-    } elseif($code <= 300) {
+    } elseif ($code <= 300) {
         echo "<tr valign=top>";
-        for($i=0; $i < 8; $i++) {
-            echo "<td>".getTnmtFightLogAll($i)."</td>";
+        for ($i = 0; $i < 8; $i++) {
+            echo "<td>" . getTnmtFightLogAll($i) . "</td>";
         }
         echo "</tr>";
-    } elseif($code < 400) {
-    } elseif($code <= 500) {
+    } elseif ($code < 400) {
+    } elseif ($code <= 500) {
         echo "<tr valign=top>";
-        for($i=10; $i < 18; $i++) {
-            echo "<td>".getTnmtFightLogAll($i)."</td>";
+        for ($i = 10; $i < 18; $i++) {
+            echo "<td>" . getTnmtFightLogAll($i) . "</td>";
         }
         echo "</tr>";
-    } elseif($code < 700) {
-    } elseif($code <= 800) {
+    } elseif ($code < 700) {
+    } elseif ($code <= 800) {
         echo "<tr valign=top>";
-        for($i=20; $i < 28; $i++) {
-            echo "<td>".getTnmtFightLogAll($i)."</td>";
+        for ($i = 20; $i < 28; $i++) {
+            echo "<td>" . getTnmtFightLogAll($i) . "</td>";
         }
         echo "</tr>";
-    } elseif($code <= 900) {
+    } elseif ($code <= 900) {
         echo "<tr valign=top>";
-        for($i=30; $i < 34; $i++) {
+        for ($i = 30; $i < 34; $i++) {
             echo "<td>&nbsp;</td>";
-            echo "<td>".getTnmtFightLogAll($i)."</td>";
+            echo "<td>" . getTnmtFightLogAll($i) . "</td>";
         }
         echo "</tr>";
-    } elseif($code <= 1000) {
+    } elseif ($code <= 1000) {
         echo "<tr valign=top>";
-        for($i=40; $i < 42; $i++) {
+        for ($i = 40; $i < 42; $i++) {
             echo "<td>&nbsp;</td>";
             echo "<td>&nbsp;</td>";
-            echo "<td>".getTnmtFightLogAll($i)."</td>";
+            echo "<td>" . getTnmtFightLogAll($i) . "</td>";
             echo "<td>&nbsp;</td>";
         }
         echo "</tr>";
     }
 }
 
-function startTournament($auto, $type) {
+function startTournament($auto, $type)
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     eraseTnmtFightLogAll();
 
-    switch($auto) {
-    case 1: $unit = 60; break;
-    case 2: $unit = 60; break;
-    case 3: $unit = 60; break;
-    case 4: $unit = 60; break;
-    case 5: $unit = 30; break;
-    case 6: $unit = 15; break;
-    case 7: $unit =  5; break;
-    default:$unit = 60; break;
+    switch ($auto) {
+        case 1:
+            $unit = 60;
+            break;
+        case 2:
+            $unit = 60;
+            break;
+        case 3:
+            $unit = 60;
+            break;
+        case 4:
+            $unit = 60;
+            break;
+        case 5:
+            $unit = 30;
+            break;
+        case 6:
+            $unit = 15;
+            break;
+        case 7:
+            $unit =  5;
+            break;
+        default:
+            $unit = 60;
+            break;
     }
 
     $admin = $gameStor->getValues(['year', 'month']);
@@ -254,87 +365,118 @@ function startTournament($auto, $type) {
     $gameStor->phase = 0;
 
     $db->update('general', [
-        'tournament'=>0,
+        'tournament' => 0,
     ], true);
     $db->update('betting', [
-        'bet0'=>0,
-        'bet1'=>0,
-        'bet2'=>0,
-        'bet3'=>0,
-        'bet4'=>0,
-        'bet5'=>0,
-        'bet6'=>0,
-        'bet7'=>0,
-        'bet8'=>0,
-        'bet9'=>0,
-        'bet10'=>0,
-        'bet11'=>0,
-        'bet12'=>0,
-        'bet13'=>0,
-        'bet14'=>0,
-        'bet15'=>0
+        'bet0' => 0,
+        'bet1' => 0,
+        'bet2' => 0,
+        'bet3' => 0,
+        'bet4' => 0,
+        'bet5' => 0,
+        'bet6' => 0,
+        'bet7' => 0,
+        'bet8' => 0,
+        'bet9' => 0,
+        'bet10' => 0,
+        'bet11' => 0,
+        'bet12' => 0,
+        'bet13' => 0,
+        'bet14' => 0,
+        'bet15' => 0
     ], true);
     $db->query('TRUNCATE TABLE tournament');
 
     $opener = $db->queryFirstField('SELECT `general`.`name` FROM `general` JOIN `nation` ON `general`.`nation` = `nation`.`nation` WHERE `general`.`officer_level` = 12 AND `nation`.`level` = 7 ORDER BY rand() LIMIT 1');
-    if(!$opener){
+    if (!$opener) {
         $opener = $gameStor->prev_winner;
     }
 
-    if($opener){
+    if ($opener) {
         $openerText = "황제 <Y>{$opener}</>의 명으로 ";
-    }
-    else{
+    } else {
         $openerText = '';
     }
 
     $history = [];
     [$typeText, $genTypeText] = [
-        ['전력전','영웅'],
-        ['통솔전','명사'],
-        ['일기토','용사'],
-        ['설전','책사'],
+        ['전력전', '영웅'],
+        ['통솔전', '명사'],
+        ['일기토', '용사'],
+        ['설전', '책사'],
     ][$type];
 
-    $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월:{$openerText}<C>{$typeText}</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>{$genTypeText}</span>들을 모집하고 있습니다!";
+    $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월:<B><b>【대회】</b></>{$openerText}<C>{$typeText}</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>{$genTypeText}</span>들을 모집하고 있습니다!";
 
     pushGlobalHistoryLog($history, $admin['year'], $admin['month']);
 }
 
-function fillLowGenAll() {
+function startBetting()
+{
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    [$year, $month, $startyear] = $gameStor->getValuesAsArray(['year', 'month', 'startyear']);
+    pushGlobalHistoryLog([
+        "<S>◆</>{$year}년 {$month}월:<B><b>【대회】</b></>우승자를 예상하는 <C>내기</>가 진행중입니다! 호사가의 참여를 기다립니다!"
+    ], $year, $month);
+
+    $betGold = Util::valueFit(floor((3 + $year - $startyear) * 0.334) * 10, 10);
+
+    $npcList = $db->queryFirstColumn('SELECT no FROM general WHERE npc >= 2 AND gold >= (500 + %i)', $betGold);
+    $npcBet = [];
+    $betSum = [
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+    ];
+
+    foreach ($npcList as $npcID) {
+        $target = Util::randRangeInt(0, 15);
+        $betSum[$target] += $betGold;
+        $npcBet[] = [$npcID, $target];
+    }
+
+    $db->update('general', [
+        'gold' => $db->sqleval('gold - %i', $betGold),
+    ], 'no IN %li', $npcList);
+    foreach ($npcBet as [$npcID, $betTarget]) {
+        $targetKey = "bet{$betTarget}";
+        $db->update('betting', [
+            "bet{$betTarget}" => $db->sqleval('%b + %i', $targetKey, $betGold),
+        ], 'general_id = %i', $npcID);
+    }
+    foreach ($betSum as $betTarget => $betSumGold) {
+        $targetKey = "bet{$betTarget}";
+        $db->update('betting', [
+            "bet{$betTarget}" => $db->sqleval('%b + %i', $targetKey, $betSumGold),
+        ], 'general_id = 0');
+    }
+}
+
+function fillLowGenAll($tnmt_type)
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     $grpCount = [];
 
     $dummyGeneral = [
-        'no'=>0,
-        'npc'=>2,
-        'name'=>'무명장수',
-        'leadership'=>10,
-        'strength'=>10,
-        'intel'=>10,
-        'explevel'=>10
+        'no' => 0,
+        'npc' => 2,
+        'name' => '무명장수',
+        'leadership' => 10,
+        'strength' => 10,
+        'intel' => 10,
+        'lvl' => 10,
+        'h' => 'None',
+        'w' => 'None',
+        'b' => 'None'
     ];
 
-    $dummyGeneral = [
-        'no'=>0,
-        'npc'=>2,
-        'name'=>'무명장수',
-        'leadership'=>10,
-        'strength'=>10,
-        'intel'=>10,
-        'lvl'=>0,
-        'h'=>'None',
-        'w'=>'None',
-        'b'=>'None'
-    ];
-
-    for($i=0;$i<8;$i++){
+    for ($i = 0; $i < 8; $i++) {
         $grpCount[$i] = 0;
     }
 
-    foreach($db->queryAllLists('SELECT grp, count(grp) FROM tournament GROUP BY grp') as [$grpIdx, $grpCnt]){
+    foreach ($db->queryAllLists('SELECT grp, count(grp) FROM tournament GROUP BY grp') as [$grpIdx, $grpCnt]) {
         $grpCount[$grpIdx] = $grpCnt;
     }
 
@@ -342,45 +484,72 @@ function fillLowGenAll() {
     $gameStor->phase = 0;
 
     $currentJoinerCnt = array_sum($grpCount);
-    if($currentJoinerCnt == 64){
+    if ($currentJoinerCnt == 64) {
         return;
     }
 
-    $toBeFilledCnt = 8*8-$currentJoinerCnt;
+    $toBeFilledCnt = 8 * 8 - $currentJoinerCnt;
+
+    $scoringCandFunction = match ($tnmt_type) {
+        0 => function ($gen) {
+            return $gen['leadership'] + $gen['strength'] + $gen['intel'];
+        }, //전력전
+        1 => function ($gen) {
+            return $gen['leadership'];
+        }, //통솔전
+        2 => function ($gen) {
+            return $gen['strength'];
+        }, //통솔전
+        3 => function ($gen) {
+            return $gen['intel'];
+        }, //통솔전
+        default => throw new \ValueError('invalid tnmt_type' . $tnmt_type)
+    };
 
     //자동신청하고, 돈 있고, 아직 참가 안한 장수
-    $freeJoiners = $db->query(
-        'SELECT no,npc,name,leadership,strength,intel,explevel,horse,weapon,book from general where tnmt=1 and tournament=0 order by rand() limit %d',
-        $toBeFilledCnt
-    );
+    $freeJoinerCandidate = [];
+
+    foreach($db->query(
+        'SELECT no,npc,name,leadership,strength,intel,explevel,horse,weapon,book from general where tnmt=1 and tournament=0',
+    ) as $gen){
+        $score = $scoringCandFunction($gen);
+        $freeJoinerCandidate[$gen['no']] = [$gen, $score**2];
+    }
+
 
     $joinersValues = [];
     $joinersIdx = [];
 
-    foreach($freeJoiners as $general){
+    foreach(Util::range($toBeFilledCnt) as $_){
+        if(!$freeJoinerCandidate){
+            break;
+        }
+        $general = Util::choiceRandomUsingWeightPair($freeJoinerCandidate);
+        unset($freeJoinerCandidate[$general['no']]);
+
         $grpIdx = array_keys($grpCount, min($grpCount))[0];
         $grpCnt = $grpCount[$grpIdx];
         $joinersValues[] = [
-            'no'=>$general['no'],
-            'npc'=>$general['npc'],
-            'name'=>$general['name'],
-            'leadership'=>$general['leadership'],
-            'strength'=>$general['strength'],
-            'intel'=>$general['intel'],
-            'lvl'=>$general['explevel'],
-            'grp'=>$grpIdx,
-            'grp_no'=>$grpCnt,
-            'h'=>$general['horse'],
-            'w'=>$general['weapon'],
-            'b'=>$general['book']
+            'no' => $general['no'],
+            'npc' => $general['npc'],
+            'name' => $general['name'],
+            'leadership' => $general['leadership'],
+            'strength' => $general['strength'],
+            'intel' => $general['intel'],
+            'lvl' => $general['explevel'],
+            'grp' => $grpIdx,
+            'grp_no' => $grpCnt,
+            'h' => $general['horse'],
+            'w' => $general['weapon'],
+            'b' => $general['book']
         ];
 
         $joinersIdx[] = $general['no'];
         $grpCount[$grpIdx] += 1;
     }
 
-    foreach($grpCount as $grpIdx=>$grpCnt){
-        while($grpCnt < 8){
+    foreach ($grpCount as $grpIdx => $grpCnt) {
+        while ($grpCnt < 8) {
             $dummyCopy = $dummyGeneral;
             $dummyCopy['grp'] = $grpIdx;
             $dummyCopy['grp_no'] = $grpCnt;
@@ -390,7 +559,7 @@ function fillLowGenAll() {
     }
 
     $db->update('general', [
-        'tournament'=>1
+        'tournament' => 1
     ], 'no IN %li', $joinersIdx);
 
     $db->insert('tournament', $joinersValues);
@@ -407,252 +576,409 @@ function fillLowGenAll() {
 //7 8강
 //8 4강
 //9 결승
-function getTwo($tournament, $phase) {
+function getTwo($tournament, $phase)
+{
     $cand = [];
-    switch($tournament) {
-    case 2:
-        //예선
-        switch($phase%28) {
-        case  0: $cand[0] = 0; $cand[1] = 1; break; case  1: $cand[0] = 2; $cand[1] = 3; break; case  2: $cand[0] = 4; $cand[1] = 5; break; case  3: $cand[0] = 6; $cand[1] = 7; break;
-        case  4: $cand[0] = 0; $cand[1] = 2; break; case  5: $cand[0] = 1; $cand[1] = 3; break; case  6: $cand[0] = 4; $cand[1] = 6; break; case  7: $cand[0] = 5; $cand[1] = 7; break;
-        case  8: $cand[0] = 0; $cand[1] = 3; break; case  9: $cand[0] = 1; $cand[1] = 6; break; case 10: $cand[0] = 2; $cand[1] = 5; break; case 11: $cand[0] = 4; $cand[1] = 7; break;
-        case 12: $cand[0] = 0; $cand[1] = 4; break; case 13: $cand[0] = 1; $cand[1] = 5; break; case 14: $cand[0] = 2; $cand[1] = 6; break; case 15: $cand[0] = 3; $cand[1] = 7; break;
-        case 16: $cand[0] = 0; $cand[1] = 5; break; case 17: $cand[0] = 1; $cand[1] = 4; break; case 18: $cand[0] = 2; $cand[1] = 7; break; case 19: $cand[0] = 3; $cand[1] = 6; break;
-        case 20: $cand[0] = 0; $cand[1] = 6; break; case 21: $cand[0] = 1; $cand[1] = 7; break; case 22: $cand[0] = 2; $cand[1] = 4; break; case 23: $cand[0] = 3; $cand[1] = 5; break;
-        case 24: $cand[0] = 0; $cand[1] = 7; break; case 25: $cand[0] = 1; $cand[1] = 2; break; case 26: $cand[0] = 3; $cand[1] = 4; break; case 27: $cand[0] = 5; $cand[1] = 6; break;
-        }
-        if($phase >= 28) {
-            $temp = $cand[0];
-            $cand[0] = $cand[1];
-            $cand[1] = $temp;
-        }
-        break;
-    case 4:
-        //본선
-        switch($phase%6) {
-        case  0: $cand[0] = 0; $cand[1] = 1; break; case  1: $cand[0] = 2; $cand[1] = 3; break;
-        case  2: $cand[0] = 0; $cand[1] = 2; break; case  3: $cand[0] = 1; $cand[1] = 3; break;
-        case  4: $cand[0] = 0; $cand[1] = 3; break; case  5: $cand[0] = 1; $cand[1] = 2; break;
-        }
-        break;
+    switch ($tournament) {
+        case 2:
+            //예선
+            switch ($phase % 28) {
+                case  0:
+                    $cand[0] = 0;
+                    $cand[1] = 1;
+                    break;
+                case  1:
+                    $cand[0] = 2;
+                    $cand[1] = 3;
+                    break;
+                case  2:
+                    $cand[0] = 4;
+                    $cand[1] = 5;
+                    break;
+                case  3:
+                    $cand[0] = 6;
+                    $cand[1] = 7;
+                    break;
+                case  4:
+                    $cand[0] = 0;
+                    $cand[1] = 2;
+                    break;
+                case  5:
+                    $cand[0] = 1;
+                    $cand[1] = 3;
+                    break;
+                case  6:
+                    $cand[0] = 4;
+                    $cand[1] = 6;
+                    break;
+                case  7:
+                    $cand[0] = 5;
+                    $cand[1] = 7;
+                    break;
+                case  8:
+                    $cand[0] = 0;
+                    $cand[1] = 3;
+                    break;
+                case  9:
+                    $cand[0] = 1;
+                    $cand[1] = 6;
+                    break;
+                case 10:
+                    $cand[0] = 2;
+                    $cand[1] = 5;
+                    break;
+                case 11:
+                    $cand[0] = 4;
+                    $cand[1] = 7;
+                    break;
+                case 12:
+                    $cand[0] = 0;
+                    $cand[1] = 4;
+                    break;
+                case 13:
+                    $cand[0] = 1;
+                    $cand[1] = 5;
+                    break;
+                case 14:
+                    $cand[0] = 2;
+                    $cand[1] = 6;
+                    break;
+                case 15:
+                    $cand[0] = 3;
+                    $cand[1] = 7;
+                    break;
+                case 16:
+                    $cand[0] = 0;
+                    $cand[1] = 5;
+                    break;
+                case 17:
+                    $cand[0] = 1;
+                    $cand[1] = 4;
+                    break;
+                case 18:
+                    $cand[0] = 2;
+                    $cand[1] = 7;
+                    break;
+                case 19:
+                    $cand[0] = 3;
+                    $cand[1] = 6;
+                    break;
+                case 20:
+                    $cand[0] = 0;
+                    $cand[1] = 6;
+                    break;
+                case 21:
+                    $cand[0] = 1;
+                    $cand[1] = 7;
+                    break;
+                case 22:
+                    $cand[0] = 2;
+                    $cand[1] = 4;
+                    break;
+                case 23:
+                    $cand[0] = 3;
+                    $cand[1] = 5;
+                    break;
+                case 24:
+                    $cand[0] = 0;
+                    $cand[1] = 7;
+                    break;
+                case 25:
+                    $cand[0] = 1;
+                    $cand[1] = 2;
+                    break;
+                case 26:
+                    $cand[0] = 3;
+                    $cand[1] = 4;
+                    break;
+                case 27:
+                    $cand[0] = 5;
+                    $cand[1] = 6;
+                    break;
+            }
+            if ($phase >= 28) {
+                $temp = $cand[0];
+                $cand[0] = $cand[1];
+                $cand[1] = $temp;
+            }
+            break;
+        case 4:
+            //본선
+            switch ($phase % 6) {
+                case  0:
+                    $cand[0] = 0;
+                    $cand[1] = 1;
+                    break;
+                case  1:
+                    $cand[0] = 2;
+                    $cand[1] = 3;
+                    break;
+                case  2:
+                    $cand[0] = 0;
+                    $cand[1] = 2;
+                    break;
+                case  3:
+                    $cand[0] = 1;
+                    $cand[1] = 3;
+                    break;
+                case  4:
+                    $cand[0] = 0;
+                    $cand[1] = 3;
+                    break;
+                case  5:
+                    $cand[0] = 1;
+                    $cand[1] = 2;
+                    break;
+            }
+            break;
     }
     return $cand;
 }
 
-function qualify($tnmt_type, $tnmt, $phase) {
+function qualify($tnmt_type, $tnmt, $phase)
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     $cand = getTwo($tnmt, $phase);
 
     //각 그룹 페이즈 실행
-    for($i=0; $i < 8; $i++) {
+    for ($i = 0; $i < 8; $i++) {
         fight($tnmt_type, $tnmt, $phase, $i, $cand[0], $cand[1], 0);
     }
-    if($phase < 55) {
-        $gameStor->phase+=1;
+    if ($phase < 55) {
+        $gameStor->phase += 1;
     } else {
-        $gameStor->phase=0;
-        $gameStor->tournament=3;
+        $gameStor->phase = 0;
+        $gameStor->tournament = 3;
 
-        foreach(Util::range(8) as $grpIdx){
+        foreach (Util::range(8) as $grpIdx) {
             $promoters = $db->query(
                 'SELECT grp,grp_no,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq limit 0,4',
                 $grpIdx
             );
-            foreach($promoters as $grpRank=>$grpGen){
+            foreach ($promoters as $grpRank => $grpGen) {
                 $db->update('tournament', [
-                    'prmt'=>$grpRank+1,
+                    'prmt' => $grpRank + 1,
                 ], 'grp=%i AND grp_no=%i', $grpIdx, $grpGen['grp_no']);
             }
         }
     }
 }
 
-function qualifyAll($tnmt_type, $tnmt, $phase) {
+function qualifyAll($tnmt_type, $tnmt, $phase)
+{
     $db = DB::db();
 
     $start = $phase;
     $end = $phase - ($phase % 4) + 4;
-    for($i=$start; $i < $end; $i++) {
+    for ($i = $start; $i < $end; $i++) {
         qualify($tnmt_type, $tnmt, $i);
     }
 }
 
-function selection($tnmt_type, $tnmt, $phase) {
+function selection($tnmt_type, $tnmt, $phase)
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     //시드1 배정
-    if($phase < 8) {
-        $grp = $phase + 10;  $grp_no = 0;
+    if ($phase < 8) {
+        $grp = $phase + 10;
+        $grp_no = 0;
         $general = $db->queryFirstRow('SELECT * FROM tournament WHERE prmt=1 ORDER BY rand() LIMIT 1');
-    //시드2 배정
-    } elseif($phase < 16) {
-        $grp = $phase - 8 + 10;  $grp_no = 1;
+        //시드2 배정
+    } elseif ($phase < 16) {
+        $grp = $phase - 8 + 10;
+        $grp_no = 1;
         $general = $db->queryFirstRow('SELECT * FROM tournament WHERE prmt=2 ORDER BY rand() LIMIT 1');
-    } elseif($phase < 24) {
-        $grp = $phase - 16 + 10;  $grp_no = 2;
+    } elseif ($phase < 24) {
+        $grp = $phase - 16 + 10;
+        $grp_no = 2;
         $general = $db->queryFirstRow('SELECT * FROM tournament WHERE prmt>2 ORDER BY rand() LIMIT 1');
     } else {
-        $grp = $phase - 24 + 10;  $grp_no = 3;
+        $grp = $phase - 24 + 10;
+        $grp_no = 3;
         $general = $db->queryFirstRow('SELECT * FROM tournament WHERE prmt>2 ORDER BY rand() LIMIT 1');
     }
     //해당 시드에서 랜덤 선택
     //본선에 추가
     $db->insert('tournament', [
-        'no'=>$general['no'],
-        'npc'=>$general['npc'],
-        'name'=>$general['name'],
-        'leadership'=>$general['leadership'],
-        'strength'=>$general['strength'],
-        'intel'=>$general['intel'],
-        'lvl'=>$general['lvl'],
-        'grp'=>$grp,
-        'grp_no'=>$grp_no,
-        'h'=>$general['h'],
-        'w'=>$general['w'],
-        'b'=>$general['b']
+        'no' => $general['no'],
+        'npc' => $general['npc'],
+        'name' => $general['name'],
+        'leadership' => $general['leadership'],
+        'strength' => $general['strength'],
+        'intel' => $general['intel'],
+        'lvl' => $general['lvl'],
+        'grp' => $grp,
+        'grp_no' => $grp_no,
+        'h' => $general['h'],
+        'w' => $general['w'],
+        'b' => $general['b']
     ]);
 
     //시드 삭제
     $db->update('tournament', [
-        'prmt'=>0
+        'prmt' => 0
     ], 'grp=%i AND grp_no=%i', $general['grp'], $general['grp_no']);
 
-    if($phase < 31) {
-        $gameStor->phase+=1;
+    if ($phase < 31) {
+        $gameStor->phase += 1;
     } else {
         $gameStor->tournament = 4;
-        $gameStor->phase=0;
+        $gameStor->phase = 0;
     }
 }
 
-function selectionAll($tnmt_type, $tnmt, $phase) {
+function selectionAll($tnmt_type, $tnmt, $phase)
+{
     $start = $phase;
     $end = $phase - ($phase % 8) + 8;
-    for($i=$start; $i < $end; $i++) {
+    for ($i = $start; $i < $end; $i++) {
         selection($tnmt_type, $tnmt, $i);
     }
 }
 
-function finallySingle($tnmt_type, $tnmt, $phase) {
+function finallySingle($tnmt_type, $tnmt, $phase)
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     $cand = getTwo($tnmt, $phase);
 
     //각 그룹 페이즈 실행
-    for($i=10; $i < 18; $i++) {
+    for ($i = 10; $i < 18; $i++) {
         fight($tnmt_type, $tnmt, $phase, $i, $cand[0], $cand[1], 0);
     }
-    if($phase < 5) {
-        $gameStor->phase+=1;
+    if ($phase < 5) {
+        $gameStor->phase += 1;
     } else {
-        $gameStor->tournament=5;
-        $gameStor->phase=0;
+        $gameStor->tournament = 5;
+        $gameStor->phase = 0;
 
-        foreach(Util::range(10, 18) as $grpIdx){
+        foreach (Util::range(10, 18) as $grpIdx) {
             $promoters = $db->query(
                 'SELECT grp,grp_no,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq limit 0,2',
                 $grpIdx
             );
-            foreach($promoters as $grpRank=>$grpGen){
+            foreach ($promoters as $grpRank => $grpGen) {
                 $db->update('tournament', [
-                    'prmt'=>$grpRank+1,
+                    'prmt' => $grpRank + 1,
                 ], 'grp=%i AND grp_no=%i', $grpIdx, $grpGen['grp_no']);
             }
         }
     }
 }
 
-function finallyAll($tnmt_type, $tnmt, $phase) {
+function finallyAll($tnmt_type, $tnmt, $phase)
+{
     $start = $phase;
     $end = $phase - ($phase % 2) + 2;
-    for($i=$start; $i < $end; $i++) {
+    for ($i = $start; $i < $end; $i++) {
         finallySingle($tnmt_type, $tnmt, $i);
     }
 }
 
-function final16set() {
+function final16set()
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     //1조1-5조2, 2조1-6조2, 3조1-7조2, 4조1-8조2, 5조1-1조2, 6조1-2조2, 7조1-3조2, 8조1-4조2
-    $grp  = Array(10, 14, 11, 15, 12, 16, 13, 17, 14, 10, 15, 11, 16, 12, 17, 13);
-    $prmt = Array( 1,  2,  1,  2,  1,  2,  1,  2,  1,  2,  1,  2,  1,  2,  1,  2);
-    for($i=0; $i < 16; $i++) {
+    $grp  = array(10, 14, 11, 15, 12, 16, 13, 17, 14, 10, 15, 11, 16, 12, 17, 13);
+    $prmt = array(1,  2,  1,  2,  1,  2,  1,  2,  1,  2,  1,  2,  1,  2,  1,  2);
+    for ($i = 0; $i < 16; $i++) {
         $general = $db->queryFirstRow('SELECT * FROM tournament WHERE grp=%i AND prmt=%i LIMIT 1', $grp[$i], $prmt[$i]);
         //16강에 추가
         $newGrp    = 20 + intdiv($i, 2);
         $newGrp_no = $i % 2;
 
         $db->insert('tournament', [
-            'no'=>$general['no'],
-            'npc'=>$general['npc'],
-            'name'=>$general['name'],
-            'leadership'=>$general['leadership'],
-            'strength'=>$general['strength'],
-            'intel'=>$general['intel'],
-            'lvl'=>$general['lvl'],
-            'grp'=>$newGrp,
-            'grp_no'=>$newGrp_no,
-            'h'=>$general['h'],
-            'w'=>$general['w'],
-            'b'=>$general['b']
+            'no' => $general['no'],
+            'npc' => $general['npc'],
+            'name' => $general['name'],
+            'leadership' => $general['leadership'],
+            'strength' => $general['strength'],
+            'intel' => $general['intel'],
+            'lvl' => $general['lvl'],
+            'grp' => $newGrp,
+            'grp_no' => $newGrp_no,
+            'h' => $general['h'],
+            'w' => $general['w'],
+            'b' => $general['b']
         ]);
     }
     $db->update('tournament', [
-        'prmt'=>0
+        'prmt' => 0
     ], true);
 
-    $gameStor->tournament=6;
-    $gameStor->phase=0;
+    $gameStor->tournament = 6;
+    $gameStor->phase = 0;
 }
 
-function finalFight($tnmt_type, $tnmt, $phase, $type) {
+function finalFight($tnmt_type, $tnmt, $phase, $type)
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    switch($type) {
-    case 16: $offset = 20; $turn = 7; $next = 7; break;
-    case  8: $offset = 30; $turn = 3; $next = 8; break;
-    case  4: $offset = 40; $turn = 1; $next = 9; break;
-    case  2: $offset = 50; $turn = 0; $next = 0; break;
-    default: throw new MustNotBeReachedException();
+    switch ($type) {
+        case 16:
+            $offset = 20;
+            $turn = 7;
+            $next = 7;
+            break;
+        case  8:
+            $offset = 30;
+            $turn = 3;
+            $next = 8;
+            break;
+        case  4:
+            $offset = 40;
+            $turn = 1;
+            $next = 9;
+            break;
+        case  2:
+            $offset = 50;
+            $turn = 0;
+            $next = 0;
+            break;
+        default:
+            throw new MustNotBeReachedException();
     }
 
     $grp = $phase + $offset;
     fight($tnmt_type, $tnmt, $phase, $grp, 0, 1, 1);
 
-    $gameStor->phase+=1;
+    $gameStor->phase += 1;
 
     $general = $db->queryFirstRow('SELECT * FROM tournament WHERE grp=%i AND win>0 AND (grp_no=0 OR grp_no=1) LIMIT 1', $grp);
     //x강에 추가
     $newGrp    = intdiv($phase, 2) + $offset + 10;
     $newGrp_no = $phase % 2;
     $db->insert('tournament', [
-        'no'=>$general['no'],
-        'npc'=>$general['npc'],
-        'name'=>$general['name'],
-        'leadership'=>$general['leadership'],
-        'strength'=>$general['strength'],
-        'intel'=>$general['intel'],
-        'lvl'=>$general['lvl'],
-        'grp'=>$newGrp,
-        'grp_no'=>$newGrp_no,
-        'h'=>$general['h'],
-        'w'=>$general['w'],
-        'b'=>$general['b']
+        'no' => $general['no'],
+        'npc' => $general['npc'],
+        'name' => $general['name'],
+        'leadership' => $general['leadership'],
+        'strength' => $general['strength'],
+        'intel' => $general['intel'],
+        'lvl' => $general['lvl'],
+        'grp' => $newGrp,
+        'grp_no' => $newGrp_no,
+        'h' => $general['h'],
+        'w' => $general['w'],
+        'b' => $general['b']
     ]);
 
-    if($phase >= $turn) {
+    if ($phase >= $turn) {
         $gameStor->tournament = $next;
         $gameStor->phase = 0;
     }
 }
 
-function setGift($tnmt_type, $tnmt, $phase) {
+function setGift($tnmt_type, $tnmt, $phase)
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
@@ -660,22 +986,35 @@ function setGift($tnmt_type, $tnmt, $phase) {
 
     $resultHelper = [];
 
-    switch($tnmt_type) {
-    case 0: $tp = "전력전"; $tp2 = "tt"; break;
-    case 1: $tp = "통솔전"; $tp2 = "tl"; break;
-    case 2: $tp = "일기토"; $tp2 = "ts"; break;
-    case 3: $tp = "설전";   $tp2 = "ti"; break;
-    default: throw new MustNotBeReachedException();
+    switch ($tnmt_type) {
+        case 0:
+            $tp = "전력전";
+            $tp2 = "tt";
+            break;
+        case 1:
+            $tp = "통솔전";
+            $tp2 = "tl";
+            break;
+        case 2:
+            $tp = "일기토";
+            $tp2 = "ts";
+            break;
+        case 3:
+            $tp = "설전";
+            $tp2 = "ti";
+            break;
+        default:
+            throw new MustNotBeReachedException();
     }
 
     //16강자 명성 돈
     $cost = $admin['develcost'];
     //experience를 General로
-    foreach($db->query('SELECT no, name, grp, grp_no FROM tournament WHERE grp>=20 AND grp<30 AND no > 0') as $general){
+    foreach ($db->query('SELECT no, name, grp, grp_no FROM tournament WHERE grp>=20 AND grp<30 AND no > 0') as $general) {
         $generalID = $general['no'];
         $db->update('general', [
-            'experience'=>$db->sqleval('experience + 25'),
-            'gold'=>$db->sqleval('gold + %i', $cost)
+            'experience' => $db->sqleval('experience + 25'),
+            'gold' => $db->sqleval('gold + %i', $cost)
         ], 'no=%i', $general['no']);
         $db->update('rank_data', [
             'value' => $db->sqleval('value + 1')
@@ -684,22 +1023,22 @@ function setGift($tnmt_type, $tnmt, $phase) {
 
         $logger = new ActionLogger($generalID, 0, $admin['year'], $admin['month']);
         $resultHelper[$generalID] = [
-            'id'=>$generalID,
-            'grp'=>$general['grp'],
-            'grp_no'=>$general['grp_no'],
-            'reward'=>$cost,
-            'msg'=>"<span class='ev_highlight'>16강 진출</span>",
-            'logger'=>$logger,
-            'inheritance_point'=>10,
+            'id' => $generalID,
+            'grp' => $general['grp'],
+            'grp_no' => $general['grp_no'],
+            'reward' => $cost,
+            'msg' => "<span class='ev_highlight'>16강 진출</span>",
+            'logger' => $logger,
+            'inheritance_point' => 10,
         ];
     }
     //8강자 명성 돈
     $cost = $admin['develcost'] * 2;
-    foreach($db->query('SELECT no, name FROM tournament WHERE grp>=30 AND grp<40 AND no > 0') as $general){
+    foreach ($db->query('SELECT no, name FROM tournament WHERE grp>=30 AND grp<40 AND no > 0') as $general) {
         $generalID = $general['no'];
         $db->update('general', [
-            'experience'=>$db->sqleval('experience + 50'),
-            'gold'=>$db->sqleval('gold + %i', $cost)
+            'experience' => $db->sqleval('experience + 50'),
+            'gold' => $db->sqleval('gold + %i', $cost)
         ], 'no=%i', $general['no']);
         $db->update('rank_data', [
             'value' => $db->sqleval('value + 1')
@@ -711,11 +1050,11 @@ function setGift($tnmt_type, $tnmt, $phase) {
     }
     //4강자 명성 돈
     $cost = $admin['develcost'] * 3;
-    foreach($db->query('SELECT no, name FROM tournament WHERE grp>=40 AND grp<50 AND no > 0') as $general){
+    foreach ($db->query('SELECT no, name FROM tournament WHERE grp>=40 AND grp<50 AND no > 0') as $general) {
         $generalID = $general['no'];
         $db->update('general', [
-            'experience'=>$db->sqleval('experience + 50'),
-            'gold'=>$db->sqleval('gold + %i', $cost)
+            'experience' => $db->sqleval('experience + 50'),
+            'gold' => $db->sqleval('gold + %i', $cost)
         ], 'no=%i', $general['no']);
         $db->update('rank_data', [
             'value' => $db->sqleval('value + 2')
@@ -728,11 +1067,11 @@ function setGift($tnmt_type, $tnmt, $phase) {
     }
     //결승자 명성 돈
     $cost = $admin['develcost'] * 6;
-    foreach($db->query('SELECT no, name, lose FROM tournament WHERE grp>=50 AND grp<60 AND no > 0') as $general){
+    foreach ($db->query('SELECT no, name, lose FROM tournament WHERE grp>=50 AND grp<60 AND no > 0') as $general) {
         $generalID = $general['no'];
         $db->update('general', [
-            'experience'=>$db->sqleval('experience + 100'),
-            'gold'=>$db->sqleval('gold + %i', $cost)
+            'experience' => $db->sqleval('experience + 100'),
+            'gold' => $db->sqleval('gold + %i', $cost)
         ], 'no=%i', $general['no']);
         $db->update('rank_data', [
             'value' => $db->sqleval('value + 2')
@@ -742,17 +1081,17 @@ function setGift($tnmt_type, $tnmt, $phase) {
         $resultHelper[$generalID]['reward'] += $cost;
         $resultHelper[$generalID]['msg'] = "<span class='ev_highlight'>준우승</span>으";
         $resultHelper[$generalID]['inheritance_point'] = 50;
-        if($general['lose'] > 0){
+        if ($general['lose'] > 0) {
             $runnerUp = $general;
         }
     }
     //우승자 명성 돈
     $cost = $admin['develcost'] * 8;
-    foreach($db->query('SELECT no, name FROM tournament WHERE grp>=60 AND no > 0') as $general){
+    foreach ($db->query('SELECT no, name FROM tournament WHERE grp>=60 AND no > 0') as $general) {
         $generalID = $general['no'];
         $db->update('general', [
-            'experience'=>$db->sqleval('experience + 200'),
-            'gold'=>$db->sqleval('gold + %i', $cost)
+            'experience' => $db->sqleval('experience + 200'),
+            'gold' => $db->sqleval('gold + %i', $cost)
         ], 'no=%i', $general['no']);
         $db->update('rank_data', [
             'value' => $db->sqleval('value + 2')
@@ -785,12 +1124,12 @@ function setGift($tnmt_type, $tnmt, $phase) {
     $josaYiWinner = JosaUtil::pick($winner['name'], '이');
     $josaYiRunnerUp = JosaUtil::pick($runnerUp['name'], '이');
 
-    $winnerLogger->pushGlobalHistoryLog("<C>{$tp}</> 대회에서 <Y>{$winner['name']}</>{$josaYiWinner} <C>우승</>, <Y>{$runnerUp['name']}</>{$josaYiRunnerUp} <C>준우승</>을 차지하여 천하에 이름을 떨칩니다!", ActionLogger::EVENT_YEAR_MONTH);
-    $winnerLogger->pushGlobalHistoryLog("<C>{$tp}</> 대회의 <S>우승자</>에게는 <C>{$winnerRewardText}</>, <S>준우승자</>에겐 <C>{$runnerUpRewardText}</>의 <S>상금</>과 약간의 <S>명성</>이 주어집니다!", ActionLogger::EVENT_YEAR_MONTH);
+    $winnerLogger->pushGlobalHistoryLog("<B><b>【대회】</b></><C>{$tp}</> 대회에서 <Y>{$winner['name']}</>{$josaYiWinner} <C>우승</>, <Y>{$runnerUp['name']}</>{$josaYiRunnerUp} <C>준우승</>을 차지하여 천하에 이름을 떨칩니다!", ActionLogger::EVENT_YEAR_MONTH);
+    $winnerLogger->pushGlobalHistoryLog("<B><b>【대회】</b></><C>{$tp}</> 대회의 <S>우승자</>에게는 <C>{$winnerRewardText}</>, <S>준우승자</>에겐 <C>{$runnerUpRewardText}</>의 <S>상금</>과 약간의 <S>명성</>이 주어집니다!", ActionLogger::EVENT_YEAR_MONTH);
 
     $generalObjList = General::createGeneralObjListFromDB(array_keys($resultHelper));
 
-    foreach($resultHelper as $generalID=>$general){
+    foreach ($resultHelper as $generalID => $general) {
         $rewardText = number_format($general['reward']);
         /** @var ActionLogger */
         $logger = $general['logger'];
@@ -811,20 +1150,23 @@ function setGift($tnmt_type, $tnmt, $phase) {
     $rewardRate = round($globalBetTotal / max($globalBet[$winnerSlot], 1), 2);
 
     $betKey = "bet{$winnerSlot}";
-    $gambleResult = Util::convertArrayToDict($db->query('SELECT general_id, %b as bet FROM betting WHERE %b > 0', $betKey, $betKey), 'general_id');
+    $gambleResult = Util::convertArrayToDict($db->query('SELECT general_id, %b as bet FROM betting WHERE %b > 0 AND general_id > 0', $betKey, $betKey), 'general_id');
 
-    foreach(General::createGeneralObjListFromDB(Util::squeezeFromArray($gambleResult, 'general_id'), ['gold'], 1) as $gambler){
+    foreach (General::createGeneralObjListFromDB(Util::squeezeFromArray($gambleResult, 'general_id'), ['gold', 'npc'], 1) as $gambler) {
         $reward = Util::round($gambleResult[$gambler->getID()]['bet'] * $rewardRate);
         $gambler->increaseVar('gold', $reward);
-        $gambler->increaseRankVar('betwingold', $reward);
-        $gambler->increaseRankVar('betwin', 1);
+        if (($gambler->getNPCType() == 0) || ($gambler->getNPCType() == 1 && $gambler->getRankVar('betgold') > 0)) {
+            $gambler->increaseRankVar('betwingold', $reward);
+            $gambler->increaseRankVar('betwin', 1);
+        }
         $rewardText = number_format($reward);
         $gambler->getLogger()->pushGeneralActionLog("<C>{$tp}</> 대회의 베팅 당첨으로 <C>{$rewardText}</>의 <S>금</> 획득!", ActionLogger::EVENT_PLAIN);
         $gambler->applyDB($db);
     }
 }
 
-function setRefund() {
+function setRefund()
+{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
@@ -832,12 +1174,12 @@ function setRefund() {
     $cost = $gameStor->develcost;
     $generalIDList = $db->queryFirstColumn('SELECT no FROM tournament WHERE grp<10 AND no > 0');
     $db->update('general', [
-        'gold'=>$db->sqleval('gold + %i', $cost)
+        'gold' => $db->sqleval('gold + %i', $cost)
     ], 'no IN %li', $generalIDList);
 
     //베팅금 환수
     $db->update(['general', [
-        'gold'=>$db->sqleval('gold + (SELECT bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 FROM betting WHERE general_id = general.no)')
+        'gold' => $db->sqleval('gold + (SELECT bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 FROM betting WHERE general_id = general.no)')
     ]], true);
 
     //자동진행 끝
@@ -845,17 +1187,19 @@ function setRefund() {
 }
 
 //10차이 1.1, 50 차이 1.17, 100차이 1.2
-function getLog($lvl1, $lvl2) {
-    if($lvl1 >= $lvl2) {
-        $ratio = 1 + log(1+$lvl1-$lvl2, 10) / 10;
+function getLog($lvl1, $lvl2)
+{
+    if ($lvl1 >= $lvl2) {
+        $ratio = 1 + log(1 + $lvl1 - $lvl2, 10) / 10;
     } else {
-        $ratio = 1 - log(1+$lvl2-$lvl1, 10) / 10;
+        $ratio = 1 - log(1 + $lvl2 - $lvl1, 10) / 10;
     }
     return $ratio;
 }
 
 //0 : 승무패, 1 : 승패
-function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) {
+function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type)
+{
     $log = [];
     $db = DB::db();
 
@@ -864,157 +1208,428 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) {
     $gen1 = $db->queryFirstRow('SELECT *,(leadership+strength+intel)*7/15 as total,h,w,b from tournament where grp=%i AND grp_no=%i', $group, $g1);
     $gen2 = $db->queryFirstRow('SELECT *,(leadership+strength+intel)*7/15 as total,h,w,b from tournament where grp=%i AND grp_no=%i', $group, $g2);
 
-    if($type == 0) { $turn = 10; }
-    else           { $turn = 100; }
+    if ($type == 0) {
+        $turn = 10;
+    } else {
+        $turn = 100;
+    }
 
 
-    if($tnmt_type == 1) { $tp = "leadership"; $tp2 = "tl"; }
-    elseif($tnmt_type == 2) { $tp = "strength"; $tp2 = "ts"; }
-    elseif($tnmt_type == 3) { $tp = "intel"; $tp2 = "ti"; }
-    else /*$tnmt_type == 0*/{ $tp = "total"; $tp2 = "tt"; }
+    if ($tnmt_type == 1) {
+        $tp = "leadership";
+        $tp2 = "tl";
+    } elseif ($tnmt_type == 2) {
+        $tp = "strength";
+        $tp2 = "ts";
+    } elseif ($tnmt_type == 3) {
+        $tp = "intel";
+        $tp2 = "ti";
+    } else /*$tnmt_type == 0*/ {
+        $tp = "total";
+        $tp2 = "tt";
+    }
 
     $e1 = $energy1 = Util::round($gen1[$tp] * getLog($gen1['lvl'], $gen2['lvl']) * 10);
     $e2 = $energy2 = Util::round($gen2[$tp] * getLog($gen1['lvl'], $gen2['lvl']) * 10);
 
 
 
-    foreach([$gen1, $gen2] as $gen){
+    foreach ([$gen1, $gen2] as $gen) {
         $horse = buildItemClass($gen['h']);
         $weapon = buildItemClass($gen['w']);
         $book = buildItemClass($gen['b']);
 
         //아이템 로그
-        if(!$horse->isBuyable() && ($tnmt_type == 0 || $tnmt_type == 1)) {
+        if (!$horse->isBuyable() && ($tnmt_type == 0 || $tnmt_type == 1)) {
             $itemName = $horse->getName();
             $itemRawName = $horse->getRawName();
-            switch(rand()%4) {
-            case 0:
-            $josaYi = JosaUtil::pick($itemRawName, '이');
-            $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>{$josaYi} 포효합니다!"; break;
-            case 1:
-            $josaYi = JosaUtil::pick($itemRawName, '이');
-            $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>{$josaYi} 그 위용을 뽐냅니다!"; break;
-            case 2:
-            $josaYi = JosaUtil::pick($gen['name'], '이');
-            $josaUl = JosaUtil::pick($itemRawName, '을');
-            $log[] = "<S>●</> <Y>{$gen['name']}</>{$josaYi} <S>{$itemName}</>{$josaUl} 타고 있습니다!"; break;
-            case 3:
-            $josaYi = JosaUtil::pick($itemRawName, '이');
-            $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>{$josaYi} 갈기를 휘날립니다!"; break;
+            switch (rand() % 4) {
+                case 0:
+                    $josaYi = JosaUtil::pick($itemRawName, '이');
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>{$josaYi} 포효합니다!";
+                    break;
+                case 1:
+                    $josaYi = JosaUtil::pick($itemRawName, '이');
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>{$josaYi} 그 위용을 뽐냅니다!";
+                    break;
+                case 2:
+                    $josaYi = JosaUtil::pick($gen['name'], '이');
+                    $josaUl = JosaUtil::pick($itemRawName, '을');
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>{$josaYi} <S>{$itemName}</>{$josaUl} 타고 있습니다!";
+                    break;
+                case 3:
+                    $josaYi = JosaUtil::pick($itemRawName, '이');
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>{$josaYi} 갈기를 휘날립니다!";
+                    break;
             }
         }
-        if(!$weapon->isBuyable() && ($tnmt_type == 0 || $tnmt_type == 2)) {
+        if (!$weapon->isBuyable() && ($tnmt_type == 0 || $tnmt_type == 2)) {
             $itemName = $weapon->getName();
             $itemRawName = $weapon->getRawName();
-            switch(rand()%4) {
-            case 0:
-            $josaYi = JosaUtil::pick($itemRawName, '이');
-            $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>{$josaYi} 번뜩입니다!"; break;
-            case 1:
-            $josaYi = JosaUtil::pick($itemRawName, '이');
-            $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>{$josaYi} 푸르게 빛납니다!"; break;
-            case 2:
-            $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>에서 살기가 느껴집니다!"; break;
-            case 3:
-            $josaYi = JosaUtil::pick($itemRawName, '이');
-            $log[] = "<S>●</> <Y>{$gen['name']}</>의 손에는 <S>{$itemName}</>{$josaYi} 쥐어져 있습니다!"; break;
+            switch (rand() % 4) {
+                case 0:
+                    $josaYi = JosaUtil::pick($itemRawName, '이');
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>{$josaYi} 번뜩입니다!";
+                    break;
+                case 1:
+                    $josaYi = JosaUtil::pick($itemRawName, '이');
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>{$josaYi} 푸르게 빛납니다!";
+                    break;
+                case 2:
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>의 <S>{$itemName}</>에서 살기가 느껴집니다!";
+                    break;
+                case 3:
+                    $josaYi = JosaUtil::pick($itemRawName, '이');
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>의 손에는 <S>{$itemName}</>{$josaYi} 쥐어져 있습니다!";
+                    break;
             }
         }
-        if(!$book->isBuyable() && ($tnmt_type == 0 || $tnmt_type == 3)) {
+        if (!$book->isBuyable() && ($tnmt_type == 0 || $tnmt_type == 3)) {
             $itemName = $book->getName();
             $itemRawName = $book->getRawName();
-            switch(rand()%4) {
-            case 0:
-            $josaYi = JosaUtil::pick($gen['name'], '이');
-            $josaUl = JosaUtil::pick($itemRawName, '을');
-            $log[] = "<S>●</> <Y>{$gen['name']}</>{$josaYi} <S>{$itemName}</>{$josaUl} 펼쳐듭니다!"; break;
-            case 1:
-            $josaYi = JosaUtil::pick($gen['name'], '이');
-            $josaUl = JosaUtil::pick($itemRawName, '을');
-            $log[] = "<S>●</> <Y>{$gen['name']}</>{$josaYi} <S>{$itemName}</>{$josaUl} 품에서 꺼냅니다!"; break;
-            case 2:
-            $josaYi = JosaUtil::pick($gen['name'], '이');
-            $josaUl = JosaUtil::pick($itemRawName, '을');
-            $log[] = "<S>●</> <Y>{$gen['name']}</>{$josaYi} <S>{$itemName}</>{$josaUl} 들고 있습니다!"; break;
-            case 3:
-            $josaYi = JosaUtil::pick($itemRawName, '이');
-            $log[] = "<S>●</> <Y>{$gen['name']}</>의 손에는 <S>{$itemName}</>{$josaYi} 쥐어져 있습니다!"; break;
+            switch (rand() % 4) {
+                case 0:
+                    $josaYi = JosaUtil::pick($gen['name'], '이');
+                    $josaUl = JosaUtil::pick($itemRawName, '을');
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>{$josaYi} <S>{$itemName}</>{$josaUl} 펼쳐듭니다!";
+                    break;
+                case 1:
+                    $josaYi = JosaUtil::pick($gen['name'], '이');
+                    $josaUl = JosaUtil::pick($itemRawName, '을');
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>{$josaYi} <S>{$itemName}</>{$josaUl} 품에서 꺼냅니다!";
+                    break;
+                case 2:
+                    $josaYi = JosaUtil::pick($gen['name'], '이');
+                    $josaUl = JosaUtil::pick($itemRawName, '을');
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>{$josaYi} <S>{$itemName}</>{$josaUl} 들고 있습니다!";
+                    break;
+                case 3:
+                    $josaYi = JosaUtil::pick($itemRawName, '이');
+                    $log[] = "<S>●</> <Y>{$gen['name']}</>의 손에는 <S>{$itemName}</>{$josaYi} 쥐어져 있습니다!";
+                    break;
             }
         }
     }
 
     $log[] = "<S>●</> <Y>{$gen1['name']}</> <C>({$energy1})</> vs <C>({$energy2})</> <Y>{$gen2['name']}</>";
 
-    $gd1 = 0;       $gd2 = 0;
-    $phase = 0;     $sel = 2;
-    while($phase < $turn) {
+    $gd1 = 0;
+    $gd2 = 0;
+    $phase = 0;
+    $sel = 2;
+    while ($phase < $turn) {
         $phase++;
         //평타
         $damage1 = Util::round($gen2[$tp] * (rand() % 21 + 90) / 130);   // 90~110%
         $damage2 = Util::round($gen1[$tp] * (rand() % 21 + 90) / 130);   // 90~110%
         //보너스타
         $ratio = rand() % 100;
-        if($gen1[$tp] >= $ratio) { $damage2 += Util::round($gen1[$tp] * (rand() % 41 + 10) / 130); }   // 10~50
+        if ($gen1[$tp] >= $ratio) {
+            $damage2 += Util::round($gen1[$tp] * (rand() % 41 + 10) / 130);
+        }   // 10~50
         $ratio = rand() % 100;
-        if($gen2[$tp] >= $ratio) { $damage1 += Util::round($gen2[$tp] * (rand() % 41 + 10) / 130); }   // 10~50
-        $critical1 = 0; $critical2 = 0;
+        if ($gen2[$tp] >= $ratio) {
+            $damage1 += Util::round($gen2[$tp] * (rand() % 41 + 10) / 130);
+        }   // 10~50
+        $critical1 = 0;
+        $critical2 = 0;
         //막판 분노
         $ratio = rand() % 300;
-        if($e1 / 5 > $energy1 && $damage1 > $damage2 && $gen1[$tp] >= $ratio) {
+        if ($e1 / 5 > $energy1 && $damage1 > $damage2 && $gen1[$tp] >= $ratio) {
             $damage2 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
             $critical1 = 1;
-            if    ($tnmt_type == 0) { switch(rand()%2) { case 0: $str = "전력"; break; case 1: $str = "집중"; break; } }
-            elseif($tnmt_type == 1) { switch(rand()%2) { case 0: $str = "봉시진"; break; case 1: $str = "어린진"; break; } }
-            elseif($tnmt_type == 2) { switch(rand()%2) { case 0: $str = "삼단"; break; case 1: $str = "나선"; break; } }
-            elseif($tnmt_type == 3) { switch(rand()%2) { case 0: $str = "독설"; break; case 1: $str = "논파"; break; } }
+            if ($tnmt_type == 0) {
+                switch (rand() % 2) {
+                    case 0:
+                        $str = "전력";
+                        break;
+                    case 1:
+                        $str = "집중";
+                        break;
+                }
+            } elseif ($tnmt_type == 1) {
+                switch (rand() % 2) {
+                    case 0:
+                        $str = "봉시진";
+                        break;
+                    case 1:
+                        $str = "어린진";
+                        break;
+                }
+            } elseif ($tnmt_type == 2) {
+                switch (rand() % 2) {
+                    case 0:
+                        $str = "삼단";
+                        break;
+                    case 1:
+                        $str = "나선";
+                        break;
+                }
+            } elseif ($tnmt_type == 3) {
+                switch (rand() % 2) {
+                    case 0:
+                        $str = "독설";
+                        break;
+                    case 1:
+                        $str = "논파";
+                        break;
+                }
+            }
             $log[] = "<S>●</> <Y>{$gen1['name']}</>의 분노의 <M>{$str}</> 공격!";
         }
         $ratio = rand() % 300;
-        if($e2 / 5 > $energy2 && $damage2 > $damage1 && $gen2[$tp] >= $ratio) {
+        if ($e2 / 5 > $energy2 && $damage2 > $damage1 && $gen2[$tp] >= $ratio) {
             $damage1 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
             $critical2 = 1;
-                if($tnmt_type == 0) { switch(rand()%2) { case 0: $str = "전력"; break; case 1: $str = "집중"; break; } }
-            elseif($tnmt_type == 1) { switch(rand()%2) { case 0: $str = "봉시진"; break; case 1: $str = "어린진"; break; } }
-            elseif($tnmt_type == 2) { switch(rand()%2) { case 0: $str = "삼단"; break; case 1: $str = "나선"; break; } }
-            elseif($tnmt_type == 3) { switch(rand()%2) { case 0: $str = "독설"; break; case 1: $str = "논파"; break; } }
+            if ($tnmt_type == 0) {
+                switch (rand() % 2) {
+                    case 0:
+                        $str = "전력";
+                        break;
+                    case 1:
+                        $str = "집중";
+                        break;
+                }
+            } elseif ($tnmt_type == 1) {
+                switch (rand() % 2) {
+                    case 0:
+                        $str = "봉시진";
+                        break;
+                    case 1:
+                        $str = "어린진";
+                        break;
+                }
+            } elseif ($tnmt_type == 2) {
+                switch (rand() % 2) {
+                    case 0:
+                        $str = "삼단";
+                        break;
+                    case 1:
+                        $str = "나선";
+                        break;
+                }
+            } elseif ($tnmt_type == 3) {
+                switch (rand() % 2) {
+                    case 0:
+                        $str = "독설";
+                        break;
+                    case 1:
+                        $str = "논파";
+                        break;
+                }
+            }
             $log[] = "<S>●</> <Y>{$gen2['name']}</>의 분노의 <M>{$str}</> 공격!";
         }
         //1합 승부
-        if($phase == 1) {
+        if ($phase == 1) {
             $ratio = rand() % 400;
-            if($gen1[$tp]*0.9 > $gen2[$tp] && $gen1[$tp] >= $ratio) {
-                $damage1 = 0;   $damage2 = $e2;
-                if    ($tnmt_type == 0) { $log[] = "<S>●</> <Y>{$gen1['name']}</>의 <M>압도</>!"; }
-                elseif($tnmt_type == 1) { $log[] = "<S>●</> <Y>{$gen1['name']}</>의 <M>팔문금쇄진</>!"; }
-                elseif($tnmt_type == 2) { $log[] = "<S>●</> <Y>{$gen1['name']}</>의 <M>일격 필살</>!"; }
-                elseif($tnmt_type == 3) { $log[] = "<S>●</> <Y>{$gen1['name']}</>의 <M>모독 욕설</>!"; }
+            if ($gen1[$tp] * 0.9 > $gen2[$tp] && $gen1[$tp] >= $ratio) {
+                $damage1 = 0;
+                $damage2 = $e2;
+                if ($tnmt_type == 0) {
+                    $log[] = "<S>●</> <Y>{$gen1['name']}</>의 <M>압도</>!";
+                } elseif ($tnmt_type == 1) {
+                    $log[] = "<S>●</> <Y>{$gen1['name']}</>의 <M>팔문금쇄진</>!";
+                } elseif ($tnmt_type == 2) {
+                    $log[] = "<S>●</> <Y>{$gen1['name']}</>의 <M>일격 필살</>!";
+                } elseif ($tnmt_type == 3) {
+                    $log[] = "<S>●</> <Y>{$gen1['name']}</>의 <M>모독 욕설</>!";
+                }
             }
-            if($gen2[$tp]*0.9 > $gen1[$tp] && $gen2[$tp] >= $ratio) {
-                $damage2 = 0;   $damage1 = $e1;
-                if    ($tnmt_type == 0) { $log[] = "<S>●</> <Y>{$gen2['name']}</>의 <M>압도</>!"; }
-                elseif($tnmt_type == 1) { $log[] = "<S>●</> <Y>{$gen2['name']}</>의 <M>팔문금쇄진</>!"; }
-                elseif($tnmt_type == 2) { $log[] = "<S>●</> <Y>{$gen2['name']}</>의 <M>일격 필살</>!"; }
-                elseif($tnmt_type == 3) { $log[] = "<S>●</> <Y>{$gen2['name']}</>의 <M>모독 욕설</>!"; }
+            if ($gen2[$tp] * 0.9 > $gen1[$tp] && $gen2[$tp] >= $ratio) {
+                $damage2 = 0;
+                $damage1 = $e1;
+                if ($tnmt_type == 0) {
+                    $log[] = "<S>●</> <Y>{$gen2['name']}</>의 <M>압도</>!";
+                } elseif ($tnmt_type == 1) {
+                    $log[] = "<S>●</> <Y>{$gen2['name']}</>의 <M>팔문금쇄진</>!";
+                } elseif ($tnmt_type == 2) {
+                    $log[] = "<S>●</> <Y>{$gen2['name']}</>의 <M>일격 필살</>!";
+                } elseif ($tnmt_type == 3) {
+                    $log[] = "<S>●</> <Y>{$gen2['name']}</>의 <M>모독 욕설</>!";
+                }
             }
         } else {
             $ratio = rand() % 1000;
-            if($critical1 == 0 && $gen1[$tp] >= $ratio) {
+            if ($critical1 == 0 && $gen1[$tp] >= $ratio) {
                 $damage2 *= Util::randRangeInt(150, 300) / 100; // 150 ~ 300%
                 $critical1 = 1;
-                if    ($tnmt_type == 0) { switch(rand()%6) { case 0: $str = "참격"; break; case 1: $str = "집중"; break; case 2: $str = "역공"; break; case 3: $str = "반격"; break; case 4: $str = "선제"; break; case 5: $str = "도발"; break; } }
-                elseif($tnmt_type == 1) { switch(rand()%6) { case 0: $str = "추행진"; break; case 1: $str = "학익진"; break; case 2: $str = "장사진"; break; case 3: $str = "형액진"; break; case 4: $str = "기형진"; break; case 5: $str = "구행진"; break; } }
-                elseif($tnmt_type == 2) { switch(rand()%6) { case 0: $str = "기합"; break; case 1: $str = "기염"; break; case 2: $str = "반격"; break; case 3: $str = "역공"; break; case 4: $str = "삼단"; break; case 5: $str = "나선"; break; } }
-                elseif($tnmt_type == 3) { switch(rand()%6) { case 0: $str = "논파"; break; case 1: $str = "항변"; break; case 2: $str = "반론"; break; case 3: $str = "반박"; break; case 4: $str = "도발"; break; case 5: $str = "면박"; break; } }
+                if ($tnmt_type == 0) {
+                    switch (rand() % 6) {
+                        case 0:
+                            $str = "참격";
+                            break;
+                        case 1:
+                            $str = "집중";
+                            break;
+                        case 2:
+                            $str = "역공";
+                            break;
+                        case 3:
+                            $str = "반격";
+                            break;
+                        case 4:
+                            $str = "선제";
+                            break;
+                        case 5:
+                            $str = "도발";
+                            break;
+                    }
+                } elseif ($tnmt_type == 1) {
+                    switch (rand() % 6) {
+                        case 0:
+                            $str = "추행진";
+                            break;
+                        case 1:
+                            $str = "학익진";
+                            break;
+                        case 2:
+                            $str = "장사진";
+                            break;
+                        case 3:
+                            $str = "형액진";
+                            break;
+                        case 4:
+                            $str = "기형진";
+                            break;
+                        case 5:
+                            $str = "구행진";
+                            break;
+                    }
+                } elseif ($tnmt_type == 2) {
+                    switch (rand() % 6) {
+                        case 0:
+                            $str = "기합";
+                            break;
+                        case 1:
+                            $str = "기염";
+                            break;
+                        case 2:
+                            $str = "반격";
+                            break;
+                        case 3:
+                            $str = "역공";
+                            break;
+                        case 4:
+                            $str = "삼단";
+                            break;
+                        case 5:
+                            $str = "나선";
+                            break;
+                    }
+                } elseif ($tnmt_type == 3) {
+                    switch (rand() % 6) {
+                        case 0:
+                            $str = "논파";
+                            break;
+                        case 1:
+                            $str = "항변";
+                            break;
+                        case 2:
+                            $str = "반론";
+                            break;
+                        case 3:
+                            $str = "반박";
+                            break;
+                        case 4:
+                            $str = "도발";
+                            break;
+                        case 5:
+                            $str = "면박";
+                            break;
+                    }
+                }
                 $log[] = "<S>●</> <Y>{$gen1['name']}</>의 <M>{$str}</>!";
             }
             $ratio = rand() % 1000;
-            if($critical2 == 0 && $gen2[$tp] >= $ratio) {
+            if ($critical2 == 0 && $gen2[$tp] >= $ratio) {
                 $damage1 *= Util::randRangeInt(150, 300) / 100; // 150 ~ 300%
                 $critical2 = 1;
-                if    ($tnmt_type == 0) { switch(rand()%6) { case 0: $str = "참격"; break; case 1: $str = "집중"; break; case 2: $str = "역공"; break; case 3: $str = "반격"; break; case 4: $str = "선제"; break; case 5: $str = "도발"; break; } }
-                elseif($tnmt_type == 1) { switch(rand()%6) { case 0: $str = "추행진"; break; case 1: $str = "학익진"; break; case 2: $str = "장사진"; break; case 3: $str = "형액진"; break; case 4: $str = "기형진"; break; case 5: $str = "구행진"; break; } }
-                elseif($tnmt_type == 2) { switch(rand()%6) { case 0: $str = "기합"; break; case 1: $str = "기염"; break; case 2: $str = "반격"; break; case 3: $str = "역공"; break; case 4: $str = "삼단"; break; case 5: $str = "나선"; break; } }
-                elseif($tnmt_type == 3) { switch(rand()%6) { case 0: $str = "논파"; break; case 1: $str = "항변"; break; case 2: $str = "반론"; break; case 3: $str = "반박"; break; case 4: $str = "도발"; break; case 5: $str = "면박"; break; } }
+                if ($tnmt_type == 0) {
+                    switch (rand() % 6) {
+                        case 0:
+                            $str = "참격";
+                            break;
+                        case 1:
+                            $str = "집중";
+                            break;
+                        case 2:
+                            $str = "역공";
+                            break;
+                        case 3:
+                            $str = "반격";
+                            break;
+                        case 4:
+                            $str = "선제";
+                            break;
+                        case 5:
+                            $str = "도발";
+                            break;
+                    }
+                } elseif ($tnmt_type == 1) {
+                    switch (rand() % 6) {
+                        case 0:
+                            $str = "추행진";
+                            break;
+                        case 1:
+                            $str = "학익진";
+                            break;
+                        case 2:
+                            $str = "장사진";
+                            break;
+                        case 3:
+                            $str = "형액진";
+                            break;
+                        case 4:
+                            $str = "기형진";
+                            break;
+                        case 5:
+                            $str = "구행진";
+                            break;
+                    }
+                } elseif ($tnmt_type == 2) {
+                    switch (rand() % 6) {
+                        case 0:
+                            $str = "기합";
+                            break;
+                        case 1:
+                            $str = "기염";
+                            break;
+                        case 2:
+                            $str = "반격";
+                            break;
+                        case 3:
+                            $str = "역공";
+                            break;
+                        case 4:
+                            $str = "삼단";
+                            break;
+                        case 5:
+                            $str = "나선";
+                            break;
+                    }
+                } elseif ($tnmt_type == 3) {
+                    switch (rand() % 6) {
+                        case 0:
+                            $str = "논파";
+                            break;
+                        case 1:
+                            $str = "항변";
+                            break;
+                        case 2:
+                            $str = "반론";
+                            break;
+                        case 3:
+                            $str = "반박";
+                            break;
+                        case 4:
+                            $str = "도발";
+                            break;
+                        case 5:
+                            $str = "면박";
+                            break;
+                    }
+                }
                 $log[] = "<S>●</> <Y>{$gen2['name']}</>의 <M>{$str}</>!";
             }
         }
@@ -1024,135 +1639,179 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) {
 
         $energy1 -= $damage1;
         $energy2 -= $damage2;
-        $tDamage1 = $damage1;   $tDamage2 = $damage2;
-        $tEnergy1 = $energy1;   $tEnergy2 = $energy2;
-        if($energy1 <= 0 && $energy2 <= 0) {
+        $tDamage1 = $damage1;
+        $tDamage2 = $damage2;
+        $tEnergy1 = $energy1;
+        $tEnergy2 = $energy2;
+        if ($energy1 <= 0 && $energy2 <= 0) {
             $r1 = $tEnergy1 / Util::valueFit($tDamage1, 1);
             $r2 = $tEnergy2 / Util::valueFit($tDamage2, 1);
 
-            if($r1 > $r2) {
-                $offset = Util::round($tEnergy2*$tDamage1/Util::valueFit($tDamage2,1));
-                $damage1 += $offset;    $energy1 -= $offset;
-                $damage2 += $tEnergy2;  $energy2 = 0;
+            if ($r1 > $r2) {
+                $offset = Util::round($tEnergy2 * $tDamage1 / Util::valueFit($tDamage2, 1));
+                $damage1 += $offset;
+                $energy1 -= $offset;
+                $damage2 += $tEnergy2;
+                $energy2 = 0;
             } else {
-                $offset = Util::round($tEnergy1*$tDamage2/Util::valueFit($tDamage1,1));
-                $damage2 += $offset;    $energy2 -= $offset;
-                $damage1 += $tEnergy1;  $energy1 = 0;
+                $offset = Util::round($tEnergy1 * $tDamage2 / Util::valueFit($tDamage1, 1));
+                $damage2 += $offset;
+                $energy2 -= $offset;
+                $damage1 += $tEnergy1;
+                $energy1 = 0;
             }
-        } elseif($energy1 * $energy2 <= 0) {
-            if($energy2 < 0) {
-                $offset = Util::round($tEnergy2*$tDamage1/Util::valueFit($tDamage2,1));
-                $damage1 += $offset;    $energy1 -= $offset;
-                $damage2 += $tEnergy2;  $energy2 = 0;
+        } elseif ($energy1 * $energy2 <= 0) {
+            if ($energy2 < 0) {
+                $offset = Util::round($tEnergy2 * $tDamage1 / Util::valueFit($tDamage2, 1));
+                $damage1 += $offset;
+                $energy1 -= $offset;
+                $damage2 += $tEnergy2;
+                $energy2 = 0;
             }
-            if($energy1 < 0) {
-                $offset = Util::round($tEnergy1*$tDamage2/Util::valueFit($tDamage1,1));
-                $damage2 += $offset;    $energy2 -= $offset;
-                $damage1 += $tEnergy1;  $energy1 = 0;
+            if ($energy1 < 0) {
+                $offset = Util::round($tEnergy1 * $tDamage2 / Util::valueFit($tDamage1, 1));
+                $damage2 += $offset;
+                $energy2 -= $offset;
+                $damage1 += $tEnergy1;
+                $energy1 = 0;
             }
         }
-        $gd1 += $damage1;           $gd2 += $damage2;
-        $energy1 = Util::round($energy1); $energy2 = Util::round($energy2);
-        $damage1 = Util::round($damage1); $damage2 = Util::round($damage2);
+        $gd1 += $damage1;
+        $gd2 += $damage2;
+        $energy1 = Util::round($energy1);
+        $energy2 = Util::round($energy2);
+        $damage1 = Util::round($damage1);
+        $damage2 = Util::round($damage2);
 
         $log[] = '<S>●</> '
-            .StringUtil::padStringAlignRight((string)$phase, 2, "0").'合 : '
-            .'<C>'.StringUtil::padStringAlignRight((string)$energy1, 3, "0").'</>'
-            .'<span class="ev_highlight">(-'.StringUtil::padStringAlignRight((string)$damage1, 3, "0").')</span>'
-            .' vs '
-            .'<span class="ev_highlight">(-'.StringUtil::padStringAlignRight((string)$damage2, 3, "0").')</span>'
-            .'<C>'.StringUtil::padStringAlignRight((string)$energy2, 3, "0").'</>';
+            . StringUtil::padStringAlignRight((string)$phase, 2, "0") . '合 : '
+            . '<C>' . StringUtil::padStringAlignRight((string)$energy1, 3, "0") . '</>'
+            . '<span class="ev_highlight">(-' . StringUtil::padStringAlignRight((string)$damage1, 3, "0") . ')</span>'
+            . ' vs '
+            . '<span class="ev_highlight">(-' . StringUtil::padStringAlignRight((string)$damage2, 3, "0") . ')</span>'
+            . '<C>' . StringUtil::padStringAlignRight((string)$energy2, 3, "0") . '</>';
 
-        if($energy1 <= 0 && $energy2 <= 0) {
-            if($type == 0) { $sel = 2; break; }
-            else {
-                $energy1 = Util::round($e1 / 2); $energy2 = Util::round($e2 / 2);
+        if ($energy1 <= 0 && $energy2 <= 0) {
+            if ($type == 0) {
+                $sel = 2;
+                break;
+            } else {
+                $energy1 = Util::round($e1 / 2);
+                $energy2 = Util::round($e2 / 2);
                 $log[] = "<S>●</> <span class='ev_highlight'>재대결</span>!";
             }
         }
-        if($energy1 <= 0) { $sel = 1; break; }
-        if($energy2 <= 0) { $sel = 0; break; }
+        if ($energy1 <= 0) {
+            $sel = 1;
+            break;
+        }
+        if ($energy2 <= 0) {
+            $sel = 0;
+            break;
+        }
     }
 
-    $general1 = $db->queryFirstRow('SELECT value as gl FROM rank_data WHERE general_id = %i AND type = %s', $gen1['no'], $tp2.'g');
-    $general2 = $db->queryFirstRow('SELECT value as gl FROM rank_data WHERE general_id = %i AND type = %s', $gen2['no'], $tp2.'g');
+    $gen1gl = $db->queryFirstField('SELECT value as gl FROM rank_data WHERE general_id = %i AND type = %s', $gen1['no'], $tp2 . 'g') ?? 0;
+    $gen2gl = $db->queryFirstField('SELECT value as gl FROM rank_data WHERE general_id = %i AND type = %s', $gen2['no'], $tp2 . 'g') ?? 0;
 
-    switch($sel) {
-    case 0:
-        $log[] = "<S>●</> <Y>{$gen1['name']}</> <S>승리</>!";
+    switch ($sel) {
+        case 0:
+            $log[] = "<S>●</> <Y>{$gen1['name']}</> <S>승리</>!";
 
-        $gl = Util::round(($gd2 - $gd1) / 50);
-        $db->update('tournament', [
-            'win'=>$db->sqleval('win+1'),
-            'gl'=>$db->sqleval('gl+%i', $gl)
-        ], 'grp=%i AND grp_no=%i', $group, $g1);
-        $db->update('tournament', [
-            'lose'=>$db->sqleval('lose+1'),
-            'gl'=>$db->sqleval('gl-%i', $gl)
-        ], 'grp=%i AND grp_no=%i', $group, $g2);
+            $gl = Util::round(($gd2 - $gd1) / 50);
+            $db->update('tournament', [
+                'win' => $db->sqleval('win+1'),
+                'gl' => $db->sqleval('gl+%i', $gl)
+            ], 'grp=%i AND grp_no=%i', $group, $g1);
+            $db->update('tournament', [
+                'lose' => $db->sqleval('lose+1'),
+                'gl' => $db->sqleval('gl-%i', $gl)
+            ], 'grp=%i AND grp_no=%i', $group, $g2);
 
-        if($general1['gl'] > $general2['gl'])      { $gl1 = 1; $gl2 = 0; }
-        elseif($general1['gl'] == $general2['gl']) { $gl1 = 2; $gl2 = -1; }
-        else                                   { $gl1 = 3; $gl2 = -2; }
+            if ($gen1gl > $gen2gl) {
+                $gl1 = 1;
+                $gl2 = 0;
+            } elseif ($gen1gl == $gen2gl) {
+                $gl1 = 2;
+                $gl2 = -1;
+            } else {
+                $gl1 = 3;
+                $gl2 = -2;
+            }
 
-        $gen1resKey = 'w';
-        $gen2resKey = 'l';
-        break;
-    case 1:
-        $log[] = "<S>●</> <Y>{$gen2['name']}</> <S>승리</>!";
+            $gen1resKey = 'w';
+            $gen2resKey = 'l';
+            break;
+        case 1:
+            $log[] = "<S>●</> <Y>{$gen2['name']}</> <S>승리</>!";
 
-        $gl = Util::round(($gd1 - $gd2) / 50);
-        $db->update('tournament', [
-            'lose'=>$db->sqleval('lose+1'),
-            'gl'=>$db->sqleval('gl-%i', $gl)
-        ], 'grp=%i AND grp_no=%i', $group, $g1);
-        $db->update('tournament', [
-            'win'=>$db->sqleval('win+1'),
-            'gl'=>$db->sqleval('gl+%i', $gl)
-        ], 'grp=%i AND grp_no=%i', $group, $g2);
+            $gl = Util::round(($gd1 - $gd2) / 50);
+            $db->update('tournament', [
+                'lose' => $db->sqleval('lose+1'),
+                'gl' => $db->sqleval('gl-%i', $gl)
+            ], 'grp=%i AND grp_no=%i', $group, $g1);
+            $db->update('tournament', [
+                'win' => $db->sqleval('win+1'),
+                'gl' => $db->sqleval('gl+%i', $gl)
+            ], 'grp=%i AND grp_no=%i', $group, $g2);
 
-        if($general2['gl'] > $general1['gl'])      { $gl2 = 1; $gl1 = 0; }
-        elseif($general2['gl'] == $general1['gl']) { $gl2 = 2; $gl1 = -1; }
-        else                                   { $gl2 = 3; $gl1 = -2; }
+            if ($gen2gl > $gen1gl) {
+                $gl2 = 1;
+                $gl1 = 0;
+            } elseif ($gen2gl == $gen1gl) {
+                $gl2 = 2;
+                $gl1 = -1;
+            } else {
+                $gl2 = 3;
+                $gl1 = -2;
+            }
 
-        $gen1resKey = 'l';
-        $gen2resKey = 'w';
-        break;
-    case 2:
-        $log[] = "<S>●</> 무승부!";
+            $gen1resKey = 'l';
+            $gen2resKey = 'w';
+            break;
+        case 2:
+            $log[] = "<S>●</> 무승부!";
 
-        $db->update('tournament', [
-            'draw'=>$db->sqleval('draw+1')
-        ], 'grp=%i AND (grp_no=%i OR grp_no=%i)', $group, $g1, $g2);
+            $db->update('tournament', [
+                'draw' => $db->sqleval('draw+1')
+            ], 'grp=%i AND (grp_no=%i OR grp_no=%i)', $group, $g1, $g2);
 
-        if($general1['gl'] > $general2['gl'])      { $gl2 = -1; $gl1 = 1; }
-        elseif($general1['gl'] == $general2['gl']) { $gl2 = 0; $gl1 = 0; }
-        else                                   { $gl2 = +1; $gl1 = -1; }
+            if ($gen1gl > $gen2gl) {
+                $gl2 = -1;
+                $gl1 = 1;
+            } elseif ($gen1gl == $gen2gl) {
+                $gl2 = 0;
+                $gl1 = 0;
+            } else {
+                $gl2 = +1;
+                $gl1 = -1;
+            }
 
-        $gen1resKey = 'd';
-        $gen2resKey = 'd';
-        break;
-    default: new MustNotBeReachedException();
+            $gen1resKey = 'd';
+            $gen2resKey = 'd';
+            break;
+        default:
+            throw new MustNotBeReachedException();
     }
 
     $db->update('rank_data', [
         'value' => $db->sqleval('value + 1')
-    ], 'general_id=%i AND type = %s',$gen1['no'], "{$tp2}{$gen1resKey}");
+    ], 'general_id=%i AND type = %s', $gen1['no'], "{$tp2}{$gen1resKey}");
     $db->update('rank_data', [
         'value' => $db->sqleval('value + %i', $gl1),
-    ], 'general_id=%i AND type = %s',$gen1['no'], "{$tp2}g");
+    ], 'general_id=%i AND type = %s', $gen1['no'], "{$tp2}g");
 
     $db->update('rank_data', [
         'value' => $db->sqleval('value + 1'),
-    ], 'general_id=%i AND type = %s',$gen2['no'], "{$tp2}{$gen2resKey}");
+    ], 'general_id=%i AND type = %s', $gen2['no'], "{$tp2}{$gen2resKey}");
     $db->update('rank_data', [
         'value' => $db->sqleval('value + %i', $gl2)
-    ], 'general_id=%i AND type = %s',$gen2['no'], "{$tp2}g");
+    ], 'general_id=%i AND type = %s', $gen2['no'], "{$tp2}g");
 
 
 
-    if(($tnmt == 2 && $phs < 55) || ($tnmt == 4 && $phs < 5)) {
-        $cand = getTwo($tnmt, $phs+1);
+    if (($tnmt == 2 && $phs < 55) || ($tnmt == 4 && $phs < 5)) {
+        $cand = getTwo($tnmt, $phs + 1);
 
         $gen1Name = $db->queryFirstField('SELECT name FROM tournament where grp=%i and grp_no=%i', $group, $cand[0]);
         $gen2Name = $db->queryFirstField('SELECT name FROM tournament where grp=%i and grp_no=%i', $group, $cand[1]);

hwe/index.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -20,7 +21,7 @@ if (!$userID) {
 //턴 실행.
 TurnExecutionHelper::executeAllCommand();
 
-if(!$session->isGameLoggedIn()){
+if (!$session->isGameLoggedIn()) {
     header('Location:..');
     die();
 }
@@ -41,8 +42,8 @@ $gameStor->cacheAll(true);
 
 if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
     $db->update('general', [
-        'newmsg'=>0,
-        'newvote'=>0
+        'newmsg' => 0,
+        'newvote' => 0
     ], 'owner=%i', $userID);
 }
 
@@ -59,29 +60,25 @@ $generalObj->setRawCity($db->queryFirstRow('SELECT * FROM city WHERE city = %i',
 $scenario = $gameStor->scenario_text;
 
 $nationID = $generalObj->getNationID();
-if($nationID){
+if ($nationID) {
     $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
     $nationStor->cacheAll();
 }
 
-$valid = 0;
 if ($gameStor->extended_general == 0) {
     $extend = "표준";
 } else {
     $extend = "확장";
-    $valid = 1;
 }
 if ($gameStor->fiction == 0) {
     $fiction = "사실";
 } else {
     $fiction = "가상";
-    $valid = 1;
 }
 if ($gameStor->npcmode == 0) {
     $npcmode = "불가능";
-} else if($gameStor->npcmode == 1){
+} else if ($gameStor->npcmode == 1) {
     $npcmode = "가능";
-    $valid = 1;
 } else {
     $npcmode = "선택 생성";
 }
@@ -89,285 +86,314 @@ $color = "cyan";
 $mapTheme = $gameStor->map_theme;
 $serverName = UniqueConst::$serverName;
 $serverCnt = $gameStor->server_cnt;
+
+$auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
+
+$myNationStatic = getNationStaticInfo($generalObj->getNationID());
+$nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
+
+$autorunUser = ($gameStor->autorun_user) ?? [];
+$otherTextInfo = [];
+
+if ($gameStor->join_mode == 'onlyRandom') {
+    $otherTextInfo[] = '랜덤 임관 전용';
+}
+if ($autorunUser['limit_minutes'] ?? false) {
+    $otherTextInfo[] = getAutorunInfo($autorunUser);
+}
+
+if (!$otherTextInfo) {
+    $otherTextInfo = '표준';
+} else {
+    $otherTextInfo = join(', ', $otherTextInfo);
+}
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
-<title><?=$serverName?>: 메인</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('d_shared/base_map.js')?>
-<?=WebUtil::printJS('dist_js/main.js')?>
-<script>
-window.serverNick = '<?=DB::prefix()?>';
-window.serverID = '<?=UniqueConst::$serverID?>';
-$(function(){
-    reloadWorldMap({
-        hrefTemplate:'b_currentCity.php?citylist={0}',
-        useCachedMap:true
-    });
-
-    setInterval(function(){
-        refreshMsg();
-    }, 5000);
-});
-</script>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printCSS('css/main.css')?>
-<?=WebUtil::printCSS('css/map.css')?>
-<?=WebUtil::printCSS('css/msg.css')?>
-<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
-<link href="https://fonts.googleapis.com/css?family=Nanum+Gothic|Nanum+Myeongjo|Nanum+Pen+Script" rel="stylesheet">
-
+    <title><?= $serverName ?>: 메인</title>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=500" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printJS('d_shared/base_map.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('vue', 'v_main', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printCSS('css/map.css') ?>
+    <?= WebUtil::printStaticValues([
+        'serverNick' => DB::prefix(),
+        'serverID' => UniqueConst::$serverID,
+        'maxTurn' => GameConst::$maxTurn,
+        'maxPushTurn' => 12,
+        'commandList' => getCommandTable($generalObj),
+        'serverNow' => TimeUtil::now(false),
+        'baseColor2' => GameConst::$basecolor2,
+    ]) ?>
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
 </head>
-<body class="img_back">
 
-<div id="container">
-<div><?=allButton($gameStor->npcmode==1)?></div>
-<table class="tb_layout bg0" style="width:1000px;">
-    <tr height=50>
-        <td colspan=5 id="server_title" align=center><font size=4>삼국지 모의전투 HiDCHe <?=$serverName.$serverCnt?>기 (<font color=cyan><?=$scenario?></font>)</font></td>
-    </tr>
-<?php if ($valid == 1): ?>
-    <tr height=30>
-        <td width=398 colspan=2 align=center><font color=<?=$color?>><?=$scenario?></font></td>
-        <td width=198 align=center><font color=<?=$color?>>NPC수 : <?=$extend?></font></td>
-        <td width=198 align=center><font color=<?=$color?>>NPC상성 : <?=$fiction?></font></td>
-        <td width=198 align=center><font color=<?=$color?>>NPC선택 : <?=$npcmode?></font></td>
-    </tr>
-<?php endif; ?>
-
-    <tr height=30>
-        <td width=198><?=info(2)?></td>
-        <td width=198>전체 접속자 수 : <?=$gameStor->online_user_cnt?> 명</td>
-        <td width=198>턴당 갱신횟수 : <?=$gameStor->conlimit?>회</td>
-        <td width=398 colspan=2><?=info(3)?></td>
-    </tr>
-    <tr height=30>
-        <td style='text-align:center;'>
-<?php
-if (!$plock) {
-    echo "<span style='color:cyan;'>동작 시각: ".substr($gameStor->turntime, 5, 14)."</span>";
-} else {
-    echo "<span style='color:magenta;'>동작 시각: ".substr($gameStor->turntime, 5, 14)."</span>";
-}
-
-echo "
-        </td>
-        <td align=center>
-";
-
-if ($gameStor->tournament == 0) {
-    echo "<font color=magenta>현재 토너먼트 경기 없음</font>";
-} else {
-    switch ($gameStor->tnmt_type) {
-        case 0:  $str = "전력전"; break;
-        case 1:  $str = "통솔전"; break;
-        case 2:  $str = "일기토"; break;
-        case 3:  $str = "설전"; break;
-        }
-    $str2 = getTournament($gameStor->tournament);
-    $str3 = getTournamentTime();
-    echo "<marquee scrollamount=2>↑<font color=cyan>{$str}</font> {$str2} {$str3}↑</marquee>";
-}
-
-echo "
-        </td>
-        <td align=center>
-";
-
-$auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
-if ($auctionCount > 0) {
-    echo "<marquee scrollamount=2><font color=cyan>{$auctionCount}건</font> 거래 진행중</marquee>";
-} else {
-    echo "<font color=magenta>진행중 거래 없음</font>";
-}
-
-echo "
-        </td>
-        <td colspan=2 align=center>
-";
-
-$vote = $gameStor->vote?:[''];
-$vote_title = Tag2Code($gameStor->vote_title??'-');
-if ($vote[0] == "") {
-    echo "<font color=magenta>진행중 설문 없음</font>";
-} else {
-    echo "<marquee scrollamount=3><font color=cyan>설문 진행중</font> : $vote_title</marquee>";
-}
-
-
-echo "
-        </td>
-    </tr>";
-?>
-    <tr><td colspan=5 style="text-align:left;">접속중인 국가: <?=$gameStor->online_nation?></td></tr>
-    <tr><td colspan=5 style="text-align:left;">운영자 메세지 : <span style='color:yellow;'><?=$gameStor->msg?></span></td></tr>
-    <tr><td colspan=5 style="text-align:left;"><div>【 국가방침 】</div><div><?=nationMsg($generalObj)?></div></td></tr>
-    <tr><td colspan=5 style="text-align:left;">【 접속자 】<?=onlinegen($generalObj)?></td></tr>
-<?php
-if ($session->userGrade >= 5) {
-?>
-    <tr><td colspan=5>
-        <a href='_admin1.php' target='_blank'><button type='button'>게임관리</button></a>
-        <a href='_admin2.php' target='_blank'><button type='button'>회원관리</button></a>
-        <a href='_admin4.php' target='_blank'><button type='button'>멀티관리</button></a>
-        <a href='_admin5.php' target='_blank'><button type='button'>일제정보</button></a>
-        <a href='_admin7.php' target='_blank'><button type='button'>로그정보</button></a>
-        <a href='_admin8.php' target='_blank'><button type='button'>외교정보</button></a>
-        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
-    </td></tr>
-<?php
-}
-else if($session->userGrade == 4){
-    ?>
-    <tr><td colspan=5>
-        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
-    </td></tr>
-<?php
-}
-
-?>
-
-</table>
-<table class="tb_layout bg0" style="width:1000px;" id='map_position'>
-    <tr>
-        <td style='width:700px;height:520px;' colspan=2>
-            <?=getMapHtml($mapTheme)?>
-        </td>
-        <td style='width:300px;vertical-align:top;' rowspan=4>
-            <div id="reservedCommandList" style='overflow-y:scroll;height:700px;'>
-                <table width="300" class="tb_layout b2">
-                    <thead>
-                        <tr height="24"><td colspan="4" class="center bg0"
-                            ><strong>- 명령 목록 - </strong><input value="<?=TimeUtil::now(false)?>" type="text" id="clock" size="19" style="background-color:black;color:white;border-style:none;"
-                        ></td></tr>
-                    </thead>
-                    <tbody class="center" style="font-weight:bold">
-<?php for($turnIdx = 0; $turnIdx < GameConst::$maxTurn; $turnIdx++): ?>
-                        <tr height='28' id="command_<?=$turnIdx?>"
-                            ><td width="24" class='idx_pad center bg0'><?=$turnIdx+1?></td
-                            ><td height='24' class='month_pad center bg1' style='min-width:70px;white-space:nowrap;overflow:hidden;'></td
-                            ><td width='42' class='time_pad center' style='background-color:black;white-space:nowrap;overflow:hidden;'></td
-                            ><td width='165' class='turn_pad center bg2'><span class='turn_text'></span></td
-                        ></tr>
-<?php endfor; ?>
-                    </tbody>
-                </table>
+<body class="img_back sam-color-<?= $nationColorType ?>">
+    <div id="container" class="bg0">
+        <div class="row toolbars gx-0">
+            <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></button></div>
+        </div>
+        <div class="tb_layout row gx-0">
+            <div id="server_title" class="row py-2 center">
+                <h3>삼국지 모의전투 HiDCHe <?= $serverName . $serverCnt ?>기 <span class="avoid-wrap">(<font color=cyan><?= $scenario ?></font>)</span></h3>
             </div>
-        </td>
-    </tr>
-    <tr>
-        <td rowspan=3 width=50 valign=top><?=turnTable()?></td>
-        <td style="width:650px;border:none;text-align:center;"><?=cityInfo($generalObj)?></td>
-    </tr>
-    <tr>
-        <td style='width:650px;' align=right>
-            <font color=cyan><b>←</b> Ctrl, Shift, 드래그로 복수선택 가능　　반복&amp;수정<b>→</b></font>
-            <select id='repeatAmount' name=sel size=1 style=color:white;background-color:black;font-size:13px;>
-                <option value=1>1턴</option>
-                <option value=2>2턴</option>
-                <option value=3>3턴</option>
-                <option value=4>4턴</option>
-                <option value=5>5턴</option>
-                <option value=6>6턴</option>
-                <option value=7>7턴</option>
-                <option value=8>8턴</option>
-                <option value=9>9턴</option>
-                <option value=10>10턴</option>
-                <option value=11>11턴</option>
-                <option value=12>12턴</option>
-            </select
-            ><input type=button value='반복' id='repeatTurn'
-                style='background-color:<?=GameConst::$basecolor2?>;color:white;width:70px;font-size:13px;margin-left:1ch;margin-right:2ch;'
-            ><input type=button value='▼미루기' id='pushTurn'
-                style='background-color:<?=GameConst::$basecolor2?>;color:white;width:80px;font-size:13px;'
-            ><input type=button value='▲당기기' id='pullTurn'
-                style='background-color:<?=GameConst::$basecolor2?>;color:white;width:80px;font-size:13px;'
-        ></td>
-    </tr>
-    <tr>
-        <td align=right style="width:650px;border:none;"><br>
-            <?php printCommandTable($generalObj)?>
-            <input type=button value='실 행' id="reserveTurn"
-                style='background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px;'
-            ><input type=button value='갱 신' id='refreshPage'
-                style='background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px;'
-            ><input type=button value='로비로' onclick="location.replace('../')"
-                style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;font-size:13px;
-            >
-        </td>
-    </tr>
-</table>
-<table class="tb_layout bg0" style="width:1000px;">
-    <tr>
-        <td width=498 style="border:none;"><?php myNationInfo($generalObj); ?></td>
-        <td width=498 style="border:none;"><?php generalInfo($generalObj); ?></td>
-    </tr>
-    <tr><td colspan=2><?=commandButton()?></td></tr>
-</table>
-<table class="tb_layout bg0" id='history_position'>
-    <tr>
-        <td width=498 class='bg1 center'><b>장수 동향</b></td>
-        <td width=498 class='bg1 center'><b>개인 기록</b></td>
-    </tr>
-    <tr>
-        <td width=498 id="general_public_record" style="text-align:left;"><?=formatHistoryToHTML(getGlobalActionLogRecent(15))?></td>
-        <td width=498 id="general_log" style="text-align:left;"><?=formatHistoryToHTML(getGeneralActionLogRecent($me['no'], 15))?></td>
-    </tr>
-    <tr><td width=998 colspan=2 class='bg1 center'><b>중원 정세</b></td></tr>
-    <tr><td width=998 id="world_history" colspan=2 style="text-align:left;"><?=formatHistoryToHTML(getGlobalHistoryLogRecent(15))?></td></tr>
-</table>
-<div class="message_input_form bg0">
-    <select id="mailbox_list" size="1">
 
-            <select name="genlist" size="1" style="color:white;background-color:black;font-size:13px">
+            <div class="row center gx-0">
+                <div class="s-border-t col py-2 col-8 col-md-4" style="color:<?= $color ?>;">
+                    <?= $scenario ?>
+                </div>
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                    NPC수 : <?= $extend ?>
+                </div>
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                    NPC상성 : <?= $fiction ?>
+                </div>
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                    NPC선택 : <?= $npcmode ?>
+                </div>
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                    기타 설정: <?= $otherTextInfo ?>
+                </div>
+
+                <div class="s-border-t col py-2 col-8 col-md-4"><?= info(2) ?></div>
+                <div class="s-border-t col py-2 col-4 col-md-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
+                <div class="s-border-t col py-2 col-4 col-md-2">턴당 갱신횟수 : <?= $gameStor->conlimit ?>회</div>
+                <div class="s-border-t col py-2 col-8 col-md-4"><?= info(3) ?></div>
+                <div class="s-border-t py-2 col col-6 col-md-4"><?php if ($gameStor->tournament == 0) : ?>
+                        <span style='color:magenta'>현재 토너먼트 경기 없음</span>
+                    <?php else : ?>
+                        ↑<span style='color:cyan'><?=
+                                                                    ([
+                                                                        '전력전', '통솔전', '일기토', '설전',
+                                                                    ])[$gameStor->tnmt_type] ?? '' ?> <?= getTournament($gameStor->tournament) ?> <?= getTournamentTime() ?></span>↑
 
 
+                    <?php endif; ?>
+                </div>
+                <div class="s-border-t py-2 col col-6 col-md-2">
+                    <div style="display:inline-block;"><?= !$plock ? ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
+                </div>
+                <div class="s-border-t py-2 col col-6 col-md-2">
+                    <?php if ($auctionCount > 0) : ?>
+                        <span style='color:cyan'><?= $auctionCount ?>건</span> 거래 진행중
+                    <?php else : ?>
+                        <span style='color:magenta'>진행중 거래 없음</span>
+                    <?php endif; ?>
+                </div>
+                <div class="s-border-t py-2 col col-6 col-md-4 vote-cell">
+                    <?php
+                    $vote = $gameStor->vote ?: [''];
+                    $vote_title = Tag2Code($gameStor->vote_title ?? '-');
+                    ?>
+                    <?php if ($vote[0] == "") : ?>
+                        <span style='color:magenta'>진행중 설문 없음</span>
+                    <?php else : ?>
+                        <span style='color:cyan'>설문 진행중</span> : <span><?= $vote_title ?></span>
+                    <?php endif; ?>
+                </div>
+            </div>
+            <div class="row gx-0">
+                <div class="col s-border-t px-2 py-2">접속중인 국가: <?= $gameStor->online_nation ?></div>
+            </div>
+            <div class="row gx-0">
+                <div class="col s-border-t px-2 py-2">운영자 메세지 : <span style='color:yellow;'><?= $gameStor->msg ?></span></div>
+            </div>
+            <div class="row gx-0">
+                <div class="col s-border-t py-2" id="nation-msg-position">
+                    <div class="px-2">【 국가방침 】</div>
+                    <div id='nation-msg-box'>
+                        <div id='nation-msg'><?= nationMsg($generalObj) ?></div>
+                    </div>
+                </div>
+            </div>
+            <div class="row gx-0">
+                <div class="col s-border-t px-2 py-2">
+                    【 접속자 】<?= onlinegen($generalObj) ?>
+                </div>
+            </div>
+            <?php if ($session->userGrade >= 5) : ?>
+                <div class="row">
+                    <div class="col">
+                        <a href='_admin1.php' target='_blank'><button type='button'>게임관리</button></a>
+                        <a href='_admin2.php' target='_blank'><button type='button'>회원관리</button></a>
+                        <a href='_admin4.php' target='_blank'><button type='button'>멀티관리</button></a>
+                        <a href='_admin5.php' target='_blank'><button type='button'>일제정보</button></a>
+                        <a href='_admin7.php' target='_blank'><button type='button'>로그정보</button></a>
+                        <a href='_admin8.php' target='_blank'><button type='button'>외교정보</button></a>
+                        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
+                    </div>
+                </div>
+            <?php elseif ($session->userGrade == 4) : ?>
+                <div class="row">
+                    <div class="col">
+                        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
+                    </div>
+                </div>
+            <?php endif; ?>
+            <div id="map_view" class="gx-0">
+                <div id="mapZone" class="view-item"><?= getMapHtml($mapTheme) ?></div>
+                <div class="view-item" id="reservedCommandZone">
+                    <div id="reservedCommandList"></div>
+                    <div id="actionMiniPlate" class="gx-0 row">
+                        <div class="col">
+                            <div class="gx-1 row">
+                                <div class="col-8 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
+                                <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div id="cityInfo" class="view-item" style="border:none;text-align:center;"><?= cityInfo($generalObj) ?></div>
+                <div id="nation-position"><?php myNationInfo($generalObj); ?></div>
+                <div id="general-position"><?php generalInfo($generalObj); ?></div>
+                <div id="generalCommandButton" class="row gx-0">
+                    <div class="buttonPlate bg2"><?= commandButton(['btnClass' => 'btn btn-sammo-nation']) ?></div>
+                </div>
+            </div>
+        </div>
+        <div id="actionMiniPlateSub" class="gx-0 row">
+            <div class="col">
+                <div class="gx-1 row">
+                    <div class="col-3 d-grid"><button type='button' class="btn btn-dark" onclick="scrollHardTo('reservedCommandList')">명령으로</button></div>
+                    <div class="col-5 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
+                    <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
+                </div>
+            </div>
+        </div>
+        <div class="row gx-0">
+            <div class="col-md-6" id="general_public_record-position">
+                <div class="bg1 center s-border-tb"><b>장수 동향</b></div>
+                <div id="general_public_record" style="text-align:left;"><?= formatHistoryToHTML(getGlobalActionLogRecent(15)) ?></div>
+            </div>
+            <div class="col-md-6" id="general_log-position">
+                <div class="bg1 center s-border-tb"><b>개인 기록</b></div>
+                <div id="general_log" style="text-align:left;"><?= formatHistoryToHTML(getGeneralActionLogRecent($me['no'], 15)) ?></div>
+            </div>
+            <div class="col-12" id="world_history-position">
+                <div class="bg1 center s-border-tb"><b>중원 정세</b></div>
+                <div id="world_history" colspan=2 style="text-align:left;"><?= formatHistoryToHTML(getGlobalHistoryLogRecent(15)) ?></div>
+            </div>
+        </div>
+        <div class="row toolbars gx-0">
+            <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></div>
 
-    </select>
-    <input type="textarea" id="msg_input" maxlength="99">
-    <button id="msg_submit">서신전달&amp;갱신</button><br>
-    내용 없이 '서신전달&amp;갱신'을 누르면 메세지창이 갱신됩니다.
-</div>
-<div><?=allButton($gameStor->npcmode==1)?></div>
-<div id="message_board"><div style="left:0;" class="board_side bg0">
-        <div class="board_header bg0" id='public_talk_position'>전체 메시지(최고99자)</div>
-        <section class="public_message">
-        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="public">이전 메시지 불러오기</button>
-        </section>
-        <div class="board_header bg0" id='secret_talk_position'>개인 메시지(최고99자)</div>
-        <section class="private_message">
-        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="private">이전 메시지 불러오기</button>
-        </section>
-    </div><div style="right:0;" class="board_side bg0">
-        <div class="board_header bg0">국가 메시지(최고99자)</div>
-        <section class="national_message">
-        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="national">이전 메시지 불러오기</button>
-        </section>
-        <div class="board_header bg0">외교 메시지(최고99자)</div>
-        <section class="diplomacy_message">
-        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="diplomacy">이전 메시지 불러오기</button>
-        </section>
- </div></div>
-<div style="clear:left;"><?=allButton($gameStor->npcmode==1)?><?=banner()?></div>
-</div>
-<?php
-if ($con == 1) {
-    MessageBox("접속제한이 얼마 남지 않았습니다!");
-}
-if ($me['newmsg'] == 1) {
-    MessageBox("새로운 서신이 도착했습니다!");
-}
-if ($me['newvote'] == 1) {
-    $develcost = $gameStor->develcost*5;
-    MessageBox("설문조사에 참여하시면 금{$develcost}과 유니크템을 드립니다! (우측 상단 설문조사 메뉴)");
-}
-?>
+            <div id="message_board" class="row gx-0">
+                <div class="message_input_form bg0 gx-0 row">
+                    <div id="mailbox_list-col" class="col-6 col-md-2 d-grid">
+                        <select id="mailbox_list" size="1" class="form-control bg-dark text-white">
+                        </select>
+                    </div>
+                    <div id="msg_input-col" class="col-12 col-md-8 d-grid">
+                        <input type="text" id="msg_input" maxlength="99" class="form-control">
+                    </div>
+                    <div id="msg_submit-col" class="col-6 col-md-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
+                </div>
+                <div class="col-md-6 board_side bg0"><a id="public_talk_position"></a>
+                    <div class="board_header bg0">전체 메시지(최고99자)</div>
+                    <section class="public_message">
+                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="public">이전 메시지 불러오기</button></div>
+                    </section>
+                </div>
+                <div class="col-md-6 board_side bg0"><a id="national_talk_position"></a>
+                    <div class="board_header bg0">국가 메시지(최고99자)</div>
+                    <section class="national_message">
+                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="national">이전 메시지 불러오기</button></div>
+                    </section>
+                </div>
+                <div class="col-md-6 board_side bg0"><a id="private_talk_position"></a>
+                    <div class="board_header bg0">개인 메시지(최고99자)</div>
+                    <section class="private_message">
+                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="private">이전 메시지 불러오기</button></div>
+                    </section>
+                </div>
+                <div class="col-md-6 board_side bg0"><a id="diplomacy_talk_position"></a>
+                    <div class="board_header bg0">외교 메시지(최고99자)</div>
+                    <section class="diplomacy_message">
+                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="diplomacy">이전 메시지 불러오기</button></div>
+                    </section>
+                </div>
+            </div>
+            <div class="row toolbars gx-0">
+                <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></div><?= banner() ?>
+            </div>
+        </div>
+        <?php
+        if ($con == 1) {
+            MessageBox("접속제한이 얼마 남지 않았습니다!");
+        }
+        if ($me['newmsg'] == 1) {
+            MessageBox("새로운 서신이 도착했습니다!");
+        }
+        if ($me['newvote'] == 1) {
+            $develcost = $gameStor->develcost * 5;
+            MessageBox("설문조사에 참여하시면 금{$develcost}과 유니크템을 드립니다! (우측 상단 설문조사 메뉴)");
+        }
+        ?>
+    </div>
+    <nav class="navbar navbar-expand fixed-bottom navbar-dark bg-dark d-sm-block d-md-none p-0" id="navbar500">
+        <div class="container-fluid">
+            <div class="collapse navbar-collapse">
+                <ul class="navbar-nav me-auto mx-auto">
+                    <li class="nav-item dropup">
+                        <div class="dropdown-toggle text-white btn btn-sammo-base2" id="navbarGlobal" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            외부 메뉴
+                        </div>
+                        <ul class="dropdown-menu dropdown-menu-start" aria-labelledby="navbarGlobal" id="navbarGlobalItems">
+                            <?= allButton($gameStor->npcmode == 1, ['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item']) ?>
+                        </ul>
+                    </li>
+                    <li class="nav-item dropup">
+                        <div class="dropdown-toggle btn btn-sammo-nation" id="navbarNation" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            국가 메뉴
+                        </div>
+                        <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
+                            <?= commandButton(['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item']) ?>
+                        </ul>
+                    </li>
+                    <li class="nav-item dropup">
+                        <div class="dropdown-toggle text-white btn btn-dark" id="navbarQuick" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            빠른 이동
+                        </div>
+                        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown" id="navbarQuickItems">
+                            <li><a class="dropdown-item disabled">국가 정보</a></button></li>
+                            <hr class="dropdown-divider">
+                            </hr>
+                            <li><button type="button" onclick="scrollHardTo('nation-msg-position')" class="dropdown-item">방침</button></li>
+                            <li><button type="button" onclick="scrollHardTo('reservedCommandList')" class="dropdown-item">명령</button></li>
+                            <li><button type="button" onclick="scrollHardTo('nation-position')" class="dropdown-item">국가</button></li>
+                            <li><button type="button" onclick="scrollHardTo('general-position')" class="dropdown-item">장수</button></li>
+                            <li><button type="button" onclick="scrollHardTo('cityInfo')" class="dropdown-item">도시</button></li>
+                            <li><a class="dropdown-item disabled">동향 정보</a></button></li>
+                            <hr class="dropdown-divider">
+                            </hr>
+                            <li><button type="button" onclick="scrollHardTo('mapZone')" class="dropdown-item">지도</button></li>
+                            <li><button type="button" onclick="scrollHardTo('general_public_record-position')" class="dropdown-item">동향</button></li>
+                            <li><button type="button" onclick="scrollHardTo('general_log-position')" class="dropdown-item">개인</button></li>
+                            <li><button type="button" onclick="scrollHardTo('world_history-position')" class="dropdown-item">정세</button></li>
+                            <li><span>&nbsp;</span></li>
+                            <li><a class="dropdown-item disabled">메시지</a></button></li>
+                            <hr class="dropdown-divider">
+                            </hr>
+                            <li><button type="button" onclick="scrollHardTo('public_talk_position')" class="dropdown-item">전체</button></li>
+                            <li><button type="button" onclick="scrollHardTo('national_talk_position')" class="dropdown-item">국가</button></li>
+                            <li><button type="button" onclick="scrollHardTo('private_talk_position')" class="dropdown-item">개인</button></li>
+                            <li><button type="button" onclick="scrollHardTo('diplomacy_talk_position')" class="dropdown-item">외교</button></li>
+                            <li><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></li>
+                        </ul>
+                    </li>
+                    <li class="nav-item">
+                        <a class="refreshPage btn btn-sammo-base2 text-white" role="button">갱신</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
 </body>
-</html>
+
+</html>

hwe/install.php

@@ -1,379 +1,276 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
 include "func.php";
 
-if(!class_exists('\sammo\DB')){
+if (!class_exists('\sammo\DB')) {
     header('Location:install_db.php');
 }
 
 $session = Session::requireLogin();
 
 $serverName = DB::prefix();
-$serverAcl = $session->acl[$serverName]??[];
+$serverAcl = $session->acl[$serverName] ?? [];
 $allowReset = in_array('reset', $serverAcl);
-$allowFullReset = in_array('fullReset',$serverAcl);
+$allowFullReset = in_array('fullReset', $serverAcl);
 $allowReset = $allowReset || $allowFullReset;
 
-if($session->userGrade < 5 && !$allowReset){
+if ($session->userGrade < 5 && !$allowReset) {
     die('관리자 아님');
 }
 
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
-<title>설치</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/install.js')?>
-<?=WebUtil::printCSS('css/normalize.css')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('css/install.css')?>
+    <title>설치</title>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('css/install.css') ?>
+    <?= WebUtil::printDist('ts', ['common', 'install']) ?>
 </head>
+
 <body>
-    <div class="container" style="min-width:720px;">
+    <div class="container">
         <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 리셋</h1>
         <div class="row justify-content-md-center">
 
-        <div class="col col-lg-8" >
-        <div class="card" id="game_form_card">
-            <h3 class="card-header">
-                설치(환경 설정)
-                <!--턴시간, 시간동기화, 시나리오, 상성, 확장장수, NPC유저, 이미지설정-->
-            </h3>
-            <div class="card-body">
-                <form id="game_form" method="post" action="#">
-                    <div class="form-group row">
-                        <label for="turnterm" class="col-sm-3 col-form-label">턴 시간(분)</label>
-                        <div class="col-sm-9">
-                            <div id="turnterm" class="btn-group btn-group-toggle" data-toggle="buttons">
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="turnterm" value="120">120
-                                </label>
-                                <label class="btn btn-secondary active">
-                                    <input type="radio" name="turnterm" value="60" checked>60
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="turnterm" value="30">30
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="turnterm" value="20">20
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="turnterm" value="10">10
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="turnterm" value="5">5
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="turnterm" value="2">2
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="turnterm" value="1">1
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-
-
-                    <div class="form-group row">
-                        <label for="sync" class="col-sm-3 col-form-label">시간 동기화</label>
-                        <div class="col-sm-9" style="display: inline-flex;">
-                            <div id="sync" class="btn-group btn-group-toggle" data-toggle="buttons">
-                                <label class="btn btn-secondary active">
-                                    <input type="radio" name="sync" value="1" checked>Y
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="sync" value="0">N
-                                </label>
-
-                            </div>
-                            <small class="text-muted">
-                                시간 단위에 맞게 년/월이 설정됩니다. <br>예: 120분(오전1시=1월), 60분(오전/오후 1시=1월)
-                            </small>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="scenario_sel" class="col-sm-3 col-form-label">시나리오 선택</label>
-                        <div class="col-sm-9">
-                        <select class="form-control" name="scenario" size="1" id="scenario_sel">
-                        </select>
-
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="fiction" class="col-sm-3 col-form-label">NPC 상성</label>
-                        <div class="col-sm-9">
-                            <div id="fiction" class="btn-group btn-group-toggle" data-toggle="buttons">
-                                <label class="btn btn-secondary active">
-                                    <input type="radio" name="fiction" value="0" checked>연의
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="fiction" value="1">가상
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="extend" class="col-sm-3 col-form-label">확장 NPC</label>
-                        <div class="col-sm-9">
-                            <div id="extend" class="btn-group btn-group-toggle" data-toggle="buttons">
-                                <label class="btn btn-secondary active">
-                                    <input type="radio" name="extend" value="1" checked>포함
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="extend" value="0">미포함
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="block_general_create" class="col-sm-3 col-form-label">장수 임의 생성</label>
-                        <div class="col-sm-9">
-                            <div id="block_general_create" class="btn-group btn-group-toggle" data-toggle="buttons">
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="block_general_create" value="0" checked>가능
-                                </label>
-                                <label class="btn btn-secondary active">
-                                    <input type="radio" name="block_general_create" value="1">불가
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="npcmode" class="col-sm-3 col-form-label">NPC 빙의</label>
-                        <div class="col-sm-9">
-                            <div id="npcmode" class="btn-group btn-group-toggle" data-toggle="buttons">
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="npcmode" value="1">가능
-                                </label>
-                                <label class="btn btn-secondary active">
-                                    <input type="radio" name="npcmode" value="0" checked>불가
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="npcmode" value="2">선택 생성 가능
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group row">
-                        <label class="col-sm-3 col-form-label" id="autorun_set_label">휴식 턴 시 장수 턴</label>
-                        <div class="col-sm-9">
-                            <div class="input-group">
-                                <div class="input-group-prepend btn-group btn-group-toggle" data-toggle="buttons">
-                                    <label class="btn btn-secondary">
-                                        <input type="checkbox" class="autorun_user_chk" data-key="develop" name="autorun_user[]" value="develop">내정
-                                    </label>
-                                    <label class="btn btn-secondary">
-                                        <input type="checkbox" class="autorun_user_chk" data-key="warp" name="autorun_user[]" value="warp">순간이동
-                                    </label>
-                                    <label class="btn btn-secondary">
-                                        <input type="checkbox" class="autorun_user_chk" data-key="recruit" name="autorun_user[]" value="recruit">징병
-                                    </label>
-                                    <label class="btn btn-secondary">
-                                        <input type="checkbox" class="autorun_user_chk" data-key="recruit_high" name="autorun_user[]" value="recruit_high">모병
-                                    </label>
-                                    <label class="btn btn-secondary">
-                                        <input type="checkbox" class="autorun_user_chk" data-key="train" name="autorun_user[]" value="train">훈사
-                                    </label>
-                                    <label class="btn btn-secondary">
-                                        <input type="checkbox" class="autorun_user_chk" data-key="battle" name="autorun_user[]" value="battle">출병
-                                    </label>
-                                    <label class="btn btn-secondary">
-                                        <input type="checkbox" class="autorun_user_chk" data-key="chief" name="autorun_user[]" value="chief">기본 사령턴
-                                    </label>
+            <div class="col col-lg-8">
+                <div class="card" id="game_form_card">
+                    <h3 class="card-header">
+                        설치(환경 설정)
+                        <!--턴시간, 시간동기화, 시나리오, 상성, 확장장수, NPC유저, 이미지설정-->
+                    </h3>
+                    <div class="card-body">
+                        <form id="game_form" method="post" action="#">
+                            <div class="form-group row">
+                                <label for="turnterm" class="col-sm-3 col-form-label">턴 시간(분)</label>
+                                <div class="col-sm-9">
+                                    <div id="turnterm" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
+                                        <input type="radio" class="btn-check" name="turnterm" id="turnterm_120" value="120"><label for="turnterm_120" class="btn btn-secondary">120</label>
+                                        <input type="radio" class="btn-check" name="turnterm" id="turnterm_60" value="60" checked><label for="turnterm_60" class="btn btn-secondary">60</label>
+                                        <input type="radio" class="btn-check" name="turnterm" id="turnterm_30" value="30"><label for="turnterm_30" class="btn btn-secondary">30</label>
+                                        <input type="radio" class="btn-check" name="turnterm" id="turnterm_20" value="20"><label for="turnterm_20" class="btn btn-secondary">20</label>
+                                        <input type="radio" class="btn-check" name="turnterm" id="turnterm_10" value="10"><label for="turnterm_10" class="btn btn-secondary">10</label>
+                                        <input type="radio" class="btn-check" name="turnterm" id="turnterm_5" value="5"><label for="turnterm_5" class="btn btn-secondary">5</label>
+                                        <input type="radio" class="btn-check" name="turnterm" id="turnterm_2" value="2"><label for="turnterm_2" class="btn btn-secondary">2</label>
+                                        <input type="radio" class="btn-check" name="turnterm" id="turnterm_1" value="1"><label for="turnterm_1" class="btn btn-secondary">1</label>
+                                    </div>
                                 </div>
-                                <div class="input-group-append">
-                                    <span class="input-group-text">유효 시간</span>
+                            </div>
+
+
+                            <div class="form-group row">
+                                <label for="sync" class="col-sm-3 col-form-label">시간 동기화</label>
+                                <div class="col-sm-9" style="display: inline-flex;">
+                                    <div id="sync" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
+                                        <input class="btn-check" id="sync_1" type="radio" name="sync" value="1" checked><label class="btn btn-secondary" for="sync_1">Y</label>
+                                        <input class="btn-check" id="sync_0" type="radio" name="sync" value="0"><label class="btn btn-secondary" for="sync_0">N</label>
+
+                                    </div>
+                                    <small class="text-muted">
+                                        시간 단위에 맞게 년/월이 설정됩니다.<br>예: 120분(오전1시=1월), 60분(오전/오후 1시=1월)
+                                    </small>
                                 </div>
-                                <select class="custom-select" name="autorun_user_minutes" id="autorun_user_minutes">
-                                        <option value="0" selected>꺼짐</option>
-                                        <option value="43200">항상</option>
-                                        <option value="10">10분</option>
-                                        <option value="20">20분</option>
-                                        <option value="30">30분</option>
-                                        <option value="60">1시간</option>
-                                        <option value="120">2시간</option>
-                                        <option value="180">3시간</option>
-                                        <option value="240">4시간</option>
-                                        <option value="360">6시간</option>
-                                        <option value="480">8시간</option>
-                                        <option value="600">10시간</option>
-                                        <option value="720">12시간</option>
-                                        <option value="1440">24시간</option>
-                                        <option value="2160">36시간</option>
-                                        <option value="2880">48시간</option>
-                                        <option value="3600">60시간</option>
-                                        <option value="4320">72시간</option>
-                                </select>
                             </div>
-                        </div>
-                    </div>
 
-                    <!--
-                    <div class="form-group row">
-                        <label class="col-sm-3 col-form-label">휴식 턴 시 사령 턴</label>
-                        <div class="col-sm-9">
-                            <div class="input-group">
-                                <div class="input-group-prepend btn-group btn-group-toggle" data-toggle="buttons">
-                                    <label class="btn btn-secondary">
-                                        <input type="radio" name="autorun_chief_reward" id="autorun_chief_reward">포상/몰수
-                                    </label>
-                                    <label class="btn btn-secondary">
-                                        <input type="radio" name="autorun_chief_warp" id="autorun_chief_warp">발령
-                                    </label>
-                                    <label class="btn btn-secondary">
-                                        <input type="radio" name="autorun_chief_declaration" id="autorun_chief_declaration">선포
-                                    </label>
+                            <div class="form-group row">
+                                <label for="scenario_sel" class="col-sm-3 col-form-label">시나리오 선택</label>
+                                <div class="col-sm-9">
+                                    <select class="form-control" name="scenario" size="1" id="scenario_sel">
+                                    </select>
+
                                 </div>
-                                <div class="input-group-append">
-                                    <span class="input-group-text">유효 시간</span>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="fiction" class="col-sm-3 col-form-label">NPC 상성</label>
+                                <div class="col-sm-9">
+                                    <div id="fiction" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
+                                        <input type="radio" id="fiction_0" class="btn-check" name="fiction" value="0" checked><label for="fiction_0" class="btn btn-secondary"> 연의 </label>
+                                        <input type="radio" id="fiction_1" class="btn-check" name="fiction" value="1"><label for="fiction_1" class="btn btn-secondary"> 가상 </label>
+                                    </div>
                                 </div>
-                                <select class="custom-select" name="autorun_chief_minutes" id="autorun_chief_minutes">
-                                        <option value="0" selected>꺼짐</option>
-                                        <option value="43200">항상</option>
-                                        <option value="10">10분</option>
-                                        <option value="20">20분</option>
-                                        <option value="30">30분</option>
-                                        <option value="60">1시간</option>
-                                        <option value="120">2시간</option>
-                                        <option value="180">3시간</option>
-                                        <option value="240">4시간</option>
-                                        <option value="360">6시간</option>
-                                        <option value="480">8시간</option>
-                                        <option value="600">10시간</option>
-                                        <option value="720">12시간</option>
-                                        <option value="1440">24시간</option>
-                                        <option value="2160">36시간</option>
-                                        <option value="2880">48시간</option>
-                                        <option value="3600">60시간</option>
-                                        <option value="4320">72시간</option>
-                                </select>
                             </div>
-                        </div>
-                    </div>
-                    -->
 
-                    <div class="form-group row">
-                        <label for="join_mode" class="col-sm-3 col-form-label">임관 모드</label>
-                        <div class="col-sm-9">
-                            <div id="join_mode" class="btn-group btn-group-toggle" data-toggle="buttons">
-                                <label class="btn btn-secondary active">
-                                    <input type="radio" name="join_mode" value="full" checked>일반
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="join_mode" value="onlyRandom">랜덤 임관
-                                </label>
+                            <div class="form-group row">
+                                <label for="extend" class="col-sm-3 col-form-label">확장 NPC</label>
+                                <div class="col-sm-9">
+                                    <div id="extend" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
+                                        <input type="radio" id="extend_1" class="btn-check" name="extend" value="1" checked><label for="extend_1" class="btn btn-secondary">포함</label>
+                                        <input type="radio" id="extend_0" class="btn-check" name="extend" value="0"><label for="extend_0" class="btn btn-secondary">미포함</label>
+                                    </div>
+                                </div>
                             </div>
-                        </div>
-                    </div>
 
-                    <div class="form-group row">
-                        <label for="show_img_level" class="col-sm-3 col-form-label">이미지 표기</label>
-                        <div class="col-sm-9">
-                            <div id="show_img_level" class="btn-group btn-group-toggle" data-toggle="buttons">
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="show_img_level" value="0">안함
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="show_img_level" value="1">전콘
-                                </label>
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="show_img_level" value="2">전콘, 병종
-                                </label>
-                                <label class="btn btn-secondary active">
-                                    <input type="radio" name="show_img_level" value="3" checked>전콘, 병종, NPC
-                                </label>
+                            <div class="form-group row">
+                                <label for="block_general_create" class="col-sm-3 col-form-label">장수 임의 생성</label>
+                                <div class="col-sm-9">
+                                    <div id="block_general_create" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
+                                        <input type="radio" class="btn-check" id="block_general_create_0" name="block_general_create" value="0" checked><label for="block_general_create_0" class="btn btn-secondary">가능</label>
+                                        <input type="radio" class="btn-check" id="block_general_create_1" name="block_general_create" value="1"><label for="block_general_create_1" class="btn btn-secondary">불가</label>
+                                    </div>
+                                </div>
                             </div>
-                        </div>
-                    </div>
 
-                    <div class="form-group row">
-                        <label for="tournament_trig" class="col-sm-3 col-form-label">토너먼트 자동 시작<br>경기 단위</label>
-                        <div class="col-sm-9" id="tournament_trig">
-                            <div id="tournament_trig" class="btn-group-toggle btn-group flex-wrap" data-toggle="buttons">
-                                <label class="btn btn-secondary w-25">
-                                    <input type="radio" name="tournament_trig" value="0">안함
-                                </label>
-                                <label class="btn btn-secondary w-25">
-                                    <input type="radio" name="tournament_trig" value="1">12분(총 5일)
-                                </label>
-                                <label class="btn btn-secondary w-25">
-                                    <input type="radio" name="tournament_trig" value="2">7분(총 10시간)
-                                </label>
-                                <label class="btn btn-secondary w-25">
-                                    <input type="radio" name="tournament_trig" value="3">3분(총 4시간)
-                                </label>
-                                <label class="btn btn-secondary w-25 active">
-                                    <input type="radio" name="tournament_trig" value="4" checked>1분(총 82분)
-                                </label>
-                                <label class="btn btn-secondary w-25">
-                                    <input type="radio" name="tournament_trig" value="5">30초(총 41분)
-                                </label>
-                                <label class="btn btn-secondary w-25">
-                                    <input type="radio" name="tournament_trig" value="6">15초(총 21분)
-                                </label>
-                                <label class="btn btn-secondary w-25">
-                                    <input type="radio" name="tournament_trig" value="7">5초(총 7분)
-                                </label>
+                            <div class="form-group row">
+                                <label for="npcmode" class="col-sm-3 col-form-label">NPC 빙의</label>
+                                <div class="col-sm-9">
+                                    <div id="npcmode" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
+                                        <input type="radio" id="npcmode_1" class="btn-check" name="npcmode" value="1"><label for="npcmode_1" class="btn btn-secondary"> 가능 </label>
+                                        <input type="radio" id="npcmode_0" class="btn-check" name="npcmode" value="0" checked><label for="npcmode_0" class="btn btn-secondary"> 불가 </label>
+                                        <input type="radio" id="npcmode_2" class="btn-check" name="npcmode" value="2"><label for="npcmode_2" class="btn btn-secondary"> 선택 생성 가능 </label>
+                                    </div>
+                                </div>
                             </div>
-                        </div>
-                    </div>
 
-                    <div class="form-group row">
-                        <label for="reserve_open" class="col-sm-3 col-form-label">오픈 예약</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="reserve_open" id="reserve_open"  placeholder="YYYY-MM-DD hh:mm" value="" />
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label class="col-sm-3 col-form-label" id="autorun_set_label">휴식 턴 시 장수 턴</label>
+                                <div class="col-sm-9">
+                                    <div class="input-group">
+                                        <div class="btn-group btn-group-toggle" data-bs-toggle="buttons">
+                                            <input type="checkbox" id="autorun_develop" class="autorun_user_chk btn-check" data-key="develop" name="autorun_user[]" value="develop"><label class="btn btn-secondary" for="autorun_develop">내정</label>
+                                            <input type="checkbox" id="autorun_warp" class="autorun_user_chk btn-check" data-key="warp" name="autorun_user[]" value="warp"><label class="btn btn-secondary" for="autorun_warp">순간이동</label>
+                                            <input type="checkbox" id="autorun_recruit" class="autorun_user_chk btn-check" data-key="recruit" name="autorun_user[]" value="recruit"><label class="btn btn-secondary" for="autorun_recruit">징병</label>
+                                            <input type="checkbox" id="autorun_recruit_high" class="autorun_user_chk btn-check" data-key="recruit_high" name="autorun_user[]" value="recruit_high"><label class="btn btn-secondary" for="autorun_recruit_high">모병</label>
+                                            <input type="checkbox" id="autorun_train" class="autorun_user_chk btn-check" data-key="train" name="autorun_user[]" value="train"><label class="btn btn-secondary" for="autorun_train">훈사</label>
+                                            <input type="checkbox" id="autorun_battle" class="autorun_user_chk btn-check" data-key="battle" name="autorun_user[]" value="battle"><label class="btn btn-secondary" for="autorun_battle">출병</label>
+                                            <input type="checkbox" id="autorun_chief" class="autorun_user_chk btn-check" data-key="chief" name="autorun_user[]" value="chief"><label class="btn btn-secondary" for="autorun_chief">기본 사령턴</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6 offset-sm-3">
+                                    <div class="input-group">
+                                        <div class="input-group-text">유효 시간
+                                        </div>
+                                        <select class="custom-select" name="autorun_user_minutes" id="autorun_user_minutes">
+                                            <option value="0" selected>꺼짐</option>
+                                            <option value="43200">항상</option>
+                                            <option value="10">10분</option>
+                                            <option value="20">20분</option>
+                                            <option value="30">30분</option>
+                                            <option value="60">1시간</option>
+                                            <option value="120">2시간</option>
+                                            <option value="180">3시간</option>
+                                            <option value="240">4시간</option>
+                                            <option value="360">6시간</option>
+                                            <option value="480">8시간</option>
+                                            <option value="600">10시간</option>
+                                            <option value="720">12시간</option>
+                                            <option value="1440">24시간</option>
+                                            <option value="2160">36시간</option>
+                                            <option value="2880">48시간</option>
+                                            <option value="3600">60시간</option>
+                                            <option value="4320">72시간</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label for="join_mode" class="col-sm-3 col-form-label">임관 모드</label>
+                                <div class="col-sm-9">
+                                    <div id="join_mode" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
+                                        <input class="btn-check" id="join_mode_full" type="radio" name="join_mode" value="full" checked><label class="btn btn-secondary" for="join_mode_full">일반</label>
+                                        <input class="btn-check" id="join_mode_onlyRandom" type="radio" name="join_mode" value="onlyRandom"><label class="btn btn-secondary" for="join_mode_onlyRandom">랜덤 임관</label>
+                                    </div>
+                                </div>
+                            </div>
 
-                    <div class="form-group row">
-                        <label for="pre_reserve_open" class="col-sm-3 col-form-label">가오픈 예약</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="pre_reserve_open" id="pre_reserve_open"  placeholder="YYYY-MM-DD hh:mm" value="" />
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label for="show_img_level" class="col-sm-3 col-form-label">이미지 표기</label>
+                                <div class="col-sm-9">
+                                    <div id="show_img_level" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
+                                        <input type="radio" id="show_img_level_0" class="btn-check" name="show_img_level" value="0"><label for="show_img_level_0" class="btn btn-secondary">안함</label>
+                                        <input type="radio" id="show_img_level_1" class="btn-check" name="show_img_level" value="1"><label for="show_img_level_1" class="btn btn-secondary">전콘</label>
+                                        <input type="radio" id="show_img_level_2" class="btn-check" name="show_img_level" value="2"><label for="show_img_level_2" class="btn btn-secondary">전콘, 병종</label>
+                                        <input type="radio" id="show_img_level_3" class="btn-check" name="show_img_level" value="3" checked><label for="show_img_level_3" class="btn btn-secondary">전콘, 병종, NPC</label>
+                                    </div>
+                                </div>
+                            </div>
 
-                    <div class="form-group row">
-                        <div class="col-sm-3"></div>
-                        <div class="col-sm-9">
-                            <input type="submit" class="btn btn-primary btn-lg btn-block login-button" value="리셋 개시">
-                        </div>
+                            <div class="form-group row">
+                                <label for="tournament_trig" class="col-sm-3 col-form-label"><span class="text-nowrap">토너먼트 자동 시작</span> <span class="text-nowrap">경기 단위</span></label>
+                                <div class="col-sm-9" id="tournament_trig">
+                                    <div id="tournament_trig" class="btn-group-toggle btn-group flex-wrap" data-bs-toggle="buttons">
+                                        <input type="radio" class="btn-check" id="tournament_trig_0" name="tournament_trig" value="0"><label for="tournament_trig_0" class="btn btn-secondary w-25">안함</label>
+                                        <input type="radio" class="btn-check" id="tournament_trig_1" name="tournament_trig" value="1"><label for="tournament_trig_1" class="btn btn-secondary w-25">12분(총 5일)</label>
+                                        <input type="radio" class="btn-check" id="tournament_trig_2" name="tournament_trig" value="2"><label for="tournament_trig_2" class="btn btn-secondary w-25">7분(총 10시간)</label>
+                                        <input type="radio" class="btn-check" id="tournament_trig_3" name="tournament_trig" value="3"><label for="tournament_trig_3" class="btn btn-secondary w-25">3분(총 4시간)</label>
+                                        <input type="radio" class="btn-check" id="tournament_trig_4" name="tournament_trig" value="4" checked><label for="tournament_trig_4" class="btn btn-secondary w-25">1분(총 82분)</label>
+                                        <input type="radio" class="btn-check" id="tournament_trig_5" name="tournament_trig" value="5"><label for="tournament_trig_5" class="btn btn-secondary w-25">30초(총 41분)</label>
+                                        <input type="radio" class="btn-check" id="tournament_trig_6" name="tournament_trig" value="6"><label for="tournament_trig_6" class="btn btn-secondary w-25">15초(총 21분)</label>
+                                        <input type="radio" class="btn-check" id="tournament_trig_7" name="tournament_trig" value="7"><label for="tournament_trig_7" class="btn btn-secondary w-25">5초(총 7분)</label>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="reserve_open" class="col-sm-3 col-form-label">오픈 예약</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control" name="reserve_open" id="reserve_open" placeholder="YYYY-MM-DD hh:mm" value="" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="pre_reserve_open" class="col-sm-3 col-form-label">가오픈 예약</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control" name="pre_reserve_open" id="pre_reserve_open" placeholder="YYYY-MM-DD hh:mm" value="" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <div class="col-sm-3"></div>
+                                <div class="col-sm-9 d-grid">
+                                    <input type="submit" class="btn btn-primary btn-lg btn-block login-button" value="리셋 개시">
+                                </div>
+                            </div>
+                        </form>
                     </div>
-                </form>
+                    <h4 class="card-header">시나리오 정보</h4>
+                    <table class="table table-striped">
+                        <colgroup>
+                            <col style="width:100px;">
+                            <col>
+                        </colgroup>
+                        <thead>
+                            <tr>
+                                <th>설정</th>
+                                <th>값</th>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <th>시작 연도</th>
+                                <td><span id="scenario_begin">180년</span><small id="scenario_begin_with_sync"></small>
+                                </td>
+                            </tr>
+                            <tr>
+                                <th>NPC 수</th>
+                                <td><span id="scenario_npc"></span><span id="scenario_npc_extend"></span></td>
+                            </tr>
+                            <tr>
+                                <th>국가</th>
+                                <td><span id="scenario_nation"></span></td>
+                            </tr>
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                <td colspan="2">
+
+                                </td>
+                            </tr>
+                        </tfoot>
+                    </table>
+                </div>
+                <!--GAME 폼 끝-->
+
             </div>
-            <h4 class="card-header">시나리오 정보</h4>
-            <table class="table table-striped">
-                <colgroup><col style="width:100px;"><col></colgroup>
-                <thead>
-                    <tr><th>설정</th><th>값</th>
-                </thead>
-                <tbody>
-                    <tr><th>시작 연도</th><td ><span id="scenario_begin">180년</span><small id="scenario_begin_with_sync"></small></td></tr>
-                    <tr><th>NPC 수</th><td><span id="scenario_npc"></span><span id="scenario_npc_extend"></span></td></tr>
-                    <tr><th>국가</th><td><span id="scenario_nation"></span></td></tr>
-                </tbody>
-                <tfoot>
-                    <tr><td colspan="2">
-
-                    </td></tr>
-                </tfoot>
-            </table>
-        </div><!--GAME 폼 끝-->
-
-        </div>
         </div>
     </div>
 </body>
+
 </html>

hwe/install_db.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -6,108 +7,110 @@ include "func.php";
 
 $session = Session::requireLogin();
 
-if($session->userGrade < 5){
+if ($session->userGrade < 5) {
     die('관리자 아님');
 }
-if($session->userGrade == 5){
+if ($session->userGrade == 5) {
     die('DB 리셋 권한을 가지고 있지 않습니다.');
 }
 
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
-<title>설치</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('dist_js/install_db.js')?>
-<?=WebUtil::printCSS('css/normalize.css')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('css/install.css')?>
+    <title>설치</title>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printCSS('css/normalize.css') ?>
+    <?= WebUtil::printCSS('css/install.css') ?>
+    <?= WebUtil::printDist('ts', ['common', 'install_db']) ?>
 </head>
+
 <body>
     <div class="container" style="min-width:720px;">
         <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 리셋</h1>
         <div class="row justify-content-md-center">
 
-        <div class="col col-lg-8" >
-        <div class="card" id="db_form_card">
-            <h3 class="card-header">
-                설치(DB 설정)
-            </h3>
-            <div class="card-body">
-                <form id="db_form" method="post" action="#">
-<?php if(class_exists('\\sammo\\DB')): ?>
-                    <div class="form-group row">
-                        <label for="full_reset" class="col-sm-3 col-form-label">이전 DB 초기화</label>
-                        <div class="col-sm-9" style="display: inline-flex;">
-                            <div id="full_reset" class="btn-group btn-group-toggle" data-toggle="buttons">
-                                <label class="btn btn-secondary">
-                                    <input type="radio" name="full_reset" value="1">Y
-                                </label>
-                                <label class="btn btn-secondary active">
-                                    <input type="radio" name="full_reset" value="0" checked>N
-                                </label>
+            <div class="col col-lg-8">
+                <div class="card" id="db_form_card">
+                    <h3 class="card-header">
+                        설치(DB 설정)
+                    </h3>
+                    <div class="card-body">
+                        <form id="db_form" method="post" action="#">
+                            <?php if (class_exists('\\sammo\\DB')) : ?>
+                                <div class="form-group row">
+                                    <label for="full_reset" class="col-sm-3 col-form-label">이전 DB 초기화</label>
+                                    <div class="col-sm-9" style="display: inline-flex;">
+                                        <div id="full_reset" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
+                                            <label class="btn btn-secondary">
+                                                <input type="radio" name="full_reset" value="1">Y
+                                            </label>
+                                            <label class="btn btn-secondary active">
+                                                <input type="radio" name="full_reset" value="0" checked>N
+                                            </label>
 
+                                        </div>
+                                    </div>
+                                </div>
+                            <?php else : ?>
+                                <input type="hidden" name="full_reset" value="0">
+                            <?php endif; ?>
+                            <div class="form-group row">
+                                <label for="db_host" class="col-sm-3 col-form-label">DB호스트</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control" name="db_host" id="db_host" placeholder="호스트" value="localhost" />
+                                </div>
                             </div>
-                        </div>
-                    </div>
-<?php else: ?>
-                    <input type="hidden" name="full_reset" value="0">
-<?php endif; ?>
-                    <div class="form-group row">
-                        <label for="db_host" class="col-sm-3 col-form-label">DB호스트</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="db_host" id="db_host"  placeholder="호스트" value="localhost" />
-                        </div>
-                    </div>
 
-                    <div class="form-group row">
-                        <label for="db_port" class="col-sm-3 col-form-label">DB포트</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="db_port" id="db_port"  placeholder="접속 포트" value="3306" />
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label for="db_port" class="col-sm-3 col-form-label">DB포트</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control" name="db_port" id="db_port" placeholder="접속 포트" value="3306" />
+                                </div>
+                            </div>
 
-                    <div class="form-group row">
-                        <label for="db_id" class="col-sm-3 col-form-label">DB계정</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="db_id" id="db_id"  placeholder="DB계정"/>
-                            <small>관리 DB의 계정과는 다른 계정을 권장합니다.</small>
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label for="db_id" class="col-sm-3 col-form-label">DB계정</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control" name="db_id" id="db_id" placeholder="DB계정" />
+                                    <small>관리 DB의 계정과는 다른 계정을 권장합니다.</small>
+                                </div>
+                            </div>
 
 
-                    <div class="form-group row">
-                        <label for="db_pw" class="col-sm-3 col-form-label">DB비밀번호</label>
-                        <div class="col-sm-9">
-                            <input type="password" class="form-control" name="db_pw" id="db_pw"  placeholder="DB비밀번호"/>
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label for="db_pw" class="col-sm-3 col-form-label">DB비밀번호</label>
+                                <div class="col-sm-9">
+                                    <input type="password" class="form-control" name="db_pw" id="db_pw" placeholder="DB비밀번호" />
+                                </div>
+                            </div>
 
-                    <div class="form-group row">
-                        <label for="db_name" class="col-sm-3 col-form-label">DB명</label>
-                        <div class="col-sm-9">
-                            <input type="text" class="form-control" name="db_name" id="db_name"  placeholder="DB명(예:sammo_che)"/>
-                            <small>관리 DB와는 다른 DB를 사용해야합니다.</small>
-                        </div>
-                    </div>
+                            <div class="form-group row">
+                                <label for="db_name" class="col-sm-3 col-form-label">DB명</label>
+                                <div class="col-sm-9">
+                                    <input type="text" class="form-control" name="db_name" id="db_name" placeholder="DB명(예:sammo_che)" />
+                                    <small>관리 DB와는 다른 DB를 사용해야합니다.</small>
+                                </div>
+                            </div>
 
-                    <div class="form-group row">
-                        <div class="col-sm-3"></div>
-                        <div class="col-sm-9">
-                            <button type="submit" class="btn btn-primary btn-lg btn-block login-button">설정 파일 생성</button>
-                        </div>
+                            <div class="form-group row">
+                                <div class="col-sm-3"></div>
+                                <div class="col-sm-9">
+                                    <button type="submit" class="btn btn-primary btn-lg btn-block login-button">설정 파일 생성</button>
+                                </div>
+                            </div>
+                        </form>
                     </div>
-                </form>
+                </div>
+                <!--DB 폼 끝-->
+
             </div>
-        </div><!--DB 폼 끝-->
-
-        </div>
         </div>
     </div>
 </body>
+
 </html>

hwe/j_general_turn.php

@@ -1,42 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-WebUtil::requireAJAX();
-
-
-
-$session = Session::requireGameLogin([])->setReadOnly();
-
-$generalID = $session->generalID;
-
-$turnAmount = Util::getPost('amount', 'int');
-$isRepeat = Util::getPost('is_repeat', 'bool', false);
-
-if($turnAmount == null){
-    Json::die([
-        'result'=>false,
-        'reason'=>'턴이 입력되지 않았습니다.',
-    ]);
-}
-
-if(abs($turnAmount) >= GameConst::$maxTurn){
-    Json::die([
-        'result'=>false,
-        'reason'=>'턴 숫자가 올바르지 않습니다.',
-    ]);
-}
-
-if($isRepeat){
-    repeatGeneralCommand($generalID, $turnAmount);
-}
-else{
-    pushGeneralCommand($generalID, $turnAmount);
-}
-
-Json::die([
-    'result'=>true,
-    'reason'=>'success',
-]);

hwe/j_get_reserved_command.php

@@ -1,46 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$session = Session::requireGameLogin([])->setReadOnly();
-
-$db = DB::db();
-
-$commandList = [];
-$gameStor = KVStorage::getStorage($db, 'game_env');
-$generalID = $session->generalID;
-
-$rawTurn = $db->queryAllLists('SELECT turn_idx, action, arg, brief FROM general_turn WHERE general_id = %i ORDER BY turn_idx ASC', $generalID);
-foreach($rawTurn as [$turn_idx, $action, $arg, $brief]){
-    $commandList[$turn_idx] = [
-        'action'=>$action,
-        'brief'=>$brief,
-        'arg'=>Json::decode($arg)
-    ];
-}
-
-[$turnTerm, $year, $month, $lastExecute] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month', 'turntime']);
-
-$turnTime = $db->queryFirstField('SELECT turntime FROM general WHERE no=%i', $generalID);
-
-if(cutTurn($turnTime, $turnTerm) > cutTurn($lastExecute, $turnTerm)){
-    //이미 이번달에 실행된 턴이다.
-    $month++;
-    if($month >= 13){
-        $month -= 12;
-        $year += 1;
-    }
-}
-
-
-Json::die([
-    'result'=>true,
-    'turnTime'=>$turnTime,
-    'turnTerm'=>$turnTerm,
-    'year'=>$year,
-    'month'=>$month,
-    'date'=>TimeUtil::now(true),
-    'turn'=>$commandList
-]);

hwe/j_image_upload.php

@@ -1,111 +0,0 @@
-<?php
-namespace sammo;
-
-include 'lib.php';
-include 'func.php';
-
-WebUtil::requireAJAX();
-
-$session = Session::requireGameLogin([])->setReadOnly();
-$userID = $session::getUserID();
-$serverID = UniqueConst::$serverID;
-
-$image = $_FILES['img'];
-switch ($image['error']) {
-    case UPLOAD_ERR_OK:
-        break;
-    case UPLOAD_ERR_NO_FILE:
-        Json::die([
-            'result'=>false,
-            'reason'=>'파일이 없습니다.'
-        ]);
-    case UPLOAD_ERR_INI_SIZE:
-    case UPLOAD_ERR_FORM_SIZE:
-        Json::die([
-            'result'=>false,
-            'reason'=>'업로드된 파일이 지나치게 큽니다.'
-        ]);
-    default:
-        Json::die([
-            'result'=>false,
-            'reason'=>'업로드되지 않았습니다.'
-        ]);
-}
-
-if(!is_uploaded_file($image['tmp_name'])) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'제대로 파일이 업로드되지 않았습니다.'
-    ]);
-}
-
-if($image['size'] > 1048576) {
-    //파일크기 검사
-    Json::die([
-        'result'=>false,
-        'reason'=>'1MB 이하로 올려주세요!'
-    ]);
-}
-
-$size = getImageSize($image['tmp_name']);
-
-$imageType = $size[2];
-$availableImageType = array('.jpg'=>IMAGETYPE_JPEG, '.png'=>IMAGETYPE_PNG, '.gif'=>IMAGETYPE_GIF);
-$newExt = array_search($imageType, $availableImageType, true);
-
-if(!$newExt) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'jpg, gif, png 파일이 아닙니다!'
-    ]);
-}
-
-$db = RootDB::db();
-$imgStor = KVStorage::getStorage($db, 'img_storage');
-
-$picName = hash_file('md5', $image['tmp_name']);
-$newPicName = "$picName$newExt";
-
-$destDir = AppConf::getUserIconPathFS().'/uploaded_image';
-$dest = $destDir.'/'.$newPicName;
-
-if(!file_exists($dest)){
-    if (!file_exists($destDir)) {
-        mkdir($destDir);
-    }
-    if(!is_dir($destDir)) {
-        Json::die([
-            'result'=>false,
-            'reason'=>'버그! 업로드 경로 확인!'
-        ]);
-    }
-    if(!is_writable($destDir)){
-        Json::die([
-            'result'=>false,
-            'reason'=>'버그! 업로드 권한 확인!'
-        ]);
-    }
-    
-    $dest = $destDir.'/'.$newPicName;
-    
-    if(!move_uploaded_file($image['tmp_name'], $dest)) {
-        Json::die([
-            'result'=>false,
-            'reason'=>'업로드에 실패했습니다!'
-        ]);
-    }
-}
-
-$storedStatus = $imgStor->$newPicName??[];
-$imgKey = "$serverID:$userID";
-if(!key_exists($imgKey, $storedStatus)){
-    $storedStatus[$imgKey] = TimeUtil::now();
-}
-
-$imgStor->$newPicName = $storedStatus;
-
-Json::die([
-    'result'=>true,
-    'reason'=>'성공',
-    'path'=>AppConf::getUserIconPathWeb().'/uploaded_image/'.$newPicName
-]);

hwe/j_msg_decide_opt.php

@@ -47,6 +47,8 @@ if($msg === null){
     ]);
 }
 $reason = 'success';
+$gameStor = KVStorage::getStorage(DB::db(), 'game_env');
+$gameStor->cacheAll();
 if($msgResponse){
     $result = $msg->agreeMessage($general['no'], $reason);
 }

hwe/j_msg_get_old.php

@@ -40,7 +40,7 @@ if(count($lastMsgGet) >= 10){
     }
     catch(\Exception $e){
         $lastMsgGet = [];
-    } 
+    }
 }
 $lastMsgGet[] = $now;
 $session->lastMsgGet = Json::encode($lastMsgGet);
@@ -83,7 +83,7 @@ if($reqType == 'private'){
             $nextSequence = $msg->id;
         }
         return $msg->toArray();
-    }, Message::getMessagesFromMailBoxOld($generalID, Message::MSGTYPE_PRIVATE, $reqTo, 20));
+    }, Message::getMessagesFromMailBoxOld($generalID, Message::MSGTYPE_PRIVATE, $reqTo, 15));
 }
 else if($reqType == 'public'){
     $result['public'] = array_map(function(Message $msg)use (&$nextSequence){
@@ -91,7 +91,7 @@ else if($reqType == 'public'){
             $nextSequence = $msg->id;
         }
         return $msg->toArray();
-    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_PUBLIC, Message::MSGTYPE_PUBLIC, $reqTo, 20));
+    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_PUBLIC, Message::MSGTYPE_PUBLIC, $reqTo, 15));
 }
 else if($reqType == 'national'){
     $result['national'] = array_map(function(Message $msg)use (&$nextSequence){
@@ -99,7 +99,7 @@ else if($reqType == 'national'){
             $nextSequence = $msg->id;
         }
         return $msg->toArray();
-    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, $reqTo, 20));
+    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, $reqTo, 15));
 }
 else{
     $result['diplomacy'] = array_map(function(Message $msg)use (&$nextSequence, $permission){
@@ -112,7 +112,7 @@ else{
             $values['option']['invalid'] = true;
         }
         return $values;
-    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, $reqTo, 20));
+    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, $reqTo, 15));
 }
 
 Json::die($result);

hwe/j_msg_get_recent.php

@@ -26,7 +26,7 @@ if(count($lastMsgGet) >= 10){
     }
     catch(\Exception $e){
         $lastMsgGet = [];
-    } 
+    }
 }
 $lastMsgGet[] = TimeUtil::now();
 $session->lastMsgGet = Json::encode($lastMsgGet);
@@ -66,7 +66,7 @@ $result['private'] = array_map(function(Message $msg) use (&$nextSequence, &$min
         $lastType = 'private';
     }
     return $msg->toArray();
-}, Message::getMessagesFromMailBox($generalID, Message::MSGTYPE_PRIVATE, 20, $reqSequence));
+}, Message::getMessagesFromMailBox($generalID, Message::MSGTYPE_PRIVATE, 15, $reqSequence));
 
 $result['public'] = array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType){
     if($msg->id > $nextSequence){
@@ -77,7 +77,7 @@ $result['public'] = array_map(function(Message $msg)use (&$nextSequence, &$minSe
         $lastType = 'public';
     }
     return $msg->toArray();
-}, Message::getMessagesFromMailBox(Message::MAILBOX_PUBLIC, Message::MSGTYPE_PUBLIC, 20, $reqSequence));
+}, Message::getMessagesFromMailBox(Message::MAILBOX_PUBLIC, Message::MSGTYPE_PUBLIC, 15, $reqSequence));
 
 $result['national'] = array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType){
     if($msg->id > $nextSequence){
@@ -88,7 +88,7 @@ $result['national'] = array_map(function(Message $msg)use (&$nextSequence, &$min
         $lastType = 'national';
     }
     return $msg->toArray();
-}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, 20, $reqSequence));
+}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, 15, $reqSequence));
 
 $result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType, $permission){
     if($msg->id > $nextSequence){
@@ -104,7 +104,7 @@ $result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence, &$min
         $values['option']['invalid'] = true;
     }
     return $values;
-}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 20, $reqSequence));
+}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 15, $reqSequence));
 
 if($lastType !== null){
     array_pop($result[$lastType]);

hwe/j_select_npc.php

@@ -73,6 +73,8 @@ if ($gencount >= $maxgeneral) {
     ]);
 }
 
+$genAux = Json::decode($db->queryFirstField('SELECT aux FROM general WHERE no = %i', $pick)??'{}');
+$genAux['pickYearMonth'] = Util::joinYearMonth($year, $month);
 //등록 시작
 $db->update('general', [
     'owner_name'=>$userNick,
@@ -81,6 +83,7 @@ $db->update('general', [
     'defence_train'=>80,
     'permission'=>'normal',
     'owner'=>$userID,
+    'aux'=>Json::encode($genAux)
 ], 'owner <= 0 AND npc = 2 AND no = %i', $pick);
 
 if(!$db->affectedRows()){

hwe/j_server_basic_info.php

@@ -2,42 +2,7 @@
 namespace sammo;
 
 include "lib.php";
-
-$templates = new \League\Plates\Engine(__DIR__.'/templates');
-
-function getAutorunInfo($autorunOption){
-    global $templates;
-    $auto_info = [];
-    foreach($autorunOption['options'] as $auto_option => $value){
-        assert($value);
-        switch($auto_option){
-            case 'develop': $auto_info['내정'] = '내정'; break;
-            case 'warp': $auto_info['순간이동'] = '순간이동'; break;
-            case 'recruit': $auto_info['징병'] = $auto_info['징병']??'징병'; break;
-            case 'recruit_high': $auto_info['징병'] = '모병'; break;
-            case 'train': $auto_info['훈사'] = '훈련/사기진작'; break;
-            case 'battle': $auto_info['출병'] = '출병'; break;
-            case 'chief': $auto_info['사령턴'] = '사령턴'; break;
-        }
-    }
-    $limit = Util::toInt($autorunOption['limit_minutes']);
-    if($limit >= 43200){
-        $auto_info['제한'] = '항상 유효';
-    }
-    else if($limit % 60 == 0){
-        $auto_info['제한'] = ($limit/60).'시간 유효';
-    }
-    else{
-        $auto_info['제한'] = ($limit).'분 유효';
-    }
-    $auto_info = join(', ', array_values($auto_info));
-    return $templates->render('tooltip', [
-        'text'=>'자율행동',
-        'info'=>$auto_info,
-        'style'=>'text-decoration:underline',
-        'copyable_info'=>true
-    ]);
-}
+include "func_template.php";
 
 $session = Session::requireLogin([
     'game'=>null,

hwe/j_set_npc_control.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -21,18 +22,18 @@ $availableTypes = [
     'nationPolicy',
 ];
 
-if(!in_array($type, $availableTypes)){
+if (!in_array($type, $availableTypes)) {
     Json::die([
-        'result'=>false,
-        'reason'=>'올바른 타입이 아닙니다.',
+        'result' => false,
+        'reason' => '올바른 타입이 아닙니다.',
     ]);
 }
 
 $data =  Json::decode($data);
-if(!$data || !is_array($data)){
+if (!$data || !is_array($data)) {
     Json::die([
-        'result'=>false,
-        'reason'=>'올바른 입력이 아닙니다.',
+        'result' => false,
+        'reason' => '올바른 입력이 아닙니다.',
     ]);
 }
 
@@ -44,94 +45,95 @@ $me = $db->queryFirstRow('SELECT no, name, npc, nation, city, officer_level, con
 $nationID = $me['nation'];
 if (!$nationID) {
     Json::die([
-        'result'=>false,
-        'reason'=>'국가에 소속되어있지 않습니다.',
+        'result' => false,
+        'reason' => '국가에 소속되어있지 않습니다.',
     ]);
 }
 
 $permission = checkSecretPermission($me);
 if ($permission < 3) {
     Json::die([
-        'result'=>false,
-        'reason'=>'권한이 부족합니다. 군주, 외교권자, 조언자가 아닙니다.'
+        'result' => false,
+        'reason' => '권한이 부족합니다. 군주, 외교권자, 조언자가 아닙니다.'
     ]);
 }
 
-function applyNationPolicy($policy, $nationID, $generalName):?string{
+function applyNationPolicy($policy, $nationID, $generalName): ?string
+{
     $db = DB::db();
     $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
 
     $defaultPolicy = AutorunNationPolicy::$defaultPolicy;
     $troopCache = null;
-    foreach($db->queryFirstColumn('SELECT troop_leader FROM troop WHERE nation=%i',$nationID) as $troopID){
+    foreach ($db->queryFirstColumn('SELECT troop_leader FROM troop WHERE nation=%i', $nationID) as $troopID) {
         $troopCache[$troopID] = 'Neutral';
     }
     $cityList = CityConst::all();
     $nationPolicyRoot = $nationStor->npc_nation_policy;
-    $nationPolicy = $nationPolicyRoot['values']??[];
-    foreach($policy as $key=>$val){
+    $nationPolicy = $nationPolicyRoot['values'] ?? [];
+    foreach ($policy as $key => $val) {
 
-        if($key === 'CombatForce'){
-            if(!is_array($val)){
-                return "{$key}는 올바른 정책값이 아닙니다.";    
+        if ($key === 'CombatForce') {
+            if (!is_array($val)) {
+                return "{$key}는 올바른 정책값이 아닙니다.";
             }
-            foreach($val as $troopID=>$troopTarget){
-                if(!key_exists($troopID, $troopCache)){
+            foreach ($val as $troopID => $troopTarget) {
+                if (!key_exists($troopID, $troopCache)) {
                     return "{$troopID}는 국가의 부대가 아닙니다.";
                 }
-                if($troopCache[$troopID] != 'Neutral'){
+                if ($troopCache[$troopID] != 'Neutral') {
                     return "부대({$troopID}는 하나의 역할만 지정할 수 있습니다.";
                 }
-                if(!is_array($troopTarget) || count($troopTarget)!=2){
+                if (!is_array($troopTarget) || count($troopTarget) != 2) {
                     return "{$troopID}의 입력양식이 올바르지 않습니다.";
                 }
                 [$fromCity, $toCity] = $troopCache;
-                if(!key_exists($fromCity, $cityList) || !key_exists($toCity, $cityList)){
+                if (!key_exists($fromCity, $cityList) || !key_exists($toCity, $cityList)) {
                     return "{$troopID}의 도시 {$fromCity}, {$toCity}가 올바른 도시 번호가 아닙니다.";
                 }
-                $troopCache[$troopID]=$key;
+                $troopCache[$troopID] = $key;
             }
-            $nationPolicy[$key]=$val;
+            $nationPolicy[$key] = $val;
             continue;
         }
-        if(in_array($key, ['SupportForce', 'DevelopForce'])){
-            if(!is_array($val)){
-                return "{$key}는 올바른 정책값이 아닙니다.";    
+        if (in_array($key, ['SupportForce', 'DevelopForce'])) {
+            if (!is_array($val)) {
+                return "{$key}는 올바른 정책값이 아닙니다.";
             }
-            foreach($val as $troopID){
-                if(!key_exists($troopID, $troopCache)){
+            foreach ($val as $troopID) {
+                if (!key_exists($troopID, $troopCache)) {
                     return "{$troopID}는 국가의 부대가 아닙니다.";
                 }
-                if($troopCache[$troopID] != 'Neutral'){
+                if ($troopCache[$troopID] != 'Neutral') {
                     return "부대({$troopID}는 하나의 역할만 지정할 수 있습니다.";
                 }
-                $troopCache[$troopID]=$key;
+                $troopCache[$troopID] = $key;
             }
 
-            $nationPolicy[$key]=array_values($val);
+            $nationPolicy[$key] = array_values($val);
             continue;
         }
 
 
-        if(!key_exists($key, $defaultPolicy)){
+        if (!key_exists($key, $defaultPolicy)) {
             return "{$key}는 올바른 정책값이 아닙니다.";
         }
         $defaultValue = $defaultPolicy[$key];
-        if(is_numeric($defaultValue) != is_numeric($val)){
+        if (is_numeric($defaultValue) != is_numeric($val)) {
             return "{$key}는 올바른 값이 아닙니다.";
         }
-        if(is_integer($defaultValue) != is_integer($val)){
+        if (is_integer($defaultValue) != is_integer($val)) {
             return "{$key}는 올바른 값이 아닙니다.";
         }
-        if(is_array($defaultValue) != is_array($val)){
+        if (is_array($defaultValue) != is_array($val)) {
             return "{$key}는 올바른 값이 아닙니다.";
         }
-        if(is_integer($val) && $val < 0){
+        if (is_integer($val) && $val < 0) {
             $val = 0;
         }
         $nationPolicy[$key] = $val;
     }
-    
+
     $nationPolicyRoot['values'] = $nationPolicy;
     $nationPolicyRoot['valueSetter'] = $generalName;
     $nationPolicyRoot['valueSetTime'] = TimeUtil::now();
@@ -139,14 +141,15 @@ function applyNationPolicy($policy, $nationID, $generalName):?string{
     return null;
 }
 
-function applyNationPriority($priority, $nationID, $generalName):?string{
+function applyNationPriority($priority, $nationID, $generalName): ?string
+{
     $db = DB::db();
     $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
     $nationPolicyRoot = $nationStor->npc_nation_policy;
 
     $defaultPriority = AutorunNationPolicy::$defaultPriority;
-    foreach($priority as $item){
-        if(!in_array($item, $defaultPriority)){
+    foreach ($priority as $item) {
+        if (!in_array($item, $defaultPriority)) {
             return "{$item}은 올바른 명령이 아닙니다.";
         }
     }
@@ -157,17 +160,47 @@ function applyNationPriority($priority, $nationID, $generalName):?string{
     return null;
 }
 
-function applyGeneralPriority($priority, $nationID, $generalName):?string{
+function applyGeneralPriority($priority, $nationID, $generalName): ?string
+{
     $db = DB::db();
     $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
     $generalPolicyRoot = $nationStor->npc_general_policy;
 
     $defaultPriority = AutorunGeneralPolicy::$default_priority;
-    foreach($priority as $item){
-        if(!in_array($item, $defaultPriority)){
+    $actionOrder = [
+        ['출병', '일반내정']
+    ];
+    $mustHaveActions = ['출병' => 1, '일반내정' => 1];
+
+    $orderMap = [];
+    foreach ($priority as $item) {
+        if (key_exists($item, $mustHaveActions)) {
+            $mustHaveActions[$item] = 0;
+        }
+        if (!in_array($item, $defaultPriority)) {
             return "{$item}은 올바른 명령이 아닙니다.";
         }
+        $orderMap[$item] = count($orderMap);
     }
+
+    foreach($actionOrder as [$preItem, $postItem]){
+        if(!key_exists($preItem, $orderMap)){
+            continue;
+        }
+        if(!key_exists($postItem, $orderMap)){
+            continue;
+        }
+        if($orderMap[$preItem] > $orderMap[$postItem]){
+            return "{$preItem} 명령은 {$postItem} 명령보다 먼저여야 합니다.";
+        }
+    }
+
+    foreach ($mustHaveActions as $actionKey => $unset) {
+        if ($unset) {
+            return "{$actionKey}은 항상 사용해야 합니다.";
+        }
+    }
+
     $generalPolicyRoot['priority'] = $priority;
     $generalPolicyRoot['prioritySetter'] = $generalName;
     $generalPolicyRoot['prioritySetTime'] = TimeUtil::now();
@@ -175,26 +208,23 @@ function applyGeneralPriority($priority, $nationID, $generalName):?string{
     return null;
 }
 
-if($type == 'nationPolicy'){
+if ($type == 'nationPolicy') {
     $result = applyNationPolicy($data, $nationID, $me['name']);
-}
-else if($type == 'generalPriority'){
+} else if ($type == 'generalPriority') {
     $result = applyGeneralPriority($data, $nationID, $me['name']);
-}
-else if($type == 'nationPriority'){
+} else if ($type == 'nationPriority') {
     $result = applyNationPriority($data, $nationID, $me['name']);
-}
-else{
+} else {
     throw new MustNotBeReachedException();
 }
 
-if($result!==null){
+if ($result !== null) {
     Json::die([
-        'result'=>false,
-        'reason'=>$result,
+        'result' => false,
+        'reason' => $result,
     ]);
 }
 Json::die([
-    'result'=>true,
-    'reason'=>'success',
-]);
+    'result' => true,
+    'reason' => 'success',
+]);

hwe/lib.php

@@ -20,10 +20,6 @@ $loader->addClassMap((function () {
 //디버그용 매크로
 ini_set("session.cache_expire", 10080);      // minutes
 
-// 각종 변수
-define('STEP_LOG', true);
-define('PROCESS_LOG', true);
-
 ob_start();
 
 // 에러 메세지 출력
@@ -69,6 +65,6 @@ function prepareDir(string $dirPath, bool $forceCreate=true):bool{
         }
         return mkdir($dirPath);
     }
-    
+
     return mkdir($dirPath, 0777, true);
 }

hwe/process_war.php

@@ -19,7 +19,7 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
             'rice'=>10000,
             'type'=>GameConst::$neutralNationType,
             'tech'=>0,
-            'gennum'=>1     
+            'gennum'=>1
         ];
     }
     else{
@@ -89,7 +89,7 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
             $rice *= getTechCost($rawDefenderNation['tech']);
             $rice *= $cityRate / 100 - 0.2;
             Util::setRound($rice);
-    
+
             $updateDefenderNation['rice'] = max(0, $rawDefenderNation['rice'] - $rice);
         }
         else if($conquerCity){
@@ -169,7 +169,7 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
     if(!$conquerCity){
         return;
     }
-    
+
     ConquerCity([
         'startyear'=>$startYear,
         'year'=>$year,
@@ -207,7 +207,7 @@ function extractBattleOrder(General $general){
 
 function processWar_NG(
     WarUnitGeneral $attacker,
-    callable $getNextDefender, 
+    callable $getNextDefender,
     WarUnitCity $city,
     int $relYear
 ):bool{
@@ -216,7 +216,7 @@ function processWar_NG(
     $logger = $attacker->getLogger();
 
     //$attacker->useBattleInitItem();
-    
+
     $date = $attacker->getGeneral()->getTurnTime(General::TURNTIME_HM);
 
     $attackerNationUpdate = [];
@@ -224,7 +224,7 @@ function processWar_NG(
 
     $defender = ($getNextDefender)(null, true);
     $conquerCity = false;
-    
+
     $josaRo = JosaUtil::pick($city->getName(), '로');
     $josaYi = JosaUtil::pick($attacker->getName(), '이');
 
@@ -234,7 +234,7 @@ function processWar_NG(
     for($currPhase = 0; $currPhase < $attacker->getMaxPhase(); $currPhase+=1){
         if($defender === null){
             $defender = $city;
-            
+
             if($city->getNationVar('rice') <= 0 && $city->getVar('supply')){
                 //병량 패퇴
                 $attacker->setOppose($defender);
@@ -261,15 +261,17 @@ function processWar_NG(
 
             $attacker->addTrain(1);
             $defender->addTrain(1);
-            
+
             $attackerCrewTypeCoef = $attacker->getCrewType()->getAttackCoef($defender->getCrewType()) * $defender->getCrewType()->getDefenceCoef($attacker->getCrewType());
             $defenderCrewTypeCoef = $defender->getCrewType()->getAttackCoef($attacker->getCrewType()) * $attacker->getCrewType()->getDefenceCoef($defender->getCrewType());
+            /*
             if($attackerCrewTypeCoef > $defenderCrewTypeCoef && $attacker instanceof WarUnitGeneral){
                 $attacker->getGeneral()->increaseInheritancePoint('snipe_combat', 1);
             }
             if($defenderCrewTypeCoef > $attackerCrewTypeCoef && $defender instanceof WarUnitGeneral){
                 $defender->getGeneral()->increaseInheritancePoint('snipe_combat', 1);
             }
+            */
 
             $attackerName = $attacker->getName();
             $attackerCrewTypeName = $attacker->getCrewTypeName();
@@ -315,7 +317,7 @@ function processWar_NG(
         $battleCaller->merge($defender->getGeneral()->getBattlePhaseSkillTriggerList($defender));
 
         $battleCaller->fire([], [$attacker, $defender]);
-        
+
         $deadDefender = $attacker->calcDamage();
         $deadAttacker = $defender->calcDamage();
 
@@ -339,7 +341,7 @@ function processWar_NG(
         }
 
         $deadAttacker = min(ceil($deadAttacker), $attackerHP);
-        $deadDefender = min(ceil($deadDefender), $defenderHP);        
+        $deadDefender = min(ceil($deadDefender), $defenderHP);
 
         $attacker->decreaseHP($deadAttacker);
         $defender->decreaseHP($deadDefender);
@@ -353,12 +355,12 @@ function processWar_NG(
             $attacker->getLogger()->pushGeneralBattleDetailLog(
                 "$phaseNickname : <Y1>【{$attacker->getName()}】</> <C>{$attacker->getHP()} (-$deadAttacker)</> VS <C>{$defender->getHP()} (-$deadDefender)</> <Y1>【{$defender->getName()}】</>"
             );
-    
+
             $defender->getLogger()->pushGeneralBattleDetailLog(
                 "$phaseNickname : <Y1>【{$defender->getName()}】</> <C>{$defender->getHP()} (-$deadDefender)</> VS <C>{$attacker->getHP()} (-$deadAttacker)</> <Y1>【{$attacker->getName()}】</>"
             );
         }
-        
+
 
         $attacker->addPhase();
         $defender->addPhase();
@@ -369,7 +371,7 @@ function processWar_NG(
 
             $attacker->addLose();
             $defender->addWin();
-            
+
             $attacker->tryWound();
             $defender->tryWound();
 
@@ -404,7 +406,7 @@ function processWar_NG(
             }
 
             $josaYi = JosaUtil::pick($defender->getCrewTypeName(), '이');
-            
+
             if($noRice){
                 $logger->pushGlobalActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.");
             $attacker->getLogger()->pushGeneralActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.", ActionLogger::PLAIN);
@@ -426,9 +428,9 @@ function processWar_NG(
             if($defender !== null && !($defender instanceof WarUnitGeneral)){
                 throw new \RuntimeException('다음 수비자를 받아오는데 실패');
             }
-            
+
         }
-        
+
     }
 
     if($currPhase == $attacker->getMaxPhase()){
@@ -442,7 +444,7 @@ function processWar_NG(
 
     $attacker->finishBattle();
     $defender->finishBattle();
-    
+
     if($defender instanceof WarUnitCity){
         $newConflict = $defender->addConflict();
         if($newConflict){
@@ -501,7 +503,7 @@ function ConquerCity(array $admin, General $general, array $city) {
     $defenderNationID = $city['nation'];
     $defenderStaticNation = getNationStaticInfo($defenderNationID);
     $defenderNationName = $defenderStaticNation['name'];
-    
+
     $defenderNationLogger = new ActionLogger(0, $defenderNationID, $year, $month);
 
     if($defenderNationID) {
@@ -535,7 +537,7 @@ function ConquerCity(array $admin, General $general, array $city) {
             $defenderNationID,
             12
         ), null, $city, $loseNation, $year, $month, false);
-        
+
         $josaUl = JosaUtil::pick($defenderNationName, '을');
         $attackerLogger->pushNationalHistoryLog("<D><b>{$defenderNationName}</b></>{$josaUl} 정복");
         $attackerLogger->flush();
@@ -585,19 +587,19 @@ function ConquerCity(array $admin, General $general, array $city) {
         // 승전국 보상
         $loseNationGold = Util::valueFit($loseNation['gold'] - GameConst::$basegold, 0);
         $loseNationRice = Util::valueFit($loseNation['rice'] - GameConst::$baserice, 0);
-        
+
         $loseNationGold += $loseGeneralGold;
         $loseNationRice += $loseGeneralRice;
-        
+
         $loseNationGold = intdiv($loseNationGold, 2);
         $loseNationRice = intdiv($loseNationRice, 2);
-        
+
         // 기본량 제외 금쌀50% + 장수들 분실 금쌀50% 흡수
         $db->update('nation', [
             'gold'=>$db->sqleval('gold + %i', $loseNationGold),
             'rice'=>$db->sqleval('rice + %i', $loseNationRice),
         ], 'nation=%i', $attackerNationID);
-        
+
         //아국 수뇌부에게 로그 전달
         $loseNationGoldText = number_format($loseNationGold);
         $loseNationRiceText = number_format($loseNationRice);
@@ -622,7 +624,7 @@ function ConquerCity(array $admin, General $general, array $city) {
             'officer_level'=>1,
             'officer_city'=>0,
         ], 'officer_city = %i',$cityID);
-        
+
         //수도였으면 긴급 천도
         if($defenderNationID && $defenderStaticNation['capital'] == $cityID) {
             $minCity = findNextCapital($cityID, $defenderNationID);
@@ -686,7 +688,7 @@ function ConquerCity(array $admin, General $general, array $city) {
         $conquerNationLogger->pushNationalHistoryLog("<D><b>{$attackerNationName}</b></>에서 <G><b>{$city['name']}</b></>{$josaUl} <S>양도</> 받음");
         $attackerLogger->pushNationalHistoryLog("<G><b>{$city['name']}</b></>{$josaUl} <D><b>{$conquerNationName}</b></>에 <Y>양도</>");
     }
-    
+
     $query = [
         'supply'=>1,
         'term'=>0,
@@ -704,7 +706,7 @@ function ConquerCity(array $admin, General $general, array $city) {
         $query['def'] = $db->sqleval('def_max/2');
         $query['wall'] = $db->sqleval('wall_max/2');
     }
-    
+
     $db->update('city', $query, 'city=%i', $cityID);
     //전방설정
 
@@ -726,8 +728,8 @@ function findNextCapital(int $capitalID, int $nationID):int{
     $cities = [];
     foreach(
         DB::db()->query(
-            'SELECT city, pop FROM city WHERE nation=%i and city!=%i', 
-            $nationID, 
+            'SELECT city, pop FROM city WHERE nation=%i and city!=%i',
+            $nationID,
             $capitalID
         ) as $row
     ){
@@ -737,7 +739,7 @@ function findNextCapital(int $capitalID, int $nationID):int{
     foreach($distList as $dist=>$distSubList){
         $maxCityPop = 0;
         $minCity = 0;
-        
+
         foreach($distSubList as $cityID){
             if(!key_exists($cityID, $cities)){
                 continue;

hwe/recent_map.php

@@ -19,14 +19,12 @@ include "func.php";
         'serverNick' => DB::prefix(),
         'serverID' => UniqueConst::$serverID
     ]) ?>
-    <?= WebUtil::printJS('dist_js/vendors.js') ?>
     <?= WebUtil::printJS('d_shared/base_map.js') ?>
-    <?= WebUtil::printJS('dist_js/recent_map.js') ?>
 
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <?= WebUtil::printCSS('../e_lib/bootstrap.min.css') ?>
-    <?= WebUtil::printCSS('css/common.css') ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printCSS('css/map.css') ?>
+    <?= WebUtil::printDist('ts', ['common', 'recent_map'], true) ?>
     <style>
         html {
             width: 700px;
@@ -52,7 +50,6 @@ include "func.php";
         <div class="card-body">
         </div>
     </div>
-
 </body>
 
 </html>

hwe/sammo/API/Command/GetReservedCommand.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace sammo\API\Command;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\Json;
+use sammo\KVStorage;
+use sammo\TimeUtil;
+
+use function sammo\cutTurn;
+
+class GetReservedCommand extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        $db = DB::db();
+
+        $commandList = [];
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $generalID = $session->generalID;
+
+        $rawTurn = $db->queryAllLists('SELECT turn_idx, action, arg, brief FROM general_turn WHERE general_id = %i ORDER BY turn_idx ASC', $generalID);
+        foreach ($rawTurn as [$turn_idx, $action, $arg, $brief]) {
+            $commandList[$turn_idx] = [
+                'action' => $action,
+                'brief' => $brief,
+                'arg' => Json::decode($arg)
+            ];
+        }
+
+
+        [$turnTerm, $year, $month, $lastExecute] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month', 'turntime']);
+
+        [$turnTime, $rawGeneralAux] = $db->queryFirstList('SELECT turntime, aux FROM general WHERE no=%i', $generalID);
+        $generalAux = Json::decode($rawGeneralAux ?? '{}');
+
+        if (cutTurn($turnTime, $turnTerm) > cutTurn($lastExecute, $turnTerm)) {
+            //이미 이번달에 실행된 턴이다.
+            $month++;
+            if ($month >= 13) {
+                $month -= 12;
+                $year += 1;
+            }
+        }
+
+        return [
+            'result' => true,
+            'turnTime' => $turnTime,
+            'turnTerm' => $turnTerm,
+            'year' => $year,
+            'month' => $month,
+            'date' => TimeUtil::now(true),
+            'turn' => $commandList,
+            'autorun_limit' => $generalAux['autorun_limit'] ?? null,
+        ];
+    }
+}

hwe/sammo/API/Command/PushCommand.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace sammo\API\Command;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\Validator;
+
+use function sammo\cutTurn;
+use function sammo\pushGeneralCommand;
+
+class PushCommand extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'amount',
+        ])
+            ->rule('integer', 'amount')
+            ->rule('min', 'amount', -12)
+            ->rule('max', 'amount', 12);
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        $amount = $this->args['amount'];
+        if($amount == 0){
+            return '0은 불가능합니다';
+        }
+        pushGeneralCommand($session->generalID, $amount);
+
+        return [
+            'result'=>true
+        ];
+    }
+}

hwe/sammo/API/Command/RepeatCommand.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace sammo\API\Command;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\Validator;
+
+use function sammo\cutTurn;
+use function sammo\repeatGeneralCommand;
+
+class RepeatCommand extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'amount',
+        ])
+            ->rule('integer', 'amount')
+            ->rule('min', 'amount', 1)
+            ->rule('max', 'amount', 12);
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+
+        $amount = $this->args['amount'];
+        repeatGeneralCommand($session->generalID, $amount);
+
+        return [
+            'result'=>true
+        ];
+    }
+}

hwe/sammo/API/Command/ReserveCommand.php

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

hwe/sammo/API/General/Join.php

@@ -26,7 +26,7 @@ use function sammo\cutTurn;
 use function sammo\getGeneralSpecialWarName;
 use function sammo\getRandTurn;
 use function sammo\pushAdminLog;
-use function sammo\resetInheritanceUser;
+use function sammo\applyInheritanceUser;
 
 class Join extends \sammo\BaseAPI
 {
@@ -155,7 +155,7 @@ class Join extends \sammo\BaseAPI
 
         $admin = $gameStor->getValues(['scenario', 'turnterm', 'turntime', 'show_img_level', 'startyear', 'year', 'month']);
 
-        $inheritTotalPoint = resetInheritanceUser($userID);
+        $inheritTotalPoint = applyInheritanceUser($userID);
         $inheritRequiredPoint = 0;
 
         $userLogger = new UserLogger($userID, $admin['year'], $admin['month'], false);

hwe/sammo/API/InheritAction/BuySpecificUnique.php

@@ -17,6 +17,7 @@ class BuySpecificUnique extends \sammo\BaseAPI
 {
     public function validateArgs(): ?string
     {
+        $availableItems = [];
         foreach (GameConst::$allItems as $items) {
             foreach ($items as $itemKey => $amount) {
                 if ($amount == 0) {

hwe/sammo/API/InheritAction/ResetTurnTime.php

@@ -62,10 +62,10 @@ class ResetTurnTime extends \sammo\BaseAPI
 
         $userLogger = new UserLogger($userID);
         if($afterTurn >= 0){
-            $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 뒤로 밀림", intdiv($afterTurn, 60), $afterTurn%60), "inheritPoint");
+            $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 뒤로 밀림", intdiv(Util::toInt($afterTurn), 60), $afterTurn%60), "inheritPoint");
         }
         else{
-            $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 앞으로 당김", intdiv(-$afterTurn, 60), (-$afterTurn)%60), "inheritPoint");
+            $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 앞으로 당김", intdiv(Util::toInt(-$afterTurn), 60), (-$afterTurn)%60), "inheritPoint");
         }
         $userLogger->flush();
 

hwe/sammo/API/Misc/UploadImage.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace sammo\API\Misc;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\AppConf;
+use sammo\KVStorage;
+use sammo\RootDB;
+use sammo\TimeUtil;
+use sammo\UniqueConst;
+use sammo\Validator;
+
+class UploadImage extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'imageData',
+        ]);
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        $imageData = base64_decode($this->args['imageData'], true);
+        if ($imageData === false) {
+            return "올바른 데이터가 아닙니다.";
+        }
+
+        if(strlen($imageData) > 1024*1024){
+            //NOTE: 가변 길이를 적용해야할까?
+            return "이미지 크기가 1MB보다 큽니다.";
+        }
+
+        $contentType = (new \finfo(FILEINFO_MIME_TYPE))->buffer($imageData);
+        if (substr($contentType, 0, 5) !== 'image') {
+            return '이미지 파일이 아닙니다: ' . $contentType;
+        }
+
+        $extension = ltrim($contentType, 'image/');
+        $validExtensions = ['png', 'jpeg', 'jpg', 'gif', 'webp'];
+        if (!in_array(strtolower($extension), $validExtensions)) {
+            return '지원하지 않는 이미지 파일입니다: ' . $contentType;
+        }
+
+        $oMD = hash_init('md5');
+        hash_update($oMD, $imageData);
+        $imgName = hash_final($oMD);
+        $imgFullName = "{$imgName}.{$extension}";
+
+        $destDir = AppConf::getUserIconPathFS() . '/uploaded_image';
+        $destPath = "{$destDir}/{$imgFullName}";
+
+        if (!file_exists($destPath)) {
+            if (!file_exists($destDir)) {
+                mkdir($destDir);
+            }
+            if (!is_dir($destDir)) {
+                return '버그! 업로드 경로 확인!';
+            }
+            if (!is_writable($destDir)) {
+                return '버그! 업로드 권한 확인!';
+            }
+
+            if (!file_put_contents($destPath, $imageData)) {
+                return '업로드에 실패했습니다!';
+            }
+        }
+
+        $db = RootDB::db();
+        $imgStor = KVStorage::getStorage($db, 'img_storage');
+
+
+        $userID = $session->userID;
+        $serverID = UniqueConst::$serverID;
+
+        $storedStatus = $imgStor->$imgFullName ?? [];
+        $imgKey = "$serverID:$userID";
+        if (!key_exists($imgKey, $storedStatus)) {
+            $storedStatus[$imgKey] = TimeUtil::now();
+        }
+
+        $imgStor->$imgFullName = $storedStatus;
+
+        return [
+            'result' => true,
+            'path'=>AppConf::getUserIconPathWeb().'/uploaded_image/'.$imgFullName,
+        ];
+    }
+}

hwe/sammo/API/Nation/SetNotice.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace sammo\API\Nation;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\KVStorage;
+use sammo\Validator;
+use sammo\WebUtil;
+
+use function sammo\checkSecretPermission;
+
+class SetNotice extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'msg',
+        ])->rule('lengthMax', 'msg', 16384);
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        $msg = $this->args['msg'];
+        $userID = $session->userID;
+        $db = DB::db();
+        $me = $db->queryFirstRow('SELECT `no`,nation,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
+
+        $permission = checkSecretPermission($me, false);
+        if($permission < 0){
+            return "권한이 부족합니다.";
+        }
+        if ($me['officer_level'] < 5 && $permission != 4){
+            return "권한이 부족합니다.";
+        }
+
+        $nationID = $me['nation'];
+
+        $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
+        $nationStor->notice = WebUtil::htmlPurify($msg);
+
+        return [
+            'result' => true
+        ];
+    }
+}

hwe/sammo/API/Nation/SetScoutMsg.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace sammo\API\Nation;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\KVStorage;
+use sammo\Validator;
+use sammo\WebUtil;
+
+use function sammo\checkSecretPermission;
+
+class SetScoutMsg extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'msg',
+        ])->rule('lengthMax', 'msg', 1000);
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        $msg = $this->args['msg'];
+        $userID = $session->userID;
+        $db = DB::db();
+        $me = $db->queryFirstRow('SELECT `no`,nation,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
+
+        $permission = checkSecretPermission($me, false);
+        if($permission < 0){
+            return "권한이 부족합니다.";
+        }
+        if ($me['officer_level'] < 5 && $permission != 4){
+            return "권한이 부족합니다.";
+        }
+
+        $nationID = $me['nation'];
+
+        $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
+        $nationStor->scout_msg = WebUtil::htmlPurify($msg);
+
+        return [
+            'result' => true
+        ];
+    }
+}

hwe/sammo/ActionItem/che_무기_09_동호비궁.php

@@ -14,12 +14,12 @@ class che_무기_09_동호비궁 extends \sammo\BaseStatItem{
     public function __construct()
     {
         parent::__construct();
-        $this->info .= "<br>[전투] 새로운 상대와 전투 시 20% 확률로 저격 발동, 성공 시 사기+10";
+        $this->info .= "<br>[전투] 새로운 상대와 전투 시 20% 확률로 저격 발동, 성공 시 사기+20";
     }
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 109, 0.2, 20, 40),
+            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 109, 0.2, 20, 40, 20),
             new che_저격발동($unit, che_저격발동::TYPE_ITEM)
         );
     }

hwe/sammo/ActionItem/che_무기_11_이광궁.php

@@ -19,7 +19,7 @@ class che_무기_11_이광궁 extends \sammo\BaseStatItem{
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 111, 0.10, 20, 40),
+            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 111, 0.10, 20, 40, 10),
             new che_저격발동($unit, che_저격발동::TYPE_ITEM)
         );
     }

hwe/sammo/ActionItem/che_무기_13_양유기궁.php

@@ -19,7 +19,7 @@ class che_무기_13_양유기궁 extends \sammo\BaseStatItem{
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 113, 0.1, 20, 40),
+            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 113, 0.1, 20, 40, 10),
             new che_저격발동($unit, che_저격발동::TYPE_ITEM)
         );
     }

hwe/sammo/ActionItem/che_반계_백우선.php

@@ -15,7 +15,7 @@ class che_반계_백우선 extends \sammo\BaseItem{
     protected $id = 45;
     protected $rawName = '백우선';
     protected $name = '백우선(반계)';
-    protected $info = '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 40% 확률로 되돌림';
+    protected $info = '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 20% 확률로 되돌림';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -29,7 +29,7 @@ class che_반계_백우선 extends \sammo\BaseItem{
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new che_반계시도($unit, BaseWarUnitTrigger::TYPE_ITEM +BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*301),
+            new che_반계시도($unit, BaseWarUnitTrigger::TYPE_ITEM +BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*301, 0.2),
             new che_반계발동($unit)
         );
     }

hwe/sammo/ActionItem/che_반계_파초선.php

@@ -15,7 +15,7 @@ class che_반계_파초선 extends \sammo\BaseItem{
     protected $id = 45;
     protected $rawName = '파초선';
     protected $name = '파초선(반계)';
-    protected $info = '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 40% 확률로 되돌림';
+    protected $info = '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 20% 확률로 되돌림';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -29,7 +29,7 @@ class che_반계_파초선 extends \sammo\BaseItem{
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new che_반계시도($unit, BaseWarUnitTrigger::TYPE_ITEM +BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*302),
+            new che_반계시도($unit, BaseWarUnitTrigger::TYPE_ITEM +BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*302, 0.2),
             new che_반계발동($unit)
         );
     }

hwe/sammo/ActionItem/che_서적_07_사마법.php

@@ -16,12 +16,12 @@ class che_서적_07_사마법 extends \sammo\BaseStatItem{
     public function __construct()
     {
         parent::__construct();
-        $this->info .= "<br>[전투] 상대의 계략을 20% 확률로 되돌림";
+        $this->info .= "<br>[전투] 상대의 계략을 10% 확률로 되돌림";
     }
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new che_반계시도($unit, BaseWarUnitTrigger::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*207, 0.2),
+            new che_반계시도($unit, BaseWarUnitTrigger::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*207, 0.1),
             new che_반계발동($unit)
         );
     }