feat: 토너먼트 베팅에서 모든 NPC가 10원씩 베팅함

- 추가로 베팅 공지

.babelrc

@@ -0,0 +1,15 @@
+{
+    "presets": [
+        [
+            "@babel/preset-env",
+            {
+                "useBuiltIns": "usage",
+                "corejs": 3,
+                "modules": false
+            }
+        ]
+    ],
+    "plugins": [
+        "lodash"
+    ]
+}

.eslintrc.cjs

@@ -0,0 +1,27 @@
+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",
+
+  ],
+  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",
+  }
+}

.gitignore

@@ -4,7 +4,8 @@
 !.vscode/launch.json
 !.vscode/extensions.json
 
-
+/node_modules
+package-lock.json
 
 
 # 체섭 ignore
@@ -29,11 +30,22 @@ d_shared
 d_pic/*.jpg
 d_pic/*.gif
 d_pic/*.png
+d_pic/*.webp
 d_pic/uploaded_image
 
+*/dist_misc/*
+*/dist_js/*
+*/dist_css/*
+/dist_misc/*
+/dist_js/*
+/dist_css/*
+
 d_setting/*.php
 */d_setting/*.php
 */d_setting/templates/*.php
+!*.orig.php
+
+*/data/file_cache
 
 **/old/*
 test.php
@@ -48,3 +60,8 @@ test.php
 phpinfo.php
 vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/*
 *.sqlite3
+
+ingame/js/*
+ingame/css/*
+gateway/js/*
+gateway/css/*

.phan/config.php

@@ -7,7 +7,7 @@
  */
 return [
     // Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`,
-    // `'7.4'`, `null`.
+    // `'7.4'`, `'8.0'`, `'8.1'`, `null`.
     // If this is set to `null`,
     // then Phan assumes the PHP version which is closest to the minor version
     // of the php executable used to execute Phan.
@@ -15,21 +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.3',
+    "target_php_version" => '8.0',
-    'backward_compatibility_checks ' => false,
+    'backward_compatibility_checks ' => true,
-    'minimum_severity'=>\Phan\Issue::SEVERITY_NORMAL,
+    '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/a_emperior2.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',
@@ -51,12 +64,9 @@ return [
         'hwe/b_tournament.php',
         'hwe/b_troop.php',
         'hwe/c_auction.php',
-        'hwe/c_die_immediately.php',
         'hwe/c_dipcenter.php',
         'hwe/c_tournament.php',
-        'hwe/c_vacation.php',
         'hwe/c_vote.php',
-        'hwe/func.php',
         'hwe/func_auction.php',
         'hwe/func_command.php',
         'hwe/func_converter.php',
@@ -65,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/install.php',
-        'hwe/join_post.php',
         'hwe/j_adjust_icon.php',
         'hwe/j_autoreset.php',
         'hwe/j_basic_info.php',
@@ -83,25 +92,31 @@ return [
         'hwe/j_board_comment_add.php',
         'hwe/j_board_get_articles.php',
         'hwe/j_chief_turn.php',
+        'hwe/j_die_immediately.php',
         'hwe/j_diplomacy_destroy_letter.php',
         'hwe/j_diplomacy_get_letter.php',
         'hwe/j_diplomacy_respond_letter.php',
         'hwe/j_diplomacy_rollback_letter.php',
         'hwe/j_diplomacy_send_letter.php',
+        'hwe/j_export_simulator_object.php',
+        'hwe/j_general_log_old.php',
         'hwe/j_general_set_permission.php',
         'hwe/j_general_turn.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',
@@ -109,30 +124,30 @@ return [
         'hwe/j_msg_get_recent.php',
         'hwe/j_msg_submit.php',
         'hwe/j_myBossInfo.php',
+        'hwe/j_raise_event.php',
         'hwe/j_select_npc.php',
+        'hwe/j_select_picked_general.php',
         'hwe/j_server_basic_info.php',
         'hwe/j_set_chief_command.php',
         'hwe/j_set_general_command.php',
+        'hwe/j_set_my_setting.php',
+        '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/v_board.php',
-        'hwe/_119_b.php',
+        'hwe/v_inheritPoint.php',
-        'hwe/_admin1.php',
+        'hwe/v_join.php',
-        'hwe/_admin1_submit.php',
+        'hwe/v_NPCControl.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',
     ],
 
     // A list of directories that should be parsed for class and
@@ -143,9 +158,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/d_setting',
-    	'hwe/sammo',
+        'hwe/sammo',
-    	'd_setting',
+        'd_setting',
         'src/sammo',
         'src/kakao',
         'vendor'
@@ -169,6 +184,7 @@ return [
 
     'suppress_issue_types' => [
         'PhanUnreferencedUseNormal',
+        'PhanTypeArraySuspiciousNullable',
     ],
 
     // A list of plugin files to execute.

403.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>닫혀 있습니다.</title>
+        <script>
+            setTimeout(function(){
+                window.location.href = '../';
+            }, 5000);
+        </script>
+        <style>
+            html, body{
+                background-color:black;
+                color:yellow;
+            }
+
+        </style>
+    </head>
+    <body>
+        서버가 닫혀있습니다.<br>
+        잠시 뒤에 입구로 이동합니다.
+    </body>
+</html>

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2020 Hide_D, 62che
+Copyright (c) 2021 Hide_D, 62che
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -5,22 +5,24 @@
 
 ## 요구사항
 
-* Apache2
+* Apache2 또는 nginx
-  * <code>mpm_event</code> 권장
+  * Apache2인 경우 `mpm_event` 권장
-* PHP 7.3 이상 
+* PHP 8.0 이상
-  * <code>php-fpm</code> 권장
+  * `php-fpm` 권장
-  * php에서 curl, pdo-sqlite을 실행가능해야 합니다. (기본값: 지원)
+  * php에서 curl, pdo-sqlite을 실행가능해야 합니다.
-  * mysqlnd가 지원되어야합니다. (기본값: 지원)
+  * mysqli, mysqlnd
-  * mysqli
   * gd
+  * mbstring
+* NodeJS 14 이상
+  * 내부의 git을 통해 upgrade 때 `webpack build` 용도로 필요합니다.
 * MariaDB 10.2.1 이상
   * 현재 MySQL은 지원하지 않습니다.
-* <code>git</code>
+* `git`
-* <code>curl</code>
+* `curl`
 
-Linux는 Ubuntu 16.04, 18.04, Windows는 Windows 10에서 XAMPP를 사용한 환경에서 테스트되었습니다.
+Linux는 Ubuntu 18.04, 20.04, Windows는 WSL2를 사용한 환경에서 테스트되었습니다.
 
-Docker를 이용한 설치는 계획중입니다.
+Docker를 이용한 설치도 제공하고 있습니다.
 
 ## Docker를 이용한 설치
 

api.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace sammo;
+
+require(__DIR__ . '/vendor/autoload.php');
+
+
+if (!class_exists('\\sammo\\RootDB')) {
+    Json::dieWithReason('No DB');
+}
+
+APIHelper::launch(dirname(__FILE__));

composer.json

@@ -8,7 +8,7 @@
     ],
     "config": {
         "platform": {
-            "php": "7.3"
+            "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",
@@ -26,7 +25,11 @@
         "ezyang/htmlpurifier": "^4.10",
         "xemlock/htmlpurifier-html5": "^0.1.7",
         "catfan/medoo": "^1.5",
-        "phan/phan": "^2.7"
+        "phan/phan": "*",
+        "erusev/parsedown-extra": "^0.8.1",
+        "nette/caching": "^3.0",
+        "illuminate/database": "^8.61",
+        "illuminate/events": "^8.61"
     },
     "autoload": {
         "psr-4": {

css/config.css

@@ -1,19 +1,34 @@
 @charset "utf-8";
-
 body {
-    color:white; background-color:black; font-family: '맑은 고딕';
+    color: white;
+    background-color: black;
+    font-family: '맑은 고딕';
 }
 
 table {
-    border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
+    border: solid 1px;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
     padding: 0px;
     font-size: 13px;
     word-break: break-all;
     text-align: center;
     font-family: '맑은 고딕';
 }
-th, td      {
+
-    border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
+th,
+td {
+    border: solid 1px;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
     padding: 0px;
     font-size: 13px;
     word-break: break-all;
@@ -25,8 +40,8 @@ a.just_link {
     text-decoration: none;
 }
 
-.with_border{
+.with_border {
-    margin:0;
+    margin: 0;
     border: solid 1px;
     border-spacing: 0px;
     border-collapse: separate;
@@ -37,42 +52,52 @@ a.just_link {
 }
 
 .section_title {
-    height:50px;
+    height: 50px;
-    line-height:50px;
+    line-height: 50px;
-    font-size: 30px; font-weight: bold;
+    font-size: 30px;
+    font-weight: bold;
     text-align: center;
-    color:white;
+    color: white;
-    padding:0;
+    padding: 0;
 }
 
-.legacy_layout div     {
+.legacy_layout div {
-    border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
+    border: solid 1px;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
     padding: 0px;
     font-size: 13px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕';;
+    font-family: '맑은 고딕';
+    ;
 }
 
-.obj_fill{
+.obj_fill {
-    display:block;
+    display: block;
-    width:100%;
+    width: 100%;
-    height:100%;
+    height: 100%;
 }
 
 button.with_skin {
-    padding:0 4px;
+    padding: 0 4px;
-    background-color: black; color: white;
+    background-color: black;
+    color: white;
     font-family: '맑은 고딕';
     font-size: 13px;
 }
 
 button.with_skin:disabled {
-    background-color:#333333;
+    background-color: #333333;
 }
 
-input.with_skin   {
+input.with_skin {
-    background-color: black; color: white;
+    background-color: black;
+    color: white;
     font-family: '맑은 고딕';
     font-size: 13px;
 }
@@ -81,25 +106,41 @@ input.with_skin:disabled {
     background-color: #333333;
 }
 
-.font0  { font-size: 10px; }
+.font0 {
-.font1  { font-size: 13px; }
+    font-size: 10px;
-.font2  { font-size: 15px; }
-.font3  { font-size: 20px; }
-.font4  { font-size: 30px; }
-.font5  { font-size: 50px; }
-
-caption.section_title {
-    caption-side:top;
 }
 
+.font1 {
+    font-size: 13px;
+}
 
-.samButton{
+.font2 {
-    float:left;
+    font-size: 15px;
-    display:block;
+}
-    padding:0;
+
-    margin:0;
+.font3 {
+    font-size: 20px;
+}
+
+.font4 {
+    font-size: 30px;
+}
+
+.font5 {
+    font-size: 50px;
+}
+
+caption.section_title {
+    caption-side: top;
+}
+
+.samButton {
+    float: left;
+    display: block;
+    padding: 0;
+    margin: 0;
     text-decoration: none;
-    position:relative;
+    position: relative;
 }
 
 a.samButton.disabled {
@@ -107,24 +148,23 @@ a.samButton.disabled {
     cursor: default;
 }
 
-.samButtonOuter{
+.samButtonOuter {
     display: table;
     border: outset 2px white;
     box-sizing: border-box;
-    font-weight:bold;
+    font-weight: bold;
     padding: 1px 6px;
-    width:125px;
+    width: 125px;
-    height:30px;
+    height: 30px;
-    background-color:#000000;
+    background-color: #000000;
-    color:#ffffff;
+    color: #ffffff;
 }
 
-.samButtonOuter:active{
+.samButtonOuter:active {
     border: inset 2px white;
 }
 
-
+.samButtonInner {
-.samButtonInner{
     display: table-cell;
     vertical-align: middle;
     width: 100%;
@@ -133,42 +173,42 @@ a.samButton.disabled {
     user-select: none;
 }
 
-.samToolbarButton > .samButtonOuter{
+.samToolbarButton>.samButtonOuter {
-    width:125px;
+    width: 125px;
-    height:30px;
+    height: 30px;
-    background-color:#225500;
+    background-color: #225500;
-    color:white;
+    color: white;
 }
 
-.samToolbarButton2 > .samButtonOuter{
+.samToolbarButton2>.samButtonOuter {
-    width:125px;
+    width: 125px;
-    height:30px;
+    height: 30px;
-    background-color:#225500;
+    background-color: #225500;
-    color:magenta;
+    color: magenta;
 }
 
-.samCommandButton > .samButtonOuter{
+.samCommandButton>.samButtonOuter {
-    width:111px;
+    width: 111px;
-    height:30px;
+    height: 30px;
 }
 
-.samCommandButton.disabled > .samButtonOuter{
+.samCommandButton.disabled>.samButtonOuter {
-    background-color:transparent !important;
+    background-color: transparent !important;
-    color:gray !important;
+    color: gray !important;
-    border-color:transparent !important;
+    border-color: transparent !important;
 }
 
-.samCommandButton.disabled > .samButtonOuter > .samButtonInner::before{
+.samCommandButton.disabled>.samButtonOuter>.samButtonInner::before {
-    content:'【'
+    content: '【'
 }
 
-.samCommandButton.disabled > .samButtonOuter > .samButtonInner::after{
+.samCommandButton.disabled>.samButtonOuter>.samButtonInner::after {
-    content:'】'
+    content: '】'
 }
 
-.tooltip_copyable_info .tooltiptext{
+.tooltip_copyable_info .tooltiptext {
     display: inline;
-    color: rgba(0,0,0,0);
+    color: rgba(0, 0, 0, 0);
     font-size: 0;
 }
 
@@ -176,7 +216,26 @@ a.samButton.disabled {
     display: none;
 }
 
-.hidden_but_copyable{
+.hidden_but_copyable {
-    color: rgba(0,0,0,0);
+    color: rgba(0, 0, 0, 0);
     font-size: 0;
 }
+
+.vertical_flex {
+    height: 100%;
+    display: flex;
+    align-content: center;
+    flex-direction: column;
+    align-items: stretch;
+}
+
+.vertical_flex .item {
+    display: block;
+    flex-grow: 1;
+}
+
+.fill_box {
+    display: block;
+    width: 100%;
+    height: 100%;
+}

css/entrance.css

@@ -1,141 +1,156 @@
 @charset "utf-8";
-
+body {
-body{
     line-height: 1.3;
 }
 
 #server_notice {
-    margin:10px 0;
+    margin: 10px 0;
     border: none;
-    text-align:center;
+    text-align: center;
 }
 
-#server_list_container{
+#server_list_container {
-    width:800px;
+    width: 800px;
-    position:absolute;
+    position: absolute;
-    left:50%;
+    left: 50%;
-    margin-left:-400px;
+    margin-left: -400px;
 }
 
-#server_list_table{
+#server_list_table {
-    width:100%;
+    width: 100%;
 }
 
-#server_list tr{
+#server_list tr {
-    height:66px;
+    height: 66px;
 }
 
-#server_list .server_create_and_select .general_create,
+.ignore_border {
-#server_list .server_create_and_select .general_select {
+    border: 0;
-    width: 120px; height: 33px;
+    margin: 0;
-    float: left;
+    padding: 0;
-}
-
-#server_list .general_create,
-#server_list .general_login {
-    width: 120px; height: 66px;
-    float: left;
-}
-
-.ignore_border{
-    border:0;
-    margin:0;
-    padding:0;
 }
 
 #user_info {
-    margin-top:20px;
+    margin-top: 20px;
-    width: 800px; height: 130px;
+    width: 800px;
+    height: 130px;
 }
 
-
+#user_info button {
-#user_info button{
     width: 200px;
     height: 50px;
     margin: 10px 50px;
 }
 
-.center_ordered_items{
+.center_ordered_items {
-    text-align:center;
+    text-align: center;
 }
 
 .Entrance_ServerList {
-    width: 800px; height: 64px;
+    width: 800px;
+    height: 64px;
     border: none;
     float: left;
 }
 
 .Entrance_ServerListServer {
-    width: 98px; height: 64px;
+    width: 98px;
+    height: 64px;
     float: left;
 }
 
 .Entrance_ServerListDown {
-    width: 698px; height: 64px;
+    width: 698px;
+    height: 64px;
     float: left;
 }
 
 .Entrance_ServerListInfo {
-    width: 398px; height: 64px;
+    width: 398px;
+    height: 64px;
     float: left;
 }
 
 .Entrance_ServerListBlock {
-    width: 298px; height: 64px;
+    width: 298px;
+    height: 64px;
     float: left;
     line-height: 64px;
 }
 
 .Entrance_ServerListCharacter {
-    width: 64px; height: 64px;
+    width: 64px;
+    height: 64px;
     float: left;
 }
 
 .Entrance_ServerListName {
-    width: 112px; height: 64px;
+    width: 112px;
+    height: 64px;
     float: left;
     line-height: 64px;
 }
 
-
 .Entrance_ServerListSelect {
-    width: 120px; height: 32px;
+    width: 120px;
+    height: 32px;
     float: left;
 }
 
 #Entrance_000003 {
-    width: 798px; height: 155px;
+    width: 798px;
+    height: 155px;
     text-align: left;
 }
 
 .Entrance_Alert {
-    color: red; font-size: 15px; font-weight: bold;
+    color: red;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Che {
-    color: white; font-size: 15px; font-weight: bold;
+    color: white;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Kwe {
-    color: yellow; font-size: 15px; font-weight: bold;
+    color: yellow;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Pwe {
-    color: orange; font-size: 15px; font-weight: bold;
+    color: orange;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Twe {
-    color: magenta; font-size: 15px; font-weight: bold;
+    color: magenta;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Nya {
-    color: #e67e22; font-size: 15px; font-weight: bold;
+    color: #e67e22;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Pya {
-    color: #9b59b6; font-size: 15px; font-weight: bold;
+    color: #9b59b6;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Hwe {
-    color: red; font-size: 15px; font-weight: bold;
+    color: red;
+    font-size: 15px;
+    font-weight: bold;
+}
+
+.BtnPlate {
+    height: inherit;
 }

css/login.css

@@ -1,131 +1,201 @@
-body, html{
+body,
+html {
     height: 100%;
     background-repeat: no-repeat;
 }
 
-.main{
+.main {
     margin-top: 70px;
 }
 
 h1.title {
-   font-size: 50px;
+    font-size: 50px;
-   font-family: 'Passion One', cursive; 
+    font-family: 'Passion One', cursive;
-   font-weight: 400; 
+    font-weight: 400;
 }
 
-hr{
+hr {
-   width: 10%;
+    width: 10%;
-   /*color: #fff;*/
+    /*color: #fff;*/
 }
 
-.form-group{
+.form-group {
-   margin-bottom: 15px;
+    margin-bottom: 15px;
 }
 
-label{
+label {
-   margin-bottom: 15px;
+    margin-bottom: 15px;
 }
 
 input,
 input::-webkit-input-placeholder {
-   font-size: 11px;
+    font-size: 11px;
-   padding-top: 3px;
+    padding-top: 3px;
 }
 
-.main-login{
+.main-login {
     /*background-color: #fff;*/
-   /* shadows and rounded borders */
+    /* shadows and rounded borders */
-   -moz-border-radius: 2px;
+    -moz-border-radius: 2px;
-   -webkit-border-radius: 2px;
+    -webkit-border-radius: 2px;
-   border-radius: 2px;
+    border-radius: 2px;
-   -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+    -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-   -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-   box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+    box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-
 }
 
-.main-center{
+.main-center {
     margin-top: 30px;
     margin: 0 auto;
     max-width: 330px;
-   padding: 40px 40px;
+    padding: 40px 40px;
-
 }
 
-.login_btn_group{
+.login_btn_group {
     margin-top: 5px;
 }
 
-.login-register{
+.login-register {
-   font-size: 11px;
+    font-size: 11px;
-   text-align: center;
+    text-align: center;
 }
 
-
+.col-form-label {
-.col-form-label{
+    text-align: center;
-    text-align:center;
 }
 
-.terms{
+.terms {
-    max-height: 200px; overflow-y: auto;
+    max-height: 200px;
+    overflow-y: auto;
 }
 
-.terms pre{
+.terms pre {
-    width:100%;
+    width: 100%;
-    white-space: pre-wrap;       /* Since CSS 2.1 */
+    white-space: pre-wrap;
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    /* Since CSS 2.1 */
-    white-space: -pre-wrap;      /* Opera 4-6 */
+    white-space: -moz-pre-wrap;
-    white-space: -o-pre-wrap;    /* Opera 7 */
+    /* Mozilla, since 1999 */
-    word-wrap: break-word;       /* Internet Explorer 5.5+ */
+    white-space: -pre-wrap;
+    /* Opera 4-6 */
+    white-space: -o-pre-wrap;
+    /* Opera 7 */
+    word-wrap: break-word;
+    /* Internet Explorer 5.5+ */
 }
 
 .vertical-center {
-    min-height: 100%;  /* Fallback for browsers do NOT support vh unit */
+    min-height: 100%;
-    min-height: 100vh; /* These two lines are counted as one :-)       */
+    /* Fallback for browsers do NOT support vh unit */
-
+    min-height: 100vh;
+    /* These two lines are counted as one :-)       */
     display: flex;
     align-items: center;
 }
 
-.full-content {
+#login_card {
-    position:fixed;
+    z-index: 801;
-    left:0;
-    top:0;
-    width:100%;
-    height:100%;
-    margin:0;
-    padding:0;
-    z-index:800;
 }
 
-#login_card{
+#btn_kakao_login {
-    z-index:801;
-}
-
-#btn_kakao_login{
     cursor: pointer;
-    height:46px;
+    height: 46px;
-    width:116px;
+    width: 116px;
     background-color: transparent;
-    color:transparent;
+    color: transparent;
-    border:0;
+    border: 0;
-    background-size: 100%; /* To fill the dimensions of container (button), or */
+    background-size: 100%;
+    /* To fill the dimensions of container (button), or */
     background-repeat: no-repeat;
     background-position: bottom center;
-    margin-top:5px;
+    margin-top: 5px;
-    background-image:url('../oauth_kakao/kakao_login_join.png');
+    background-image: url('../oauth_kakao/kakao_login_join.png');
 }
 
 #btn_kakao_login:hover {
-    background-image:url('../oauth_kakao/kakao_login_join_ov.png');
+    background-image: url('../oauth_kakao/kakao_login_join_ov.png');
 }
 
-#bottom_box{
+#bottom_box .container {
-    position:fixed;
+    text-align: center;
-    bottom:0;
-    width:100%;
-    left:0;
 }
-#bottom_box .container{
+
-    text-align:center;
+.btn-group-xs>.btn,
+.btn-xs {
+    padding: .25rem .4rem;
+    font-size: .875rem;
+    line-height: .5;
+    border-radius: .2rem;
+}
+
+#running_map {
+    border: none;
+    width: 700px;
+}
+
+
+#map-subframe {
+    display: none;
+    width: 700px;
+}
+
+@media only screen and (min-width : 360px) {
+    #map-subframe {
+        display: block;
+        transform: scale(calc(330 / 700));
+        transform-origin: 350px 0px;
+        margin-bottom: -400px;
+    }
+}
+
+
+@media only screen and (min-width : 440px) {
+    #map-subframe {
+        transform: scale(calc(410 / 700));
+        margin-bottom: -300px;
+    }
+}
+
+@media only screen and (min-width : 480px) {
+    #map-subframe {
+        transform: scale(calc(450 / 700));
+        margin-bottom: -250px;
+    }
+}
+
+
+@media only screen and (min-width : 520px) {
+    #map-subframe {
+        transform: scale(calc(490 / 700));
+        margin-bottom: -200px;
+    }
+}
+
+@media only screen and (min-width : 576px) {
+    #map-subframe {
+        transform: scale(calc(546 / 700));
+        margin-bottom: -150px;
+    }
+}
+
+@media only screen and (min-width : 640px) {
+    #map-subframe {
+        transform: scale(calc(600/700));
+        margin-bottom: -100px;
+    }
+}
+
+
+@media only screen and (min-width : 700px) {
+    #map-subframe {
+        transform: scale(calc(670 / 700));
+        margin-bottom: -20px;
+    }
+}
+
+
+@media only screen and (min-width : 730px) {
+    #map-subframe {
+        transform: none;
+        margin-bottom: 0;
+    }
 }

e_lib/select2/i18n/ko.js

@@ -1,3 +1,3 @@
-/*! Select2 4.0.5 | https://github.com/select2/select2/blob/master/LICENSE.md */
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
 
-(function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;return e.define("select2/i18n/ko",[],function(){return{errorLoading:function(){return"결과를 불러올 수 없습니다."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="너무 깁니다. "+t+" 글자 지워주세요.";return n},inputTooShort:function(e){var t=e.minimum-e.input.length,n="너무 짧습니다. "+t+" 글자 더 입력해주세요.";return n},loadingMore:function(){return"불러오는 중…"},maximumSelected:function(e){var t="최대 "+e.maximum+"개까지만 선택 가능합니다.";return t},noResults:function(){return"결과가 없습니다."},searching:function(){return"검색 중…"}}}),{define:e.define,require:e.require}})();
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ko",[],function(){return{errorLoading:function(){return"결과를 불러올 수 없습니다."},inputTooLong:function(n){return"너무 깁니다. "+(n.input.length-n.maximum)+" 글자 지워주세요."},inputTooShort:function(n){return"너무 짧습니다. "+(n.minimum-n.input.length)+" 글자 더 입력해주세요."},loadingMore:function(){return"불러오는 중…"},maximumSelected:function(n){return"최대 "+n.maximum+"개까지만 선택 가능합니다."},noResults:function(){return"결과가 없습니다."},searching:function(){return"검색 중…"},removeAllItems:function(){return"모든 항목 삭제"}}}),n.define,n.require}();

e_lib/select2/select2-bootstrap4.css

@@ -1,188 +1,553 @@
 /* select2-bootstrap4 with Darkly */
-.select2-container--bootstrap4 { color: black; }
 
-.select2-container--bootstrap4 .select2-selection { background-color: #fff; border: 1px solid #ced4da; border-radius: 0.25rem; color: #495057; font-size: 1rem; outline: 0; }
+.select2-container--bootstrap4 {
-
+    color: black;
-.select2-container--bootstrap4 .select2-selection.form-control { border-radius: 0.25rem; }
+}
-
+
-.select2-container--bootstrap4 .select2-search--dropdown .select2-search__field { background-color: #fff; border: 1px solid #ced4da; border-radius: 0.25rem; color: #495057; font-size: 1rem; }
+.select2-container--bootstrap4 .select2-selection {
-
+    background-color: #fff;
-.select2-container--bootstrap4 .select2-search__field { outline: 0; }
+    border: 1px solid #ced4da;
-
+    border-radius: 0.25rem;
-.select2-container--bootstrap4 .select2-search__field::-webkit-input-placeholder { color: #6c757d; }
+    color: #495057;
-
+    font-size: 1rem;
-.select2-container--bootstrap4 .select2-search__field:-moz-placeholder { color: #6c757d; }
+    outline: 0;
-
+}
-.select2-container--bootstrap4 .select2-search__field::-moz-placeholder { color: #6c757d; opacity: 1; }
+
-
+.select2-container--bootstrap4 .select2-selection.form-control {
-.select2-container--bootstrap4 .select2-search__field:-ms-input-placeholder { color: #6c757d; }
+    border-radius: 0.25rem;
-
+}
-.select2-container--bootstrap4 .select2-results__option { padding: 0.75rem 0.375rem; font-size: 1rem; }
+
-
+.select2-container--bootstrap4 .select2-search--dropdown .select2-search__field {
-.select2-container--bootstrap4 .select2-results__option[role=group] { padding: 0; }
+    background-color: #fff;
-
+    border: 1px solid #ced4da;
-.select2-container--bootstrap4 .select2-results__option[aria-disabled=true] { color: #6c757d; cursor: not-allowed; }
+    border-radius: 0.25rem;
-
+    color: #495057;
-.select2-container--bootstrap4 .select2-results__option[aria-selected=true] { background-color: #f8f9fa; color: #16181b; }
+    font-size: 1rem;
-
+}
-.select2-container--bootstrap4 .select2-results__option--highlighted[aria-selected] { background-color: #007bff; color: #fff; }
+
-
+.select2-container--bootstrap4 .select2-search__field {
-.select2-container--bootstrap4 .select2-results__option .select2-results__option { padding: 0.75rem 0.375rem; }
+    outline: 0;
-
+}
-.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__group { padding-left: 0; }
+
-
+.select2-container--bootstrap4 .select2-search__field::-webkit-input-placeholder {
-.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option { margin-left: -0.375rem; padding-left: 0.75rem; }
+    color: #6c757d;
-
+}
-.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option { margin-left: -0.75rem; padding-left: 1.125rem; }
+
-
+.select2-container--bootstrap4 .select2-search__field:-moz-placeholder {
-.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { margin-left: -1.125rem; padding-left: 1.5rem; }
+    color: #6c757d;
-
+}
-.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { margin-left: -1.5rem; padding-left: 1.875rem; }
+
-
+.select2-container--bootstrap4 .select2-search__field::-moz-placeholder {
-.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { margin-left: -1.875rem; padding-left: 2.25rem; }
+    color: #6c757d;
-
+    opacity: 1;
-.select2-container--bootstrap4 .select2-results__group { color: #6c757d; display: block; padding: 0.75rem 0.375rem; font-size: 75%; line-height: 1; white-space: nowrap; }
+}
-
+
-.select2-container--bootstrap4.select2-container--focus .select2-selection, .select2-container--bootstrap4.select2-container--open .select2-selection { transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; border-color: #80bdff; }
+.select2-container--bootstrap4 .select2-search__field:-ms-input-placeholder {
-
+    color: #6c757d;
-@media screen and (prefers-reduced-motion: reduce) { .select2-container--bootstrap4.select2-container--focus .select2-selection, .select2-container--bootstrap4.select2-container--open .select2-selection { transition: none; } }
+}
-
+
-.select2-container--bootstrap4.select2-container--open .select2-selection .select2-selection__arrow b { border-color: transparent transparent #6c757d transparent; border-width: 0 0.25rem 0.25rem 0.25rem; }
+.select2-container--bootstrap4 .select2-results__option {
-
+    padding: 0.75rem 0.375rem;
-.select2-container--bootstrap4.select2-container--open.select2-container--below .select2-selection { border-bottom-right-radius: 0; border-bottom-left-radius: 0; border-bottom-color: transparent; }
+    font-size: 1rem;
-
+}
-.select2-container--bootstrap4.select2-container--open.select2-container--above .select2-selection { border-top-left-radius: 0; border-top-right-radius: 0; border-top-color: transparent; }
+
-
+.select2-container--bootstrap4 .select2-results__option[role=group] {
-.select2-container--bootstrap4 .select2-selection__clear { color: #6c757d; cursor: pointer; float: right; font-weight: bold; margin-right: 10px; }
+    padding: 0;
-
+}
-.select2-container--bootstrap4 .select2-selection__clear:hover { color: #343a40; }
+
-
+.select2-container--bootstrap4 .select2-results__option[aria-disabled=true] {
-.select2-container--bootstrap4.select2-container--disabled .select2-selection { border-color: #ced4da; }
+    color: #6c757d;
-
+    cursor: not-allowed;
-.select2-container--bootstrap4.select2-container--disabled .select2-selection, .select2-container--bootstrap4.select2-container--disabled .select2-search__field { cursor: not-allowed; }
+}
-
+
-.select2-container--bootstrap4.select2-container--disabled .select2-selection, .select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice { background-color: #e9ecef; }
+.select2-container--bootstrap4 .select2-results__option[aria-selected=true] {
-
+    background-color: #f8f9fa;
-.select2-container--bootstrap4.select2-container--disabled .select2-selection__clear, .select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice__remove { display: none; }
+    color: #16181b;
-
+}
-.select2-container--bootstrap4 .select2-dropdown { border-color: #80bdff; border-width: 1px; overflow-x: hidden; margin-top: -1px; }
+
-
+.select2-container--bootstrap4 .select2-results__option--highlighted[aria-selected] {
-.select2-container--bootstrap4 .select2-dropdown--above { margin-top: 1px; }
+    background-color: #007bff;
-
+    color: #fff;
-.select2-container--bootstrap4 .select2-results > .select2-results__options { max-height: 200px; overflow-y: auto; }
+}
-
+
-.select2-container--bootstrap4 .select2-selection--single { height: calc(2.25rem + 2px); line-height: 1; padding: 0.75rem 1.125rem 0.75rem 0.375rem; }
+.select2-container--bootstrap4 .select2-results__option .select2-results__option {
-
+    padding: 0.75rem 0.375rem;
-.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow { position: absolute; bottom: 0; right: 0.375rem; top: 0; width: 0.25rem; }
+}
-
+
-.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b { border-color: #6c757d transparent transparent transparent; border-style: solid; border-width: 0.25rem 0.25rem 0 0.25rem; height: 0; left: 0; margin-left: -0.25rem; margin-top: -0.125rem; position: absolute; top: 50%; width: 0; }
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__group {
-
+    padding-left: 0;
-.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered { color: #495057; padding: 0; }
+}
-
+
-.select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder { color: #6c757d; }
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option {
-
+    margin-left: -0.375rem;
-.select2-container--bootstrap4 .select2-selection--multiple { min-height: calc(2.25rem + 2px); padding: 0; height: auto; }
+    padding-left: 0.75rem;
-
+}
-.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered { box-sizing: border-box; display: block; line-height: 1; list-style: none; margin: 0; overflow: hidden; padding: 0.75rem 0.375rem 0 0.75rem; width: 100%; text-overflow: ellipsis; white-space: nowrap; }
+
-
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
-.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__placeholder { color: #6c757d; float: left; margin-top: 5px; }
+    margin-left: -0.75rem;
-
+    padding-left: 1.125rem;
-.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice { color: #495057; background: transparent; border: 1px solid #343a40; border-radius: 0.25rem; cursor: default; float: left; margin: -0.25rem 0 0 0.1875rem; padding: 0 0.75rem; }
+}
-
+
-.select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field { background: transparent; padding: 0 0.375rem; height: calc(2.25rem + 2px)-2; line-height: 1; margin-top: 0; min-width: 5em; }
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
-
+    margin-left: -1.125rem;
-.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove { color: #6c757d; cursor: pointer; display: inline-block; font-weight: bold; margin-right: 0.375rem; }
+    padding-left: 1.5rem;
-
+}
-.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove:hover { color: #343a40; }
+
-
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
-.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear { margin-top: 0.75rem; }
+    margin-left: -1.5rem;
-
+    padding-left: 1.875rem;
-.select2-container--bootstrap4 .select2-selection--single.input-sm, .input-group-sm .select2-container--bootstrap4 .select2-selection--single, .form-group-sm .select2-container--bootstrap4 .select2-selection--single { border-radius: 0.2rem; font-size: 75%; height: calc(1.8125rem + 2px); line-height: 1; padding: 0.5rem 1rem 0.5rem 0.25rem; }
+}
-
+
-.select2-container--bootstrap4 .select2-selection--single.input-sm .select2-selection__arrow b, .input-group-sm .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b, .form-group-sm .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b { margin-left: -0.5rem; }
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
-
+    margin-left: -1.875rem;
-.select2-container--bootstrap4 .select2-selection--multiple.input-sm, .input-group-sm .select2-container--bootstrap4 .select2-selection--multiple, .form-group-sm .select2-container--bootstrap4 .select2-selection--multiple { min-height: calc(1.8125rem + 2px); border-radius: 0.2rem; }
+    padding-left: 2.25rem;
-
+}
-.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__rendered, .input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered, .form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered { padding: 0.5rem 0.25rem 0 0.5rem; }
+
-
+.select2-container--bootstrap4 .select2-results__group {
-.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__choice, .input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice, .form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice { font-size: 75%; line-height: 1; margin: 0 0 0 0.125rem; padding: 0 0.5rem; }
+    color: #6c757d;
-
+    display: block;
-.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-search--inline .select2-search__field, .input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field, .form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field { padding: 0 0.25rem; font-size: 75%; height: calc(1.8125rem + 2px)-2; line-height: 1; }
+    padding: 0.75rem 0.375rem;
-
+    font-size: 75%;
-.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__clear, .input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear, .form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear { margin-top: 0.5rem; }
+    line-height: 1;
-
+    white-space: nowrap;
-.select2-container--bootstrap4 .select2-selection--single.input-lg, .input-group-lg .select2-container--bootstrap4 .select2-selection--single, .form-group-lg .select2-container--bootstrap4 .select2-selection--single { border-radius: 0.3rem; font-size: 1.25rem; height: calc(2.875rem + 2px); line-height: 1; padding: 1rem 1.4375rem 1rem 0.5rem; }
+}
-
+
-.select2-container--bootstrap4 .select2-selection--single.input-lg .select2-selection__arrow, .input-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow, .form-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow { width: 0.3125rem; }
+.select2-container--bootstrap4.select2-container--focus .select2-selection,
-
+.select2-container--bootstrap4.select2-container--open .select2-selection {
-.select2-container--bootstrap4 .select2-selection--single.input-lg .select2-selection__arrow b, .input-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b, .form-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b { border-width: 0.3125rem 0.3125rem 0 0.3125rem; margin-left: -0.3125rem; margin-left: -1rem; margin-top: -0.15625rem; }
+    transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
-
+    border-color: #80bdff;
-.select2-container--bootstrap4 .select2-selection--multiple.input-lg, .input-group-lg .select2-container--bootstrap4 .select2-selection--multiple, .form-group-lg .select2-container--bootstrap4 .select2-selection--multiple { min-height: calc(2.875rem + 2px); border-radius: 0.3rem; }
+}
-
+
-.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-selection__choice, .input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice, .form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice { font-size: 1.25rem; line-height: 1; border-radius: 0.25rem; margin: 0rem 0 0 0.25rem; padding: 0 1rem; }
+@media screen and (prefers-reduced-motion: reduce) {
-
+    .select2-container--bootstrap4.select2-container--focus .select2-selection,
-.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-search--inline .select2-search__field, .input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field, .form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field { padding: 0 0.5rem; font-size: 1.25rem; height: calc(2.875rem + 2px)-2; line-height: 1; }
+    .select2-container--bootstrap4.select2-container--open .select2-selection {
-
+        transition: none;
-.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-selection__clear, .input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear, .form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear { margin-top: 1rem; }
+    }
-
+}
-.select2-container--bootstrap4 .select2-selection.input-lg.select2-container--open .select2-selection--single .select2-selection__arrow b { border-color: transparent transparent #6c757d transparent; border-width: 0 0.3125rem 0.3125rem 0.3125rem; }
+
-
+.select2-container--bootstrap4.select2-container--open .select2-selection .select2-selection__arrow b {
-.input-group-lg .select2-container--bootstrap4 .select2-selection.select2-container--open .select2-selection--single .select2-selection__arrow b { border-color: transparent transparent #6c757d transparent; border-width: 0 0.3125rem 0.3125rem 0.3125rem; }
+    border-color: transparent transparent #6c757d transparent;
-
+    border-width: 0 0.25rem 0.25rem 0.25rem;
-.select2-container--bootstrap4[dir="rtl"] .select2-selection--single { padding-left: 1.125rem; padding-right: 0.375rem; }
+}
-
+
-.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__rendered { padding-right: 0; padding-left: 0; text-align: right; }
+.select2-container--bootstrap4.select2-container--open.select2-container--below .select2-selection {
-
+    border-bottom-right-radius: 0;
-.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__clear { float: left; }
+    border-bottom-left-radius: 0;
-
+    border-bottom-color: transparent;
-.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__arrow { left: 0.375rem; right: auto; }
+}
-
+
-.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__arrow b { margin-left: 0; }
+.select2-container--bootstrap4.select2-container--open.select2-container--above .select2-selection {
-
+    border-top-left-radius: 0;
-.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-search--inline { float: right; }
+    border-top-right-radius: 0;
-
+    border-top-color: transparent;
-.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice { margin-left: 0; margin-right: 0.1875rem; }
+}
-
+
-.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove { margin-left: 2px; margin-right: auto; }
+.select2-container--bootstrap4 .select2-selection__clear {
-
+    color: #6c757d;
-.has-warning .select2-dropdown, .has-warning .select2-selection { border-color: #ffc107; }
+    cursor: pointer;
-
+    float: right;
-.has-warning .select2-container--focus .select2-selection, .has-warning .select2-container--open .select2-selection { border-color: #d39e00; }
+    font-weight: bold;
-
+    margin-right: 10px;
-.has-warning.select2-drop-active { border-color: #d39e00; }
+}
-
+
-.has-warning.select2-drop-active.select2-drop.select2-drop-above { border-top-color: #d39e00; }
+.select2-container--bootstrap4 .select2-selection__clear:hover {
-
+    color: #343a40;
-.has-error .select2-dropdown, .has-error .select2-selection { border-color: #dc3545; }
+}
-
+
-.has-error .select2-container--focus .select2-selection, .has-error .select2-container--open .select2-selection { border-color: #bd2130; }
+.select2-container--bootstrap4.select2-container--disabled .select2-selection {
-
+    border-color: #ced4da;
-.has-error.select2-drop-active { border-color: #bd2130; }
+}
-
+
-.has-error.select2-drop-active.select2-drop.select2-drop-above { border-top-color: #bd2130; }
+.select2-container--bootstrap4.select2-container--disabled .select2-selection,
-
+.select2-container--bootstrap4.select2-container--disabled .select2-search__field {
-.has-success .select2-dropdown, .has-success .select2-selection { border-color: #28a745; }
+    cursor: not-allowed;
-
+}
-.has-success .select2-container--focus .select2-selection, .has-success .select2-container--open .select2-selection { border-color: #1e7e34; }
+
-
+.select2-container--bootstrap4.select2-container--disabled .select2-selection,
-.has-success.select2-drop-active { border-color: #1e7e34; }
+.select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice {
-
+    background-color: #e9ecef;
-.has-success.select2-drop-active.select2-drop.select2-drop-above { border-top-color: #1e7e34; }
+}
-
+
-.input-group > .select2-hidden-accessible:first-child + .select2-container--bootstrap4 > .selection > .select2-selection, .input-group > .select2-hidden-accessible:first-child + .select2-container--bootstrap4 > .selection > .select2-selection.form-control { border-top-right-radius: 0; border-bottom-right-radius: 0; }
+.select2-container--bootstrap4.select2-container--disabled .select2-selection__clear,
-
+.select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice__remove {
-.input-group > .select2-hidden-accessible:not(:first-child) + .select2-container--bootstrap4:not(:last-child) > .selection > .select2-selection, .input-group > .select2-hidden-accessible:not(:first-child) + .select2-container--bootstrap4:not(:last-child) > .selection > .select2-selection.form-control { border-radius: 0; }
+    display: none;
-
+}
-.input-group > .select2-hidden-accessible:not(:first-child):not(:last-child) + .select2-container--bootstrap4:last-child > .selection > .select2-selection, .input-group > .select2-hidden-accessible:not(:first-child):not(:last-child) + .select2-container--bootstrap4:last-child > .selection > .select2-selection.form-control { border-top-left-radius: 0; border-bottom-left-radius: 0; }
+
-
+.select2-container--bootstrap4 .select2-dropdown {
-.input-group > .select2-container--bootstrap4 { display: table; table-layout: fixed; position: relative; z-index: 2; width: 100%; margin-bottom: 0; }
+    border-color: #80bdff;
-
+    border-width: 1px;
-.input-group > .select2-container--bootstrap4 > .selection > .select2-selection.form-control { float: none; }
+    overflow-x: hidden;
-
+    margin-top: -1px;
-.input-group > .select2-container--bootstrap4.select2-container--open, .input-group > .select2-container--bootstrap4.select2-container--focus { z-index: 3; }
+}
-
+
-.input-group > .select2-container--bootstrap4, .input-group > .select2-container--bootstrap4 .input-group-btn, .input-group > .select2-container--bootstrap4 .input-group-btn .btn { vertical-align: top; }
+.select2-container--bootstrap4 .select2-dropdown--above {
-
+    margin-top: 1px;
-.form-control.select2-hidden-accessible { position: absolute !important; width: 1px !important; }
+}
-
+
-@media (min-width: 576px) { .form-inline .select2-container--bootstrap4 { display: inline-block; } }
+.select2-container--bootstrap4 .select2-results>.select2-results__options {
+    max-height: 200px;
+    overflow-y: auto;
+}
+
+.select2-container--bootstrap4 .select2-selection--single {
+    height: calc(2.25rem + 2px);
+    line-height: 1;
+    padding: 0.75rem 1.125rem 0.75rem 0.375rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow {
+    position: absolute;
+    bottom: 0;
+    right: 0.375rem;
+    top: 0;
+    width: 0.25rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
+    border-color: #6c757d transparent transparent transparent;
+    border-style: solid;
+    border-width: 0.25rem 0.25rem 0 0.25rem;
+    height: 0;
+    left: 0;
+    margin-left: -0.25rem;
+    margin-top: -0.125rem;
+    position: absolute;
+    top: 50%;
+    width: 0;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered {
+    color: #495057;
+    padding: 0;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder {
+    color: #6c757d;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple {
+    min-height: calc(2.25rem + 2px);
+    padding: 0;
+    height: auto;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered {
+    box-sizing: border-box;
+    display: block;
+    line-height: 1;
+    list-style: none;
+    margin: 0;
+    overflow: hidden;
+    padding: 0.75rem 0.375rem 0 0.75rem;
+    width: 100%;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__placeholder {
+    color: #6c757d;
+    float: left;
+    margin-top: 5px;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+    color: #495057;
+    background: transparent;
+    border: 1px solid #343a40;
+    border-radius: 0.25rem;
+    cursor: default;
+    float: left;
+    margin: -0.25rem 0 0 0.1875rem;
+    padding: 0 0.75rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field {
+    background: transparent;
+    padding: 0 0.375rem;
+    height: calc(2.25rem + 2px)-2;
+    line-height: 1;
+    margin-top: 0;
+    min-width: 5em;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove {
+    color: #6c757d;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 0.375rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove:hover {
+    color: #343a40;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear {
+    margin-top: 0.75rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-sm,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--single,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--single {
+    border-radius: 0.2rem;
+    font-size: 75%;
+    height: calc(1.8125rem + 2px);
+    line-height: 1;
+    padding: 0.5rem 1rem 0.5rem 0.25rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-sm .select2-selection__arrow b,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
+    margin-left: -0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple {
+    min-height: calc(1.8125rem + 2px);
+    border-radius: 0.2rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__rendered,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered {
+    padding: 0.5rem 0.25rem 0 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__choice,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+    font-size: 75%;
+    line-height: 1;
+    margin: 0 0 0 0.125rem;
+    padding: 0 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-search--inline .select2-search__field,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field {
+    padding: 0 0.25rem;
+    font-size: 75%;
+    height: calc(1.8125rem + 2px)-2;
+    line-height: 1;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__clear,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear {
+    margin-top: 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--single,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--single {
+    border-radius: 0.3rem;
+    font-size: 1.25rem;
+    height: calc(2.875rem + 2px);
+    line-height: 1;
+    padding: 1rem 1.4375rem 1rem 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg .select2-selection__arrow,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow {
+    width: 0.3125rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg .select2-selection__arrow b,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
+    border-width: 0.3125rem 0.3125rem 0 0.3125rem;
+    margin-left: -0.3125rem;
+    margin-left: -1rem;
+    margin-top: -0.15625rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple {
+    min-height: calc(2.875rem + 2px);
+    border-radius: 0.3rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-selection__choice,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+    font-size: 1.25rem;
+    line-height: 1;
+    border-radius: 0.25rem;
+    margin: 0rem 0 0 0.25rem;
+    padding: 0 1rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-search--inline .select2-search__field,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field {
+    padding: 0 0.5rem;
+    font-size: 1.25rem;
+    height: calc(2.875rem + 2px)-2;
+    line-height: 1;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-selection__clear,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear {
+    margin-top: 1rem;
+}
+
+.select2-container--bootstrap4 .select2-selection.input-lg.select2-container--open .select2-selection--single .select2-selection__arrow b {
+    border-color: transparent transparent #6c757d transparent;
+    border-width: 0 0.3125rem 0.3125rem 0.3125rem;
+}
+
+.input-group-lg .select2-container--bootstrap4 .select2-selection.select2-container--open .select2-selection--single .select2-selection__arrow b {
+    border-color: transparent transparent #6c757d transparent;
+    border-width: 0 0.3125rem 0.3125rem 0.3125rem;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single {
+    padding-left: 1.125rem;
+    padding-right: 0.375rem;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__rendered {
+    padding-right: 0;
+    padding-left: 0;
+    text-align: right;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__clear {
+    float: left;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+    left: 0.375rem;
+    right: auto;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__arrow b {
+    margin-left: 0;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice,
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+    float: right;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+    margin-left: 0;
+    margin-right: 0.1875rem;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+    margin-left: 2px;
+    margin-right: auto;
+}
+
+.has-warning .select2-dropdown,
+.has-warning .select2-selection {
+    border-color: #ffc107;
+}
+
+.has-warning .select2-container--focus .select2-selection,
+.has-warning .select2-container--open .select2-selection {
+    border-color: #d39e00;
+}
+
+.has-warning.select2-drop-active {
+    border-color: #d39e00;
+}
+
+.has-warning.select2-drop-active.select2-drop.select2-drop-above {
+    border-top-color: #d39e00;
+}
+
+.has-error .select2-dropdown,
+.has-error .select2-selection {
+    border-color: #dc3545;
+}
+
+.has-error .select2-container--focus .select2-selection,
+.has-error .select2-container--open .select2-selection {
+    border-color: #bd2130;
+}
+
+.has-error.select2-drop-active {
+    border-color: #bd2130;
+}
+
+.has-error.select2-drop-active.select2-drop.select2-drop-above {
+    border-top-color: #bd2130;
+}
+
+.has-success .select2-dropdown,
+.has-success .select2-selection {
+    border-color: #28a745;
+}
+
+.has-success .select2-container--focus .select2-selection,
+.has-success .select2-container--open .select2-selection {
+    border-color: #1e7e34;
+}
+
+.has-success.select2-drop-active {
+    border-color: #1e7e34;
+}
+
+.has-success.select2-drop-active.select2-drop.select2-drop-above {
+    border-top-color: #1e7e34;
+}
+
+.input-group>.select2-hidden-accessible:first-child+.select2-container--bootstrap4>.selection>.select2-selection,
+.input-group>.select2-hidden-accessible:first-child+.select2-container--bootstrap4>.selection>.select2-selection.form-control {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.input-group>.select2-hidden-accessible:not(:first-child)+.select2-container--bootstrap4:not(:last-child)>.selection>.select2-selection,
+.input-group>.select2-hidden-accessible:not(:first-child)+.select2-container--bootstrap4:not(:last-child)>.selection>.select2-selection.form-control {
+    border-radius: 0;
+}
+
+.input-group>.select2-hidden-accessible:not(:first-child):not(:last-child)+.select2-container--bootstrap4:last-child>.selection>.select2-selection,
+.input-group>.select2-hidden-accessible:not(:first-child):not(:last-child)+.select2-container--bootstrap4:last-child>.selection>.select2-selection.form-control {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+.input-group>.select2-container--bootstrap4 {
+    display: table;
+    table-layout: fixed;
+    position: relative;
+    z-index: 2;
+    width: 100%;
+    margin-bottom: 0;
+}
+
+.input-group>.select2-container--bootstrap4>.selection>.select2-selection.form-control {
+    float: none;
+}
+
+.input-group>.select2-container--bootstrap4.select2-container--open,
+.input-group>.select2-container--bootstrap4.select2-container--focus {
+    z-index: 3;
+}
+
+.input-group>.select2-container--bootstrap4,
+.input-group>.select2-container--bootstrap4 .input-group-btn,
+.input-group>.select2-container--bootstrap4 .input-group-btn .btn {
+    vertical-align: top;
+}
+
+.form-control.select2-hidden-accessible {
+    position: absolute !important;
+    width: 1px !important;
+}
+
+@media (min-width: 576px) {
+    .form-inline .select2-container--bootstrap4 {
+        display: inline-block;
+    }
+}

e_lib/select2/select2.css

@@ -118,12 +118,14 @@
 .select2-hidden-accessible {
   border: 0 !important;
   clip: rect(0 0 0 0) !important;
+  -webkit-clip-path: inset(50%) !important;
+  clip-path: inset(50%) !important;
   height: 1px !important;
-  margin: -1px !important;
   overflow: hidden !important;
   padding: 0 !important;
   position: absolute !important;
-  width: 1px !important; }
+  width: 1px !important;
+  white-space: nowrap !important; }
 
 .select2-container--default .select2-selection--single {
   background-color: #fff;
@@ -186,16 +188,13 @@
     width: 100%; }
     .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
       list-style: none; }
-  .select2-container--default .select2-selection--multiple .select2-selection__placeholder {
-    color: #999;
-    margin-top: 5px;
-    float: left; }
   .select2-container--default .select2-selection--multiple .select2-selection__clear {
     cursor: pointer;
     float: right;
     font-weight: bold;
     margin-top: 5px;
-    margin-right: 10px; }
+    margin-right: 10px;
+    padding: 1px; }
   .select2-container--default .select2-selection--multiple .select2-selection__choice {
     background-color: #e4e4e4;
     border: 1px solid #aaa;
@@ -214,7 +213,7 @@
     .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
       color: #333; }
 
-.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
   float: right; }
 
 .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
@@ -420,9 +419,7 @@
       color: #555; }
 
 .select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
-  float: right; }
+  float: right;
-
-.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
   margin-left: 5px;
   margin-right: auto; }
 

e_lib/select2/select2.full.js

@@ -1,11 +1,11 @@
 /*!
- * Select2 4.0.5
+ * Select2 4.0.13
  * https://select2.github.io
  *
  * Released under the MIT license
  * https://github.com/select2/select2/blob/master/LICENSE.md
  */
-(function (factory) {
+;(function (factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define(['jquery'], factory);
@@ -574,10 +574,10 @@ S2.define('select2/utils',[
     DecoratedClass.prototype = new ctr();
 
     for (var m = 0; m < superMethods.length; m++) {
-        var superMethod = superMethods[m];
+      var superMethod = superMethods[m];
 
-        DecoratedClass.prototype[superMethod] =
+      DecoratedClass.prototype[superMethod] =
-          SuperClass.prototype[superMethod];
+        SuperClass.prototype[superMethod];
     }
 
     var calledMethod = function (methodName) {
@@ -772,6 +772,70 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
+  // Cache objects in Utils.__cache instead of $.data (see #4346)
+  Utils.__cache = {};
+
+  var id = 0;
+  Utils.GetUniqueElementId = function (element) {
+    // Get a unique element Id. If element has no id,
+    // creates a new unique number, stores it in the id
+    // attribute and returns the new id.
+    // If an id already exists, it simply returns it.
+
+    var select2Id = element.getAttribute('data-select2-id');
+    if (select2Id == null) {
+      // If element has id, use it.
+      if (element.id) {
+        select2Id = element.id;
+        element.setAttribute('data-select2-id', select2Id);
+      } else {
+        element.setAttribute('data-select2-id', ++id);
+        select2Id = id.toString();
+      }
+    }
+    return select2Id;
+  };
+
+  Utils.StoreData = function (element, name, value) {
+    // Stores an item in the cache for a specified element.
+    // name is the cache key.
+    var id = Utils.GetUniqueElementId(element);
+    if (!Utils.__cache[id]) {
+      Utils.__cache[id] = {};
+    }
+
+    Utils.__cache[id][name] = value;
+  };
+
+  Utils.GetData = function (element, name) {
+    // Retrieves a value from the cache by its key (name)
+    // name is optional. If no name specified, return
+    // all cache items for the specified element.
+    // and for a specified element.
+    var id = Utils.GetUniqueElementId(element);
+    if (name) {
+      if (Utils.__cache[id]) {
+        if (Utils.__cache[id][name] != null) {
+          return Utils.__cache[id][name];
+        }
+        return $(element).data(name); // Fallback to HTML5 data attribs.
+      }
+      return $(element).data(name); // Fallback to HTML5 data attribs.
+    } else {
+      return Utils.__cache[id];
+    }
+  };
+
+  Utils.RemoveData = function (element) {
+    // Removes all cached items for a specified element.
+    var id = Utils.GetUniqueElementId(element);
+    if (Utils.__cache[id] != null) {
+      delete Utils.__cache[id];
+    }
+
+    element.removeAttribute('data-select2-id');
+  };
+
   return Utils;
 });
 
@@ -791,7 +855,7 @@ S2.define('select2/results',[
 
   Results.prototype.render = function () {
     var $results = $(
-      '<ul class="select2-results__options" role="tree"></ul>'
+      '<ul class="select2-results__options" role="listbox"></ul>'
     );
 
     if (this.options.get('multiple')) {
@@ -814,7 +878,7 @@ S2.define('select2/results',[
     this.hideLoading();
 
     var $message = $(
-      '<li role="treeitem" aria-live="assertive"' +
+      '<li role="alert" aria-live="assertive"' +
       ' class="select2-results__option"></li>'
     );
 
@@ -907,7 +971,7 @@ S2.define('select2/results',[
       $options.each(function () {
         var $option = $(this);
 
-        var item = $.data(this, 'data');
+        var item = Utils.GetData(this, 'data');
 
         // id needs to be converted to a string when comparing
         var id = '' + item.id;
@@ -948,11 +1012,16 @@ S2.define('select2/results',[
     option.className = 'select2-results__option';
 
     var attrs = {
-      'role': 'treeitem',
+      'role': 'option',
       'aria-selected': 'false'
     };
 
-    if (data.disabled) {
+    var matches = window.Element.prototype.matches ||
+      window.Element.prototype.msMatchesSelector ||
+      window.Element.prototype.webkitMatchesSelector;
+
+    if ((data.element != null && matches.call(data.element, ':disabled')) ||
+        (data.element == null && data.disabled)) {
       delete attrs['aria-selected'];
       attrs['aria-disabled'] = 'true';
     }
@@ -1012,7 +1081,7 @@ S2.define('select2/results',[
       this.template(data, option);
     }
 
-    $.data(option, 'data', data);
+    Utils.StoreData(option, 'data', data);
 
     return option;
   };
@@ -1053,7 +1122,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('unselect', function () {
@@ -1062,7 +1134,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('open', function () {
@@ -1098,7 +1173,7 @@ S2.define('select2/results',[
         return;
       }
 
-      var data = $highlighted.data('data');
+      var data = Utils.GetData($highlighted[0], 'data');
 
       if ($highlighted.attr('aria-selected') == 'true') {
         self.trigger('close', {});
@@ -1116,8 +1191,9 @@ S2.define('select2/results',[
 
       var currentIndex = $options.index($highlighted);
 
-      // If we are already at te top, don't move further
+      // If we are already at the top, don't move further
-      if (currentIndex === 0) {
+      // If no options, currentIndex will be -1
+      if (currentIndex <= 0) {
         return;
       }
 
@@ -1210,7 +1286,7 @@ S2.define('select2/results',[
       function (evt) {
       var $this = $(this);
 
-      var data = $this.data('data');
+      var data = Utils.GetData(this, 'data');
 
       if ($this.attr('aria-selected') === 'true') {
         if (self.options.get('multiple')) {
@@ -1233,7 +1309,7 @@ S2.define('select2/results',[
 
     this.$results.on('mouseenter', '.select2-results__option[aria-selected]',
       function (evt) {
-      var data = $(this).data('data');
+      var data = Utils.GetData(this, 'data');
 
       self.getHighlightedResults()
           .removeClass('select2-results__option--highlighted');
@@ -1348,14 +1424,15 @@ S2.define('select2/selection/base',[
 
     this._tabindex = 0;
 
-    if (this.$element.data('old-tabindex') != null) {
+    if (Utils.GetData(this.$element[0], 'old-tabindex') != null) {
-      this._tabindex = this.$element.data('old-tabindex');
+      this._tabindex = Utils.GetData(this.$element[0], 'old-tabindex');
     } else if (this.$element.attr('tabindex') != null) {
       this._tabindex = this.$element.attr('tabindex');
     }
 
     $selection.attr('title', this.$element.attr('title'));
     $selection.attr('tabindex', this._tabindex);
+    $selection.attr('aria-disabled', 'false');
 
     this.$selection = $selection;
 
@@ -1365,7 +1442,6 @@ S2.define('select2/selection/base',[
   BaseSelection.prototype.bind = function (container, $container) {
     var self = this;
 
-    var id = container.id + '-container';
     var resultsId = container.id + '-results';
 
     this.container = container;
@@ -1408,17 +1484,19 @@ S2.define('select2/selection/base',[
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.focus();
+      self.$selection.trigger('focus');
 
       self._detachCloseHandler(container);
     });
 
     container.on('enable', function () {
       self.$selection.attr('tabindex', self._tabindex);
+      self.$selection.attr('aria-disabled', 'false');
     });
 
     container.on('disable', function () {
       self.$selection.attr('tabindex', '-1');
+      self.$selection.attr('aria-disabled', 'true');
     });
   };
 
@@ -1441,7 +1519,6 @@ S2.define('select2/selection/base',[
   };
 
   BaseSelection.prototype._attachCloseHandler = function (container) {
-    var self = this;
 
     $(document.body).on('mousedown.select2.' + container.id, function (e) {
       var $target = $(e.target);
@@ -1451,13 +1528,11 @@ S2.define('select2/selection/base',[
       var $all = $('.select2.select2-container--open');
 
       $all.each(function () {
-        var $this = $(this);
-
         if (this == $select[0]) {
           return;
         }
 
-        var $element = $this.data('element');
+        var $element = Utils.GetData(this, 'element');
 
         $element.select2('close');
       });
@@ -1481,6 +1556,27 @@ S2.define('select2/selection/base',[
     throw new Error('The `update` method must be defined in child classes.');
   };
 
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  BaseSelection.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  BaseSelection.prototype.isDisabled = function () {
+    return this.options.get('disabled');
+  };
+
   return BaseSelection;
 });
 
@@ -1518,7 +1614,10 @@ S2.define('select2/selection/single',[
 
     var id = container.id + '-container';
 
-    this.$selection.find('.select2-selection__rendered').attr('id', id);
+    this.$selection.find('.select2-selection__rendered')
+      .attr('id', id)
+      .attr('role', 'textbox')
+      .attr('aria-readonly', 'true');
     this.$selection.attr('aria-labelledby', id);
 
     this.$selection.on('mousedown', function (evt) {
@@ -1542,17 +1641,15 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger('focus');
       }
     });
-
-    container.on('selection:update', function (params) {
-      self.update(params.data);
-    });
   };
 
   SingleSelection.prototype.clear = function () {
-    this.$selection.find('.select2-selection__rendered').empty();
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    $rendered.empty();
+    $rendered.removeAttr('title'); // clear tooltip on empty
   };
 
   SingleSelection.prototype.display = function (data, container) {
@@ -1578,7 +1675,14 @@ S2.define('select2/selection/single',[
     var formatted = this.display(selection, $rendered);
 
     $rendered.empty().append(formatted);
-    $rendered.prop('title', selection.title || selection.text);
+
+    var title = selection.title || selection.text;
+
+    if (title) {
+      $rendered.attr('title', title);
+    } else {
+      $rendered.removeAttr('title');
+    }
   };
 
   return SingleSelection;
@@ -1623,14 +1727,14 @@ S2.define('select2/selection/multiple',[
       '.select2-selection__choice__remove',
       function (evt) {
         // Ignore the event if it is disabled
-        if (self.options.get('disabled')) {
+        if (self.isDisabled()) {
           return;
         }
 
         var $remove = $(this);
         var $selection = $remove.parent();
 
-        var data = $selection.data('data');
+        var data = Utils.GetData($selection[0], 'data');
 
         self.trigger('unselect', {
           originalEvent: evt,
@@ -1641,7 +1745,9 @@ S2.define('select2/selection/multiple',[
   };
 
   MultipleSelection.prototype.clear = function () {
-    this.$selection.find('.select2-selection__rendered').empty();
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    $rendered.empty();
+    $rendered.removeAttr('title');
   };
 
   MultipleSelection.prototype.display = function (data, container) {
@@ -1679,9 +1785,14 @@ S2.define('select2/selection/multiple',[
       var formatted = this.display(selection, $selection);
 
       $selection.append(formatted);
-      $selection.prop('title', selection.title || selection.text);
 
-      $selection.data('data', selection);
+      var title = selection.title || selection.text;
+
+      if (title) {
+        $selection.attr('title', title);
+      }
+
+      Utils.StoreData($selection[0], 'data', selection);
 
       $selections.push($selection);
     }
@@ -1746,8 +1857,9 @@ S2.define('select2/selection/placeholder',[
 
 S2.define('select2/selection/allowClear',[
   'jquery',
-  '../keys'
+  '../keys',
-], function ($, KEYS) {
+  '../utils'
+], function ($, KEYS, Utils) {
   function AllowClear () { }
 
   AllowClear.prototype.bind = function (decorated, container, $container) {
@@ -1776,7 +1888,7 @@ S2.define('select2/selection/allowClear',[
 
   AllowClear.prototype._handleClear = function (_, evt) {
     // Ignore the event if it is disabled
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -1789,10 +1901,22 @@ S2.define('select2/selection/allowClear',[
 
     evt.stopPropagation();
 
-    var data = $clear.data('data');
+    var data = Utils.GetData($clear[0], 'data');
+
+    var previousVal = this.$element.val();
+    this.$element.val(this.placeholder.id);
+
+    var unselectData = {
+      data: data
+    };
+    this.trigger('clear', unselectData);
+    if (unselectData.prevented) {
+      this.$element.val(previousVal);
+      return;
+    }
 
     for (var d = 0; d < data.length; d++) {
-      var unselectData = {
+      unselectData = {
         data: data[d]
       };
 
@@ -1802,11 +1926,12 @@ S2.define('select2/selection/allowClear',[
 
       // If the event was prevented, don't clear it out.
       if (unselectData.prevented) {
+        this.$element.val(previousVal);
         return;
       }
     }
 
-    this.$element.val(this.placeholder.id).trigger('change');
+    this.$element.trigger('input').trigger('change');
 
     this.trigger('toggle', {});
   };
@@ -1829,12 +1954,14 @@ S2.define('select2/selection/allowClear',[
       return;
     }
 
+    var removeAll = this.options.get('translations').get('removeAllItems');
+
     var $remove = $(
-      '<span class="select2-selection__clear">' +
+      '<span class="select2-selection__clear" title="' + removeAll() +'">' +
         '&times;' +
       '</span>'
     );
-    $remove.data('data', data);
+    Utils.StoreData($remove[0], 'data', data);
 
     this.$selection.find('.select2-selection__rendered').prepend($remove);
   };
@@ -1856,7 +1983,7 @@ S2.define('select2/selection/search',[
       '<li class="select2-search select2-search--inline">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
+        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
       '</li>'
     );
 
@@ -1873,14 +2000,18 @@ S2.define('select2/selection/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
+    var resultsId = container.id + '-results';
+
     decorated.call(this, container, $container);
 
     container.on('open', function () {
+      self.$search.attr('aria-controls', resultsId);
       self.$search.trigger('focus');
     });
 
     container.on('close', function () {
       self.$search.val('');
+      self.$search.removeAttr('aria-controls');
       self.$search.removeAttr('aria-activedescendant');
       self.$search.trigger('focus');
     });
@@ -1900,7 +2031,11 @@ S2.define('select2/selection/search',[
     });
 
     container.on('results:focus', function (params) {
-      self.$search.attr('aria-activedescendant', params.id);
+      if (params.data._resultId) {
+        self.$search.attr('aria-activedescendant', params.data._resultId);
+      } else {
+        self.$search.removeAttr('aria-activedescendant');
+      }
     });
 
     this.$selection.on('focusin', '.select2-search--inline', function (evt) {
@@ -1925,7 +2060,7 @@ S2.define('select2/selection/search',[
           .prev('.select2-selection__choice');
 
         if ($previousChoice.length > 0) {
-          var item = $previousChoice.data('data');
+          var item = Utils.GetData($previousChoice[0], 'data');
 
           self.searchRemoveChoice(item);
 
@@ -1934,6 +2069,12 @@ S2.define('select2/selection/search',[
       }
     });
 
+    this.$selection.on('click', '.select2-search--inline', function (evt) {
+      if (self.$search.val()) {
+        evt.stopPropagation();
+      }
+    });
+
     // Try to detect the IE version should the `documentMode` property that
     // is stored on the document. This is only implemented in IE and is
     // slightly cleaner than doing a user agent check.
@@ -2019,7 +2160,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger('focus');
     }
   };
 
@@ -2052,7 +2193,7 @@ S2.define('select2/selection/search',[
     var width = '';
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.find('.select2-selection__rendered').innerWidth();
+      width = this.$selection.find('.select2-selection__rendered').width();
     } else {
       var minimumWidth = this.$search.val().length + 1;
 
@@ -2076,10 +2217,13 @@ S2.define('select2/selection/eventRelay',[
       'open', 'opening',
       'close', 'closing',
       'select', 'selecting',
-      'unselect', 'unselecting'
+      'unselect', 'unselecting',
+      'clear', 'clearing'
     ];
 
-    var preventableEvents = ['opening', 'closing', 'selecting', 'unselecting'];
+    var preventableEvents = [
+      'opening', 'closing', 'selecting', 'unselecting', 'clearing'
+    ];
 
     decorated.call(this, container, $container);
 
@@ -2412,6 +2556,7 @@ S2.define('select2/diacritics',[
     '\u019F': 'O',
     '\uA74A': 'O',
     '\uA74C': 'O',
+    '\u0152': 'OE',
     '\u01A2': 'OI',
     '\uA74E': 'OO',
     '\u0222': 'OU',
@@ -2821,6 +2966,7 @@ S2.define('select2/diacritics',[
     '\uA74B': 'o',
     '\uA74D': 'o',
     '\u0275': 'o',
+    '\u0153': 'oe',
     '\u01A3': 'oi',
     '\u0223': 'ou',
     '\uA74F': 'oo',
@@ -2989,8 +3135,9 @@ S2.define('select2/diacritics',[
     '\u03CD': '\u03C5',
     '\u03CB': '\u03C5',
     '\u03B0': '\u03C5',
-    '\u03C9': '\u03C9',
+    '\u03CE': '\u03C9',
-    '\u03C2': '\u03C3'
+    '\u03C2': '\u03C3',
+    '\u2019': '\''
   };
 
   return diacritics;
@@ -3075,7 +3222,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = true;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3096,13 +3243,13 @@ S2.define('select2/data/select',[
         }
 
         self.$element.val(val);
-        self.$element.trigger('change');
+        self.$element.trigger('input').trigger('change');
       });
     } else {
       var val = data.id;
 
       this.$element.val(val);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
 
@@ -3118,7 +3265,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = false;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3136,7 +3283,7 @@ S2.define('select2/data/select',[
 
       self.$element.val(val);
 
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
 
@@ -3158,7 +3305,7 @@ S2.define('select2/data/select',[
     // Remove anything added to child elements
     this.$element.find('*').each(function () {
       // Remove any custom data set by Select2
-      $.removeData(this, 'data');
+      Utils.RemoveData(this);
     });
   };
 
@@ -3231,7 +3378,7 @@ S2.define('select2/data/select',[
     normalizedData.element = option;
 
     // Override the option's data with the combined data
-    $.data(option, 'data', normalizedData);
+    Utils.StoreData(option, 'data', normalizedData);
 
     return $option;
   };
@@ -3239,7 +3386,7 @@ S2.define('select2/data/select',[
   SelectAdapter.prototype.item = function ($option) {
     var data = {};
 
-    data = $.data($option[0], 'data');
+    data = Utils.GetData($option[0], 'data');
 
     if (data != null) {
       return data;
@@ -3277,13 +3424,13 @@ S2.define('select2/data/select',[
     data = this._normalizeItem(data);
     data.element = $option[0];
 
-    $.data($option[0], 'data', data);
+    Utils.StoreData($option[0], 'data', data);
 
     return data;
   };
 
   SelectAdapter.prototype._normalizeItem = function (item) {
-    if (!$.isPlainObject(item)) {
+    if (item !== Object(item)) {
       item = {
         id: item,
         text: item
@@ -3329,15 +3476,19 @@ S2.define('select2/data/array',[
   'jquery'
 ], function (SelectAdapter, Utils, $) {
   function ArrayAdapter ($element, options) {
-    var data = options.get('data') || [];
+    this._dataToConvert = options.get('data') || [];
 
     ArrayAdapter.__super__.constructor.call(this, $element, options);
-
-    this.addOptions(this.convertToOptions(data));
   }
 
   Utils.Extend(ArrayAdapter, SelectAdapter);
 
+  ArrayAdapter.prototype.bind = function (container, $container) {
+    ArrayAdapter.__super__.bind.call(this, container, $container);
+
+    this.addOptions(this.convertToOptions(this._dataToConvert));
+  };
+
   ArrayAdapter.prototype.select = function (data) {
     var $option = this.$element.find('option').filter(function (i, elm) {
       return elm.value == data.id.toString();
@@ -3487,7 +3638,8 @@ S2.define('select2/data/ajax',[
       }, function () {
         // Attempt to detect if a request was aborted
         // Only works if the transport exposes a status property
-        if ($request.status && $request.status === '0') {
+        if ('status' in $request &&
+            ($request.status === 0 || $request.status === '0')) {
           return;
         }
 
@@ -3626,8 +3778,6 @@ S2.define('select2/data/tags',[
   };
 
   Tags.prototype._removeOldTags = function (_) {
-    var tag = this._lastTag;
-
     var $options = this.$element.find('option[data-select2-tag]');
 
     $options.each(function () {
@@ -3702,7 +3852,7 @@ S2.define('select2/data/tokenizer',[
       // Replace the search term if we have the search box
       if (this.$search.length) {
         this.$search.val(tokenData.term);
-        this.$search.focus();
+        this.$search.trigger('focus');
       }
 
       params.term = tokenData.term;
@@ -3831,10 +3981,30 @@ S2.define('select2/data/maximumSelectionLength',[
     decorated.call(this, $e, options);
   }
 
+  MaximumSelectionLength.prototype.bind =
+    function (decorated, container, $container) {
+      var self = this;
+
+      decorated.call(this, container, $container);
+
+      container.on('select', function () {
+        self._checkIfMaximumSelected();
+      });
+  };
+
   MaximumSelectionLength.prototype.query =
     function (decorated, params, callback) {
       var self = this;
 
+      this._checkIfMaximumSelected(function () {
+        decorated.call(self, params, callback);
+      });
+  };
+
+  MaximumSelectionLength.prototype._checkIfMaximumSelected =
+    function (_, successCallback) {
+      var self = this;
+
       this.current(function (currentData) {
         var count = currentData != null ? currentData.length : 0;
         if (self.maximumSelectionLength > 0 &&
@@ -3847,7 +4017,10 @@ S2.define('select2/data/maximumSelectionLength',[
           });
           return;
         }
-        decorated.call(self, params, callback);
+
+        if (successCallback) {
+          successCallback();
+        }
       });
   };
 
@@ -3886,7 +4059,7 @@ S2.define('select2/dropdown',[
   };
 
   Dropdown.prototype.position = function ($dropdown, $container) {
-    // Should be implmented in subclasses
+    // Should be implemented in subclasses
   };
 
   Dropdown.prototype.destroy = function () {
@@ -3910,7 +4083,7 @@ S2.define('select2/dropdown/search',[
       '<span class="select2-search select2-search--dropdown">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="textbox" />' +
+        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
       '</span>'
     );
 
@@ -3925,6 +4098,8 @@ S2.define('select2/dropdown/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
+    var resultsId = container.id + '-results';
+
     decorated.call(this, container, $container);
 
     this.$search.on('keydown', function (evt) {
@@ -3947,23 +4122,27 @@ S2.define('select2/dropdown/search',[
 
     container.on('open', function () {
       self.$search.attr('tabindex', 0);
+      self.$search.attr('aria-controls', resultsId);
 
-      self.$search.focus();
+      self.$search.trigger('focus');
 
       window.setTimeout(function () {
-        self.$search.focus();
+        self.$search.trigger('focus');
       }, 0);
     });
 
     container.on('close', function () {
       self.$search.attr('tabindex', -1);
+      self.$search.removeAttr('aria-controls');
+      self.$search.removeAttr('aria-activedescendant');
 
       self.$search.val('');
+      self.$search.trigger('blur');
     });
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.focus();
+        self.$search.trigger('focus');
       }
     });
 
@@ -3978,6 +4157,14 @@ S2.define('select2/dropdown/search',[
         }
       }
     });
+
+    container.on('results:focus', function (params) {
+      if (params.data._resultId) {
+        self.$search.attr('aria-activedescendant', params.data._resultId);
+      } else {
+        self.$search.removeAttr('aria-activedescendant');
+      }
+    });
   };
 
   Search.prototype.handleSearch = function (evt) {
@@ -4062,6 +4249,7 @@ S2.define('select2/dropdown/infiniteScroll',[
 
     if (this.showLoadingMore(data)) {
       this.$results.append(this.$loadingMore);
+      this.loadMoreIfNeeded();
     }
   };
 
@@ -4080,25 +4268,27 @@ S2.define('select2/dropdown/infiniteScroll',[
       self.loading = true;
     });
 
-    this.$results.on('scroll', function () {
+    this.$results.on('scroll', this.loadMoreIfNeeded.bind(this));
-      var isLoadMoreVisible = $.contains(
+  };
-        document.documentElement,
-        self.$loadingMore[0]
-      );
 
-      if (self.loading || !isLoadMoreVisible) {
+  InfiniteScroll.prototype.loadMoreIfNeeded = function () {
-        return;
+    var isLoadMoreVisible = $.contains(
-      }
+      document.documentElement,
+      this.$loadingMore[0]
+    );
 
-      var currentOffset = self.$results.offset().top +
+    if (this.loading || !isLoadMoreVisible) {
-        self.$results.outerHeight(false);
+      return;
-      var loadingMoreOffset = self.$loadingMore.offset().top +
+    }
-        self.$loadingMore.outerHeight(false);
 
-      if (currentOffset + 50 >= loadingMoreOffset) {
+    var currentOffset = this.$results.offset().top +
-        self.loadMore();
+      this.$results.outerHeight(false);
-      }
+    var loadingMoreOffset = this.$loadingMore.offset().top +
-    });
+      this.$loadingMore.outerHeight(false);
+
+    if (currentOffset + 50 >= loadingMoreOffset) {
+      this.loadMore();
+    }
   };
 
   InfiniteScroll.prototype.loadMore = function () {
@@ -4119,7 +4309,7 @@ S2.define('select2/dropdown/infiniteScroll',[
     var $option = $(
       '<li ' +
       'class="select2-results__option select2-results__option--load-more"' +
-      'role="treeitem" aria-disabled="true"></li>'
+      'role="option" aria-disabled="true"></li>'
     );
 
     var message = this.options.get('translations').get('loadingMore');
@@ -4137,7 +4327,7 @@ S2.define('select2/dropdown/attachBody',[
   '../utils'
 ], function ($, Utils) {
   function AttachBody (decorated, $element, options) {
-    this.$dropdownParent = options.get('dropdownParent') || $(document.body);
+    this.$dropdownParent = $(options.get('dropdownParent') || document.body);
 
     decorated.call(this, $element, options);
   }
@@ -4145,27 +4335,14 @@ S2.define('select2/dropdown/attachBody',[
   AttachBody.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
-    var setupResultsEvents = false;
-
     decorated.call(this, container, $container);
 
     container.on('open', function () {
       self._showDropdown();
       self._attachPositioningHandler(container);
 
-      if (!setupResultsEvents) {
+      // Must bind after the results handlers to ensure correct sizing
-        setupResultsEvents = true;
+      self._bindContainerResultHandlers(container);
-
-        container.on('results:all', function () {
-          self._positionDropdown();
-          self._resizeDropdown();
-        });
-
-        container.on('results:append', function () {
-          self._positionDropdown();
-          self._resizeDropdown();
-        });
-      }
     });
 
     container.on('close', function () {
@@ -4214,6 +4391,44 @@ S2.define('select2/dropdown/attachBody',[
     this.$dropdownContainer.detach();
   };
 
+  AttachBody.prototype._bindContainerResultHandlers =
+      function (decorated, container) {
+
+    // These should only be bound once
+    if (this._containerResultsHandlersBound) {
+      return;
+    }
+
+    var self = this;
+
+    container.on('results:all', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('results:append', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('results:message', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('select', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('unselect', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    this._containerResultsHandlersBound = true;
+  };
+
   AttachBody.prototype._attachPositioningHandler =
       function (decorated, container) {
     var self = this;
@@ -4224,14 +4439,14 @@ S2.define('select2/dropdown/attachBody',[
 
     var $watchers = this.$container.parents().filter(Utils.hasScroll);
     $watchers.each(function () {
-      $(this).data('select2-scroll-position', {
+      Utils.StoreData(this, 'select2-scroll-position', {
         x: $(this).scrollLeft(),
         y: $(this).scrollTop()
       });
     });
 
     $watchers.on(scrollEvent, function (ev) {
-      var position = $(this).data('select2-scroll-position');
+      var position = Utils.GetData(this, 'select2-scroll-position');
       $(this).scrollTop(position.y);
     });
 
@@ -4290,16 +4505,26 @@ S2.define('select2/dropdown/attachBody',[
       top: container.bottom
     };
 
-    // Determine what the parent element is to use for calciulating the offset
+    // Determine what the parent element is to use for calculating the offset
     var $offsetParent = this.$dropdownParent;
 
-    // For statically positoned elements, we need to get the element
+    // For statically positioned elements, we need to get the element
     // that is determining the offset
     if ($offsetParent.css('position') === 'static') {
       $offsetParent = $offsetParent.offsetParent();
     }
 
-    var parentOffset = $offsetParent.offset();
+    var parentOffset = {
+      top: 0,
+      left: 0
+    };
+
+    if (
+      $.contains(document.body, $offsetParent[0]) ||
+      $offsetParent[0].isConnected
+      ) {
+      parentOffset = $offsetParent.offset();
+    }
 
     css.top -= parentOffset.top;
     css.left -= parentOffset.left;
@@ -4396,8 +4621,8 @@ S2.define('select2/dropdown/minimumResultsForSearch',[
 });
 
 S2.define('select2/dropdown/selectOnClose',[
-
+  '../utils'
-], function () {
+], function (Utils) {
   function SelectOnClose () { }
 
   SelectOnClose.prototype.bind = function (decorated, container, $container) {
@@ -4428,7 +4653,7 @@ S2.define('select2/dropdown/selectOnClose',[
       return;
     }
 
-    var data = $highlightedResults.data('data');
+    var data = Utils.GetData($highlightedResults[0], 'data');
 
     // Don't re-select already selected resulte
     if (
@@ -4469,7 +4694,7 @@ S2.define('select2/dropdown/closeOnSelect',[
     var originalEvent = evt.originalEvent;
 
     // Don't close if the control key is being held
-    if (originalEvent && originalEvent.ctrlKey) {
+    if (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey)) {
       return;
     }
 
@@ -4523,6 +4748,9 @@ S2.define('select2/i18n/en',[],function () {
     },
     searching: function () {
       return 'Searching…';
+    },
+    removeAllItems: function () {
+      return 'Remove all items';
     }
   };
 });
@@ -4761,66 +4989,29 @@ S2.define('select2/defaults',[
       );
     }
 
-    if (typeof options.language === 'string') {
+    // If the defaults were not previously applied from an element, it is
-      // Check if the language is specified with a region
+    // possible for the language option to have not been resolved
-      if (options.language.indexOf('-') > 0) {
+    options.language = this._resolveLanguage(options.language);
-        // Extract the region information if it is included
-        var languageParts = options.language.split('-');
-        var baseLanguage = languageParts[0];
 
-        options.language = [options.language, baseLanguage];
+    // Always fall back to English since it will always be complete
-      } else {
+    options.language.push('en');
-        options.language = [options.language];
+
+    var uniqueLanguages = [];
+
+    for (var l = 0; l < options.language.length; l++) {
+      var language = options.language[l];
+
+      if (uniqueLanguages.indexOf(language) === -1) {
+        uniqueLanguages.push(language);
       }
     }
 
-    if ($.isArray(options.language)) {
+    options.language = uniqueLanguages;
-      var languages = new Translation();
-      options.language.push('en');
 
-      var languageNames = options.language;
+    options.translations = this._processTranslations(
-
+      options.language,
-      for (var l = 0; l < languageNames.length; l++) {
+      options.debug
-        var name = languageNames[l];
+    );
-        var language = {};
-
-        try {
-          // Try to load it with the original name
-          language = Translation.loadPath(name);
-        } catch (e) {
-          try {
-            // If we couldn't load it, check if it wasn't the full path
-            name = this.defaults.amdLanguageBase + name;
-            language = Translation.loadPath(name);
-          } catch (ex) {
-            // The translation could not be loaded at all. Sometimes this is
-            // because of a configuration problem, other times this can be
-            // because of how Select2 helps load all possible translation files.
-            if (options.debug && window.console && console.warn) {
-              console.warn(
-                'Select2: The language file for "' + name + '" could not be ' +
-                'automatically loaded. A fallback will be used instead.'
-              );
-            }
-
-            continue;
-          }
-        }
-
-        languages.extend(language);
-      }
-
-      options.translations = languages;
-    } else {
-      var baseTranslation = Translation.loadPath(
-        this.defaults.amdLanguageBase + 'en'
-      );
-      var customTranslation = new Translation(options.language);
-
-      customTranslation.extend(baseTranslation);
-
-      options.translations = customTranslation;
-    }
 
     return options;
   };
@@ -4887,13 +5078,14 @@ S2.define('select2/defaults',[
       debug: false,
       dropdownAutoWidth: false,
       escapeMarkup: Utils.escapeMarkup,
-      language: EnglishTranslation,
+      language: {},
       matcher: matcher,
       minimumInputLength: 0,
       maximumInputLength: 0,
       maximumSelectionLength: 0,
       minimumResultsForSearch: 0,
       selectOnClose: false,
+      scrollAfterSelect: false,
       sorter: function (data) {
         return data;
       },
@@ -4908,6 +5100,103 @@ S2.define('select2/defaults',[
     };
   };
 
+  Defaults.prototype.applyFromElement = function (options, $element) {
+    var optionLanguage = options.language;
+    var defaultLanguage = this.defaults.language;
+    var elementLanguage = $element.prop('lang');
+    var parentLanguage = $element.closest('[lang]').prop('lang');
+
+    var languages = Array.prototype.concat.call(
+      this._resolveLanguage(elementLanguage),
+      this._resolveLanguage(optionLanguage),
+      this._resolveLanguage(defaultLanguage),
+      this._resolveLanguage(parentLanguage)
+    );
+
+    options.language = languages;
+
+    return options;
+  };
+
+  Defaults.prototype._resolveLanguage = function (language) {
+    if (!language) {
+      return [];
+    }
+
+    if ($.isEmptyObject(language)) {
+      return [];
+    }
+
+    if ($.isPlainObject(language)) {
+      return [language];
+    }
+
+    var languages;
+
+    if (!$.isArray(language)) {
+      languages = [language];
+    } else {
+      languages = language;
+    }
+
+    var resolvedLanguages = [];
+
+    for (var l = 0; l < languages.length; l++) {
+      resolvedLanguages.push(languages[l]);
+
+      if (typeof languages[l] === 'string' && languages[l].indexOf('-') > 0) {
+        // Extract the region information if it is included
+        var languageParts = languages[l].split('-');
+        var baseLanguage = languageParts[0];
+
+        resolvedLanguages.push(baseLanguage);
+      }
+    }
+
+    return resolvedLanguages;
+  };
+
+  Defaults.prototype._processTranslations = function (languages, debug) {
+    var translations = new Translation();
+
+    for (var l = 0; l < languages.length; l++) {
+      var languageData = new Translation();
+
+      var language = languages[l];
+
+      if (typeof language === 'string') {
+        try {
+          // Try to load it with the original name
+          languageData = Translation.loadPath(language);
+        } catch (e) {
+          try {
+            // If we couldn't load it, check if it wasn't the full path
+            language = this.defaults.amdLanguageBase + language;
+            languageData = Translation.loadPath(language);
+          } catch (ex) {
+            // The translation could not be loaded at all. Sometimes this is
+            // because of a configuration problem, other times this can be
+            // because of how Select2 helps load all possible translation files
+            if (debug && window.console && console.warn) {
+              console.warn(
+                'Select2: The language file for "' + language + '" could ' +
+                'not be automatically loaded. A fallback will be used instead.'
+              );
+            }
+          }
+        }
+      } else if ($.isPlainObject(language)) {
+        languageData = new Translation(language);
+      } else {
+        languageData = language;
+      }
+
+      translations.extend(languageData);
+    }
+
+    return translations;
+  };
+
   Defaults.prototype.set = function (key, value) {
     var camelKey = $.camelCase(key);
 
@@ -4916,7 +5205,7 @@ S2.define('select2/defaults',[
 
     var convertedData = Utils._convertData(data);
 
-    $.extend(this.defaults, convertedData);
+    $.extend(true, this.defaults, convertedData);
   };
 
   var defaults = new Defaults();
@@ -4937,6 +5226,10 @@ S2.define('select2/options',[
       this.fromElement($element);
     }
 
+    if ($element != null) {
+      this.options = Defaults.applyFromElement(this.options, $element);
+    }
+
     this.options = Defaults.apply(this.options);
 
     if ($element && $element.is('input')) {
@@ -4960,14 +5253,6 @@ S2.define('select2/options',[
       this.options.disabled = $e.prop('disabled');
     }
 
-    if (this.options.language == null) {
-      if ($e.prop('lang')) {
-        this.options.language = $e.prop('lang').toLowerCase();
-      } else if ($e.closest('[lang]').prop('lang')) {
-        this.options.language = $e.closest('[lang]').prop('lang');
-      }
-    }
-
     if (this.options.dir == null) {
       if ($e.prop('dir')) {
         this.options.dir = $e.prop('dir');
@@ -4981,7 +5266,7 @@ S2.define('select2/options',[
     $e.prop('disabled', this.options.disabled);
     $e.prop('multiple', this.options.multiple);
 
-    if ($e.data('select2Tags')) {
+    if (Utils.GetData($e[0], 'select2Tags')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-select2-tags` attribute has been changed to ' +
@@ -4990,11 +5275,11 @@ S2.define('select2/options',[
         );
       }
 
-      $e.data('data', $e.data('select2Tags'));
+      Utils.StoreData($e[0], 'data', Utils.GetData($e[0], 'select2Tags'));
-      $e.data('tags', true);
+      Utils.StoreData($e[0], 'tags', true);
     }
 
-    if ($e.data('ajaxUrl')) {
+    if (Utils.GetData($e[0], 'ajaxUrl')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-ajax-url` attribute has been changed to ' +
@@ -5003,21 +5288,45 @@ S2.define('select2/options',[
         );
       }
 
-      $e.attr('ajax--url', $e.data('ajaxUrl'));
+      $e.attr('ajax--url', Utils.GetData($e[0], 'ajaxUrl'));
-      $e.data('ajax--url', $e.data('ajaxUrl'));
+      Utils.StoreData($e[0], 'ajax-Url', Utils.GetData($e[0], 'ajaxUrl'));
     }
 
     var dataset = {};
 
+    function upperCaseLetter(_, letter) {
+      return letter.toUpperCase();
+    }
+
+    // Pre-load all of the attributes which are prefixed with `data-`
+    for (var attr = 0; attr < $e[0].attributes.length; attr++) {
+      var attributeName = $e[0].attributes[attr].name;
+      var prefix = 'data-';
+
+      if (attributeName.substr(0, prefix.length) == prefix) {
+        // Get the contents of the attribute after `data-`
+        var dataName = attributeName.substring(prefix.length);
+
+        // Get the data contents from the consistent source
+        // This is more than likely the jQuery data helper
+        var dataValue = Utils.GetData($e[0], dataName);
+
+        // camelCase the attribute name to match the spec
+        var camelDataName = dataName.replace(/-([a-z])/g, upperCaseLetter);
+
+        // Store the data attribute contents into the dataset since
+        dataset[camelDataName] = dataValue;
+      }
+    }
+
     // Prefer the element's `dataset` attribute if it exists
     // jQuery 1.x does not correctly handle data attributes with multiple dashes
     if ($.fn.jquery && $.fn.jquery.substr(0, 2) == '1.' && $e[0].dataset) {
-      dataset = $.extend(true, {}, $e[0].dataset, $e.data());
+      dataset = $.extend(true, {}, $e[0].dataset, dataset);
-    } else {
-      dataset = $e.data();
     }
 
-    var data = $.extend(true, {}, dataset);
+    // Prefer our internal data cache if it exists
+    var data = $.extend(true, {}, Utils.GetData($e[0]), dataset);
 
     data = Utils._convertData(data);
 
@@ -5054,8 +5363,8 @@ S2.define('select2/core',[
   './keys'
 ], function ($, Options, Utils, KEYS) {
   var Select2 = function ($element, options) {
-    if ($element.data('select2') != null) {
+    if (Utils.GetData($element[0], 'select2') != null) {
-      $element.data('select2').destroy();
+      Utils.GetData($element[0], 'select2').destroy();
     }
 
     this.$element = $element;
@@ -5071,7 +5380,7 @@ S2.define('select2/core',[
     // Set up the tabindex
 
     var tabindex = $element.attr('tabindex') || 0;
-    $element.data('old-tabindex', tabindex);
+    Utils.StoreData($element[0], 'old-tabindex', tabindex);
     $element.attr('tabindex', '-1');
 
     // Set up containers and adapters
@@ -5132,6 +5441,9 @@ S2.define('select2/core',[
     // Synchronize any monitored attributes
     this._syncAttributes();
 
+    Utils.StoreData($element[0], 'select2', this);
+
+    // Ensure backwards compatibility with $element.data('select2').
     $element.data('select2', this);
   };
 
@@ -5208,6 +5520,12 @@ S2.define('select2/core',[
       return null;
     }
 
+    if (method == 'computedstyle') {
+      var computedStyle = window.getComputedStyle($element[0]);
+
+      return computedStyle.width;
+    }
+
     return method;
   };
 
@@ -5248,8 +5566,8 @@ S2.define('select2/core',[
 
     if (observer != null) {
       this._observer = new observer(function (mutations) {
-        $.each(mutations, self._syncA);
+        self._syncA();
-        $.each(mutations, self._syncS);
+        self._syncS(null, mutations);
       });
       this._observer.observe(this.$element[0], {
         attributes: true,
@@ -5371,7 +5689,7 @@ S2.define('select2/core',[
       if (self.isOpen()) {
         if (key === KEYS.ESC || key === KEYS.TAB ||
             (key === KEYS.UP && evt.altKey)) {
-          self.close();
+          self.close(evt);
 
           evt.preventDefault();
         } else if (key === KEYS.ENTER) {
@@ -5405,7 +5723,7 @@ S2.define('select2/core',[
   Select2.prototype._syncAttributes = function () {
     this.options.set('disabled', this.$element.prop('disabled'));
 
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       if (this.isOpen()) {
         this.close();
       }
@@ -5416,7 +5734,7 @@ S2.define('select2/core',[
     }
   };
 
-  Select2.prototype._syncSubtree = function (evt, mutations) {
+  Select2.prototype._isChangeMutation = function (evt, mutations) {
     var changed = false;
     var self = this;
 
@@ -5444,7 +5762,22 @@ S2.define('select2/core',[
       }
     } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
       changed = true;
+    } else if ($.isArray(mutations)) {
+      $.each(mutations, function(evt, mutation) {
+        if (self._isChangeMutation(evt, mutation)) {
+          // We've found a change mutation.
+          // Let's escape from the loop and continue
+          changed = true;
+          return false;
+        }
+      });
     }
+    return changed;
+  };
+
+  Select2.prototype._syncSubtree = function (evt, mutations) {
+    var changed = this._isChangeMutation(evt, mutations);
+    var self = this;
 
     // Only re-pull the data if we think there is a change
     if (changed) {
@@ -5466,7 +5799,8 @@ S2.define('select2/core',[
       'open': 'opening',
       'close': 'closing',
       'select': 'selecting',
-      'unselect': 'unselecting'
+      'unselect': 'unselecting',
+      'clear': 'clearing'
     };
 
     if (args === undefined) {
@@ -5494,7 +5828,7 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.toggleDropdown = function () {
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -5510,15 +5844,40 @@ S2.define('select2/core',[
       return;
     }
 
+    if (this.isDisabled()) {
+      return;
+    }
+
     this.trigger('query', {});
   };
 
-  Select2.prototype.close = function () {
+  Select2.prototype.close = function (evt) {
     if (!this.isOpen()) {
       return;
     }
 
-    this.trigger('close', {});
+    this.trigger('close', { originalEvent : evt });
+  };
+
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  Select2.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  Select2.prototype.isDisabled = function () {
+    return this.options.get('disabled');
   };
 
   Select2.prototype.isOpen = function () {
@@ -5595,7 +5954,7 @@ S2.define('select2/core',[
       });
     }
 
-    this.$element.val(newVal).trigger('change');
+    this.$element.val(newVal).trigger('input').trigger('change');
   };
 
   Select2.prototype.destroy = function () {
@@ -5621,10 +5980,12 @@ S2.define('select2/core',[
     this._syncS = null;
 
     this.$element.off('.select2');
-    this.$element.attr('tabindex', this.$element.data('old-tabindex'));
+    this.$element.attr('tabindex',
+    Utils.GetData(this.$element[0], 'old-tabindex'));
 
     this.$element.removeClass('select2-hidden-accessible');
     this.$element.attr('aria-hidden', 'false');
+    Utils.RemoveData(this.$element[0]);
     this.$element.removeData('select2');
 
     this.dataAdapter.destroy();
@@ -5652,7 +6013,7 @@ S2.define('select2/core',[
 
     this.$container.addClass('select2-container--' + this.options.get('theme'));
 
-    $container.data('element', this.$element);
+    Utils.StoreData($container[0], 'element', this.$element);
 
     return $container;
   };
@@ -5862,8 +6223,9 @@ S2.define('select2/compat/initSelection',[
 });
 
 S2.define('select2/compat/inputData',[
-  'jquery'
+  'jquery',
-], function ($) {
+  '../utils'
+], function ($, Utils) {
   function InputData (decorated, $element, options) {
     this._currentData = [];
     this._valueSeparator = options.get('valueSeparator') || ',';
@@ -5927,13 +6289,13 @@ S2.define('select2/compat/inputData',[
       });
 
       this.$element.val(data.id);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     } else {
       var value = this.$element.val();
       value += this._valueSeparator + data.id;
 
       this.$element.val(value);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
 
@@ -5956,7 +6318,7 @@ S2.define('select2/compat/inputData',[
       }
 
       self.$element.val(values.join(self._valueSeparator));
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
 
@@ -5980,7 +6342,7 @@ S2.define('select2/compat/inputData',[
 
   InputData.prototype.addOptions = function (_, $options) {
     var options = $.map($options, function ($option) {
-      return $.data($option[0], 'data');
+      return Utils.GetData($option[0], 'data');
     });
 
     this._currentData.push.apply(this._currentData, options);
@@ -6383,8 +6745,9 @@ S2.define('jquery.select2',[
   'jquery-mousewheel',
 
   './select2/core',
-  './select2/defaults'
+  './select2/defaults',
-], function ($, _, Select2, Defaults) {
+  './select2/utils'
+], function ($, _, Select2, Defaults, Utils) {
   if ($.fn.select2 == null) {
     // All methods that should return the element
     var thisMethods = ['open', 'close', 'destroy'];
@@ -6405,7 +6768,7 @@ S2.define('jquery.select2',[
         var args = Array.prototype.slice.call(arguments, 1);
 
         this.each(function () {
-          var instance = $(this).data('select2');
+          var instance = Utils.GetData(this, 'select2');
 
           if (instance == null && window.console && console.error) {
             console.error(

e_lib/select2/select2.js

@@ -1,11 +1,11 @@
 /*!
- * Select2 4.0.5
+ * Select2 4.0.13
  * https://select2.github.io
  *
  * Released under the MIT license
  * https://github.com/select2/select2/blob/master/LICENSE.md
  */
-(function (factory) {
+;(function (factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define(['jquery'], factory);
@@ -574,10 +574,10 @@ S2.define('select2/utils',[
     DecoratedClass.prototype = new ctr();
 
     for (var m = 0; m < superMethods.length; m++) {
-        var superMethod = superMethods[m];
+      var superMethod = superMethods[m];
 
-        DecoratedClass.prototype[superMethod] =
+      DecoratedClass.prototype[superMethod] =
-          SuperClass.prototype[superMethod];
+        SuperClass.prototype[superMethod];
     }
 
     var calledMethod = function (methodName) {
@@ -772,6 +772,70 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
+  // Cache objects in Utils.__cache instead of $.data (see #4346)
+  Utils.__cache = {};
+
+  var id = 0;
+  Utils.GetUniqueElementId = function (element) {
+    // Get a unique element Id. If element has no id,
+    // creates a new unique number, stores it in the id
+    // attribute and returns the new id.
+    // If an id already exists, it simply returns it.
+
+    var select2Id = element.getAttribute('data-select2-id');
+    if (select2Id == null) {
+      // If element has id, use it.
+      if (element.id) {
+        select2Id = element.id;
+        element.setAttribute('data-select2-id', select2Id);
+      } else {
+        element.setAttribute('data-select2-id', ++id);
+        select2Id = id.toString();
+      }
+    }
+    return select2Id;
+  };
+
+  Utils.StoreData = function (element, name, value) {
+    // Stores an item in the cache for a specified element.
+    // name is the cache key.
+    var id = Utils.GetUniqueElementId(element);
+    if (!Utils.__cache[id]) {
+      Utils.__cache[id] = {};
+    }
+
+    Utils.__cache[id][name] = value;
+  };
+
+  Utils.GetData = function (element, name) {
+    // Retrieves a value from the cache by its key (name)
+    // name is optional. If no name specified, return
+    // all cache items for the specified element.
+    // and for a specified element.
+    var id = Utils.GetUniqueElementId(element);
+    if (name) {
+      if (Utils.__cache[id]) {
+        if (Utils.__cache[id][name] != null) {
+          return Utils.__cache[id][name];
+        }
+        return $(element).data(name); // Fallback to HTML5 data attribs.
+      }
+      return $(element).data(name); // Fallback to HTML5 data attribs.
+    } else {
+      return Utils.__cache[id];
+    }
+  };
+
+  Utils.RemoveData = function (element) {
+    // Removes all cached items for a specified element.
+    var id = Utils.GetUniqueElementId(element);
+    if (Utils.__cache[id] != null) {
+      delete Utils.__cache[id];
+    }
+
+    element.removeAttribute('data-select2-id');
+  };
+
   return Utils;
 });
 
@@ -791,7 +855,7 @@ S2.define('select2/results',[
 
   Results.prototype.render = function () {
     var $results = $(
-      '<ul class="select2-results__options" role="tree"></ul>'
+      '<ul class="select2-results__options" role="listbox"></ul>'
     );
 
     if (this.options.get('multiple')) {
@@ -814,7 +878,7 @@ S2.define('select2/results',[
     this.hideLoading();
 
     var $message = $(
-      '<li role="treeitem" aria-live="assertive"' +
+      '<li role="alert" aria-live="assertive"' +
       ' class="select2-results__option"></li>'
     );
 
@@ -907,7 +971,7 @@ S2.define('select2/results',[
       $options.each(function () {
         var $option = $(this);
 
-        var item = $.data(this, 'data');
+        var item = Utils.GetData(this, 'data');
 
         // id needs to be converted to a string when comparing
         var id = '' + item.id;
@@ -948,11 +1012,16 @@ S2.define('select2/results',[
     option.className = 'select2-results__option';
 
     var attrs = {
-      'role': 'treeitem',
+      'role': 'option',
       'aria-selected': 'false'
     };
 
-    if (data.disabled) {
+    var matches = window.Element.prototype.matches ||
+      window.Element.prototype.msMatchesSelector ||
+      window.Element.prototype.webkitMatchesSelector;
+
+    if ((data.element != null && matches.call(data.element, ':disabled')) ||
+        (data.element == null && data.disabled)) {
       delete attrs['aria-selected'];
       attrs['aria-disabled'] = 'true';
     }
@@ -1012,7 +1081,7 @@ S2.define('select2/results',[
       this.template(data, option);
     }
 
-    $.data(option, 'data', data);
+    Utils.StoreData(option, 'data', data);
 
     return option;
   };
@@ -1053,7 +1122,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('unselect', function () {
@@ -1062,7 +1134,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('open', function () {
@@ -1098,7 +1173,7 @@ S2.define('select2/results',[
         return;
       }
 
-      var data = $highlighted.data('data');
+      var data = Utils.GetData($highlighted[0], 'data');
 
       if ($highlighted.attr('aria-selected') == 'true') {
         self.trigger('close', {});
@@ -1116,8 +1191,9 @@ S2.define('select2/results',[
 
       var currentIndex = $options.index($highlighted);
 
-      // If we are already at te top, don't move further
+      // If we are already at the top, don't move further
-      if (currentIndex === 0) {
+      // If no options, currentIndex will be -1
+      if (currentIndex <= 0) {
         return;
       }
 
@@ -1210,7 +1286,7 @@ S2.define('select2/results',[
       function (evt) {
       var $this = $(this);
 
-      var data = $this.data('data');
+      var data = Utils.GetData(this, 'data');
 
       if ($this.attr('aria-selected') === 'true') {
         if (self.options.get('multiple')) {
@@ -1233,7 +1309,7 @@ S2.define('select2/results',[
 
     this.$results.on('mouseenter', '.select2-results__option[aria-selected]',
       function (evt) {
-      var data = $(this).data('data');
+      var data = Utils.GetData(this, 'data');
 
       self.getHighlightedResults()
           .removeClass('select2-results__option--highlighted');
@@ -1348,14 +1424,15 @@ S2.define('select2/selection/base',[
 
     this._tabindex = 0;
 
-    if (this.$element.data('old-tabindex') != null) {
+    if (Utils.GetData(this.$element[0], 'old-tabindex') != null) {
-      this._tabindex = this.$element.data('old-tabindex');
+      this._tabindex = Utils.GetData(this.$element[0], 'old-tabindex');
     } else if (this.$element.attr('tabindex') != null) {
       this._tabindex = this.$element.attr('tabindex');
     }
 
     $selection.attr('title', this.$element.attr('title'));
     $selection.attr('tabindex', this._tabindex);
+    $selection.attr('aria-disabled', 'false');
 
     this.$selection = $selection;
 
@@ -1365,7 +1442,6 @@ S2.define('select2/selection/base',[
   BaseSelection.prototype.bind = function (container, $container) {
     var self = this;
 
-    var id = container.id + '-container';
     var resultsId = container.id + '-results';
 
     this.container = container;
@@ -1408,17 +1484,19 @@ S2.define('select2/selection/base',[
       self.$selection.removeAttr('aria-activedescendant');
       self.$selection.removeAttr('aria-owns');
 
-      self.$selection.focus();
+      self.$selection.trigger('focus');
 
       self._detachCloseHandler(container);
     });
 
     container.on('enable', function () {
       self.$selection.attr('tabindex', self._tabindex);
+      self.$selection.attr('aria-disabled', 'false');
     });
 
     container.on('disable', function () {
       self.$selection.attr('tabindex', '-1');
+      self.$selection.attr('aria-disabled', 'true');
     });
   };
 
@@ -1441,7 +1519,6 @@ S2.define('select2/selection/base',[
   };
 
   BaseSelection.prototype._attachCloseHandler = function (container) {
-    var self = this;
 
     $(document.body).on('mousedown.select2.' + container.id, function (e) {
       var $target = $(e.target);
@@ -1451,13 +1528,11 @@ S2.define('select2/selection/base',[
       var $all = $('.select2.select2-container--open');
 
       $all.each(function () {
-        var $this = $(this);
-
         if (this == $select[0]) {
           return;
         }
 
-        var $element = $this.data('element');
+        var $element = Utils.GetData(this, 'element');
 
         $element.select2('close');
       });
@@ -1481,6 +1556,27 @@ S2.define('select2/selection/base',[
     throw new Error('The `update` method must be defined in child classes.');
   };
 
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  BaseSelection.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  BaseSelection.prototype.isDisabled = function () {
+    return this.options.get('disabled');
+  };
+
   return BaseSelection;
 });
 
@@ -1518,7 +1614,10 @@ S2.define('select2/selection/single',[
 
     var id = container.id + '-container';
 
-    this.$selection.find('.select2-selection__rendered').attr('id', id);
+    this.$selection.find('.select2-selection__rendered')
+      .attr('id', id)
+      .attr('role', 'textbox')
+      .attr('aria-readonly', 'true');
     this.$selection.attr('aria-labelledby', id);
 
     this.$selection.on('mousedown', function (evt) {
@@ -1542,17 +1641,15 @@ S2.define('select2/selection/single',[
 
     container.on('focus', function (evt) {
       if (!container.isOpen()) {
-        self.$selection.focus();
+        self.$selection.trigger('focus');
       }
     });
-
-    container.on('selection:update', function (params) {
-      self.update(params.data);
-    });
   };
 
   SingleSelection.prototype.clear = function () {
-    this.$selection.find('.select2-selection__rendered').empty();
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    $rendered.empty();
+    $rendered.removeAttr('title'); // clear tooltip on empty
   };
 
   SingleSelection.prototype.display = function (data, container) {
@@ -1578,7 +1675,14 @@ S2.define('select2/selection/single',[
     var formatted = this.display(selection, $rendered);
 
     $rendered.empty().append(formatted);
-    $rendered.prop('title', selection.title || selection.text);
+
+    var title = selection.title || selection.text;
+
+    if (title) {
+      $rendered.attr('title', title);
+    } else {
+      $rendered.removeAttr('title');
+    }
   };
 
   return SingleSelection;
@@ -1623,14 +1727,14 @@ S2.define('select2/selection/multiple',[
       '.select2-selection__choice__remove',
       function (evt) {
         // Ignore the event if it is disabled
-        if (self.options.get('disabled')) {
+        if (self.isDisabled()) {
           return;
         }
 
         var $remove = $(this);
         var $selection = $remove.parent();
 
-        var data = $selection.data('data');
+        var data = Utils.GetData($selection[0], 'data');
 
         self.trigger('unselect', {
           originalEvent: evt,
@@ -1641,7 +1745,9 @@ S2.define('select2/selection/multiple',[
   };
 
   MultipleSelection.prototype.clear = function () {
-    this.$selection.find('.select2-selection__rendered').empty();
+    var $rendered = this.$selection.find('.select2-selection__rendered');
+    $rendered.empty();
+    $rendered.removeAttr('title');
   };
 
   MultipleSelection.prototype.display = function (data, container) {
@@ -1679,9 +1785,14 @@ S2.define('select2/selection/multiple',[
       var formatted = this.display(selection, $selection);
 
       $selection.append(formatted);
-      $selection.prop('title', selection.title || selection.text);
 
-      $selection.data('data', selection);
+      var title = selection.title || selection.text;
+
+      if (title) {
+        $selection.attr('title', title);
+      }
+
+      Utils.StoreData($selection[0], 'data', selection);
 
       $selections.push($selection);
     }
@@ -1746,8 +1857,9 @@ S2.define('select2/selection/placeholder',[
 
 S2.define('select2/selection/allowClear',[
   'jquery',
-  '../keys'
+  '../keys',
-], function ($, KEYS) {
+  '../utils'
+], function ($, KEYS, Utils) {
   function AllowClear () { }
 
   AllowClear.prototype.bind = function (decorated, container, $container) {
@@ -1776,7 +1888,7 @@ S2.define('select2/selection/allowClear',[
 
   AllowClear.prototype._handleClear = function (_, evt) {
     // Ignore the event if it is disabled
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -1789,10 +1901,22 @@ S2.define('select2/selection/allowClear',[
 
     evt.stopPropagation();
 
-    var data = $clear.data('data');
+    var data = Utils.GetData($clear[0], 'data');
+
+    var previousVal = this.$element.val();
+    this.$element.val(this.placeholder.id);
+
+    var unselectData = {
+      data: data
+    };
+    this.trigger('clear', unselectData);
+    if (unselectData.prevented) {
+      this.$element.val(previousVal);
+      return;
+    }
 
     for (var d = 0; d < data.length; d++) {
-      var unselectData = {
+      unselectData = {
         data: data[d]
       };
 
@@ -1802,11 +1926,12 @@ S2.define('select2/selection/allowClear',[
 
       // If the event was prevented, don't clear it out.
       if (unselectData.prevented) {
+        this.$element.val(previousVal);
         return;
       }
     }
 
-    this.$element.val(this.placeholder.id).trigger('change');
+    this.$element.trigger('input').trigger('change');
 
     this.trigger('toggle', {});
   };
@@ -1829,12 +1954,14 @@ S2.define('select2/selection/allowClear',[
       return;
     }
 
+    var removeAll = this.options.get('translations').get('removeAllItems');
+
     var $remove = $(
-      '<span class="select2-selection__clear">' +
+      '<span class="select2-selection__clear" title="' + removeAll() +'">' +
         '&times;' +
       '</span>'
     );
-    $remove.data('data', data);
+    Utils.StoreData($remove[0], 'data', data);
 
     this.$selection.find('.select2-selection__rendered').prepend($remove);
   };
@@ -1856,7 +1983,7 @@ S2.define('select2/selection/search',[
       '<li class="select2-search select2-search--inline">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
+        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
       '</li>'
     );
 
@@ -1873,14 +2000,18 @@ S2.define('select2/selection/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
+    var resultsId = container.id + '-results';
+
     decorated.call(this, container, $container);
 
     container.on('open', function () {
+      self.$search.attr('aria-controls', resultsId);
       self.$search.trigger('focus');
     });
 
     container.on('close', function () {
       self.$search.val('');
+      self.$search.removeAttr('aria-controls');
       self.$search.removeAttr('aria-activedescendant');
       self.$search.trigger('focus');
     });
@@ -1900,7 +2031,11 @@ S2.define('select2/selection/search',[
     });
 
     container.on('results:focus', function (params) {
-      self.$search.attr('aria-activedescendant', params.id);
+      if (params.data._resultId) {
+        self.$search.attr('aria-activedescendant', params.data._resultId);
+      } else {
+        self.$search.removeAttr('aria-activedescendant');
+      }
     });
 
     this.$selection.on('focusin', '.select2-search--inline', function (evt) {
@@ -1925,7 +2060,7 @@ S2.define('select2/selection/search',[
           .prev('.select2-selection__choice');
 
         if ($previousChoice.length > 0) {
-          var item = $previousChoice.data('data');
+          var item = Utils.GetData($previousChoice[0], 'data');
 
           self.searchRemoveChoice(item);
 
@@ -1934,6 +2069,12 @@ S2.define('select2/selection/search',[
       }
     });
 
+    this.$selection.on('click', '.select2-search--inline', function (evt) {
+      if (self.$search.val()) {
+        evt.stopPropagation();
+      }
+    });
+
     // Try to detect the IE version should the `documentMode` property that
     // is stored on the document. This is only implemented in IE and is
     // slightly cleaner than doing a user agent check.
@@ -2019,7 +2160,7 @@ S2.define('select2/selection/search',[
 
     this.resizeSearch();
     if (searchHadFocus) {
-      this.$search.focus();
+      this.$search.trigger('focus');
     }
   };
 
@@ -2052,7 +2193,7 @@ S2.define('select2/selection/search',[
     var width = '';
 
     if (this.$search.attr('placeholder') !== '') {
-      width = this.$selection.find('.select2-selection__rendered').innerWidth();
+      width = this.$selection.find('.select2-selection__rendered').width();
     } else {
       var minimumWidth = this.$search.val().length + 1;
 
@@ -2076,10 +2217,13 @@ S2.define('select2/selection/eventRelay',[
       'open', 'opening',
       'close', 'closing',
       'select', 'selecting',
-      'unselect', 'unselecting'
+      'unselect', 'unselecting',
+      'clear', 'clearing'
     ];
 
-    var preventableEvents = ['opening', 'closing', 'selecting', 'unselecting'];
+    var preventableEvents = [
+      'opening', 'closing', 'selecting', 'unselecting', 'clearing'
+    ];
 
     decorated.call(this, container, $container);
 
@@ -2412,6 +2556,7 @@ S2.define('select2/diacritics',[
     '\u019F': 'O',
     '\uA74A': 'O',
     '\uA74C': 'O',
+    '\u0152': 'OE',
     '\u01A2': 'OI',
     '\uA74E': 'OO',
     '\u0222': 'OU',
@@ -2821,6 +2966,7 @@ S2.define('select2/diacritics',[
     '\uA74B': 'o',
     '\uA74D': 'o',
     '\u0275': 'o',
+    '\u0153': 'oe',
     '\u01A3': 'oi',
     '\u0223': 'ou',
     '\uA74F': 'oo',
@@ -2989,8 +3135,9 @@ S2.define('select2/diacritics',[
     '\u03CD': '\u03C5',
     '\u03CB': '\u03C5',
     '\u03B0': '\u03C5',
-    '\u03C9': '\u03C9',
+    '\u03CE': '\u03C9',
-    '\u03C2': '\u03C3'
+    '\u03C2': '\u03C3',
+    '\u2019': '\''
   };
 
   return diacritics;
@@ -3075,7 +3222,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = true;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3096,13 +3243,13 @@ S2.define('select2/data/select',[
         }
 
         self.$element.val(val);
-        self.$element.trigger('change');
+        self.$element.trigger('input').trigger('change');
       });
     } else {
       var val = data.id;
 
       this.$element.val(val);
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
     }
   };
 
@@ -3118,7 +3265,7 @@ S2.define('select2/data/select',[
     if ($(data.element).is('option')) {
       data.element.selected = false;
 
-      this.$element.trigger('change');
+      this.$element.trigger('input').trigger('change');
 
       return;
     }
@@ -3136,7 +3283,7 @@ S2.define('select2/data/select',[
 
       self.$element.val(val);
 
-      self.$element.trigger('change');
+      self.$element.trigger('input').trigger('change');
     });
   };
 
@@ -3158,7 +3305,7 @@ S2.define('select2/data/select',[
     // Remove anything added to child elements
     this.$element.find('*').each(function () {
       // Remove any custom data set by Select2
-      $.removeData(this, 'data');
+      Utils.RemoveData(this);
     });
   };
 
@@ -3231,7 +3378,7 @@ S2.define('select2/data/select',[
     normalizedData.element = option;
 
     // Override the option's data with the combined data
-    $.data(option, 'data', normalizedData);
+    Utils.StoreData(option, 'data', normalizedData);
 
     return $option;
   };
@@ -3239,7 +3386,7 @@ S2.define('select2/data/select',[
   SelectAdapter.prototype.item = function ($option) {
     var data = {};
 
-    data = $.data($option[0], 'data');
+    data = Utils.GetData($option[0], 'data');
 
     if (data != null) {
       return data;
@@ -3277,13 +3424,13 @@ S2.define('select2/data/select',[
     data = this._normalizeItem(data);
     data.element = $option[0];
 
-    $.data($option[0], 'data', data);
+    Utils.StoreData($option[0], 'data', data);
 
     return data;
   };
 
   SelectAdapter.prototype._normalizeItem = function (item) {
-    if (!$.isPlainObject(item)) {
+    if (item !== Object(item)) {
       item = {
         id: item,
         text: item
@@ -3329,15 +3476,19 @@ S2.define('select2/data/array',[
   'jquery'
 ], function (SelectAdapter, Utils, $) {
   function ArrayAdapter ($element, options) {
-    var data = options.get('data') || [];
+    this._dataToConvert = options.get('data') || [];
 
     ArrayAdapter.__super__.constructor.call(this, $element, options);
-
-    this.addOptions(this.convertToOptions(data));
   }
 
   Utils.Extend(ArrayAdapter, SelectAdapter);
 
+  ArrayAdapter.prototype.bind = function (container, $container) {
+    ArrayAdapter.__super__.bind.call(this, container, $container);
+
+    this.addOptions(this.convertToOptions(this._dataToConvert));
+  };
+
   ArrayAdapter.prototype.select = function (data) {
     var $option = this.$element.find('option').filter(function (i, elm) {
       return elm.value == data.id.toString();
@@ -3487,7 +3638,8 @@ S2.define('select2/data/ajax',[
       }, function () {
         // Attempt to detect if a request was aborted
         // Only works if the transport exposes a status property
-        if ($request.status && $request.status === '0') {
+        if ('status' in $request &&
+            ($request.status === 0 || $request.status === '0')) {
           return;
         }
 
@@ -3626,8 +3778,6 @@ S2.define('select2/data/tags',[
   };
 
   Tags.prototype._removeOldTags = function (_) {
-    var tag = this._lastTag;
-
     var $options = this.$element.find('option[data-select2-tag]');
 
     $options.each(function () {
@@ -3702,7 +3852,7 @@ S2.define('select2/data/tokenizer',[
       // Replace the search term if we have the search box
       if (this.$search.length) {
         this.$search.val(tokenData.term);
-        this.$search.focus();
+        this.$search.trigger('focus');
       }
 
       params.term = tokenData.term;
@@ -3831,10 +3981,30 @@ S2.define('select2/data/maximumSelectionLength',[
     decorated.call(this, $e, options);
   }
 
+  MaximumSelectionLength.prototype.bind =
+    function (decorated, container, $container) {
+      var self = this;
+
+      decorated.call(this, container, $container);
+
+      container.on('select', function () {
+        self._checkIfMaximumSelected();
+      });
+  };
+
   MaximumSelectionLength.prototype.query =
     function (decorated, params, callback) {
       var self = this;
 
+      this._checkIfMaximumSelected(function () {
+        decorated.call(self, params, callback);
+      });
+  };
+
+  MaximumSelectionLength.prototype._checkIfMaximumSelected =
+    function (_, successCallback) {
+      var self = this;
+
       this.current(function (currentData) {
         var count = currentData != null ? currentData.length : 0;
         if (self.maximumSelectionLength > 0 &&
@@ -3847,7 +4017,10 @@ S2.define('select2/data/maximumSelectionLength',[
           });
           return;
         }
-        decorated.call(self, params, callback);
+
+        if (successCallback) {
+          successCallback();
+        }
       });
   };
 
@@ -3886,7 +4059,7 @@ S2.define('select2/dropdown',[
   };
 
   Dropdown.prototype.position = function ($dropdown, $container) {
-    // Should be implmented in subclasses
+    // Should be implemented in subclasses
   };
 
   Dropdown.prototype.destroy = function () {
@@ -3910,7 +4083,7 @@ S2.define('select2/dropdown/search',[
       '<span class="select2-search select2-search--dropdown">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
         ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
-        ' spellcheck="false" role="textbox" />' +
+        ' spellcheck="false" role="searchbox" aria-autocomplete="list" />' +
       '</span>'
     );
 
@@ -3925,6 +4098,8 @@ S2.define('select2/dropdown/search',[
   Search.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
+    var resultsId = container.id + '-results';
+
     decorated.call(this, container, $container);
 
     this.$search.on('keydown', function (evt) {
@@ -3947,23 +4122,27 @@ S2.define('select2/dropdown/search',[
 
     container.on('open', function () {
       self.$search.attr('tabindex', 0);
+      self.$search.attr('aria-controls', resultsId);
 
-      self.$search.focus();
+      self.$search.trigger('focus');
 
       window.setTimeout(function () {
-        self.$search.focus();
+        self.$search.trigger('focus');
       }, 0);
     });
 
     container.on('close', function () {
       self.$search.attr('tabindex', -1);
+      self.$search.removeAttr('aria-controls');
+      self.$search.removeAttr('aria-activedescendant');
 
       self.$search.val('');
+      self.$search.trigger('blur');
     });
 
     container.on('focus', function () {
       if (!container.isOpen()) {
-        self.$search.focus();
+        self.$search.trigger('focus');
       }
     });
 
@@ -3978,6 +4157,14 @@ S2.define('select2/dropdown/search',[
         }
       }
     });
+
+    container.on('results:focus', function (params) {
+      if (params.data._resultId) {
+        self.$search.attr('aria-activedescendant', params.data._resultId);
+      } else {
+        self.$search.removeAttr('aria-activedescendant');
+      }
+    });
   };
 
   Search.prototype.handleSearch = function (evt) {
@@ -4062,6 +4249,7 @@ S2.define('select2/dropdown/infiniteScroll',[
 
     if (this.showLoadingMore(data)) {
       this.$results.append(this.$loadingMore);
+      this.loadMoreIfNeeded();
     }
   };
 
@@ -4080,25 +4268,27 @@ S2.define('select2/dropdown/infiniteScroll',[
       self.loading = true;
     });
 
-    this.$results.on('scroll', function () {
+    this.$results.on('scroll', this.loadMoreIfNeeded.bind(this));
-      var isLoadMoreVisible = $.contains(
+  };
-        document.documentElement,
-        self.$loadingMore[0]
-      );
 
-      if (self.loading || !isLoadMoreVisible) {
+  InfiniteScroll.prototype.loadMoreIfNeeded = function () {
-        return;
+    var isLoadMoreVisible = $.contains(
-      }
+      document.documentElement,
+      this.$loadingMore[0]
+    );
 
-      var currentOffset = self.$results.offset().top +
+    if (this.loading || !isLoadMoreVisible) {
-        self.$results.outerHeight(false);
+      return;
-      var loadingMoreOffset = self.$loadingMore.offset().top +
+    }
-        self.$loadingMore.outerHeight(false);
 
-      if (currentOffset + 50 >= loadingMoreOffset) {
+    var currentOffset = this.$results.offset().top +
-        self.loadMore();
+      this.$results.outerHeight(false);
-      }
+    var loadingMoreOffset = this.$loadingMore.offset().top +
-    });
+      this.$loadingMore.outerHeight(false);
+
+    if (currentOffset + 50 >= loadingMoreOffset) {
+      this.loadMore();
+    }
   };
 
   InfiniteScroll.prototype.loadMore = function () {
@@ -4119,7 +4309,7 @@ S2.define('select2/dropdown/infiniteScroll',[
     var $option = $(
       '<li ' +
       'class="select2-results__option select2-results__option--load-more"' +
-      'role="treeitem" aria-disabled="true"></li>'
+      'role="option" aria-disabled="true"></li>'
     );
 
     var message = this.options.get('translations').get('loadingMore');
@@ -4137,7 +4327,7 @@ S2.define('select2/dropdown/attachBody',[
   '../utils'
 ], function ($, Utils) {
   function AttachBody (decorated, $element, options) {
-    this.$dropdownParent = options.get('dropdownParent') || $(document.body);
+    this.$dropdownParent = $(options.get('dropdownParent') || document.body);
 
     decorated.call(this, $element, options);
   }
@@ -4145,27 +4335,14 @@ S2.define('select2/dropdown/attachBody',[
   AttachBody.prototype.bind = function (decorated, container, $container) {
     var self = this;
 
-    var setupResultsEvents = false;
-
     decorated.call(this, container, $container);
 
     container.on('open', function () {
       self._showDropdown();
       self._attachPositioningHandler(container);
 
-      if (!setupResultsEvents) {
+      // Must bind after the results handlers to ensure correct sizing
-        setupResultsEvents = true;
+      self._bindContainerResultHandlers(container);
-
-        container.on('results:all', function () {
-          self._positionDropdown();
-          self._resizeDropdown();
-        });
-
-        container.on('results:append', function () {
-          self._positionDropdown();
-          self._resizeDropdown();
-        });
-      }
     });
 
     container.on('close', function () {
@@ -4214,6 +4391,44 @@ S2.define('select2/dropdown/attachBody',[
     this.$dropdownContainer.detach();
   };
 
+  AttachBody.prototype._bindContainerResultHandlers =
+      function (decorated, container) {
+
+    // These should only be bound once
+    if (this._containerResultsHandlersBound) {
+      return;
+    }
+
+    var self = this;
+
+    container.on('results:all', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('results:append', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('results:message', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('select', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    container.on('unselect', function () {
+      self._positionDropdown();
+      self._resizeDropdown();
+    });
+
+    this._containerResultsHandlersBound = true;
+  };
+
   AttachBody.prototype._attachPositioningHandler =
       function (decorated, container) {
     var self = this;
@@ -4224,14 +4439,14 @@ S2.define('select2/dropdown/attachBody',[
 
     var $watchers = this.$container.parents().filter(Utils.hasScroll);
     $watchers.each(function () {
-      $(this).data('select2-scroll-position', {
+      Utils.StoreData(this, 'select2-scroll-position', {
         x: $(this).scrollLeft(),
         y: $(this).scrollTop()
       });
     });
 
     $watchers.on(scrollEvent, function (ev) {
-      var position = $(this).data('select2-scroll-position');
+      var position = Utils.GetData(this, 'select2-scroll-position');
       $(this).scrollTop(position.y);
     });
 
@@ -4290,16 +4505,26 @@ S2.define('select2/dropdown/attachBody',[
       top: container.bottom
     };
 
-    // Determine what the parent element is to use for calciulating the offset
+    // Determine what the parent element is to use for calculating the offset
     var $offsetParent = this.$dropdownParent;
 
-    // For statically positoned elements, we need to get the element
+    // For statically positioned elements, we need to get the element
     // that is determining the offset
     if ($offsetParent.css('position') === 'static') {
       $offsetParent = $offsetParent.offsetParent();
     }
 
-    var parentOffset = $offsetParent.offset();
+    var parentOffset = {
+      top: 0,
+      left: 0
+    };
+
+    if (
+      $.contains(document.body, $offsetParent[0]) ||
+      $offsetParent[0].isConnected
+      ) {
+      parentOffset = $offsetParent.offset();
+    }
 
     css.top -= parentOffset.top;
     css.left -= parentOffset.left;
@@ -4396,8 +4621,8 @@ S2.define('select2/dropdown/minimumResultsForSearch',[
 });
 
 S2.define('select2/dropdown/selectOnClose',[
-
+  '../utils'
-], function () {
+], function (Utils) {
   function SelectOnClose () { }
 
   SelectOnClose.prototype.bind = function (decorated, container, $container) {
@@ -4428,7 +4653,7 @@ S2.define('select2/dropdown/selectOnClose',[
       return;
     }
 
-    var data = $highlightedResults.data('data');
+    var data = Utils.GetData($highlightedResults[0], 'data');
 
     // Don't re-select already selected resulte
     if (
@@ -4469,7 +4694,7 @@ S2.define('select2/dropdown/closeOnSelect',[
     var originalEvent = evt.originalEvent;
 
     // Don't close if the control key is being held
-    if (originalEvent && originalEvent.ctrlKey) {
+    if (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey)) {
       return;
     }
 
@@ -4523,6 +4748,9 @@ S2.define('select2/i18n/en',[],function () {
     },
     searching: function () {
       return 'Searching…';
+    },
+    removeAllItems: function () {
+      return 'Remove all items';
     }
   };
 });
@@ -4761,66 +4989,29 @@ S2.define('select2/defaults',[
       );
     }
 
-    if (typeof options.language === 'string') {
+    // If the defaults were not previously applied from an element, it is
-      // Check if the language is specified with a region
+    // possible for the language option to have not been resolved
-      if (options.language.indexOf('-') > 0) {
+    options.language = this._resolveLanguage(options.language);
-        // Extract the region information if it is included
-        var languageParts = options.language.split('-');
-        var baseLanguage = languageParts[0];
 
-        options.language = [options.language, baseLanguage];
+    // Always fall back to English since it will always be complete
-      } else {
+    options.language.push('en');
-        options.language = [options.language];
+
+    var uniqueLanguages = [];
+
+    for (var l = 0; l < options.language.length; l++) {
+      var language = options.language[l];
+
+      if (uniqueLanguages.indexOf(language) === -1) {
+        uniqueLanguages.push(language);
       }
     }
 
-    if ($.isArray(options.language)) {
+    options.language = uniqueLanguages;
-      var languages = new Translation();
-      options.language.push('en');
 
-      var languageNames = options.language;
+    options.translations = this._processTranslations(
-
+      options.language,
-      for (var l = 0; l < languageNames.length; l++) {
+      options.debug
-        var name = languageNames[l];
+    );
-        var language = {};
-
-        try {
-          // Try to load it with the original name
-          language = Translation.loadPath(name);
-        } catch (e) {
-          try {
-            // If we couldn't load it, check if it wasn't the full path
-            name = this.defaults.amdLanguageBase + name;
-            language = Translation.loadPath(name);
-          } catch (ex) {
-            // The translation could not be loaded at all. Sometimes this is
-            // because of a configuration problem, other times this can be
-            // because of how Select2 helps load all possible translation files.
-            if (options.debug && window.console && console.warn) {
-              console.warn(
-                'Select2: The language file for "' + name + '" could not be ' +
-                'automatically loaded. A fallback will be used instead.'
-              );
-            }
-
-            continue;
-          }
-        }
-
-        languages.extend(language);
-      }
-
-      options.translations = languages;
-    } else {
-      var baseTranslation = Translation.loadPath(
-        this.defaults.amdLanguageBase + 'en'
-      );
-      var customTranslation = new Translation(options.language);
-
-      customTranslation.extend(baseTranslation);
-
-      options.translations = customTranslation;
-    }
 
     return options;
   };
@@ -4887,13 +5078,14 @@ S2.define('select2/defaults',[
       debug: false,
       dropdownAutoWidth: false,
       escapeMarkup: Utils.escapeMarkup,
-      language: EnglishTranslation,
+      language: {},
       matcher: matcher,
       minimumInputLength: 0,
       maximumInputLength: 0,
       maximumSelectionLength: 0,
       minimumResultsForSearch: 0,
       selectOnClose: false,
+      scrollAfterSelect: false,
       sorter: function (data) {
         return data;
       },
@@ -4908,6 +5100,103 @@ S2.define('select2/defaults',[
     };
   };
 
+  Defaults.prototype.applyFromElement = function (options, $element) {
+    var optionLanguage = options.language;
+    var defaultLanguage = this.defaults.language;
+    var elementLanguage = $element.prop('lang');
+    var parentLanguage = $element.closest('[lang]').prop('lang');
+
+    var languages = Array.prototype.concat.call(
+      this._resolveLanguage(elementLanguage),
+      this._resolveLanguage(optionLanguage),
+      this._resolveLanguage(defaultLanguage),
+      this._resolveLanguage(parentLanguage)
+    );
+
+    options.language = languages;
+
+    return options;
+  };
+
+  Defaults.prototype._resolveLanguage = function (language) {
+    if (!language) {
+      return [];
+    }
+
+    if ($.isEmptyObject(language)) {
+      return [];
+    }
+
+    if ($.isPlainObject(language)) {
+      return [language];
+    }
+
+    var languages;
+
+    if (!$.isArray(language)) {
+      languages = [language];
+    } else {
+      languages = language;
+    }
+
+    var resolvedLanguages = [];
+
+    for (var l = 0; l < languages.length; l++) {
+      resolvedLanguages.push(languages[l]);
+
+      if (typeof languages[l] === 'string' && languages[l].indexOf('-') > 0) {
+        // Extract the region information if it is included
+        var languageParts = languages[l].split('-');
+        var baseLanguage = languageParts[0];
+
+        resolvedLanguages.push(baseLanguage);
+      }
+    }
+
+    return resolvedLanguages;
+  };
+
+  Defaults.prototype._processTranslations = function (languages, debug) {
+    var translations = new Translation();
+
+    for (var l = 0; l < languages.length; l++) {
+      var languageData = new Translation();
+
+      var language = languages[l];
+
+      if (typeof language === 'string') {
+        try {
+          // Try to load it with the original name
+          languageData = Translation.loadPath(language);
+        } catch (e) {
+          try {
+            // If we couldn't load it, check if it wasn't the full path
+            language = this.defaults.amdLanguageBase + language;
+            languageData = Translation.loadPath(language);
+          } catch (ex) {
+            // The translation could not be loaded at all. Sometimes this is
+            // because of a configuration problem, other times this can be
+            // because of how Select2 helps load all possible translation files
+            if (debug && window.console && console.warn) {
+              console.warn(
+                'Select2: The language file for "' + language + '" could ' +
+                'not be automatically loaded. A fallback will be used instead.'
+              );
+            }
+          }
+        }
+      } else if ($.isPlainObject(language)) {
+        languageData = new Translation(language);
+      } else {
+        languageData = language;
+      }
+
+      translations.extend(languageData);
+    }
+
+    return translations;
+  };
+
   Defaults.prototype.set = function (key, value) {
     var camelKey = $.camelCase(key);
 
@@ -4916,7 +5205,7 @@ S2.define('select2/defaults',[
 
     var convertedData = Utils._convertData(data);
 
-    $.extend(this.defaults, convertedData);
+    $.extend(true, this.defaults, convertedData);
   };
 
   var defaults = new Defaults();
@@ -4937,6 +5226,10 @@ S2.define('select2/options',[
       this.fromElement($element);
     }
 
+    if ($element != null) {
+      this.options = Defaults.applyFromElement(this.options, $element);
+    }
+
     this.options = Defaults.apply(this.options);
 
     if ($element && $element.is('input')) {
@@ -4960,14 +5253,6 @@ S2.define('select2/options',[
       this.options.disabled = $e.prop('disabled');
     }
 
-    if (this.options.language == null) {
-      if ($e.prop('lang')) {
-        this.options.language = $e.prop('lang').toLowerCase();
-      } else if ($e.closest('[lang]').prop('lang')) {
-        this.options.language = $e.closest('[lang]').prop('lang');
-      }
-    }
-
     if (this.options.dir == null) {
       if ($e.prop('dir')) {
         this.options.dir = $e.prop('dir');
@@ -4981,7 +5266,7 @@ S2.define('select2/options',[
     $e.prop('disabled', this.options.disabled);
     $e.prop('multiple', this.options.multiple);
 
-    if ($e.data('select2Tags')) {
+    if (Utils.GetData($e[0], 'select2Tags')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-select2-tags` attribute has been changed to ' +
@@ -4990,11 +5275,11 @@ S2.define('select2/options',[
         );
       }
 
-      $e.data('data', $e.data('select2Tags'));
+      Utils.StoreData($e[0], 'data', Utils.GetData($e[0], 'select2Tags'));
-      $e.data('tags', true);
+      Utils.StoreData($e[0], 'tags', true);
     }
 
-    if ($e.data('ajaxUrl')) {
+    if (Utils.GetData($e[0], 'ajaxUrl')) {
       if (this.options.debug && window.console && console.warn) {
         console.warn(
           'Select2: The `data-ajax-url` attribute has been changed to ' +
@@ -5003,21 +5288,45 @@ S2.define('select2/options',[
         );
       }
 
-      $e.attr('ajax--url', $e.data('ajaxUrl'));
+      $e.attr('ajax--url', Utils.GetData($e[0], 'ajaxUrl'));
-      $e.data('ajax--url', $e.data('ajaxUrl'));
+      Utils.StoreData($e[0], 'ajax-Url', Utils.GetData($e[0], 'ajaxUrl'));
     }
 
     var dataset = {};
 
+    function upperCaseLetter(_, letter) {
+      return letter.toUpperCase();
+    }
+
+    // Pre-load all of the attributes which are prefixed with `data-`
+    for (var attr = 0; attr < $e[0].attributes.length; attr++) {
+      var attributeName = $e[0].attributes[attr].name;
+      var prefix = 'data-';
+
+      if (attributeName.substr(0, prefix.length) == prefix) {
+        // Get the contents of the attribute after `data-`
+        var dataName = attributeName.substring(prefix.length);
+
+        // Get the data contents from the consistent source
+        // This is more than likely the jQuery data helper
+        var dataValue = Utils.GetData($e[0], dataName);
+
+        // camelCase the attribute name to match the spec
+        var camelDataName = dataName.replace(/-([a-z])/g, upperCaseLetter);
+
+        // Store the data attribute contents into the dataset since
+        dataset[camelDataName] = dataValue;
+      }
+    }
+
     // Prefer the element's `dataset` attribute if it exists
     // jQuery 1.x does not correctly handle data attributes with multiple dashes
     if ($.fn.jquery && $.fn.jquery.substr(0, 2) == '1.' && $e[0].dataset) {
-      dataset = $.extend(true, {}, $e[0].dataset, $e.data());
+      dataset = $.extend(true, {}, $e[0].dataset, dataset);
-    } else {
-      dataset = $e.data();
     }
 
-    var data = $.extend(true, {}, dataset);
+    // Prefer our internal data cache if it exists
+    var data = $.extend(true, {}, Utils.GetData($e[0]), dataset);
 
     data = Utils._convertData(data);
 
@@ -5054,8 +5363,8 @@ S2.define('select2/core',[
   './keys'
 ], function ($, Options, Utils, KEYS) {
   var Select2 = function ($element, options) {
-    if ($element.data('select2') != null) {
+    if (Utils.GetData($element[0], 'select2') != null) {
-      $element.data('select2').destroy();
+      Utils.GetData($element[0], 'select2').destroy();
     }
 
     this.$element = $element;
@@ -5071,7 +5380,7 @@ S2.define('select2/core',[
     // Set up the tabindex
 
     var tabindex = $element.attr('tabindex') || 0;
-    $element.data('old-tabindex', tabindex);
+    Utils.StoreData($element[0], 'old-tabindex', tabindex);
     $element.attr('tabindex', '-1');
 
     // Set up containers and adapters
@@ -5132,6 +5441,9 @@ S2.define('select2/core',[
     // Synchronize any monitored attributes
     this._syncAttributes();
 
+    Utils.StoreData($element[0], 'select2', this);
+
+    // Ensure backwards compatibility with $element.data('select2').
     $element.data('select2', this);
   };
 
@@ -5208,6 +5520,12 @@ S2.define('select2/core',[
       return null;
     }
 
+    if (method == 'computedstyle') {
+      var computedStyle = window.getComputedStyle($element[0]);
+
+      return computedStyle.width;
+    }
+
     return method;
   };
 
@@ -5248,8 +5566,8 @@ S2.define('select2/core',[
 
     if (observer != null) {
       this._observer = new observer(function (mutations) {
-        $.each(mutations, self._syncA);
+        self._syncA();
-        $.each(mutations, self._syncS);
+        self._syncS(null, mutations);
       });
       this._observer.observe(this.$element[0], {
         attributes: true,
@@ -5371,7 +5689,7 @@ S2.define('select2/core',[
       if (self.isOpen()) {
         if (key === KEYS.ESC || key === KEYS.TAB ||
             (key === KEYS.UP && evt.altKey)) {
-          self.close();
+          self.close(evt);
 
           evt.preventDefault();
         } else if (key === KEYS.ENTER) {
@@ -5405,7 +5723,7 @@ S2.define('select2/core',[
   Select2.prototype._syncAttributes = function () {
     this.options.set('disabled', this.$element.prop('disabled'));
 
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       if (this.isOpen()) {
         this.close();
       }
@@ -5416,7 +5734,7 @@ S2.define('select2/core',[
     }
   };
 
-  Select2.prototype._syncSubtree = function (evt, mutations) {
+  Select2.prototype._isChangeMutation = function (evt, mutations) {
     var changed = false;
     var self = this;
 
@@ -5444,7 +5762,22 @@ S2.define('select2/core',[
       }
     } else if (mutations.removedNodes && mutations.removedNodes.length > 0) {
       changed = true;
+    } else if ($.isArray(mutations)) {
+      $.each(mutations, function(evt, mutation) {
+        if (self._isChangeMutation(evt, mutation)) {
+          // We've found a change mutation.
+          // Let's escape from the loop and continue
+          changed = true;
+          return false;
+        }
+      });
     }
+    return changed;
+  };
+
+  Select2.prototype._syncSubtree = function (evt, mutations) {
+    var changed = this._isChangeMutation(evt, mutations);
+    var self = this;
 
     // Only re-pull the data if we think there is a change
     if (changed) {
@@ -5466,7 +5799,8 @@ S2.define('select2/core',[
       'open': 'opening',
       'close': 'closing',
       'select': 'selecting',
-      'unselect': 'unselecting'
+      'unselect': 'unselecting',
+      'clear': 'clearing'
     };
 
     if (args === undefined) {
@@ -5494,7 +5828,7 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.toggleDropdown = function () {
-    if (this.options.get('disabled')) {
+    if (this.isDisabled()) {
       return;
     }
 
@@ -5510,15 +5844,40 @@ S2.define('select2/core',[
       return;
     }
 
+    if (this.isDisabled()) {
+      return;
+    }
+
     this.trigger('query', {});
   };
 
-  Select2.prototype.close = function () {
+  Select2.prototype.close = function (evt) {
     if (!this.isOpen()) {
       return;
     }
 
-    this.trigger('close', {});
+    this.trigger('close', { originalEvent : evt });
+  };
+
+  /**
+   * Helper method to abstract the "enabled" (not "disabled") state of this
+   * object.
+   *
+   * @return {true} if the instance is not disabled.
+   * @return {false} if the instance is disabled.
+   */
+  Select2.prototype.isEnabled = function () {
+    return !this.isDisabled();
+  };
+
+  /**
+   * Helper method to abstract the "disabled" state of this object.
+   *
+   * @return {true} if the disabled option is true.
+   * @return {false} if the disabled option is false.
+   */
+  Select2.prototype.isDisabled = function () {
+    return this.options.get('disabled');
   };
 
   Select2.prototype.isOpen = function () {
@@ -5595,7 +5954,7 @@ S2.define('select2/core',[
       });
     }
 
-    this.$element.val(newVal).trigger('change');
+    this.$element.val(newVal).trigger('input').trigger('change');
   };
 
   Select2.prototype.destroy = function () {
@@ -5621,10 +5980,12 @@ S2.define('select2/core',[
     this._syncS = null;
 
     this.$element.off('.select2');
-    this.$element.attr('tabindex', this.$element.data('old-tabindex'));
+    this.$element.attr('tabindex',
+    Utils.GetData(this.$element[0], 'old-tabindex'));
 
     this.$element.removeClass('select2-hidden-accessible');
     this.$element.attr('aria-hidden', 'false');
+    Utils.RemoveData(this.$element[0]);
     this.$element.removeData('select2');
 
     this.dataAdapter.destroy();
@@ -5652,7 +6013,7 @@ S2.define('select2/core',[
 
     this.$container.addClass('select2-container--' + this.options.get('theme'));
 
-    $container.data('element', this.$element);
+    Utils.StoreData($container[0], 'element', this.$element);
 
     return $container;
   };
@@ -5672,8 +6033,9 @@ S2.define('jquery.select2',[
   'jquery-mousewheel',
 
   './select2/core',
-  './select2/defaults'
+  './select2/defaults',
-], function ($, _, Select2, Defaults) {
+  './select2/utils'
+], function ($, _, Select2, Defaults, Utils) {
   if ($.fn.select2 == null) {
     // All methods that should return the element
     var thisMethods = ['open', 'close', 'destroy'];
@@ -5694,7 +6056,7 @@ S2.define('jquery.select2',[
         var args = Array.prototype.slice.call(arguments, 1);
 
         this.each(function () {
-          var instance = $(this).data('select2');
+          var instance = Utils.GetData(this, 'select2');
 
           if (instance == null && window.console && console.error) {
             console.error(

f_config/config.php

@@ -117,7 +117,7 @@ function logError(string $err, string $errstr, string $errpath, array $trace)
     ]);
 }
 
-function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, int $errline, array $errcontext)
+function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, int $errline, array $errcontext=null)
 {
     if (!(error_reporting() & $errno)) {
         // This error code is not included in error_reporting, so let it fall
@@ -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

@@ -11,12 +11,9 @@ require(__DIR__.'/../vendor/autoload.php');
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>설치</title>
-    <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+    <?=WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+    <?=WebUtil::printJS('../dist_js/vendors.js') ?>
-    <?=WebUtil::printJS('../e_lib/jquery.validate.min.js')?>
+    <?=WebUtil::printJS('../dist_js/install.js')?>
-    <?=WebUtil::printJS('../e_lib/sha512.min.js')?>
-    <?=WebUtil::printJS('../js/common.js')?>
-    <?=WebUtil::printJS('../js/install.js')?>
     <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
     <?=WebUtil::printCSS('../css/install.css')?>
 </head>

f_install/j_setup_db.php

@@ -204,7 +204,15 @@ $result = Util::generateFileUsingSimpleTemplate(
         'sharedIconPath' => $sharedIconPath,
         'gameImagePath' => $gameImagePath,
         'imageRequestPath' => $imageRequestPath,
-        'imageRequestKey' => $imageRequestKey
+        'imageRequestKey' => $imageRequestKey,
+        'serverList' => [
+            ['che', '체', 'white'],
+            ['kwe', '퀘', 'yellow'],
+            ['pwe', '풰', 'orange'],
+            ['twe', '퉤', 'magenta'],
+            ['nya', '냐', '#e67e22'],
+            ['pya', '퍄', '#9b59b6']
+        ]
     ],
     true
 );

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/KakaoKey.orig.php

@@ -1,6 +1,7 @@
 <?php
 namespace kakao;
 
+// @suppress PhanRedefineClass
 class KakaoKey{
     const REST_KEY = '_tK_REST_API_KEY_';
     const ADMIN_KEY = '_tK_ADMIN_KEY_';

f_install/templates/RootDB.orig.php

@@ -2,9 +2,15 @@
 
 namespace sammo;
 
+//https://hub.packtpub.com/eloquent-without-laravel/
+use Illuminate\Database\Capsule\Manager as Capsule;
+use Illuminate\Events\Dispatcher;
+use Illuminate\Container\Container;
+
 class RootDB
 {
     private static $uDB = null;
+    private static ?Capsule $uIlluminate = null;
 
     private static $host = '_tK_host_';
     private static $user = '_tK_user_';
@@ -12,6 +18,8 @@ class RootDB
     private static $dbName = '_tK_dbName_';
     private static $port = _tK_port_;
     private static $encoding = 'utf8mb4';
+    private static $collation = 'utf8mb4_general_ci';
+
 
     private static $globalSalt = '_tK_globalSalt_';
 
@@ -19,6 +27,29 @@ class RootDB
     {
     }
 
+    public static function illuminate(): Capsule
+    {
+        if(self::$uIlluminate !== null){
+            return self::$uIlluminate;
+        }
+        $capsule = new Capsule;
+
+        $capsule->addConnection([
+            'driver'   => 'mysql',
+            'host'     => self::$host,
+            'database' => self::$dbName,
+            'username' => self::$user,
+            'password' => self::$password,
+            'charset'   => self::$encoding,
+            'collation' => self::$collation,
+        ], 'root');
+
+        $capsule->setEventDispatcher(new Dispatcher(new Container));
+        $capsule->bootEloquent();
+        self::$uIlluminate = $capsule;
+        return $capsule;
+    }
+
     /**
      * DB 객체 생성
      *

f_install/templates/ServConfig.orig.php

@@ -13,6 +13,7 @@ class ServConfig
     public static $gameImagePath = "_tK_gameImagePath_";
     public static $imageRequestPath = "_tK_imageRequestPath_";
     public static $imageRequestKey = '_tK_imageRequestKey_';
+    private static $serverList = null;
 
     public static function getSharedIconPath(string $filepath = ''): string
     {
@@ -42,6 +43,24 @@ class ServConfig
         return static::$imageRequestPath . "?req={$req_hash}&time={$now}";
     }
 
+    /**
+     * 서버 설정 반환
+     *
+     * @return \sammo\Setting[]
+     */
+    public static function getServerList(): array{
+        $servKeyList = [/*_tK_serverList_*/];
+        $servKeyList[] = ['hwe', '훼', 'red'];
+
+        if (self::$serverList === null) {
+            self::$serverList = [];
+            foreach($servKeyList as [$servKey, $servNick, $servColor]){
+                self::$serverList[$servKey] = new Setting(ROOT.'/'.$servKey, $servNick, $servColor);
+            }
+        }
+        return self::$serverList;
+    }
+
 
     /**
      * 서버 주소 반환. 서버의 경로가 하부 디렉토리인 경우에 하부 디렉토리까지 포함

f_install/templates/common.orig.css

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

hwe/_admin1.php

@@ -38,7 +38,7 @@ $admin = getAdmin();
     </tr>
     <tr>
         <td width=110 align=right>시작시간변경</td>
-        <td width=285><input type=text size=20 maxlength=20 style=color:white;background-color:black;text-align:right; name=starttime value='<?=$admin['starttime']?>'><input type=submit name=btn value=변경1></td>
+        <td width=285><input type=text size=20 maxlength=20 style=color:white;background-color:black;text-align:right; name=starttime value='<?=substr($admin['starttime'], 0, 19)?>'><input type=submit name=btn value=변경1></td>
         <td width=110 align=right>현재도시훈사</td>
         <td width=285><?=$admin['city_rate']?></td>
     </tr>

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/_admin5.php

@@ -99,7 +99,7 @@ $sel2[$type2] = "selected";
     </table>
 
     <table align=center width=1600 class="tb_layout bg0">
-        <tr id=bg1>
+        <tr class='bg1'>
             <td align=center>국명</td>
             <td align=center>접률</td>
             <td align=center>단접</td>
@@ -278,7 +278,7 @@ from city where nation=%i', $nation['nation']);
     </table>
 
     <table align=center width=1760 class="tb_layout bg0">
-        <tr id=bg1>
+        <tr class='bg1'>
             <td width=30 align=center>년</td>
             <td width=30 align=center>월</td>
             <td width=50 align=center>국가수</td>

hwe/_admin7.php

@@ -117,10 +117,10 @@ $generalObj = General::createGeneralObjFromDB($gen);
     </table>
     <table width=1000 align=center class='tb_layout bg0'>
         <tr>
-            <td width=50% align=center id=bg1>
+            <td width=50% align=center class='bg1'>
                 <font color=skyblue size=3>장 수 정 보</font>
             </td>
-            <td width=50% align=center id=bg1>
+            <td width=50% align=center class='bg1'>
                 <font color=orange size=3>-</font>
             </td>
         </tr>
@@ -133,10 +133,10 @@ $generalObj = General::createGeneralObjFromDB($gen);
             </td>
         </tr>
         <tr>
-            <td align=center id=bg1>
+            <td align=center class='bg1'>
                 <font color=skyblue size=3>개인 기록</font>
             </td>
-            <td align=center id=bg1>
+            <td align=center class='bg1'>
                 <font color=orange size=3>전투 기록</font>
             </td>
         </tr>
@@ -149,10 +149,10 @@ $generalObj = General::createGeneralObjFromDB($gen);
             </td>
         </tr>
         <tr>
-            <td align=center id=bg1>
+            <td align=center class='bg1'>
                 <font color=skyblue size=3>장수 열전</font>
             </td>
-            <td align=center id=bg1>
+            <td align=center class='bg1'>
                 <font color=orange size=3>전투 결과</font>
             </td>
         </tr>

hwe/_admin8.php

@@ -49,10 +49,10 @@ $sel[$type] = "selected";
 <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 id=bg1>국 가 명</td>
+        <td width=130 align=center class='bg1'>국 가 명</td>
-        <td width=130 align=center id=bg1>국 가 명</td>
+        <td width=130 align=center class='bg1'>국 가 명</td>
-        <td width=80  align=center id=bg1>상 태</td>
+        <td width=80  align=center class='bg1'>상 태</td>
-        <td width=60  align=center id=bg1>기 간</td>
+        <td width=60  align=center class='bg1'>기 간</td>
     </tr>
 <?php
 

hwe/_admin_force_rehall.php

@@ -24,3 +24,7 @@ foreach ($db->queryFirstColumn(
 ) as $generalNo) {
     CheckHall($generalNo);
 }
+
+foreach(General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
+    $genObj->mergeTotalInheritancePoint();
+}

hwe/a_bestGeneral.php

@@ -29,10 +29,9 @@ $templates = new \League\Plates\Engine(__DIR__.'/templates');
 <?=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('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printJS('js/common.js')?>
 </head>
 
 <body>
@@ -91,6 +90,7 @@ $types = [
         }
         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){
@@ -101,6 +101,16 @@ $types = [
         }
         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; }],
@@ -326,4 +336,3 @@ foreach(GameConst::$allItems as $itemType=>$itemList){
 </table>
 </body>
 </html>
-

hwe/a_emperior.php

@@ -16,9 +16,9 @@ increaseRefresh("왕조일람", 1);
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 왕조일람</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/common.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')?>
@@ -84,33 +84,33 @@ foreach($emperiors as $emperior){
         </td>
     </tr>
     <tr>
-        <td id=bg1 align=center width=80>국 력</td>
+        <td class='bg1' align=center width=80>국 력</td>
         <td align=center width=170><?=$emperior['power']?></td>
-        <td id=bg1 align=center width=80>장 수</td>
+        <td class='bg1' align=center width=80>장 수</td>
         <td align=center width=170><?=$emperior['gennum']?></td>
-        <td id=bg1 align=center width=80>속 령</td>
+        <td class='bg1' align=center width=80>속 령</td>
         <td align=center width=170><?=$emperior['citynum']?></td>
-        <td id=bg1 align=center width=80>성 향</td>
+        <td class='bg1' align=center width=80>성 향</td>
         <td align=center width=170><?=$emperior['type']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>황 제</td>
+        <td class='bg1' align=center>황 제</td>
         <td align=center><?=$emperior['l12name']?></td>
-        <td id=bg1 align=center>승 상</td>
+        <td class='bg1' align=center>승 상</td>
         <td align=center><?=$emperior['l11name']?></td>
-        <td id=bg1 align=center>표 기 장 군</td>
+        <td class='bg1' align=center>표 기 장 군</td>
         <td align=center><?=$emperior['l10name']?></td>
-        <td id=bg1 align=center>사 공</td>
+        <td class='bg1' align=center>사 공</td>
         <td align=center><?=$emperior['l9name']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>거 기 장 군</td>
+        <td class='bg1' align=center>거 기 장 군</td>
         <td align=center><?=$emperior['l8name']?></td>
-        <td id=bg1 align=center>태 위</td>
+        <td class='bg1' align=center>태 위</td>
         <td align=center><?=$emperior['l7name']?></td>
-       <td id=bg1 align=center>위 장 군</td>
+       <td class='bg1' align=center>위 장 군</td>
         <td align=center><?=$emperior['l6name']?></td>
-        <td id=bg1 align=center>사 도</td>
+        <td class='bg1' align=center>사 도</td>
         <td align=center><?=$emperior['l5name']?></td>
     </tr>
 </table>

hwe/a_emperior_detail.php

@@ -26,9 +26,6 @@ $serverID = $emperior['server_id']??($emperior['serverID']??null);
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 왕조일람</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
@@ -57,25 +54,25 @@ if($emperior):
         </td>
     </tr>
     <tr>
-        <td id=bg1 width=98 align=center>국 가 수<br>(최종 / 최대)</td>
+        <td class='bg1' width=98 align=center>국 가 수<br>(최종 / 최대)</td>
         <td align=center width=398 colspan=2><?=$emperior['nation_count']?></td>
-        <td id=bg1 width=98 align=center>장 수 수<br>(최종 / 최대)</td>
+        <td class='bg1' width=98 align=center>장 수 수<br>(최종 / 최대)</td>
         <td align=center width=398 colspan=2><?=$emperior['gen_count']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>등 장 국 가</td>
+        <td class='bg1' align=center>등 장 국 가</td>
         <td colspan=5><?=$emperior['nation_name']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>국가별 성향</td>
+        <td class='bg1' align=center>국가별 성향</td>
         <td colspan=5><?=$emperior['nation_hist']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>장 수 성 격</td>
+        <td class='bg1' align=center>장 수 성 격</td>
         <td colspan=5><?=$emperior['personal_hist']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>장 수 특 기</td>
+        <td class='bg1' align=center>장 수 특 기</td>
         <td colspan=5><?=$emperior['special_hist']?></td>
     </tr>
     <tr>
@@ -84,75 +81,75 @@ if($emperior):
         </td>
     </tr>
     <tr>
-        <td id=bg1 width=98 align=center>국 력</td>
+        <td class='bg1' width=98 align=center>국 력</td>
         <td align=center width=398 colspan=2><?=$emperior['power']?></td>
-        <td id=bg1 width=98 align=center>성 향</td>
+        <td class='bg1' width=98 align=center>성 향</td>
         <td align=center width=398 colspan=2><?=$emperior['type']?></td>
     </tr>
     <tr>
-        <td id=bg1 width=98 align=center>장 수</td>
+        <td class='bg1' width=98 align=center>장 수</td>
         <td align=center width=398 colspan=2><?=$emperior['gennum']?></td>
-        <td id=bg1 width=98 align=center>속 령</td>
+        <td class='bg1' width=98 align=center>속 령</td>
         <td align=center width=398 colspan=2><?=$emperior['citynum']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>총 인 구</td>
+        <td class='bg1' align=center>총 인 구</td>
         <td align=center colspan=2><?=$emperior['pop']?></td>
-        <td id=bg1 align=center>인 구 율</td>
+        <td class='bg1' align=center>인 구 율</td>
         <td align=center colspan=2><?=$emperior['poprate']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>국 고</td>
+        <td class='bg1' align=center>국 고</td>
         <td align=center colspan=2><?=$emperior['gold']?></td>
-        <td id=bg1 align=center>병 량</td>
+        <td class='bg1' align=center>병 량</td>
         <td align=center colspan=2><?=$emperior['rice']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>황 제</td>
+        <td class='bg1' align=center>황 제</td>
         <td width=64>&nbsp;</td>
         <td width=332><?=$emperior['l12name']?></td>
-        <td id=bg1 align=center>승 상</td>
+        <td class='bg1' align=center>승 상</td>
         <td width=64>&nbsp;</td>
         <td width=332><?=$emperior['l11name']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>위 장 군</td>
+        <td class='bg1' align=center>위 장 군</td>
         <td width=64>&nbsp;</td>
         <td width=332><?=$emperior['l10name']?></td>
-        <td id=bg1 align=center>사 공</td>
+        <td class='bg1' align=center>사 공</td>
         <td width=64>&nbsp;</td>
         <td width=332><?=$emperior['l9name']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>표 기 장 군</td>
+        <td class='bg1' align=center>표 기 장 군</td>
         <td width=64>&nbsp;</td>
         <td width=332><?=$emperior['l8name']?></td>
-        <td id=bg1 align=center>태 위</td>
+        <td class='bg1' align=center>태 위</td>
         <td width=64>&nbsp;</td>
         <td width=332><?=$emperior['l7name']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>거 기 장 군</td>
+        <td class='bg1' align=center>거 기 장 군</td>
         <td width=64>&nbsp;</td>
         <td width=332><?=$emperior['l6name']?></td>
-        <td id=bg1 align=center>사 도</td>
+        <td class='bg1' align=center>사 도</td>
         <td width=64>&nbsp;</td>
         <td width=332><?=$emperior['l5name']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>오 호 장 군</td>
+        <td class='bg1' align=center>오 호 장 군</td>
         <td colspan=5><?=$emperior['tiger']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>건 안 칠 자</td>
+        <td class='bg1' align=center>건 안 칠 자</td>
         <td colspan=5><?=$emperior['eagle']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>장 수 들<br>(공헌도 순서)</td>
+        <td class='bg1' align=center>장 수 들<br>(공헌도 순서)</td>
         <td colspan=5><?=$emperior['gen']?></td>
     </tr>
     <tr>
-        <td id=bg1 align=center>역 사 기 록</td>
+        <td class='bg1' align=center>역 사 기 록</td>
         <td colspan=5><?=formatHistoryToHTML(Json::decode($emperior['history']))?></td>
     </tr>
 </table>

hwe/a_genList.php

@@ -46,10 +46,9 @@ if($gameStor->isunited){
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
+<?=WebUtil::printJS('dist_js/common.js')?>
 
 </head>
 
@@ -110,21 +109,21 @@ $generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special
 echo"
 <table align=center width=1000 class='tb_layout bg0'>
     <tr>
-        <td width=64  align=center id=bg1>얼 굴</td>
+        <td width=64  align=center class='bg1'>얼 굴</td>
-        <td width=140 align=center id=bg1>이 름</td>
+        <td width=140 align=center class='bg1'>이 름</td>
-        <td width=45 align=center id=bg1>연령</td>
+        <td width=45 align=center class='bg1'>연령</td>
-        <td width=45 align=center id=bg1>성격</td>
+        <td width=45 align=center class='bg1'>성격</td>
-        <td width=80 align=center id=bg1>특기</td>
+        <td width=80 align=center class='bg1'>특기</td>
-        <td width=45 align=center id=bg1>레 벨</td>
+        <td width=45 align=center class='bg1'>레 벨</td>
-        <td width=140 align=center id=bg1>국 가</td>
+        <td width=140 align=center class='bg1'>국 가</td>
-        <td width=55 align=center id=bg1>명 성</td>
+        <td width=55 align=center class='bg1'>명 성</td>
-        <td width=55 align=center id=bg1>계 급</td>
+        <td width=55 align=center class='bg1'>계 급</td>
-        <td width=75 align=center id=bg1>관 직</td>
+        <td width=75 align=center class='bg1'>관 직</td>
-        <td width=45 align=center id=bg1>통솔</td>
+        <td width=45 align=center class='bg1'>통솔</td>
-        <td width=45 align=center id=bg1>무력</td>
+        <td width=45 align=center class='bg1'>무력</td>
-        <td width=45 align=center id=bg1>지력</td>
+        <td width=45 align=center class='bg1'>지력</td>
-        <td width=45 align=center id=bg1>삭턴</td>
+        <td width=45 align=center class='bg1'>삭턴</td>
-        <td width=70 align=center id=bg1>벌점</td>
+        <td width=70 align=center class='bg1'>벌점</td>
     </tr>";
 foreach($generalList as $general){
     $nation = $nationname[$general['nation']];

hwe/a_hallOfFame.php

@@ -28,7 +28,7 @@ $scenarioList = (function(){
 
 
 
-if($scenarioIdx !== null || key_exists($scenarioIdx, $scenarioList)){
+if($scenarioIdx && key_exists($scenarioIdx, $scenarioList[$seasonIdx]??[])){
     $searchScenarioName = $scenarioList[$seasonIdx][$scenarioIdx]['name'];
     $searchFilter = $db->sqleval('season = %i AND scenario = %i', $seasonIdx, $scenarioIdx);
 }
@@ -50,12 +50,9 @@ else{
 <?=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('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
+<?=WebUtil::printJs('dist_js/hallOfFame.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJs('js/hallOfFame.js')?>
 </head>
 
 <body>
@@ -90,8 +87,11 @@ $types = [
     'warnum'=>['전 투 횟 수', 'int'],
     'killnum'=>['승 리', 'int'],
     'winrate'=>['승 률', 'percent'],
+    'occupied'=>['점 령', 'int'],
     'killcrew'=>['사 살', 'int'],
     'killrate'=>['살 상 률', 'percent'],
+    'killcrew_person'=>['대 인 사 살', 'int'],
+    'killrate_person'=>['대 인 살 상 률', 'percent'],
     'dex1'=>['보 병 숙 련 도', 'int'],
     'dex2'=>['궁 병 숙 련 도', 'int'],
     'dex3'=>['기 병 숙 련 도', 'int'],
@@ -172,4 +172,3 @@ foreach($types as $typeName=>[$typeDescribe, $typeValue]) {
 </table>
 </body>
 </html>
-

hwe/a_history.php

@@ -99,13 +99,10 @@ $nations = Json::decode($history['nations']);
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 연감</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
 <?=WebUtil::printJS("js/map/theme_{$mapTheme}.js")?>
-<?=WebUtil::printJS('js/map.js')?>
+<?=WebUtil::printJS('dist_js/history.js')?>
-<?=WebUtil::printJS('js/history.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
@@ -139,7 +136,7 @@ var nations = <?=$nations?$history['nations']:'{}'?>;
     </td></tr>
 </table>
 <table align=center width=1000 height=520 class='tb_layout bg0'>
-    <thead><tr><th colspan=5 align=center id=bg1>중 원 지 도</th></tr></thead>
+    <thead><tr><th colspan=5 align=center class='bg1'>중 원 지 도</th></tr></thead>
     <tbody>
     <tr height=520>
         <td width=698>
@@ -169,13 +166,13 @@ var nations = <?=$nations?$history['nations']:'{}'?>;
             </table>
         </td>
     </tr>
-    <tr><th colspan=5 align=center id=bg1>중 원 정 세</th></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 id=bg1>장 수 동 향</th></tr>
+    <tr><th colspan=5 align=center class='bg1'>장 수 동 향</th></tr>
     <tr>
         <td colspan=5 valign=top>
             <?=formatHistoryToHTML(Json::decode($history['global_action']))?>

hwe/a_kingdomList.php

@@ -25,10 +25,9 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 세력일람</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/extKingdoms.js')?>
-<?=WebUtil::printJS('js/ext.kingdoms.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
@@ -92,13 +91,13 @@ foreach ($nations as $nation) {
         <td colspan=8 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 {$nation['name']} 】</td>
     </tr>
     <tr>
-        <td width=80 align=center id=bg1>성 향</td>
+        <td width=80 align=center class='bg1'>성 향</td>
         <td width=170 align=center><font color=yellow>".getNationType($nation['type'])."</font></td>
-        <td width=80 align=center id=bg1>작 위</td>
+        <td width=80 align=center class='bg1'>작 위</td>
         <td width=170 align=center>".getNationLevel($nation['level'])."</td>
-        <td width=80 align=center id=bg1>국 력</td>
+        <td width=80 align=center class='bg1'>국 력</td>
         <td width=170 align=center>{$nation['power']}</td>
-        <td width=80 align=center id=bg1>장수 / 속령</td>
+        <td width=80 align=center class='bg1'>장수 / 속령</td>
         <td width=170 align=center>{$nation['gennum']} / ".count($nation['cities']??[])."</td>
     ";
     for($chiefLevel = 12; $chiefLevel >= 5; $chiefLevel--){
@@ -113,9 +112,9 @@ foreach ($nations as $nation) {
     }
     echo "</tr>
     <tr>
-        <td align=center id=bg1>외교권자</td><td colspan=5>";
+        <td align=center class='bg1'>외교권자</td><td colspan=5>";
     echo join(', ', $ambassadors);
-    echo "</td><td align=center id=bg1>조언자</td><td align=center >";
+    echo "</td><td align=center class='bg1'>조언자</td><td align=center >";
     echo count($auditors).'명';
     echo "</td></tr>
     <tr>
@@ -160,9 +159,9 @@ echo "
     </tr>
     <tr>
         <td width=498 align=center>&nbsp;</td>
-        <td width=123 align=center id=bg1>장 수</td>
+        <td width=123 align=center class='bg1'>장 수</td>
         <td width=123 align=center>{$nations[0]['gennum']}</td>
-        <td width=123 align=center id=bg1>속 령</td>
+        <td width=123 align=center class='bg1'>속 령</td>
         <td width=123 align=center>".count($nations[0]['cities']??[])."</td>
     </tr>
     <tr>

hwe/a_npcList.php

@@ -26,9 +26,9 @@ $sel[$type] = "selected";
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 빙의일람</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/common.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')?>
@@ -59,8 +59,13 @@ 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');
+
+if($generalListFromPool){
+    $generalList = array_merge($generalListFromPool, $generalList);
+}
+
 $sortType = [
     1 => ['name', true],
     2 => ['nation', true],
@@ -88,18 +93,18 @@ else{
 ?>
 <table align=center width=1000 class='tb_layout bg0'>
     <tr>
-        <td width=102  align=center id=bg1>희생된 장수</td>
+        <td width=102  align=center class='bg1'>희생된 장수</td>
-        <td width=102  align=center id=bg1>악령 이름</td>
+        <td width=102  align=center class='bg1'>악령 이름</td>
-        <td width=68  align=center id=bg1>레벨</td>
+        <td width=68  align=center class='bg1'>레벨</td>
-        <td width=118 align=center id=bg1>국가</td>
+        <td width=118 align=center class='bg1'>국가</td>
-        <td width=68  align=center id=bg1>성격</td>
+        <td width=68  align=center class='bg1'>성격</td>
-        <td width=88  align=center id=bg1>특기</td>
+        <td width=88  align=center class='bg1'>특기</td>
-        <td width=68  align=center id=bg1>종능</td>
+        <td width=68  align=center class='bg1'>종능</td>
-        <td width=68  align=center id=bg1>통솔</td>
+        <td width=68  align=center class='bg1'>통솔</td>
-        <td width=68  align=center id=bg1>무력</td>
+        <td width=68  align=center class='bg1'>무력</td>
-        <td width=68  align=center id=bg1>지력</td>
+        <td width=68  align=center class='bg1'>지력</td>
-        <td width=78  align=center id=bg1>명성</td>
+        <td width=78  align=center class='bg1'>명성</td>
-        <td width=78  align=center id=bg1>계급</td>
+        <td width=78  align=center class='bg1'>계급</td>
     </tr>
 <?php foreach($generalList as $general): ?>
     <tr>

hwe/a_status.php

@@ -27,12 +27,11 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 세력도</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
+<?=WebUtil::printJS('dist_js/common.js')?>
 <?=WebUtil::printJS('d_shared/base_map.js')?>
-<?=WebUtil::printJS('js/map.js')?>
+<?=WebUtil::printJS('dist_js/map.js')?>
 <script>
 window.serverNick = '<?=DB::prefix()?>';
 window.serverID = '<?=UniqueConst::$serverID?>';
@@ -80,4 +79,3 @@ $(function(){
 </body>
 
 </html>
-

hwe/a_traffic.php

@@ -52,9 +52,9 @@ if ($admin['maxonline'] < $curonline) {
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/common.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')?>
@@ -92,7 +92,7 @@ span.out_bar{
 <table align=center width=1016>
     <tr><td align=left>
         <table align=center class='tb_layout bg0'>
-            <tr><td colspan=4 align=center id=bg2><font size=5>접 속 량</font></td></tr>
+            <tr><td colspan=4 align=center class='bg2'><font size=5>접 속 량</font></td></tr>
 <?php
 $refresh[] = $admin['refresh'];
 foreach($refresh as $i=>$value){
@@ -101,8 +101,8 @@ foreach($refresh as $i=>$value){
     $dt = substr($date[$i], 11, 5); ?>
             <tr height=30>
                 <td width=100 align=center><?=$year[$i]?>년 <?=$month[$i]?>월</td>
-                <td width=60 align=center id=bg2><?=$dt?></td>
+                <td width=60 align=center class='bg2'><?=$dt?></td>
-                <td width=2 align=center id=bg1></td>
+                <td width=2 align=center class='bg1'></td>
                 <td width=320>
                     <?php if($w == 0): ?>
                         <span class="out_bar"><?=$value?></span>
@@ -117,9 +117,9 @@ foreach($refresh as $i=>$value){
 <?php
 }
 ?>
-            <tr><td colspan=4 height=5 align=center id=bg1></td></tr>
+            <tr><td colspan=4 height=5 align=center class='bg1'></td></tr>
             <tr>
-                <td colspan=4 height=30 align=center id=bg0>최고기록: <?=$admin['maxrefresh']?></td>
+                <td colspan=4 height=30 align=center class='bg0'>최고기록: <?=$admin['maxrefresh']?></td>
             </tr>
 
 
@@ -127,7 +127,7 @@ foreach($refresh as $i=>$value){
     </td>
     <td align=right>
         <table align=center class='tb_layout bg0'>
-            <tr><td colspan=4 align=center id=bg2><font size=5>접 속 자</font></td></tr>
+            <tr><td colspan=4 align=center class='bg2'><font size=5>접 속 자</font></td></tr>
 <?php
 $online[] = $curonline;
 foreach($online as $i=>$value){
@@ -136,8 +136,8 @@ foreach($online as $i=>$value){
     $dt = substr($date[$i], 11, 5); ?>
             <tr height=30>
                 <td width=100 align=center><?=$year[$i]?>년 <?=$month[$i]?>월</td>
-                <td width=60 align=center id=bg2><?=$dt?></td>
+                <td width=60 align=center class='bg2'><?=$dt?></td>
-                <td width=2 align=center id=bg1></td>
+                <td width=2 align=center class='bg1'></td>
                 <td width=320>
                     <?php if($w == 0): ?>
                         <span class="out_bar"><?=$value?></span>
@@ -152,16 +152,16 @@ foreach($online as $i=>$value){
 <?php
 }
 ?>
-            <tr><td colspan=4 height=5 align=center id=bg1></td></tr>
+            <tr><td colspan=4 height=5 align=center class='bg1'></td></tr>
             <tr>
-                <td colspan=4 height=30 align=center id=bg0>최고기록: <?=$admin['maxonline']?></td>
+                <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 id=bg2><font size=5>주 의 대 상 자 (순간과도갱신)</font></td></tr>
+    <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'] = '접속자 총합';

hwe/a_vote.php

@@ -12,7 +12,7 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("설문조사", 1);
 
 $isVoteAdmin = in_array('vote', $session->acl[DB::prefix()]??[]);
-$isVoteAdmin |= $session->userGrade >= 5;
+$isVoteAdmin = $isVoteAdmin || $session->userGrade >= 5;
 
 $me = $db->queryFirstRow('SELECT no,vote from general where owner=%i', $userID);
 
@@ -28,9 +28,9 @@ $vote = $admin['vote']?:['-'];
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/common.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')?>
@@ -60,7 +60,7 @@ function captureKey(e) {
 </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 id=bg2><font size=5>설 문 조 사 (<?=$admin['develcost']*5?>금과 추첨으로 유니크템 증정!)</font></td></tr>
+    <tr><td colspan=3 align=center class='bg2'><font size=5>설 문 조 사 (<?=$admin['develcost']*5?>금과 추첨으로 유니크템 증정!)</font></td></tr>
 <?php
 
 if ($isVoteAdmin) {
@@ -76,7 +76,7 @@ if ($isVoteAdmin) {
 $vote_title = Tag2Code($vote_title);
 echo "
     <tr>
-        <td colspan=2 width=148 align=center id=bg1>제 목</td>
+        <td colspan=2 width=148 align=center class='bg1'>제 목</td>
         <td width=848 align=left>&nbsp;{$vote_title}</td>
     </tr>
 ";
@@ -151,7 +151,7 @@ echo "
 </table>
 <table align=center width=1000 class='tb_layout bg0'>
     <tr>
-        <td colspan=4 align=center id=bg1>댓 글</td>
+        <td colspan=4 align=center class='bg1'>댓 글</td>
     </tr>
 ";
 for ($i=0; $i < $commentCount; $i++) {
@@ -180,7 +180,7 @@ if ($me['no'] > 0) {
 </table>
 <br>
 <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td colspan=3 align=center id=bg2><font size=5>
+    <tr><td colspan=3 align=center class='bg2'><font size=5>
         전 체 통 계
 <?php
 if ($isVoteAdmin) {

hwe/api.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+APIHelper::launch(dirname(__FILE__));

hwe/b_auction.php

@@ -49,9 +49,9 @@ if ($msg2 == "") {
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/common.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')?>
@@ -59,12 +59,12 @@ if ($msg2 == "") {
 <body>
 <table align=center width=1000 class='tb_layout bg0'>
     <tr><td>거 래 장<br><?=closeButton()?></td></tr>
-    <tr><td align=center id=bg2><font color=orange size=6><b>거 래 장</b></font><input type=button value='갱신' onclick="location.replace('b_auction.php')"></td></tr>
+    <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 id=bg1>
+    <tr align=center class='bg1'>
         <td width=68>거래번호</td>
         <td width=48>선택</td>
         <td width=98>판매자</td>
@@ -118,18 +118,18 @@ foreach($db->query('SELECT * from auction where type=0 order by expire') as $auc
 }
 ?>
     <tr height=25>
-        <td align=center id=bg1>등록결과</td>
+        <td align=center class='bg1'>등록결과</td>
         <td colspan=10><?=ConvertLog($msg)?></td>
     </tr>
     <tr>
-        <td align=center id=bg1>입찰등록</td>
+        <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 id=bg1>거래등록</td>
+        <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>턴 후
             　물품: 쌀
@@ -152,7 +152,7 @@ foreach($db->query('SELECT * from auction where type=0 order by expire') as $auc
 <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 id=bg1>
+    <tr align=center class='bg1'>
         <td width=68>거래번호</td>
         <td width=48>선택</td>
         <td width=98>구매자</td>
@@ -205,18 +205,18 @@ foreach($db->query('SELECT * from auction where type=1 order by expire') as $auc
 }
 ?>
     <tr height=25>
-        <td align=center id=bg1>등록결과</td>
+        <td align=center class='bg1'>등록결과</td>
         <td colspan=10><?=ConvertLog($msg2)?></td>
     </tr>
     <tr>
-        <td align=center id=bg1>입찰등록</td>
+        <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 id=bg1>거래등록</td>
+        <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>턴 후
             　물품: 쌀
@@ -237,11 +237,11 @@ foreach($db->query('SELECT * from auction where type=1 order by expire') as $auc
 </table>
 <br>
 <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td align=center id=bg2><font size=5>최 근 기 록</font></td></tr>
+    <tr><td align=center class='bg2'><font size=5>최 근 기 록</font></td></tr>
     <tr><td>
     <?=getAuctionLogRecent(20)?>
     </td></tr>
-    <tr><td align=center id=bg2><font size=5>도 움 말</font></td></tr>
+    <tr><td align=center class='bg2'><font size=5>도 움 말</font></td></tr>
     <tr><td>
         <font color=white size=2>
 ㆍ판매거래는 거래자가 판매할 물품을 거래하면, 구입을 희망하는 사람이 현재가보다 높게 입찰하여 구입하는 방식입니다.<br>

hwe/b_battleCenter.php

@@ -120,9 +120,9 @@ $showGeneral = General::createGeneralObjFromDB($gen);
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/common.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')?>
@@ -153,8 +153,8 @@ $showGeneral = General::createGeneralObjFromDB($gen);
 </table>
 <table width=1000 align=center class='tb_layout bg0'>
     <tr>
-        <td width=50% align=center id=bg1><font color=skyblue size=3>장 수 정 보</font></td>
+        <td width=50% align=center class='bg1'><font color=skyblue size=3>장 수 정 보</font></td>
-        <td width=50% align=center id=bg1><font color=orange size=3>장 수 열 전</font></td>
+        <td width=50% align=center class='bg1'><font color=orange size=3>장 수 열 전</font></td>
     </tr>
     <tr>
         <td valign=top>
@@ -165,8 +165,8 @@ $showGeneral = General::createGeneralObjFromDB($gen);
         </td>
     </tr>
     <tr>
-        <td align=center id=bg1><font color=orange size=3>전투 기록</font></td>
+        <td align=center class='bg1'><font color=orange size=3>전투 기록</font></td>
-        <td align=center id=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>
@@ -178,8 +178,8 @@ $showGeneral = General::createGeneralObjFromDB($gen);
     </tr>
 <?php if($showGeneral->getNPCType() > 1 || $permission >= 2): ?>
     <tr>
-        <td align=center id=bg1><font color=orange size=3>개인 기록</font></td>
+        <td align=center class='bg1'><font color=orange size=3>개인 기록</font></td>
-        <td align=center id=bg1><font color=orange size=3>&nbsp;</font></td>
+        <td align=center class='bg1'><font color=orange size=3>&nbsp;</font></td>
     </tr>
     <tr>
         <td valign=top>

hwe/b_betting.php

@@ -63,10 +63,9 @@ if($str3){
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 베팅장</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/betting.js')?>
-<?=WebUtil::printJS('js/betting.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
@@ -79,7 +78,7 @@ if($str3){
 <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 id=bg2><font color=limegreen size=6>16강 상황</font><br><font color=orange size=3>(전체 금액 : <?=$globalBetTotal?> / 내 투자 금액 : <?=$myBetTotal?>)</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>
@@ -393,8 +392,8 @@ if ($admin['tournament'] == 6) {
     <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 id=bg2><font color=yellow size=6>토너먼트 랭킹</font></td></tr>
+    <tr align=center><td height=50 colspan=4 class='bg2'><font color=yellow size=6>토너먼트 랭킹</font></td></tr>
-    <tr align=center><td colspan=4 id=bg2><font color=skyblue size=3>순위 / 장수명 / 능력치 / 경기수 / 승리 / 무승부 / 패배 / 집계점수 / 우승횟수</font></td></tr>
+    <tr align=center><td colspan=4 class='bg2'><font color=skyblue size=3>순위 / 장수명 / 능력치 / 경기수 / 승리 / 무승부 / 패배 / 집계점수 / 우승횟수</font></td></tr>
     <tr align=center>
 <?php
 
@@ -430,7 +429,7 @@ foreach($tournamentType as $tournamentTypeText=>[$statTypeText,$statFunc,$rankCo
         <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 id=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>
+                <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";

hwe/b_chiefcenter.php

@@ -15,12 +15,9 @@ $generalObj = General::createGeneralObjFromDB($session->generalID);
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 사령부</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
+<?=WebUtil::printJS('dist_js/chiefCenter.js')?>
-<?=WebUtil::printJS('../e_lib/moment.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/chiefCenter.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
@@ -72,7 +69,7 @@ var maxChiefTurn = <?=GameConst::$maxChiefTurn?>;
         ></div
         ><div
             ><?=chiefCommandTable($generalObj)
-            ?><input type='button' id='setCommand' style='visibility:hidden;background-color:<?=GameConst::$basecolor2?>;color:white;font-size:13px;' value='실 행'
+            ?><br><input type='button' id='setCommand' style='visibility:hidden;background-color:<?=GameConst::$basecolor2?>;color:white;font-size:13px;' value='실 행'
         ></div
     ></div
 ></div
@@ -108,4 +105,3 @@ var maxChiefTurn = <?=GameConst::$maxChiefTurn?>;
 </div>
 </body>
 </html>
-

hwe/b_currentCity.php

@@ -16,7 +16,11 @@ $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']);
+$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,11 +33,9 @@ $templates = new \League\Plates\Engine('templates');
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('../e_lib/select2/select2.full.min.js')?>
+<?=WebUtil::printJS('dist_js/currentCity.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('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')?>
@@ -148,8 +150,31 @@ echo "
 unset($city);
 
 // 첩보된 도시까지만 허용
-if($valid == 0 && $userGrade < 5) {
+
+$showDetailedInfo = false;
+if($valid){
+    $showDetailedInfo = true;
+}
+
+if(!key_exists($citylist, CityConst::all())){
     $citylist = $me['city'];
+    $showDetailedInfo = true;
+    $valid = 1;
+}
+
+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;
+        }
+    }
 }
 
 
@@ -172,11 +197,35 @@ if($city['trade'] === null) {
 }
 
 $dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'], 2)[0];
-$generals = $db->query(
+if($showDetailedInfo){
-    'SELECT %l from general where city=%i order by name',
+    $generals = $db->query(
-    Util::formatListOfBackticks($dbColumns),
+        'SELECT %l from general where city=%i order by turntime',
-    $city['city']
+        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($city['nation'] != 0){
+        $city['def'] = '?';
+        $city['wall'] = '?';
+    }
+}
+
 
 $generalTurnList = [];
 
@@ -257,6 +306,10 @@ foreach($generals as $general){
         $crew = $general['crew'];
         $train = -1;
         $atmos = -1;
+
+        if(!$valid){
+            $crew = -1;
+        }
     }
 
     $nation = $general['nation'];
@@ -326,12 +379,14 @@ $genTotal = 0;
 
 
 foreach($generalsFormat as $general){
-    if($general['nation'] == 0){
+    if(!$general['nation'] || !$myNation['nation']){
         continue;
     }
     if($general['nation'] != $myNation['nation']){
         $enemyCnt += 1;
-        $enemyCrew += $general['crew'];
+        if($general['crew'] >= 0){
+            $enemyCrew += $general['crew'];
+        }
         if($general['crew'] > 0){
             $enemyArmedCnt += 1;
         }
@@ -402,11 +457,11 @@ foreach($generalsFormat as $general){
     </tr>
     <tr>
         <td align=center class=bg1>민심</td>
-        <td align=center><?=round($city['trust'], 1)?></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><?=round($city['pop']/$city['pop_max']*100, 2)?>%</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>
@@ -430,11 +485,12 @@ foreach($generalsFormat as $general){
     </tr>
     <tr>
         <td align=center class=bg1>장수</td>
-        <td colspan=11><?=join(', ', $generalsName)?></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>
@@ -459,11 +515,10 @@ foreach($generalsFormat as $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>
-

hwe/b_dipcenter.php

@@ -55,20 +55,17 @@ $nationStor->cacheValues(['notice', 'scout_msg']);
 <title><?=UniqueConst::$serverName?>: 내무부</title>
 <script>
 var editable = <?=(($me['officer_level']>=5||$permission==4)?'true':'false')?>;
-var nationMsg = <?=Json::encode($nationStor->notice??'')?>;
+var storedData = <?=Json::encode([
-var scoutmsg = <?=Json::encode($nationStor->scout_msg??'')?>;
+    "nationMsg"=>$nationStor->notice??'',
+    "scoutMsg"=>$nationStor->scout_msg??''
+])?>;
 </script>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('../e_lib/summernote/summernote-bs4.min.js')?>
-<?=WebUtil::printJS('../e_lib/summernote/lang/summernote-ko-KR.js')?>
-<?=WebUtil::printJS('../e_lib/summernote/plugin/image-sammo/summernote-image-flip.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/dipcenter.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')?>
@@ -200,7 +197,7 @@ if ($budgetricediff > 0) {
             </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'>
+        <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>

hwe/b_diplomacy.php

@@ -90,12 +90,11 @@ $neutralStateCharMap = [
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 중원 정보</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
+<?=WebUtil::printJS('dist_js/common.js')?>
 <?=WebUtil::printJS('d_shared/base_map.js')?>
-<?=WebUtil::printJS('js/map.js')?>
+<?=WebUtil::printJS('dist_js/map.js')?>
 <script>
 window.serverNick = '<?=DB::prefix()?>';
 window.serverID = '<?=UniqueConst::$serverID?>';
@@ -179,7 +178,7 @@ else{
         </td>
     </tr>
     <?php endforeach; ?>
-    <tr><td colspan=2 height=5 id=bg1></td></tr>
+    <tr><td colspan=2 height=5 class='bg1'></td></tr>
 </table>
 
 <?php endif; ?>

hwe/b_genList.php

@@ -56,9 +56,9 @@ $templates = new \League\Plates\Engine('templates');
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/common.js')?>
 </head>
 
 <body>
@@ -93,7 +93,7 @@ switch ($type) {
     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_leader desc"; break;
+    case 8: $orderSQL = "order by troop desc"; break;
 }
 
 $generals = $db->query(

hwe/b_myBossInfo.php

@@ -33,11 +33,10 @@ $nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nati
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 인사부</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('../e_lib/select2/select2.full.min.js')?>
+<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/bossInfo.js')?>
-<?=WebUtil::printJS('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')?>
@@ -114,7 +113,7 @@ $level = Util::convertArrayToDict(
 
 $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 = "warnum" AND value > 0 ORDER BY value DESC LIMIT 5',
+    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){
@@ -146,10 +145,10 @@ for($i=12; $i >= $lv; $i-=2) {
     $imageTemp2 = GetImageURL($level[$i2]['imgsvr']??0);
     ?>
     <tr>
-        <td width=98 align=center id=bg1><font size=4><?=getOfficerLevelText($i1, $nation['level'])?></font></td>
+        <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 id=bg1><font size=4><?=getOfficerLevelText($i2, $nation['level'])?></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>
@@ -158,11 +157,11 @@ for($i=12; $i >= $lv; $i-=2) {
 
 ?>
 <tr>
-    <td width=98 align=center id=bg1>오호장군【승전】</td>
+    <td width=98 align=center class='bg1'>오호장군【승전】</td>
     <td colspan=5><?=$tigerstr?></td>
     </tr>
     <tr>
-        <td width=98 align=center id=bg1>건안칠자【계략】</td>
+        <td width=98 align=center class='bg1'>건안칠자【계략】</td>
         <td colspan=5><?=$eaglestr?></td>
     </tr>
 </table>
@@ -170,7 +169,7 @@ for($i=12; $i >= $lv; $i-=2) {
     <tr><td colspan=6 height=5></td></tr>
     <tr><td colspan=2 align=center bgcolor=red>추 방</td></tr>
     <tr>
-        <td width=498 align=right id=bg1>대상 장수</td>
+        <td width=498 align=right class='bg1'>대상 장수</td>
         <td width=498>
 <?php
 
@@ -212,9 +211,9 @@ 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 id=bg1>".getOfficerLevelText(12, $nation['level'])."</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 id=bg1>{$officerLevelText}</td>
+        <td width=98  align=right class='bg1'>{$officerLevelText}</td>
         <td width=398>
 ";
 
@@ -251,7 +250,7 @@ for($i=10; $i >= $lv; $i--) {
     if($i % 2 == 0) { echo "<tr>"; }
     $officerLevelText = getOfficerLevelText($i, $nation['level']);
     echo "
-        <td width=98 align=right id=bg1>{$officerLevelText}</td>
+        <td width=98 align=right class='bg1'>{$officerLevelText}</td>
         <td width=398>
     ";
 
@@ -295,13 +294,13 @@ if($meLevel == 12):
     <tr><td colspan='4' height='5'></td></tr>
 <tr><td colspan='4' align='center' bgcolor='purple'>외 교 권 자 임 명</td></tr>
     <tr>
-        <td width=98  align=right id=bg1>외교권자</td>
+        <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 id=bg1>조언자</td>
+        <td width=98  align=right class='bg1'>조언자</td>
         <td width=398>
 <select id="selectAuditor" multiple="multiple">
 </select>
@@ -320,7 +319,7 @@ if($meLevel >= 5) {
     echo "
     <tr><td colspan=5 align=center bgcolor=orange>도 시 관 직 임 명</td></tr>
     <tr>
-        <td colspan=3 align=right id=bg2>{$officerLevelText} 임명</td>
+        <td colspan=3 align=right class='bg2'>{$officerLevelText} 임명</td>
         <td colspan=2>
             <select id='citylist_4' size=1 style=color:white;background-color:black;>
     ";
@@ -367,7 +366,7 @@ if($meLevel >= 5) {
     </tr>";
     $officerLevelText = getOfficerLevelText(3, $nation['level']);
     echo "<tr>
-        <td colspan=3 align=right id=bg2>{$officerLevelText} 임명</td>
+        <td colspan=3 align=right class='bg2'>{$officerLevelText} 임명</td>
         <td colspan=2>
             <select id='citylist_3' size=1 style=color:white;background-color:black;>
     ";
@@ -413,7 +412,7 @@ if($meLevel >= 5) {
     </tr>";
     $officerLevelText = getOfficerLevelText(2, $nation['level']);
     echo "<tr>
-        <td colspan=3 align=right id=bg2>{$officerLevelText} 임명</td>
+        <td colspan=3 align=right class='bg2'>{$officerLevelText} 임명</td>
         <td colspan=2>
             <select id='citylist_2' size=1 style=color:white;background-color:black;>
     ";
@@ -462,10 +461,10 @@ if($meLevel >= 5) {
 }
 echo "
     <tr>
-        <td width=158 align=center id=bg1 colspan=2><font size=4>도 시</font></td>
+        <td width=158 align=center class='bg1' colspan=2><font size=4>도 시</font></td>
-        <td width=278 align=center id=bg1><font size=4>태 수 (사관) 【현재도시】</font></td>
+        <td width=278 align=center class='bg1'><font size=4>태 수 (사관) 【현재도시】</font></td>
-        <td width=278 align=center id=bg1><font size=4>군 사 (사관) 【현재도시】</font></td>
+        <td width=278 align=center class='bg1'><font size=4>군 사 (사관) 【현재도시】</font></td>
-        <td width=278 align=center id=bg1><font size=4>종 사 (사관) 【현재도시】</font></td>
+        <td width=278 align=center class='bg1'><font size=4>종 사 (사관) 【현재도시】</font></td>
     </tr>
 ";
 
@@ -495,8 +494,8 @@ foreach($db->query('SELECT city,name,level,region,officer_set from city where na
     $cityOfficerList = $officerList[$cityID]??[];
 ?>
 <?php if($region != $city['region']): ?>
-    <tr><td colspan=5 height=3 id=bg1></td></tr>
+    <tr><td colspan=5 height=3 class='bg1'></td></tr>
-    <tr><td colspan=5 id=bg1><font size=4 color=skyblue> 【 <?=CityConst::$regionMap[$city['region']]?> 】 </font></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>
@@ -506,7 +505,7 @@ foreach($db->query('SELECT city,name,level,region,officer_set from city where na
 <?php     if(key_exists($officerLevel, $cityOfficerList)):
 $officer = $cityOfficerList[$officerLevel];
 ?>
-<td><?=$officer['name']?>(<?=$officer['belong']?>년) 【<?=CityConst::byID($officer['city'])->name?>】</td>
+<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; ?>

hwe/b_myCityInfo.php

@@ -37,13 +37,10 @@ $sel = [$type => "selected"];
 <title><?=UniqueConst::$serverName?>: 세력도시</title>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('../e_lib/jquery-ui.min.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('../e_lib/jquery-ui.min.js')?>
+<?=WebUtil::printJS('dist_js/extExpandCity.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/ext.expand_city.js')?>
 
 </head>
 
@@ -151,41 +148,41 @@ foreach($cityList as $city){
         <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 id=bg1>주민</td>
+        <td align=center width=46 class='bg1'>주민</td>
         <td align=center width=140>{$city['pop']}/{$city['pop_max']}</td>
-        <td align=center width=46 id=bg1>농업</td>
+        <td align=center width=46 class='bg1'>농업</td>
         <td align=center width=140>{$city['agri']}/{$city['agri_max']}</td>
-        <td align=center width=46 id=bg1>상업</td>
+        <td align=center width=46 class='bg1'>상업</td>
         <td align=center width=140>{$city['comm']}/{$city['comm_max']}</td>
-        <td align=center width=46 id=bg1>치안</td>
+        <td align=center width=46 class='bg1'>치안</td>
         <td align=center width=140>{$city['secu']}/{$city['secu_max']}</td>
-        <td align=center width=46 id=bg1>수비</td>
+        <td align=center width=46 class='bg1'>수비</td>
         <td align=center width=140>{$city['def']}/{$city['def_max']}</td>
-        <td align=center width=46 id=bg1>성벽</td>
+        <td align=center width=46 class='bg1'>성벽</td>
         <td align=center width=140>{$city['wall']}/{$city['wall_max']}</td>
     </tr>
     <tr>
-        <td align=center id=bg1>민심</td>
+        <td align=center class='bg1'>민심</td>
         <td align=center>".round($city['trust'], 1)."</td>
-        <td align=center id=bg1>시세</td>
+        <td align=center class='bg1'>시세</td>
         <td align=center>{$city['trade']}%</td>
-        <td align=center id=bg1>인구</td>
+        <td align=center class='bg1'>인구</td>
         <td align=center>".round($city['pop']/$city['pop_max']*100, 2)." %</td>
-        <td align=center id=bg1>태수</td>
+        <td align=center class='bg1'>태수</td>
         <td align=center>";
     echo $officerName[4];
     echo "</td>
-        <td align=center id=bg1>군사</td>
+        <td align=center class='bg1'>군사</td>
         <td align=center>";
     echo $officerName[3];
     echo "</td>
-        <td align=center id=bg1>종사</td>
+        <td align=center class='bg1'>종사</td>
         <td align=center>";
     echo $officerName[2];
     echo "</td>
     </tr>
     <tr>
-        <td align=center id=bg1>장수</td>
+        <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) {
@@ -209,4 +206,3 @@ foreach($cityList as $city){
 </body>
 <div id="helper_genlist" style="display:none;"></div>
 </html>
-

hwe/b_myGenInfo.php

@@ -47,9 +47,9 @@ if($gameStor->isunited){
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/common.js')?>
 
 </head>
 
@@ -104,21 +104,21 @@ $generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special
 echo"
 <table align=center class='tb_layout bg0'>
     <tr>
-        <td width=64 align=center id=bg1>얼 굴</td>
+        <td width=64 align=center class='bg1'>얼 굴</td>
-        <td width=98 align=center id=bg1>이 름</td>
+        <td width=98 align=center class='bg1'>이 름</td>
-        <td width=78 align=center id=bg1>관 직</td>
+        <td width=78 align=center class='bg1'>관 직</td>
-        <td width=68 align=center id=bg1>계 급</td>
+        <td width=68 align=center class='bg1'>계 급</td>
-        <td width=68 align=center id=bg1>명 성</td>
+        <td width=68 align=center class='bg1'>명 성</td>
-        <td width=68 align=center id=bg1>봉 록</td>
+        <td width=68 align=center class='bg1'>봉 록</td>
-        <td width=48 align=center id=bg1>통솔</td>
+        <td width=48 align=center class='bg1'>통솔</td>
-        <td width=48 align=center id=bg1>무력</td>
+        <td width=48 align=center class='bg1'>무력</td>
-        <td width=48 align=center id=bg1>지력</td>
+        <td width=48 align=center class='bg1'>지력</td>
-        <td width=68 align=center id=bg1>자 금</td>
+        <td width=68 align=center class='bg1'>자 금</td>
-        <td width=68 align=center id=bg1>군 량</td>
+        <td width=68 align=center class='bg1'>군 량</td>
-        <td width=48 align=center id=bg1>성 격</td>
+        <td width=48 align=center class='bg1'>성 격</td>
-        <td width=78 align=center id=bg1>특 기</td>
+        <td width=78 align=center class='bg1'>특 기</td>
-        <td width=48 align=center id=bg1>사 관</td>
+        <td width=48 align=center class='bg1'>사 관</td>
-        <td width=70 align=center id=bg1>벌점</td>
+        <td width=70 align=center class='bg1'>벌점</td>
     </tr>";
 foreach($generalList as $general){
 
@@ -183,4 +183,3 @@ foreach($generalList as $general){
 </body>
 
 </html>
-

hwe/b_myKingdomInfo.php

@@ -27,9 +27,9 @@ if($nationID == 0) {
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 세력정보</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/common.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')?>
@@ -96,57 +96,57 @@ if ($budgetricediff > 0) {
         <td colspan=8 align=center style='color:<?=newColor($nation['color'])?>;background-color:<?=$nation['color']?>'>【<?=$nation['name']?>】</td>
     </tr>
     <tr>
-        <td width=98 align=center id=bg1>총주민</td>
+        <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 id=bg1>총병사</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 id=bg1>국 력</td>
+        <td width=98 align=center class='bg1'>국 력</td>
         <td width=298 align=center colspan=3><?=$nation['power']?></td>
     </tr>
     <tr>
-        <td align=center id=bg1>국 고</td>
+        <td align=center class='bg1'>국 고</td>
         <td align=center><?=number_format($nation['gold'])?></td>
-        <td align=center id=bg1>병 량</td>
+        <td align=center class='bg1'>병 량</td>
         <td align=center><?=number_format($nation['rice'])?></td>
-        <td align=center id=bg1>세 율</td>
+        <td align=center class='bg1'>세 율</td>
         <td align=center colspan=3><?=$nation['rate']?> %</td>
         </td>
     </tr>
     <tr>
-        <td align=center id=bg1>세금/단기</td>
+        <td align=center class='bg1'>세금/단기</td>
         <td align=center>+<?=number_format($goldIncome)?> / +<?=number_format($warIncome)?></td>
-        <td align=center id=bg1>세곡/둔전</td>
+        <td align=center class='bg1'>세곡/둔전</td>
         <td align=center>+<?=number_format($riceIncome)?> / +<?=number_format($wallIncome)?></td>
-        <td align=center id=bg1>지급률</td>
+        <td align=center class='bg1'>지급률</td>
         <td align=center colspan=3><?=$nation['bill']?> %</td>
     </tr>
     <tr>
-        <td align=center id=bg1>수입/지출</td>
+        <td align=center class='bg1'>수입/지출</td>
         <td align=center>+<?=number_format($totalGoldIncome)?> / -<?=number_format($outcome)?></td>
-        <td align=center id=bg1>수입/지출</td>
+        <td align=center class='bg1'>수입/지출</td>
         <td align=center>+<?=number_format($totalRiceIncome)?> / -<?=number_format($outcome)?></td>
-        <td align=center id=bg1>속 령</td>
+        <td align=center class='bg1'>속 령</td>
         <td width=98 align=center><?=count($cityList)?></td>
-        <td width=98 align=center id=bg1>장 수</td>
+        <td width=98 align=center class='bg1'>장 수</td>
         <td width=98 align=center><?=$nation['gennum']?></td>
     </tr>
     <tr>
-        <td align=center id=bg1>국고 예산</td>
+        <td align=center class='bg1'>국고 예산</td>
         <td align=center><?=number_format($budgetgold)?> (<?=$budgetgolddiff?>)</td>
-        <td align=center id=bg1>병량 예산</td>
+        <td align=center class='bg1'>병량 예산</td>
         <td align=center><?=number_format($budgetrice)?> (<?=$budgetricediff?>)</td>
-        <td align=center id=bg1>기술력</td>
+        <td align=center class='bg1'>기술력</td>
         <td align=center><?=number_format(floor($nation['tech']))?></td>
-        <td align=center id=bg1>작 위</td>
+        <td align=center class='bg1'>작 위</td>
         <td align=center><?=getNationLevel($nation['level'])?></td>
     </tr>
     <tr>
-        <td align=center valign=top id=bg1> 속령일람 :</td>
+        <td align=center valign=top class='bg1'> 속령일람 :</td>
         <td colspan=7><?=join(', ', $cityNames)?></td>
     </tr>
     <tr>
-        <td align=center valign=top id=bg1>국가열전</td>
+        <td align=center valign=top class='bg1'>국가열전</td>
-        <td colspan=7 id=bg0><?=formatHistoryToHTML(getNationHistoryLogAll($nation['nation']))?></td>
+        <td colspan=7 class='bg0'><?=formatHistoryToHTML(getNationHistoryLogAll($nation['nation']))?></td>
     </tr>
 </table>
 <br>
@@ -158,4 +158,3 @@ if ($budgetricediff > 0) {
 </body>
 
 </html>
-

hwe/b_myPage.php

@@ -4,29 +4,9 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 
-$btn = Util::getPost('btn');
-$defence_train = Util::getPost('defence_train', 'int', 2);
-$tnmt = Util::getPost('tnmt', 'int', 1);
-//$detachNPC = Util::getPost('detachNPC', 'bool');
-$detachNPC = false;
-
 $showDieImmediatelyBtn = false;
 $availableDieImmediately = false;
 
-if ($defence_train <= 60) {
-    $defence_train = 60;
-}
-else if($defence_train <= 80){
-    $defence_train = 80;
-}
-else{
-    $defence_train = 999;
-}
-
-if($tnmt < 0 || $tnmt > 1){
-    $tnmt = 1;
-}
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -34,6 +14,7 @@ $generalID = $session->generalID;
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
+$gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
 
 increaseRefresh("내정보", 1);
 
@@ -41,61 +22,24 @@ $me = General::createGeneralObjFromDB($generalID);
 
 $myset = $me->getVar('myset');
 if ($myset > 0) {
-    $submit = 'submit';
+    $submit = 'button';
 } else {
     $submit = 'hidden';
 }
 
-if (($btn == "설정저장" || $detachNPC) && $myset > 0) {
+$targetTime = addTurn($me->getVar('lastrefresh'), $gameStor->turnterm, 2);
-    if ($myset > 1) {
-        $submit = 'submit';
-    } else {
-        $submit = 'hidden';
-    }
-
-    if($defence_train != $me->getVar('defence_train')){
-        if($defence_train == 999){
-            $me->increaseVar('myset', -1);
-            $me->setVar('defence_train', $defence_train);
-            $me->increaseVar('train', -3);
-            $me->increaseVar('atmos', -3);
-        }
-        else{
-            $me->increaseVar('myset', -1);
-            $me->setVar('defence_train', $defence_train);
-        }
-        $myset -= 1;
-    }
-    
-    if($me->getVar('tnmt') != $tnmt){
-        $me->setVar('tnmt', $tnmt);
-    }
-
-    if($me->getNPCType() == 1 && $detachNPC){
-        $turnterm = $gameStor->turnterm;
-
-        if($turnterm < 10){
-            $targetKillTurn = 30 / $turnterm;
-        }
-        else{
-            $targetKillTurn = 60 / $turnterm;
-        }
-        $me->setVar('killturn', $targetKillTurn);
-    }
-}
-$me->applyDB($db);
-
 if($gameStor->turntime <= $gameStor->opentime){
     //서버 가오픈시 할 수 있는 행동
-
     if($me->getNPCType() == 0){
         $showDieImmediatelyBtn = true;
-        if(addTurn($me->getVar('lastrefresh'), $gameStor->turnterm, 2) <= 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;
 ?>
 <!DOCTYPE html>
 <html>
@@ -104,28 +48,16 @@ if($gameStor->turntime <= $gameStor->opentime){
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 내정보</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<script>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+var availableDieImmediately = <?=$availableDieImmediately?'true':'false'?>;
-<?=WebUtil::printJS('js/common.js')?>
+</script>
-<?=WebUtil::printJS('js/myPage.js')?>
+<?=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')?>
-<script>
-var availableDieImmediately = <?=$availableDieImmediately?'true':'false'?>;
-jQuery(function($){
-
-$('#die_immediately').click(function(){
-    if(!availableDieImmediately){
-        alert('삭제를 위해서는 생성 후 2턴 가량의 시간이 필요합니다.');
-        location.reload();
-        return false;
-    }
-    return confirm('정말로 삭제하시겠습니까?');
-});
-
-});
-</script>
 </head>
 
 <body>
@@ -139,39 +71,60 @@ $('#die_immediately').click(function(){
             <?php generalInfo2($me); ?>
         </td>
         <td width=50% valign=top style="padding-left:4ch;">
-            <form name=form1 action=b_myPage.php method=post>
                 토너먼트 【
-                <input type=radio name=tnmt value=0 <?=$me->getVar('tnmt')==0?"checked":""; ?>>수동참여
+                <input type=radio class='tnmt' name=tnmt value=0 <?=$me->getVar('tnmt')==0?"checked":""; ?>>수동참여
-                <input type=radio name=tnmt value=1 <?=$me->getVar('tnmt')==1?"checked":""; ?>>자동참여
+                <input type=radio class='tnmt' name=tnmt value=1 <?=$me->getVar('tnmt')==1?"checked":""; ?>>자동참여
                 】<br>
-               ∞<font color=orange>개막직전 남는자리가 있을경우 랜덤하게 참여합니다.</font><br><br>
+               ∞<span style='color:orange'>개막직전 남는자리가 있을경우 랜덤하게 참여합니다.</span><br><br>
-                수비 【
+
-                <input type=radio name=defence_train  value=80 <?=$me->getVar('defence_train')==80?"checked":""; ?>>◎(훈사80)
+               환약 사용 【<select id='use_treatment' name='use_treatment'>
-                <input type=radio name=defence_train  value=60 <?=$me->getVar('defence_train')==60?"checked":""; ?>>○(훈사60)
+                <option value=10 <?=($use_treatment==10)?"selected":""; ?>>경상</option>
-                <input type=radio name=defence_train  value=999 <?=$me->getVar('defence_train')==999?"checked":""; ?>>×
+                <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?> name=btn style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px; value=설정저장><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>
-                ∞<font color=orange>설정저장은 이달중 <?=$myset?>회 남았습니다.</font><br><br>
+                ∞<span style='color:orange'>설정저장은 이달중 <?=$myset?>회 남았습니다.</span><br><br>
-            </form>
             <?php if(!($gameStor->autorun_user['limit_minutes']??false)): ?>
             휴 가 신 청<br>
-            <a href="c_vacation.php"><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>휴가 신청</button></a><br><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): ?>
-            가오픈 기간 내 장수 삭제<br>
+            가오픈 기간 내 장수 삭제 (<?=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 id=bg1><font color=skyblue size=3>개인 기록</font></td>
+        <td align=center class='bg1'><font color=skyblue size=3>개인 기록</font></td>
-        <td align=center id=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>
@@ -188,8 +141,8 @@ $('#die_immediately').click(function(){
         </td>
     </tr>
     <tr>
-        <td align=center id=bg1><font color=skyblue size=3>장수 열전</font></td>
+        <td align=center class='bg1'><font color=skyblue size=3>장수 열전</font></td>
-        <td align=center id=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>
@@ -209,4 +162,3 @@ $('#die_immediately').click(function(){
 </table>
 </body>
 </html>
-

hwe/b_npc_control.php

@@ -1,419 +0,0 @@
-<?php
-
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-$gameStor->cacheValues(['autorun_user', 'develcost']);
-
-increaseRefresh("NPC 정책", 1);
-
-
-$me = $db->queryFirstRow('SELECT no, npc, nation, city, officer_level, con, turntime, belong, permission, penalty FROM general WHERE owner=%i', $userID);
-
-$nationID = $me['nation'];
-$nation = $db->queryFirstRow('SELECT nation,level,name,color,type,gold,rice,bill,tech,rate,scout,war,secretlimit,capital FROM nation WHERE nation = %i', $nationID);
-
-$con = checkLimit($me['con']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-$permission = checkSecretPermission($me);
-if ($permission < 0) {
-    echo '국가에 소속되어있지 않습니다.';
-    die();
-} else if ($permission < 1) {
-    echo "권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.";
-    die();
-}
-
-
-$nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
-$nationStor->cacheValues(['npc_nation_policy', 'npc_general_policy']);
-$gameStor->cacheAll();
-
-$general = new General($me, null, null, $nation, $gameStor->year, $gameStor->month, false);
-
-$rawServerPolicy = $gameStor->getValue('npc_nation_policy') ?? [];
-$rawNationPolicy = $nationStor->getValue('npc_nation_policy') ?? [];
-$rawServerGeneralPolicy = $gameStor->getValue('npc_general_policy') ?? [];
-$rawNationGeneralPolicy = $nationStor->getValue('npc_general_policy') ?? [];
-
-$defaultNationPolicy = ($rawServerPolicy['values'] ?? []) + AutorunNationPolicy::$defaultPolicy;
-$currentNationPolicy = ($rawNationPolicy['values'] ?? []) + $defaultNationPolicy;
-
-$defaultNationPriority = $rawServerPolicy['priority'] ?? (AutorunNationPolicy::$defaultPriority);
-$currentNationPriority = $rawNationPolicy['priority'] ?? $defaultNationPriority;
-
-$defaultGeneralActionPriority = $rawServerGeneralPolicy['priority'] ?? (AutorunGeneralPolicy::$default_priority);
-$currentGeneralActionPriority = $rawNationGeneralPolicy['priority'] ?? $defaultGeneralActionPriority;
-
-$autoPolicyVariable = [];
-if ($currentNationPolicy['reqHumanWarUrgentRice'] ?? 0) {
-    $autoPolicyVariable['reqHumanWarUrgentRice'] = $currentNationPolicy['reqHumanWarUrgentRice'];
-}
-if ($currentNationPolicy['reqHumanWarUrgentGold'] ?? 0) {
-    $autoPolicyVariable['reqHumanWarUrgentGold'] = $currentNationPolicy['reqHumanWarUrgentGold'];
-}
-$autoPolicy = new AutorunNationPolicy($general, ($gameStor->autorun_user)['options'], ['values' => $autoPolicyVariable], null, $nation, $gameStor->getAll(true));
-
-
-?>
-<!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 ?>: 임시 NPC 정책</title>
-    <script>
-        var nationID = <?= $nationID ?>;
-
-        var defaultNationPolicy = <?= Json::encode($defaultNationPolicy) ?>;
-        var currentNationPolicy = <?= Json::encode($currentNationPolicy) ?>;
-
-        var defaultNationPriority = <?= Json::encode($defaultNationPriority) ?>;
-        var currentNationPriority = <?= Json::encode($currentNationPriority) ?>;
-        var availableNationPriorityItems = <?= Json::encode(AutorunNationPolicy::$defaultPriority) ?>;
-
-        var defaultGeneralActionPriority = <?= Json::encode($defaultGeneralActionPriority) ?>;
-        var currentGeneralActionPriority = <?= Json::encode($currentGeneralActionPriority) ?>;
-        var availableGeneralActionPriorityItems = <?= Json::encode(AutorunGeneralPolicy::$default_priority) ?>;
-
-        var btnHelpMessage = {
-            '선전포고': '군주가 NPC이고, 전쟁중이 아닐 때,<br>주변국중 하나를 골라 선포합니다.<br><br>선포 시점은 다음을 참고합니다.<br>- 인구율<br>- 도시내정률<br>- NPC전투장권장 금 충족률<br>- NPC전투장권장 쌀 충족률<br><br>국력이 낮은 국가를 조금 더 선호합니다.',
-            '천도': '인구가 많은 곳을 찾아 천도를 시도합니다.<br>영토의 가운데를 선호합니다.<br><br>도시 인구가 충분하다면, 굳이 천도하지는 않습니다.',
-            '유저장긴급포상': '금/쌀이 부족한 유저전투장에게 긴급하게 포상합니다.<br>국고가 권장량보다 적어지더라도 시도합니다.',
-            '부대전방발령': '(작동하지 않음)<br>전투 부대를 접경으로 발령합니다.<br>수도->시작점->도착점 경로를 따릅니다.',
-            '유저장구출발령': '아군 영토에 있지 않은 유저장을 아군 영토로 발령합니다.<br>곧 집합하는 부대에 탑승한 경우는 제외합니다.',
-            '유저장후방발령': '유저전투장 중에<br>- 병력이 충분하지 않고,<br>- 도시의 인구가 제자리 징병할 수 있을 정도로 충분하지 않고,<br>- 부대에 탑승하지 않았다면,<br>인구가 충분한 후방도시로 발령합니다.',
-            '부대유저장후방발령': '접경에 위치한 부대에 탑승한 유저전투장 중에,<br>- 병력이 충분하지 않고,<br>- 첫 턴이 징병턴이며,<br>- 부대장 집합 턴 사이라면,<br>인구가 충분한 후방도시로 발령합니다.<br><br>부대장의 위치와 유저장의 위치가 다르다면 발령하지 않습니다.',
-            '유저장전방발령': '후방에 있는 유저장이<br>- 병력을 가지고 있으며,<br>- 곧 훈련/사기진작이 완료될 것 같으면,<br>전방으로 발령합니다.<br><br>도시 관직이 많이 임명된 도시를 선호합니다.',
-            '유저장포상': '금/쌀이 부족한 유저장에게 포상합니다.<br>유저전투장과 유저내정장은 각각 기준을 따릅니다.<br>국고 권장량을 가급적 지킵니다.',
-            '부대후방발령': '(작동하지 않음)<br>후방 부대가 위치한 도시의 인구가 충분하지 않을 경우,<br>인구가 충분한 도시로 발령합니다.',
-            '부대구출발령': '전투 부대, 후방 부대가 아닌 부대가 아군 영토에 있지 않을 때,<br>전방 도시 중 하나를 골라 발령합니다.',
-            'NPC긴급포상': '금/쌀이 부족한 NPC전투장에게 긴급하게 포상합니다.<br>국고가 권장량보다 \'약간\' 적어지더라도 시도합니다.',
-            'NPC구출발령': '아군 영토에 있지 않은 NPC장을 아군 영토로 발령합니다.',
-            'NPC후방발령': 'NPC전투장 중에<br>- 병력이 충분하지 않고,<br>- 도시의 인구가 제자리 징병할 수 있을 정도로 충분하지 않고,<br>- 부대에 탑승하지 않았다면,<br>인구가 충분한 후방도시로 발령합니다.',
-            'NPC포상': '금/쌀이 부족한 유저장에게 포상합니다.<br>NPC전투장과 NPC내정장은 각각 기준을 따릅니다.<br>국고 권장량을 가급적 지킵니다.',
-            'NPC전방발령': '후방에 있는 유저장이<br>- 병력을 가지고 있으며,<br>- 곧 훈련/사기진작이 완료될 것 같으면,<br>전방으로 발령합니다.<br><br>도시 관직이 많이 임명된 도시를 선호합니다.',
-            '유저장내정발령': '내정중인 유저장이 위치한 도시의 내정률이 95% 이상이면<br>개발되지 않은 도시로 발령합니다.',
-            'NPC내정발령': '내정중인 NPC장이 위치한 도시의 내정률이 95% 이상이면<br>개발되지 않은 도시로 발령합니다.',
-            'NPC몰수': '국고가 부족하다면 NPC에게서 몰수합니다. 내정NPC장은 국고가 부족하지 않아도 몰수합니다.',
-
-            'NPC사망대비': 'NPC의 사망까지 5턴 이내인 경우, 헌납합니다.<br>헌납할 금쌀이 없다면 물자조달을 수행합니다.',
-            '귀환': '아국 도시에 있지 않다면 귀환합니다.',
-            '금쌀구매': '전쟁 중에 금쌀의 비율이 크게 차이난다면 금쌀을 거래하여 비슷하게 맞춥니다.<br>금쌀 비율이 적절하는지 판단하는데 살상률을 포함합니다.<br>NPC는 상인이 없어도 금쌀을 구매할 수 있습니다.<br><br>또는 금쌀 한쪽이 지나치게 적은 경우에는 내정 중에도 금쌀을 거래합니다.',
-            '출병': '충분한 병력과 충분한 훈련/사기를 가지고 있는 경우 출병합니다.<br>접경이 여럿인 경우 무작위로 선택합니다.<br><br>타국과 전쟁중인 경우 공백지로는 출병하지 않습니다.',
-            '긴급내정': '전쟁중에 민심이 70 미만이거나,<br>인구가 제자리 징병이 가능하지 않을 정도로 적을 경우,<br>일정확률로 주민선정과 정착장려를 수행합니다.<br><br>통솔이 높을 수록 수행할 확률이 높습니다.',
-            '전투준비': '충분한 병력을 가지고 있지만 훈련과 사기가 부족한 경우 훈련과 사기진작을 수행합니다.',
-            '전방워프': '전투장이 충분한 병력을 가지고 있다면 전방으로 이동합니다.',
-            'NPC헌납': '국고가 부족한데 NPC장수가 충분한 금쌀을 가지고 있다면 일부를 헌납합니다. <br>NPC내정장은 국고가 넉넉하더라도 충분한 금쌀을 가지고 있다면 일부를 헌납합니다.',
-            '징병': '전쟁 중 병력을 소진하였다면 재 징병합니다.<br><br>기존에 사용한 병종군 중에서 사용가능한 병종을 랜덤하게 선택합니다.<br>고급 병종을 선택할 확률이 조금 더 높습니다.<br><br>NPC의 경우 도시의 인구가 충분하지 않다면 징병을 할 확률이 감소합니다.<br><br>유저장은 최대한 고급병종을 유지하며,<br>유저장 모병이 허용되는 경우 모병을 3회할 수 있다면 모병합니다.',
-            '후방워프': '전쟁 중 병력을 소진하였는데 도시의 인구가 충분하지 않다면,<br>인구가 많은 도시로 이동합니다.',
-            '전쟁내정': '전쟁 중 수행하는 내정입니다.<br>정착장려, 기술연구의 확률이 좀 더 높고,<br>치안강화, 농지개간, 상업투자의 확률이 낮습니다.<br><br>내정이 가능하다 하더라도 전시임을 고려해,<br>30% 확률로 다른 턴을 수행합니다.',
-            '소집해제': '전쟁 중이 아닌 데 병력이 남아있는 경우,<br>3/4 확률로 소집해제합니다.',
-            '일반내정': '도시에서 내정을 수행합니다. 낮은 내정일 수록 수행할 확률이 높습니다.<br>기술 연구는 1등급 이상 뒤쳐지지 않도록 노력합니다.',
-            '내정워프': '도시에서 더이상 내정을 수행할 수 없는 경우,<br>일정확률로 내정이 부족한 다른 도시로 이동합니다.',
-        };
-    </script>
-    <?= WebUtil::printJS('../e_lib/jquery-3.3.1.min.js') ?>
-    <?= WebUtil::printJS('../e_lib/Sortable.min.js') ?>
-    <?= WebUtil::printJS('../e_lib/jquery-sortable.js') ?>
-    <?= WebUtil::printJS('../e_lib/bootstrap.bundle.min.js') ?>
-    <?= WebUtil::printJS('../e_lib/jquery_toast/toast.js') ?>
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('js/common.js') ?>
-    <?= WebUtil::printJS('js/npc_control.js') ?>
-
-    <?= WebUtil::printCSS('../e_lib/bootstrap.min.css') ?>
-    <?= WebUtil::printCSS('../e_lib/font_awesome/css/all.min.css') ?>
-    <?= WebUtil::printCSS('../e_lib/jquery_toast/toast.css') ?>
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <?= WebUtil::printCSS('css/common.css') ?>
-    <?= WebUtil::printCSS('css/npc_control.css') ?>
-</head>
-
-<body>
-    <div id='container' class='tb_layout bg0' style='width:1000px;margin:auto;border:solid 1px #888888;'>
-        <div class='tb_layout bg0'>임시 NPC 정책<br>
-            <?= backButton() ?></div>
-
-        <div class='bg1 section_bar'>국가 정책</div>
-        <div class="text-right px-3"><small class="form-text text-muted">
-                최근 설정: <?= $rawNationPolicy['valueSetter'] ?? '-없음-' ?> (<?= $rawNationPolicy['valueSetTime'] ?? '설정 기록 없음' ?>)
-            </small></div>
-        <div class="form_list">
-            <div class="form-group row">
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqNationGold" class="col-sm-6 col-form-label">국가 권장 금</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqNationGold" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">이보다 많으면 포상, 적으면 몰수/헌납합니다.(긴급포상 제외)</small></div>
-                </div>
-
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqNationRice" class="col-sm-6 col-form-label">국가 권장 쌀</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqNationRice" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">이보다 많으면 포상, 적으면 몰수/헌납합니다.(긴급포상 제외)</small></div>
-                </div>
-            </div>
-            <div class="form-group row">
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqHumanWarUrgentGold" class="col-sm-6 col-form-label">유저전투장 긴급포상 금</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqHumanWarUrgentGold" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">
-                            유저장긴급포상시 이보다 금이 적은 장수에게 포상합니다.<br>
-                            0이면 보병 6회 징병(<?= number_format(GameConst::$defaultStatMax * 100) ?> * 6) 가능한 금을 기준으로 하며, 그 수치는 현재 <?= number_format($autoPolicy->reqHumanWarUrgentGold) ?>입니다.</small></div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqHumanWarUrgentRice" class="col-sm-6 col-form-label">유저전투장 긴급포상 쌀</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqHumanWarUrgentRice" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">유저장긴급포상시 이보다 쌀이 적은 장수에게 포상합니다.<br>0이면 기본 병종으로 <?= number_format(GameConst::$defaultStatMax * 100 * 6) ?>명 사살 가능한 쌀을 기준으로 하며, 그 수치는 현재 <?= number_format($autoPolicy->reqHumanWarUrgentRice) ?>입니다.</small></div>
-                </div>
-            </div>
-            <div class="form-group row">
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqHumanWarRecommandGold" class="col-sm-6 col-form-label">유저전투장 권장 금</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqHumanWarRecommandGold" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">유저전투장에게 주는 금입니다. 이보다 적으면 포상합니다. <br>
-                            0이면 유저전투장 긴급포상 금의 3배를 기준으로 하며, 그 수치는 현재 <?= number_format($autoPolicy->reqHumanWarRecommandGold) ?>입니다.</small></div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqHumanWarRecommandRice" class="col-sm-6 col-form-label">유저전투장 권장 쌀</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqHumanWarRecommandRice" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">유저전투장에게 주는 쌀입니다. 이보다 적으면 포상합니다. <br>
-                            0이면 유저전투장 긴급포상 쌀의 3배를 기준으로 하며, 그 수치는 현재 <?= number_format($autoPolicy->reqHumanWarRecommandRice) ?>입니다.</small></div>
-                </div>
-            </div>
-            <div class="form-group row">
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqHumanDevelGold" class="col-sm-6 col-form-label">유저내정장 권장 금</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqHumanDevelGold" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">유저내정장에게 주는 금입니다. 이보다 적으면 포상합니다.</small></div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqHumanDevelRice" class="col-sm-6 col-form-label">유저내정장 권장 쌀</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqHumanDevelRice" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">유저내정장에게 주는 쌀입니다. 이보다 적으면 포상합니다.</small></div>
-                </div>
-            </div>
-            <div class="form-group row">
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqNPCWarGold" class="col-sm-6 col-form-label">NPC전투장 권장 금</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqNPCWarGold" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">NPC전투장에게 주는 금입니다. 이보다 적으면 포상합니다. <br>
-                            0이면 기본 병종 4회(<?= number_format(GameConst::$defaultStatNPCMax * 100) ?> * 4) 징병비를 기준으로 하며, 그 수치는 현재 <?= number_format($autoPolicy->reqNPCWarGold) ?>입니다.</small></div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqNPCWarRice" class="col-sm-6 col-form-label">NPC전투장 권장 쌀</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqNPCWarRice" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">NPC전투장에게 주는 쌀입니다. 이보다 적으면 포상합니다. <br>
-                            0이면 기본 병종으로 <?= number_format(GameConst::$defaultStatNPCMax * 100 * 4) ?>명 사살 가능한 쌀을 기준으로 하며, 그 수치는 현재 <?= number_format($autoPolicy->reqNPCWarRice) ?>입니다.</small></div>
-                </div>
-            </div>
-            <div class="form-group row">
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqNPCDevelGold" class="col-sm-6 col-form-label">NPC내정장 권장 금</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqNPCDevelGold" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">NPC내정장에게 주는 금입니다. 이보다 5배 더 많다면 헌납합니다.<br>0이면 30턴 내정 가능한 금을 기준으로 하며, 그 수치는 현재 <?= number_format($autoPolicy->reqNPCDevelGold) ?>입니다.</small></div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="reqNPCDevelRice" class="col-sm-6 col-form-label">NPC내정장 권장 쌀</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="reqNPCDevelRice" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">NPC내정장에게 주는 쌀입니다. 이보다 5배 더 많다면 헌납합니다.</small></div>
-                </div>
-            </div>
-            <div class="form-group row">
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="minimumResourceActionAmount" class="col-sm-6 col-form-label">포상/몰수/헌납/삼/팜 최소 단위</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="minimumResourceActionAmount" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">연산결과가 이 단위보다 적다면 수행하지 않습니다.</small></div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="minWarCrew" class="col-sm-6 col-form-label">최소 전투 가능 병력 수</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="minWarCrew" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">이보다 적을 때에는 징병을 시도합니다.</small></div>
-                </div>
-            </div>
-            <div class="form-group row">
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="minNPCRecruitCityPopulation" class="col-sm-6 col-form-label">NPC 최소 징병 가능 인구 수</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="minNPCRecruitCityPopulation" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">이보다 낮으면 NPC는 도시에서 징병하지 않고 후방 워프합니다.</small></div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="safeRecruitCityPopulationRatio" class="col-sm-6 col-form-label">제자리 징병 허용 인구율(%)</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="percent" id="safeRecruitCityPopulationRatio" min="0" max="100" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">전쟁 시 후방 발령, 후방 워프의 기준 인구입니다. 이보다 많다면 '충분하다'고 판단합니다.</small></div>
-                </div>
-            </div>
-            <div class="form-group row">
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="minNPCWarLeadership" class="col-sm-6 col-form-label">NPC 전투 참여 통솔 기준</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="minNPCWarLeadership" min="0" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">이 수치보다 같거나 높으면 NPC전투장으로 분류됩니다.</small></div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="row">
-                        <label for="properWarTrainAtmos" class="col-sm-6 col-form-label">훈련/사기진작 목표치</label>
-                        <div class="col-sm-6">
-                            <input type="number" class="form-control" data-type="integer" id="properWarTrainAtmos" min="0" max="100" value="0">
-                        </div>
-                    </div>
-                    <div style='text-align:right;'><small class="form-text text-muted">훈련/사기진작 기준치입니다. 이보다 같거나 높으면 출병합니다.</small></div>
-                </div>
-            </div>
-            <div class="alert alert-secondary">
-                전투 부대는 작업중입니다(json양식: {부대번호:[시작도시번호(아국),도착도시번호(적군)],...})<br>
-                후방 징병 부대는 작업중입니다(json양식: [부대번호,...])<br>
-                내정 부대는 작업중입니다(json양식: [부대번호,...])
-                <input type="hidden" value="{}" data-type="json" id="CombatForce">
-                <input type="hidden" value="[]" data-type="json" id="SupportForce">
-                <input type="hidden" value="[]" data-type="json" id="DevelopForce">
-                <input type="hidden" value="true" data-type="json" id="allowNpcAttackCity">
-                <!--allowNpcAttackCity는 현재 게임 내 비활성-->
-            </div>
-            <div class='control_bar' data-type="nationPolicy">
-                <div class="btn-group" role="group">
-                    <button type="button" class="btn btn-dark reset_btn">초기값으로</button>
-                    <button type="button" class="btn btn-secondary revert_btn">이전값으로</button>
-                </div><button type="button" class="btn btn-primary submit_btn">설정</button>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-sm-6 half_section_left">
-                <div class='bg1 section_bar'>NPC 사령턴 우선순위</div>
-                <div class="float-right px-3"><small class="form-text text-muted">
-                        최근 설정: <?= $rawNationPolicy['prioritySetter'] ?? '-없음-' ?> (<?= $rawNationPolicy['prioritySetTime'] ?? '설정 기록 없음' ?>)
-                    </small></div>
-                <div class='text-left px-2'><small class="text-muted">예턴이 없거나, 지정되어 있더라도 실패할경우<br>아래 순위에 따라 사령턴을 시도합니다.</small></div>
-                <div class="form_list">
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="bg2 sub_bar">비활성</div>
-                            <div id="nationPriorityDisabled" class="list-group col" data-type="list">
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="bg2 sub_bar">활성</div>
-                            <div id="nationPriority" class="list-group col" data-type="list">
-                            </div>
-                        </div>
-                    </div>
-                    <div class='control_bar' data-type="nationPriority">
-                        <div class="btn-group" role="group">
-                            <button type="button" class="btn btn-dark reset_btn">초기값으로</button>
-                            <button type="button" class="btn btn-secondary revert_btn">이전값으로</button>
-                        </div><button type="button" class="btn btn-primary submit_btn">설정</button>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-6 half_section_right">
-                <div class='bg1 section_bar'>NPC 일반턴 우선순위</div>
-                <div class="float-right px-3"><small class="form-text text-muted">
-                        최근 설정: <?= $rawNationGeneralPolicy['prioritySetter'] ?? '-없음-' ?> (<?= $rawNationGeneralPolicy['prioritySetTime'] ?? '설정 기록 없음' ?>)
-                    </small></div>
-                <div class='text-left px-2'><small class="text-muted">순위가 높은 것부터 시도합니다. <br>아무것도 실행할 수 없으면 물자조달이나 인재탐색을 합니다.</small></div>
-                <div class="form_list">
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="bg2 sub_bar">비활성</div>
-                            <div id="generalPriorityDisabled" class="list-group col" data-type="list">
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="bg2 sub_bar">활성</div>
-                            <div id="generalPriority" class="list-group col" data-type="list">
-                            </div>
-                        </div>
-                    </div>
-                    <div class='control_bar' data-type="generalPriority">
-                        <div class="btn-group" role="group">
-                            <button type="button" class="btn btn-dark reset_btn">초기값으로</button>
-                            <button type="button" class="btn btn-secondary revert_btn">이전값으로</button>
-                        </div><button type="button" class="btn btn-primary submit_btn">설정</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-
-</html>

hwe/b_processing.php

@@ -64,7 +64,7 @@ if(!$commandObj->hasPermissionToReserve()){
     die_redirect();
 }
 
-$jsList = $commandObj->getJSFiles();
+$jsList = $commandObj->getJSPlugins();
 $cssList = $commandObj->getCSSFiles();
 ?>
 
@@ -75,30 +75,28 @@ $cssList = $commandObj->getCSSFiles();
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
+<?=WebUtil::printJS('dist_js/common.js')?>
 <?=WebUtil::printJS('d_shared/base_map.js')?>
-<?=WebUtil::printJS('js/map.js')?>
+<?=WebUtil::printJS('dist_js/processing.js')?>
-<?=WebUtil::printJS('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>
-<?php
-foreach($jsList as $js){
-    print(WebUtil::printJS($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')?>
 <?=WebUtil::printCSS('css/main.css')?>
 <?=WebUtil::printCSS('css/map.css')?>
+<?=WebUtil::printCSS('css/processing.css')?>
+
 <?php
 foreach($cssList as $css){
     print(WebUtil::printCSS($css));

hwe/b_tournament.php

@@ -145,7 +145,7 @@ if($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 id=bg2><font color=magenta size=5>16강 승자전</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
 
@@ -398,7 +398,7 @@ if ($admin['tournament'] >= 7 || $admin['tournament'] == 0) {
 }
 echo "
     <tr><td height=10 colspan=8 align=center></td></tr>
-    <tr><td colspan=8 align=center id=bg2><font color=orange size=5>조별 본선 순위</font></td></tr>
+    <tr><td colspan=8 align=center class='bg2'><font color=orange size=5>조별 본선 순위</font></td></tr>
     <tr>";
 
 $num = array("一", "二", "三", "四", "五", "六", "七", "八");
@@ -409,7 +409,7 @@ for ($i=0; $i < 8; $i++) {
         <td>
             <table align=center width=250 class='tb_layout bg0'>
                 <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
-                <tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
+                <tr class='bg1'><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
 
     $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) {
@@ -427,7 +427,7 @@ if ($admin['tournament'] == 4 || $admin['tournament'] == 5) {
     printFighting($admin['tournament'], $admin['phase']);
 }
 echo "
-    <tr><td colspan=8 align=center id=bg2><font color=yellow size=5>조별 예선 순위</font></td></tr>
+    <tr><td colspan=8 align=center class='bg2'><font color=yellow size=5>조별 예선 순위</font></td></tr>
     <tr>";
 
 for ($i=0; $i < 8; $i++) {
@@ -436,7 +436,7 @@ for ($i=0; $i < 8; $i++) {
         <td>
             <table align=center width=250 class='tb_layout bg0'>
                 <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
-                <tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
+                <tr class='bg1'><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
 
     $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) {

hwe/b_troop.php

@@ -85,15 +85,14 @@ uasort($troops, function($lhs, $rhs){
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 부대편성</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::preloadJS('dist_js/troop.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/troop.js')?>
+<?=WebUtil::printJS('dist_js/common.js')?>
-<?=WebUtil::printJS('js/ext.plugin_troop.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printCSS('css/troops.css')?>
+<?=WebUtil::printCSS('dist_css/troop.css')?>
 <script>
 
 </script>
@@ -195,7 +194,7 @@ foreach ($troops as $troopNo=>$troop) {
 <br>
 <table width=1000 class='tb_layout bg0'>
     <tr>
-        <td width=80 id=bg1>부 대 명</td>
+        <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>
@@ -210,6 +209,6 @@ foreach ($troops as $troopNo=>$troop) {
     <tr><td><?=banner()?> </td></tr>
 </table>
 </div>
+<?=WebUtil::printJS('dist_js/troop.js')?>
 </body>
 </html>
-

hwe/battle_simulator.php

@@ -8,7 +8,34 @@ $session = Session::requireLogin()->setReadOnly();
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 
-$startYear = $gameStor->getValue('startyear');
+$gameStor->cacheValues(['startyear', 'year']);
+$startYear = $gameStor->startyear;
+$year = $gameStor->year;
+
+$me = $db->queryFirstRow('SELECT no, nation, city FROM general WHERE owner =%i', Session::getUserID());
+
+if($me){
+    $generalID = $me['no'];
+    $nationID = $me['nation'];
+    $city = $db->queryFirstRow('SELECT city, level, def, wall FROM city WHERE city = %i', $me['city']);
+}
+else{
+    $generalID = 0;
+    $nationID = 0;
+    $city = [
+        'city'=>0,
+        'level'=>5,
+        'def'=>1000,
+        'wall'=>1000,
+    ];
+}
+
+if($nationID){
+    $nation = $db->queryFirstRow('SELECT level, type, tech, capital FROM nation WHERE nation = %i', $nationID);
+}
+else{
+    $nation = null;
+}
 
 ?>
 <!DOCTYPE html>
@@ -23,15 +50,13 @@ $startYear = $gameStor->getValue('startyear');
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/battle_simulator.css')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('../e_lib/moment.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('../e_lib/download2.js')?>
-<?=WebUtil::printJS('js/common.js')?>
 <script>
 var defaultSpecialDomestic = '<?=GameConst::$defaultSpecialDomestic?>';
+var city = <?=Json::encode($city)?>;
+var nation = <?=Json::encode($nation)?>;
 </script>
-<?=WebUtil::printJS('js/battle_simulator.js')?>
+<?=WebUtil::printJS('dist_js/battle_simulator.js')?>
 </head>
 <body>
 <div id="container">
@@ -47,7 +72,7 @@ var defaultSpecialDomestic = '<?=GameConst::$defaultSpecialDomestic?>';
                     <div class="input-group-append">
                         <span class="input-group-text">년 시작</span>
                     </div>
-                    <input type="number" class="form-control" id="year" value="<?=$startYear+3?>" min="<?=$startYear?>">
+                    <input type="number" class="form-control" id="year" value="<?=$year?>" min="<?=$startYear?>">
                     <div class="input-group-append">
                         <span class="input-group-text">년</span>
                     </div>
@@ -131,7 +156,7 @@ var defaultSpecialDomestic = '<?=GameConst::$defaultSpecialDomestic?>';
                             <input type="radio" name="is_attacker_capital" class="form_is_capital" value="1" autocomplete="off">Y
                         </label>
                         <label class="btn btn-secondary active">
-                            <input type="radio" name="is_attacker_capital" class="form_is_capital" value="2" autocomplete="off" checked>N
+                            <input type="radio" name="is_attacker_capital" class="form_is_capital" value="0" autocomplete="off">N
                         </label>
                     </div>
 
@@ -145,6 +170,9 @@ var defaultSpecialDomestic = '<?=GameConst::$defaultSpecialDomestic?>';
             <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;" />
@@ -203,7 +231,7 @@ var defaultSpecialDomestic = '<?=GameConst::$defaultSpecialDomestic?>';
                             <input type="radio" name="is_defender_capital" class="form_is_capital" value="1" autocomplete="off">Y
                         </label>
                         <label class="btn btn-secondary active">
-                            <input type="radio" name="is_defender_capital" class="form_is_capital" value="0" autocomplete="off" checked>N
+                            <input type="radio" name="is_defender_capital" class="form_is_capital" value="0" autocomplete="off">N
                         </label>
                     </div>
                 </div>
@@ -236,6 +264,9 @@ var defaultSpecialDomestic = '<?=GameConst::$defaultSpecialDomestic?>';
             <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;" />
@@ -404,7 +435,7 @@ var defaultSpecialDomestic = '<?=GameConst::$defaultSpecialDomestic?>';
                         <?php endforeach; ?>
                     </select>
                 </div>
-                <div class="input-group mb-1">
+                <div class="input-group mb-3">
                     <div class="input-group-prepend">
                         <span class="input-group-text">귀병숙련</span>
                     </div>
@@ -425,11 +456,27 @@ var defaultSpecialDomestic = '<?=GameConst::$defaultSpecialDomestic?>';
                         <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>
 
@@ -477,5 +524,25 @@ var defaultSpecialDomestic = '<?=GameConst::$defaultSpecialDomestic?>';
     </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

@@ -7,7 +7,7 @@ include "func.php";
 
 $btn = Util::getPost('btn');
 $msg = Util::getPost('msg');
-$scoutmsg = Util::getPost('scoutmsg');
+$scoutmsg = Util::getPost('scoutMsg');
 $rate = Util::getPost('rate', 'int');
 $bill = Util::getPost('bill', 'int');
 $secretlimit = Util::getPost('secretlimit', 'int');
@@ -75,4 +75,3 @@ if($btn == "국가방침 수정") {
 }
 
 header('location:b_dipcenter.php');
-

hwe/c_tournament.php

@@ -49,6 +49,7 @@ if($btn == '참가') {
     $general['gold'] -= $admin['develcost'];
 
     $freeSlot = [
+        0=>8,
         1=>8,
         2=>8,
         3=>8,
@@ -56,7 +57,6 @@ if($btn == '참가') {
         5=>8,
         6=>8,
         7=>8,
-        8=>8,
     ];
     foreach($db->query('SELECT count(*) as cnt, grp FROM tournament WHERE grp < 10 GROUP BY grp') as $grpInfo){
         if($grpInfo['cnt'] == 8){

hwe/c_vote.php

@@ -15,7 +15,7 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $isVoteAdmin = in_array('vote', $session->acl[DB::prefix()]??[]);
-$isVoteAdmin |= $session->userGrade >= 5;
+$isVoteAdmin = $isVoteAdmin || $session->userGrade >= 5;
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -24,7 +24,7 @@ $admin = $gameStor->getValues(['develcost', 'cost', 'vote_title', 'vote', 'votec
 
 $generalID = Session::getGeneralID();
 
-$general = General::createGeneralObjFromDB($generalID, ['vote','horse','weapon','book','item','npc'], 2);
+$general = General::createGeneralObjFromDB($generalID, ['vote','horse','weapon','book','item','npc','imgsvr','picture','aux'], 2);
 
 if($btn == "투표" && $general->getVar('vote') == 0 && $sel > 0) {
     $develcost = $admin['develcost'] * 5;

hwe/css/board.css

@@ -1,56 +0,0 @@
-#newArticle{
-    width:1000px;
-    margin: 0 auto;
-}
-
-.titleInput{
-    width:100%;
-    color:white;
-    background-color:transparent;
-    border:none;
-    margin:1px 5px;
-}
-
-.contentInput{
-    width:100%;
-    min-height:3em;
-    color:white;
-    background-color:transparent;
-    border:none;
-    padding:1px 5px;
-}
-
-.articleFrame{
-    width:1000px;
-    margin: 20px auto;
-}
-
-.commentText{
-    width:100%;
-}
-
-.authorName, .comment .author{
-    width:110px;
-    font-size:85%;
-}
-
-.date{
-    width:125px;
-    font-size:85%;
-}
-
-.text{
-    text-align:left;
-    padding:1px 5px;
-}
-
-.submitComment{
-    width:100%;
-}
-
-.commentText{
-    color:white;
-    background-color:transparent;
-    border:none;
-    padding:1px 5px;
-}

hwe/css/common.css

@@ -1,40 +1,56 @@
 @charset "UTF-8";
 
 /* font-boostring Block */
-html * {max-height:1000000px;}
 
-
+html * {
-html, body{
+    max-height: 1000000px;
-    background-color:black;
-    color:white;
-    line-height:1.3;
-    font-family:'맑은 고딕'; 
-    font-size:13px;
 }
 
-table { font-family:'맑은 고딕'; }
+html,
-font { font-family:'맑은 고딕'; }
+body {
-input { font-family:'맑은 고딕'; font-size:13px; }
+    background-color: black;
-select { font-family:'굴림'; line-height:100%; }
+    color: white;
-
+    line-height: 1.3;
-.center{
+    font-family: '맑은 고딕';
-    text-align:center;
+    font-size: 13px;
 }
 
-table.mimic_flex{
+table {
+    font-family: '맑은 고딕';
+}
+
+font {
+    font-family: '맑은 고딕';
+}
+
+input {
+    font-family: '맑은 고딕';
+    font-size: 13px;
+}
+
+select {
+    font-family: '굴림';
+    line-height: 100%;
+}
+
+.center {
+    text-align: center;
+}
+
+table.mimic_flex {
     border-collapse: collapse;
-    border:none;
+    border: none;
-    padding:0;
+    padding: 0;
 }
 
-.mimic_flex td, .mimic_flex th     {
+.mimic_flex td,
-    border:none !important;
+.mimic_flex th {
+    border: none !important;
     padding: 0px;
     word-break: break-all;
 }
 
-
+table.tb_layout {
-table.tb_layout  {
     border-collapse: collapse;
     padding: 0px;
     font-size: 13px;
@@ -42,159 +58,161 @@ table.tb_layout  {
     font-family: '맑은 고딕';
 }
 
-.tb_layout td, .tb_layout th     {
+.tb_layout td,
-    border:solid 1px gray;
+.tb_layout th {
+    border: solid 1px gray;
     padding: 0px;
     word-break: break-all;
-    font-family: '맑은 고딕';;
+    font-family: '맑은 고딕';
+    ;
 }
 
-div.bar_out{
+div.bar_out {
-    position:relative;
+    position: relative;
-    border-top:solid 1px #888888;
+    border-top: solid 1px #888888;
-    border-bottom:solid 1px #333333;
+    border-bottom: solid 1px #333333;
-    padding:0;
+    padding: 0;
-    margin:0;
+    margin: 0;
-    width:100%;
+    width: 100%;
     overflow: hidden;
 }
 
-div.bar_out div{
+div.bar_out div {
-    position:absolute;
+    position: absolute;
-    left:0;
+    left: 0;
-    top:0;
+    top: 0;
-    height:100%;
+    height: 100%;
 }
 
-div.bar_out div.bar_in{
+div.bar_out div.bar_in {
-    width:100%;
+    width: 100%;
 }
 
+
 /* */
 
-.ev_warning{
+.ev_warning {
-    color:orangered;
+    color: orangered;
 }
 
-.ev_notice{
+.ev_notice {
-    color:orangered;
+    color: orangered;
 }
 
-.ev_succes{
+.ev_succes {
-    color:lightgreen;
+    color: lightgreen;
 }
 
-.ev_sell{
+.ev_sell {
-    color:orange;
+    color: orange;
 }
 
-.ev_failed{
+.ev_failed {
-    color:orangered;
+    color: orangered;
 }
 
-.ev_highlight{
+.ev_highlight {
-    color:orangered;
+    color: orangered;
 }
 
+
 /* TODO: 색상값이 아니라 의미에 따라 클래스 지정 */
 
-.o_bullet::before{
+.o_bullet::before {
-    color:cyan;
+    color: cyan;
-    content:"●";
+    content: "●";
 }
 
-.o_diamond::before{
+.o_diamond::before {
-    color:orangered;
+    color: orangered;
-    content:"◆";
+    content: "◆";
 }
 
-.small_war_log{
+.small_war_log {
-    display:inline-block;
+    display: inline-block;
 }
 
-.small_war_log .war_type_attack{
+.small_war_log .war_type_attack {
-    color:cyan;
+    color: cyan;
 }
 
-.small_war_log .war_type_defense{
+.small_war_log .war_type_defense {
-    color:magenta;
+    color: magenta;
 }
 
-.small_war_log .war_type_siege{
+.small_war_log .war_type_siege {
-    color:white;
+    color: white;
 }
 
-
+.small_war_log .name_plate {
-
-.small_war_log .name_plate{
     font-size: 0.75em;
 }
 
-.small_war_log .name_plate_cover{
+.small_war_log .name_plate_cover {
-    color:yellow;
+    color: yellow;
 }
 
-.small_war_log .crew_plate{
+.small_war_log .crew_plate {
-    color:orangered;
+    color: orangered;
-    font-size:90%;
+    font-size: 90%;
 }
 
-.t_date{
+.t_date {
     font-size: 0.75em;
 }
 
-.t_red{
+.t_red {
-    color:red;
+    color: red;
 }
 
-.t_blue{
+.t_blue {
-    color:blue;
+    color: blue;
 }
 
-.t_green{
+.t_green {
-    color:green;
+    color: green;
 }
 
-.t_magenta{
+.t_magenta {
-    color:magenta;
+    color: magenta;
 }
 
-.t_cyan{
+.t_cyan {
-    color:cyan;
+    color: cyan;
 }
 
-.t_limegreen{
+.t_limegreen {
-    color:limegreen;
+    color: limegreen;
 }
 
-.t_skyblue{
+.t_skyblue {
-    color:skyblue;
+    color: skyblue;
 }
 
-.t_orangered{
+.t_orangered {
-    color:orangered;
+    color: orangered;
 }
 
-.t_yellow{
+.t_yellow {
-    color:yellow;
+    color: yellow;
 }
 
-.t_white{
+.t_white {
-    color:white;
+    color: white;
 }
 
-.float_left{
+.float_left {
-    float:left;
+    float: left;
 }
 
-.tooltip{
+.tooltip {
-    font-size:12px;
+    font-size: 12px;
     font-family: '맑은 고딕';
 }
 
-.tooltip_copyable_info .tooltiptext{
+.tooltip_copyable_info .tooltiptext {
     display: inline;
-    color: rgba(0,0,0,0);
+    color: rgba(0, 0, 0, 0);
     font-size: 0;
 }
 
@@ -202,67 +220,69 @@ div.bar_out div.bar_in{
     display: none;
 }
 
-.hidden_but_copyable{
+.hidden_but_copyable {
-    color: rgba(0,0,0,0);
+    color: rgba(0, 0, 0, 0);
     font-size: 0;
 }
 
-.btn-group-xs > .btn, .btn-xs {
+.btn-group-xs>.btn,
-    padding  : .25rem .4rem;
+.btn-xs {
-    font-size  : .875rem;
+    padding: .25rem .4rem;
-    line-height  : .5;
+    font-size: .875rem;
-    border-radius : .2rem;
+    line-height: .5;
+    border-radius: .2rem;
 }
 
-.edit_form.viewer{
+.edit_form.viewer {
-    max-height:200px;
+    max-height: 200px;
-    overflow-y:auto;
+    overflow-y: auto;
 }
 
-.trumbowyg-box{
+.trumbowyg-box {
-    margin:0;
+    margin: 0;
-    border-left:none;
+    border-left: none;
-    border-right:none;
+    border-right: none;
 }
 
-.edit_form.trumbowyg-editor{
+.edit_form.trumbowyg-editor {
-    margin:0;
+    margin: 0;
-    padding:0;
+    padding: 0;
 }
 
-.commandBasic{
+.commandBasic {
-    background-color:black;
+    background-color: black;
-    color:white;
+    color: white;
 }
 
-.compensatePositive{
+.compensatePositive {
-    color:skyblue;
+    color: skyblue;
 }
 
-.compensateNegative{
+.compensateNegative {
-    color:orange;
+    color: orange;
 }
 
-.compensateNeutral{
+.compensateNeutral {
-    color:white;
+    color: white;
 }
 
-.commandBasic.commandImpossible{
+.commandBasic.commandImpossible {
-    background-color:red;
+    background-color: red;
-    color:white;
+    color: white;
 }
+
 .select2-selection--single.simple-select2-align-center .select2-selection__rendered {
     text-align: center;
 }
 
-.select2-dropdown.simple-select2-align-center li.select2-results__option{
+.select2-dropdown.simple-select2-align-center li.select2-results__option {
     text-align: center;
 }
 
-.select2-container--bootstrap4 .select2-selection--single.text-secondary .select2-selection__rendered{
+.select2-container--bootstrap4 .select2-selection--single.text-secondary .select2-selection__rendered {
-    color:white;
+    color: white;
 }
 
-.select2-container--bootstrap4 .text-secondary .select2-results__option[aria-selected=false]{
+.select2-container--bootstrap4 .text-secondary .select2-results__option[aria-selected=false] {
-    color:white;
+    color: white;
 }

hwe/css/npc_control.css

@@ -1,49 +0,0 @@
-.section_bar{
-    text-align:center;
-    border:0.5px solid #aaa;
-    padding-right:0;
-    padding-left:0;
-}
-
-.sub_bar{
-    text-align:center;
-    border:0.5px solid #aaa;
-    margin-left:-5px;
-    margin-right:-5px;
-}
-
-.reset_btn{
-    width:15ch;
-}
-
-.submit_btn{
-    margin-left:1em;
-    width:15ch;
-}
-
-.control_bar{
-    margin-top:8pt;
-    text-align:right;
-}
-
-.col-form-label{
-    text-align:right;
-    padding-right:2ch;
-}
-
-.form_list{
-    padding:8pt;
-}
-
-.half_section_left{
-    padding-right:0;
-    border-right:0.5px solid #aaa;
-}
-.half_section_right{
-    padding-left:0;
-    
-}
-
-.popover{
-    max-width:100%;
-}

hwe/css/processing.css

@@ -0,0 +1,11 @@
+#amount {
+    width: 100px;
+}
+
+#colorType {
+    width: 150px;
+}
+
+.no-padding .select2-results__option {
+    padding: 0;
+}

hwe/css/select_general_from_pool.css

@@ -0,0 +1,64 @@
+@charset "UTF-8";
+.container {
+    width: 1000px;
+    margin: 0 auto;
+}
+
+.card_holder {
+    text-align: center;
+}
+
+.general_card {
+    width: 125px;
+    display: inline-block;
+}
+
+.general_card h4 {
+    margin: 0;
+}
+
+.general_card p {
+    margin: 0;
+}
+
+.general_card .select_btn {
+    width: 100%;
+}
+
+.general_card label {
+    display: block;
+    padding-left: 15px;
+    text-indent: -15px;
+}
+
+.general_card input {
+    width: 13px;
+    height: 13px;
+    padding: 0;
+    margin: 0;
+    vertical-align: bottom;
+    position: relative;
+    top: -1px;
+    *overflow: hidden;
+}
+
+#outdate_token {
+    color: red;
+    display: none;
+}
+
+#left_pad button {
+    display: none;
+}
+
+.custom_picture {
+    display: none;
+}
+
+.custom_personality {
+    display: none;
+}
+
+.custom_stat {
+    display: none;
+}

hwe/d_setting/DB.orig.php

@@ -1,8 +1,16 @@
 <?php
+
 namespace sammo;
 
-class DB{
+//https://hub.packtpub.com/eloquent-without-laravel/
+use Illuminate\Database\Capsule\Manager as Capsule;
+use Illuminate\Events\Dispatcher;
+use Illuminate\Container\Container;
+
+class DB
+{
     private static $uDB = null;
+    private static ?Capsule $uIlluminate = null;
 
     private static $host = '_tK_host_';
     private static $user = '_tK_user_';
@@ -10,11 +18,36 @@ class DB{
     private static $dbName = '_tK_dbName_';
     private static $port = _tK_port_;
     private static $encoding = 'utf8mb4';
+    private static $collation = 'utf8mb4_general_ci';
 
     private static $prefix = '_tK_prefix_';
 
-    private function __construct(){
+    private function __construct()
+    {
+    }
 
+    public static function illuminate(): Capsule
+    {
+        if(self::$uIlluminate !== null){
+            return self::$uIlluminate;
+        }
+        $capsule = new Capsule;
+
+        $capsule->addConnection([
+            'driver'   => 'mysql',
+            'host'     => self::$host,
+            'database' => self::$dbName,
+            'username' => self::$user,
+            'password' => self::$password,
+            'charset'   => self::$encoding,
+            'collation' => self::$collation,
+        ]);
+
+        $capsule->setEventDispatcher(new Dispatcher(new Container));
+        $capsule->setAsGlobal();
+        $capsule->bootEloquent();
+        self::$uIlluminate = $capsule;
+        return $capsule;
     }
 
     /**
@@ -23,12 +56,14 @@ class DB{
      * @return \MeekroDB 
      * @suppress PhanTypeMismatchProperty
      */
-    public static function db(){
+    public static function db()
-        if(self::$uDB === null){
+    {
-            self::$uDB = new \MeekroDB(self::$host,self::$user,self::$password,self::$dbName,self::$port,self::$encoding);
+        if (self::$uDB === null) {
+            self::$uDB = new \MeekroDB(self::$host, self::$user, self::$password, self::$dbName, self::$port, self::$encoding);
             self::$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
 
-            self::$uDB->error_handler= function(){};
+            self::$uDB->error_handler = function () {
+            };
             self::$uDB->throw_exception_on_error = true;
             self::$uDB->throw_exception_on_nonsql_error = true;
         }

hwe/d_setting/VersionGit.dynamic.orig.php

@@ -0,0 +1,6 @@
+<?php
+namespace sammo;
+
+class VersionGit extends VersionGitDynamic {
+}
+//{"version":"dynamic","hash":"dynamic"}

hwe/d_setting/VersionGit.orig.php

@@ -2,8 +2,15 @@
 namespace sammo;
 
 class VersionGit{
-    public static $version = '_tK_verionGit_';
+    static function getVersion()
+    {
+        return '_tK_verionGit_';
+    }
+
+    static function getHash(){
+        return '_tK_hash_';
+    }
 
     private function __construct(){}
 }
-//{"version":"_tK_verionGit_"}
+//{"version":"_tK_verionGit_","hash":"_tK_hash_"}

hwe/d_setting/templates/allButton.php.orig

@@ -1,22 +1,22 @@
 <div class="buttonPlate bg1">
     <div>
-        <a href="a_status.php" target="_blank"><button class="toolbarButton">세력도</button></a>
+        <a href="a_status.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">세력도</button></a>
-        <a href="a_kingdomList.php" target="_blank"><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"><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"><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"><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"><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"><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"><button class="toolbarButton">접속량정보</button></a>
+        <a href="a_traffic.php" target="_blank" class="open-window"><button type="button" class="toolbarButton">접속량정보</button></a>
     </div>
     <div>
-        <a href="/bbs/board" target="_blank"><button class="toolbarButton2">삼모게시판</button></a>
+        <a href="/bbs/board" target="_blank"><button type="button" class="toolbarButton2">삼모게시판</button></a>
-        <a href="/bbs/tip" target="_blank"><button class="toolbarButton">팁/강좌</button></a>
+        <a href="/bbs/tip" target="_blank"><button type="button" class="toolbarButton">팁/강좌</button></a>
-        <a href="/bbs/news" target="_blank"><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 class="toolbarButton">개인 열전</button></a>
+        <a href="/bbs/history2" target="_blank"><button type="button" class="toolbarButton">개인 열전</button></a>
-        <a href="/bbs/history3" target="_blank"><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 class="toolbarButton">패치 내역</button></a>
+        <a href="/bbs/patch" target="_blank"><button type="button" class="toolbarButton">패치 내역</button></a>
-        <a href="../i_other/help.php" target="_blank"><button class="toolbarButton">튜토리얼</button></a>
+        <a href="battle_simulator.php" target="_blank"><button type="button" class="toolbarButton">전투 시뮬레이터</button></a>
-        <a href="<?=$site?>" target="_blank"><button class="toolbarButton"><?=$call?></button></a>
+        <a href="<?=$site?>" target="_blank" class="open-window"><button type="button" class="toolbarButton"><?=$call?></button></a>
     </div>
 </div>

hwe/func.php

@@ -2,6 +2,7 @@
 
 namespace sammo;
 
+use DateTime;
 use sammo\Event\Action;
 
 require_once 'process_war.php';
@@ -185,10 +186,11 @@ function myNationInfo(General $generalObj)
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    $admin = $gameStor->getValues(['startyear', 'year']);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
+    $templates = new \League\Plates\Engine(__DIR__ . '/templates');
 
     $nationID = $generalObj->getNationID();
-    $nation = $db->queryFirstRow('SELECT * FROM nation WHERE nation = %i', $nationID)??getNationStaticInfo(0);
+    $nation = $db->queryFirstRow('SELECT * FROM nation WHERE nation = %i', $nationID) ?? getNationStaticInfo(0);
     $city = $db->queryFirstRow(
         'SELECT COUNT(*) as cnt, SUM(pop) as totpop, SUM(pop_max) as maxpop from city where nation=%i',
         $nationID
@@ -197,8 +199,19 @@ function myNationInfo(General $generalObj)
 
     $topChiefs = Util::convertArrayToDict($db->query('SELECT officer_level, no, name, npc FROM general WHERE nation = %i AND officer_level >= 11', $nationID), 'officer_level');
 
-    $level12Name = key_exists(12, $topChiefs)?getColoredName($topChiefs[12]['name'], $topChiefs[12]['npc']):'-';
+    $level12Name = key_exists(12, $topChiefs) ? getColoredName($topChiefs[12]['name'], $topChiefs[12]['npc']) : '-';
-    $level11Name = key_exists(11, $topChiefs)?getColoredName($topChiefs[11]['name'], $topChiefs[11]['npc']):'-';
+    $level11Name = key_exists(11, $topChiefs) ? getColoredName($topChiefs[11]['name'], $topChiefs[11]['npc']) : '-';
+
+    $impossibleStrategicCommandLists = [];
+    $strategicCommandLists = GameConst::$availableChiefCommand['전략'];
+    $yearMonth = Util::joinYearMonth($admin['year'], $admin['month']);
+    foreach ($strategicCommandLists as $command) {
+        $cmd = buildNationCommandClass($command, $generalObj, $admin, new LastTurn());
+        $nextAvailableTurn = $cmd->getNextAvailableTurn();
+        if ($nextAvailableTurn > $yearMonth) {
+            $impossibleStrategicCommandLists[] = [$cmd->getName(), $nextAvailableTurn - $yearMonth];
+        }
+    }
 
     echo "<table width=498 class='tb_layout bg2 nation_info'>
     <tr>
@@ -227,28 +240,28 @@ function myNationInfo(General $generalObj)
     <tr>
         <td class='bg1 center'><b>총주민</b></td>
         <td class='center'>";
-    echo $nationID===0 ? "해당 없음" : "{$city['totpop']}/{$city['maxpop']}";
+    echo $nationID === 0 ? "해당 없음" : "{$city['totpop']}/{$city['maxpop']}";
     echo "</td>
         <td class='bg1 center'><b>총병사</b></td>
         <td class='center'>";
-    echo $nationID===0 ? "해당 없음" : "{$general['totcrew']}/{$general['maxcrew']}";
+    echo $nationID === 0 ? "해당 없음" : "{$general['totcrew']}/{$general['maxcrew']}";
     echo "</td>
         </td>
     </tr>
     <tr>
         <td class='bg1 center'><b>국 고</b></td>
         <td class='center'>";
-    echo $nationID===0 ? "해당 없음" : "{$nation['gold']}";
+    echo $nationID === 0 ? "해당 없음" : "{$nation['gold']}";
     echo "</td>
         <td class='bg1 center'><b>병 량</b></td>
         <td class='center'>";
-    echo $nationID===0 ? "해당 없음" : "{$nation['rice']}";
+    echo $nationID === 0 ? "해당 없음" : "{$nation['rice']}";
     echo "</td>
     </tr>
     <tr>
         <td class='bg1 center'><b>지급률</b></td>
         <td class='center'>";
-    if ($nationID===0) {
+    if ($nationID === 0) {
         echo "해당 없음";
     } else {
         echo $nation['bill'] == 0 ? "0 %" : "{$nation['bill']} %";
@@ -257,7 +270,7 @@ function myNationInfo(General $generalObj)
         </td>
         <td class='bg1 center'><b>세 율</b></td>
         <td class='center'>";
-    if ($nationID===0) {
+    if ($nationID === 0) {
         echo "해당 없음";
     } else {
         echo $nation['rate'] == 0 ? "0 %" : "{$nation['rate']} %";
@@ -273,7 +286,7 @@ function myNationInfo(General $generalObj)
 
     $nation['tech'] = "$techCall / {$nation['tech']}";
 
-    if ($nationID===0) {
+    if ($nationID === 0) {
         $nation['strategic_cmd_limit'] = "<font color=white>해당 없음</font>";
         $nation['surlimit'] = "<font color=white>해당 없음</font>";
         $nation['scout'] = "<font color=white>해당 없음</font>";
@@ -282,10 +295,23 @@ function myNationInfo(General $generalObj)
     } else {
         if ($nation['strategic_cmd_limit'] != 0) {
             $nation['strategic_cmd_limit'] = "<font color=red>{$nation['strategic_cmd_limit']}턴</font>";
+        } else if ($impossibleStrategicCommandLists) {
+            $nation['strategic_cmd_limit'] = "<font color=yellow>가 능</font>";
         } else {
             $nation['strategic_cmd_limit'] = "<font color=limegreen>가 능</font>";
         }
 
+        if ($impossibleStrategicCommandLists) {
+            $text = [];
+            foreach ($impossibleStrategicCommandLists as [$cmdName, $remainTurn]) {
+                $text[] = "{$cmdName}: {$remainTurn}턴 뒤";
+            }
+            $nation['strategic_cmd_limit'] = $templates->render('tooltip', [
+                'text' => '<span style="text-decoration:underline dashed;">' . $nation['strategic_cmd_limit'] . '</span>',
+                'info' => '<span class="text-left d-inline-block">' . join('<br>', $text) . '</span>',
+            ]);
+        }
+
         if ($nation['surlimit'] != 0) {
             $nation['surlimit'] = "<font color=red>{$nation['surlimit']}턴</font>";
         } else {
@@ -311,11 +337,11 @@ function myNationInfo(General $generalObj)
     <tr>
         <td style='text-align:center;' class='bg1'><b>속 령</b></td>
         <td style='text-align:center;'>";
-    echo $nationID===0 ? "-" : "{$city['cnt']}";
+    echo $nationID === 0 ? "-" : "{$city['cnt']}";
     echo "</td>
         <td style='text-align:center;' class='bg1'><b>장 수</b></td>
         <td style='text-align:center;'>";
-    echo $nationID===0 ? "-" : "{$general['cnt']}";
+    echo $nationID === 0 ? "-" : "{$general['cnt']}";
     echo "</td>
     </tr>
     <tr>
@@ -323,7 +349,7 @@ function myNationInfo(General $generalObj)
         <td style='text-align:center;'>{$nation['power']}</td>
         <td style='text-align:center;' class='bg1'><b>기술력</b></td>
         <td style='text-align:center;'>";
-    echo $nationID===0 ? "-" : "{$nation['tech']}";
+    echo $nationID === 0 ? "-" : "{$nation['tech']}";
     echo "</td>
     </tr>
     <tr>
@@ -879,16 +905,15 @@ function nationMsg(General $general)
     $nationID = $general->getNationID();
     $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
 
-    return $nationStor->notice??'';
+    return $nationStor->notice ?? '';
 }
 
 function banner()
 {
-
     return sprintf(
         '<font size=2>%s %s / %s</font>',
         GameConst::$title,
-        VersionGit::$version,
+        VersionGit::getVersion(),
         GameConst::$banner
     );
 }
@@ -981,7 +1006,7 @@ function increaseRefresh($type = "", $cnt = 1)
     $isunited = $gameStor->isunited;
     $opentime = $gameStor->opentime;
 
-    if ($isunited != 2 && $generalID && $userGrade < 6 && $opentime <= TimeUtil::DatetimeNow()) {
+    if ($isunited != 2 && $generalID && $userGrade < 6 && $opentime <= TimeUtil::now()) {
         $db->update('general', [
             'lastrefresh' => $date,
             'con' => $db->sqleval('con + %i', $cnt),
@@ -1199,17 +1224,17 @@ function updateOnline()
 
     //동접수
     $before5Min = TimeUtil::nowAddMinutes(-5);
-    $onlineUser = $db->query('SELECT no,name,nation FROM general WHERE lastrefresh > %s', $before5Min);
+    $onlineUser = $db->query('SELECT no,name,nation FROM general WHERE lastrefresh > %s AND npc < 2', $before5Min);
     $onlineNum = count($onlineUser);
     $onlineNationUsers = Util::arrayGroupBy($onlineUser, 'nation');
 
-    uasort($onlineNationUsers, function(array $lhs, array $rhs){
+    uasort($onlineNationUsers, function (array $lhs, array $rhs) {
-        return -(count($lhs)<=>count($rhs));
+        return - (count($lhs) <=> count($rhs));
     });
 
     $onlineNation = [];
 
-    foreach($onlineNationUsers as $nationID=>$rawOnlineUser){
+    foreach ($onlineNationUsers as $nationID => $rawOnlineUser) {
         $nationName = getNationStaticInfo($nationID)['name'];
         $onlineNation[] = "【{$nationName}】";
         $userList = join(', ', Util::squeezeFromArray($rawOnlineUser, 'name'));
@@ -1231,9 +1256,12 @@ function addAge()
     //나이와 호봉 증가
     $db->update('general', [
         'age' => $db->sqleval('age+1'),
-        'belong' => $db->sqleval('belong+1')
     ], true);
 
+    $db->update('general', [
+        'belong' => $db->sqleval('belong+1')
+    ], 'nation != 0');
+
     [$startYear, $year, $month] = $gameStor->getValuesAsArray(['startyear', 'year', 'month']);
 
     if ($year >= $startYear + 3) {
@@ -1241,7 +1269,7 @@ function addAge()
             $generalID = $general['no'];
             $special = SpecialityHelper::pickSpecialDomestic(
                 $general,
-                (Json::decode($general['aux'])['prev_types_special2'])??[]
+                (Json::decode($general['aux'])['prev_types_special']) ?? []
             );
             $specialClass = buildGeneralSpecialDomesticClass($special);
             $specialText = $specialClass->getName();
@@ -1258,16 +1286,25 @@ function addAge()
 
         foreach ($db->query('SELECT no,name,nation,leadership,strength,intel,npc,dex1,dex2,dex3,dex4,dex5,aux from general where specage2<=age and special2=%s', GameConst::$defaultSpecialWar) as $general) {
             $generalID = $general['no'];
-            $special2 = SpecialityHelper::pickSpecialWar(
+            $generalAux = Json::decode($general['aux']);
-                $general,
+
-                (Json::decode($general['aux'])['prev_types_special2'])??[]
+            $updateVars = [];
-            );
+            if (key_exists('inheritSpecificSpecialWar', $generalAux)) {
+                $special2 = $generalAux['inheritSpecificSpecialWar'];
+                unset($generalAux['inheritSpecificSpecialWar']);
+                $updateVars['aux'] = Json::encode($generalAux);
+            } else {
+                $special2 = SpecialityHelper::pickSpecialWar(
+                    $general,
+                    ($generalAux['prev_types_special2']) ?? []
+                );
+            }
+
             $specialClass = buildGeneralSpecialWarClass($special2);
             $specialText = $specialClass->getName();
 
-            $db->update('general', [
+            $updateVars['special2'] = $special2;
-                'special2' => $special2
+            $db->update('general', $updateVars, 'no=%i', $general['no']);
-            ], 'no=%i', $general['no']);
 
             $logger = new ActionLogger($generalID, $general['nation'], $year, $month);
 
@@ -1311,17 +1348,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) {
+    if($tournament != 0){
-        $type = rand() % 5; //  0 : 전력전, 1 : 통솔전, 2 : 일기토, 3 : 설전
+        return;
-        //전력전 40%, 통, 일, 설 각 20%
-        if ($type > 3) {
-            $type = 0;
-        }
-        startTournament($admin['tnmt_trig'], $type);
     }
+    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)
@@ -1336,8 +1385,11 @@ function CheckHall($no)
         ["warnum", 'rank'],
         ["killnum", 'rank'],
         ["winrate", 'calc'],
+        ["occupied", 'rank'],
         ["killcrew", 'rank'],
         ["killrate", 'calc'],
+        ["killcrew_person", 'rank'],
+        ["killrate_person", 'calc'],
         ["dex1", 'natural'],
         ["dex2", 'natural'],
         ["dex3", 'natural'],
@@ -1380,6 +1432,9 @@ function CheckHall($no)
     $kill = $generalObj->getRankVar('killcrew');
     $death = Util::valueFit($generalObj->getRankVar('deathcrew'), 1);
 
+    $killPerson = $generalObj->getRankVar('killcrew_person');
+    $deathPerson = Util::valueFit($generalObj->getRankVar('deathcrew_person'), 1);
+
     $tt = Util::valueFit($ttw + $ttd + $ttl, 1);
     $tl = Util::valueFit($tlw + $tld + $tll, 1);
     $ts = Util::valueFit($tsw + $tsd + $tsl, 1);
@@ -1393,6 +1448,7 @@ function CheckHall($no)
     $calcVar['betrate'] = $betWinGold / $betGold;
     $calcVar['winrate'] = $win / $war;
     $calcVar['killrate'] = $kill / $death;
+    $calcVar['killrate_person'] = $killPerson / $deathPerson;
 
     if ($generalObj instanceof DummyGeneral) {
         return;
@@ -1505,7 +1561,18 @@ function giveRandomUniqueItem(General $general, string $acquireType): bool
     //일단은 '획득' 시에만 동작하므로 이대로 사용하기로...
     $occupiedUnique = [];
 
+    $invalidItemType = [];
     foreach (array_keys(GameConst::$allItems) as $itemType) {
+        $ownItem = $general->getItems()[$itemType] ?? null;
+        if ($ownItem !== null && !$ownItem->isBuyable()) {
+            $invalidItemType[$itemType] = true;
+        }
+    }
+
+    foreach (array_keys(GameConst::$allItems) as $itemType) {
+        if (key_exists($itemType, $invalidItemType)) {
+            continue;
+        }
         foreach ($db->queryAllLists('SELECT %b, count(*) as cnt FROM general GROUP BY %b', $itemType, $itemType) as [$itemCode, $cnt]) {
             $itemClass = buildItemClass($itemCode);
             if (!$itemClass) {
@@ -1519,7 +1586,13 @@ function giveRandomUniqueItem(General $general, string $acquireType): bool
     }
 
     foreach (GameConst::$allItems as $itemType => $itemCategories) {
+        if (key_exists($itemType, $invalidItemType)) {
+            continue;
+        }
         foreach ($itemCategories as $itemCode => $cnt) {
+            if ($cnt == 0) {
+                continue;
+            }
             if (!key_exists($itemCode, $occupiedUnique)) {
                 $availableUnique[] = [[$itemType, $itemCode], $cnt];
                 continue;
@@ -1533,9 +1606,19 @@ function giveRandomUniqueItem(General $general, string $acquireType): bool
     }
 
     if (!$availableUnique) {
+        if ($general->getAuxVar('inheritRandomUnique')) {
+            $general->setAuxVar('inheritRandomUnique', null);
+            $general->increaseInheritancePoint('previous', GameConst::$inheritItemRandomPoint);
+            $userLogger = new UserLogger($general->getVar('owner'));
+            $userLogger->push(sprintf("얻을 유니크가 없어 %d 포인트 반환", GameConst::$inheritItemRandomPoint), "inheritPoint");
+        }
         return false;
     }
 
+    if ($general->getAuxVar('inheritRandomUnique')) {
+        $general->setAuxVar('inheritRandomUnique', null);
+    }
+
     [$itemType, $itemCode] = Util::choiceRandomUsingWeightPair($availableUnique);
 
     $nationName = $general->getStaticNation()['name'];
@@ -1559,6 +1642,207 @@ function giveRandomUniqueItem(General $general, string $acquireType): bool
     return true;
 }
 
+function rollbackInheritUniqueTrial(General $general, string $itemKey, string $reason)
+{
+
+    $ownerID = $general->getVar('owner');
+
+    $db = DB::db();
+
+    $itemTrials = $general->getAuxVar('inheritUniqueTrial');
+    LogText("선택유니크 롤백:{$ownerID}", [$itemKey, $itemTrials]);
+    unset($itemTrials[$itemKey]);
+    if(count($itemTrials) == 0){
+        $itemTrials = null;
+    }
+    $general->setAuxVar('inheritUniqueTrial', $itemTrials);
+
+
+    $trialStor = KVStorage::getStorage($db, "ut_{$itemKey}");
+    $ownTrial = $trialStor->getValue("u{$ownerID}");
+
+    $itemObj = buildItemClass($itemKey);
+    $itemName = $itemObj->getName();
+
+    if ($ownTrial) {
+        //두 값이 general, KVStorage 둘다 있고, 이중에선 KVStorage 값을 기준으로 하자 따르자
+        [,, $amount] = $ownTrial;
+        $trialStor->deleteValue("u{$ownerID}");
+        $general->increaseInheritancePoint('previous', $amount);
+        LogText("선택유니크 롤백포인트:{$ownerID}", $amount);
+
+        $userLogger = new UserLogger($ownerID);
+        $userLogger->push("{$itemName} 입찰에 사용한 {$amount} 포인트 반환", "inheritPoint");
+    }
+
+    //메시지
+
+    $staticNation = $general->getStaticNation();
+
+    $unlimited = new \DateTime('9999-12-31');
+    $src = new MessageTarget(0, '', 0, 'System', '#000000');
+    $dest = new MessageTarget($general->getID(), $general->getName(), $general->getNationID(), $staticNation['name'], $staticNation['color'], GetImageURL($general->getVar('imgsvr'), $general->getVar('picture')));
+    $josaUl = JosaUtil::pick($itemName, '을');
+    $msg = new Message(
+        Message::MSGTYPE_PRIVATE,
+        $src,
+        $dest,
+        "{$itemName}{$josaUl} 얻지 못했습니다. {$reason}",
+        new DateTime(),
+        $unlimited,
+        []
+    );
+
+    $general->applyDB($db);
+    $msg->send(true);
+}
+
+function tryRollbackInheritUniqueItem(General $general): void
+{
+    tryInheritUniqueItem($general, 'Rollback', true);
+}
+
+function tryInheritUniqueItem(General $general, string $acquireType = '아이템', bool $justRollback = false): bool
+{
+    $ownerID = $general->getVar('owner');
+    if (!$ownerID) {
+        LogText("선택유니크 실패???: {$ownerID}", $general->getName());
+        return false;
+    }
+
+    $itemTrials = $general->getAuxVar('inheritUniqueTrial') ?? [];
+    arsort($itemTrials);
+    LogText("선택유니크항목: {$ownerID}", $itemTrials);
+
+    $db = DB::db();
+
+    $ownTarget = null;
+    $ownType = null;
+
+    foreach ($itemTrials as $itemKey => $amount) {
+        $availableItemTypes = [];
+        $reasons = [];
+        foreach (GameConst::$allItems as $itemType => $itemList) {
+            //아직은 그런 경우는 없지만 동일 유니크를 여러 부위에 장착할 수 있을지도 모름
+            if (!key_exists($itemKey, $itemList)) {
+                continue;
+            }
+
+            $ownItem = $general->getItem($itemType);
+            if ($ownItem->getRawClassName() == $itemKey) {
+                $reasons[] = '이미 그 유니크를 가지고 있습니다.';
+                continue;
+            }
+            /*
+            if (!$ownItem->isBuyable()) {
+                $reasons[] = '이미 다른 유니크를 가지고 있습니다.';
+                continue;
+            }
+            */
+
+            $availableCnt = $itemList[$itemKey];
+            $occupiedCnt = $db->queryFirstField('SELECT count(*) FROM general WHERE %b = %s', $itemType, $itemKey);
+            if ($occupiedCnt >= $availableCnt) {
+                $reasons[] = '그 유니크는 모두 점유되었습니다.';
+                continue;
+            }
+            $availableItemTypes[] = $itemType;
+        }
+
+        if (!$availableItemTypes) {
+            rollbackInheritUniqueTrial($general, $itemKey, join(' ', $reasons));
+            continue;
+        }
+        $reasons = [];
+
+        $itemType = Util::choiceRandom($availableItemTypes);
+
+        $trialStor = KVStorage::getStorage($db, "ut_{$itemKey}"); //혹시 itemKey의 크기가 37이 넘을 수 있을까?
+        $anyTrials = $trialStor->getAll();
+        if (!$anyTrials) {
+            //순서가 꼬였던 모양, 실제 값은 storage를 우선시하자
+            rollbackInheritUniqueTrial($general, $itemKey, '절차상의 오류입니다.');
+            continue;
+        }
+
+        //XXX: 정렬할 필요 없지 않나?
+        usort($anyTrials, function ($lhsTrial, $rhsTrial) {
+            [,, $lhsAmount] = $lhsTrial;
+            [,, $rhsAmount] = $rhsTrial;
+            return $rhsAmount <=> $lhsAmount; //큰 값이 앞에 오도록
+        });
+
+        LogText("선택유니크상태 {$ownerID} {$itemKey}", $anyTrials);
+
+        //공동 1등인데 본인이 있을 수도 있다.
+        [,, $topAmount] = $anyTrials[0];
+        if ($amount < $topAmount) {
+            $compAmount = $topAmount / $amount;
+            if ($compAmount > 2.0) {
+                $compText = '엄청난 차이로 ';
+            } else if ($compAmount > 1.2) {
+                $compText = '큰 차이로 ';
+            } else if ($compAmount > 1.05) {
+                $compText = '';
+            } else {
+                $compText = '아슬아슬한 차이로 ';
+            }
+            rollbackInheritUniqueTrial($general, $itemKey, "{$compText}상위 입찰한 장수가 있습니다.");
+            continue;
+        }
+
+        //내가 1위다
+        if ($ownTarget !== null) {
+            //이미 다른 아이템을 얻기로 되어있다.
+            continue;
+        }
+        $ownTarget = $itemKey;
+        $ownType = $itemType;
+    }
+    unset($itemKey);
+    unset($itemType);
+
+    if ($ownTarget === null) {
+        return false;
+    }
+    if ($justRollback) {
+        return false;
+    }
+
+    LogText("선택유니크획득{$ownerID}", $ownTarget);
+
+    $trialStor = KVStorage::getStorage($db, "ut_{$ownTarget}");
+    $trialStor->deleteValue("u{$ownerID}");
+
+    //rollbackInheritUniqueTrial 과정 때문에 새로 받아와야함
+    $itemTrials = $general->getAuxVar('inheritUniqueTrial');
+    unset($itemTrials[$ownTarget]);
+    $general->setAuxVar('inheritUniqueTrial', $itemTrials);
+
+    $nationName = $general->getStaticNation()['name'];
+    $generalName = $general->getName();
+    $josaYi = JosaUtil::pick($generalName, '이');
+    $itemObj = buildItemClass($ownTarget);
+    $itemName = $itemObj->getName();
+    $itemRawName = $itemObj->getRawName();
+    $josaUl = JosaUtil::pick($itemRawName, '을');
+
+
+    $general->setVar($ownType, $ownTarget);
+
+
+    $logger = $general->getLogger();
+
+    $logger->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 습득했습니다!");
+    $logger->pushGeneralHistoryLog("<C>{$itemName}</>{$josaUl} 습득");
+    $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <C>{$itemName}</>{$josaUl} 습득했습니다!");
+    $logger->pushGlobalHistoryLog("<C><b>【{$acquireType}】</b></><D><b>{$nationName}</b></>의 <Y>{$generalName}</>{$josaYi} <C>{$itemName}</>{$josaUl} 습득했습니다!");
+
+    $general->applyDB($db);
+
+    return true;
+}
+
 function tryUniqueItemLottery(General $general, string $acquireType = '아이템'): bool
 {
     $db = DB::db();
@@ -1568,16 +1852,46 @@ function tryUniqueItemLottery(General $general, string $acquireType = '아이템
         return false;
     }
 
-    if ($general->getNPCType() > 6) {
+    $itemTypeCnt = count(GameConst::$allItems);
+
+    [$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;
+    }
+
+    $trialCnt = Util::valueFit($itemTypeCnt, null, $maxTrialCountByYear);
+    $maxCnt = $itemTypeCnt;
+
+    foreach ($general->getItems() as $item) {
+        if (!$item->isBuyable()) {
+            $trialCnt -= 1;
+            $maxCnt -= 1;
+        }
+    }
+
+    if ($trialCnt <= 0) {
+        LogText("{$general->getName()}, {$general->getID()} 모든 아이템", $trialCnt);
+        if ($general->getAuxVar('inheritRandomUnique')) {
+            $general->setAuxVar('inheritRandomUnique', null);
+            $general->increaseInheritancePoint('previous', GameConst::$inheritItemRandomPoint);
+            $userLogger = new UserLogger($general->getVar('owner'));
+            $userLogger->push(sprintf("유니크를 얻을 공간이 없어 %d 포인트 반환", GameConst::$inheritItemRandomPoint), "inheritPoint");
+        }
+        tryRollbackInheritUniqueItem($general);
         return false;
     }
 
-    foreach ($general->getItems() as $item) {
+    $inheritUnique = $general->getAuxVar('inheritUniqueTrial');
-        if (!$item) {
+    if ($acquireType != '설문조사' && $inheritUnique && count($inheritUnique)) {
-            continue;
+        $trialResult = tryInheritUniqueItem($general, $acquireType);
-        }
+        if ($trialResult) {
-        if (!$item->isBuyable()) {
+            return true;
-            return false;
         }
     }
 
@@ -1585,24 +1899,42 @@ function tryUniqueItemLottery(General $general, string $acquireType = '아이템
     $genCount = $db->queryFirstField('SELECT count(*) FROM general WHERE npc<2');
 
     if ($scenario < 100) {
-        $prob = 1 / ($genCount * 5); // 5~6개월에 하나씩 등장
+        $prob = 1 / ($genCount * 3 * $itemTypeCnt); // 3~4개월에 하나씩 등장
     } else {
-        $prob = 1 / $genCount; // 1~2개월에 하나씩 등장
+        $prob = 1 / ($genCount * $itemTypeCnt); // 1~2개월에 하나씩 등장
     }
 
     if ($acquireType == '설문조사') {
-        $prob = 1 / ($genCount * 0.7 / 3); // 투표율 70%, 설문조사 한번에 2~3개 등장
+        $prob = 1 / ($genCount * $itemTypeCnt * 0.7 / 3); // 투표율 70%, 설문조사 한번에 2~3개 등장
     } else if ($acquireType == '랜덤 임관') {
-        $prob = 1 / ($genCount / 10 / 2); // 랜임시 2개(10%) 등장(200명중 20명 랜임시도?)
+        $prob = 1 / ($genCount * $itemTypeCnt / 10 / 2); // 랜임시 2개(10%) 등장(200명중 20명 랜임시도?)
     } else if ($acquireType == '건국') {
-        $prob = 1 / ($genCount / 10 / 4); // 건국시 4개(20%) 등장(200명시 20국 정도 됨)
+        $prob = 1 / ($genCount * $itemTypeCnt / 10 / 4); // 건국시 4개(20%) 등장(200명시 20국 정도 됨)
     }
 
-    $prob = Util::valueFit($prob, null, 1 / 3);
+    $prob = Util::valueFit($prob, null, 1 / 4); //최대치 감소
+    $result = false;
 
-    if (!Util::randBool($prob)) {
+    $prob /= sqrt(2);
+    $moreProb = pow(2, 1 / 4);
+
+    if ($general->getAuxVar('inheritRandomUnique')) {
+        //포인트로 랜덤 유니크 획득
+        $prob = 1;
+    }
+
+    foreach (Util::range($maxCnt) as $_idx) {
+        if (Util::randBool($prob)) {
+            $result = true;
+            break;
+        }
+        $prob *= $moreProb;
+    }
+    if (!$result) {
+        LogText("{$general->getName()}, {$general->getID()} 유니크 실패 {$maxCnt}", $prob);
         return false;
     }
+    LogText("{$general->getName()}, {$general->getID()} 유니크 성공 {$maxCnt}", $prob);
 
     return giveRandomUniqueItem($general, $acquireType);
 }
@@ -1615,7 +1947,7 @@ function getAdmin()
 }
 
 /** @return General[] */
-function deleteNation(General $lord, bool $applyDB):array
+function deleteNation(General $lord, bool $applyDB): array
 {
     $lordID = $lord->getID();
     $nationID = $lord->getNationID();
@@ -1640,7 +1972,8 @@ function deleteNation(General $lord, bool $applyDB):array
             $nationID,
             $lordID
         ),
-        ['npc', 'gold', 'rice', 'experience', 'explevel', 'dedication', 'dedlevel', 'aux'], 1
+        ['npc', 'gold', 'rice', 'experience', 'explevel', 'dedication', 'dedlevel', 'belong', 'aux'],
+        1
     );
     $nationGeneralList[$lordID] = $lord;
 
@@ -1656,7 +1989,14 @@ function deleteNation(General $lord, bool $applyDB):array
     $destroyHistoryLog = "<D><b>{$nationName}</b></>{$josaYi} <R>멸망</>";
 
     // 전 장수 재야로
-    foreach($nationGeneralList as $general){
+    foreach ($nationGeneralList as $general) {
+        $general->setAuxVar(
+            'max_belong',
+            max(
+                $general->getVar('belong'),
+                $general->getAuxVar('max_belong') ?? 0
+            )
+        );
         $general->setVar('belong', 0);
         $general->setVar('troop', 0);
         $general->setVar('officer_level', 0);
@@ -1667,7 +2007,7 @@ function deleteNation(General $lord, bool $applyDB):array
         $logger->pushGeneralActionLog($destroyLog, ActionLogger::PLAIN);
         $logger->pushGeneralHistoryLog($destroyHistoryLog);
 
-        if($applyDB){
+        if ($applyDB) {
             $general->applyDB($db);
         }
     }
@@ -1704,7 +2044,7 @@ function nextRuler(General $general)
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
+    [$year, $month, $fiction] = $gameStor->getValuesAsArray(['year', 'month', 'fiction']);
     $nation = $general->getStaticNation();
     $nationName = $nation['name'];
     $nationID = $nation['nation'];
@@ -1712,7 +2052,7 @@ function nextRuler(General $general)
     $candidate = null;
 
     //npc or npc유저인 경우 후계 찾기
-    if ($general->getNPCType() > 0) {
+    if (!$fiction && $general->getNPCType() > 0) {
         $candidate = $db->queryFirstRow(
             'SELECT no,name,officer_level,IF(ABS(affinity-%i)>75,150-ABS(affinity-%i),ABS(affinity-%i)) as npcmatch2 from general where nation=%i and officer_level!=12 and 1 <= npc and npc<=3 order by npcmatch2,rand() LIMIT 1',
             $general->getVar('affinity'),
@@ -2086,7 +2426,7 @@ function getRandTurn($term, ?\DateTimeInterface $baseDateTime = null)
     $randSecond = Util::randRangeInt(0, 60 * $term - 1);
     $randFraction = Util::randRangeInt(0, 999999) / 1000000; //6자리 소수
 
-    return $baseDateTime->add(TimeUtil::secondsToDateInterval($randSecond + $randFraction))->format('Y-m-d H:i:s');
+    return TimeUtil::format($baseDateTime->add(TimeUtil::secondsToDateInterval($randSecond + $randFraction)), true);
 }
 
 function getRandTurn2($term, ?\DateTimeInterface $baseDateTime = null)
@@ -2101,5 +2441,5 @@ function getRandTurn2($term, ?\DateTimeInterface $baseDateTime = null)
     $randSecond = Util::randRangeInt(0, 60 * $term - 1);
     $randFraction = Util::randRangeInt(0, 999999) / 1000000; //6자리 소수
 
-    return $baseDateTime->sub(TimeUtil::secondsToDateInterval($randSecond + $randFraction))->format('Y-m-d H:i:s');
+    return $baseDateTime->sub(TimeUtil::secondsToDateInterval($randSecond + $randFraction))->format('Y-m-d H:i:s.u');
 }

hwe/func_command.php

@@ -232,7 +232,7 @@ function checkCommandArg(?array $arg):?string{
     }
     $defaultCheck = [
         /*'string'=>[
-            'nationName', 'optionText', 'itemType', 'nationType'
+            'nationName', 'optionText', 'itemType', 'nationType', 'commandType',
         ],*/
         'integer'=>[
             'crewType', 'destGeneralID', 'destCityID', 'destNationID',
@@ -284,14 +284,14 @@ function setGeneralCommand(int $generalID, array $rawTurnList, string $command,
             $turnList[$turnIdx] = true;
         }
         else if($turnIdx == -1){
-            //홀수
+            //홀수, 0부터 맞다.
-            foreach(Util::range(1, GameConst::$maxTurn, 2) as $subIdx){
+            foreach(Util::range(0, GameConst::$maxTurn, 2) as $subIdx){
                 $turnList[$subIdx] = true;
             }
         }
         else if($turnIdx == -2){
-            //짝수
+            //짝수, 1부터 맞다.
-            foreach(Util::range(0, GameConst::$maxTurn, 2) as $subIdx){
+            foreach(Util::range(1, GameConst::$maxTurn, 2) as $subIdx){
                 $turnList[$subIdx] = true;
             }
         }

hwe/func_converter.php

@@ -378,6 +378,30 @@ function buildWarUnitTriggerClass(?string $type, WarUnit $unit, ?array $args = n
     return $class->newInstanceArgs(array_merge([$unit], $args));
 }
 
+function getGeneralPoolClass(string $type){
+    static $basePath = __NAMESPACE__.'\\GeneralPool\\';
+    $classPath = ($basePath.$type);
+
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    throw new \InvalidArgumentException("{$type}은 GeneralPool이 아님");
+}
+
+/**
+ * @param \MeekroDB $db
+ * @param int $owner
+ * @param int $pickCnt
+ * @param null|string $prefix
+ * @return AbsGeneralPool[]
+ */
+function pickGeneralFromPool(\MeekroDB $db, int $owner, int $pickCnt, ?string $prefix=null):array{
+    /** @var AbsGeneralPool */
+    $class = getGeneralPoolClass(GameConst::$targetGeneralPool);
+    return $class::pickGeneralFromPool($db, $owner, $pickCnt, $prefix);
+}
+
 function countPureGeneralFromRawList(?array $rawGeneralList=null):int{
     if(!$rawGeneralList){
         return 0;

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]){
+    foreach ($db->queryAllLists('SELECT nation, count(*) FROM general WHERE npc != 5 GROUP BY nation') as [$nationID, $gennum]) {
-        if($nationID === 0){
+        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.`npc` < 2 THEN 1.5 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)*2 + (SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/2)
+                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]){
+    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){
+        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,
+            'state' => 2,
-            'term'=>0,
+            'term' => 0,
         ], '(me=%i AND you=%i) OR (you=%i AND me=%i)', $me, $you, $me, $you);
     }
 
@@ -464,17 +468,17 @@ function postUpdateMonthly()
 
     //사상자 초기화, 외교 기한-1
     $db->update('diplomacy', [
-        'dead'=>$db->sqleval('if(state!=0, 0, dead)'),
+        'dead' => $db->sqleval('if(state!=0, 0, dead)'),
-        'term'=>$db->sqleval('greatest(0, term-1)'),
+        '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,
+        'state' => 0,
-        'term'=>6,
+        'term' => 6,
     ], 'state = 1 AND term = 0');
 
     //초반이후 방랑군 자동 해체
@@ -516,6 +520,7 @@ function checkWander()
             $logger = $wanderer->getLogger();
             $logger->pushGeneralActionLog('초반 제한후 방랑군은 자동 해산됩니다.', ActionLogger::PLAIN);
             $wanderCmd->run();
+            $wanderCmd->setNextAvailable();
         }
     }
 
@@ -565,7 +570,9 @@ function updateNationState()
             $nation['level'] = $nationlevel;
 
             $updateVals = [
-                'level' => $nationlevel
+                'level' => $nationlevel,
+                'gold' => $db->sqleval('gold + %i', $nationlevel * 1000),
+                'rice' => $db->sqleval('rice + %i', $nationlevel * 1000),
             ];
 
             switch ($nationlevel) {
@@ -620,30 +627,49 @@ function updateNationState()
                     $nation['nation'],
                     $targetKillTurn
                 );
-                $nationGenList = General::createGeneralObjListFromDB($nationGenIDList, ['belong'], 2);
+                $nationGenList = General::createGeneralObjListFromDB($nationGenIDList, ['belong', 'npc', 'aux'], 2);
+                $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) {
-                    $hasUnique = false;
+                    if ($nationGen->getVar('officer_level') == 12) {
+                        $chiefID = $nationGen->getID();
+                    }
+                    $trialCnt = min($maxTrialCountByYear, count(GameConst::$allItems));
+
                     foreach ($nationGen->getItems() as $item) {
                         if (!$item->isBuyable()) {
-                            $hasUnique = true;
+                            $trialCnt -= 1;
-                            break;
                         }
                     }
-                    if ($hasUnique) {
+
+                    if ($trialCnt <= 0) {
                         continue;
                     }
 
                     $score = $nationGen->getVar('belong') + 5;
 
                     if ($nationGen->getVar('officer_level') == 12) {
-                        $score += 200; //NOTE: 꼬우면 군주하세요.
+                        $score += 100; //NOTE: 꼬우면 군주하세요.
                     } else if ($nationGen->getVar('officer_level') == 11) {
-                        $score += 70;
+                        $score += 50;
                     } else if ($nationGen->getVar('officer_level') > 4) {
                         $score += 35;
                     }
+
+                    $score *= $trialCnt;
+
                     $uniqueLotteryWeightList[$nationGen->getID()] = [$nationGen, $score];
                 }
 
@@ -658,6 +684,12 @@ function updateNationState()
                     giveRandomUniqueItem($winnerObj, '작위보상');
                     $winnerObj->applyDB($db);
                 }
+
+                if ($chiefID) {
+                    $chiefObj = General::createGeneralObjFromDB($chiefID, ['belong', 'npc', 'aux'], 2);
+                    $chiefObj->increaseInheritancePoint('unifier', 250 * $levelDiff);
+                    $chiefObj->applyDB($db);
+                }
             }
         }
 
@@ -677,38 +709,30 @@ function updateNationState()
 
             while ($assemblerCnt < $maxAssemblerCnt) {
                 $lastAssemblerID += 1;
-                $npcObj = new Scenario\NPC(
+                $npcObj = new Scenario\GeneralBuilder(
-                    999,
                     sprintf('부대장%4d', $lastAssemblerID),
+                    false,
                     null,
-                    $nation['nation'],
+                    $nation['nation']
-                    null,
-                    10,
-                    10,
-                    10,
-                    1,
-                    $admin['year'] - 15,
-                    $admin['year'] + 15,
-                    '은둔',
-                    '척사'
                 );
-                $npcObj->killturn = 70;
+                $npcObj->setAffinity(999)->setStat(10, 10, 10)
-                $npcObj->gold = 0;
+                    ->setSpecialSingle('척사')->setEgo('che_은둔')
-                $npcObj->rice = 0;
+                    ->setKillturn(70)->setGoldRice(0, 0)
-                $npcObj->npc = 5;
+                    ->setNPCType(5)->fillRemainSpecAsZero($admin);
                 $npcObj->build($admin);
-                $npcID = $npcObj->generalID;
+                $npcID = $npcObj->getGeneralID();
 
                 $db->insert('troop', [
                     'troop_leader' => $npcID,
-                    'name' => $npcObj->realName,
+                    'name' => $npcObj->getGeneralName(),
                     'nation' => $nation['nation'],
                 ]);
                 $db->update('general', [
                     'troop' => $npcID
                 ], 'no=%i', $npcID);
 
-                //TODO: 5턴간 집합턴 입력
+                $cmd = buildGeneralCommandClass('che_집합', General::createGeneralObjFromDB($npcID), $admin);
+                _setGeneralCommand($cmd, iterator_to_array(Util::range(GameConst::$maxTurn)));
                 $assemblerCnt += 1;
                 $gameStor->assembler_id = $lastAssemblerID;
             }
@@ -983,6 +1007,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) {
+                $genObj->increaseInheritancePoint('unifier', 2000);
+            };
+        }
+        $genObj->mergeTotalInheritancePoint();
+    }
+
     $gameStor->isunited = 2;
     $gameStor->conlimit = $gameStor->conlimit * 100;
 
@@ -992,7 +1025,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(
@@ -1008,7 +1041,7 @@ function checkEmperior()
     $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 = "warnum" AND value > 0 ORDER BY value DESC LIMIT 5',
+        WHERE rank_data.nation_id = %i AND rank_data.type = "killnum" AND value > 0 ORDER BY value DESC LIMIT 5',
         $nationID
     ); // 오호장군
 
@@ -1036,8 +1069,7 @@ function checkEmperior()
         $generalLogger->flush();
     }
 
-    $gen = join(', ', array_column($rawGeneral, 'name'));
+    $gen = join(', ', array_column($rawGeneralList, 'name'));
-    $nation['type'] = getNationType($nation['type']);
 
     $stat = $db->queryFirstRow('SELECT max(nation_count) as nc, max(gen_count) as gc FROM statistic');
     $genCnt = $db->queryFirstField('SELECT count(*) FROM general');
@@ -1134,3 +1166,54 @@ function checkEmperior()
     //연감 월결산
     LogHistory();
 }
+
+function resetInheritanceUser(int $userID, bool $isRebirth = false): float
+{
+    $rebirthDegraded = [
+        'dex' => 0.5,
+    ];
+
+    $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$userID}");
+    $totalPoint = 0;
+    $allPoints = $inheritStor->getAll();
+    if (!$allPoints || count($allPoints) == 0) {
+        //비었으므로 리셋 안함
+        return 0;
+    }
+    if (count($allPoints) == 1 && key_exists('previous', $allPoints)) {
+        //이미 리셋되었으므로 리셋 안함
+        return $allPoints['previous'][0];
+    }
+
+    $userLogger = new UserLogger($userID);
+
+    $previousPoint = ($allPoints['previous'] ?? [0, 0])[0];
+
+    foreach ($allPoints as $key => [$value,]) {
+        if ($isRebirth && key_exists($key, $rebirthDegraded)) {
+            $value *= $rebirthDegraded[$key];
+        }
+        $keyText = General::INHERITANCE_KEY[$key][2];
+        $userLogger->push("{$keyText} 포인트 {$value} 증가", "inheritPoint");
+        $totalPoint += $value;
+    }
+    $totalPoint = Util::toInt($totalPoint);
+    $userLogger->push("포인트 {$previousPoint} => {$totalPoint}", "inheritPoint");
+    $userLogger->flush();
+
+    $inheritStor->resetValues();
+    $inheritStor->setValue('previous', [$totalPoint, null]);
+    return $totalPoint;
+}
+
+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) {
+        $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);
@@ -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']);
@@ -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

@@ -39,10 +39,26 @@ function bar($per, $h=7) {
 }
 
 
-function optionsForCities() {
+function optionsForCities(callable $infoCall=null) {
-    return join('', array_map(function($city){
+
-        return "<option value='{$city->id}'>{$city->name}</option>";
+    if(!$infoCall){
-    }, CityConst::all()));
+        return join('', array_map(function($city){
+            return "<option value='{$city->id}'>{$city->name}</option>";
+        }, CityConst::all()));
+    }
+
+    $infoList = [];
+    $noInfoList = [];
+    foreach(CityConst::all() as $city){
+        $info = $infoCall($city);
+        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));    
 }
 
 function Submit($url, $msg="", $msg2="") {

hwe/func_template.php

@@ -217,10 +217,14 @@ function formatDefenceTrain(int $value): string
 {
     if ($value === 999) {
         return "×";
+    } else if ($value >= 90){
+        return "☆";
     } else if ($value >= 80) {
         return "◎";
-    } else {
+    } else if ($value >= 60) {
         return "○";
+    } else{
+        return "△";
     }
 }
 

hwe/func_time_event.php

@@ -78,6 +78,7 @@ function processGoldIncome() {
             // 실지급률
             $ratio = $realoutcome / $originoutcome;
         }
+        $nation['gold'] = Util::valueFit($nation['gold'], GameConst::$basegold);
         $adminLog[] = StringUtil::padStringAlignRight((string)$nation['name'],12," ")
             ." // 세금 : ".StringUtil::padStringAlignRight((string)$income,6," ")
             ." // 세출 : ".StringUtil::padStringAlignRight((string)$originoutcome,6," ")
@@ -87,6 +88,8 @@ function processGoldIncome() {
 
         $incomeText = number_format($income);
         $incomeLog = "이번 수입은 금 <C>$incomeText</>입니다.";
+        $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
+        $nationStor->prev_income_gold = $income;
 
         $db->update('nation', [
             'gold'=>$nation['gold']
@@ -353,6 +356,7 @@ function processRiceIncome() {
             // 실지급률
             $ratio = $realoutcome / $originoutcome;
         }
+        $nation['rice'] = Util::valueFit($nation['rice'], GameConst::$baserice);
         $adminLog[] = StringUtil::padStringAlignRight($nation['name'],12," ")
             ." // 세곡 : ".StringUtil::padStringAlignRight((string)$income,6," ")
             ." // 세출 : ".StringUtil::padStringAlignRight((string)$originoutcome,6," ")
@@ -362,6 +366,8 @@ function processRiceIncome() {
 
         $incomeText = number_format($income);
         $incomeLog = "이번 수입은 쌀 <C>$incomeText</>입니다.";
+        $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
+        $nationStor->prev_income_rice = $income;
 
         $db->update('nation', [
             'rice'=>$nation['rice']
@@ -528,36 +534,36 @@ function disaster() {
     $targetCityNames = "<G><b>".join(' ', Util::squeezeFromArray($targetCityList, 'name'))."</b></>";
     $disasterTextList = [
         1 => [
-            ['재난', 4, '역병이 발생하여 도시가 황폐해지고 있습니다.'],
+            ['<M><b>【재난】</b></>', 4, '역병이 발생하여 도시가 황폐해지고 있습니다.'],
-            ['재난', 5, '지진으로 피해가 속출하고 있습니다.'],
+            ['<M><b>【재난】</b></>', 5, '지진으로 피해가 속출하고 있습니다.'],
-            ['재난', 3, '추위가 풀리지 않아 얼어죽는 백성들이 늘어나고 있습니다.'],
+            ['<M><b>【재난】</b></>', 3, '추위가 풀리지 않아 얼어죽는 백성들이 늘어나고 있습니다.'],
-            ['재난', 9, '황건적이 출현해 도시를 습격하고 있습니다.'],
+            ['<M><b>【재난】</b></>', 9, '황건적이 출현해 도시를 습격하고 있습니다.'],
         ],
         4 => [
-            ['재난', 7, '홍수로 인해 피해가 급증하고 있습니다.'],
+            ['<M><b>【재난】</b></>', 7, '홍수로 인해 피해가 급증하고 있습니다.'],
-            ['재난', 5, '지진으로 피해가 속출하고 있습니다.'],
+            ['<M><b>【재난】</b></>', 5, '지진으로 피해가 속출하고 있습니다.'],
-            ['재난', 6, '태풍으로 인해 피해가 속출하고 있습니다.'],
+            ['<M><b>【재난】</b></>', 6, '태풍으로 인해 피해가 속출하고 있습니다.'],
         ],
         7 => [
-            ['재난', 8, '메뚜기 떼가 발생하여 도시가 황폐해지고 있습니다.'],
+            ['<M><b>【재난】</b></>', 8, '메뚜기 떼가 발생하여 도시가 황폐해지고 있습니다.'],
-            ['재난', 5, '지진으로 피해가 속출하고 있습니다.'],
+            ['<M><b>【재난】</b></>', 5, '지진으로 피해가 속출하고 있습니다.'],
-            ['재난', 8, '흉년이 들어 굶어죽는 백성들이 늘어나고 있습니다.'],
+            ['<M><b>【재난】</b></>', 8, '흉년이 들어 굶어죽는 백성들이 늘어나고 있습니다.'],
         ],
         10 => [
-            ['재난', 3, '혹한으로 도시가 황폐해지고 있습니다.'],
+            ['<M><b>【재난】</b></>', 3, '혹한으로 도시가 황폐해지고 있습니다.'],
-            ['재난', 5, '지진으로 피해가 속출하고 있습니다.'],
+            ['<M><b>【재난】</b></>', 5, '지진으로 피해가 속출하고 있습니다.'],
-            ['재난', 3, '눈이 많이 쌓여 도시가 황폐해지고 있습니다.'],
+            ['<M><b>【재난】</b></>', 3, '눈이 많이 쌓여 도시가 황폐해지고 있습니다.'],
-            ['재난', 9, '황건적이 출현해 도시를 습격하고 있습니다.'],
+            ['<M><b>【재난】</b></>', 9, '황건적이 출현해 도시를 습격하고 있습니다.'],
         ]
     ];
 
     $boomingTextList = [
         1 => null,
         4 => [
-            ['호황', 2, '호황으로 도시가 번창하고 있습니다.'],
+            ['<C><b>【호황】</b></>', 2, '호황으로 도시가 번창하고 있습니다.'],
         ],
         7 => [
-            ['풍작', 1, '풍작으로 도시가 번창하고 있습니다.'],
+            ['<C><b>【풍작】</b></>', 1, '풍작으로 도시가 번창하고 있습니다.'],
         ],
         10 => null
     ];
@@ -566,7 +572,7 @@ function disaster() {
 
     $logger = new ActionLogger(0, 0, $year, $month, false);
 
-    $logger->pushGlobalHistoryLog("<M><b>【{$logTitle}】</b></>{$targetCityNames}에 {$logBody}");
+    $logger->pushGlobalHistoryLog("{$logTitle}{$targetCityNames}에 {$logBody}");
     $logger->flush();
 
     if (!$isGood) {

hwe/func_tournament.php

@@ -8,8 +8,7 @@ function processTournament() {
 
     $admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'tnmt_auto', 'tnmt_time']);
     $now = new \DateTime();
-    $admin['now'] = $now->format('Y-m-d H:i:s');
+    $offset = $now->getTimestamp() - (new \DateTime($admin['tnmt_time']))->getTimestamp();
-    $admin['offset'] = $now->getTimestamp() - (new \DateTime($admin['tnmt_time']))->getTimestamp();
 
     //수동일땐 무시
     if($admin['tnmt_auto'] == 0) { return; }
@@ -18,99 +17,102 @@ function processTournament() {
     $tnmt  = $admin['tournament'];
     $phase = $admin['phase'];
 
+    if($offset < 0){
+        return;
+    }
+
     //현시간이 스탬프 지나친경우
-    if($admin['offset'] >= 0)  {
+    switch($admin['tnmt_auto']) {
-        switch($admin['tnmt_auto']) {
+    case 1: $unit = 720; break;
-        case 1: $unit = 720; break;
+    case 2: $unit = 420; break;
-        case 2: $unit = 420; break;
+    case 3: $unit = 180; break;
-        case 3: $unit = 180; break;
+    case 4: $unit =  60; break;
-        case 4: $unit =  60; break;
+    case 5: $unit =  30; break;
-        case 5: $unit =  30; break;
+    case 6: $unit =  15; break;
-        case 6: $unit =  15; break;
+    case 7: $unit =   5; break;
-        case 7: $unit =   5; break;
+    default: throw new MustNotBeReachedException();
-        default: throw new MustNotBeReachedException();
+    }
+
+    //업데이트 횟수
+    $iter = intdiv($offset, $unit) + 1;
+
+    for($i=0; $i < $iter; $i++) {
+        switch($tnmt) {
+        case 1: //신청 마감
+            fillLowGenAll();
+            $tnmt = 2;  $phase = 0;
+            break;
+        case 2: //예선중
+            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; }
+            break;
+        case 4: //본선중
+            finallySingle($type, $tnmt, $phase);        $phase++;
+            if($phase >= 6) { $tnmt = 5; $phase = 0; }
+            break;
+        case 5: //배정중
+            final16set();
+            $tnmt = 6; $phase = 0;
+            startBetting();
+            break;
+        case 6: //베팅중
+            $tnmt = 7; $phase = 0;
+            break;
+        case 7: //16강중
+            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; }
+            break;
+        case 9: //4강중
+            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;
+            setGift($type, $tnmt, $phase);
+            $i = $iter;
+            break;
         }
 
-        //업데이트 횟수
+        //베팅은 무조건 60페이즈후 진행(최대 1시간)
-        $iter = intdiv($admin['offset'], $unit) + 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;
+        }
 
-        for($i=0; $i < $iter; $i++) {
+        if($admin['tnmt_auto'] == 1) {
-            switch($tnmt) {
+            //처리 초 더한 날짜
-            case 1: //신청 마감
+            $dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i);
-                fillLowGenAll();
+            $hr = substr($dt, 11, 2);
-                $tnmt = 2;  $phase = 0;
+            //지정시간대 넘어가면 중단 20~24시
-                break;
+            if($hr < 20) {
-            case 2: //예선중
+                $dt = substr($dt, 0, 11)."20:00:00";
-                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; }
-                break;
-            case 4: //본선중
-                finallySingle($type, $tnmt, $phase);        $phase++;
-                if($phase >= 6) { $tnmt = 5; $phase = 0; }
-                break;
-            case 5: //배정중
-                final16set();
-                $tnmt = 6; $phase = 0;
-                break;
-            case 6: //베팅중
-                $tnmt = 7; $phase = 0;
-                break;
-            case 7: //16강중
-                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; }
-                break;
-            case 9: //4강중
-                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;
-                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);
                 $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() {
@@ -173,7 +175,7 @@ function printRow($k, $npc, $name, $abil, $tgame, $win, $draw, $lose, $gd, $gl,
     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 id=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>";
+    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) {
@@ -296,11 +298,51 @@ function startTournament($auto, $type) {
         ['설전','책사'],
     ][$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 startBetting(){
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
+    pushGlobalHistoryLog([
+        "<S>◆</>{$year}년 {$month}월:<B><b>【대회】</b></>우승자를 예상하는 <C>내기</>가 진행중입니다! 호사가의 참여를 기다립니다!"
+    ], $year, $month);
+
+    $betGold = 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() {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -523,7 +565,7 @@ function selection($tnmt_type, $tnmt, $phase) {
     if($phase < 31) {
         $gameStor->phase+=1;
     } else {
-        $gameStor->tournamemt = 4;
+        $gameStor->tournament = 4;
         $gameStor->phase=0;
     }
 }
@@ -689,7 +731,8 @@ function setGift($tnmt_type, $tnmt, $phase) {
             'grp_no'=>$general['grp_no'],
             'reward'=>$cost,
             'msg'=>"<span class='ev_highlight'>16강 진출</span>",
-            'logger'=>$logger
+            'logger'=>$logger,
+            'inheritance_point'=>10,
         ];
     }
     //8강자 명성 돈
@@ -723,6 +766,7 @@ function setGift($tnmt_type, $tnmt, $phase) {
         //포상 장수 이름, 금액
         $resultHelper[$generalID]['reward'] += $cost;
         $resultHelper[$generalID]['msg'] = "<span class='ev_highlight'>4강 진출</span>";
+        General::createGeneralObjFromDB($generalID)->increaseInheritancePoint('tournament', 10);
     }
     //결승자 명성 돈
     $cost = $admin['develcost'] * 6;
@@ -739,6 +783,7 @@ 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){
             $runnerUp = $general;
         }
@@ -761,6 +806,7 @@ function setGift($tnmt_type, $tnmt, $phase) {
         //포상 장수 이름, 금액
         $resultHelper[$generalID]['reward'] += $cost;
         $resultHelper[$generalID]['msg'] = "<span class='ev_highlight'>우승</span>으";
+        $resultHelper[$generalID]['inheritance_point'] = 100;
         $winner = $general;
     }
 
@@ -775,23 +821,24 @@ function setGift($tnmt_type, $tnmt, $phase) {
     $runnerUpLogger = $resultHelper[$runnerUp['no']]['logger'];
     $runnerUpLogger->pushGeneralHistoryLog("<C>{$tp}</> 대회에서 준우승");
 
-
-    
-
     $winnerRewardText = number_format($resultHelper[$winner['no']]['reward']);
     $runnerUpRewardText = number_format($resultHelper[$runnerUp['no']]['reward']);
 
     $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("<B><b>【대회】</b></><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}</> 대회의 <S>우승자</>에게는 <C>{$winnerRewardText}</>, <S>준우승자</>에겐 <C>{$runnerUpRewardText}</>의 <S>상금</>과 약간의 <S>명성</>이 주어집니다!", ActionLogger::EVENT_YEAR_MONTH);
 
-    foreach($resultHelper as $general){
+    $generalObjList = General::createGeneralObjListFromDB(array_keys($resultHelper));
+
+    foreach($resultHelper as $generalID=>$general){
         $rewardText = number_format($general['reward']);
         /** @var ActionLogger */
         $logger = $general['logger'];
         $logger->pushGeneralActionLog("<C>{$tp}</> 대회의 {$general['msg']}로 <C>{$rewardText}</>의 <S>상금</>, 약간의 <S>명성</> 획득!", ActionLogger::EVENT_PLAIN);
+        //TODO: 토너먼트의 다른 값이 모두 sql에 직접 입력하므로 기반을 바꿔야함.
+        $generalObjList[$generalID]->increaseInheritancePoint('tournament', $general['inheritance_point']);
     }
 
     //우승자 번호
@@ -1127,7 +1174,7 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type) {
         $gen1resKey = 'd';
         $gen2resKey = 'd';
         break;
-    default: new MustNotBeReachedException();
+    default: throw new MustNotBeReachedException();
     }
 
     $db->update('rank_data', [

hwe/index.php

@@ -61,7 +61,7 @@ $scenario = $gameStor->scenario_text;
 $nationID = $generalObj->getNationID();
 if($nationID){
     $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
-    $nationStor->cacheValues(['notice', 'online_genenerals']);
+    $nationStor->cacheAll();
 }
 
 $valid = 0;
@@ -79,9 +79,11 @@ if ($gameStor->fiction == 0) {
 }
 if ($gameStor->npcmode == 0) {
     $npcmode = "불가능";
-} else {
+} else if($gameStor->npcmode == 1){
     $npcmode = "가능";
     $valid = 1;
+} else {
+    $npcmode = "선택 생성";
 }
 $color = "cyan";
 $mapTheme = $gameStor->map_theme;
@@ -95,18 +97,10 @@ $serverCnt = $gameStor->server_cnt;
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('../e_lib/moment.min.js')?>
-<?=WebUtil::printJS('../e_lib/linkify/linkify.min.js')?>
-<?=WebUtil::printJS('../e_lib/linkify/linkify-string.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('js/main.js')?>
 <?=WebUtil::printJS('d_shared/base_map.js')?>
-<?=WebUtil::printJS('js/map.js')?>
+<?=WebUtil::printJS('dist_js/main.js')?>
-<?=WebUtil::printJS('js/msg.js')?>
 <script>
 window.serverNick = '<?=DB::prefix()?>';
 window.serverID = '<?=UniqueConst::$serverID?>';
@@ -134,7 +128,7 @@ $(function(){
 <body class="img_back">
 
 <div id="container">
-<div><?=allButton($gameStor->npcmode!=0)?></div>
+<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>
@@ -341,7 +335,7 @@ else if($session->userGrade == 4){
     <button id="msg_submit">서신전달&amp;갱신</button><br>
     내용 없이 '서신전달&amp;갱신'을 누르면 메세지창이 갱신됩니다.
 </div>
-<div><?=allButton($gameStor->npcmode!=0)?></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">
@@ -361,7 +355,7 @@ else if($session->userGrade == 4){
         <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!=0)?><?=banner()?></div>
+<div style="clear:left;"><?=allButton($gameStor->npcmode==1)?><?=banner()?></div>
 </div>
 <?php
 if ($con == 1) {

hwe/install.php

@@ -14,7 +14,7 @@ $serverName = DB::prefix();
 $serverAcl = $session->acl[$serverName]??[];
 $allowReset = in_array('reset', $serverAcl);
 $allowFullReset = in_array('fullReset',$serverAcl);
-$allowReset |= $allowFullReset;
+$allowReset = $allowReset || $allowFullReset;
 
 if($session->userGrade < 5 && !$allowReset){
     die('관리자 아님');
@@ -28,11 +28,9 @@ if($session->userGrade < 5 && !$allowReset){
 <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('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('../e_lib/jquery.validate.min.js')?>
+<?=WebUtil::printJS('dist_js/install.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/install.js')?>
 <?=WebUtil::printCSS('css/normalize.css')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('css/install.css')?>
@@ -102,7 +100,7 @@ if($session->userGrade < 5 && !$allowReset){
                     </div>
 
                     <div class="form-group row">
-                        <label for="confirm_password" class="col-sm-3 col-form-label">시나리오 선택</label>
+                        <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>
@@ -138,6 +136,20 @@ if($session->userGrade < 5 && !$allowReset){
                         </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">
@@ -148,35 +160,38 @@ if($session->userGrade < 5 && !$allowReset){
                                 <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">휴식 턴 시 장수 턴</label>
+                        <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_develop" id="autorun_develop">내정
+                                        <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_warp" id="autorun_warp">순간이동
+                                        <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_recruit" id="autorun_recruit">징병
+                                        <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_recruit_high" id="autorun_recruit_high">모병
+                                        <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_train" id="autorun_train">훈사
+                                        <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_battle" id="autorun_battle">출병
+                                        <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_chief" id="autorun_chief">기본 사령턴
+                                        <input type="checkbox" class="autorun_user_chk" data-key="chief" name="autorun_user[]" value="chief">기본 사령턴
                                     </label>
                                 </div>
                                 <div class="input-group-append">

hwe/install_db.php

@@ -21,11 +21,9 @@ if($session->userGrade == 5){
 <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('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('dist_js/vendors.js')?>
-<?=WebUtil::printJS('../e_lib/jquery.validate.min.js')?>
+<?=WebUtil::printJS('dist_js/install_db.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/install_db.js')?>
 <?=WebUtil::printCSS('css/normalize.css')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('css/install.css')?>

hwe/j_autoreset.php

@@ -52,7 +52,7 @@ else if(
     $now->getTimestamp() - $lastTurn->getTimestamp() > $reservedDate->getTimestamp() - $now->getTimestamp()
 ){
     //정지 상태 & 중간 넘음
-    AppConf::getList()[DB::prefix()]->closeServer();
+    ServConfig::getServerList()[DB::prefix()]->closeServer();
     $status = 'closed';
 }
 else if(
@@ -60,12 +60,12 @@ else if(
     $now->getTimestamp() - $lastTurn->getTimestamp() > ($reservedDate->getTimestamp() - $now->getTimestamp()) * 2
 ){
     //천통 & 비정지 상태 & 2/3 넘음
-    AppConf::getList()[DB::prefix()]->closeServer();
+    ServConfig::getServerList()[DB::prefix()]->closeServer();
     $status = 'closed';
 }
 else if($reservedDate->getTimestamp() - $now->getTimestamp() <= 60*10){
     //어쨌든 간에 10분 남았다면.
-    AppConf::getList()[DB::prefix()]->closeServer();
+    ServConfig::getServerList()[DB::prefix()]->closeServer();
     $status = 'closed';
 }
 
@@ -85,6 +85,7 @@ $result = ResetHelper::buildScenario(
     $options['scenario'],
     $options['fiction'],
     $options['extend'],
+    $options['block_general_create'],
     $options['npcmode'],
     $options['show_img_level'],
     $options['tournament_trig'],
@@ -96,6 +97,6 @@ $result = ResetHelper::buildScenario(
 $result['affected']=1;
 
 $prefix = DB::prefix();
-AppConf::getList()[$prefix]->openServer();
+ServConfig::getServerList()[$prefix]->openServer();
 
 Json::die($result);

hwe/j_basic_info.php

@@ -5,9 +5,11 @@ include('lib.php');
 include 'func.php';
 
 $result = [
-    "generalID"=>null,
+    "generalID"=>0,
-    "myNationID"=>null,
+    "myNationID"=>0,
-    "isChief"=>false
+    "isChief"=>false,
+    "officerLevel"=>0,
+    "permission"=>0,
 ];
 $session = Session::requireGameLogin([])->setReadOnly();
 $userID = Session::getUserID();

hwe/j_die_immediately.php

@@ -4,6 +4,9 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 
+
+WebUtil::requireAJAX();
+
 $availableDieImmediately = false;
 
 //로그인 검사
@@ -16,25 +19,31 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 $general = $db->queryFirstRow('SELECT no,name,owner_name,npc,lastrefresh FROM general WHERE owner=%i AND npc = 0', $userID);
 
 if(!$general){
-    header('location:b_myPage.php');
+    Json::die([
-    die();
+        'result'=>false,
+        'reason'=>'장수가 없습니다.'
+    ]);
 }
 
 increaseRefresh("장수 삭제", 1);
 $gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
 
-if($gameStor->turntime <= $gameStor->opentime){
+if($gameStor->turntime > $gameStor->opentime){
-    //서버 가오픈시 할 수 있는 행동
+    Json::die([
-    if(addTurn($general['lastrefresh'], $gameStor->turnterm, 2) <= TimeUtil::now()){
+        'result'=>false,
-        $availableDieImmediately = true;
+        'reason'=>'이미 서버가 시작되었습니다.'
-    }
+    ]);
 }
 
-if(!$availableDieImmediately){
-    header('location:b_myPage.php');
-    die();
-}
 
+$targetTime = addTurn($general['lastrefresh'], $gameStor->turnterm, 2);
+if($targetTime > TimeUtil::now()){
+    $targetTimeShort = substr($targetTime, 0, 19);
+    Json::die([
+        'result'=>false,
+        'reason'=>"아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다."
+    ]);
+}
 
 
 $generalObj = General::createGeneralObjFromDB($general['no']);
@@ -46,4 +55,7 @@ $josaYi = JosaUtil::pick($generalName, '이');
 $generalObj->kill($db, true, "<Y>{$generalName}</>{$josaYi} 이 홀연히 모습을 <R>감추었습니다</>");
 
 $session->logoutGame();
-header('location:..');
+Json::die([
+    'result'=>true,
+    'reason'=>'success'
+]);

hwe/j_export_simulator_object.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+WebUtil::requireAJAX();
+
+$destGeneralID = Util::getPost('destGeneralID', 'int', 0);
+
+if(!$destGeneralID || $destGeneralID <= 0){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 장수 코드입니다'
+    ]);
+}
+
+$session = Session::requireGameLogin([])->setReadOnly();
+
+$db = DB::db();
+
+increaseRefresh("시뮬레이터 추출", 1);
+
+$userID = Session::getUserID();
+$me = $db->queryFirstRow('SELECT no,nation from general where owner=%i', $userID);
+$nationID = $me['nation'];
+
+$reqColumns = [
+    'nation',
+    'name', 'officer_level', 'explevel', 'injury', 
+    'leadership', 'horse', 'strength', 'weapon', 'intel', 'book', 'item', 
+    'rice', 'personal', 'special2', 
+    'crew', 'crewtype', 
+    'atmos', 'train', 'dex1', 'dex2', 'dex3', 'dex4', 'dex5', 'defence_train',
+];
+
+$reqRankColumns = [
+    'warnum', 'killnum', 'killcrew'
+];
+
+$dummyItems = [
+    'officer_level'=>1,
+    'horse'=>'None',
+    'weapon'=>'None',
+    'book'=>'None',
+    'item'=>'None',
+    'crew'=>0,
+    'crewtype'=>GameUnitConst::DEFAULT_CREWTYPE,
+    'rice'=>10000,
+    'train'=>GameConst::$maxTrainByCommand,
+    'atmos'=>GameConst::$maxTrainByCommand,
+    'dex1'=>0,
+    'dex2'=>0,
+    'dex3'=>0,
+    'dex4'=>0,
+    'dex5'=>0,
+    'defence_train'=>80,
+    'warnum'=>0,
+    'killnum'=>0,
+    'killcrew'=>0,
+];
+
+$rawDestGeneral = $db->queryFirstRow('SELECT %l FROM general WHERE no=%i', Util::formatListOfBackticks($reqColumns), $destGeneralID);
+
+if($nationID == 0 || $rawDestGeneral['nation'] != $nationID){
+    foreach($dummyItems as $key=>$val){
+        $rawDestGeneral[$key] = $val;
+    }
+}
+else{
+    $rawRankValue = $db->queryAllLists('SELECT `type`, `value` FROM rank_data WHERE general_id = %i AND `type` IN %ls', $destGeneralID, $reqRankColumns);
+    foreach($rawRankValue as [$rankType, $rankValue]){
+        $rawDestGeneral[$rankType] = $rankValue;
+    }
+}
+
+foreach(['dex1', 'dex2', 'dex3', 'dex4', 'dex5'] as $dexKey){
+    $dex = $rawDestGeneral[$dexKey];
+    $rawDestGeneral[$dexKey] = getDexLevelList()[getDexLevel($dex)][0];
+}
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success',
+    'general'=>$rawDestGeneral,
+]);

hwe/j_getChiefTurn.php

@@ -70,6 +70,13 @@ foreach(
 $nationTurnBrief = [];
 foreach($nationTurnList as $officer_level=>$turnBrief){
     if(!key_exists($officer_level, $generals)){
+        $nationTurnBrief[$officer_level] = [
+            'name'=>null,
+            'turnTime'=>null,
+            'officerLevelText'=>getOfficerLevelText($officer_level, $nationLevel),
+            'npcType'=>null,
+            'turn'=>$turnBrief
+        ];
         continue;
     }
     $general = $generals[$officer_level];

hwe/j_get_basic_general_list.php

@@ -0,0 +1,36 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+//로그인 검사
+$session = Session::requireGameLogin([]);
+$generalID = Session::getGeneralID();
+
+$db = DB::db();
+
+$rawList = Util::convertArrayToDict($db->query('SELECT no, name, npc, nation FROM general'), 'no');
+$nationID = $rawList[$generalID]['nation'];
+
+
+$result = [
+    'result'=>true,
+    'reason'=>'success',
+    'nationID'=>$nationID,
+    'generalID'=>$generalID,
+    'column'=>['no', 'name', 'npc']
+];
+
+$resultItem = [];
+foreach(Util::arrayGroupBy($rawList, 'nation') as $subNationID=>$generals){
+    $subNation = [];
+    foreach($generals as $general){
+        $subNation[] = [$general['no'], $general['name'], $general['npc']];
+    }
+    $resultItem[$subNationID] = $subNation;
+}
+
+$result['list'] = $resultItem;
+$result['nation'] = Util::convertArrayToDict($db->query('SELECT nation, name, color FROM nation'), 'nation');
+Json::die($result);

hwe/j_get_general_list.php

@@ -6,7 +6,7 @@ include "func.php";
 
 
 //로그인 검사
-$session = Session::requireLogin();
+$session = Session::requireLogin([]);
 $userID = Session::getUserID();
 
 $db = DB::db();

hwe/j_get_nation_general_list.php

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

hwe/j_get_reserved_command.php

@@ -21,9 +21,11 @@ foreach($rawTurn as [$turn_idx, $action, $arg, $brief]){
     ];
 }
 
+
 [$turnTerm, $year, $month, $lastExecute] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month', 'turntime']);
 
-$turnTime = $db->queryFirstField('SELECT turntime FROM general WHERE no=%i', $generalID);
+[$turnTime, $rawGeneralAux] = $db->queryFirstList('SELECT turntime, aux FROM general WHERE no=%i', $generalID);
+$generalAux = Json::decode($rawGeneralAux??'{}');
 
 if(cutTurn($turnTime, $turnTerm) > cutTurn($lastExecute, $turnTerm)){
     //이미 이번달에 실행된 턴이다.
@@ -42,5 +44,6 @@ Json::die([
     'year'=>$year,
     'month'=>$month,
     'date'=>TimeUtil::now(true),
-    'turn'=>$commandList
+    'turn'=>$commandList,
+    'autorun_limit'=> $generalAux['autorun_limit']??null,
 ]);