아이템 효과 텍스트 수정

feat: 후방 발령 관련 로직도 후방 워프와 유사하게 재 적용

.gitignore

@@ -29,12 +29,15 @@ d_shared
 d_pic/*.jpg
 d_pic/*.gif
 d_pic/*.png
+d_pic/*.webp
 d_pic/uploaded_image
 
 d_setting/*.php
 */d_setting/*.php
 */d_setting/templates/*.php
 
+*/data/file_cache
+
 **/old/*
 test.php
 

README.md

@@ -9,18 +9,18 @@
   * <code>mpm_event</code> 권장
 * PHP 7.3 이상 
   * <code>php-fpm</code> 권장
-  * php에서 curl, pdo-sqlite을 실행가능해야 합니다. (기본값: 지원)
-  * mysqlnd가 지원되어야합니다. (기본값: 지원)
-  * mysqli
+  * php에서 curl, pdo-sqlite을 실행가능해야 합니다.
+  * mysqli, mysqlnd
   * gd
+  * mbstring
 * MariaDB 10.2.1 이상
   * 현재 MySQL은 지원하지 않습니다.
 * <code>git</code>
 * <code>curl</code>
 
-Linux는 Ubuntu 16.04, 18.04, Windows는 Windows 10에서 XAMPP를 사용한 환경에서 테스트되었습니다.
+Linux는 Ubuntu 18.04, 20.04, Windows는 Windows 10에서 XAMPP, WSL2를 사용한 환경에서 테스트되었습니다.
 
-Docker를 이용한 설치는 계획중입니다.
+Docker를 이용한 설치는 테스트버전만 제공됩니다.
 
 ## Docker를 이용한 설치
 

composer.json

@@ -27,7 +27,8 @@
         "xemlock/htmlpurifier-html5": "^0.1.7",
         "catfan/medoo": "^1.5",
         "phan/phan": "^2.7",
-        "erusev/parsedown-extra": "^0.8.1"
+        "erusev/parsedown-extra": "^0.8.1",
+        "nette/caching": "^3.0"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1c2e0182ebdf9bfe795e52a5d7fc6abd",
+    "content-hash": "ab1175c8592ba7f7756d5f02a3aa051c",
     "packages": [
         {
             "name": "brandonwamboldt/utilphp",
@@ -843,6 +843,213 @@
             "description": "Map nested JSON structures onto PHP classes",
             "time": "2020-04-16T18:48:43+00:00"
         },
+        {
+            "name": "nette/caching",
+            "version": "v3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/caching.git",
+                "reference": "b9ecbf920f240bd1ab14900d9a77876924ad7fb4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/caching/zipball/b9ecbf920f240bd1ab14900d9a77876924ad7fb4",
+                "reference": "b9ecbf920f240bd1ab14900d9a77876924ad7fb4",
+                "shasum": ""
+            },
+            "require": {
+                "nette/finder": "^2.4 || ^3.0",
+                "nette/utils": "^2.4 || ^3.0",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "latte/latte": "^2.4",
+                "nette/di": "^v3.0",
+                "nette/tester": "^2.0",
+                "tracy/tracy": "^2.4"
+            },
+            "suggest": {
+                "ext-pdo_sqlite": "to use SQLiteStorage or SQLiteJournal"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0",
+                "GPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "⏱ Nette Caching: library with easy-to-use API and many cache backends.",
+            "homepage": "https://nette.org",
+            "keywords": [
+                "cache",
+                "journal",
+                "memcached",
+                "nette",
+                "sqlite"
+            ],
+            "time": "2019-11-19T18:41:40+00:00"
+        },
+        {
+            "name": "nette/finder",
+            "version": "v2.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/finder.git",
+                "reference": "4ad2c298eb8c687dd0e74ae84206a4186eeaed50"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/finder/zipball/4ad2c298eb8c687dd0e74ae84206a4186eeaed50",
+                "reference": "4ad2c298eb8c687dd0e74ae84206a4186eeaed50",
+                "shasum": ""
+            },
+            "require": {
+                "nette/utils": "^2.4 || ^3.0",
+                "php": ">=7.1"
+            },
+            "conflict": {
+                "nette/nette": "<2.2"
+            },
+            "require-dev": {
+                "nette/tester": "^2.0",
+                "phpstan/phpstan": "^0.12",
+                "tracy/tracy": "^2.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0",
+                "GPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "🔍 Nette Finder: find files and directories with an intuitive API.",
+            "homepage": "https://nette.org",
+            "keywords": [
+                "filesystem",
+                "glob",
+                "iterator",
+                "nette"
+            ],
+            "time": "2020-01-03T20:35:40+00:00"
+        },
+        {
+            "name": "nette/utils",
+            "version": "v3.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/utils.git",
+                "reference": "488f58378bba71767e7831c83f9e0fa808bf83b9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/utils/zipball/488f58378bba71767e7831c83f9e0fa808bf83b9",
+                "reference": "488f58378bba71767e7831c83f9e0fa808bf83b9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "nette/tester": "~2.0",
+                "phpstan/phpstan": "^0.12",
+                "tracy/tracy": "^2.3"
+            },
+            "suggest": {
+                "ext-gd": "to use Image",
+                "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()",
+                "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
+                "ext-json": "to use Nette\\Utils\\Json",
+                "ext-mbstring": "to use Strings::lower() etc...",
+                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()",
+                "ext-xml": "to use Strings::length() etc. when mbstring is not available"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0-only",
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.",
+            "homepage": "https://nette.org",
+            "keywords": [
+                "array",
+                "core",
+                "datetime",
+                "images",
+                "json",
+                "nette",
+                "paginator",
+                "password",
+                "slugify",
+                "string",
+                "unicode",
+                "utf-8",
+                "utility",
+                "validation"
+            ],
+            "time": "2020-05-27T09:58:51+00:00"
+        },
         {
             "name": "pguardiario/phpuri",
             "version": "1.0",

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{
-    margin:0;
+.with_border {
+    margin: 0;
     border: solid 1px;
     border-spacing: 0px;
     border-collapse: separate;
@@ -37,42 +52,52 @@ a.just_link {
 }
 
 .section_title {
-    height:50px;
-    line-height:50px;
-    font-size: 30px; font-weight: bold;
+    height: 50px;
+    line-height: 50px;
+    font-size: 30px;
+    font-weight: bold;
     text-align: center;
-    color:white;
-    padding:0;
+    color: white;
+    padding: 0;
 }
 
-.legacy_layout div     {
-    border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
+.legacy_layout div {
+    border: solid 1px;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
     padding: 0px;
     font-size: 13px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕';;
+    font-family: '맑은 고딕';
+    ;
 }
 
-.obj_fill{
-    display:block;
-    width:100%;
-    height:100%;
+.obj_fill {
+    display: block;
+    width: 100%;
+    height: 100%;
 }
 
 button.with_skin {
-    padding:0 4px;
-    background-color: black; color: white;
+    padding: 0 4px;
+    background-color: black;
+    color: white;
     font-family: '맑은 고딕';
     font-size: 13px;
 }
 
 button.with_skin:disabled {
-    background-color:#333333;
+    background-color: #333333;
 }
 
-input.with_skin   {
-    background-color: black; color: white;
+input.with_skin {
+    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; }
-.font1  { font-size: 13px; }
-.font2  { font-size: 15px; }
-.font3  { font-size: 20px; }
-.font4  { font-size: 30px; }
-.font5  { font-size: 50px; }
-
-caption.section_title {
-    caption-side:top;
+.font0 {
+    font-size: 10px;
 }
 
+.font1 {
+    font-size: 13px;
+}
 
-.samButton{
-    float:left;
-    display:block;
-    padding:0;
-    margin:0;
+.font2 {
+    font-size: 15px;
+}
+
+.font3 {
+    font-size: 20px;
+}
+
+.font4 {
+    font-size: 30px;
+}
+
+.font5 {
+    font-size: 50px;
+}
+
+caption.section_title {
+    caption-side: top;
+}
+
+.samButton {
+    float: left;
+    display: block;
+    padding: 0;
+    margin: 0;
     text-decoration: none;
-    position:relative;
+    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;
-    height:30px;
-    background-color:#000000;
-    color:#ffffff;
+    width: 125px;
+    height: 30px;
+    background-color: #000000;
+    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{
-    width:125px;
-    height:30px;
-    background-color:#225500;
-    color:white;
+.samToolbarButton>.samButtonOuter {
+    width: 125px;
+    height: 30px;
+    background-color: #225500;
+    color: white;
 }
 
-.samToolbarButton2 > .samButtonOuter{
-    width:125px;
-    height:30px;
-    background-color:#225500;
-    color:magenta;
+.samToolbarButton2>.samButtonOuter {
+    width: 125px;
+    height: 30px;
+    background-color: #225500;
+    color: magenta;
 }
 
-.samCommandButton > .samButtonOuter{
-    width:111px;
-    height:30px;
+.samCommandButton>.samButtonOuter {
+    width: 111px;
+    height: 30px;
 }
 
-.samCommandButton.disabled > .samButtonOuter{
-    background-color:transparent !important;
-    color:gray !important;
-    border-color:transparent !important;
+.samCommandButton.disabled>.samButtonOuter {
+    background-color: transparent !important;
+    color: gray !important;
+    border-color: transparent !important;
 }
 
-.samCommandButton.disabled > .samButtonOuter > .samButtonInner::before{
-    content:'【'
+.samCommandButton.disabled>.samButtonOuter>.samButtonInner::before {
+    content: '【'
 }
 
-.samCommandButton.disabled > .samButtonOuter > .samButtonInner::after{
-    content:'】'
+.samCommandButton.disabled>.samButtonOuter>.samButtonInner::after {
+    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{
-    color: rgba(0,0,0,0);
+.hidden_but_copyable {
+    color: rgba(0, 0, 0, 0);
     font-size: 0;
 }
+
+.vertical_flex {
+    height: 100%;
+    display: flex;
+    align-content: center;
+    flex-direction: column;
+    align-items: stretch;
+}
+
+.vertical_flex .item {
+    display: block;
+    flex-grow: 1;
+}
+
+.fill_box {
+    display: block;
+    width: 100%;
+    height: 100%;
+}

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{
-    width:800px;
-    position:absolute;
-    left:50%;
-    margin-left:-400px;
+#server_list_container {
+    width: 800px;
+    position: absolute;
+    left: 50%;
+    margin-left: -400px;
 }
 
-#server_list_table{
-    width:100%;
+#server_list_table {
+    width: 100%;
 }
 
-#server_list tr{
-    height:66px;
+#server_list tr {
+    height: 66px;
 }
 
-#server_list .server_create_and_select .general_create,
-#server_list .server_create_and_select .general_select {
-    width: 120px; height: 33px;
-    float: left;
-}
-
-#server_list .general_create,
-#server_list .general_login {
-    width: 120px; height: 66px;
-    float: left;
-}
-
-.ignore_border{
-    border:0;
-    margin:0;
-    padding:0;
+.ignore_border {
+    border: 0;
+    margin: 0;
+    padding: 0;
 }
 
 #user_info {
-    margin-top:20px;
-    width: 800px; height: 130px;
+    margin-top: 20px;
+    width: 800px;
+    height: 130px;
 }
 
-
-#user_info button{
+#user_info button {
     width: 200px;
     height: 50px;
     margin: 10px 50px;
 }
 
-.center_ordered_items{
-    text-align:center;
+.center_ordered_items {
+    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,132 @@
-body, html{
+body,
+html {
     height: 100%;
     background-repeat: no-repeat;
 }
 
-.main{
+.main {
     margin-top: 70px;
 }
 
 h1.title {
-   font-size: 50px;
-   font-family: 'Passion One', cursive; 
-   font-weight: 400; 
+    font-size: 50px;
+    font-family: 'Passion One', cursive;
+    font-weight: 400;
 }
 
-hr{
-   width: 10%;
-   /*color: #fff;*/
+hr {
+    width: 10%;
+    /*color: #fff;*/
 }
 
-.form-group{
-   margin-bottom: 15px;
+.form-group {
+    margin-bottom: 15px;
 }
 
-label{
-   margin-bottom: 15px;
+label {
+    margin-bottom: 15px;
 }
 
 input,
 input::-webkit-input-placeholder {
-   font-size: 11px;
-   padding-top: 3px;
+    font-size: 11px;
+    padding-top: 3px;
 }
 
-.main-login{
+.main-login {
     /*background-color: #fff;*/
-   /* shadows and rounded borders */
-   -moz-border-radius: 2px;
-   -webkit-border-radius: 2px;
-   border-radius: 2px;
-   -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-   -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-   box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-
+    /* shadows and rounded borders */
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
+    -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+    box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
 }
 
-.main-center{
+.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{
-   font-size: 11px;
-   text-align: center;
+.login-register {
+    font-size: 11px;
+    text-align: center;
 }
 
-
-.col-form-label{
-    text-align:center;
+.col-form-label {
+    text-align: center;
 }
 
-.terms{
-    max-height: 200px; overflow-y: auto;
+.terms {
+    max-height: 200px;
+    overflow-y: auto;
 }
 
-.terms pre{
-    width:100%;
-    white-space: pre-wrap;       /* Since CSS 2.1 */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: -pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
-    word-wrap: break-word;       /* Internet Explorer 5.5+ */
+.terms pre {
+    width: 100%;
+    white-space: pre-wrap;
+    /* Since CSS 2.1 */
+    white-space: -moz-pre-wrap;
+    /* Mozilla, since 1999 */
+    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: 100vh; /* These two lines are counted as one :-)       */
-
+    min-height: 100%;
+    /* Fallback for browsers do NOT support vh unit */
+    min-height: 100vh;
+    /* These two lines are counted as one :-)       */
     display: flex;
     align-items: center;
 }
 
-.full-content {
-    position:fixed;
-    left:0;
-    top:0;
-    width:100%;
-    height:100%;
-    margin:0;
-    padding:0;
-    z-index:800;
+#login_card {
+    z-index: 801;
 }
 
-#login_card{
-    z-index:801;
-}
-
-#btn_kakao_login{
+#btn_kakao_login {
     cursor: pointer;
-    height:46px;
-    width:116px;
+    height: 46px;
+    width: 116px;
     background-color: transparent;
-    color:transparent;
-    border:0;
-    background-size: 100%; /* To fill the dimensions of container (button), or */
+    color: transparent;
+    border: 0;
+    background-size: 100%;
+    /* To fill the dimensions of container (button), or */
     background-repeat: no-repeat;
     background-position: bottom center;
-    margin-top:5px;
-    background-image:url('../oauth_kakao/kakao_login_join.png');
+    margin-top: 5px;
+    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{
-    position:fixed;
-    bottom:0;
-    width:100%;
-    left:0;
+#bottom_box .container {
+    text-align: center;
 }
-#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 {
+    margin-top: 20px;
 }

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

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/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;
+    }
+
 
     /**
      * 서버 주소 반환. 서버의 경로가 하부 디렉토리인 경우에 하부 디렉토리까지 포함

hwe/a_npcList.php

@@ -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],

hwe/b_currentCity.php

@@ -148,8 +148,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 +195,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(
-    'SELECT %l from general where city=%i order by name',
-    Util::formatListOfBackticks($dbColumns),
-    $city['city']
-);
+if($showDetailedInfo){
+    $generals = $db->query(
+        'SELECT %l from general where city=%i order by turntime',
+        Util::formatListOfBackticks($dbColumns),
+        $city['city']
+    );
+}
+else{
+    $generals = [];
+}
+
+if($valid){
+    $city['trustText'] = round($city['trust'], 1);
+    $city['popRateText'] = round($city['pop']/$city['pop_max']*100, 2);
+}
+else{
+    $city['agri'] = '?';
+    $city['comm'] = '?';
+    $city['pop'] = '?';
+    $city['secu'] = '?';
+    $city['trustText'] = '?';
+    $city['popRateText'] = '?';
+
+    if($city['nation'] != 0){
+        $city['def'] = '?';
+        $city['wall'] = '?';
+    }
+}
+
 
 $generalTurnList = [];
 
@@ -257,6 +304,10 @@ foreach($generals as $general){
         $crew = $general['crew'];
         $train = -1;
         $atmos = -1;
+
+        if(!$valid){
+            $crew = -1;
+        }
     }
 
     $nation = $general['nation'];
@@ -331,7 +382,9 @@ foreach($generalsFormat as $general){
     }
     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 +455,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 +483,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,7 +513,7 @@ 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>

hwe/b_myPage.php

@@ -14,6 +14,7 @@ $generalID = $session->generalID;
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
+$gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
 
 increaseRefresh("내정보", 1);
 
@@ -38,7 +39,7 @@ if($gameStor->turntime <= $gameStor->opentime){
 }
 
 $use_treatment = $me->getAuxVar('use_treatment')??10;
-
+$use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn')??1;
 ?>
 <!DOCTYPE html>
 <html>
@@ -77,20 +78,25 @@ var availableDieImmediately = <?=$availableDieImmediately?'true':'false'?>;
                ∞<span style='color:orange'>개막직전 남는자리가 있을경우 랜덤하게 참여합니다.</span><br><br>
 
                환약 사용 【<select id='use_treatment' name='use_treatment'>
-                <option value=10 <?=$use_treatment==10?"selected":""; ?>>경상</option>
-                <option value=20 <?=$use_treatment==21?"selected":""; ?>>중상</option>
-                <option value=40 <?=$use_treatment==41?"selected":""; ?>>심각</option>
-                <option value=60 <?=$use_treatment==61?"selected":""; ?>>위독</option>
-                <option value=100 <?=$use_treatment==100?"selected":""; ?>>사용안함</option>
+                <option value=10 <?=($use_treatment==10)?"selected":""; ?>>경상</option>
+                <option value=21 <?=($use_treatment==21)?"selected":""; ?>>중상</option>
+                <option value=41 <?=($use_treatment==41)?"selected":""; ?>>심각</option>
+                <option value=61 <?=($use_treatment==61)?"selected":""; ?>>위독</option>
+                <option value=100 <?=($use_treatment==100)?"selected":""; ?>>사용안함</option>
                 </select>】<br>
                ∞<span style='color:orange'>부상을 입었을 때 환약을 사용하는 기준입니다.</span><br><br>
-
+<?php if(($gameStor->autorun_user['options']['chief'])??false) : ?>
+               자동 사령턴 허용 【<select id='use_auto_nation_turn' name='use_auto_nation_turn'>
+                <option value=1 <?=$use_auto_nation_turn?"selected":""; ?>>허용</option>
+                <option value=0 <?=(!$use_auto_nation_turn)?"selected":""; ?>>허용 안함</option>
+                </select>】<br>
+               ∞<span style='color:orange'>수뇌가 되었을 때 휴식 턴이어도 적당한 턴을 알아서 넣는 것을 허용합니다.</span><br><br>
+<?php endif; ?>
                 수비 【<select id='defence_train' name='defence_train'>
-                <option value=90 <?=$me->getVar('defence_train')==90?"selected":""; ?>>☆(훈사90)</option>
-                <option value=80 <?=$me->getVar('defence_train')==80?"selected":""; ?>>◎(훈사80)</option>
-                <option value=60 <?=$me->getVar('defence_train')==60?"selected":""; ?>>○(훈사60)</option>
-                <option value=40 <?=$me->getVar('defence_train')==40?"selected":""; ?>>△(훈사40)</option>
-                <option value=999 <?=$me->getVar('defence_train')==999?"selected":""; ?>>×[훈련, 사기 -3]</option>
+<?php foreach([90, 80, 60, 40] as $targetDefenceTrain): ?>
+                <option value='<?=$targetDefenceTrain?>' <?=$me->getVar('defence_train')==$targetDefenceTrain?"selected":""; ?>><?=formatDefenceTrain($targetDefenceTrain)?>(훈사<?=$targetDefenceTrain?>)</option>
+<?php endforeach; ?>
+                <option value=999 <?=$me->getVar('defence_train')==999?"selected":""; ?>><?=formatDefenceTrain(999)?>[훈련, 사기 -3]</option>
                 </select>
                 】<br><br>
                 <input type=<?=$submit?> id='set_my_setting' name=btn style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px; value=설정저장><br>
@@ -107,6 +113,11 @@ var availableDieImmediately = <?=$availableDieImmediately?'true':'false'?>;
             <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>

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>
@@ -30,6 +57,8 @@ $startYear = $gameStor->getValue('startyear');
 <?=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')?>
 </head>
@@ -47,7 +76,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 +160,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 +174,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 +235,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 +268,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 +439,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 +460,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 +528,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/css/common.css

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

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

@@ -185,7 +185,8 @@ 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);
@@ -200,6 +201,17 @@ function myNationInfo(General $generalObj)
     $level12Name = key_exists(12, $topChiefs)?getColoredName($topChiefs[12]['name'], $topChiefs[12]['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>
         <td colspan=4 ";
@@ -282,10 +294,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 {
+        } 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 {
@@ -1199,7 +1224,7 @@ 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');
     
@@ -1512,7 +1537,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) {
@@ -1526,6 +1562,9 @@ 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 (!key_exists($itemCode, $occupiedUnique)) {
                 $availableUnique[] = [[$itemType, $itemCode], $cnt];
@@ -1579,37 +1618,55 @@ function tryUniqueItemLottery(General $general, string $acquireType = '아이템
         return false;
     }
 
+    $itemTypeCnt = count(GameConst::$allItems);
+    $trialCnt = $itemTypeCnt;
+
     foreach ($general->getItems() as $item) {
-        if (!$item) {
-            continue;
-        }
         if (!$item->isBuyable()) {
-            return false;
+            $trialCnt -= 1;
         }
     }
 
+    if($trialCnt <= 0){
+        LogText("{$general->getName()}, {$general->getID()} 모든 아이템", $trialCnt);
+        return false;
+    }
+
+
+
     $scenario = $gameStor->scenario;
     $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)) {
+
+
+    foreach(Util::range($trialCnt) as $_idx){
+        if (Util::randBool($prob)) {
+            $result = true;
+            break;
+        }
+    }
+    if(!$result){
+        LogText("{$general->getName()}, {$general->getID()} 유니크 실패 {$trialCnt}", $prob);
         return false;
     }
+    LogText("{$general->getName()}, {$general->getID()} 유니크 성공 {$trialCnt}", $prob);
     
     return giveRandomUniqueItem($general, $acquireType);
 }
@@ -1711,7 +1768,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'];
@@ -1719,7 +1776,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'),

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){
-            //홀수
-            foreach(Util::range(1, GameConst::$maxTurn, 2) as $subIdx){
+            //홀수, 0부터 맞다.
+            foreach(Util::range(0, GameConst::$maxTurn, 2) as $subIdx){
                 $turnList[$subIdx] = true;
             }
         }
         else if($turnIdx == -2){
-            //짝수
-            foreach(Util::range(0, GameConst::$maxTurn, 2) as $subIdx){
+            //짝수, 1부터 맞다.
+            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

@@ -516,6 +516,7 @@ function checkWander()
             $logger = $wanderer->getLogger();
             $logger->pushGeneralActionLog('초반 제한후 방랑군은 자동 해산됩니다.', ActionLogger::PLAIN);
             $wanderCmd->run();
+            $wanderCmd->setNextAvailable();
         }
     }
 
@@ -626,14 +627,15 @@ function updateNationState()
 
                 $uniqueLotteryWeightList = [];
                 foreach ($nationGenList as $nationGen) {
-                    $hasUnique = false;
+                    $trialCnt = count(GameConst::$allItems);
+
                     foreach ($nationGen->getItems() as $item) {
                         if (!$item->isBuyable()) {
-                            $hasUnique = true;
-                            break;
+                            $trialCnt -= 1;
                         }
                     }
-                    if ($hasUnique) {
+
+                    if ($trialCnt <= 0) {
                         continue;
                     }
 
@@ -646,6 +648,9 @@ function updateNationState()
                     } else if ($nationGen->getVar('officer_level') > 4) {
                         $score += 35;
                     }
+
+                    $score *= $trialCnt;
+                    
                     $uniqueLotteryWeightList[$nationGen->getID()] = [$nationGen, $score];
                 }
 
@@ -679,31 +684,22 @@ function updateNationState()
 
             while ($assemblerCnt < $maxAssemblerCnt) {
                 $lastAssemblerID += 1;
-                $npcObj = new Scenario\NPC(
-                    999,
+                $npcObj = new Scenario\GeneralBuilder(
                     sprintf('부대장%4d', $lastAssemblerID),
+                    0,
                     null,
-                    $nation['nation'],
-                    null,
-                    10,
-                    10,
-                    10,
-                    1,
-                    $admin['year'] - 15,
-                    $admin['year'] + 15,
-                    '은둔',
-                    '척사'
+                    $nation['nation']
                 );
-                $npcObj->killturn = 70;
-                $npcObj->gold = 0;
-                $npcObj->rice = 0;
-                $npcObj->npc = 5;
+                $npcObj->setAffinity(999)->setStat(10, 10, 10)
+                ->setSpecialSingle('척사')->setEgo('che_은둔')
+                ->setKillturn(70)->setGoldRice(0, 0)
+                ->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', [

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_tournament.php

@@ -523,7 +523,7 @@ function selection($tnmt_type, $tnmt, $phase) {
     if($phase < 31) {
         $gameStor->phase+=1;
     } else {
-        $gameStor->tournamemt = 4;
+        $gameStor->tournament = 4;
         $gameStor->phase=0;
     }
 }

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;
@@ -134,7 +136,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 +343,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 +363,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

@@ -102,7 +102,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 +138,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,6 +162,9 @@ 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>

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_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_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_select_npc_token.php

@@ -37,7 +37,7 @@ list(
     $npcmode
 ) = $gameStor->getValuesAsArray(['maxgeneral', 'turnterm', 'npcmode']);
 
-if(!$npcmode){
+if($npcmode!=1){
     Json::die([
         'result'=>false,
         'reason'=>'빙의 가능한 서버가 아닙니다'

hwe/j_get_select_pool.php

@@ -0,0 +1,90 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+function sortTokens(&$tokens){
+    usort($tokens, function($lhs, $rhs){
+        return array_sum($lhs['dex'])<=>array_sum($rhs['dex']);
+    });
+}
+
+function putInfoText(&$info){
+    if(key_exists('specialDomestic', $info)){
+        $class = buildGeneralSpecialDomesticClass($info['specialDomestic']);
+        $info['specialDomesticName'] = $class->getName();
+        $info['specialDomesticInfo'] = $class->getInfo();
+    }
+
+    if(key_exists('specialWar', $info)){
+        $class = buildGeneralSpecialDomesticClass($info['specialWar']);
+        $info['specialWarName'] = $class->getName();
+        $info['specialWarInfo'] = $class->getInfo();
+    }
+}
+
+$session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
+
+$oNow = new \DateTimeImmutable();
+
+$now = $oNow->format('Y-m-d H:i:s');
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$npcmode = $gameStor->getValue('npcmode');
+if($npcmode!=2){
+    Json::die([
+        'result'=>false,
+        'reason'=>'선택 가능한 서버가 아닙니다'
+    ]);
+}
+
+$rawGeneral = $db->queryFirstRow('SELECT no, aux FROM general WHERE `owner` = %i', $userID);
+if($rawGeneral){
+    $generalAux = Json::decode($rawGeneral['aux']);
+    if(key_exists('next_change', $generalAux)&& $generalAux['next_change'] > $now){
+        Json::die([
+            'result'=>false,
+            'reason'=>'아직 다시 고를 수 없습니다'
+        ]);
+    }
+}
+
+$tokens = $db->query('SELECT unique_name, reserved_until, info FROM `select_pool` WHERE `owner`=%i AND `reserved_until`>=%s', $userID, $now);
+
+if($tokens){
+    $pick = [];
+    $valid_until = null;
+    $specialInfo = [];
+    foreach($tokens as $token){
+        $valid_until = $token['reserved_until'];
+        $info = Json::decode($token['info']);
+        putInfoText($info);
+        $info['uniqueName'] = $token['unique_name'];
+        $pick[] = $info;
+    }
+    sortTokens($pick);//좀 무식하지만..
+    Json::die([
+        'result'=>true,
+        'pick'=>$pick,
+        'validUntil'=>$valid_until
+    ]);
+}
+
+$pick = [];
+$valid_until = null;
+foreach(pickGeneralFromPool($db, $userID, 14) as $pickObj){
+    $valid_until = $pickObj->getValidUntil();
+    $info = $pickObj->getInfo();
+    putInfoText($info);
+    $pick[] = $info;
+}
+sortTokens($pick);//좀 무식하지만..
+Json::die([
+    'result'=>true,
+    'pick'=>$pick,
+    'validUntil'=>$valid_until
+]);

hwe/j_install.php

@@ -57,6 +57,7 @@ $v->rule('required', [
     'scenario',
     'fiction',
     'extend',
+    'block_general_create',
     'join_mode',
     'npcmode',
     'show_img_level',
@@ -67,6 +68,7 @@ $v->rule('required', [
     'scenario',
     'fiction',
     'extend',
+    'block_general_create',
     'npcmode',
     'show_img_level',
     'tournament_trig',
@@ -109,11 +111,13 @@ $scenario = (int)$_POST['scenario'];
 $fiction = (int)$_POST['fiction'];
 $extend = (int)$_POST['extend'];
 $npcmode = (int)$_POST['npcmode'];
+$block_general_create = (bool)$_POST['block_general_create'];
 $show_img_level = (int)$_POST['show_img_level'];
 $tournament_trig = (int)$_POST['tournament_trig'];
 $join_mode = $_POST['join_mode'];
 $autorun_user_minutes = (int)$_POST['autorun_user_minutes'];
 $autorun_user_options = [];
+
 foreach(Util::getPost('autorun_user', 'array_string', []) as $autorun_option){
     $autorun_user_options[$autorun_option] = 1;
 }
@@ -165,6 +169,7 @@ if($reserve_open){
         'scenarioName'=>$scenarioObj->getTitle(),
         'fiction'=>$fiction,
         'extend'=>$extend,
+        'block_general_create'=>$block_general_create,
         'npcmode'=>$npcmode,
         'show_img_level'=>$show_img_level,
         'tournament_trig'=>$tournament_trig,
@@ -187,7 +192,7 @@ if($reserve_open){
         'options'=>Json::encode($reserveInfo),
         'date'=>$open_date
     ]);
-    AppConf::getList()[DB::prefix()]->closeServer();
+    ServConfig::getServerList()[DB::prefix()]->closeServer();
     Json::die([
         'result'=>true,
         'reason'=>'예약'
@@ -200,6 +205,7 @@ Json::die(ResetHelper::buildScenario(
     $scenario,
     $fiction,
     $extend,
+    $block_general_create,
     $npcmode,
     $show_img_level,
     $tournament_trig,

hwe/j_install_db.php

@@ -95,7 +95,7 @@ if($result !== true){
 
 ResetHelper::clearDB();
 
-AppConf::getList()[$prefix]->closeServer();
+ServConfig::getServerList()[$prefix]->closeServer();
 
 Json::die([
     'result'=>true,

hwe/j_map_recent.php

@@ -0,0 +1,83 @@
+<?php
+namespace sammo;
+use Nette\Caching\Cache;
+
+include "lib.php";
+include "func.php";
+
+if(!class_exists('\\sammo\\UniqueConst')){
+    Json::die([
+        'result'=>false,
+        'reason'=>'서버 초기화되지 않음'
+    ]);
+}
+
+if(!prepareDir('data/file_cache')){
+	Json::die([
+		'result'=>false,
+		'reason'=>'cache 불가'
+	]);
+}
+
+$storage = new \Nette\Caching\Storages\FileStorage('data/file_cache');
+$cache = new Cache($storage);
+$serverID = UniqueConst::$serverID;
+
+$mapInfo = $cache->load("recent_map");
+//로그인 검사
+
+$now = time();
+
+if($mapInfo && ($now - $mapInfo['timestamp'] < 600)){
+	$mapEtag = $mapInfo['etag'];
+	$mapModified = $mapInfo['timestamp'];
+	
+    header("Last-Modified: ".gmdate("D, d M Y H:i:s", $mapModified)." GMT"); 
+    header("Etag: $mapEtag"); 
+
+    if (
+		strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']??'2000-01-01') === $mapModified || 
+		trim($_SERVER['HTTP_IF_NONE_MATCH']??'') === $mapEtag
+	) { 
+        header("HTTP/1.1 304 Not Modified"); 
+		die();
+	}
+
+	Json::die($mapInfo['data'], 0);
+}
+
+$defaultPost = [
+    'year' => null,
+    'month' => null,
+    'aux' => null,
+    'neutralView' => true,
+    'showMe' => false,
+];
+
+$history = formatHistoryToHTML(getGlobalHistoryLogRecent(10));
+$rawMap = getWorldMap([
+    'year' => null,
+    'month' => null,
+    'aux' => null,
+    'neutralView' => true,
+    'showMe' => false,
+]);
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+$mapTheme = $gameStor->map_theme ?? 'che';
+
+$rawMap['history'] = $history;
+$rawMap['theme'] = $mapTheme;
+
+$etag = hash('sha256', $serverID.$now);
+$map = [
+	'etag'=>$etag,
+	'timestamp'=>$now,
+	'data'=>$rawMap,
+];
+$cache->save("recent_map", $map);
+header("Last-Modified: ".gmdate("D, d M Y H:i:s", $now)." GMT"); 
+header("Etag: $etag"); 
+
+Json::die($map['data'], 0);

hwe/j_myBossInfo.php

@@ -40,6 +40,7 @@ if($action === '추방' && $destGeneralID==0){
 
 if($destGeneralID==0){
     $general = new DummyGeneral(true);
+    $general->setVar('nation', $nationID);
 }
 else{
     $general = General::createGeneralObjFromDB($destGeneralID, [

hwe/j_select_npc.php

@@ -59,7 +59,7 @@ list(
     $npcmode
 ) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode']);
 
-if(!$npcmode){
+if($npcmode!=1){
     Json::die([
         'result'=>false,
         'reason'=>'빙의 가능한 서버가 아닙니다'

hwe/j_select_picked_general.php

@@ -0,0 +1,170 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+WebUtil::requireAJAX();
+
+$pick = Util::getPost('pick');
+$leadership = Util::getPost('leadership', 'int', GameConst::$defaultStatMin);
+$strength = Util::getPost('leadership', 'int', GameConst::$defaultStatMin);
+$intel = Util::getPost('leadership', 'int', GameConst::$defaultStatMin);
+$personal = Util::getPost('personal', 'string', null);
+$use_own_picture = Util::getPost('use_own_picture', 'bool', false);
+
+
+if(!$pick){
+    Json::die([
+        'result'=>false,
+        'reason'=>'장수를 선택하지 않았습니다'
+    ]);
+}
+
+$session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$rootDB = RootDB::db();
+$oNow = new \DateTimeImmutable();
+$now = $oNow->format('Y-m-d H:i:s');
+
+$hasGeneralID = $db->queryFirstField('SELECT no FROM general WHERE owner = %i', $userID);
+if($hasGeneralID){
+    Json::die([
+        'result'=>false,
+        'reason'=>'이미 장수를 생성했습니다.'
+    ]);
+}
+
+$env = $gameStor->getValues(['startyear', 'year', 'month', 'maxgeneral', 'npcmode', 'show_img_level', 'icon_path', 'turnterm', 'turntime']);
+$env['fiction'] = false;
+
+$npcmode = $env['npcmode'];
+$maxgeneral = $env['maxgeneral'];
+
+if($npcmode!=2){
+    Json::die([
+        'result'=>false,
+        'reason'=>'선택 가능한 서버가 아닙니다'
+    ]);
+}
+
+$selectInfo = $db->queryFirstField('SELECT info FROM select_pool WHERE `owner` = %i AND `reserved_until`>=%s AND `unique_name`=%s', $userID, $now, $pick);
+if(!$selectInfo){
+    Json::die([
+        'result'=>false,
+        'reason'=>'유효한 장수 목록이 없습니다.'
+    ]);
+}
+$selectInfo = Json::decode($selectInfo);
+
+$ownerInfo = RootDB::db()->queryFirstRow('SELECT `name`,`picture`,`imgsvr` FROM member WHERE `NO`=%i',$userID);
+if(!$ownerInfo){
+    Json::die([
+        'result'=>false,
+        'reason'=>'멤버 정보를 가져오지 못했습니다.'
+    ]);
+}
+
+
+$gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
+
+if ($gencount >= $maxgeneral) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'더 이상 등록 할 수 없습니다.'
+    ]);
+}
+
+$poolClass = getGeneralPoolClass(GameConst::$targetGeneralPool);
+/** @var AbsGeneralPool */
+$pickedGeneral = new $poolClass($db, $selectInfo, $now);
+
+$builder = $pickedGeneral->getGeneralBuilder();
+
+foreach(GameConst::$generalPoolAllowOption as $allowOption){
+    if($allowOption == 'stat'){
+        $leadership = Util::valueFit($leadership, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
+        $strength = Util::valueFit($strength, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
+        $intel = Util::valueFit($intel, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
+
+        if($leadership + $strength + $intel > GameConst::$defaultStatTotal){
+            Json::die([
+                'result'=>false,
+                'reason'=>'스탯의 총 합이 올바르지 않습니다.'
+            ]);
+        }
+        $builder->setStat($leadership, $strength, $intel);
+    }
+    else if($allowOption == 'picture' && $use_own_picture){
+        $builder->setPicture($ownerInfo['imgsvr'], $ownerInfo['picture']);
+    }
+    else if($allowOption == 'ego'){
+        if(!$personal || $personal == 'Random'){
+            $personal = Util::choiceRandom(GameConst::$availablePersonality);
+        }
+        if(!array_search($personal, GameConst::$availablePersonality)){
+            Json::die([
+                'result'=>false,
+                'reason'=>'올바르지 않은 성격입니다.'
+            ]);
+        }
+        $builder->setEgo($personal);
+    }
+}
+
+$userNick = $ownerInfo['name'];
+
+$builder->setOwner($userID);
+$builder->setOwnerName($userNick);
+$builder->setKillturn(5);
+$builder->setNPCType(0);
+$builder->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $env['turnterm']));
+$builder->fillRemainSpecAsZero($env);
+$builder->build($env);
+$generalID = $builder->getGeneralID();
+if(!$generalID){
+    Json::die([
+        'result'=>false,
+        'reason'=>'장수 등록에 실패했습니다.'
+    ]);
+}
+$pickedGeneral->occupyGeneralName();
+
+$db->update('select_pool',[
+    'owner'=>null,
+    'reserved_until'=>null,
+], '(owner=%i or reserved_until < %s) AND general_id is NULL', $userID, $now);
+
+
+$josaYi = JosaUtil::pick($userNick, '이');
+$generalName = $builder->getGeneralName();
+$josaRo = JosaUtil::pick($generalName, '로');
+
+$cityName = CityConst::byID($builder->getCityID())->name;
+
+$logger = new ActionLogger($generalID, 0, $env['year'], $env['month']);
+$logger->pushGeneralHistoryLog("<Y>{$generalName}</>, <G>{$cityName}</>에서 등장");
+$logger->pushGlobalActionLog("<G><b>{$cityName}</b></>에서 <Y>{$userNick}</>{$josaYi} <Y>{$generalName}</>{$josaRo} 등장합니다.");
+$logger->flush();
+
+pushAdminLog(["가입 : {$userID} // {$session->userName} // {$pick} // ".getenv("REMOTE_ADDR")]);
+
+$rootDB->insert('member_log', [
+    'member_no' => $userID,
+    'date'=>TimeUtil::now(),
+    'action_type'=>'make_general',
+    'action'=>Json::encode([
+        'server'=>DB::prefix(),
+        'type'=>'select',
+        'generalID'=>$generalID,
+        'generalName'=>$generalName
+    ])
+]);
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success'
+]);

hwe/j_server_basic_info.php

@@ -43,7 +43,7 @@ $session = Session::requireLogin([
     'game'=>null,
     'me'=>null
 ])->setReadOnly();
-$userID = Session::getUserID();
+$userID = $session->userID;
 
 if(!class_exists('\\sammo\\DB')){
     Json::die([
@@ -91,7 +91,8 @@ if(file_exists(__DIR__.'/.htaccess')){
             'scenarioName'=>$options['scenarioName'],
             'turnterm'=>$options['turnterm'],
             'fictionMode'=>($options['fiction']?'가상':'사실'),
-            'npcMode'=>($options['npcmode']?'가능':'불가'),
+            'block_general_create'=>(!!$options['block_general_create']),
+            'npcMode'=>([0=>'불가',1=>'가능',2=>'선택 생성'][$options['npcmode']]),
             'openDatetime'=>$reserved['date'],
             'starttime'=>$options['starttime'],
             'gameConf'=>$options['gameConf'],
@@ -104,7 +105,7 @@ if(file_exists(__DIR__.'/.htaccess')){
 
 //TODO: 천통시에도 예약 오픈 알림이 필요..?
 
-$admin = $gameStor->getValues(['isunited', 'npcmode', 'year', 'month', 'scenario', 'scenario_text', 'maxgeneral', 'turnterm', 'opentime', 'turntime', 'join_mode', 'fiction', 'autorun_user']);
+$admin = $gameStor->getValues(['isunited', 'npcmode', 'year', 'month', 'scenario', 'scenario_text', 'maxgeneral', 'turnterm', 'opentime', 'turntime', 'join_mode', 'fiction', 'block_general_create', 'autorun_user']);
 $admin['maxUserCnt'] = $admin['maxgeneral'];
 $admin['npcMode'] = $admin['npcmode'];
 $admin['turnTerm'] = $admin['turnterm'];
@@ -124,8 +125,8 @@ $admin['scenario'] = $admin['scenario_text'];
 $admin['userCnt'] = $genCnt;
 $admin['npcCnt'] = $npcCnt;
 $admin['nationCnt'] = $nationCnt;
-
-$admin['npcMode'] = $admin['npcMode']?'가능':'불가';
+$admin['block_general_create'] = !!$admin['block_general_create'];
+$admin['npcMode'] = [0=>'불가',1=>'가능',2=>'선택 생성'][$admin['npcMode']];
 $admin['fictionMode'] = $admin['fiction']?'가상':'사실';
 
 $otherTextInfo = [];

hwe/j_set_my_setting.php

@@ -16,6 +16,7 @@ $action = Util::getPost('action');
 $tnmt = Util::getPost('tnmt', 'int', 1);
 $defence_train = Util::getPost('defence_train', 'int', 80);
 $use_treatment = Util::getPost('use_treatment', 'int', 10);
+$use_auto_nation_turn = Util::getPost('use_auto_nation_turn', 'int', 1);
 //$detachNPC = Util::getPost('detachNPC', 'bool');
 $detachNPC = false;
 
@@ -42,8 +43,8 @@ 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);
+        $me->increaseVarWithLimit('train', -3, 20);
+        $me->increaseVarWithLimit('atmos', -3, 20);
     }
     else{
         $me->increaseVar('myset', -1);
@@ -53,6 +54,10 @@ if($defence_train != $me->getVar('defence_train')){
 
 $me->setAuxVar('use_treatment', Util::valueFit($use_treatment, 10, 100));
 
+if($use_auto_nation_turn != $me->getAuxVar('use_auto_nation_turn')){
+    $me->setAuxVar('use_auto_nation_turn', $use_auto_nation_turn);
+}
+
 if($me->getVar('tnmt') != $tnmt){
     $me->setVar('tnmt', $tnmt);
 }

hwe/j_simulate_battle.php

@@ -87,12 +87,13 @@ $generalCheck = [
         'no', 'name', 'nation', 'turntime', 'personal', 'special2', 'crew', 'crewtype', 'atmos', 'train', 
         'intel', 'intel_exp', 'book', 'strength', 'strength_exp', 'weapon', 'injury', 'leadership', 'leadership_exp', 'horse', 'item', 
         'explevel', 'experience', 'dedication', 'officer_level', 'officer_city', 'gold', 'rice', 'dex1', 'dex2', 'dex3', 'dex4', 'dex5',
-        'recent_war'
+        'recent_war', 'warnum', 'killnum', 'killcrew',
     ],
     'integer'=>[
         'no', 'nation', 'crew', 'crewtype', 'atmos', 'train',
         'intel', 'intel_exp', 'strength', 'strength_exp',  'injury', 'leadership', 'leadership_exp', 
         'explevel', 'experience', 'dedication', 'officer_level', 'officer_city', 'gold', 'rice', 'dex1', 'dex2', 'dex3', 'dex4', 'dex5',
+        'warnum', 'killnum', 'killcrew',
     ],
     'min'=>[
         ['no', 1],
@@ -109,6 +110,9 @@ $generalCheck = [
         ['dex3', 0],
         ['dex4', 0],
         ['dex5', 0],
+        ['warnum', 0],
+        ['killnum', 0],
+        ['killcrew', 0],
     ],
     'between'=>[
         ['train', [40, GameConst::$maxTrainByWar]],
@@ -148,7 +152,8 @@ foreach($rawDefenderList as $idx=>$rawDefenderGeneral){
             'reason'=>"[수비자{$idx}]".$v->errorStr()
         ]);
     }
-    $defenderList[] = new General($rawDefenderGeneral, null, $rawDefenderCity, $rawAttackerNation, $year, $month, true);
+    
+    $defenderList[] = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), $rawDefenderCity, $rawAttackerNation, $year, $month, true);
 }
 
 
@@ -273,6 +278,15 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 $startYear = $gameStor->startyear;
 $cityRate = Util::round(($year - $startYear) / 1.5) + 60;
 
+function extractRankVar(array $rawVal):array{
+    $rankVars = [];
+    foreach($rawVal as $rawKey=>$rawVal){
+        if(key_exists($rawKey, General::RANK_COLUMN)){
+            $rankVars[$rawKey] = $rawVal;
+        }
+    }
+    return $rankVars;
+}
 
 function simulateBattle(
     $rawAttacker, $rawAttackerCity, $rawAttackerNation, 
@@ -280,7 +294,7 @@ function simulateBattle(
     $startYear, $year, $month, $cityRate
 ){
     $attacker = new WarUnitGeneral(
-        new General($rawAttacker, null, $rawAttackerCity, $rawAttackerNation, $year, $month),
+        new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month),
         $rawAttackerNation,
         true
     );
@@ -312,7 +326,7 @@ function simulateBattle(
             return null;
         }
 
-        $defenderObj = new General($iterDefender->current(), null, $rawDefenderCity, $rawDefenderNation, $year, $month);
+        $defenderObj = new General($iterDefender->current(), extractRankVar($iterDefender->current()), $rawDefenderCity, $rawDefenderNation, $year, $month);
         if(extractBattleOrder($defenderObj) <= 0){
             return null;
         }

hwe/j_update_picked_general.php

@@ -0,0 +1,151 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+WebUtil::requireAJAX();
+
+$pick = Util::getPost('pick');
+
+if(!$pick){
+    Json::die([
+        'result'=>false,
+        'reason'=>'장수를 선택하지 않았습니다'
+    ]);
+}
+
+$session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$rootDB = RootDB::db();
+$oNow = new \DateTimeImmutable();
+$now = $oNow->format('Y-m-d H:i:s');
+
+$generalID = $db->queryFirstField('SELECT no FROM general WHERE owner = %i', $userID);
+if(!$generalID){
+    Json::die([
+        'result'=>false,
+        'reason'=>'장수가 생성하지 않았습니다. 이미 사망하지 않았는지 확인해보세요.'
+    ]);
+}
+
+list(
+    $year,
+    $month,
+    $maxgeneral,
+    $npcmode,
+    $turnterm
+) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode', 'turnterm']);
+
+if($npcmode!=2){
+    Json::die([
+        'result'=>false,
+        'reason'=>'선택 가능한 서버가 아닙니다'
+    ]);
+}
+
+$info = $db->queryFirstField('SELECT info FROM select_pool WHERE `owner` = %i AND `reserved_until`>=%s AND `unique_name`=%s', $userID, $now, $pick);
+if(!$info){
+    Json::die([
+        'result'=>false,
+        'reason'=>'유효한 장수 목록이 없습니다.'
+    ]);
+}
+
+$ownerInfo = RootDB::db()->queryFirstRow('SELECT `name`,`picture`,`imgsvr` FROM member WHERE `NO`=%i',$userID);
+if(!$ownerInfo){
+    Json::die([
+        'result'=>false,
+        'reason'=>'멤버 정보를 가져오지 못했습니다.'
+    ]);
+}
+
+$info = Json::decode($info);
+
+
+$generalObj = General::createGeneralObjFromDB($generalID);
+$oldGeneralName = $generalObj->getName();
+$db->update('select_pool', [
+    'general_id'=>-$generalID,
+    'owner'=>null,
+    'reserved_until'=>null
+], 'unique_name=%s AND `reserved_until` IS NOT NULL AND owner = %i', $info['uniqueName'], $userID);
+
+if($db->affectedRows()==0){
+    Json::die([
+        'result'=>false,
+        'reason'=>'동시성 제어에 문제가 발생했습니다. 버그 제보를 부탁드립니다.'
+    ]);
+}
+
+$db->update('select_pool', [
+    'general_id'=>null,
+    'owner'=>null,
+    'reserved_until'=>null,
+], 'unique_name != %s AND general_id = %i', $info['uniqueName'], $generalID);
+
+$db->update('select_pool', [
+    'general_id'=>$generalID,
+], 'general_id=%i', -$generalID);
+if($db->affectedRows()==0){
+    Json::die([
+        'result'=>false,
+        'reason'=>'장수 선택 과정에 문제가 발생했습니다.. 버그 제보를 부탁드립니다.'
+    ]);
+}
+$db->update('select_pool',[
+    'owner'=>null,
+    'reserved_until'=>null,
+], '(owner=%i or reserved_until < %s) AND general_id is NULL', $userID, $now);
+
+if(key_exists('leadership', $info)){
+    $generalObj->updateVar('leadership', $info['leadership']);
+    $generalObj->updateVar('strength', $info['strength']);
+    $generalObj->updateVar('intel', $info['intel']);
+}
+if(key_exists('picture', $info)){
+    $generalObj->updateVar('imgsvr', $info['imgsvr']);
+    $generalObj->updateVar('picture', $info['picture']);
+}
+if(key_exists('generalName', $info)){
+    $generalObj->updateVar('name', $info['generalName']);
+}
+if(key_exists('dex', $info)){
+    $generalObj->updateVar('dex1', $info['dex'][0]);
+    $generalObj->updateVar('dex2', $info['dex'][1]);
+    $generalObj->updateVar('dex3', $info['dex'][2]);
+    $generalObj->updateVar('dex4', $info['dex'][3]);
+    $generalObj->updateVar('dex5', $info['dex'][4]);
+}
+if(key_exists('ego', $info)){
+    $generalObj->updateVar('personal', $info['ego']);
+}
+if(key_exists('specialDomestic', $info)){
+    $generalObj->updateVar('special', $info['specialDomestic']);
+}
+if(key_exists('specialWar', $info)){
+    $generalObj->updateVar('special2', $info['specialWar']);
+}
+$generalObj->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $turnterm));
+
+$userNick = $ownerInfo['name'];
+$generalObj->setVar('owner_name', $userNick);
+$josaYi = JosaUtil::pick($userNick, '이');
+
+$generalName = $info['generalName'];
+$josaRo = JosaUtil::pick($generalName, '로');
+
+
+$logger = $generalObj->getLogger();
+$logger->pushGeneralHistoryLog("장수를 <Y>{$oldGeneralName}</>에서 <Y>{$generalName}</>{$josaRo} 변경");
+$logger->pushGlobalActionLog("<Y>{$userNick}</>{$josaYi} 장수를 <Y>{$oldGeneralName}</>에서 <Y>{$generalName}</>{$josaRo} 변경합니다.");
+$generalObj->applyDB($db);
+
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success'
+]);

hwe/join.php

@@ -24,7 +24,12 @@ if (!$member) {
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-
+$admin = $gameStor->getValues(['block_general_create','show_img_level','maxgeneral']);
+if($admin['block_general_create']){
+    MessageBox("잘못된 접근입니다!!!");
+    echo "<script>history.go(-1);</script>";
+    exit(1);
+}
 ?>
 <!DOCTYPE html>
 <html>
@@ -66,7 +71,6 @@ echo Json::encode((object)$charInfoText);
         <tr><td align=center><?=info(0)?></td></tr>
     </table>
 <?php
-$admin = $gameStor->getValues(['show_img_level','maxgeneral']);
 
 $gencount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc<2');
 

hwe/join_post.php

@@ -185,10 +185,10 @@ if($relYear < 3){
     $experience = 0;
 }
 else{
-    $expGenCount = $db->queryFirstField('SELECT count(*) FROM general WHERE nation != 0 AND npc < 5');
+    $expGenCount = $db->queryFirstField('SELECT count(*) FROM general WHERE nation != 0 AND npc < 4');
     $targetGenOrder = Util::round($expGenCount * 0.2);
     $experience = $db->queryFirstField(
-        'SELECT experience FROM general WHERE nation != 0 AND npc < 5 ORDER BY experience ASC LIMIT %i, 1', 
+        'SELECT experience FROM general WHERE nation != 0 AND npc < 4 ORDER BY experience ASC LIMIT %i, 1', 
         $targetGenOrder - 1
     );
     $experience *= 0.8;

hwe/js/battle_simulator.js

@@ -1,4 +1,4 @@
-jQuery(function($){
+jQuery(function($) {
 
 
     var $generalForm = $('.form_sample .general_detail');
@@ -9,9 +9,28 @@ jQuery(function($){
 
     var $attackerCard = $('.attacker_form');
 
-    var initBasicEvent = function(){
+    var initBasicEvent = function() {
 
-        $('.form_injury').change(function(){
+        if (window.nation) {
+            $('.form_city_level').val(window.city.level);
+            $('.form_def').val(parseInt(window.city.def));
+            $('.form_wall').val(parseInt(window.city.wall));
+            $('.form_nation_type').val(window.nation.type);
+            $('.form_nation_level').val(window.nation.level);
+            $('.form_tech').val(parseInt(window.nation.tech / 1000));
+            if (window.nation.capital == window.city.city) {
+                $('.attacker_nation .form_is_capital:first').click();
+                $('.defender_nation .form_is_capital:first').click();
+            } else {
+                $('.attacker_nation .form_is_capital:last').click();
+                $('.defender_nation .form_is_capital:last').click();
+            }
+        } else {
+            $('.attacker_nation .form_is_capital:last').click();
+            $('.defender_nation .form_is_capital:last').click();
+        }
+
+        $('.form_injury').change(function() {
             var $this = $(this);
             var $general = getGeneralDetail($this);
             var $helptext = $general.find('.injury_helptext');
@@ -20,51 +39,48 @@ jQuery(function($){
             //FIXME: PHP 코드와 항상 일치하도록 변경
             var text = '건강';
             var color = 'white';
-            if(injury > 60){
+            if (injury > 60) {
                 text = '위독';
                 color = 'red';
-            }
-            else if(injury > 40){
+            } else if (injury > 40) {
                 text = '심각';
                 color = 'magenta';
-            }
-            else if(injury > 20){
+            } else if (injury > 20) {
                 text = '중상';
                 color = 'orange';
-            }
-            else if(injury > 0){
+            } else if (injury > 0) {
                 text = '경상';
                 color = 'yellow';
             }
             $helptext.html(text).css('color', color);
         });
 
-        $('.export_general').click(function(){
+        $('.export_general').click(function() {
             var $btn = $(this);
             var $general = getGeneralDetail($btn);
 
             var values = exportGeneralInfo($general);
             console.log(values);
         });
-        $('.delete-defender').click(function(){
+        $('.delete-defender').click(function() {
             var $card = getGeneralFrame($(this));
             deleteDefender($card);
         });
-        $('.copy-defender').click(function(){
+        $('.copy-defender').click(function() {
             var $card = getGeneralFrame($(this));
             copyDefender($card);
         });
 
-        $('.add-defender').click(function(){
+        $('.add-defender').click(function() {
             addDefender();
         });
 
-        $('.btn-general-load').click(function(){
+        $('.btn-general-load').click(function() {
             var $file = $(this).prev();
             $file[0].click();
         })
 
-        $('.form_load_general_file').on('change', function(e){
+        $('.form_load_general_file').on('change', function(e) {
             e.preventDefault();
             var $this = $(this);
             var $card = getGeneralFrame($this);
@@ -75,26 +91,35 @@ jQuery(function($){
             return false;
         });
 
-        $('.btn-general-save').click(function(){
+        $('.btn-general-import-server').click(function() {
+            var $this = $(this);
+            var $card = getGeneralFrame($this);
+
+            var $modal = $('#importModal');
+            $modal.data('target', $card);
+            $modal.modal('show');
+        });
+
+        $('.btn-general-save').click(function() {
             var $this = $(this);
             var $general = getGeneralDetail($this);
             var generalData = exportGeneralInfo($general);
 
             var filename = "general_{0}.json".format(generalData.name);
             var saveData = JSON.stringify({
-                objType:'general',
-                data:generalData
+                objType: 'general',
+                data: generalData
             }, null, 4);
 
             download(saveData, filename, 'application/json');
         });
 
-        $('.btn-battle-load').click(function(){
+        $('.btn-battle-load').click(function() {
             var $file = $(this).prev();
             $file[0].click();
         })
 
-        $('.form_load_battle_file').on('change', function(e){
+        $('.form_load_battle_file').on('change', function(e) {
             e.preventDefault();
             var $this = $(this);
             var files = e.target.files;
@@ -103,12 +128,12 @@ jQuery(function($){
             return false;
         });
 
-        $('.btn-battle-save').click(function(){
+        $('.btn-battle-save').click(function() {
             var battleData = exportAllData();
             var filename = "battle_{0}.json".format(moment().format('YYYYMMDD_hhmmss'));
             var saveData = JSON.stringify({
-                objType:'battle',
-                data:battleData
+                objType: 'battle',
+                data: battleData
             }, null, 4);
 
             download(saveData, filename, 'application/json');
@@ -119,7 +144,7 @@ jQuery(function($){
             e.stopPropagation()
             e.preventDefault()
         })
-        $generals.bind('drop', function(e){
+        $generals.bind('drop', function(e) {
             e.preventDefault();
             var $this = $(this);
             var $card = getGeneralFrame($this);
@@ -135,7 +160,7 @@ jQuery(function($){
             e.stopPropagation()
             e.preventDefault()
         })
-        $battlePad.bind('drop', function(e){
+        $battlePad.bind('drop', function(e) {
             e.preventDefault();
 
             var files = e.originalEvent.dataTransfer.files;
@@ -145,8 +170,8 @@ jQuery(function($){
         });
     }
 
-    var importGeneralInfo = function($general, data){
-        var setVal = function(query, val){
+    var importGeneralInfo = function($general, data) {
+        var setVal = function(query, val) {
             $general.find(query).val(val).change();
         }
 
@@ -154,7 +179,6 @@ jQuery(function($){
 
         setVal('.form_officer_level', data.officer_level);
         setVal('.form_exp_level', data.explevel);
-        setVal('.form_injury', data.injury);
 
         setVal('.form_leadership', data.leadership);
         setVal('.form_general_horse', data.horse);
@@ -183,93 +207,103 @@ jQuery(function($){
         setVal('.form_dex5', data.dex5);
         setVal('.form_defence_train', data.defence_train);
 
-        if(!setGeneralNo($general, data.no)){
+        setVal('.form_warnum', data.warnum);
+        setVal('.form_killnum', data.killnum);
+        setVal('.form_killcrew', data.killcrew);
+
+        if (!setGeneralNo($general, data.no)) {
             setGeneralNo($general, generateNewGeneralNo());
         }
     }
 
-    var exportGeneralInfo = function($general){
-        var getInt = function(query){
+    var exportGeneralInfo = function($general) {
+        var getInt = function(query) {
             return parseInt($general.find(query).val());
         }
 
-        var getVal = function(query){
+        var getVal = function(query) {
             return $general.find(query).val();
         }
 
         return {
-            no:getGeneralNo($general),
-            name:getVal('.form_general_name'),
-            officer_level:getInt('.form_officer_level'),
-            explevel:getInt('.form_exp_level'),
+            no: getGeneralNo($general),
+            name: getVal('.form_general_name'),
+            officer_level: getInt('.form_officer_level'),
+            explevel: getInt('.form_exp_level'),
 
-            leadership:getInt('.form_leadership'),
-            horse:getVal('.form_general_horse'),
-            strength:getInt('.form_strength'),
-            weapon:getVal('.form_general_weap'),
-            intel:getInt('.form_intel'),
-            book:getVal('.form_general_book'),
-            item:getVal('.form_general_item'),
+            leadership: getInt('.form_leadership'),
+            horse: getVal('.form_general_horse'),
+            strength: getInt('.form_strength'),
+            weapon: getVal('.form_general_weap'),
+            intel: getInt('.form_intel'),
+            book: getVal('.form_general_book'),
+            item: getVal('.form_general_item'),
 
-            injury:getInt('.form_injury'),
+            injury: getInt('.form_injury'),
 
-            rice:getInt('.form_rice'),
+            rice: getInt('.form_rice'),
 
-            personal:getVal('.form_general_character'),
-            special2:getVal('.form_general_special_war'),
+            personal: getVal('.form_general_character'),
+            special2: getVal('.form_general_special_war'),
 
-            crew:getInt('.form_crew'),
-            crewtype:getInt('.form_crewtype'),
-            atmos:getInt('.form_atmos'),
-            train:getInt('.form_train'),
+            crew: getInt('.form_crew'),
+            crewtype: getInt('.form_crewtype'),
+            atmos: getInt('.form_atmos'),
+            train: getInt('.form_train'),
+
+            dex1: getInt('.form_dex1'),
+            dex2: getInt('.form_dex2'),
+            dex3: getInt('.form_dex3'),
+            dex4: getInt('.form_dex4'),
+            dex5: getInt('.form_dex5'),
+
+            defence_train: getInt('.form_defence_train'),
+
+            warnum: getInt('.form_warnum'),
+            killnum: getInt('.form_killnum'),
+            killcrew: getInt('.form_killcrew'),
 
-            dex1:getInt('.form_dex1'),
-            dex2:getInt('.form_dex2'),
-            dex3:getInt('.form_dex3'),
-            dex4:getInt('.form_dex4'),
-            dex5:getInt('.form_dex5'),
-            defence_train:getInt('.form_defence_train'),
         };
     }
 
-    var importBattleInfoByFile = function(files){
-        if(files === null){
+    var importBattleInfoByFile = function(files) {
+        if (files === null) {
             alert('파일 에러!');
             return false;
         }
 
-        if(files.length < 1){
+        if (files.length < 1) {
             alert("파일 에러!");
             return false;
         }
 
 
         var file = files[0];
-        if(file.size > 1024*1024){
+        if (file.size > 1024 * 1024) {
             alert('파일이 너무 큽니다!');
             return false;
         }
-        if(file.type === ''){
+        if (file.type === '') {
             alert('폴더를 업로드할 수 없습니다!');
             return false;
         }
 
         var reader = new FileReader();
-        reader.onload = function(){
+        reader.onload = function() {
             var battleData = {};
             try {
                 battleData = JSON.parse(reader.result);
-            } catch(e) {
+            } catch (e) {
                 alert('올바르지 않은 파일 형식입니다');
                 return false;
             }
 
-            if(!('objType' in battleData)){
+            if (!('objType' in battleData)) {
                 alert('파일 형식을 확인할 수 없습니다');
                 return false;
             }
 
-            if(battleData.objType != 'battle'){
+            if (battleData.objType != 'battle') {
                 alert('전투 데이터가 아닙니다');
                 return false;
             }
@@ -281,8 +315,7 @@ jQuery(function($){
         try {
 
             reader.readAsText(file);
-        }
-        catch(e) {
+        } catch (e) {
             alert('파일을 읽는데 실패했습니다.');
             return false;
         }
@@ -290,52 +323,52 @@ jQuery(function($){
         return true;
     }
 
-    var importGeneralInfoByFile = function(files, $card){
-        if($card === undefined){
+    var importGeneralInfoByFile = function(files, $card) {
+        if ($card === undefined) {
             $card = addDefender();
         }
 
-        if(files === null){
+        if (files === null) {
             alert('파일 에러!');
             return false;
         }
 
-        if(files.length < 1){
+        if (files.length < 1) {
             alert("파일 에러!");
             return false;
         }
 
 
         var file = files[0];
-        if(file.size > 1024*1024){
+        if (file.size > 1024 * 1024) {
             alert('파일이 너무 큽니다!');
             return false;
         }
-        if(file.type === ''){
+        if (file.type === '') {
             alert('폴더를 업로드할 수 없습니다!');
             return false;
         }
 
         var reader = new FileReader();
-        reader.onload = function(){
+        reader.onload = function() {
             var generalData = {};
             try {
                 generalData = JSON.parse(reader.result);
-            } catch(e) {
+            } catch (e) {
                 alert('올바르지 않은 파일 형식입니다');
                 return false;
             }
 
-            if(!('objType' in generalData)){
+            if (!('objType' in generalData)) {
                 alert('파일 형식을 확인할 수 없습니다');
                 return false;
             }
 
-            if(generalData.objType == 'battle'){
+            if (generalData.objType == 'battle') {
                 importBattleInfo(generalData.data);
                 return true;
             }
-            if(generalData.objType != 'general'){
+            if (generalData.objType != 'general') {
                 alert('장수 데이터가 아닙니다');
                 return false;
             }
@@ -349,8 +382,7 @@ jQuery(function($){
         try {
 
             reader.readAsText(file);
-        }
-        catch(e) {
+        } catch (e) {
             alert('파일을 읽는데 실패했습니다.');
             return false;
         }
@@ -358,49 +390,49 @@ jQuery(function($){
         return true;
     }
 
-    var extendGeneralInfoForDB = function(generalData){
+    var extendGeneralInfoForDB = function(generalData) {
 
         var dbVal = {
-            nation: (generalData.no)<=1 ? 1 : 2,
-            city: (generalData.no)<=1 ? 1 : 3,
-            turntime:'2018-08-26 12:00',
-            special:defaultSpecialDomestic,
-            leadership_exp:0,
-            strength_exp:0,
-            intel_exp:0,
+            nation: (generalData.no) <= 1 ? 1 : 2,
+            city: (generalData.no) <= 1 ? 1 : 3,
+            turntime: '2018-08-26 12:00',
+            special: defaultSpecialDomestic,
+            leadership_exp: 0,
+            strength_exp: 0,
+            intel_exp: 0,
 
-            gold:10000,
+            gold: 10000,
 
-            dedication:0,
+            dedication: 0,
 
-            recent_war:'2018-08-26 12:00',
-            experience:Math.pow(generalData.explevel, 2),
+            recent_war: '2018-08-26 12:00',
+            experience: Math.pow(generalData.explevel, 2),
         };
 
         return $.extend({}, generalData, dbVal);
     }
 
-    var getGeneralFrame = function($btn){
+    var getGeneralFrame = function($btn) {
         var $card = $btn.closest('.general_form');
         return $card;
     }
 
-    var getGeneralDetail = function($btn){
+    var getGeneralDetail = function($btn) {
         var $card = getGeneralFrame($btn);
         var $general = $card.find('.general_detail');
         return $general;
     }
 
-    var getGeneralNo = function($btn){
+    var getGeneralNo = function($btn) {
         return parseInt(getGeneralFrame($btn).data('general_no'));
     }
 
-    var setGeneralNo = function($btn, value){
-        if(value == 1){
+    var setGeneralNo = function($btn, value) {
+        if (value == 1) {
             //1번은 무조건 공격자임
             return false;
         }
-        if(value in defenderNoList){
+        if (value in defenderNoList) {
             return false;
         }
         var $card = getGeneralFrame($btn);
@@ -409,35 +441,34 @@ jQuery(function($){
         return true;
     }
 
-    var generateNewGeneralNo = function(){
-        while(true){
-            var newGeneralNo = parseInt(Math.random()*(1<<24))+2;
-            if(newGeneralNo in defenderNoList){
+    var generateNewGeneralNo = function() {
+        while (true) {
+            var newGeneralNo = parseInt(Math.random() * (1 << 24)) + 2;
+            if (newGeneralNo in defenderNoList) {
                 continue;
             }
             return newGeneralNo;
         }
     }
 
-    var deleteGeneralNo = function($btn){
+    var deleteGeneralNo = function($btn) {
         var $card = getGeneralFrame($btn);
         $card.removeData('general_no');
         var generalNo = getGeneralNo($card);
         delete defenderNoList[generalNo];
     }
 
-    var addDefender = function($cardAfter){
+    var addDefender = function($cardAfter) {
         var $newCard = $('<div class="card mb-2 defender_form general_form"></div>');
 
-        if($cardAfter === undefined){
+        if ($cardAfter === undefined) {
             $defenderColumn.append($newCard);
-        }
-        else{
+        } else {
             $cardAfter.after($newCard);
         }
 
-        $newCard.append($defenderHeaderForm.clone(true,true));
-        $newCard.append($generalForm.clone(true,true));
+        $newCard.append($defenderHeaderForm.clone(true, true));
+        $newCard.append($generalForm.clone(true, true));
 
         $newGeneral = getGeneralDetail($newCard);
         setGeneralNo($newCard, generateNewGeneralNo());
@@ -445,12 +476,12 @@ jQuery(function($){
         return $newCard;
     }
 
-    var deleteDefender = function($card){
+    var deleteDefender = function($card) {
         deleteGeneralNo($card);
         $card.detach();
     }
 
-    var copyDefender = function($card){
+    var copyDefender = function($card) {
         var $general = getGeneralDetail($card);
 
         var generalData = exportGeneralInfo($general);
@@ -458,7 +489,7 @@ jQuery(function($){
         importGeneralInfo(getGeneralDetail($newObj), generalData);
     }
 
-    var importBattleInfo = function(battleData){
+    var importBattleInfo = function(battleData) {
 
         $('.form_load_battle_file').val('');
         console.log(battleData);
@@ -481,12 +512,11 @@ jQuery(function($){
         $('.delete-defender').click();
 
         $attackerNation.find('.form_nation_type').val(attackerNation.type);
-        $attackerNation.find('.form_tech').val(Math.floor(attackerNation.tech/1000));
+        $attackerNation.find('.form_tech').val(Math.floor(attackerNation.tech / 1000));
         $attackerNation.find('.form_nation_level').val(attackerNation.level);
-        if(attackerNation.capital == 1){
+        if (attackerNation.capital == 1) {
             $attackerNation.find('.form_is_capital:first').click();
-        }
-        else{
+        } else {
             $attackerNation.find('.form_is_capital:last').click();
         }
         $attackerNation.find('.form_city_level').val(attackerCity.level);
@@ -494,56 +524,55 @@ jQuery(function($){
         importGeneralInfo($('.attacker_form'), attackerGeneral);
 
         $defenderNation.find('.form_nation_type').val(defenderNation.type);
-        $defenderNation.find('.form_tech').val(Math.floor(defenderNation.tech/1000));
+        $defenderNation.find('.form_tech').val(Math.floor(defenderNation.tech / 1000));
         $defenderNation.find('.form_nation_level').val(defenderNation.level);
-        if(defenderNation.capital == 1){
+        if (defenderNation.capital == 1) {
             $defenderNation.find('.form_is_capital:first').click();
-        }
-        else{
+        } else {
             $defenderNation.find('.form_is_capital:last').click();
         }
         $defenderNation.find('.form_city_level').val(defenderCity.level);
         $('#city_def').val(defenderCity.def);
         $('#city_wall').val(defenderCity.wall);
 
-        $.each(defenderGenerals, function(idx, defenderGeneral){
+        $.each(defenderGenerals, function(idx, defenderGeneral) {
             var $card = addDefender();
             importGeneralInfo($card, defenderGeneral);
         });
     }
 
-    var exportAllData = function(){
+    var exportAllData = function() {
         var $attackerNation = $('.attacker_nation');
         var $defenderNation = $('.defender_nation');
 
         var attackerGeneral = exportGeneralInfo($('.attacker_form'));
 
         var attackerCity = {
-            level:parseInt($attackerNation.find('.form_city_level').val()),
+            level: parseInt($attackerNation.find('.form_city_level').val()),
         };
 
         var attackerNation = {
-            type:$attackerNation.find('.form_nation_type').val(),
-            tech:parseInt($attackerNation.find('.form_tech').val()) * 1000,
-            level:parseInt($attackerNation.find('.form_nation_level').val()),
-            capital:$attackerNation.find('.form_is_capital:checked').val()=='1'?1:2,
+            type: $attackerNation.find('.form_nation_type').val(),
+            tech: parseInt($attackerNation.find('.form_tech').val()) * 1000,
+            level: parseInt($attackerNation.find('.form_nation_level').val()),
+            capital: $attackerNation.find('.form_is_capital:checked').val() == '1' ? 1 : 2,
         }
 
-        var defenderGenerals = $('.defender_form').map(function(){
+        var defenderGenerals = $('.defender_form').map(function() {
             return exportGeneralInfo($(this));
         }).toArray();
 
         var defenderCity = {
             def: parseInt($('#city_def').val()),
             wall: parseInt($('#city_wall').val()),
-            level:parseInt($defenderNation.find('.form_city_level').val()),
+            level: parseInt($defenderNation.find('.form_city_level').val()),
         };
 
         var defenderNation = {
-            type:$defenderNation.find('.form_nation_type').val(),
-            tech:parseInt($defenderNation.find('.form_tech').val()) * 1000,
-            level:parseInt($defenderNation.find('.form_nation_level').val()),
-            capital:$defenderNation.find('.form_is_capital:checked').val()=='1'?3:4,
+            type: $defenderNation.find('.form_nation_type').val(),
+            tech: parseInt($defenderNation.find('.form_tech').val()) * 1000,
+            level: parseInt($defenderNation.find('.form_nation_level').val()),
+            capital: $defenderNation.find('.form_is_capital:checked').val() == '1' ? 3 : 4,
         }
 
         var year = parseInt($('#year').val());
@@ -551,59 +580,59 @@ jQuery(function($){
         var repeatCnt = parseInt($('#repeat_cnt').val());
 
         return {
-            attackerGeneral:attackerGeneral,
-            attackerCity:attackerCity,
-            attackerNation:attackerNation,
+            attackerGeneral: attackerGeneral,
+            attackerCity: attackerCity,
+            attackerNation: attackerNation,
 
-            defenderGenerals:defenderGenerals,
-            defenderCity:defenderCity,
-            defenderNation:defenderNation,
+            defenderGenerals: defenderGenerals,
+            defenderCity: defenderCity,
+            defenderNation: defenderNation,
 
-            year:year,
-            month:month,
-            repeatCnt:repeatCnt,
+            year: year,
+            month: month,
+            repeatCnt: repeatCnt,
         };
     }
 
-    var extendAllDataForDB = function(allData){
+    var extendAllDataForDB = function(allData) {
         var defaultNation = {
-            nation:0,
-            name:'재야',
-            capital:0,
-            level:0,
-            gold:0,
-            rice:2000,
-            type:'None',
-            tech:0,
-            gennum:200,
+            nation: 0,
+            name: '재야',
+            capital: 0,
+            level: 0,
+            gold: 0,
+            rice: 2000,
+            type: 'None',
+            tech: 0,
+            gennum: 200,
         };
 
         var defaultCity = {
-            nation:0,
-            supply:1,
-            name:'도시',
+            nation: 0,
+            supply: 1,
+            name: '도시',
 
-            pop:500000,
-            agri:10000,
-            comm:10000,
-            secu:10000,
-            def:1000,
-            wall:1000,
+            pop: 500000,
+            agri: 10000,
+            comm: 10000,
+            secu: 10000,
+            def: 1000,
+            wall: 1000,
 
-            trust:100,
+            trust: 100,
 
-            pop_max:600000,
-            agri_max:12000,
-            comm_max:12000,
-            secu_max:10000,
-            def_max:12000,
-            wall_max:12000,
+            pop_max: 600000,
+            agri_max: 12000,
+            comm_max: 12000,
+            secu_max: 10000,
+            def_max: 12000,
+            wall_max: 12000,
 
-            dead:0,
+            dead: 0,
 
-            state:0,
+            state: 0,
 
-            conflict:'{}',
+            conflict: '{}',
         };
 
         var attackerNation = $.extend({}, defaultNation, allData.attackerNation);
@@ -615,10 +644,9 @@ jQuery(function($){
         attackerCity.city = 1;
 
         var attackerGeneral = extendGeneralInfoForDB(allData.attackerGeneral);
-        if(2 <= attackerGeneral.officer_level && attackerGeneral.officer_level <= 4){
+        if (2 <= attackerGeneral.officer_level && attackerGeneral.officer_level <= 4) {
             attackerGeneral.officer_city = 1;
-        }
-        else{
+        } else {
             attackerGeneral.officer_city = 0;
         }
 
@@ -629,16 +657,15 @@ jQuery(function($){
         var defenderCity = $.extend({}, defaultCity, allData.defenderCity);
         defenderCity.nation = 2;
         defenderCity.city = 3;
-        defenderCity.wall_max = defenderCity.wall/5*6;
-        defenderCity.def_max = defenderCity.def/5*6;
+        defenderCity.wall_max = parseInt(defenderCity.wall / 5 * 6);
+        defenderCity.def_max = parseInt(defenderCity.def / 5 * 6);
 
         var defenderGenerals = [];
-        $.each(allData.defenderGenerals, function(){
+        $.each(allData.defenderGenerals, function() {
             var defenderGeneral = extendGeneralInfoForDB(this);
-            if(2 <= defenderGeneral.officer_level && defenderGeneral.officer_level <= 4){
+            if (2 <= defenderGeneral.officer_level && defenderGeneral.officer_level <= 4) {
                 defenderGeneral.officer_city = 3;
-            }
-            else{
+            } else {
                 defenderGeneral.officer_city = 0;
             }
 
@@ -647,58 +674,55 @@ jQuery(function($){
 
 
         return $.extend({}, allData, {
-            attackerGeneral:attackerGeneral,
-            attackerCity:attackerCity,
-            attackerNation:attackerNation,
+            attackerGeneral: attackerGeneral,
+            attackerCity: attackerCity,
+            attackerNation: attackerNation,
 
-            defenderGenerals:defenderGenerals,
-            defenderCity:defenderCity,
-            defenderNation:defenderNation,
+            defenderGenerals: defenderGenerals,
+            defenderCity: defenderCity,
+            defenderNation: defenderNation,
         });
     }
 
-    var parseSkillCount = function(skills){
+    var parseSkillCount = function(skills) {
         var result = [];
-        $.each(skills, function(key, value){
+        $.each(skills, function(key, value) {
             result.push("{0}({1}회)".format(key, toPretty(value)));
         })
 
-        if(result.length == 0){
+        if (result.length == 0) {
             return '-';
         }
         return result.join(', ');
     }
 
-    var toPretty = function(number){
-        if(isInt(number)){
+    var toPretty = function(number) {
+        if (isInt(number)) {
             number = parseInt(number);
-        }
-        else{
+        } else {
             number = parseFloat(number).toFixed(2);
         }
         return numberWithCommas(number);
     }
 
-    var showBattleResult = function(result){
+    var showBattleResult = function(result) {
         $('#result_datetime').html(result.datetime);
         $('#result_warcnt').html(toPretty(result.avgWar));
         $('#result_phase').html(toPretty(result.phase));
         $('#result_killed').html(toPretty(result.killed));
-        if(result.minKilled != result.maxKilled){
+        if (result.minKilled != result.maxKilled) {
             $('#result_maxKilled').html(toPretty(result.maxKilled));
             $('#result_minKilled').html(toPretty(result.minKilled));
             $('#result_varKilled').show();
-        }
-        else{
+        } else {
             $('#result_varKilled').hide();
         }
         $('#result_dead').html(toPretty(result.dead));
-        if(result.minDead != result.maxDead){
+        if (result.minDead != result.maxDead) {
             $('#result_maxDead').html(toPretty(result.maxDead));
             $('#result_minDead').html(toPretty(result.minDead));
             $('#result_varDead').show();
-        }
-        else{
+        } else {
             $('#result_varDead').hide();
         }
 
@@ -710,7 +734,7 @@ jQuery(function($){
 
         var $summary = $('#battle_result_summary');
 
-        $.each(result.defendersSkills, function(idx, defenderSkills){
+        $.each(result.defendersSkills, function(idx, defenderSkills) {
             console.log(defenderSkills);
             var $result = $("<tr class='result_defenderSkills'><th>수비자{0} 스킬</th><td></td></tr>".format(idx + 1));
             $result.find('td').html(parseSkillCount(defenderSkills));
@@ -722,35 +746,35 @@ jQuery(function($){
 
     }
 
-    var beginBattle = function(){
+    var beginBattle = function() {
         var data = extendAllDataForDB(exportAllData());
         console.log(data);
         $.ajax({
-            type:'post',
-            url:'j_simulate_battle.php',
-            dataType:'json',
-            data:{
-                action:'battle',
-                query:JSON.stringify(data),
+            type: 'post',
+            url: 'j_simulate_battle.php',
+            dataType: 'json',
+            data: {
+                action: 'battle',
+                query: JSON.stringify(data),
             }
-        }).then(function(result){
+        }).then(function(result) {
             console.log(result);
-            if(!result.result){
+            if (!result.result) {
                 alert(result.reason);
                 return;
             }
             showBattleResult(result);
 
-        }, function(result){
+        }, function(result) {
             alert('전투 개시 실패!');
         });
     }
 
 
-    var reorderDefender = function(defenderOrder){
-        $.each(defenderOrder, function(idx, generalNo){
+    var reorderDefender = function(defenderOrder) {
+        $.each(defenderOrder, function(idx, generalNo) {
 
-            if(!(generalNo in defenderNoList)){
+            if (!(generalNo in defenderNoList)) {
                 //음..?
                 alert("{0}이 수비자 리스트에 없습니다. 버그인 듯 합니다.".format(generalNo));
                 return true;
@@ -762,39 +786,147 @@ jQuery(function($){
         })
     }
 
-    var requestReorderDefender = function(){
+    var requestReorderDefender = function() {
         var data = extendAllDataForDB(exportAllData());
         console.log(data);
         $.ajax({
-            type:'post',
-            url:'j_simulate_battle.php',
-            dataType:'json',
-            data:{
-                action:'reorder',
-                query:JSON.stringify(data),
+            type: 'post',
+            url: 'j_simulate_battle.php',
+            dataType: 'json',
+            data: {
+                action: 'reorder',
+                query: JSON.stringify(data),
             }
-        }).then(function(result){
+        }).then(function(result) {
             console.log(result);
-            if(!result.result){
+            if (!result.result) {
                 alert(result.reason);
                 return;
             }
             reorderDefender(result.order);
 
-        }, function(result){
+        }, function(result) {
             alert('재정렬 실패!');
         });
     }
 
+    var initGeneralList = false;
+
+    $('#importFromDB').click(function() {
+        var generalID = $('#modalSelector').val();
+        console.log(generalID);
+
+
+        $.post({
+            url: 'j_export_simulator_object.php',
+            dataType: 'json',
+            data: {
+                destGeneralID: generalID
+            }
+        }).then(function(data) {
+
+            if (!data.result) {
+                alert(data.reason);
+                return false;
+            }
+
+            var $modal = $('#importModal');
+            var $card = $modal.data('target');
+            importGeneralInfo($card, data.general);
+
+            $modal.modal('hide');
+        }, errUnknown);
+
+
+    });
+
+    $('#importModal').on('show.bs.modal', function(e) {
+        if (!initGeneralList) {
+            var $list = $('#modalSelector');
+
+            var addNation = function(generalList, nationName, color) {
+
+                generalList.sort(function(lhs, rhs) {
+                    if (lhs.npc != rhs.npc) {
+                        return lhs.npc - rhs.npc;
+                    }
+                    if (lhs.name < rhs.name) {
+                        return -1;
+                    }
+                    if (lhs.name > rhs.name) {
+                        return 1;
+                    }
+                    return 0;
+                })
+                var $optGroup = $('<optgroup label="{0}"></optgroup>'.format(nationName));
+                $optGroup.css('background-color', color);
+                $optGroup.css('color', isBrightColor(color) ? 'black' : 'white');
+
+                $.each(generalList, function(idx, general) {
+                    $item = $('<option value="{0}">{1}</option>'.format(general.no, general.name));
+                    if (general.npc) {
+                        $item.css('color', getNpcColor(general.npc));
+                    } else {
+                        $item.css('color', 'white');
+                    }
+                    $item.css('background-color', 'black');
+                    $optGroup.append($item);
+
+                });
+                $list.append($optGroup);
+            }
+            $.post({
+                url: 'j_get_basic_general_list.php',
+                dataType: 'json',
+                data: {
+                    req: 2,
+                }
+            }).then(function(data) {
+                if (!data.result) {
+                    alert(data.reason);
+                    $('#importModal').modal('hide');
+                    return false;
+                }
+
+                var nations = data.nation;
+                var myNationID = data.nationID;
+
+                $list.empty();
+                //자국 먼저
+
+                if (0 in data.list) {
+                    nations[0] = {
+                        nation: 0,
+                        name: '재야',
+                        color: '#000000'
+                    };
+                }
+
+
+
+                addNation(combineArray(data.list[myNationID], data.column), nations[myNationID].name, nations[myNationID].color);
+
+                for (var nationID in data.list) {
+                    if (nationID == myNationID) {
+                        continue;
+                    }
+                    addNation(combineArray(data.list[nationID], data.column), nations[nationID].name, nations[nationID].color);
+                }
+                initGeneralList = true;
+            }, errUnknown);
+        }
+
+    });
+
     initBasicEvent();
-    $attackerCard.append($generalForm.clone(true,true));
+    $attackerCard.append($generalForm.clone(true, true));
     addDefender();
 
-    $('.btn-begin_battle').click(function(){
+    $('.btn-begin_battle').click(function() {
         beginBattle();
     });
 
-    $('.btn-reorder_defender').click(function(){
+    $('.btn-reorder_defender').click(function() {
         requestReorderDefender();
     })
 });

hwe/js/bossInfo.js

@@ -1,26 +1,26 @@
-function changePermission(isAmbassador, rawGeneralList){
+function changePermission(isAmbassador, rawGeneralList) {
     console.log(isAmbassador);
     console.log(rawGeneralList);
 
     var generalList = [];
-    $.each(rawGeneralList, function(idx, value){
+    $.each(rawGeneralList, function(idx, value) {
         generalList.push(parseInt(value.id));
     })
 
     $.post({
-        url:'j_general_set_permission.php',
-        dataType:'json',
-        data:{
-            isAmbassador:isAmbassador,
-            genlist:generalList
+        url: 'j_general_set_permission.php',
+        dataType: 'json',
+        data: {
+            isAmbassador: isAmbassador,
+            genlist: generalList
         },
-    }).then(function(data){
-        if(!data){
+    }).then(function(data) {
+        if (!data) {
             alert('변경하지 못했습니다.');
             return false;
         }
-        if(!data.result){
-            alert('변경하지 못했습니다. : '+data.reason);
+        if (!data.result) {
+            alert('변경하지 못했습니다. : ' + data.reason);
             return false;
         }
         alert('변경했습니다.');
@@ -28,19 +28,19 @@ function changePermission(isAmbassador, rawGeneralList){
     }, errUnknown);
 }
 
-$(function(){
+$(function() {
     $('#selectAmbassador').select2({
         theme: 'bootstrap4',
         placeholder: "",
         allowClear: true,
         language: "ko",
-        width:300,
+        width: 300,
         maximumSelectionLength: 2,
         containerCss: {
             display: "inline-block !important;",
             color: 'white !important'
         },
-        data:candidateAmbassadors,
+        data: candidateAmbassadors,
         //containerCssClass: 'simple-select2-align-center bg-secondary text-secondary',
         dropdownCssClass: 'simple-select2-align-center bg-secondary text-secondary',
     });
@@ -50,19 +50,19 @@ $(function(){
         placeholder: "",
         allowClear: true,
         language: "ko",
-        width:300,
+        width: 300,
         maximumSelectionLength: 2,
         containerCss: {
             display: "inline-block !important;",
             color: 'white !important'
         },
-        data:candidateAuditors,
+        data: candidateAuditors,
         //containerCssClass: 'simple-select2-align-center bg-secondary text-secondary',
         dropdownCssClass: 'simple-select2-align-center bg-secondary text-secondary',
     });
 
-    $('#changeAmbassador').click(function(){
-        if(!confirm('외교권자를 변경할까요?')){
+    $('#changeAmbassador').click(function() {
+        if (!confirm('외교권자를 변경할까요?')) {
             return false;
         }
 
@@ -70,8 +70,8 @@ $(function(){
         return false;
     });
 
-    $('#changeAuditor').click(function(){
-        if(!confirm('조언자를 변경할까요?')){
+    $('#changeAuditor').click(function() {
+        if (!confirm('조언자를 변경할까요?')) {
             return false;
         }
 
@@ -79,31 +79,31 @@ $(function(){
         return false;
     });
 
-    $('#btn_kick').click(function(){
+    $('#btn_kick').click(function() {
         var $kickSelect = $('#genlist_kick option:selected');
         var generalID = $kickSelect.val();
-        if(!generalID){
+        if (!generalID) {
             alert('장수를 선택해주세요');
             return false;
         }
         var generalName = $kickSelect.data('name');
-        if(!confirm('{0}를 추방하시겠습니까?'.format(generalName))){
+        if (!confirm('{0}를 추방하시겠습니까?'.format(generalName))) {
             return false;
         }
         $.post({
-            url:'j_myBossInfo.php',
-            dataType:'json',
-            data:{
-                action:'추방',
-                destGeneralID:generalID
+            url: 'j_myBossInfo.php',
+            dataType: 'json',
+            data: {
+                action: '추방',
+                destGeneralID: generalID
             },
-        }).then(function(data){
-            if(!data){
+        }).then(function(data) {
+            if (!data) {
                 alert('추방하지 못했습니다.');
                 return false;
             }
-            if(!data.result){
-                alert('추방하지 못했습니다. : '+data.reason);
+            if (!data.result) {
+                alert('추방하지 못했습니다. : ' + data.reason);
                 return false;
             }
             alert('{0}를 추방했습니다.'.format(generalName));
@@ -112,7 +112,7 @@ $(function(){
         return false;
     });
 
-    $('.btn_appoint').click(function(){
+    $('.btn_appoint').click(function() {
         var $btn = $(this);
         var officerLevel = $btn.data('officer_level');
         var officerLevelText = $btn.data('officer_level_text');
@@ -121,76 +121,70 @@ $(function(){
         var $generalSelect = $('#genlist_{0} option:selected'.format(officerLevel));
         var $citySelect = $('#citylist_{0} option:selected'.format(officerLevel));
 
-        var generalID = $generalSelect.val();
+        var generalID = parseInt($generalSelect.val());
         var generalName = $generalSelect.data('name');
         var generalOfficerLevel = $generalSelect.data('officer_level');
 
 
-        if(officerLevel >= 5){
-            if(generalID == 0){
-                if(!confirm('{0}직을 비우시겠습니까?'.format(officerLevelText))){
+        if (officerLevel >= 5) {
+            if (generalID == 0) {
+                if (!confirm('{0}직을 비우시겠습니까?'.format(officerLevelText))) {
+                    return false;
+                }
+            } else if (generalOfficerLevel >= 5) {
+                if (!confirm('이미 수뇌인 {0}을(를) {1}직에 임명하시겠습니까?'.format(generalName, officerLevelText))) {
+                    return false;
+                }
+            } else {
+                if (!confirm('{0}을(를) {1}직에 임명하시겠습니까?'.format(generalName, officerLevelText))) {
                     return false;
                 }
             }
-            else if(generalOfficerLevel >= 5){
-                if(!confirm('이미 수뇌인 {0}을(를) {1}직에 임명하시겠습니까?'.format(generalName, officerLevelText))){
-                    return false;
-                }
-            }
-            else{
-                if(!confirm('{0}을(를) {1}직에 임명하시겠습니까?'.format(generalName, officerLevelText))){
-                    return false;
-                }
-            }
-        }
-        else{
+        } else {
             cityID = $citySelect.val();
-            if(!cityID){
+            if (!cityID) {
                 alert('도시를 선택해주세요');
                 return false;
             }
             cityName = $citySelect.find('option:selected .name_field').text();
 
-            if(generalID == 0){
-                if(!confirm('{0} {1}직을 비우시겠습니까?'.format(cityName, officerLevelText))){
+            if (generalID == 0) {
+                if (!confirm('{0} {1}직을 비우시겠습니까?'.format(cityName, officerLevelText))) {
                     return false;
                 }
-            }
-            else if(generalOfficerLevel >= 5){
-                if(!confirm('수뇌인 {0}을(를) {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, officerLevelText))){
+            } else if (generalOfficerLevel >= 5) {
+                if (!confirm('수뇌인 {0}을(를) {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, officerLevelText))) {
                     return false;
                 }
-            }
-            else{
-                if(!confirm('{0}을(를) {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, officerLevelText))){
+            } else {
+                if (!confirm('{0}을(를) {1} {2}직에 임명하시겠습니까?'.format(generalName, cityName, officerLevelText))) {
                     return false;
                 }
             }
         }
 
         $.post({
-            url:'j_myBossInfo.php',
-            dataType:'json',
-            data:{
-                action:'임명',
-                destGeneralID:generalID,
-                destCityID:cityID,
-                officerLevel:officerLevel
+            url: 'j_myBossInfo.php',
+            dataType: 'json',
+            data: {
+                action: '임명',
+                destGeneralID: generalID,
+                destCityID: cityID,
+                officerLevel: officerLevel
             },
-        }).then(function(data){
-            if(!data){
+        }).then(function(data) {
+            if (!data) {
                 alert('임명하지 못했습니다.');
                 return false;
             }
-            if(!data.result){
-                alert('임명하지 못했습니다. : '+data.reason);
+            if (!data.result) {
+                alert('임명하지 못했습니다. : ' + data.reason);
                 return false;
             }
 
-            if(generalID){
+            if (generalID) {
                 alert('{0}을(를) 임명했습니다.'.format(generalName));
-            }
-            else{
+            } else {
                 alert('관직을 비웠습니다.');
             }
 

hwe/js/common.js

@@ -3,8 +3,8 @@
  * @see https://stackoverflow.com/questions/24816/escaping-html-strings-with-jquery
  * @param {string} string escape하고자 하는 문자열
  * @returns {string}
-*/
-var escapeHtml = (function (string) {
+ */
+var escapeHtml = (function(string) {
     var entityMap = {
         '&': '&',
         '<': '&lt;',
@@ -32,58 +32,70 @@ function isInt(n) {
     return +n === n && !(n % 1);
 }
 
-;(function(ns){
+;
+(function(ns) {
     //https://gist.github.com/demouth/3217440
-	/**
-	 * mb_strwidth
-	 * @param String
-	 * @return int
-	 * @see http://php.net/manual/ja/function.mb-strwidth.php
-	 */
-	var mb_strwidth = function(str){
-		var i=0,l=str.length,c='',length=0;
-		for(;i<l;i++){
-			c=str.charCodeAt(i);
-			if(0x0000<=c&&c<=0x0019){
-				length += 0;
-			}else if(0x0020<=c&&c<=0x1FFF){
-				length += 1;
-			}else if(0x2000<=c&&c<=0xFF60){
-				length += 2;
-			}else if(0xFF61<=c&&c<=0xFF9F){
-				length += 1;
-			}else if(0xFFA0<=c){
-				length += 2;
-			}
-		}
-		return length;
-	};
+    /**
+     * mb_strwidth
+     * @param String
+     * @return int
+     * @see http://php.net/manual/ja/function.mb-strwidth.php
+     */
+    var mb_strwidth = function(str) {
+        var i = 0,
+            l = str.length,
+            c = '',
+            length = 0;
+        for (; i < l; i++) {
+            c = str.charCodeAt(i);
+            if (0x0000 <= c && c <= 0x0019) {
+                length += 0;
+            } else if (0x0020 <= c && c <= 0x1FFF) {
+                length += 1;
+            } else if (0x2000 <= c && c <= 0xFF60) {
+                length += 2;
+            } else if (0xFF61 <= c && c <= 0xFF9F) {
+                length += 1;
+            } else if (0xFFA0 <= c) {
+                length += 2;
+            }
+        }
+        return length;
+    };
 
-	/**
-	 * mb_strimwidth
-	 * @param String
-	 * @param int
-	 * @param int
-	 * @param String
-	 * @return String
-	 * @see http://www.php.net/manual/ja/function.mb-strimwidth.php
-	 */
-	var mb_strimwidth = function(str,start,width,trimmarker){
-		if(typeof trimmarker === 'undefined') trimmarker='';
-		var trimmakerWidth = mb_strwidth(trimmarker),i=start,l=str.length,trimmedLength=0,trimmedStr='';
-		for(;i<l;i++){
-			var charCode=str.charCodeAt(i),c=str.charAt(i),charWidth=mb_strwidth(c),next=str.charAt(i+1),nextWidth=mb_strwidth(next);
-			trimmedLength += charWidth;
-			trimmedStr += c;
-			if(trimmedLength+trimmakerWidth+nextWidth>width){
-				trimmedStr += trimmarker;
-				break;
-			}
-		}
-		return trimmedStr;
-	};
-	ns.mb_strwidth   = mb_strwidth;
-	ns.mb_strimwidth = mb_strimwidth;
+    /**
+     * mb_strimwidth
+     * @param String
+     * @param int
+     * @param int
+     * @param String
+     * @return String
+     * @see http://www.php.net/manual/ja/function.mb-strimwidth.php
+     */
+    var mb_strimwidth = function(str, start, width, trimmarker) {
+        if (typeof trimmarker === 'undefined') trimmarker = '';
+        var trimmakerWidth = mb_strwidth(trimmarker),
+            i = start,
+            l = str.length,
+            trimmedLength = 0,
+            trimmedStr = '';
+        for (; i < l; i++) {
+            var charCode = str.charCodeAt(i),
+                c = str.charAt(i),
+                charWidth = mb_strwidth(c),
+                next = str.charAt(i + 1),
+                nextWidth = mb_strwidth(next);
+            trimmedLength += charWidth;
+            trimmedStr += c;
+            if (trimmedLength + trimmakerWidth + nextWidth > width) {
+                trimmedStr += trimmarker;
+                break;
+            }
+        }
+        return trimmedStr;
+    };
+    ns.mb_strwidth = mb_strwidth;
+    ns.mb_strimwidth = mb_strimwidth;
 })(window);
 
 /**
@@ -93,7 +105,7 @@ function isInt(n) {
  */
 function convertDictById(arr) {
     var result = {};
-    arr.forEach(function (v, i) {
+    arr.forEach(function(v, i) {
         result[v.id] = v;
     });
     return result;
@@ -106,7 +118,7 @@ function convertDictById(arr) {
  */
 function convertSet(arr) {
     var result = {};
-    arr.forEach(function (v) {
+    arr.forEach(function(v) {
         result[v] = true;
     });
     return result;
@@ -115,7 +127,7 @@ function convertSet(arr) {
 
 /** 
  * {0}, {1}, {2}형태로 포맷해주는 함수
-*/
+ */
 String.prototype.format = function() {
     var args = arguments;
     return this.replace(/{(\d+)}/g, function(match, number) {
@@ -134,12 +146,11 @@ function hexToRgb(hex) {
 }
 
 
-function isBrightColor(color){
+function isBrightColor(color) {
     color = hexToRgb(color);
-    if ((color.r*0.299 + color.g*0.587 + color.b*0.114) > 140){
+    if ((color.r * 0.299 + color.g * 0.587 + color.b * 0.114) > 140) {
         return true;
-    }
-    else{
+    } else {
         return false;
     }
 }
@@ -177,7 +188,7 @@ function numberWithCommas(x) {
     return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 }
 
-function linkifyStrWithOpt(text){
+function linkifyStrWithOpt(text) {
     return linkifyStr(text, {});
 }
 
@@ -188,14 +199,14 @@ function linkifyStrWithOpt(text){
  * @param {object} options 
  * @returns {string}
  */
-var TemplateEngine = function (html, options) {
+var TemplateEngine = function(html, options) {
     var re = /<%(.+?)%>/g,
         reExp = /(^( )?(var|if|for|else|switch|case|break|{|}|;))(.*)?/g,
         code = 'with(obj) { var r=[];\n',
         cursor = 0,
         result,
         match;
-    var add = function (line, js) {
+    var add = function(line, js) {
         js ? (code += line.match(reExp) ? line + '\n' : 'r.push(' + line + ');\n') :
             (code += line != '' ? 'r.push("' + line.replace(/"/g, '\\"') + '");\n' : '');
         return add;
@@ -208,82 +219,97 @@ var TemplateEngine = function (html, options) {
     }
     add(html.substr(cursor, html.length - cursor));
     code = (code + 'return r.join(""); }').replace(/[\r\t\n]/g, ' ');
-    try { result = new Function('obj', code).apply(options, [options]); }
-    catch (err) { console.error("'" + err.message + "'", " in \n\nCode:\n", code, "\n"); }
+    try { result = new Function('obj', code).apply(options, [options]); } catch (err) { console.error("'" + err.message + "'", " in \n\nCode:\n", code, "\n"); }
     return result;
 }
 
-function getIconPath(imgsvr,  picture){
+function getIconPath(imgsvr, picture) {
     // ../d_shared/common_path.js 필요
-    if(!imgsvr){
-        return pathConfig.sharedIcon+'/'+picture;
-    }
-    else{
-        return pathConfig.root+'/d_pic/'+picture;
+    if (!imgsvr) {
+        return pathConfig.sharedIcon + '/' + picture;
+    } else {
+        return pathConfig.root + '/d_pic/' + picture;
     }
 }
 
-function activeFlip($obj){
+function activeFlip($obj) {
     var $result;
-    if($obj === undefined){
+    if ($obj === undefined) {
         $result = $('img[data-flip]');
-    }
-    else{
+    } else {
         $result = $obj.find('img[data-flip]');
     }
 
-    $result.each(function(){
+    $result.each(function() {
         activeFlipItem($(this));
     });
 
 }
 
-function activeFlipItem($img){
+function combineObject(item, columnList) {
+    var newItem = {};
+    for (var columnIdx in columnList) {
+        var columnName = columnList[columnIdx];
+        newItem[columnName] = item[columnIdx];
+    }
+    return newItem;
+}
+
+function combineArray(array, columnList) {
+    var result = [];
+    for (var key in array) {
+        var item = array[key];
+        result[key] = combineObject(item, columnList);
+    }
+    return result;
+}
+
+function activeFlipItem($img) {
     var imageList = [];
     imageList.push($img.attr('src'));
-    $.each($img.data('flip').split(','), function(idx, value){
+    $.each($img.data('flip').split(','), function(idx, value) {
         var value = $.trim(value);
-        if(!value){
+        if (!value) {
             return true;
         }
         imageList.push(value);
     });
-    if(imageList.length <= 1){
+    if (imageList.length <= 1) {
         return;
     }
     $img.data('computed_flip_array', imageList);
     $img.data('computed_flip_idx', 0);
 
-    $img.click(function(){
+    $img.click(function() {
         var arr = $img.data('computed_flip_array');
         var idx = $img.data('computed_flip_idx');
-        idx = (idx + 1)%(arr.length);
+        idx = (idx + 1) % (arr.length);
         $img.attr('src', arr[idx]);
         $img.data('computed_flip_idx', idx);
     });
-    $img.css('cursor','pointer');
+    $img.css('cursor', 'pointer');
 }
 
-jQuery(function($){
-    $('.obj_tooltip').mouseover(function(){
+jQuery(function($) {
+    $('.obj_tooltip').mouseover(function() {
         var $objTooltip = $(this);
-        if($objTooltip.data('setObjTooltip')){
+        if ($objTooltip.data('setObjTooltip')) {
             return true;
         }
 
         var tooltipClassText = $objTooltip.data('tooltip-class');
-        if(!tooltipClassText){
+        if (!tooltipClassText) {
             tooltipClassText = '';
         }
         var template = '<div class="tooltip {0}" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>'
             .format(tooltipClassText);
 
         $objTooltip.tooltip({
-            title:function(){
+            title: function() {
                 return $.trim($(this).find('.tooltiptext').html());
             },
-            template:template,
-            html:true
+            template: template,
+            html: true
         }).tooltip('show');
 
         $objTooltip.data('setObjTooltip', true);
@@ -297,7 +323,7 @@ jQuery(function($){
     activeFlip();
 
     var customCSS = localStorage.getItem('sam_customCSS');
-    if(customCSS){
+    if (customCSS) {
         var $style = $('<style type="text/css"></style>');
         $style.text(customCSS);
         $style.appendTo($('head'));
@@ -307,11 +333,11 @@ jQuery(function($){
 });
 
 
-function errUnknown(){
+function errUnknown() {
     alert('작업을 실패했습니다.');
 }
 
-function errUnknownToast(){
+function errUnknownToast() {
     $.toast({
         title: '에러!',
         content: '작업을 실패했습니다.',
@@ -320,8 +346,8 @@ function errUnknownToast(){
     });
 }
 
-function quickReject(errMsg){
-    if(errMsg === undefined){
+function quickReject(errMsg) {
+    if (errMsg === undefined) {
         errMsg = '작업을 실패했습니다.';
     }
     var deferred = $.Deferred();
@@ -329,8 +355,8 @@ function quickReject(errMsg){
     return deferred.promise();
 }
 
-function nl2br(text){
-    return text.replace(/\n/g,"<br>");
+function nl2br(text) {
+    return text.replace(/\n/g, "<br>");
 }
 /*
 function br2nl (text) {   
@@ -338,12 +364,54 @@ function br2nl (text) {
 }
 */
 
-function getNpcColor(npcType){
-    if(npcType >= 2){
+function getNpcColor(npcType) {
+    if (npcType >= 2) {
         return 'cyan';
     }
-    if(npcType == 1){
+    if (npcType == 1) {
         return 'skyblue';
     }
     return null;
 }
+
+function initTooltip($obj) {
+    if ($obj === undefined) {
+        $obj = $('.obj_tooltip');
+    } else if (!$obj.hasClass('obj_tooltip')) {
+        $obj = $obj.find('.obj_tooltip');
+    }
+    console.log($obj);
+
+    $obj.each(function() {
+        $target = $(this);
+
+        if ($target.data('installHandler')) {
+            return true;
+        }
+        $target.data('installHandler', true);
+
+        $target.mouseover(function() {
+            var $objTooltip = $(this);
+            if ($objTooltip.data('setObjTooltip')) {
+                return true;
+            }
+
+            var tooltipClassText = $objTooltip.data('tooltip-class');
+            if (!tooltipClassText) {
+                tooltipClassText = '';
+            }
+            var template = '<div class="tooltip {0}" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>'
+                .format(tooltipClassText);
+
+            $objTooltip.tooltip({
+                title: function() {
+                    return $.trim($(this).find('.tooltiptext').html());
+                },
+                template: template,
+                html: true
+            }).tooltip('show');
+
+            $objTooltip.data('setObjTooltip', true);
+        });
+    });
+}

hwe/js/install.js

@@ -1,4 +1,3 @@
-
 /*
 function showCityGeneral(cityIdx){
 
@@ -21,13 +20,13 @@ function loadScenarioPreview(scenarioIdx){
 
 
 
-function loadScenarios(){
+function loadScenarios() {
     $.ajax({
-        method:'post',
-        url:'j_load_scenarios.php',
-        dataType:'json'
-    }).then(function(result){
-        if(!result.result){
+        method: 'post',
+        url: 'j_load_scenarios.php',
+        dataType: 'json'
+    }).then(function(result) {
+        if (!result.result) {
             var deferred = $.Deferred();
             deferred.reject('fail');
             return deferred.promise();
@@ -37,18 +36,18 @@ function loadScenarios(){
         var list = {};
 
 
-        $.each(result.scenario, function(idx, value){
+        $.each(result.scenario, function(idx, value) {
             var title = value.title || "-";
             var pat = /【(.*?)[0-9\-_\.a-zA-Z]*】/;
             var category = pat.exec(title);
-            category = category?category[1]:'-';
+            category = category ? category[1] : '-';
 
             value.title = title;
             value.category = category;
             value.idx = idx;
             value.year = value.year || 180;
 
-            if(!(category in list)){
+            if (!(category in list)) {
                 list[category] = {};
             }
 
@@ -56,12 +55,12 @@ function loadScenarios(){
         });
 
         var $select = $('#scenario_sel');
-        $.each(list, function(category, items){
+        $.each(list, function(category, items) {
             var $optgroup = $('<optgroup>').attr('label', category);
 
-            $.each(items, function(idx, scenario){
+            $.each(items, function(idx, scenario) {
                 var $option = $('<option>')
-                    .data('scenario',scenario)
+                    .data('scenario', scenario)
                     .val(idx)
                     .html(scenario.title);
                 $optgroup.append($option);
@@ -75,7 +74,7 @@ function loadScenarios(){
     });
 }
 
-function scenarioPreview(){
+function scenarioPreview() {
     var $select = $(this);
     var $option = $select.find('option:selected');
 
@@ -89,124 +88,123 @@ function scenarioPreview(){
 
     $year.html('{0}년'.format(scenario.year));
     $npc.html('{0}명'.format(scenario.npc_cnt));
-    if(scenario.npcEx_cnt == 0){
+    if (scenario.npcEx_cnt == 0) {
         $npcEx.html('');
-    }
-    else{
+    } else {
         $npcEx.html('+{0}명'.format(scenario.npcEx_cnt));
     }
 
     $nation.html('');
-    $.each(scenario.nation, function(idx, nation){
+    $.each(scenario.nation, function(idx, nation) {
         $nation.append('<span style="color:{0}">{1}</span> {2}명. {3}<br>'.format(
             nation.color, nation.name, nation.generals, nation.cities.join(', ')
         ));
     });
 }
 
-function formSetup(){
-    $.validator.addMethod("autorun_user", function(value,element){
+function formSetup() {
+    $.validator.addMethod("autorun_user", function(value, element) {
         var parent = $(element).parent('.input-group');
         var checkCnt = parent.find('input:checked').length;
-        if(value <= 0){
-            if(checkCnt > 0){
+        if (value <= 0) {
+            if (checkCnt > 0) {
                 return false;
             }
             return true;
         }
 
 
-        if(checkCnt == 0){
+        if (checkCnt == 0) {
             return false;
         }
         return true;
     }, "유효 시간과 옵션은 동시에 설정해야합니다.");
     $('#game_form').validate({
-        rules:{
-            turnterm:"required",
-            sync:"required",
-            scenario:"required",
-            fiction:"required",
-            extend:"required",
-            npcmode:"required",
-            show_img_level:"required",
-            tournament_trig:"required",
-            join_mode:'required',
-            autorun_user_minutes:{required: true, autorun_user: true, min:0}
+        rules: {
+            turnterm: "required",
+            sync: "required",
+            scenario: "required",
+            fiction: "required",
+            extend: "required",
+            npcmode: "required",
+            show_img_level: "required",
+            tournament_trig: "required",
+            join_mode: 'required',
+            autorun_user_minutes: { required: true, autorun_user: true, min: 0 }
         },
         errorElement: "div",
-        errorPlacement: function ( error, element ) {
+        errorPlacement: function(error, element) {
             // Add the `help-block` class to the error element
-            error.addClass( "invalid-feedback" );
+            error.addClass("invalid-feedback");
 
-            if ( element.prop( "type" ) === "checkbox" ) {
-                error.insertAfter( element.parent( "label" ) );
+            if (element.prop("type") === "checkbox") {
+                error.insertAfter(element.parent("label"));
             } else {
-                error.insertAfter( element );
+                error.insertAfter(element);
             }
         },
-        highlight: function ( element, errorClass, validClass ) {
-            $( element ).addClass( "is-invalid" ).removeClass( "is-valid" );
+        highlight: function(element, errorClass, validClass) {
+            $(element).addClass("is-invalid").removeClass("is-valid");
         },
-        unhighlight: function (element, errorClass, validClass) {
-            $( element ).addClass( "is-valid" ).removeClass( "is-invalid" );
+        unhighlight: function(element, errorClass, validClass) {
+            $(element).addClass("is-valid").removeClass("is-invalid");
         }
     });
-    $('#game_form').submit(function(e){
+    $('#game_form').submit(function(e) {
         e.preventDefault();
-        if(!$("#game_form").valid()){
+        if (!$("#game_form").valid()) {
             return;
         }
 
         var autorun_user_minutes = parseInt($('#autorun_user_minutes').val());
         var autorun_user = [];
-        if(autorun_user_minutes > 0){
-            $('.autorun_user_chk:checked').each(function(){
+        if (autorun_user_minutes > 0) {
+            $('.autorun_user_chk:checked').each(function() {
                 autorun_user.push($(this).data('key'));
             });
         }
 
         $.ajax({
-            cache:false,
-            type:'post',
-            url:'j_install.php',
-            dataType:'json',
-            data:{
-                turnterm:$('#turnterm input:radio:checked').val(),
-                sync:$('#sync input:radio:checked').val(),
-                scenario:$('#scenario_sel').val(),
-                fiction:$('#fiction input:radio:checked').val(),
-                extend:$('#extend input:radio:checked').val(),
-                npcmode:$('#npcmode input:radio:checked').val(),
-                show_img_level:$('#show_img_level input:radio:checked').val(),
-                tournament_trig:$('#tournament_trig input:radio:checked').val(),
-                reserve_open:$('#reserve_open').val(),
-                pre_reserve_open:$('#pre_reserve_open').val(),
-                join_mode:$('#join_mode input:radio:checked').val(),
-                autorun_user_minutes:autorun_user_minutes,
-                autorun_user:autorun_user
+            cache: false,
+            type: 'post',
+            url: 'j_install.php',
+            dataType: 'json',
+            data: {
+                turnterm: $('#turnterm input:radio:checked').val(),
+                sync: $('#sync input:radio:checked').val(),
+                scenario: $('#scenario_sel').val(),
+                fiction: $('#fiction input:radio:checked').val(),
+                extend: $('#extend input:radio:checked').val(),
+                block_general_create: $('#block_general_create input:radio:checked').val(),
+                npcmode: $('#npcmode input:radio:checked').val(),
+                show_img_level: $('#show_img_level input:radio:checked').val(),
+                tournament_trig: $('#tournament_trig input:radio:checked').val(),
+                reserve_open: $('#reserve_open').val(),
+                pre_reserve_open: $('#pre_reserve_open').val(),
+                join_mode: $('#join_mode input:radio:checked').val(),
+                autorun_user_minutes: autorun_user_minutes,
+                autorun_user: autorun_user
             }
-        }).then(function(result){
+        }).then(function(result) {
             var deferred = $.Deferred();
 
-            if(!result.result){
+            if (!result.result) {
                 alert(result.reason);
                 deferred.reject('fail');
-            }
-            else{
+            } else {
                 alert('게임이 리셋되었습니다.');
                 deferred.resolve();
             }
 
             return deferred.promise();
-        }).then(function(){
+        }).then(function() {
             location.href = '..';
         });
 
     });
 }
 
-$(function(){
+$(function() {
     loadScenarios();
     $('#scenario_sel').change(scenarioPreview);
     formSetup();

hwe/js/map.js

@@ -1,8 +1,7 @@
-
 function is_touch_device() {
     var prefixes = ' -webkit- -moz- -o- -ms- '.split(' ');
     var mq = function(query) {
-      return window.matchMedia(query).matches;
+        return window.matchMedia(query).matches;
     }
 
     if (('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch) {
@@ -14,32 +13,39 @@ function is_touch_device() {
     // https://git.io/vznFH
     var query = ['(', prefixes.join('touch-enabled),('), 'heartz', ')'].join('');
     return mq(query);
-  }
+}
 
-function reloadWorldMap(option){
-    var $world_map = $('.world_map');
+function reloadWorldMap(option, drawTarget) {
+    if (drawTarget === undefined || drawTarget === null) {
+        drawTarget = '.world_map'
+    }
+    var $world_map = $(drawTarget);
 
-    if($world_map.length == 0){
+    if ($world_map.length == 0) {
         return;
     }
 
     var defaultOption = {
-        isDetailMap:true, //복잡 지도, 단순 지도
-        clickableAll:false, //어떤 경우든 클릭을 가능하게 함. 해당 동작의 동작 가능성 여부와는 별도.
-        selectCallback:null, //callback을 지정시 clickable과 관계 없이 해당 함수를 실행. 
-        hrefTemplate:'#', //도시가 클릭가능할 경우 지정할 href값. {0}은 도시 id로 변환됨
-        useCachedMap:false, //맵 캐시를 사용
+        isDetailMap: true, //복잡 지도, 단순 지도
+        clickableAll: false, //어떤 경우든 클릭을 가능하게 함. 해당 동작의 동작 가능성 여부와는 별도.
+        selectCallback: null, //callback을 지정시 clickable과 관계 없이 해당 함수를 실행. 
+        hrefTemplate: '#', //도시가 클릭가능할 경우 지정할 href값. {0}은 도시 id로 변환됨
+        useCachedMap: false, //맵 캐시를 사용
 
         //아래부터는 post query에 들어갈 녀석
-        year:null, //year값, 연감등에 사용
-        month:null, //month값, 연감등에 사용
-        aux:null, //기타 넣고 싶은 값을 입력
-        neutralView:false, //clickable, 소속 국가, 첩보 여부 등을 반환여부를 설정
-        showMe:true, //반환 값에 본인이 위치한 도시 값을 반환하도록 설정. neutralView와 별개
-        targetJson:'j_map.php',
+        year: null, //year값, 연감등에 사용
+        month: null, //month값, 연감등에 사용
+        aux: null, //기타 넣고 싶은 값을 입력
+        neutralView: false, //clickable, 소속 국가, 첩보 여부 등을 반환여부를 설정
+        showMe: true, //반환 값에 본인이 위치한 도시 값을 반환하도록 설정. neutralView와 별개
+
+        targetJson: 'j_map.php',
+        reqType: 'post',
+        dynamicMapTheme: false,
+        callback: null,
 
         //기타 보조 값
-        startYear:null,
+        startYear: null,
     };
 
     option = $.extend(defaultOption, option);
@@ -56,23 +62,23 @@ function reloadWorldMap(option){
     var storedStartYear = 'sam.{0}.startYear'.format(serverNick);
     //OBJ : startYear, year, month, cityList, nationList, spyList, shownByGeneralList, myCity
 
-    function checkReturnObject(obj){
-        if(!obj.result){
+    function checkReturnObject(obj) {
+        if (!obj.result) {
             var obj = $.Deferred();
             obj.reject('fail');
             return obj.promise();
         }
 
-        if(!$.isNumeric(obj.startYear)
-            ||!$.isNumeric(obj.year)
-            ||!$.isNumeric(obj.month)
-        ){
+        if (!$.isNumeric(obj.startYear) ||
+            !$.isNumeric(obj.year) ||
+            !$.isNumeric(obj.month)
+        ) {
             var obj = $.Deferred();
             obj.reject('fail');
             return obj.promise();
         }
 
-        if(useCachedMap){
+        if (useCachedMap) {
             localStorage.setItem(storedOldMapKey, JSON.stringify([serverID, obj]));
             localStorage.setItem(storedStartYear, JSON.stringify(obj.startYear));
         }
@@ -82,26 +88,40 @@ function reloadWorldMap(option){
         return obj;
     }
 
-    function setMapBackground(obj){
+
+
+    function setMapBackground(obj) {
+        function setTheme() {
+            var oldTheme = $world_map.data('currentTheme');
+            var newTheme = obj.theme;
+            if (oldTheme === newTheme) {
+                return;
+            }
+            if (oldTheme) {
+                $world_map.removeClass('map_theme_' + oldTheme);
+            }
+            $world_map.addClass('map_theme_' + newTheme);
+            $world_map.data('currentTheme', newTheme);
+        }
+        if (option.dynamicMapTheme) {
+            setTheme();
+        }
         var startYear = obj.startYear;
         var year = obj.year;
         var month = obj.month;
 
-        if(isDetailMap){
+        if (isDetailMap) {
             $world_map.addClass('map_detail').removeClass('map_basic');
-        }
-        else{
+        } else {
             $world_map.addClass('map_basic').removeClass('map_detail');
         }
 
         var $map_title = $('.map_title_text');
-        if(year < startYear + 1){
+        if (year < startYear + 1) {
             $map_title.css('color', 'magenta');
-        }
-        else if(year < startYear + 2){
+        } else if (year < startYear + 2) {
             $map_title.css('color', 'orange');
-        }
-        else if(year < startYear + 3){
+        } else if (year < startYear + 3) {
             $map_title.css('color', 'yellow');
         }
 
@@ -109,17 +129,17 @@ function reloadWorldMap(option){
         $map_title_tooltip.empty();
 
         var tooltipTexts = [];
-        if(year < startYear + 3){
+        if (year < startYear + 3) {
             var startYearText = [];
             var remainYear = startYear + 3 - year;
             var remainMonth = 12 - month + 1;
-            if(remainMonth > 0){
+            if (remainMonth > 0) {
                 remainYear -= 1;
             }
-            if(remainYear){
+            if (remainYear) {
                 startYearText.push('{0}년'.format(remainYear));
             }
-            if(remainMonth){
+            if (remainMonth) {
                 startYearText.push('{0}개월'.format(remainMonth));
             }
 
@@ -129,20 +149,17 @@ function reloadWorldMap(option){
         var currentTechLimit = Math.floor(Math.max(0, year - startYear) / 5) + 1;
         var nextTechLimitYear = currentTechLimit * 5 + startYear;
 
-        tooltipTexts.push('기술등급 제한 : {0}등급 ({1}년 해제)'.format(currentTechLimit, nextTechLimitYear, currentTechLimit+1));
+        tooltipTexts.push('기술등급 제한 : {0}등급 ({1}년 해제)'.format(currentTechLimit, nextTechLimitYear, currentTechLimit + 1));
         $map_title_tooltip.html(tooltipTexts.join('<br>'));
 
         $world_map.removeClass('map_string map_summer map_fall map_winter');
-        if(month <= 3){
+        if (month <= 3) {
             $world_map.addClass('map_spring');
-        }
-        else if(month <= 6){
+        } else if (month <= 6) {
             $world_map.addClass('map_summer');
-        }
-        else if(month <= 9){
+        } else if (month <= 9) {
             $world_map.addClass('map_fall');
-        }
-        else{
+        } else {
             $world_map.addClass('map_winter');
         }
 
@@ -151,26 +168,26 @@ function reloadWorldMap(option){
         return obj;
     }
 
-    function convertCityObjs(obj){
+    function convertCityObjs(obj) {
         //원본 Obj는 굉장히 간소하게 온다, Object 형태로 변환해서 사용한다.
 
-        function toCityObj(arr){
+        function toCityObj(arr) {
             return {
-                id:arr[0],
-                level:arr[1],
-                state:arr[2],
-                nationId:(arr[3]>0)?arr[3]:null,
-                region:arr[4],
-                supply:(arr[5]!=0)
+                id: arr[0],
+                level: arr[1],
+                state: arr[2],
+                nationId: (arr[3] > 0) ? arr[3] : null,
+                region: arr[4],
+                supply: (arr[5] != 0)
             };
         }
 
-        function toNationObj(arr){
+        function toNationObj(arr) {
             return {
-                id:arr[0],
-                name:arr[1],
-                color:arr[2],
-                capital:arr[3]
+                id: arr[0],
+                name: arr[1],
+                color: arr[2],
+                capital: arr[3]
             };
         }
 
@@ -179,15 +196,15 @@ function reloadWorldMap(option){
         nationList = convertDictById(nationList); //array of object -> dict
 
         var spyList = obj.spyList;
-        var shownByGeneralList = convertSet(obj.shownByGeneralList);//Array -> Set
+        var shownByGeneralList = convertSet(obj.shownByGeneralList); //Array -> Set
 
         var myCity = obj.myCity;
         var myNation = obj.myNation;
 
 
-        function mergePositionInfo(city){
+        function mergePositionInfo(city) {
             var id = city.id;
-            if(!(id in cityPosition)){
+            if (!(id in cityPosition)) {
                 return city;
             }
             var xy_val = cityPosition[id];
@@ -197,11 +214,11 @@ function reloadWorldMap(option){
             return city;
         }
 
-        function mergeNationInfo(city){
+        function mergeNationInfo(city) {
             //nationId 값으로 isCapital, color, nation을 통합
 
             var nationId = city.nationId;
-            if(nationId === null || !(nationId in nationList)){
+            if (nationId === null || !(nationId in nationList)) {
                 city.nationId = null;
                 city.nation = null;
                 city.color = null;
@@ -217,24 +234,24 @@ function reloadWorldMap(option){
             return city;
         }
 
-        function mergeClickable(city){
-            //clickable = (remainSpy << 3) | (ourCity << 2) | (shownByGeneral << 1) | clickableAll
+        function mergeClickable(city) {
+            //clickable = (defaultCity << 4 ) | (remainSpy << 3) | (ourCity << 2) | (shownByGeneral << 1) | clickableAll
             var id = city.id;
             var nationId = city.nationId;
-            var clickable = 0;
-            if(id in spyList){
+            var clickable = 16;
+            if (id in spyList) {
                 clickable |= spyList[id] << 3;
             }
-            if(myNation !== null && nationId == myNation){
+            if (myNation !== null && nationId == myNation) {
                 clickable |= 4;
             }
-            if(shownByGeneralList.hasOwnProperty(id)){
+            if (shownByGeneralList.hasOwnProperty(id)) {
                 clickable |= 2;
             }
-            if(myCity !== null && id == myCity){
+            if (myCity !== null && id == myCity) {
                 clickable |= 2;
             }
-            if(clickableAll){
+            if (clickableAll) {
                 clickable |= 1;
             }
 
@@ -250,35 +267,35 @@ function reloadWorldMap(option){
             .map(formatCityInfo);
 
         return {
-            'cityList' : cityList,
-            'myCity' : myCity
+            'cityList': cityList,
+            'myCity': myCity
         };
     }
 
-    function drawDetailWorldMap(obj){
+    function drawDetailWorldMap(obj) {
 
-        var $map_body = $('.world_map .map_body');
+        var $map_body = $(drawTarget + ' .map_body');
 
         var cityList = obj.cityList;
         var myCity = obj.myCity;
 
-        cityList.forEach(function(city){
+        cityList.forEach(function(city) {
             var id = city.id;
             $('.city_base_{0}'.format(id)).detach();
             //이전 도시는 지운다.
 
             var $cityObj = $('<div class="city_base city_base_{0}"></div>'.format(id));
             $cityObj.addClass('city_level_{0}'.format(city.level));
-            $cityObj.data('obj', city).css({'left':city.x-20,'top':city.y-15});
+            $cityObj.data('obj', city).css({ 'left': city.x - 20, 'top': city.y - 15 });
 
-            if('color' in city && city.color !== null){
+            if ('color' in city && city.color !== null) {
                 var $bgObj = $('<div class="city_bg"></div>');
                 $cityObj.append($bgObj);
-                $bgObj.css({'background-image':'url({0}/b{1}.png)'.format(pathConfig.gameImage, convColorValue(city.color))});
+                $bgObj.css({ 'background-image': 'url({0}/b{1}.png)'.format(pathConfig.gameImage, convColorValue(city.color)) });
             }
 
             var $linkObj = $('<a class="city_link"></a>');
-            $linkObj.data({'text':city.text,'nation':city.nation,'id':city.id});
+            $linkObj.data({ 'text': city.text, 'nation': city.nation, 'id': city.id });
             $cityObj.append($linkObj);
 
             var $imgObj = $('<div class="city_img"><img src="{0}/cast_{1}.gif"><div class="city_filler"></div></div>'.format(pathConfig.gameImage, city.level));
@@ -286,15 +303,15 @@ function reloadWorldMap(option){
 
 
 
-            if(city.state > 0){
+            if (city.state > 0) {
                 var $stateObj = $('<div class="city_state"><img src="{0}/event{1}.gif"></div>'.format(pathConfig.gameImage, city.state));
                 $linkObj.append($stateObj);
             }
 
-            if(city.nationId && city.nationId > 0){
-                var flagType = city.supply?'f':'d';
+            if (city.nationId && city.nationId > 0) {
+                var flagType = city.supply ? 'f' : 'd';
                 var $flagObj = $('<div class="city_flag"><img src="{0}/{1}{2}.gif"></div>'.format(pathConfig.gameImage, flagType, convColorValue(city.color)));
-                if(city.isCapital){
+                if (city.isCapital) {
                     var $capitalObj = $('<div class="city_capital"><img src="{0}/event51.gif"></div>'.format(pathConfig.gameImage));
                     $flagObj.append($capitalObj);
                 }
@@ -315,41 +332,39 @@ function reloadWorldMap(option){
         return obj;
     }
 
-    function drawBasicWorldMap(obj){
+    function drawBasicWorldMap(obj) {
 
-        var $map_body = $('.world_map .map_body');
+        var $map_body = $(drawTarget + ' .map_body');
 
         var cityList = obj.cityList;
         var myCity = obj.myCity;
 
-        cityList.forEach(function(city){
+        cityList.forEach(function(city) {
             var id = city.id;
             $('.city_base_{0}'.format(id)).detach();
             //이전 도시는 지운다.
 
             var $cityObj = $('<div class="city_base city_base_{0}"></div>'.format(id));
             $cityObj.addClass('city_level_{0}'.format(city.level));
-            $cityObj.data('obj', city).css({'left':city.x-20,'top':city.y-15});
+            $cityObj.data('obj', city).css({ 'left': city.x - 20, 'top': city.y - 15 });
 
             var $linkObj = $('<a class="city_link"></a>');
-            $linkObj.data({'text':city.text,'nation':city.nation,'id':city.id});
+            $linkObj.data({ 'text': city.text, 'nation': city.nation, 'id': city.id });
             $cityObj.append($linkObj);
 
             var $imgObj = $('<div class="city_img"><div class="city_filler"></div></div>');
-            if('color' in city && city.color !== null){
-                $imgObj.css({'background-color':city.color});
+            if ('color' in city && city.color !== null) {
+                $imgObj.css({ 'background-color': city.color });
             }
             $linkObj.append($imgObj);
 
-            if(city.state > 0){
+            if (city.state > 0) {
                 var state_text = 'wrong';
-                if(city.state < 10){
+                if (city.state < 10) {
                     state_text = 'good';
-                }
-                else if(city.state < 40){
+                } else if (city.state < 40) {
                     state_text = 'bad';
-                }
-                else if(city.state < 50){
+                } else if (city.state < 50) {
                     state_text = 'war';
                 }
 
@@ -358,7 +373,7 @@ function reloadWorldMap(option){
             }
 
             //단순 표기에서는 깃발 여부가 없음
-            if(city.isCapital){
+            if (city.isCapital) {
                 var $capitalObj = $('<div class="city_capital"></div>');
                 $imgObj.append($capitalObj);
             }
@@ -374,32 +389,30 @@ function reloadWorldMap(option){
         return obj;
     }
 
-    function setMouseWork(obj){
-        var $tooltip = $('.world_map .city_tooltip');
+    function setMouseWork(obj) {
+        var $tooltip = $(drawTarget + ' .city_tooltip');
         var $tooltip_city = $tooltip.find('.city_name');
         var $tooltip_nation = $tooltip.find('.nation_name');
 
-        var $objs = $('.world_map .city_link');
+        var $objs = $(drawTarget + ' .city_link');
 
-        var $map_body = $('.world_map .map_body');
+        var $map_body = $(drawTarget + ' .map_body');
 
         //터치스크린 탭
 
-        if(!option.neutralView && is_touch_device()){
-            $objs.on('touchstart', function(e){
-                if(window.sam_toggleSingleTap){
+        if (!option.neutralView && is_touch_device()) {
+            $objs.on('touchstart', function(e) {
+                if (window.sam_toggleSingleTap) {
                     return true;
                 }
                 var $this = $(this);
 
                 var touchMode = $this.data('touchMode');
-                if($tooltip_city.data('target') != $this.data('id')){
+                if ($tooltip_city.data('target') != $this.data('id')) {
                     $this.data('touchMode', 1);
-                }
-                else if(touchMode === undefined){
+                } else if (touchMode === undefined) {
                     $this.data('touchMode', 1);
-                }
-                else{
+                } else {
                     $this.data('touchMode', touchMode + 1);
                 }
                 $map_body.data('touchMode', 1);
@@ -409,8 +422,8 @@ function reloadWorldMap(option){
 
             });
 
-            $objs.on('touchend', function(e){    
-                if(window.sam_toggleSingleTap){
+            $objs.on('touchend', function(e) {
+                if (window.sam_toggleSingleTap) {
                     return true;
                 }
                 var $this = $(this);
@@ -418,17 +431,25 @@ function reloadWorldMap(option){
                 $tooltip_city.html($this.data('text'));
 
                 var nation_text = $this.data('nation');
-                if(nation_text){
+                if (nation_text) {
                     $tooltip_nation.html(nation_text).show();
-                }
-                else{
+                } else {
                     $tooltip_nation.html('').hide();
                 }
 
-                $tooltip.css({'top': position.top + 25, 'left': position.left + 35}).show();
+                var left = position.left;
+                var top = position.top;
+
+                var scale = $map_body.data('scale');
+                if (scale) {
+                    left /= scale;
+                    top /= scale;
+                }
+
+                $tooltip.css({ 'top': top + 25, 'left': left + 35 }).show();
 
                 var touchMode = $this.data('touchMode');
-                if(touchMode <= 1){
+                if (touchMode <= 1) {
                     return false;
                 }
 
@@ -436,8 +457,8 @@ function reloadWorldMap(option){
                 $this.data('touchMode', 0);
             });
 
-            $map_body.on('touchend',function(e){
-                if(window.sam_toggleSingleTap){
+            $map_body.on('touchend', function(e) {
+                if (window.sam_toggleSingleTap) {
                     return true;
                 }
                 //위의 touchend bind에 해당하지 않는 경우 -> 빈 지도 터치
@@ -448,20 +469,26 @@ function reloadWorldMap(option){
 
         //Mouse over 모드 작동
 
-        $map_body.on('mousemove', function(e){
-            if($(this).data('touchMode')){
+        $map_body.on('mousemove', function(e) {
+            if ($(this).data('touchMode')) {
                 return true;
             }
 
-            var parentOffset = $map_body.offset(); 
-            var relX = e.pageX - parentOffset.left;
-            var relY = e.pageY - parentOffset.top;
+            var rect = this.getBoundingClientRect();
+            var left = (e.clientX - rect.left - this.clientLeft + this.scrollLeft);
+            var top = (e.clientY - rect.top - this.clientTop + this.scrollTop);
 
-            $tooltip.css({'top': relY + 10, 'left': relX + 10});
+            var scale = $map_body.data('scale');
+            if (scale) {
+                left /= scale;
+                top /= scale;
+            }
+
+            $tooltip.css({ 'top': top + 10, 'left': left + 10 });
         });
 
-        $objs.on('mouseenter', function(e){
-            if($map_body.data('touchMode')){
+        $objs.on('mouseenter', function(e) {
+            if ($map_body.data('touchMode')) {
                 return true;
             }
 
@@ -470,28 +497,27 @@ function reloadWorldMap(option){
             $tooltip_city.data('target', $this.data('id'));
             $tooltip_city.html($this.data('text'));
             var nation_text = $this.data('nation');
-            if(nation_text){
+            if (nation_text) {
                 $tooltip_nation.html(nation_text).show();
-            }
-            else{
+            } else {
                 $tooltip_nation.html('').hide();
             }
 
             $tooltip.show();
         });
 
-        $objs.on('mouseleave', function(event){
+        $objs.on('mouseleave', function(event) {
             $tooltip.hide();
         });
 
-        $objs.on('click', function(e){
+        $objs.on('click', function(e) {
             //xxx: touchend 다음 click 이벤트가 갈 수도 있고, 안 갈 수도 있다.
             var touchMode = $(this).data('touchMode');
-            if(touchMode === undefined){
+            if (touchMode === undefined) {
                 return;
             }
 
-            if(touchMode === 1){
+            if (touchMode === 1) {
                 return false;
             }
         });
@@ -500,17 +526,17 @@ function reloadWorldMap(option){
         return obj;
     }
 
-    function setCityClickable(obj){
+    function setCityClickable(obj) {
 
-        obj.cityList.forEach(function(city){
+        obj.cityList.forEach(function(city) {
             var $cityLink = $world_map.find('.city_base_{0} .city_link'.format(city.id));
 
-            if('clickable' in city && city.clickable > 0){
-                $cityLink.attr('href',hrefTemplate.format(city.id));
+            if ('clickable' in city && city.clickable > 0) {
+                $cityLink.attr('href', hrefTemplate.format(city.id));
             }
 
-            if(selectCallback){
-                $cityLink.click(function(){
+            if (selectCallback) {
+                $cityLink.click(function() {
                     return selectCallback(city);
                 });
             }
@@ -519,127 +545,133 @@ function reloadWorldMap(option){
         return obj;
     }
 
-    function saveCityInfo(obj){
+    function saveCityInfo(obj) {
         $world_map.data('cityInfo', obj);
         return obj;
     }
 
     var $hideCityNameBtn = $world_map.find('.map_toggle_cityname');
-    if(localStorage.getItem('sam.hideMapCityName') == 'yes'){
+    if (localStorage.getItem('sam.hideMapCityName') == 'yes') {
         $world_map.addClass('hide_cityname');
         $hideCityNameBtn.addClass('active').attr('aria-pressed', 'true');
     }
 
-    $hideCityNameBtn.click(function(){
+    $hideCityNameBtn.click(function() {
         //이전 상태 확인
         var state = !$hideCityNameBtn.hasClass('active');
-        if(state){
+        if (state) {
             $world_map.addClass('hide_cityname');
             localStorage.setItem('sam.hideMapCityName', 'yes');
-        }
-        else{
+        } else {
             $world_map.removeClass('hide_cityname');
             localStorage.setItem('sam.hideMapCityName', 'no');
         }
     });
 
     var $toggleSingleTapBtn = $world_map.find('.map_toggle_single_tap');
-    if(localStorage.getItem('sam.toggleSingleTap') == 'yes'){
+    if (localStorage.getItem('sam.toggleSingleTap') == 'yes') {
         window.sam_toggleSingleTap = true;
         $toggleSingleTapBtn.addClass('active').attr('aria-pressed', 'true');
-    }
-    else{
+    } else {
         window.sam_toggleSingleTap = false;
     }
 
-    var $map_body = $('.world_map .map_body');
+    var $map_body = $(drawTarget + ' .map_body');
 
-    $toggleSingleTapBtn.click(function(){
+    $toggleSingleTapBtn.click(function() {
         //이전 상태 확인
         var state = !$toggleSingleTapBtn.hasClass('active');
-        if(state){
+        if (state) {
             $map_body.removeData('touchMode');
             localStorage.setItem('sam.toggleSingleTap', 'yes');
             window.sam_toggleSingleTap = true;
-        }
-        else{
+        } else {
             localStorage.setItem('sam.toggleSingleTap', 'no');
             window.sam_toggleSingleTap = false;
         }
     });
 
-    if(isDetailMap){
+    if (isDetailMap) {
         $world_map.addClass('map_detail');
-    }
-    else{
+    } else {
         $world_map.removeClass('map_datail');
     }
 
     //deferred mode of jQuery. != promise-then.
     var deferred = $.ajax({
         url: option.targetJson,
-        type: 'post',
-        dataType:'json',
+        type: option.reqType,
+        dataType: 'json',
+        ifModified: true,
         data: {
             data: JSON.stringify({
-                neutralView:option.neutralView,
-                year:option.year,
-                month:option.month,
-                showMe:option.showMe,
-                aux:option.aux
+                neutralView: option.neutralView,
+                year: option.year,
+                month: option.month,
+                showMe: option.showMe,
+                aux: option.aux
             })
         }
     });
 
+    var rawObject = null;
+
     deferred
+        .then(function(data) {
+            rawObject = data;
+            return data;
+        })
         .then(checkReturnObject)
         .then(setMapBackground)
         .then(convertCityObjs)
-        .then(isDetailMap?drawDetailWorldMap:drawBasicWorldMap)
+        .then(isDetailMap ? drawDetailWorldMap : drawBasicWorldMap)
         .then(setMouseWork)
         .then(setCityClickable)
-        .then(saveCityInfo);    
+        .then(saveCityInfo)
+        .then(function(data) {
+            if (option.callback) {
+                option.callback(data, rawObject);
+            }
 
-    if($world_map.hasClass('draw_required')){
-        if(useCachedMap){
+        });
+
+    if ($world_map.hasClass('draw_required')) {
+        if (useCachedMap) {
             //일단 불러옴
-            do{
+            do {
                 var storedMap = localStorage.getItem(storedOldMapKey);
-                if(!storedMap){
+                if (!storedMap) {
                     break;
                 }
                 storedMap = JSON.parse(storedMap);
                 var storedServerID = storedMap[0];
-                if(storedServerID != serverID){
+                if (storedServerID != serverID) {
                     break;
                 }
 
                 storedMap = storedMap[1];
                 storedMap = setMapBackground(storedMap);
                 storedMap = convertCityObjs(storedMap);
-                if(isDetailMap){
+                if (isDetailMap) {
                     storedMap = drawDetailWorldMap(storedMap);
-                }
-                else{
+                } else {
                     storedMap = drawBasicWorldMap(storedMap);
                 }
                 storedMap = setMouseWork(storedMap);
                 storedMap = setCityClickable(storedMap);
                 storedMap = saveCityInfo(storedMap);
-            }while(false);
-        }
-        else if(option.year && option.month){
+            } while (false);
+        } else if (option.year && option.month) {
             var startYear = localStorage.getItem(storedStartYear);
-            if(startYear){
+            if (startYear) {
                 startYear = JSON.parse(startYear);
-            }
-            else{
+            } else {
                 startYear = option.year;
             }
             var tmp = {
-                year : option.year,
-                month : option.month,
-                startYear : startYear
+                year: option.year,
+                month: option.month,
+                startYear: startYear
             };
             setMapBackground(tmp);
         }
@@ -647,8 +679,8 @@ function reloadWorldMap(option){
 
     }
 }
-$(function(){
-    if(is_touch_device()){
+$(function() {
+    if (is_touch_device()) {
         $('.map_body .map_toggle_single_tap').show();
     }
 })

hwe/js/myPage.js

@@ -1,166 +1,167 @@
-jQuery(function($){
+jQuery(function($) {
 
 
-    var initCustomCSSForm = function(){
+    var initCustomCSSForm = function() {
         var lastTimeOut = null;
         var $obj = $('#custom_css');
         var key = 'sam_customCSS';
 
         var text = localStorage.getItem(key);
-        if(text){
+        if (text) {
             $obj.val(text);
             console.log(text);
         }
 
-        if($obj.on('change keyup paste', function(){
-            var newText = $obj.val();
-            if(text == newText){
-                return;
-            }
-            if(lastTimeOut){
-                clearTimeout(lastTimeOut);
-            }
-            $obj.css('background-color', '#222222');
-            lastTimeOut = setTimeout(function(){
-                text = $obj.val();
-                localStorage.setItem(key, text);
-                $obj.css('background-color', 'black');
-            }, 500);
-        }));
+        if ($obj.on('change keyup paste', function() {
+                var newText = $obj.val();
+                if (text == newText) {
+                    return;
+                }
+                if (lastTimeOut) {
+                    clearTimeout(lastTimeOut);
+                }
+                $obj.css('background-color', '#222222');
+                lastTimeOut = setTimeout(function() {
+                    text = $obj.val();
+                    localStorage.setItem(key, text);
+                    $obj.css('background-color', 'black');
+                }, 500);
+            }));
 
     }
 
-    $('.load_old_log').click(function(){
+    $('.load_old_log').click(function() {
         var $thisBtn = $(this);
         var logType = $thisBtn.data('log_type');
         var $last = $('.log_{0}:last'.format(logType));
         var reqTo = null;
-        if($last.length){
+        if ($last.length) {
             reqTo = $last.data('seq');
         }
 
         $.post({
-            url:'j_general_log_old.php', 
-            dataType:'json',
-            data:{
-                to:reqTo,
-                type:logType
-            }
-        }).then(function(data){
-            if(!data){
-                return quickReject('로그를 받아오지 못했습니다.');
-            }
-            if(!data.result){
-                return quickReject('로그를 받아오지 못했습니다. : '+data.reason);
-            }
-
-            var keys = Object.keys(data.log);
-            if(keys.length > 1 && keys[0] < keys[1]){
-                keys.reverse();
-            }
-
-            if(keys == 0){
-                $thisBtn.hide();
-                return;
-            }
-
-            var html = [];
-            $.each(keys, function(_, key){
-                if($('#log_{0}_{1}'.format(logType, key)).length){
-                    return true;
+                url: 'j_general_log_old.php',
+                dataType: 'json',
+                data: {
+                    to: reqTo,
+                    type: logType
+                }
+            }).then(function(data) {
+                if (!data) {
+                    return quickReject('로그를 받아오지 못했습니다.');
+                }
+                if (!data.result) {
+                    return quickReject('로그를 받아오지 못했습니다. : ' + data.reason);
                 }
-                var item = data.log[key];
-                html.push("<div class='log_{0}' id='log_{0}_{1}' data-seq='{1}'>{2}</div>".format(logType, key, item));
-            });
 
-            $('#{0}Plate'.format(logType)).append(html);
-        }, errUnknown)
-        .fail(function(reason){
-            alert(reason);
-            location.reload();
-        });
+                var keys = Object.keys(data.log);
+                if (keys.length > 1 && keys[0] < keys[1]) {
+                    keys.reverse();
+                }
+
+                if (keys == 0) {
+                    $thisBtn.hide();
+                    return;
+                }
+
+                var html = [];
+                $.each(keys, function(_, key) {
+                    if ($('#log_{0}_{1}'.format(logType, key)).length) {
+                        return true;
+                    }
+                    var item = data.log[key];
+                    html.push("<div class='log_{0}' id='log_{0}_{1}' data-seq='{1}'>{2}</div>".format(logType, key, item));
+                });
+
+                $('#{0}Plate'.format(logType)).append(html);
+            }, errUnknown)
+            .fail(function(reason) {
+                alert(reason);
+                location.reload();
+            });
     })
 
     initCustomCSSForm();
 
 
-    $('#die_immediately').click(function(){
-        if(!confirm('정말로 삭제하시겠습니까?')){
+    $('#die_immediately').click(function() {
+        if (!confirm('정말로 삭제하시겠습니까?')) {
             return false;
         }
         $.post({
-                url:'j_die_immediately.php',
-                dataType:'json',
-            }).then(function(data){
-                if(!data){
+                url: 'j_die_immediately.php',
+                dataType: 'json',
+            }).then(function(data) {
+                if (!data) {
                     return quickReject('실패했습니다.');
                 }
-                if(!data.result){
+                if (!data.result) {
                     return quickReject(data.reason);
                 }
 
                 location.replace('..');
 
             }, errUnknown)
-            .fail(function(reason){
+            .fail(function(reason) {
                 alert(reason);
                 location.reload();
             });
-            return false;
+        return false;
         return false;
     });
 
-    $('#vacation').click(function(){
-        if(!confirm('휴가 기능을 신청할까요?')){
+    $('#vacation').click(function() {
+        if (!confirm('휴가 기능을 신청할까요?')) {
             return false;
         }
         $.post({
-                url:'j_vacation.php',
-                dataType:'json',
-            }).then(function(data){
-                if(!data){
+                url: 'j_vacation.php',
+                dataType: 'json',
+            }).then(function(data) {
+                if (!data) {
                     return quickReject('실패했습니다.');
                 }
-                if(!data.result){
+                if (!data.result) {
                     return quickReject(data.reason);
                 }
 
                 location.reload();
 
             }, errUnknown)
-            .fail(function(reason){
+            .fail(function(reason) {
                 alert(reason);
                 location.reload();
             });
-            return false;
+        return false;
         return false;
     });
 
-    $('#set_my_setting').click(function(){
+    $('#set_my_setting').click(function() {
         $.post({
-                url:'j_set_my_setting.php',
-                dataType:'json',
-                data:{
-                    tnmt:$('.tnmt:checked').val(),
-                    defence_train:$('#defence_train').val(),
-                    use_treatment:$('#use_treatment').val(),
+                url: 'j_set_my_setting.php',
+                dataType: 'json',
+                data: {
+                    tnmt: $('.tnmt:checked').val(),
+                    defence_train: $('#defence_train').val(),
+                    use_treatment: $('#use_treatment').val(),
+                    use_auto_nation_turn: $('#use_auto_nation_turn').val(),
                 }
-            }).then(function(data){
-                if(!data){
+            }).then(function(data) {
+                if (!data) {
                     return quickReject('실패했습니다.');
                 }
-                if(!data.result){
+                if (!data.result) {
                     return quickReject(data.reason);
                 }
 
                 location.reload();
 
             }, errUnknown)
-            .fail(function(reason){
+            .fail(function(reason) {
                 alert(reason);
                 location.reload();
             });
-            return false;
+        return false;
         return false;
     });
 });

hwe/js/processing.js

@@ -35,7 +35,7 @@ jQuery(function($) {
         //checkCommandArg 참고
         var availableArgumentList = {
             'string': [
-                'nationName', 'optionText', 'itemType', 'nationType', 'itemCode',
+                'nationName', 'optionText', 'itemType', 'nationType', 'itemCode', 'commandType',
             ],
             'int': [
                 'crewType', 'destGeneralID', 'destCityID', 'destNationID',
@@ -73,9 +73,11 @@ jQuery(function($) {
                 }
             },
             'integerArray': function($obj) {
-                return $obj.map(function() {
-                    return parseInt($(this).val());
+                var result = [];
+                $obj.each(function() {
+                    result.push(parseInt($(this).val()));
                 });
+                return result;
             }
         }
 

hwe/js/select_general_from_pool.js

@@ -0,0 +1,210 @@
+var templateGeneralCard = '<div class="general_card">\
+    <h4 class="bg1 with_border"><%generalName%></h4>\
+    <h4><img src="<%iconPath%>" height=64 width=64></h4><p>\
+    <%if(leadership){%>\
+    <%leadership%> / <%strength%> / <%intel%><br>\
+    <%}%>\
+    <%if(personalText){%><%personalText%><br><%}%>\
+    <%if(specialDomesticText||specialWarText){%>\
+        <%specialDomesticText%> / <%specialWarText%><br>\
+    <%}%>\
+    <%if(dex){%><br>\
+        보병: <%parseInt(dex[0]/1000)%>K<br>\
+        궁병: <%parseInt(dex[1]/1000)%>K<br>\
+        기병: <%parseInt(dex[2]/1000)%>K<br>\
+        귀병: <%parseInt(dex[3]/1000)%>K<br>\
+        차병: <%parseInt(dex[4]/1000)%>K<br>\
+    <%}%>\
+    </p>\
+    <button type="subject" class="with_skin with_border select_btn" data-name="<%generalName%>" value="<%uniqueName%>" name="pick">선택하기</button>\
+</div>';
+
+var templateSpecial =
+    '<span class="obj_tooltip" data-toggle="tooltip" data-placement="top"><%text%>\
+    <span class="tooltiptext">\
+        <%info%>\
+    </span>\
+</span>\
+';
+
+function pickGeneral() {
+    $btn = $(this);
+
+
+    if (hasGeneralID) {
+        if (!confirm('이 장수를 선택할까요? : {0}'.format($btn.data('name')))) {
+            return false;
+        }
+        $.post({
+            url: 'j_update_picked_general.php',
+            dataType: 'json',
+            data: {
+                pick: $btn.val()
+            }
+        }).then(function(result) {
+            if (!result.result) {
+                alert(result.reason);
+                location.refresh();
+            }
+
+            alert('선택한 장수로 변경했습니다.');
+            location.href = './';
+        });
+        return false;
+    }
+
+    currentGeneralInfo = cards[$btn.val()];
+    var $card = $btn.closest('.general_card');
+
+    var $leftPad = $('#left_pad');
+    $leftPad.empty();
+    $card.clone().appendTo($leftPad);
+    initTooltip($leftPad);
+
+    return false;
+}
+
+function buildGeneral() {
+    if (!currentGeneralInfo) {
+        alert('장수를 선택해주세요!');
+        return false;
+    }
+    if (!confirm('이 장수로 생성할까요?')) {
+        return false;
+    }
+    $.post({
+        url: 'j_select_picked_general.php',
+        dataType: 'json',
+        data: {
+            pick: currentGeneralInfo.uniqueName,
+            use_own_picture: $('#use_own_picture').is(':checked'),
+            leadership: parseInt($('#leadership').val()),
+            strength: parseInt($('#leadership').val()),
+            intel: parseInt($('#leadership').val()),
+            personal: $('#selChar').val()
+        }
+    }).then(function(result) {
+        if (!result.result) {
+            alert(result.reason);
+            location.refresh();
+        }
+
+        alert('선택한 장수로 생성했습니다.');
+        location.href = './';
+    });
+    return false;
+}
+
+function updateOutdateTimer() {
+    var $validUntilText = $('#valid_until_text');
+    var now = Date.now();
+    var validUntil = $validUntilText.data('until');
+    if (validUntil <= 0) {
+        return;
+    } else if (validUntil < now) {
+        $validUntilText.data('until', 0);
+        $('#valid_until').hide();
+        $('#outdate_token').show();
+        return;
+    } else if (validUntil - now <= 30000) {
+        $validUntilText.css('color', "rgb(255, {0}, {0})".format(255 * (validUntil - now) / 30000));
+    }
+
+    setTimeout(updateOutdateTimer, 1000);
+}
+
+function printGenerals(value) {
+    $('.card_holder').empty();
+    $('#valid_until').show();
+    $('#valid_until_text').html(value.validUntil).data('until', (new Date(value.validUntil)).getTime()).css('color', 'white');
+    $('#outdate_token').hide();
+
+    var pick = $.map(value.pick, function(value, key) {
+        return value;
+    });
+
+    var emptyCard = {
+        'leadership': null,
+        'strength': null,
+        'intel': null,
+        'personalText': null,
+        'specialDomesticText': null,
+        'specialWarText': null,
+        'dex': null
+    };
+
+    $.each(pick, function(idx, cardData) {
+        cardData.iconPath = getIconPath(cardData.imgsvr, cardData.picture);
+        if (cardData.specialDomestic !== undefined) {
+            cardData.specialDomesticText = TemplateEngine(templateSpecial, {
+                text: cardData.specialDomesticName,
+                info: cardData.specialDomesticInfo
+            });
+            cardData.specialWarText = '-';
+        }
+
+        if (cardData.specialWar !== undefined) {
+            cardData.specialWarText = TemplateEngine(templateSpecial, {
+                text: cardData.specialWarName,
+                info: cardData.specialWarInfo
+            });
+            if (cardData.specialDomesticText === undefined) {
+                cardData.specialDomesticText = '-';
+            }
+        }
+
+        //FIXME: ego로 적었던것 같음!
+        if (cardData.personal in characterInfo) {
+            cardData.personalText = TemplateEngine(templateSpecial, {
+                text: characterInfo[cardData.personal].name,
+                info: characterInfo[cardData.personal].info
+            });
+        } else {
+            cardData.personalText = cardData.personal;
+        }
+
+        cards[cardData.uniqueName] = cardData;
+
+        var $card = $(TemplateEngine(templateGeneralCard, $.extend({}, emptyCard, cardData)));
+
+        $('.card_holder').append($card);
+        $card.find('.select_btn').click(pickGeneral);
+        $card.find('.obj_tooltip').tooltip({
+            title: function() {
+                return $.trim($(this).find('.tooltiptext').html());
+            },
+            html: true
+        });
+    });
+
+    updateOutdateTimer();
+}
+
+
+$(function($) {
+    $.post('j_get_select_pool.php').then(function(value) {
+        if (!value.result) {
+            alert(value.reason);
+            return;
+        }
+
+        console.log(value);
+        printGenerals(value);
+    });
+
+    if (hasGeneralID) {
+        $('#create_plate').hide();
+    }
+
+    $('#build_general').on('click', buildGeneral);
+
+    $.each(validCustomOption, function(idx, value) {
+        if (value == 'picture') {
+            $('.custom_picture').show();
+        } else if (value == 'ego') {
+            $('.custom_personality').show();
+        } else if (value == 'stat') {
+            $('.custom_stat').show();
+        }
+    });
+});

hwe/js/select_npc.js

@@ -1,5 +1,5 @@
 var templateGeneralCard =
-'<div class="general_card">\
+    '<div class="general_card">\
     <h4 class="bg1 with_border"><%name%></h4>\
     <h4><img src="<%iconPath%>" height=64 width=64></h4>\
     <p><%leadership%> / <%strength%> / <%intel%><br>\
@@ -11,7 +11,7 @@ var templateGeneralCard =
 </div>';
 
 var templateSpecial =
-'<span class="obj_tooltip" data-toggle="tooltip" data-placement="top"><%text%>\
+    '<span class="obj_tooltip" data-toggle="tooltip" data-placement="top"><%text%>\
     <span class="tooltiptext">\
         <%info%>\
     </span>\
@@ -19,7 +19,7 @@ var templateSpecial =
 ';
 
 var templateGeneralRow =
-'<tr>\
+    '<tr>\
     <td><img class="generalIcon" width="64" height="64" src="<%iconPath%>"></td>\
     <td style="<%userCSS%>"><%name%><%nameAux%></td>\
     <td><%age%>세</td>\
@@ -37,7 +37,7 @@ var templateGeneralRow =
     <td><%killturn%></td>\
 </tr>';
 
-function pickGeneral(){
+function pickGeneral() {
     $btn = $(this);
 
     if (!confirm('빙의할까요? : {0}'.format($btn.data('name')))) {
@@ -45,13 +45,13 @@ function pickGeneral(){
     }
 
     $.post({
-        url:'j_select_npc.php',
-        dataType:'json',
-        data:{
-            pick:$btn.val()
+        url: 'j_select_npc.php',
+        dataType: 'json',
+        data: {
+            pick: $btn.val()
         }
-    }).then(function(result){
-        if(!result.result){
+    }).then(function(result) {
+        if (!result.result) {
             alert(result.reason);
             location.refresh();
         }
@@ -62,32 +62,30 @@ function pickGeneral(){
     return false;
 }
 
-function updateOutdateTimer(){
+function updateOutdateTimer() {
     var $validUntilText = $('#valid_until_text');
     var now = Date.now();
     var validUntil = $validUntilText.data('until');
-    if(validUntil <= 0){
+    if (validUntil <= 0) {
         return;
-    }
-    else if(validUntil < now){
-        $validUntilText.data('until',0);
+    } else if (validUntil < now) {
+        $validUntilText.data('until', 0);
         $('#valid_until').hide();
         $('#outdate_token').show();
         return;
-    }
-    else if(validUntil - now <= 30000){
-        $validUntilText.css('color', "rgb(255, {0}, {0})".format(255*(validUntil - now)/30000)); 
+    } else if (validUntil - now <= 30000) {
+        $validUntilText.css('color', "rgb(255, {0}, {0})".format(255 * (validUntil - now) / 30000));
     }
 
     setTimeout(updateOutdateTimer, 1000);
 }
 
-function updatePickMoreTimer(){
+function updatePickMoreTimer() {
     var $btn = $('#btn_pick_more');
 
     var now = Date.now();
     var remain = ($btn.data('available') - now) / 1000;
-    if(remain <= 0){
+    if (remain <= 0) {
         $btn.prop('disabled', false)
         $btn.html('다른 장수 보기');
         return;
@@ -98,53 +96,50 @@ function updatePickMoreTimer(){
     setTimeout(updatePickMoreTimer, 250);
 }
 
-function printGenerals(value){
+function printGenerals(value) {
     $('.card_holder').empty();
     $('#valid_until').show();
-    $('#valid_until_text').html(value.validUntil).data('until', (new Date(value.validUntil)).getTime()).css('color','white');
+    $('#valid_until_text').html(value.validUntil).data('until', (new Date(value.validUntil)).getTime()).css('color', 'white');
     $('#outdate_token').hide();
-    var time = Date.now() + value.pickMoreSeconds*1000;
-    $('#btn_pick_more').data('available', time).prop('disabled',true);
+    var time = Date.now() + value.pickMoreSeconds * 1000;
+    $('#btn_pick_more').data('available', time).prop('disabled', true);
 
     var pick = $.map(value.pick, function(value, key) {
         return value;
     });
 
-    pick.sort(function(lhs, rhs){
-        var lsum = lhs.leadership+lhs.strength+lhs.intel;
-        var rsum = rhs.leadership+rhs.strength+rhs.intel;
+    pick.sort(function(lhs, rhs) {
+        var lsum = lhs.leadership + lhs.strength + lhs.intel;
+        var rsum = rhs.leadership + rhs.strength + rhs.intel;
         return lsum - rsum;
     });
 
-    $.each(pick, function(idx, cardData){
+    $.each(pick, function(idx, cardData) {
         cardData.iconPath = getIconPath(cardData.imgsvr, cardData.picture);
-        if(cardData.special in specialInfo){
+        if (cardData.special in specialInfo) {
             cardData.specialText = TemplateEngine(templateSpecial, {
-                text:cardData.special,
-                info:specialInfo[cardData.special]
+                text: cardData.special,
+                info: specialInfo[cardData.special]
             });
-        }
-        else{
+        } else {
             cardData.specialText = cardData.special;
         }
 
-        if(cardData.special2 in specialInfo){
+        if (cardData.special2 in specialInfo) {
             cardData.special2Text = TemplateEngine(templateSpecial, {
-                text:cardData.special2,
-                info:specialInfo[cardData.special2]
+                text: cardData.special2,
+                info: specialInfo[cardData.special2]
             });
-        }
-        else{
+        } else {
             cardData.special2Text = cardData.special2;
         }
 
-        if(cardData.personal in characterInfo){
+        if (cardData.personal in characterInfo) {
             cardData.personalText = TemplateEngine(templateSpecial, {
-                text:cardData.personal,
-                info:characterInfo[cardData.personal]
+                text: cardData.personal,
+                info: characterInfo[cardData.personal]
             });
-        }
-        else{
+        } else {
             cardData.personalText = cardData.personal;
         }
 
@@ -154,10 +149,10 @@ function printGenerals(value){
         $('.card_holder').append($card);
         $card.find('.select_btn').click(pickGeneral);
         $card.find('.obj_tooltip').tooltip({
-            title:function(){
+            title: function() {
                 return $.trim($(this).find('.tooltiptext').html());
             },
-            html:true
+            html: true
         });
     });
 
@@ -165,59 +160,57 @@ function printGenerals(value){
     updateOutdateTimer();
 }
 
-function printGeneralList(value){
+function printGeneralList(value) {
     var tokenList = value.token;
-    var generalList = $.map(value.list, function(general){
+    var generalList = $.map(value.list, function(general) {
         general = {
-            no:general[0],
-            picture:general[1],
-            imgsvr:general[2],
-            npc:general[3],
-            age:general[4],
-            nation:general[5],
-            special:general[6],
-            special2:general[7],
-            personal:general[8],
-            name:general[9],
-            ownerName:general[10],
-            injury:general[11],
-            leadership:general[12],
-            lbonus:general[13],
-            strength:general[14],
-            intel:general[15],
-            explevel:general[16],
-            experience:general[17],
-            dedication:general[18],
-            officerLevel:general[19],
-            killturn:general[20],
-            connect:general[21],
-            reserved:0
+            no: general[0],
+            picture: general[1],
+            imgsvr: general[2],
+            npc: general[3],
+            age: general[4],
+            nation: general[5],
+            special: general[6],
+            special2: general[7],
+            personal: general[8],
+            name: general[9],
+            ownerName: general[10],
+            injury: general[11],
+            leadership: general[12],
+            lbonus: general[13],
+            strength: general[14],
+            intel: general[15],
+            explevel: general[16],
+            experience: general[17],
+            dedication: general[18],
+            officerLevel: general[19],
+            killturn: general[20],
+            connect: general[21],
+            reserved: 0
         };
-        if(general.npc < 2){
+        if (general.npc < 2) {
             general.reserved = 2;
         }
-        if(general.no in tokenList){
+        if (general.no in tokenList) {
             general.reserved = 1;
         }
 
         general.userCSS = "";
         general.nameAux = "";
 
-        if(general.reserved == 1){
+        if (general.reserved == 1) {
             general.userCSS = 'color:violet';
-        }
-        else if(general.npc >= 2){
+        } else if (general.npc >= 2) {
             general.userCSS = 'color:cyan';
-        }
-        else if(general.npc == 1){
+        } else if (general.npc == 1) {
             general.userCSS = 'color:skyblue';
         }
 
-        if(general.ownerName){
+        if (general.ownerName) {
             general.nameAux += '<br><small>({0})</small>'.format(general.ownerName);
         }
 
-        if(general.reserved == 1){
+        if (general.reserved == 1) {
             general.nameAux += '<br><small>({0}회)</small>'.format(tokenList[general.no]);
         }
 
@@ -226,41 +219,41 @@ function printGeneralList(value){
         general.iconPath = getIconPath(general.imgsvr, general.picture);
 
         general.specialDomesticWithTooltip = TemplateEngine(templateSpecial, {
-            text:general.special,
-            info:specialInfo[general.special]
+            text: general.special,
+            info: specialInfo[general.special]
         });
 
         general.speicalWarWithTooltip = TemplateEngine(templateSpecial, {
-            text:general.special2,
-            info:specialInfo[general.special2]
+            text: general.special2,
+            info: specialInfo[general.special2]
         });
 
         general.personalWithTooltip = TemplateEngine(templateSpecial, {
-            text:general.personal,
-            info:characterInfo[general.personal]
+            text: general.personal,
+            info: characterInfo[general.personal]
         });
 
         return general;
     });
 
-    generalList.sort(function(lhs, rhs){
-        if(lhs.reserved > rhs.reserved){
+    generalList.sort(function(lhs, rhs) {
+        if (lhs.reserved > rhs.reserved) {
             return -1;
         }
-        if(lhs.reserved < rhs.reserved){
+        if (lhs.reserved < rhs.reserved) {
             return 1;
         }
-        if(lhs.total != rhs.total){
+        if (lhs.total != rhs.total) {
             return rhs.total - lhs.total;
         }
-        if(lhs.leadership != rhs.leadership){
+        if (lhs.leadership != rhs.leadership) {
             return rhs.leadership - lhs.total;
         }
 
-        if(lhs.name < rhs.name){
+        if (lhs.name < rhs.name) {
             return -1;
         }
-        if(lhs.name > rhs.name){
+        if (lhs.name > rhs.name) {
             return 1;
         }
         return 0;
@@ -270,9 +263,9 @@ function printGeneralList(value){
     _printGeneralList(true);
 }
 
-function _printGeneralList(clear){
+function _printGeneralList(clear) {
     var $generalTable = $('#general_list');
-    if(clear){
+    if (clear) {
         $generalTable.empty();
         $generalTable.data('lastIdx', 0);
         $('#row_print_more').show();
@@ -284,77 +277,77 @@ function _printGeneralList(clear){
     var idxTo = Math.min(idxFrom + 50, generalList.length);
     $generalTable.data('lastIdx', idxTo);
 
-    for(var idx = idxFrom; idx < idxFrom + 50; idx++){
+    for (var idx = idxFrom; idx < idxFrom + 50; idx++) {
         var general = generalList[idx];
         $generalTable.append(TemplateEngine(templateGeneralRow, general));
     }
 
-    if(idxTo == generalList.length){
+    if (idxTo == generalList.length) {
         $('#row_print_more').hide();
     }
 
     $generalTable.find('.obj_tooltip').tooltip({
-        title:function(){
+        title: function() {
             return $.trim($(this).find('.tooltiptext').html());
         },
-        html:true
+        html: true
     });
     $('#tb_general_list').show();
 }
 
-$(function($){
-window.generalList = [];
+$(function($) {
+    window.generalList = [];
 
-$.post('j_get_select_npc_token.php').then(function(value){
-    if(!value.result){
-        alert(value.reason);
-        return;
-    }
+    $.post('j_get_select_npc_token.php').then(function(value) {
+        if (!value.result) {
+            alert(value.reason);
+            return;
+        }
 
-    console.log(value);
-    printGenerals(value);
-});
-
-$('#btn_pick_more').click(function(){
-    var generals = $.map($('.keep_select:checked'), function(value){
-        return $(value).val();
+        console.log(value);
+        printGenerals(value);
     });
-    console.log(generals);
-    $.post({
-        url:'j_get_select_npc_token.php',
-        dataType:'json',
-        data:{
-            refresh:true,
-            keep:generals
-        }
-    }).then(function(result){
-        if(!result.result){
-            alert(result.reason);
-            location.refresh();
-        }
-        console.log(result);
-        printGenerals(result);
+
+    $('#btn_pick_more').click(function() {
+        var generals = $.map($('.keep_select:checked'), function(value) {
+            return $(value).val();
+        });
+        console.log(generals);
+        $.post({
+            url: 'j_get_select_npc_token.php',
+            dataType: 'json',
+            data: {
+                refresh: true,
+                keep: generals
+            }
+        }).then(function(result) {
+            if (!result.result) {
+                alert(result.reason);
+                location.refresh();
+            }
+            console.log(result);
+            printGenerals(result);
+        });
     });
-});
 
-$('#btn_load_general_list').click(function(){
-    $.post({
-        url:'j_get_general_list.php',
-        dataType:'json',
-        data:{
-            with_token:true
-        }
-    }).then(function(result){
-        if(!result.result){
-            alert(result.reason);
-            return false;
-        }
-        printGeneralList(result);
+    $('#btn_load_general_list').click(function() {
+        $.post({
+            url: 'j_get_general_list.php',
+            dataType: 'json',
+            data: {
+                with_token: true
+            }
+        }).then(function(result) {
+            if (!result.result) {
+                alert(result.reason);
+                return false;
+            }
+            printGeneralList(result);
+        });
     });
-});
 
-$('#btn_print_more').click(function(){
-    _printGeneralList();
-})
+    $('#btn_print_more').click(function() {
+        _printGeneralList();
+    })
 
 });

hwe/lib.php

@@ -55,3 +55,20 @@ function LogText($prefix, $variable)
     $text = sprintf('%s : %s'."\r\n", $prefix, TVarDumper::dump($variable));
     file_put_contents(ROOT.'/d_log/'.UniqueConst::$serverName.'_dbg_logs.txt', $text, FILE_APPEND);
 }
+
+function prepareDir(string $dirPath, bool $forceCreate=true):bool{
+    if(file_exists($dirPath)){
+        if(is_dir($dirPath)){
+            return true;
+        }
+        if(!$forceCreate){
+            throw new \RuntimeException('이미 파일이 있습니다');
+        }
+        if(!unlink($dirPath)){
+            return false;
+        }
+        return mkdir($dirPath);
+    }
+    
+    return mkdir($dirPath, 0777, true);
+}

hwe/process_war.php

@@ -43,7 +43,7 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
     $iterDefender = new \ArrayIterator($defenderList);
     $iterDefender->rewind();
 
-    $getNextDefender = function(?WarUnit $prevDefender, bool $reqNext) use ($iterDefender, $rawDefenderNation, $db) {
+    $getNextDefender = function(?WarUnit $prevDefender, bool $reqNext) use ($iterDefender, $rawDefenderNation, $rawDefenderCity, $db) {
         if($prevDefender !== null){
             $prevDefender->applyDB($db);
         }
@@ -57,6 +57,7 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
         }
 
         $nextDefender = $iterDefender->current();
+        $nextDefender->setRawCity($rawDefenderCity);
         if(extractBattleOrder($nextDefender) <= 0){
             return null;
         }

hwe/sammo/AbsFromUserPool.php

@@ -0,0 +1,72 @@
+<?php
+namespace sammo;
+
+use sammo\AbsGeneralPool;
+use sammo\GameConst;
+use sammo\Json;
+use sammo\Util;
+
+abstract class AbsFromUserPool extends AbsGeneralPool{
+
+    public function occupyGeneralName(): bool
+    {
+        $generalID = $this->getGeneralBuilder()->getGeneralID();
+        if($generalID === null){
+            throw new \RuntimeException('build되지 않음');
+        }
+
+        $db= $this->db;
+        $db->update('select_pool', [
+            'general_id'=>$generalID,
+            'owner'=>null,
+            'reserved_until'=>null,
+        ], 'unique_name = %s AND owner IS NOT NULL', $this->uniqueName);
+        return $db->affectedRows()!=0;
+    }
+
+    static public function pickGeneralFromPool(\MeekroDB $db, int $owner, int $pickCnt, ?string $prefix=null):array{
+        $oNow = new \DateTimeImmutable();
+        $now = $oNow->format('Y-m-d H:i:s');
+
+        $db->update('select_pool', [
+            'reserved_until'=>null,
+            'owner'=>null,
+        ],'reserved_until < %s AND general_id IS NULL', $now);
+
+        $pool = [];
+        foreach($db->query('SELECT id, unique_name, info FROM select_pool WHERE reserved_until IS NULL AND general_id IS NULL', $pickCnt) as $cand){
+            $cand['info'] = Json::decode($cand['info']);
+            $dexTotal = array_sum($cand['info']['dex']);
+            $pool[] = [$cand, $dexTotal];
+        }
+
+        if(count($pool) < $pickCnt){
+            throw new \RuntimeException('pool 부족');
+        }
+
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $result = [];
+        $validUntil = TimeUtil::nowAddMinutes(2 * $gameStor->turnterm);
+        while(count($result) < $pickCnt){
+            $cand = Util::choiceRandomUsingWeightPair($pool);
+            $poolID = $cand['id'];
+            if(key_exists($poolID, $result)){
+                continue;
+            }
+            $candInfo = $cand['info'];
+            $candInfo['uniqueName'] = $cand['unique_name'];
+
+            //하나씩 한다.
+            $db->update('select_pool', [
+                'owner'=>$owner,
+                'reserved_until'=>$validUntil,
+            ], 'id = %i AND reserved_until IS NULL AND owner IS NULL and general_id IS NULL', $poolID);
+            if($db->affectedRows()==0){
+                continue;
+            }
+            $result[$poolID] = new static($db, $candInfo, $validUntil);
+        }
+
+        return array_values($result);
+    }
+}

hwe/sammo/AbsGeneralPool.php

@@ -0,0 +1,111 @@
+<?php
+namespace sammo;
+
+use MeekroDB;
+use sammo\GameConst;
+use sammo\Scenario\GeneralBuilder;
+use sammo\Util;
+
+abstract class AbsGeneralPool{
+    protected $builder;
+    protected $info;
+    protected $db=null;
+    protected $uniqueName;
+    protected $generalName;
+    protected $validUntil;
+
+    /*
+     * info = [
+     * uniqueName
+     * generalName
+     * imgsvr
+     * picture
+     * 
+     * leadership
+     * strength
+     * intel
+     * 
+     * experience
+     * dedication
+     * 
+     * dex[5]
+     * 
+     * specialDomestic
+     * specialWar
+     */
+
+    public function __construct(\MeekroDB $db, array $info, string $validUntil)
+    {
+        $this->db = $db;
+        $this->info = $info;
+        $this->uniqueName = $info['uniqueName'];
+        $this->generalName = $info['generalName'];
+        $this->builder = new GeneralBuilder(
+            $info['generalName'],
+            $info['imgsvr'],
+            $info['picture'],
+            0
+        );
+        $this->validUntil = $validUntil;
+
+        $builder = $this->builder;
+        if(key_exists('leadership', $info)){
+            $builder->setStat($info['leadership'], $info['strength'], $info['intel']);
+        }
+
+        if(key_exists('experience', $info)){
+            $builder->setExpDed($info['experience'], $info['dedication']);
+        }
+
+        if(key_exists('dex', $info)){
+            $builder->setDex($info['dex'][0], $info['dex'][1], $info['dex'][2], $info['dex'][3], $info['dex'][4]);
+        }
+
+        if(key_exists('specialDomestic', $info) || key_exists('specialWar', $info)){
+            $builder->setSpecial($info['specialDomestic']??GameConst::$defaultSpecialDomestic, $info['specialWar']??GameConst::$defaultSpecialWar);
+        }
+
+    }
+
+    public function getUniqueName():string{
+        return $this->uniqueName;
+    }
+
+    public function getInfo():array{
+        return $this->info;
+    }
+
+    static protected function checkDuplicatedCnt(\MeekroDB $db, string $name):int{
+        $duplicateCnt = 0;
+        foreach(GeneralBuilder::$prefixList as $npcPrefix){
+            $testName = "{$npcPrefix}{$name}";
+            $duplicateCnt += $db->queryFirstField('SELECT count(no) FROM general WHERE name LIKE %s', $testName.'%');
+        }
+        return $duplicateCnt;
+    }
+
+    public function getGeneralBuilder():GeneralBuilder{
+        if(!$this->generalName){
+            throw new \RuntimeException('generalName not picked');
+        }
+        return $this->builder;
+    }
+
+    public function getValidUntil():string{
+        return $this->validUntil;
+    }
+
+    /**
+     * @param \MeekroDB $db
+     * @param int $owner 
+     * @param int $pickCnt 
+     * @param null|string $prefix
+     * @return AbsGeneralPool[]
+     */
+    static abstract public function pickGeneralFromPool(\MeekroDB $db, int $owner, int $pickCnt, ?string $prefix=null):array;
+    abstract public function occupyGeneralName():bool;
+    
+
+    abstract public static function getPoolName():string;
+    abstract public static function initPool(\MeekroDB $db);
+}

hwe/sammo/ActionItem/che_계략_삼략.php

@@ -8,7 +8,7 @@ class che_계략_삼략 extends \sammo\BaseItem{
     protected $id = 22;
     protected $rawName = '삼략';
     protected $name = '삼략(계략)';
-    protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p';
+    protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p<br>[전투] 계략 시도 확률 +10%p, 계략 성공 확률 +10%p';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -19,4 +19,14 @@ class che_계략_삼략 extends \sammo\BaseItem{
         
         return $value;
     }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'warMagicTrialProb'){
+            return $value + 0.1;
+        }
+        if($statName === 'warMagicSuccessProb'){
+            return $value + 0.1;
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/che_계략_육도.php

@@ -8,7 +8,7 @@ class che_계략_육도 extends \sammo\BaseItem{
     protected $id = 21;
     protected $rawName = '육도';
     protected $name = '육도(계략)';
-    protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p';
+    protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p<br>[전투] 계략 시도 확률 +10%p, 계략 성공 확률 +10%p';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -19,4 +19,14 @@ class che_계략_육도 extends \sammo\BaseItem{
         
         return $value;
     }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'warMagicTrialProb'){
+            return $value + 0.1;
+        }
+        if($statName === 'warMagicSuccessProb'){
+            return $value + 0.1;
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/che_계략_이추.php

@@ -8,7 +8,7 @@ class che_계략_이추 extends \sammo\BaseItem{
     protected $id = 5;
     protected $rawName = '이추';
     protected $name = '이추(계략)';
-    protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +10%p';
+    protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p';
     protected $cost = 1000;
     protected $consumable = true;
     protected $buyable = true;
@@ -16,7 +16,7 @@ class che_계략_이추 extends \sammo\BaseItem{
 
     public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
         if($turnType == '계략'){
-            if($varType == 'success') return $value + 0.1;
+            if($varType == 'success') return $value + 0.2;
         }
         
         return $value;

hwe/sammo/ActionItem/che_계략_향낭.php

@@ -8,7 +8,7 @@ class che_계략_향낭 extends \sammo\BaseItem{
     protected $id = 5;
     protected $rawName = '항냥';
     protected $name = '항냥(계략)';
-    protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p';
+    protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +50%p';
     protected $cost = 3000;
     protected $consumable = true;
     protected $buyable = true;
@@ -16,7 +16,7 @@ class che_계략_향낭 extends \sammo\BaseItem{
 
     public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
         if($turnType == '계략'){
-            if($varType == 'success') return $value + 0.2;
+            if($varType == 'success') return $value + 0.5;
         }
         
         return $value;

hwe/sammo/ActionItem/che_명마_07_기주마.php

@@ -6,4 +6,17 @@ use \sammo\General;
 class che_명마_07_기주마 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 공격 시 페이즈 +1";
+    }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'initWarPhase'){
+            return $value + 1;
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/che_명마_07_백마.php

@@ -1,9 +1,26 @@
 <?php
 namespace sammo\ActionItem;
+
+use sammo\BaseWarUnitTrigger;
 use \sammo\iAction;
 use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_퇴각부상무효;
+use sammo\WarUnitTriggerCaller;
 
 class che_명마_07_백마 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 전투 종료로 인한 부상 없음";
+    }
+
+    public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_퇴각부상무효($unit, BaseWarUnitTrigger::TYPE_ITEM),
+        );
+    }
 }

hwe/sammo/ActionItem/che_명마_12_사륜거.php

@@ -1,9 +1,27 @@
 <?php
 namespace sammo\ActionItem;
+
+use sammo\BaseWarUnitTrigger;
 use \sammo\iAction;
 use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_퇴각부상무효;
+use sammo\WarUnitTriggerCaller;
 
 class che_명마_12_사륜거 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 전투 종료로 인한 부상 없음";
+    }
+
+    public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_퇴각부상무효($unit, BaseWarUnitTrigger::TYPE_ITEM),
+        );
+    }
+
 }

hwe/sammo/ActionItem/che_무기_02_단궁.php

@@ -2,9 +2,26 @@
 namespace sammo\ActionItem;
 use \sammo\iAction;
 use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_저격발동;
+use sammo\WarUnitTrigger\che_저격시도;
+use sammo\WarUnitTriggerCaller;
 
 class che_무기_02_단궁 extends \sammo\BaseStatItem{
     protected $cost = 3000;
     protected $buyable = true;
     protected $reqSecu = 2000;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 새로운 상대와 전투 시 1% 확률로 저격 발동, 성공 시 사기+10";
+    }
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 102, 0.01, 10, 30),
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+        );
+    }
 }

hwe/sammo/ActionItem/che_무기_07_맥궁.php

@@ -2,8 +2,25 @@
 namespace sammo\ActionItem;
 use \sammo\iAction;
 use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_저격발동;
+use sammo\WarUnitTrigger\che_저격시도;
+use sammo\WarUnitTriggerCaller;
 
 class che_무기_07_맥궁 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 새로운 상대와 전투 시 20% 확률로 저격 발동, 성공 시 사기+10";
+    }
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 107, 0.2, 20, 40),
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+        );
+    }
 }

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

@@ -2,8 +2,25 @@
 namespace sammo\ActionItem;
 use \sammo\iAction;
 use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_저격발동;
+use sammo\WarUnitTrigger\che_저격시도;
+use sammo\WarUnitTriggerCaller;
 
 class che_무기_09_동호비궁 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 새로운 상대와 전투 시 20% 확률로 저격 발동, 성공 시 사기+10";
+    }
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 109, 0.15, 20, 40),
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+        );
+    }
 }

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

@@ -2,8 +2,25 @@
 namespace sammo\ActionItem;
 use \sammo\iAction;
 use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_저격발동;
+use sammo\WarUnitTrigger\che_저격시도;
+use sammo\WarUnitTriggerCaller;
 
 class che_무기_11_이광궁 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 새로운 상대와 전투 시 10% 확률로 저격 발동, 성공 시 사기+10";
+    }
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 111, 0.10, 20, 40),
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+        );
+    }
 }

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

@@ -2,8 +2,25 @@
 namespace sammo\ActionItem;
 use \sammo\iAction;
 use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_저격발동;
+use sammo\WarUnitTrigger\che_저격시도;
+use sammo\WarUnitTriggerCaller;
 
 class che_무기_13_양유기궁 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 새로운 상대와 전투 시 10% 확률로 저격 발동, 성공 시 사기+10";
+    }
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 113, 0.05, 20, 40),
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+        );
+    }
 }

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

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

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

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

hwe/sammo/ActionItem/che_부적_태현청생부.php

@@ -0,0 +1,34 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use \sammo\GeneralTrigger;
+use \sammo\GeneralTriggerCaller;
+use \sammo\WarUnit;
+use sammo\WarUnitTriggerCaller;
+use sammo\BaseWarUnitTrigger;
+use sammo\WarUnitTrigger\che_부상무효;
+use sammo\WarUnitTrigger\WarActivateSkills;
+
+class che_부적_태현청생부 extends \sammo\BaseItem{
+
+    protected $id = 9;
+    protected $rawName = '태현청생부';
+    protected $name = '태현청생부(부적)';
+    protected $info = '[전투] 저격 불가, 부상 없음';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_부상무효($unit, BaseWarUnitTrigger::TYPE_NONE),
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '저격불가')
+        );
+    }
+    
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '저격불가')
+        );
+    }
+}

hwe/sammo/ActionItem/che_서적_01_효경전.php

@@ -7,4 +7,17 @@ class che_서적_01_효경전 extends \sammo\BaseStatItem{
     protected $cost = 1000;
     protected $buyable = true;
     protected $reqSecu = 1000;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 계략 시도 확률 +1%p";
+    }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'warMagicTrialProb'){
+            return $value + 0.01;
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/che_서적_02_회남자.php

@@ -7,4 +7,17 @@ class che_서적_02_회남자 extends \sammo\BaseStatItem{
     protected $cost = 3000;
     protected $buyable = true;
     protected $reqSecu = 2000;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 계략 시도 확률 +1%p";
+    }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'warMagicTrialProb'){
+            return $value + 0.01;
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/che_서적_03_변도론.php

@@ -7,4 +7,17 @@ class che_서적_03_변도론 extends \sammo\BaseStatItem{
     protected $cost = 6000;
     protected $buyable = true;
     protected $reqSecu = 3000;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 계략 시도 확률 +2%p";
+    }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'warMagicTrialProb'){
+            return $value + 0.02;
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/che_서적_04_건상역주.php

@@ -7,4 +7,17 @@ class che_서적_04_건상역주 extends \sammo\BaseStatItem{
     protected $cost = 10000;
     protected $buyable = true;
     protected $reqSecu = 4000;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 계략 시도 확률 +2%p";
+    }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'warMagicTrialProb'){
+            return $value + 0.02;
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/che_서적_05_여씨춘추.php

@@ -7,4 +7,17 @@ class che_서적_05_여씨춘추 extends \sammo\BaseStatItem{
     protected $cost = 15000;
     protected $buyable = true;
     protected $reqSecu = 5000;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 계략 시도 확률 +3%p";
+    }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'warMagicTrialProb'){
+            return $value + 0.03;
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/che_서적_06_사민월령.php

@@ -7,4 +7,17 @@ class che_서적_06_사민월령 extends \sammo\BaseStatItem{
     protected $cost = 21000;
     protected $buyable = true;
     protected $reqSecu = 6000;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 계략 시도 확률 +3%p";
+    }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'warMagicTrialProb'){
+            return $value + 0.03;
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/che_서적_07_논어.php

@@ -1,9 +1,26 @@
 <?php
 namespace sammo\ActionItem;
+
+use sammo\BaseWarUnitTrigger;
 use \sammo\iAction;
 use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\WarActivateSkills;
+use sammo\WarUnitTriggerCaller;
 
 class che_서적_07_논어 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 상대의 계략 성공 확률 -10%p";
+    }
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*207, false, '계략약화')
+        );
+    }
 }

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

@@ -1,9 +1,28 @@
 <?php
 namespace sammo\ActionItem;
+
+use sammo\BaseWarUnitTrigger;
 use \sammo\iAction;
 use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_반계발동;
+use sammo\WarUnitTrigger\che_반계시도;
+use sammo\WarUnitTriggerCaller;
 
 class che_서적_07_사마법 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 상대의 계략을 20% 확률로 되돌림";
+    }
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_반계시도($unit, BaseWarUnitTrigger::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*207, 0.2),
+            new che_반계발동($unit)
+        );
+    }
 }

hwe/sammo/ActionItem/che_서적_07_위료자.php

@@ -6,4 +6,17 @@ use \sammo\General;
 class che_서적_07_위료자 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 계략 시도 확률 +20%p";
+    }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'warMagicTrialProb'){
+            return $value + 0.2;
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/che_서적_08_전론.php

@@ -6,4 +6,17 @@ use \sammo\General;
 class che_서적_08_전론 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 계략 성공 시 대미지 +20%";
+    }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'warMagicSuccessDamage'){
+            return $value * 1.2;
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/che_서적_11_춘추전.php

@@ -1,9 +1,26 @@
 <?php
 namespace sammo\ActionItem;
+
+use sammo\BaseWarUnitTrigger;
 use \sammo\iAction;
 use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\WarActivateSkills;
+use sammo\WarUnitTriggerCaller;
 
 class che_서적_11_춘추전 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 상대의 계략 성공 확률 -10%p";
+    }
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*211, false, '계략약화')
+        );
+    }
 }

hwe/sammo/ActionItem/che_서적_12_산해경.php

@@ -1,9 +1,28 @@
 <?php
 namespace sammo\ActionItem;
+
+use sammo\BaseWarUnitTrigger;
 use \sammo\iAction;
 use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_반계발동;
+use sammo\WarUnitTrigger\che_반계시도;
+use sammo\WarUnitTriggerCaller;
 
 class che_서적_12_산해경 extends \sammo\BaseStatItem{
     protected $cost = 200;
     protected $buyable = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->info .= "<br>[전투] 상대의 계략을 20% 확률로 되돌림";
+    }
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_반계시도($unit, BaseWarUnitTrigger::TYPE_ITEM, 0.2),
+            new che_반계발동($unit)
+        );
+    }
 }

hwe/sammo/ActionItem/che_의술_상한잡병론.php

@@ -0,0 +1,35 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use \sammo\GeneralTrigger;
+use \sammo\GeneralTriggerCaller;
+use \sammo\BaseWarUnitTrigger;
+use \sammo\WarUnitTriggerCaller;
+use sammo\WarUnitTrigger\che_전투치료발동;
+use sammo\WarUnitTrigger\che_전투치료시도;
+
+class che_의술_상한잡병론 extends \sammo\BaseItem{
+
+    protected $id = 24;
+    protected $rawName = '상한잡병론';
+    protected $name = '상한잡병론(의술)';
+    protected $info = '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 40% 확률로 치료 발동(아군 피해 1/3 감소, 부상 회복)';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getPreTurnExecuteTriggerList(General $general):?GeneralTriggerCaller{
+        return new GeneralTriggerCaller(
+            new GeneralTrigger\che_도시치료($general)
+        );
+    }
+
+    public function getBattlePhaseSkillTriggerList(\sammo\WarUnit $unit): ?WarUnitTriggerCaller
+    {
+        return new WarUnitTriggerCaller(
+            new che_전투치료시도($unit, BaseWarUnitTrigger::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*301),
+            new che_전투치료발동($unit, BaseWarUnitTrigger::TYPE_ITEM)
+            
+        );
+    }
+}

hwe/sammo/ActionItem/che_의술_청낭서.php

@@ -14,7 +14,7 @@ class che_의술_청낭서 extends \sammo\BaseItem{
     protected $id = 23;
     protected $rawName = '청낭서';
     protected $name = '청낭서(의술)';
-    protected $info = '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 20% 확률로 치료 발동(아군 피해 1/3 감소)';
+    protected $info = '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 40% 확률로 치료 발동(아군 피해 1/3 감소, 부상 회복)';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -27,7 +27,7 @@ class che_의술_청낭서 extends \sammo\BaseItem{
     public function getBattlePhaseSkillTriggerList(\sammo\WarUnit $unit): ?WarUnitTriggerCaller
     {
         return new WarUnitTriggerCaller(
-            new che_전투치료시도($unit, BaseWarUnitTrigger::TYPE_ITEM),
+            new che_전투치료시도($unit, BaseWarUnitTrigger::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*302),
             new che_전투치료발동($unit, BaseWarUnitTrigger::TYPE_ITEM)
             
         );

hwe/sammo/ActionItem/che_의술_태평청령.php

@@ -14,7 +14,7 @@ class che_의술_태평청령 extends \sammo\BaseItem{
     protected $id = 24;
     protected $rawName = '태평청령';
     protected $name = '태평청령(의술)';
-    protected $info = '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 20% 확률로 치료 발동(아군 피해 1/3 감소)';
+    protected $info = '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 40% 확률로 치료 발동(아군 피해 1/3 감소, 부상 회복)';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -27,7 +27,7 @@ class che_의술_태평청령 extends \sammo\BaseItem{
     public function getBattlePhaseSkillTriggerList(\sammo\WarUnit $unit): ?WarUnitTriggerCaller
     {
         return new WarUnitTriggerCaller(
-            new che_전투치료시도($unit, BaseWarUnitTrigger::TYPE_ITEM),
+            new che_전투치료시도($unit, BaseWarUnitTrigger::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*303),
             new che_전투치료발동($unit, BaseWarUnitTrigger::TYPE_ITEM)
             
         );

hwe/sammo/ActionItem/che_저격_매화수전.php

@@ -0,0 +1,28 @@
+<?php
+namespace sammo\ActionItem;
+
+use sammo\BaseWarUnitTrigger;
+use \sammo\iAction;
+use \sammo\General;
+use \sammo\SpecialityHelper;
+use \sammo\WarUnit;
+use sammo\WarUnitTriggerCaller;
+use \sammo\WarUnitTrigger\che_저격시도;
+use \sammo\WarUnitTrigger\che_저격발동;
+
+class che_저격_매화수전 extends \sammo\BaseItem{
+
+    protected $id = 70;
+    protected $rawName = '매화수전';
+    protected $name = '매화수전(저격)';
+    protected $info = '[전투] 새로운 상대와 전투 시 50% 확률로 저격 발동, 성공 시 사기+10';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_저격시도($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*304, 0.5, 20, 40),
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+        );
+    }
+}

hwe/sammo/ActionItem/che_저격_비도.php

@@ -0,0 +1,28 @@
+<?php
+namespace sammo\ActionItem;
+
+use sammo\BaseWarUnitTrigger;
+use \sammo\iAction;
+use \sammo\General;
+use \sammo\SpecialityHelper;
+use \sammo\WarUnit;
+use sammo\WarUnitTriggerCaller;
+use \sammo\WarUnitTrigger\che_저격시도;
+use \sammo\WarUnitTrigger\che_저격발동;
+
+class che_저격_비도 extends \sammo\BaseItem{
+
+    protected $id = 70;
+    protected $rawName = '비도';
+    protected $name = '비도(저격)';
+    protected $info = '[전투] 새로운 상대와 전투 시 50% 확률로 저격 발동, 성공 시 사기+10';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_저격시도($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*305, 0.5, 20, 40),
+            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+        );
+    }
+}

hwe/sammo/ActionItem/che_저격_수극.php

@@ -13,7 +13,7 @@ class che_저격_수극 extends \sammo\BaseItem{
     protected $id = 2;
     protected $rawName = '수극';
     protected $name = '수극(저격)';
-    protected $info = '[전투] 전투 개시 전 20% 확률로 저격 시도. 1회용';
+    protected $info = '[전투] 전투 개시 전 50% 확률로 저격 시도. 1회용';
     protected $cost = 1000;
     protected $consumable = true;
     protected $buyable = true;
@@ -21,8 +21,15 @@ class che_저격_수극 extends \sammo\BaseItem{
 
     public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new che_저격시도($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM, 0.2, 20, 40),
-            new che_저격발동($unit)
+            new che_저격시도($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM, 0.5, 20, 40),
+            new che_저격발동($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM)
         );
     }
+
+    function isConsumableNow(string $actionType, string $command):bool{
+        if($actionType == 'GeneralTrigger' && $command == 'che_아이템치료'){
+            return true;
+        }
+        return false;
+    }
 }

hwe/sammo/ActionItem/che_행동_서촉지형도.php

@@ -0,0 +1,21 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+
+class che_행동_서촉지형도 extends \sammo\BaseItem{
+
+    protected $id = 22;
+    protected $rawName = '서촉지형도';
+    protected $name = '서촉지형도(행동)';
+    protected $info = '[전투] 공격 시 페이즈 + 2';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'initWarPhase'){
+            return $value + 2;
+        }
+        return $value;
+    }
+}

hwe/sammo/ActionItem/event_빼빼로.php

@@ -0,0 +1,29 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use \sammo\SpecialityHelper;
+use \sammo\WarUnit;
+use sammo\WarUnitTriggerCaller;
+use sammo\WarUnitTrigger\che_격노시도;
+use sammo\WarUnitTrigger\che_격노발동;
+
+class event_빼빼로 extends \sammo\BaseItem{
+
+    protected $id = 75;
+    protected $rawName = '빼빼로';
+    protected $name = '빼빼로';
+    protected $info = '1의 상징입니다.<br>통솔 +1, 무력 +1, 지력 +1';
+    protected $cost = 1500;
+    protected $buyable = true;
+    protected $consumable = false;
+    protected $reqSecu = 12000;
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if(in_array($statName, ['leadership', 'strength', 'intel'] )){
+            return $value + 1;
+        }
+        return $value;
+    }
+
+}

hwe/sammo/ActionItem/event_전투특기_격노.php

@@ -13,17 +13,21 @@ class event_전투특기_격노 extends \sammo\BaseItem{
     protected $id = 74;
     protected $rawName = '비급';
     protected $name = '비급(격노)';
-    protected $info = '[전투] 상대방 필살 및 회피 시도시 일정 확률로 격노(필살) 발동, 공격 시 일정 확률로 진노(1페이즈 추가)';
+    protected $info = '[전투] 상대방 필살 시 격노(필살) 발동, 회피 시도시 25% 확률로 격노 발동, 공격 시 일정 확률로 진노(1페이즈 추가)';
     protected $cost = 100;
     protected $buyable = true;
     protected $consumable = false;
     protected $reqSecu = 3000;
 
+    public function getWarPowerMultiplier(WarUnit $unit):array{
+        $activatedCnt = $unit->hasActivatedSkillOnLog('격노');
+        return [1 + 0.2*$activatedCnt, 1];
+    }
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new che_격노시도($unit),
-            new che_격노발동($unit)
+            new che_격노시도($unit, che_격노시도::TYPE_ITEM),
+            new che_격노발동($unit, che_격노발동::TYPE_ITEM)
         );
     }
 }

hwe/sammo/ActionItem/event_전투특기_공성.php

@@ -12,7 +12,7 @@ class event_전투특기_공성 extends \sammo\BaseItem{
     protected $id = 53;
     protected $rawName = '비급';
     protected $name = '비급(공성)';
-    protected $info = '[군사] 차병 계통 징·모병비 -10%<br>[전투] 성벽 공격 시 대미지 +100%';
+    protected $info = '[군사] 차병 계통 징·모병비 -10%<br>[전투] 성벽 공격 시 대미지 +100%,<br>공격시 상대 병종에/수비시 자신 병종 숙련에 차병 숙련을 가산';
     protected $cost = 100;
     protected $buyable = true;
     protected $consumable = false;
@@ -32,4 +32,18 @@ class event_전투특기_공성 extends \sammo\BaseItem{
         }
         return [1, 1];
     }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if(\sammo\Util::starts_with($statName, 'dex')){
+            $myArmType = 'dex'.GameUnitConst::T_SIEGE;
+            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
+            if($aux['isAttacker'] && $opposeArmType === $statName){
+                return $value + $general->getVar($myArmType);
+            }
+            if(!$aux['isAttacker'] && $myArmType === $statName){
+                return $value + $general->getVar($myArmType);
+            }
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/event_전투특기_궁병.php

@@ -11,7 +11,7 @@ class event_전투특기_궁병 extends \sammo\BaseItem{
     protected $id = 51;
     protected $rawName = '비급';
     protected $name = '비급(궁병)';
-    protected $info = '[군사] 궁병 계통 징·모병비 -10%<br>[전투] 회피 확률 +20%p';
+    protected $info = '[군사] 궁병 계통 징·모병비 -10%<br>[전투] 회피 확률 +20%p,<br>공격시 상대 병종에/수비시 자신 병종 숙련에 궁병 숙련을 가산';
     protected $cost = 100;
     protected $buyable = true;
     protected $consumable = false;
@@ -29,6 +29,16 @@ class event_전투특기_궁병 extends \sammo\BaseItem{
         if($statName === 'warAvoidRatio'){
             return $value + 0.2;
         }
+        if(\sammo\Util::starts_with($statName, 'dex')){
+            $myArmType = 'dex'.GameUnitConst::T_ARCHER;
+            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
+            if($aux['isAttacker'] && $opposeArmType === $statName){
+                return $value + $general->getVar($myArmType);
+            }
+            if(!$aux['isAttacker'] && $myArmType === $statName){
+                return $value + $general->getVar($myArmType);
+            }
+        }
         return $value;
     }
 }

hwe/sammo/ActionItem/event_전투특기_귀병.php

@@ -11,7 +11,7 @@ class event_전투특기_귀병 extends \sammo\BaseItem{
     protected $id = 40;
     protected $rawName = '비급';
     protected $name = '비급(귀병)';
-    protected $info = '[군사] 귀병 계통 징·모병비 -10%<br>[전투] 계략 성공 확률 +20%p';
+    protected $info = '[군사] 귀병 계통 징·모병비 -10%<br>[전투] 계략 성공 확률 +20%p,<br>공격시 상대 병종에/수비시 자신 병종 숙련에 귀병 숙련을 가산';
     protected $cost = 100;
     protected $buyable = true;
     protected $consumable = false;
@@ -29,6 +29,16 @@ class event_전투특기_귀병 extends \sammo\BaseItem{
         if($statName === 'warMagicSuccessProb'){
             return $value + 0.2;
         }
+        if(\sammo\Util::starts_with($statName, 'dex')){
+            $myArmType = 'dex'.GameUnitConst::T_WIZARD;
+            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
+            if($aux['isAttacker'] && $opposeArmType === $statName){
+                return $value + $general->getVar($myArmType);
+            }
+            if(!$aux['isAttacker'] && $myArmType === $statName){
+                return $value + $general->getVar($myArmType);
+            }
+        }
         return $value;
     }
 }

hwe/sammo/ActionItem/event_전투특기_기병.php

@@ -11,7 +11,7 @@ class event_전투특기_기병 extends \sammo\BaseItem{
     protected $id = 52;
     protected $rawName = '비급';
     protected $name = '비급(기병)';
-    protected $info = '[군사] 기병 계통 징·모병비 -10%<br>[전투] 수비 시 대미지 +10%, 공격 시 대미지 +20%';
+    protected $info = '[군사] 기병 계통 징·모병비 -10%<br>[전투] 수비 시 대미지 +10%, 공격 시 대미지 +20%,<br>공격시 상대 병종에/수비시 자신 병종 숙련에 기병 숙련을 가산';
     protected $cost = 100;
     protected $buyable = true;
     protected $consumable = false;
@@ -31,4 +31,18 @@ class event_전투특기_기병 extends \sammo\BaseItem{
         }
         return [1.1, 1];
     }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if(\sammo\Util::starts_with($statName, 'dex')){
+            $myArmType = 'dex'.GameUnitConst::T_CAVALRY;
+            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
+            if($aux['isAttacker'] && $opposeArmType === $statName){
+                return $value + $general->getVar($myArmType);
+            }
+            if(!$aux['isAttacker'] && $myArmType === $statName){
+                return $value + $general->getVar($myArmType);
+            }
+        }
+        return $value;
+    }
 }

hwe/sammo/ActionItem/event_전투특기_돌격.php

@@ -7,13 +7,14 @@ use \sammo\WarUnit;
 use \sammo\BaseWarUnitTrigger;
 use \sammo\WarUnitTriggerCaller;
 use sammo\WarUnitTrigger\WarActivateSkills;
+use \sammo\WarUnitTrigger\che_돌격지속;
 
 class event_전투특기_돌격 extends \sammo\BaseItem{
 
     protected $id = 60;
     protected $rawName = '비급';
     protected $name = '비급(돌격)';
-    protected $info = '[전투] 상대 회피 불가, 공격 시 전투 페이즈 +1, 공격 시 대미지 +10%';
+    protected $info = '[전투] 공격 시 대등/유리한 병종에게는 퇴각 전까지 전투, 공격 시 페이즈 + 2, 공격 시 대미지 +5%';
     protected $cost = 100;
     protected $buyable = true;
     protected $consumable = false;
@@ -21,21 +22,20 @@ class event_전투특기_돌격 extends \sammo\BaseItem{
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
         if($statName === 'initWarPhase'){
-            return $value + 1;
+            return $value + 2;
         }
         return $value;
     }
-
     public function getWarPowerMultiplier(WarUnit $unit):array{
         if($unit->isAttacker()){
-            return [1.1, 1];
+            return [1.05, 1];
         }
         return [1, 1];
     }
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            (new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '회피불가'))->setPriority(BaseWarUnitTrigger::PRIORITY_BEGIN + 200)
+            new che_돌격지속($unit)
         );
     }
 }

hwe/sammo/ActionItem/event_전투특기_무쌍.php

@@ -4,13 +4,14 @@ use \sammo\iAction;
 use \sammo\General;
 use \sammo\SpecialityHelper;
 use \sammo\WarUnit;
+use \sammo\Util;
 
 class event_전투특기_무쌍 extends \sammo\BaseItem{
 
     protected $id = 61;
     protected $rawName = '비급';
     protected $name = '비급(무쌍)';
-    protected $info = '[전투] 대미지 +10%, 공격 시 필살 확률 +10%p';
+    protected $info = '[전투] 대미지 +10%, 피해 -5%, 공격 시 필살 확률 +10%p, <br>승리 수만큼 대미지 0.20%씩 추가 상승(최대40%)<br>승리 수만큼 피해 0.05%씩 감소(최대30%)';
     protected $cost = 100;
     protected $buyable = true;
     protected $consumable = false;
@@ -24,6 +25,11 @@ class event_전투특기_무쌍 extends \sammo\BaseItem{
     }
 
     public function getWarPowerMultiplier(WarUnit $unit):array{
-        return [1.1, 1];
+        $attackMultiplier = 1.1;
+        $defenceMultiplier = 0.95;
+        $killnum = $unit->getGeneral()->getRankVar('killnum');
+        $attackMultiplier += Util::valueFit($killnum * 0.01 * 0.2, null, 0.4);
+        $defenceMultiplier -= Util::valueFit($killnum * 0.01 * 0.05, null, 0.3);
+        return [$attackMultiplier, $defenceMultiplier];
     }
 }

hwe/sammo/ActionItem/event_전투특기_반계.php

@@ -15,7 +15,7 @@ class event_전투특기_반계 extends \sammo\BaseItem{
     protected $id = 45;
     protected $rawName = '비급';
     protected $name = '비급(반계)';
-    protected $info = '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 40% 확률로 되돌림, 반목 성공시 대미지 추가(+60% → +100%)';
+    protected $info = '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 40% 확률로 되돌림, 반목 성공시 대미지 추가(+60% → +150%)';
     protected $cost = 100;
     protected $buyable = true;
     protected $consumable = false;
@@ -23,15 +23,15 @@ class event_전투특기_반계 extends \sammo\BaseItem{
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
         if($statName === 'warMagicSuccessDamage' && $aux === '반목'){
-            return $value + 0.4;
+            return $value + 0.9;
         }
         return $value;
     }
 
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_ITEM, false, '계략약화'),
-            new che_반계시도($unit, che_반계시도::TYPE_ITEM),
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '계략약화'),
+            new che_반계시도($unit),
             new che_반계발동($unit)
         );
     }

hwe/sammo/ActionItem/event_전투특기_보병.php

@@ -11,7 +11,7 @@ class event_전투특기_보병 extends \sammo\BaseItem{
     protected $id = 50;
     protected $rawName = '비급';
     protected $name = '비급(보병)';
-    protected $info = '[군사] 보병 계통 징·모병비 -10%<br>[전투] 공격 시 아군 피해 -10%, 수비 시 아군 피해 -20%';
+    protected $info = '[군사] 보병 계통 징·모병비 -10%<br>[전투] 공격 시 아군 피해 -10%, 수비 시 아군 피해 -20%,<br>공격시 상대 병종에/수비시 자신 병종 숙련에 보병 숙련을 가산';
     protected $cost = 100;
     protected $buyable = true;
     protected $consumable = false;
@@ -32,4 +32,18 @@ class event_전투특기_보병 extends \sammo\BaseItem{
         }
         return [1, 0.8];
     }
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if(\sammo\Util::starts_with($statName, 'dex')){
+            $myArmType = 'dex'.GameUnitConst::T_FOOTMAN;
+            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
+            if($aux['isAttacker'] && $opposeArmType === $statName){
+                return $value + $general->getVar($myArmType);
+            }
+            if(!$aux['isAttacker'] && $myArmType === $statName){
+                return $value + $general->getVar($myArmType);
+            }
+        }
+        return $value;
+    }
 }