국호 변경 warning 수정

This reverts commit 2c31de1d6a2cf8cf404daff6ae1d060bb1181b00.

.gitignore

@@ -1,11 +1,4 @@
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-
-
 
 # 체섭 ignore
 *.log
@@ -48,3 +41,4 @@ test.php
 phpinfo.php
 vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/*
 *.sqlite3
+

LICENSE

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

README.md

@@ -11,16 +11,21 @@
   * <code>php-fpm</code> 권장
   * php에서 curl, pdo-sqlite을 실행가능해야 합니다. (기본값: 지원)
   * mysqlnd가 지원되어야합니다. (기본값: 지원)
+  * mysqli
+  * gd
 * MariaDB 10.2.1 이상
-  * MySQL 5.6 이상도 가능하도록 할 예정입니다.
+  * 현재 MySQL은 지원하지 않습니다.
 * <code>git</code>
 * <code>curl</code>
 
-Linux는 Ubuntu 16.04, Windows는 Windows 10에서 XAMPP를 사용한 환경에서 테스트되었습니다.
+Linux는 Ubuntu 16.04, 18.04, Windows는 Windows 10에서 XAMPP를 사용한 환경에서 테스트되었습니다.
 
-Docker를 이용한 설치는 계획중입니다.
 
-## 설치
+## Docker를 이용한 설치
+
+https://storage.hided.net/gogs/devsam/docker 를 참고해 주세요.
+
+## 수동 설치
 
 본 게임은 <code>git</code>을 이용한 업그레이드 시스템을 구현하였으므로, <code>git</code>이 필요합니다.
 또한 웹 서비스 데몬을 운영중인 사용자(일반적으로 <code>www-data</code>, <code>apache</code>)에게 디렉토리 권한이 주어져야합니다.
@@ -30,11 +35,11 @@ Docker를 이용한 설치는 계획중입니다.
 웹 데몬 user가 <code>www-data</code>인 경우 다음과 같이 입력하여 최신 배포버전과 이미지 파일을 얻을 수 있습니다.
 
 ```
-sudo -u www-data git clone ssh://git@storage.hided.net:2525/devsam/core.git
-git clone ssh://git@storage.hided.net:2525/devsam/image.git
+sudo -u www-data git clone https://storage.hided.net/gogs/devsam/core.git
+sudo -u www-data git clone https://storage.hided.net/gogs/devsam/image.git
 ```
 
-> 이미지는 git hook을 이용한 업데이트 기능을 제공하지만 아직 범용성 있는 설계가 되어있진 않습니다.
+> 이미지는 hook/git_hook.php을 통해 동기화되며, 서버 설치 과정에 이미지 갱신 키를 지정하는 것으로 '훼' 서버 업데이트 시 동기화됩니다. 이미지 서버가 게임 서버와 별개여도 동작하나, php와 git을 지원해야합니다.
 
 ### 설치
 
@@ -47,9 +52,9 @@ Database 수는 로그인 관리 서버 1개, 내부 서버 7개로, 총 8개의
 
 ## 카카오로그인 연동
 
-현재 카카오로그인 API KEY를 입력하는 작업이 설치과정에 추가되어있지 않습니다.
+서버 설치 시 카카오 로그인 연동을 위한 API KEY를 입력받습니다.
 
-설치 후 <code>d_setting/KakaoKey.php</code>에서 API키를 입력해야 합니다.
+만약 설치 이후 API KEY를 변경하고자 하는 경우 <code>d_setting/KakaoKey.php</code>에서 API키를 변경해야 합니다.
 
 
 ## 라이선스

composer.json

@@ -6,12 +6,17 @@
        "GPL-2.0-or-later",
        "proprietary"
     ],
+    "config": {
+        "platform": {
+            "php": "7.3"
+        }
+    },
     "require": {
         "brandonwamboldt/utilphp": "^1.1",
         "sergeytsalkov/meekrodb": "^2.3",
         "league/plates": "^3.3",
         "guzzlehttp/guzzle": "^6.3",
-        "leafo/scssphp": "^0.7.5",
+        "scssphp/scssphp": "^1.0",
         "monolog/monolog": "^1.23",
         "firephp/firephp-core": "^0.4.0",
         "vlucas/valitron": "^1.4",

composer.lock

@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3fceaf3c2925068c7e757ab12036e29e",
+    "content-hash": "b5b5695ed0b1b04fa672f99972d8caad",
     "packages": [
         {
             "name": "brandonwamboldt/utilphp",
@@ -54,16 +54,16 @@
         },
         {
             "name": "catfan/medoo",
-            "version": "v1.5.7",
+            "version": "v1.7.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/catfan/Medoo.git",
-                "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf"
+                "reference": "dd9d570584cfb1e09ec470608479b86e41d5b60d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/catfan/Medoo/zipball/8d90cba0e8ff176028847527d0ea76fe41a06ecf",
-                "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf",
+                "url": "https://api.github.com/repos/catfan/Medoo/zipball/dd9d570584cfb1e09ec470608479b86e41d5b60d",
+                "reference": "dd9d570584cfb1e09ec470608479b86e41d5b60d",
                 "shasum": ""
             },
             "require": {
@@ -77,7 +77,7 @@
                 "ext-pdo_oci8": "For Oracle version 8 database",
                 "ext-pdo_pqsql": "For PostgreSQL database",
                 "ext-pdo_sqlite": "For SQLite database",
-                "ext-pdo_sqlsrv": "For MSSQL database"
+                "ext-pdo_sqlsrv": "For MSSQL database on both Window/Liunx platform"
             },
             "type": "framework",
             "autoload": {
@@ -95,10 +95,11 @@
                     "email": "angel@catfan.me"
                 }
             ],
-            "description": "The lightest PHP database framework to accelerate development",
+            "description": "The lightweight PHP database framework to accelerate development",
             "homepage": "https://medoo.in",
             "keywords": [
                 "database",
+                "database library",
                 "lightweight",
                 "mariadb",
                 "mssql",
@@ -109,27 +110,27 @@
                 "sql",
                 "sqlite"
             ],
-            "time": "2018-06-14T18:59:08+00:00"
+            "time": "2019-12-19T05:04:34+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.10.0",
+            "version": "v4.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "d85d39da4576a6934b72480be6978fb10c860021"
+                "reference": "a617e55bc62a87eec73bd456d146d134ad716f03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d85d39da4576a6934b72480be6978fb10c860021",
-                "reference": "d85d39da4576a6934b72480be6978fb10c860021",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/a617e55bc62a87eec73bd456d146d134ad716f03",
+                "reference": "a617e55bc62a87eec73bd456d146d134ad716f03",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2"
             },
             "require-dev": {
-                "simpletest/simpletest": "^1.1"
+                "simpletest/simpletest": "dev-master#72de02a7b80c6bb8864ef9bf66d41d2f58f826bd"
             },
             "type": "library",
             "autoload": {
@@ -142,7 +143,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL"
+                "LGPL-2.1-or-later"
             ],
             "authors": [
                 {
@@ -156,7 +157,7 @@
             "keywords": [
                 "html"
             ],
-            "time": "2018-02-23T01:58:20+00:00"
+            "time": "2019-10-28T03:44:26+00:00"
         },
         {
             "name": "firephp/firephp-core",
@@ -196,44 +197,46 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.3.3",
+            "version": "6.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
+                "reference": "43ece0e75098b7ecd8d13918293029e555a50f82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
-                "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82",
+                "reference": "43ece0e75098b7ecd8d13918293029e555a50f82",
                 "shasum": ""
             },
             "require": {
+                "ext-json": "*",
                 "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4",
+                "guzzlehttp/psr7": "^1.6.1",
                 "php": ">=5.5"
             },
             "require-dev": {
                 "ext-curl": "*",
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.0"
+                "psr/log": "^1.1"
             },
             "suggest": {
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "psr/log": "Required for using the Log middleware"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.3-dev"
+                    "dev-master": "6.5-dev"
                 }
             },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\": "src/"
-                }
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -257,7 +260,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2018-04-22T15:46:56+00:00"
+            "time": "2019-12-23T11:57:10+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -312,32 +315,37 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.4.2",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
-                "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0",
-                "psr/http-message": "~1.0"
+                "psr/http-message": "~1.0",
+                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
             },
             "provide": {
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "ext-zlib": "*",
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+            },
+            "suggest": {
+                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.6-dev"
                 }
             },
             "autoload": {
@@ -367,65 +375,14 @@
             "keywords": [
                 "http",
                 "message",
+                "psr-7",
                 "request",
                 "response",
                 "stream",
                 "uri",
                 "url"
             ],
-            "time": "2017-03-20T17:10:46+00:00"
-        },
-        {
-            "name": "leafo/scssphp",
-            "version": "v0.7.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/leafo/scssphp.git",
-                "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/leafo/scssphp/zipball/1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
-                "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.6",
-                "squizlabs/php_codesniffer": "~2.5"
-            },
-            "bin": [
-                "bin/pscss"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Leafo\\ScssPhp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Leaf Corcoran",
-                    "email": "leafot@gmail.com",
-                    "homepage": "http://leafo.net"
-                }
-            ],
-            "description": "scssphp is a compiler for SCSS written in PHP.",
-            "homepage": "http://leafo.github.io/scssphp/",
-            "keywords": [
-                "css",
-                "less",
-                "sass",
-                "scss",
-                "stylesheet"
-            ],
-            "time": "2018-07-22T01:22:08+00:00"
+            "time": "2019-07-01T23:21:34+00:00"
         },
         {
             "name": "league/plates",
@@ -484,16 +441,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.23.0",
+            "version": "1.25.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
+                "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1",
+                "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1",
                 "shasum": ""
             },
             "require": {
@@ -558,7 +515,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2017-06-19T01:22:40+00:00"
+            "time": "2019-12-20T14:15:16+00:00"
         },
         {
             "name": "pguardiario/phpuri",
@@ -720,16 +677,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.0.2",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
                 "shasum": ""
             },
             "require": {
@@ -738,7 +695,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -763,7 +720,108 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2019-11-01T11:05:21+00:00"
+        },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "time": "2019-03-08T08:55:37+00:00"
+        },
+        {
+            "name": "scssphp/scssphp",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/scssphp/scssphp.git",
+                "reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/5b3c9d704950d8f9637f5110c36c281ec47dc13c",
+                "reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
+                "php": ">=5.6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
+                "squizlabs/php_codesniffer": "~2.5",
+                "twbs/bootstrap": "~4.3",
+                "zurb/foundation": "~6.5"
+            },
+            "bin": [
+                "bin/pscss"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "ScssPhp\\ScssPhp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Anthon Pang",
+                    "email": "apang@softwaredevelopment.ca",
+                    "homepage": "https://github.com/robocoder"
+                },
+                {
+                    "name": "Cédric Morin",
+                    "email": "cedric@yterium.com",
+                    "homepage": "https://github.com/Cerdic"
+                }
+            ],
+            "description": "scssphp is a compiler for SCSS written in PHP.",
+            "homepage": "http://scssphp.github.io/scssphp/",
+            "keywords": [
+                "css",
+                "less",
+                "sass",
+                "scss",
+                "stylesheet"
+            ],
+            "time": "2019-12-12T05:00:52+00:00"
         },
         {
             "name": "sergeytsalkov/meekrodb",
@@ -810,29 +868,34 @@
         },
         {
             "name": "symfony/lock",
-            "version": "v4.1.1",
+            "version": "v4.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/lock.git",
-                "reference": "d508b5dd92272cb74300396ecaadde969d0f7976"
+                "reference": "6c4f5b620871cfef5b004fc57f2ca74572ae03b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/d508b5dd92272cb74300396ecaadde969d0f7976",
-                "reference": "d508b5dd92272cb74300396ecaadde969d0f7976",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/6c4f5b620871cfef5b004fc57f2ca74572ae03b3",
+                "reference": "6c4f5b620871cfef5b004fc57f2ca74572ae03b3",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1.3",
                 "psr/log": "~1.0"
             },
+            "conflict": {
+                "doctrine/dbal": "<2.5"
+            },
             "require-dev": {
+                "doctrine/dbal": "~2.5",
+                "mongodb/mongodb": "~1.1",
                 "predis/predis": "~1.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "4.4-dev"
                 }
             },
             "autoload": {
@@ -848,13 +911,13 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
                 {
                     "name": "Jérémy Derussé",
                     "email": "jeremy@derusse.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Lock Component",
@@ -867,20 +930,20 @@
                 "redlock",
                 "semaphore"
             ],
-            "time": "2018-06-21T11:15:46+00:00"
+            "time": "2020-01-04T13:00:46+00:00"
         },
         {
             "name": "vlucas/valitron",
-            "version": "v1.4.3",
+            "version": "v1.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/valitron.git",
-                "reference": "3c5463315bfa23b17f8949b100a960d035234e43"
+                "reference": "a03072bed1679660200766d134507a30193eaf6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/valitron/zipball/3c5463315bfa23b17f8949b100a960d035234e43",
-                "reference": "3c5463315bfa23b17f8949b100a960d035234e43",
+                "url": "https://api.github.com/repos/vlucas/valitron/zipball/a03072bed1679660200766d134507a30193eaf6d",
+                "reference": "a03072bed1679660200766d134507a30193eaf6d",
                 "shasum": ""
             },
             "require": {
@@ -916,28 +979,29 @@
                 "validation",
                 "validator"
             ],
-            "time": "2018-05-06T10:45:26+00:00"
+            "time": "2019-08-29T19:49:43+00:00"
         },
         {
             "name": "xemlock/htmlpurifier-html5",
-            "version": "v0.1.7",
+            "version": "v0.1.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/xemlock/htmlpurifier-html5.git",
-                "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359"
+                "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/b4b35e51ec75e0207c23035f7d9a354bdcdac359",
-                "reference": "b4b35e51ec75e0207c23035f7d9a354bdcdac359",
+                "url": "https://api.github.com/repos/xemlock/htmlpurifier-html5/zipball/f0d563f9fd4a82a3d759043483f9a94c0d8c2255",
+                "reference": "f0d563f9fd4a82a3d759043483f9a94c0d8c2255",
                 "shasum": ""
             },
             "require": {
-                "ezyang/htmlpurifier": "^4.7",
+                "ezyang/htmlpurifier": "^4.8",
                 "php": ">=5.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.7.*|5.7.*"
+                "php-coveralls/php-coveralls": "^1.1|^2.1",
+                "phpunit/phpunit": ">=4.7 <8.0"
             },
             "type": "library",
             "autoload": {
@@ -955,8 +1019,18 @@
                     "email": "xemlock@gmail.com"
                 }
             ],
-            "description": "HTML Purifier definitions for HTML5 elements",
-            "time": "2018-06-07T14:30:17+00:00"
+            "description": "HTML5 element definitions for HTML Purifier",
+            "keywords": [
+                "HTML5",
+                "Purifier",
+                "html",
+                "htmlpurifier",
+                "security",
+                "tidy",
+                "validator",
+                "xss"
+            ],
+            "time": "2019-08-07T17:19:21+00:00"
         }
     ],
     "packages-dev": [],
@@ -966,5 +1040,8 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],
-    "platform-dev": []
+    "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.3"
+    }
 }

css/config.css

@@ -164,4 +164,19 @@ a.samButton.disabled {
 
 .samCommandButton.disabled > .samButtonOuter > .samButtonInner::after{
     content:'】'
+}
+
+.tooltip_copyable_info .tooltiptext{
+    display: inline;
+    color: rgba(0,0,0,0);
+    font-size: 0;
+}
+
+.tooltiptext {
+    display: none;
+}
+
+.hidden_but_copyable{
+    color: rgba(0,0,0,0);
+    font-size: 0;
 }

e_lib/linkify/linkify-string.min.js

@@ -0,0 +1 @@
+"use strict";!function(t,r){var n=function(t){function r(t){return t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function n(t){return t.replace(/"/g,"&quot;")}function e(t){if(!t)return"";var r=[];for(var e in t){var i=t[e]+"";r.push(e+'="'+n(i)+'"')}return r.join(" ")}function i(t){var i=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};i=new a(i);for(var f=o(t),u=[],c=0;c<f.length;c++){var p=f[c];if("nl"===p.type&&i.nl2br)u.push("<br>\n");else if(p.isLink&&i.check(p)){var l=i.resolve(p),s=l.formatted,g=l.formattedHref,y=l.tagName,h=l.className,v=l.target,k=l.attributes,S="<"+y+' href="'+n(g)+'"';h&&(S+=' class="'+n(h)+'"'),v&&(S+=' target="'+n(v)+'"'),k&&(S+=" "+e(k)),S+=">"+r(s)+"</"+y+">",u.push(S)}else u.push(r(p.toString()))}return u.join("")}var o=t.tokenize,f=t.options,a=f.Options;if(!String.prototype.linkify)try{Object.defineProperty(String.prototype,"linkify",{a:function(){},get:function(){return function(t){return i(this,t)}}})}catch(u){String.prototype.linkify||(String.prototype.linkify=function(t){return i(this,t)})}return i}(r);t.linkifyStr=n}(window,linkify);

f_config/config.php

@@ -3,7 +3,6 @@ namespace sammo;
 
 define('ROOT', realpath(__dir__.'/..'));
 setlocale(LC_ALL, 'ko_KR.UTF-8');
-date_default_timezone_set('Asia/Seoul');
 mb_internal_encoding("UTF-8");
 mb_http_output('UTF-8');
 mb_regex_encoding('UTF-8'); 
@@ -88,19 +87,28 @@ function getExceptionTraceAsString($exception) {
     return $rtn;
 }
 
-function logError(string $err, string $errstr, array $trace){
+function logError(string $err, string $errstr, string $errpath, array $trace){
     $fdb = FileDB::db(ROOT.'/d_log/err_log.sqlite3', ROOT.'/f_install/sql/err_log.sql');
     $date = date("Ymd_His");
 
+    $errpath = str_replace(ROOT, '{ROOT}', $errpath);
     $trace = array_map(function(string $text){
         return str_replace(ROOT, '{ROOT}', $text);
     }, $trace);
 
+    $owner = Util::get_client_ip();
+    $session = Session::getInstance();
+    if($session->isLoggedIn(true)){
+        $owner .= '('.$session->getUserID().','.$session->userName.')';
+    }
+
     $fdb->insert('err_log', [
         'date'=>$date,
         'err'=>$err,
         'errstr'=>$errstr,
-        'trace'=>Json::encode($trace)
+        'errpath'=>$errpath,
+        'trace'=>Json::encode($trace),
+        'webuser'=>$owner
     ]);
 }
 
@@ -116,6 +124,7 @@ function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, in
     logError(
         getFriendlyErrorType($errno),
         $errstr,
+        $errfile.':'.$errline,
         getExceptionTraceAsString($e)
     );
 }
@@ -123,9 +132,11 @@ set_error_handler("\sammo\logErrorByCustomHandler");
 
 
 function logExceptionByCustomHandler(\Throwable $e){
+    
     logError(
         get_class($e),
         $e->getMessage(),
+        $e->getFile().':'.$e->getLine(),
         getExceptionTraceAsString($e)
     );
     

f_install/install.php

@@ -98,6 +98,38 @@ require(__dir__.'/../vendor/autoload.php');
                         </div>
                     </div>
 
+                    <div class="form-group row">
+                        <label for="image_request_key" class="col-sm-4 col-form-label">이미지 갱신 키</label>
+                        <div class="input-group col-sm-8">
+                            <input type="text" class="form-control" name="image_request_key" id="image_request_key" 
+                            placeholder="이미지 서버의 hook/HashKey.php의 값과 동일하게"
+                            value="" />
+                            <div class="input-group-append">
+                                <button id="btn_random_generate_key" class="btn btn-secondary" type="button">랜덤 생성</button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <hr style="width:100%; border-top: 1px solid lightgray;">
+
+                    <div class="form-group row">
+                        <label for="kakao_rest_key" class="col-sm-4 col-form-label">카카오 API Rest Key</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" name="kakao_rest_key" id="kakao_rest_key" 
+                            placeholder="카카오톡 API의 Rest Key"
+                            value="" />
+                        </div>
+                    </div>
+
+                    <div class="form-group row">
+                        <label for="kakao_admin_key" class="col-sm-4 col-form-label">카카오 API Admin Key</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" name="kakao_admin_key" id="kakao_admin_key" 
+                            placeholder="카카오톡 API의 Admin Key"
+                            value="" />
+                        </div>
+                    </div>
+
                     <div class="form-group row">
                         <div class="col-sm-4"></div>
                         <div class="col-sm-8">

f_install/j_setup_db.php

@@ -11,6 +11,11 @@ $dbName = Util::getReq('db_name');
 $servHost = Util::getReq('serv_host');
 $sharedIconPath = Util::getReq('shared_icon_path');
 $gameImagePath = Util::getReq('game_image_path');
+$imageRequestKey = Util::getReq('image_request_key');
+
+$kakaoRESTKey = Util::getReq('kakao_rest_key', 'string', '');
+$kakaoAdminKey = Util::getReq('kakao_admin_key', 'string', '');
+
 
 if (!$host || !$port || !$username || !$password || !$dbName || !$servHost || !$sharedIconPath || !$gameImagePath) {
     Json::die([
@@ -186,6 +191,8 @@ $globalSalt = bin2hex(random_bytes(16));
 
 $sharedIconPath = WebUtil::resolveRelativePath($sharedIconPath, $servHost);
 $gameImagePath = WebUtil::resolveRelativePath($gameImagePath, $servHost);
+$imageRequestPath = WebUtil::resolveRelativePath($gameImagePath.'/../hook/git_pull.php', $servHost);
+$imageKeyInstallPath = WebUtil::resolveRelativePath($gameImagePath.'/../hook/InstallKey.php', $servHost);
 
 $result = Util::generateFileUsingSimpleTemplate(
     __dir__.'/templates/ServConfig.orig.php',
@@ -193,11 +200,17 @@ $result = Util::generateFileUsingSimpleTemplate(
     [
         'serverBasePath'=>$servHost,
         'sharedIconPath'=>$sharedIconPath,
-        'gameImagePath'=>$gameImagePath
+        'gameImagePath'=>$gameImagePath,
+        'imageRequestPath'=>$imageRequestPath,
+        'imageRequestKey'=>$imageRequestKey
     ],
     true
 );
 
+if($imageRequestKey){
+    @file_get_contents($imageKeyInstallPath.'?key='.$imageRequestKey);
+}
+
 if ($result !== true) {
     Json::die([
         'result'=>false,
@@ -263,10 +276,15 @@ $result = Util::generateFileUsingSimpleTemplate(
     ]
 );
 
+$kakaoRedirectURI = WebUtil::resolveRelativePath('oauth_kakao/oauth.php', $servHost.'/');
+
 Util::generateFileUsingSimpleTemplate(
     __dir__.'/templates/KakaoKey.orig.php',
     ROOT.'/d_setting/KakaoKey.php',
     [
+        'REST_API_KEY'=>$kakaoRESTKey,
+        'ADMIN_KEY'=>$kakaoAdminKey,
+        'REDIRECT_URI'=>$kakaoRedirectURI
     ],
     true
 );
@@ -280,5 +298,6 @@ if ($result !== true) {
 
 Json::die([
     'result'=>true,
-    'reason'=>'success'
+    'reason'=>'success',
+    'globalSalt'=>$globalSalt
 ]);

f_install/j_update_js_css_path.php

@@ -0,0 +1,117 @@
+<?php
+namespace sammo;
+
+require(__dir__.'/../vendor/autoload.php');
+
+$session = Session::requireLogin([])->setReadOnly();
+if($session->userGrade < 6){
+    Json::die([
+        'result'=>false,
+        'reason'=>'관리자 아님'
+    ]);
+}
+
+$servHost = Util::getReq('serv_host');
+$sharedIconPath = Util::getReq('shared_icon_path');
+$gameImagePath = Util::getReq('game_image_path');
+
+if($servHost){
+    if(!$sharedIconPath || $gameImagePath){
+        Json::die([
+            'result'=>false,
+            'reason'=>'serv_host가 지정된 경우, sharedIconPath와 gameImagePath가 모두 지정되어야합니다.'
+        ]);
+    }
+
+    $sharedIconPath = WebUtil::resolveRelativePath($sharedIconPath, $servHost);
+    $gameImagePath = WebUtil::resolveRelativePath($gameImagePath, $servHost);
+
+    $result = Util::generateFileUsingSimpleTemplate(
+        __dir__.'/templates/ServConfig.orig.php',
+        ROOT.'/d_setting/ServConfig.php',
+        [
+            'serverBasePath'=>$servHost,
+            'sharedIconPath'=>$sharedIconPath,
+            'gameImagePath'=>$gameImagePath
+        ],
+        true
+    );
+
+    if ($result !== true) {
+        Json::die([
+            'result'=>false,
+            'reason'=>$result
+        ]);
+    }
+}
+else if($sharedIconPath || $gameImagePath){
+    $servHost = ServConfig::$serverWebPath;
+    if($sharedIconPath){
+        $sharedIconPath = WebUtil::resolveRelativePath($sharedIconPath, $servHost);
+    }
+    else{
+        $sharedIconPath = ServConfig::$sharedIconPath;
+    }
+
+    if($gameImagePath){
+        $gameImagePath = WebUtil::resolveRelativePath($gameImagePath, $servHost);
+    }
+    else{
+        $gameImagePath = ServConfig::$gameImagePath;
+    }
+
+    $result = Util::generateFileUsingSimpleTemplate(
+        __dir__.'/templates/ServConfig.orig.php',
+        ROOT.'/d_setting/ServConfig.php',
+        [
+            'serverBasePath'=>$servHost,
+            'sharedIconPath'=>$sharedIconPath,
+            'gameImagePath'=>$gameImagePath
+        ],
+        true
+    );
+
+    if ($result !== true) {
+        Json::die([
+            'result'=>false,
+            'reason'=>$result
+        ]);
+    }
+}
+else{
+    $servHost = ServConfig::$serverWebPath;
+    $sharedIconPath = ServConfig::$sharedIconPath;
+    $gameImagePath = ServConfig::$gameImagePath;
+}
+
+
+
+$result = Util::generateFileUsingSimpleTemplate(
+    __dir__.'/templates/common_path.orig.js',
+    ROOT.'/d_shared/common_path.js',
+    [
+        'serverBasePath'=>$servHost,
+        'sharedIconPath'=>$sharedIconPath,
+        'gameImagePath'=>$gameImagePath
+    ],
+    true
+);
+
+
+$result = Util::generateFileUsingSimpleTemplate(
+    __dir__.'/templates/common.orig.css',
+    ROOT.'/d_shared/common.css',
+    [
+        'serverBasePath'=>$servHost,
+        'sharedIconPath'=>$sharedIconPath,
+        'gameImagePath'=>$gameImagePath
+    ],
+    true
+);
+
+if ($result !== true) {
+    Json::die([
+        'result'=>false,
+        'reason'=>$result
+    ]);
+}

f_install/sql/err_log.sql

@@ -3,7 +3,9 @@ CREATE TABLE IF NOT EXISTS `err_log` (
 	`date`	TEXT NOT NULL,
 	`err`	TEXT NOT NULL,
 	`errstr`	TEXT NOT NULL,
-	`trace`	TEXT NOT NULL
+	`errpath`  TEXT NOT NULL,
+	`trace`	TEXT NOT NULL,
+	`webuser`  TEXT NULL
 );
 CREATE INDEX IF NOT EXISTS `date` ON `err_log` (
 	`date`	DESC

f_install/templates/ServConfig.orig.php

@@ -10,6 +10,8 @@ class ServConfig
     public static $serverWebPath = '_tK_serverBasePath_';
     public static $sharedIconPath = '_tK_sharedIconPath_';
     public static $gameImagePath = "_tK_gameImagePath_";
+    public static $imageRequestPath = "_tK_imageRequestPath_";
+    public static $imageRequestKey = '_tK_imageRequestKey_';
 
     public static function getSharedIconPath(string $filepath='') : string
     {
@@ -32,6 +34,13 @@ class ServConfig
         return static::$gameImagePath;
     }
 
+    public static function getImagePullURI() : string
+    {
+        $now = time();
+        $req_hash = Util::hashPassword(sprintf("%016x",$now), static::$imageRequestKey);
+        return static::$imageRequestPath."?req={$req_hash}&time={$now}";
+    }
+
 
     /**
      * 서버 주소 반환. 서버의 경로가 하부 디렉토리인 경우에 하부 디렉토리까지 포함

f_install/templates/common.orig.css

@@ -88,6 +88,59 @@
     background-size: 700px 500px;
 }
 
+
+/*미니체 지도*/
+.map_theme_miniche_b.map_spring .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_spring.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b.map_summer .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_summer.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b.map_fall .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_fall.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b.map_winter .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_winter.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b .map_bgroad{
+    background: url('_tK_gameImagePath_/map/che/miniche_road.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+/*미니체 지도*/
+.map_theme_miniche_clean.map_spring .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_spring.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_summer .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_summer.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_fall .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_fall.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_winter .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_winter.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean .map_bgroad{
+    background: url('_tK_gameImagePath_/map/che/miniche_road.png') no-repeat;
+    background-size: 700px 500px;
+}
+
 /*루드라사움 지도*/
 .map_theme_ludo_rathowm .map_bglayer1{
     background: url('_tK_gameImagePath_/map/ludo_rathowm/back.jpg') no-repeat;
@@ -99,28 +152,21 @@
     background-size: 700px 500px;
 }
 
-.map_theme_ludo_rathowm.map_detail.map_spring .map_title_text{
-    background:
-        url('_tK_gameImagePath_/spring.gif') no-repeat right;
-}
-
-.map_theme_ludo_rathowm.map_detail.map_summer .map_title_text{
-    background:
-        url('_tK_gameImagePath_/summer.gif') no-repeat right;
-}
-
-.map_theme_ludo_rathowm.map_detail.map_fall .map_title_text{
-    background:
-        url('_tK_gameImagePath_/fall.gif') no-repeat right;
-}
-
-.map_theme_ludo_rathowm.map_detail.map_winter .map_title_text{
-    background:
-        url('_tK_gameImagePath_/winter.gif') no-repeat right;
-}
-
 .world_map.map_theme_ludo_rathowm .map_title .map_title_text::before {
     color:white;
     content:'LP';
     margin-right:1ch;
-}
+}
+
+/*체스판 지도*/
+.map_theme_chess .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/chess/chessboard.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+
+/*포켓몬 v1 지도*/
+.map_theme_pokemon_v1 .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/pokemon_v1/back_pal8.png') no-repeat;
+    background-size: 700px 500px;
+}

hwe/_119_b.php

@@ -40,10 +40,10 @@ case "분당김":
     $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
 
     $db->update('general', [
-        'turntime'=>$db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
+        'turntime'=>$db->sqleval('DATE_SUB(turntime, INTERVAL %i MINUTE)', $minute)
     ], true);
     $db->update('auction', [
-        'expire'=>$db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute)
+        'expire'=>$db->sqleval('DATE_SUB(expire, INTERVAL %i MINUTE)', $minute)
     ], true);
     break;
 case "분지연":
@@ -87,4 +87,4 @@ case "락풀기":
     break;
 }
 
-header('Location:_119.php');
+header('Location:_119.php', true, 303);

hwe/_admin_force_rehall.php

@@ -0,0 +1,25 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+
+if($session->userGrade < 5) {
+    die('권한 부족');
+}
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+if(!$gameStor->isunited){
+    die('아직 천통하지 않았습니다');
+}
+
+foreach($db->queryFirstColumn(
+    'SELECT no FROM general WHERE npc != 0 and age >= %i',
+    GameConst::$retirementYear
+) as $generalNo){
+    CheckHall($generalNo);
+}

hwe/a_bestGeneral.php

@@ -49,6 +49,12 @@ increaseRefresh("명장일람", 1);
 <div style="margin:auto;width=1000px;">
 <?php
 
+$ownerNameList = [];
+if($gameStor->isunited){
+    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
 
 $nationName = [0=>'재야'];
 $nationColor = [0=>'#000000'];
@@ -60,8 +66,11 @@ foreach (getAllNationStaticInfo() as $nation) {
 $types = [
     ["명 성", "int", function($v){$v['value'] = $v['experience']; return $v; }],
     ["계 급", "int", function($v){$v['value'] = $v['dedication']; return $v; }],
-    ["계 략 성 공", "int", function($v){
+    ["계 략 성 공", "int", function($v) use ($gameStor){
         $v['value'] = $v['firenum'];
+        if($gameStor->isunited){
+            return $v;
+        }
         $v['nationName'] = '???';
         $v['pictureFullPath'] = GetImageURL(0)."/default.jpg";
         $v['name'] = '???'; 
@@ -166,7 +175,7 @@ $generals = array_map(function($general) use($nationColor, $nationName) {
 
     return $general;
 }, $db->query(
-    "SELECT nation,no,name,name2 as owner_name, picture, imgsvr, 
+    "SELECT nation,no,name,name2 as owner_name, owner, picture, imgsvr, 
     experience, dedication, firenum, warnum, killnum, killcrew, deathcrew, 
     dex0, dex10, dex20, dex30, dex40, 
     ttw, ttd, ttl, tlw, tld, tll, tpw, tpd, tpl, tiw, tid, til,
@@ -179,7 +188,8 @@ $templates = new \League\Plates\Engine('templates');
 
 foreach($types as $idx=>[$typeName, $typeValue, $typeFunc]){
     $validCnt = 0;
-    $typeGenerals = array_map(function($general) use($typeValue, $typeFunc, &$validCnt){
+    $typeGenerals = array_map(function($general) use($typeValue, $typeFunc, &$validCnt, $ownerNameList){
+        $general['owner_name'] = $ownerNameList[$general['owner']]??null;
         $general = ($typeFunc)($general);
         $value = $general['value'];
 

hwe/a_emperior.php

@@ -98,11 +98,21 @@ foreach($emperiors as $emperior){
         <td align=center><?=$emperior['l12name']?></td>
         <td id=bg1 align=center>승 상</td>
         <td align=center><?=$emperior['l11name']?></td>
-        <td id=bg1 align=center>위 장 군</td>
+        <td id=bg1 align=center>표 기 장 군</td>
         <td align=center><?=$emperior['l10name']?></td>
         <td id=bg1 align=center>사 공</td>
         <td align=center><?=$emperior['l9name']?></td>
     </tr>
+    <tr>
+        <td id=bg1 align=center>거 기 장 군</td>
+        <td align=center><?=$emperior['l8name']?></td>
+        <td id=bg1 align=center>태 위</td>
+        <td align=center><?=$emperior['l7name']?></td>
+        <td id=bg1 align=center>위 장 군</td>
+        <td align=center><?=$emperior['l6name']?></td>
+        <td id=bg1 align=center>사 도</td>
+        <td align=center><?=$emperior['l5name']?></td>
+    </tr>
 </table>
 
 

hwe/a_genList.php

@@ -30,6 +30,13 @@ if ($type <= 0 || $type > 15) {
     $type = 9;
 }
 
+$ownerNameList = [];
+if($gameStor->isunited){
+    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -82,26 +89,26 @@ foreach (getAllNationStaticInfo() as $nation) {
     $nationlevel[$nation['nation']] = $nation['level'];
 }
 
-switch ($type) { //FIXME:  $query 처리 조심.
-    case  1: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by nation"; break;
-    case  2: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by leader desc"; break;
-    case  3: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by power desc"; break;
-    case  4: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by intel desc"; break;
-    case  5: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
-    case  6: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by dedication desc"; break;
-    case  7: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by level desc"; break;
-    case  8: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by killturn"; break;
-    default:
-    case  9: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by connect desc"; break;
-    case 10: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
-    case 11: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by personal"; break;
-    case 12: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special desc"; break;
-    case 13: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special2 desc"; break;
-    case 14: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by age desc"; break;
-    case 15: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by npc desc"; break;
-}
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$gencount = MYDB_num_rows($genresult);
+
+[$orderKey, $orderDesc] = [
+    1=>['nation', false],
+    2=>['leader', true],
+    3=>['power', true],
+    4=>['intel', true],
+    5=>['experience', true],
+    6=>['dedication', true],
+    7=>['level', true],
+    8=>['killturn', false],
+    9=>['connect', true],
+    10=>['experience', true],
+    11=>['personal', true],
+    12=>['special', true],
+    13=>['special2', true],
+    14=>['age', true],
+    15=>['npc', true],
+][$type];
+
+$generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by %b %l', $orderKey, $orderDesc?'desc':'');
 
 echo"
 <table align=center width=1000 class='tb_layout bg0'>
@@ -122,8 +129,7 @@ echo"
         <td width=45 align=center id=bg1>삭턴</td>
         <td width=70 align=center id=bg1>벌점</td>
     </tr>";
-for ($j=0; $j < $gencount; $j++) {
-    $general = MYDB_fetch_array($genresult);
+foreach($generalList as $general){
     $nation = $nationname[$general['nation']];
 
     if ($general['level'] == 12) {
@@ -152,6 +158,8 @@ for ($j=0; $j < $gencount; $j++) {
         $intel = "{$general['intel']}";
     }
 
+    
+
     if ($general['npc'] >= 2) {
         $name = "<font color=cyan>{$general['name']}</font>";
     } elseif ($general['npc'] == 1) {
@@ -160,6 +168,10 @@ for ($j=0; $j < $gencount; $j++) {
         $name =  "{$general['name']}";
     }
 
+    if(key_exists($general['owner'], $ownerNameList)){
+        $name = $name.'<br><small>('.$ownerNameList[$general['owner']].')</small>';
+    }
+
     $general['connect'] = Util::round($general['connect'] / 10) * 10;
 
     $imageTemp = GetImageURL($general['imgsvr']);

hwe/a_hallOfFame.php

@@ -5,26 +5,34 @@ include "lib.php";
 include "func.php";
 
 $session = Session::getInstance()->setReadOnly();
+$seasonIdx = Util::getReq('seasonIdx', 'int', UniqueConst::$seasonIdx);
 $scenarioIdx = Util::getReq('scenarioIdx', 'int', null);
 
 $db = DB::db();
 
 increaseRefresh("명예의전당", 1);
 
-$scenarioList= [];
-foreach($db->query('SELECT scenario_name as name, count(scenario) as cnt, scenario from ng_games group by scenario order by scenario asc') as $scenarioInfo){
-    $scenarioList[$scenarioInfo['scenario']] = $scenarioInfo;
-}
-
-
+$scenarioList = (function(){
+    $db = DB::db();
+    $scenarioList= [];
+    foreach($db->query('SELECT season, scenario_name as name, count(scenario) as cnt, scenario from ng_games group by season, scenario order by season desc, scenario asc') as $scenarioInfo){
+        $seasonIdx = $scenarioInfo['season'];
+        $scenarioIdx = $scenarioInfo['scenario'];
+        if(!key_exists($seasonIdx, $scenarioList)){
+            $scenarioList[$seasonIdx] = [];
+        }
+        $scenarioList[$seasonIdx][$scenarioIdx] = $scenarioInfo;
+    }
+    return $scenarioList;
+})();
 
 if($scenarioIdx !== null || key_exists($scenarioIdx, $scenarioList)){
-    $searchScenarioName = $scenarioList[$scenarioIdx]['name'];
-    $searchFilter = $db->sqleval('scenario = %i', $scenarioIdx);
+    $searchScenarioName = $scenarioList[$seasonIdx][$scenarioIdx]['name'];
+    $searchFilter = $db->sqleval('season = %i AND scenario = %i', $seasonIdx, $scenarioIdx);
 }
 else{
     $searchScenarioName = '* 모두 *';
-    $searchFilter = $db->sqleval(true);
+    $searchFilter = $db->sqleval('season = %i', $seasonIdx);
 }
 
 ?>
@@ -53,14 +61,20 @@ else{
     <tr><td>명 예 의 전 당<br><?=closeButton()?></td></tr>
     <tr><td>
 시나리오 검색 : <select id="by_scenario" name="by_scenario">
-    <option value="" <?=$scenarioIdx?"selected='selected'":''?>>* 종합 *</option>
-<?php foreach($scenarioList as $info): ?>
-    <option
-        value="<?=$info['scenario']?>"
-        <?=($info['scenario']===$scenarioIdx)?"selected='selected'":''?>
-    ><?=$info['name']?>(<?=$info['cnt']?>회)</option>
+<?php foreach($scenarioList as $iterSeasonIdx=>$subScenarioList): ?>
+    <option 
+        data-season="<?=$iterSeasonIdx?>" 
+        value="" 
+        <?=($iterSeasonIdx == $seasonIdx && $scenarioIdx === null)?"selected='selected'":''?>
+    >* 시즌 : <?=$iterSeasonIdx?> 종합 *</option>
+    <?php foreach($subScenarioList as $info): ?>
+        <option
+        data-season="<?=$iterSeasonIdx?>" 
+            value="<?=$info['scenario']?>"
+            <?=($iterSeasonIdx == $seasonIdx && $info['scenario']===$scenarioIdx)?"selected='selected'":''?>
+        ><?=$info['name']?>(<?=$info['cnt']?>회)</option>
+    <?php endforeach; ?>
 <?php endforeach; ?>
-?>
 </select>
 </td></tr>
 </table>
@@ -92,12 +106,22 @@ $types = [
 
 $templates = new \League\Plates\Engine('templates');
 
+$ownerNameList = [];
+foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+    $ownerNameList[$ownerID] = $ownerName;
+}
+
 foreach($types as $idx=>[$typeName, $typeValue]) {
     $hallResult = $db->query('SELECT * FROM ng_hall WHERE `type`=%i AND %? ORDER BY `value` DESC LIMIT 10', $idx, $searchFilter);
 
-    $hallResult = array_map(function($general)use($typeValue){
+    $hallResult = array_map(function($general)use($typeValue, $ownerNameList){
         $aux = Json::decode($general['aux']);
         $general += $aux;
+
+        if(key_exists($general['owner'], $ownerNameList)){
+            $general['owner_name'] = $ownerNameList[$general['owner']];
+        }
+
         if(!key_exists('bgColor', $general)){
             if(!key_exists('color', $general)){
                 $general['bgColor'] = GameConst::$basecolor4;

hwe/a_history.php

@@ -86,6 +86,8 @@ if ($month <= 0) {
     $month += 12;
 }
 
+$history = $db->queryFirstRow('SELECT log,genlog,nation,power,gen,city FROM history WHERE server_id = %s AND year = %i AND month = %i', $serverID, $year, $month);
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -101,12 +103,19 @@ if ($month <= 0) {
 <?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJS("js/map/theme_{$mapTheme}.js")?>
 <?=WebUtil::printJS('js/map.js')?>
-
+<?=WebUtil::printJS('js/history.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/map.css')?>
-
+<script>
+var startYear = <?=$s_year?>;
+var startMonth = <?=$s_month?>;
+var lastYear = <?=$e_year?>;
+var lastMonth = <?=$e_month?>;
+var selectYear = <?=$year?>;
+var selectMonth = <?=$month?>;
+</script>
 </head>
 
 <body>
@@ -116,22 +125,9 @@ if ($month <= 0) {
         <form name=form1 method=post>
         년월 선택 :
         <input type=submit name=btn value="◀◀ 이전달">
-        <select name=yearmonth size=1>
-<?php
-$dates = $db->queryAllLists('SELECT year, month FROM history WHERE server_id = %s ORDER BY year ASC, month ASC', $serverID);
-foreach($dates as [$hYear, $hMonth]){
-    $value = "".$hYear.StringUtil::padStringAlignRight($hMonth, 2, "0");
-    if ($hYear == $year && $hMonth == $month) {
-        echo "
-            <option selected value={$value}>{$hYear}년 {$hMonth}월</option>";
-    } else {
-        echo "
-            <option value={$value}>{$hYear}년 {$hMonth}월</option>";
-    }
-}
-
-$history = $db->queryFirstRow('SELECT log,genlog,nation,power,gen,city FROM history WHERE server_id = %s AND year = %i AND month = %i', $serverID, $year, $month);
-?>
+        <select id='yearmonth' name=yearmonth size=1>
+            <option selected='selected'><?=$year?>년 <?=$month?>월</option>
+            <option><?=$e_year?>년 12월</option>
         </select>
         <input type=submit name=btn value='조회하기'>
         <input type=submit name=btn value="다음달 ▶▶">

hwe/a_kingdomList.php

@@ -130,6 +130,19 @@ for($i=1; $i <= $count; $i++) {
     elseif($level5['npc'] == 1) { $l5 = "<font color=skyblue>{$level5['name']}</font>"; }
     else { $l5 = $level5['name']; }
 
+    $generals = $db->query('SELECT no,nation,npc,name,level,penalty,permission FROM general WHERE nation=%i ORDER BY no ASC', $nation['nation']);
+    $ambassadors = [];
+    $auditors = [];
+    foreach($generals as $general){
+        $generalPermission = checkSecretPermission($general, false);
+        if($generalPermission == 4){
+            $ambassadors[] = $general['name'];
+        }
+        else if($generalPermission == 3){
+            $auditors[] = $general['name'];
+        }
+    }
+
     echo "
 <table align=center width=1000 class='tb_layout bg2'>
     <tr>
@@ -143,7 +156,7 @@ for($i=1; $i <= $count; $i++) {
         <td width=80 align=center id=bg1>국 력</td>
         <td width=170 align=center>{$nation['power']}</td>
         <td width=80 align=center id=bg1>장수 / 속령</td>
-        <td width=170 align=center>{$gencount} / {$citycount}</td>
+        <td width=170 align=center>".count($generals)." / {$citycount}</td>
     </tr>
     <tr>
         <td align=center id=bg1>".getLevel(12, $nation['level'])."</td>
@@ -165,6 +178,12 @@ for($i=1; $i <= $count; $i++) {
         <td align=center id=bg1>".getLevel( 5, $nation['level'])."</td>
         <td align=center>$l5</td>
     </tr>
+    <tr>
+        <td align=center id=bg1>외교권자</td><td colspan=5>";
+    echo join(', ', $ambassadors);
+    echo "</td><td align=center id=bg1>조언자</td><td align=center >";
+    echo count($auditors).'명';
+    echo "</td></tr>
     <tr>
         <td colspan=8>";
     if($nation['level'] > 0) {
@@ -190,8 +209,7 @@ for($i=1; $i <= $count; $i++) {
     </tr>
     <tr>
         <td colspan=8> 장수 일람 : ";
-    for($j=0; $j < $gencount; $j++) {
-        $general = MYDB_fetch_array($genresult);
+    foreach($generals as $general){
         if($general['npc'] >= 2) { echo "<font color=cyan>{$general['name']}</font>, "; }
         elseif($general['npc'] == 1) { echo "<font color=skyblue>{$general['name']}</font>, "; }
         else { echo "{$general['name']}, "; }

hwe/b_battleCenter.php

@@ -33,7 +33,7 @@ $query = "select nation from general where no='$gen'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $general = MYDB_fetch_array($result);
 
-$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
+$query = "select no,nation,level,con,turntime,belong,permission,penalty from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
@@ -161,7 +161,7 @@ for ($i=0; $i < $gencount; $i++) {
             <?=getBatResRecent($gen, 24)?>
         </td>
     </tr>
-<?php if($npc > 1 || $meLevel >= 5): ?>
+<?php if($npc > 1 || $permission >= 2): ?>
     <tr>
         <td align=center id=bg1><font color=orange size=3>개인 기록</font></td>
         <td align=center id=bg1><font color=orange size=3>&nbsp;</font></td>

hwe/b_chiefcenter.php

@@ -13,7 +13,7 @@ $connect=$db->get();
 
 increaseRefresh("사령부", 1);
 
-$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
+$query = "select no,nation,level,con,turntime,belong,permission,penalty from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
 

hwe/b_currentCity.php

@@ -282,6 +282,7 @@ for($j=0; $j < $gencount; $j++) {
     
     $generalsFormat[] = [
         'ourGeneral'=>$ourGeneral,
+        'iconPath'=>GetImageURL($general['imgsvr']).'/'.$general['picture'],
         'isNPC'=>$isNPC,
         'wounded'=>$wounded,
         'name'=>$name,

hwe/b_dipcenter.php

@@ -13,7 +13,7 @@ $connect=$db->get();
 
 increaseRefresh("내무부", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, level, con, turntime, belong FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no, nation, level, con, turntime, belong, permission, penalty FROM general WHERE owner=%i', $userID);
 
 $nation = $db->queryFirstRow('SELECT msg, scoutmsg FROM nation WHERE nation = %i', $me['nation']);
 
@@ -85,7 +85,6 @@ var scoutmsg = <?=Json::encode($nation['scoutmsg']??'')?>;
         <td width=80  align=center class=bg1>상태</td>
         <td width=60  align=center class=bg1>기간</td>
         <td width=100 align=center class=bg1>종 료 시 점</td>
-        <td align=center class=bg1>비 고</td>
     </tr>
 <?php
 $admin = $gameStor->getValues(['year','month']);

hwe/b_genList.php

@@ -19,7 +19,7 @@ $connect=$db->get();
 
 increaseRefresh("암행부", 1);
 
-$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
+$query = "select no,nation,level,con,turntime,belong,permission,penalty from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 

hwe/b_myBossInfo.php

@@ -35,8 +35,12 @@ if($meLevel == 0) {
 <title><?=UniqueConst::$serverName?>: 인사부</title>
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
 <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('../e_lib/select2/select2.full.min.js')?>
 <?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/bossInfo.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+<?=WebUtil::printCSS('../e_lib/select2/select2.min.css')?>
+<?=WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <script type="text/javascript">
@@ -45,6 +49,51 @@ function out() {
 }
 </script>
 
+<?php 
+
+$query = "select nation,name,level,color,l12set,l11set,l10set,l9set,l8set,l7set,l6set,l5set from nation where nation='{$me['nation']}'";
+$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+$nation = MYDB_fetch_array($result);   //국가정보
+
+$ambassadors = $db->query('SELECT no, name, level, penalty, permission FROM general WHERE permission = \'ambassador\' AND nation = %i', $nation['nation']);
+$auditors = $db->query('SELECT no, name, level, penalty, permission FROM general WHERE permission = \'auditor\' AND nation = %i', $nation['nation']);
+$candidateAmbassadors = [];
+$candidateAuditors = [];
+foreach($ambassadors as $ambassador){
+    $candidateAmbassadors[] = $ambassador;
+}
+foreach($auditors as $auditor){
+    $candidateAuditors[] = $auditor;
+}
+foreach($db->query('SELECT no, name, nation, level, penalty, permission FROM general WHERE nation = %i AND permission = \'normal\' AND level != 12', $nation['nation']) as $candidate){
+    $maxPermission = checkSecretMaxPermission($candidate);
+    if($maxPermission == 4){
+        $candidateAmbassadors[] = $candidate;
+    }
+    if($maxPermission >= 3){
+        $candidateAuditors[] = $candidate;
+    }
+}
+
+?>
+<script>
+var candidateAmbassadors = <?=Json::encode(array_map(function($value){
+    return [
+        'id'=>$value['no'],
+        'text'=>$value['name'],
+        "selected"=>($value['permission']!='normal')
+    ];
+}, $candidateAmbassadors))?>;
+
+var candidateAuditors = <?=Json::encode(array_map(function($value){
+    return [
+        'id'=>$value['no'],
+        'text'=>$value['name'],
+        "selected"=>($value['permission']!='normal')
+    ];
+}, $candidateAuditors))?>;
+</script>
+
 </head>
 
 <body>
@@ -55,10 +104,6 @@ function out() {
 
 <?php
 
-$query = "select nation,name,level,color,l12set,l11set,l10set,l9set,l8set,l7set,l6set,l5set from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$nation = MYDB_fetch_array($result);   //국가정보
-
 $lv = getNationChiefLevel($nation['level']);
 if($meLevel >= 5) { $btn = "submit"; }
 else { $btn = "hidden"; }
@@ -77,6 +122,7 @@ $tigerresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connec
 $query = "select name,picture,firenum from general where nation='{$nation['nation']}' order by firenum desc limit 7";   // 건안칠자
 $eagleresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
+
 echo "
 <table align=center width=1000 class='tb_layout bg0'>
     <tr>
@@ -279,9 +325,35 @@ for($i=10; $i >= $lv; $i--) {
 echo "
     <tr><td colspan=4>※ <font color=red>빨간색</font>은 현재 임명중인 장수, <font color=orange>노란색</font>은 다른 관직에 임명된 장수, 하얀색은 일반 장수를 뜻합니다.</td></tr>
 </table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td colspan=5 height=5></td></tr>
+
 ";
+
+if($meLevel == 12):
+?>
+<table align='center' width='1000' class='tb_layout bg0'>
+    <tr><td colspan='4' height='5'></td></tr>
+<tr><td colspan='4' align='center' bgcolor='purple'>외 교 권 자 임 명</td></tr>
+    <tr>
+        <td width=98  align=right id=bg1>외교권자</td>
+        <td width=398>
+<select id="selectAmbassador" multiple="multiple">
+</select>
+    <button id='changeAmbassador' type='button'>임명</button>
+        </td>
+        <td width=98  align=right id=bg1>조언자</td>
+        <td width=398>
+<select id="selectAuditor" multiple="multiple">
+</select>
+        <button id='changeAuditor' type='button'>임명</button>
+        </td>
+    </tr>
+</table>
+<?php
+endif;
+?>
+<table align=center width=1000 id='officer_list' class='tb_layout bg0'>
+    <tr><td colspan=5 height=5></td></tr>
+<?php
 if($meLevel >= 5) {
     echo "
     <tr><td colspan=5 align=center bgcolor=orange>도 시 관 직 임 명</td></tr>
@@ -395,7 +467,7 @@ if($meLevel >= 5) {
 </form>
 <form method=post action=c_myBossInfo.php>
     <tr>
-        <td colspan=3 align=right id=bg2>시 중 임 명</td>
+        <td colspan=3 align=right id=bg2>종 사 임 명</td>
         <td colspan=2>
             <select name=citylist size=1 style=color:white;background-color:black;>
     ";
@@ -455,7 +527,7 @@ echo "
         <td width=158 align=center id=bg1 colspan=2><font size=4>도 시</font></td>
         <td width=278 align=center id=bg1><font size=4>태 수 (사관) 【현재도시】</font></td>
         <td width=278 align=center id=bg1><font size=4>군 사 (사관) 【현재도시】</font></td>
-        <td width=278 align=center id=bg1><font size=4>시 중 (사관) 【현재도시】</font></td>
+        <td width=278 align=center id=bg1><font size=4>종 사 (사관) 【현재도시】</font></td>
     </tr>
 ";
 

hwe/b_myGenInfo.php

@@ -14,6 +14,7 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("세력장수", 1);
@@ -29,6 +30,14 @@ if($me['level'] == 0) {
 
 $sel = [$type => "selected"];
 
+$ownerNameList = [];
+if($gameStor->isunited){
+    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
+
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -74,48 +83,26 @@ $sel = [$type => "selected"];
 <?php
 
 $nationLevel = DB::db()->queryFirstField('select level from nation where nation = %i', $me['nation']);
-$orderByText = '';//FIXME: 쿼리 재작성
-switch($type) {
-    case  1: $orderByText = " order by level desc"; break;
-    case  2: $orderByText = " order by dedication desc"; break;
-    case  3: $orderByText = " order by experience desc"; break;
-    case  4: $orderByText = " order by leader desc"; break;
-    case  5: $orderByText = " order by power desc"; break;
-    case  6: $orderByText = " order by intel desc"; break;
-    case  7: $orderByText = " order by gold desc"; break;
-    case  8: $orderByText = " order by rice desc"; break;
-    case  9: $orderByText = " order by crew desc"; break;
-    case 10: $orderByText = " order by connect desc"; break;
-    case 11: $orderByText = " order by personal"; break;
-    case 12: $orderByText = " order by special desc"; break;
-    case 13: $orderByText = " order by special2 desc"; break;
-    case 14: $orderByText = " order by belong desc"; break;
-    case 15: $orderByText = " order by npc desc"; break;
-}
-$query = 
-    "select 
-        npc,
-        special,
-        special2,
-        personal,
-        picture,
-        imgsvr,
-        name,
-        level,
-        dedication,
-        experience,
-        injury,
-        leader,
-        power,
-        intel,
-        gold,
-        rice,
-        belong,
-        connect,
-        killturn
-    from general where nation='{$me['nation']}' ".$orderByText;
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($genresult);
+
+[$orderKey, $orderDesc] = [
+    1=>['level', true],
+    2=>['dedication', true],
+    3=>['experience', true],
+    4=>['leader', true],
+    5=>['power', true],
+    6=>['intel', true],
+    7=>['gold', true],
+    8=>['rice', true],
+    9=>['crew', true],
+    10=>['connect', true],
+    11=>['personal', true],
+    12=>['special', true],
+    13=>['special2', true],
+    14=>['belong', true],
+    15=>['npc', true],
+][$type];
+
+$generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect,gold,rice,crew,belong from general where nation = %i order by %b %l', $me['nation'], $orderKey, $orderDesc?'desc':'');
 
 echo"
 <table align=center class='tb_layout bg0'>
@@ -136,8 +123,7 @@ echo"
         <td width=48 align=center id=bg1>사 관</td>
         <td width=70 align=center id=bg1>벌점</td>
     </tr>";
-for($j=0; $j < $gencount; $j++) {
-    $general = MYDB_fetch_array($genresult);
+foreach($generalList as $general){
 
     if($general['level'] == 12) {
         $lbonus = $nationLevel * 2;
@@ -169,6 +155,10 @@ for($j=0; $j < $gencount; $j++) {
     elseif($general['npc'] == 1) { $name = "<font color=skyblue>{$general['name']}</font>"; }
     else { $name =  "{$general['name']}"; }
 
+    if(key_exists($general['owner'], $ownerNameList)){
+        $name = $name.'<br><small>('.$ownerNameList[$general['owner']].')</small>';
+    }
+
     $imageTemp = GetImageURL($general['imgsvr']);
     echo "
     <tr>

hwe/b_myPage.php

@@ -18,21 +18,24 @@ if($tnmt < 0 || $tnmt > 1){
     $tnmt = 1;
 }
 
+$showDieImmediatelyBtn = false;
+$availableDieImmediately = false;
+
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
+$gameStor->cacheValues(['turnterm', 'opentime', 'turntime','autorun_user']);
 $connect=$db->get();
 
 increaseRefresh("내정보", 1);
 
-$query = "select no,npc,mode,tnmt,myset from general where owner='{$userID}'";
+$query = "select no,npc,mode,tnmt,myset,train,atmos,lastrefresh from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
-
 if ($me['myset'] > 0) {
     $submit = 'submit';
 } else {
@@ -46,13 +49,30 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
         $submit = 'hidden';
     }
 
-    $me['myset'] -= 1;
+    if($mode == 0){
+        $db->update('general', [
+            'myset'=>$db->sqleval('myset-1'),
+            'mode'=>$mode,
+            'train'=>max(0, $me['train'] - 3),
+            'atmos'=>max(0, $me['atmos'] - 3),
+        ], 'owner=%i AND mode!=%i', $userID, $mode);
+    }
+    else{
+        $db->update('general', [
+            'myset'=>$db->sqleval('myset-1'),
+            'mode'=>$mode
+        ], 'owner=%i AND mode!=%i', $userID, $mode);
+    }
 
-    $db->update('general', [
-        'myset'=>$db->sqleval('myset-1'),
-        'mode'=>$mode,
-        'tnmt'=>$tnmt
-    ], 'owner=%i', $userID);
+    if($db->affectedRows()){
+        $me['myset'] -= 1;
+    }
+
+    if($me['tnmt'] != $tnmt){
+        $db->update('general', [
+            'tnmt'=>$tnmt
+        ], 'owner=%i', $userID);
+    }
 
     $me['mode'] = $mode;
     $me['tnmt'] = $tnmt;
@@ -74,6 +94,16 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
     }
 }
 
+if($gameStor->turntime <= $gameStor->opentime){
+    //서버 가오픈시 할 수 있는 행동
+
+    if($me['npc'] == 0){
+        $showDieImmediatelyBtn = true;
+        if(addTurn($me['lastrefresh'], $gameStor->turnterm, 2) <= TimeUtil::DatetimeNow()){
+            $availableDieImmediately = true;
+        }
+    }
+}
 ?>
 <!DOCTYPE html>
 <html>
@@ -89,7 +119,21 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
+<script>
+var availableDieImmediately = <?=$availableDieImmediately?'true':'false'?>;
+jQuery(function($){
 
+$('#die_immediately').click(function(){
+    if(!availableDieImmediately){
+        alert('삭제를 위해서는 생성 후 2턴 가량의 시간이 필요합니다.');
+        location.reload();
+        return false;
+    }
+    return confirm('정말로 삭제하시겠습니까?');
+});
+
+});
+</script>
 </head>
 
 <body>
@@ -117,10 +161,18 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
                 <input type=<?=$submit?> name=btn style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px; value=설정저장><br>
                 ∞<font color=orange>설정저장은 이달중 <?=$me['myset']?>회 남았습니다.</font><br><br>
             </form>
+            <?php if(!($gameStor->autorun_user['limit_minutes']??false)): ?>
             휴 가 신 청<br>
             <a href="c_vacation.php"><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>휴가 신청</button></a><br><br>
+            <?php endif; ?>
             <!--빙의 해제용 삭턴 조절<br>
             <a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>빙의 해체 요청</button></a>-->
+
+<?php if($showDieImmediatelyBtn): ?>
+            가오픈 기간 내 장수 삭제<br>
+            <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; ?>
+
             개인용 CSS<br>
             <textarea id='custom_css' style='color:white;background-color:black;width:420px;height:150px;'></textarea>
         </td>

hwe/b_troop.php

@@ -81,6 +81,48 @@ uasort($troops, function($lhs, $rhs){
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/troops.css')?>
+<script>
+jQuery(function($){
+
+$('#form1').submit(function(){
+    return false;
+});
+$('#leaveTroop').click(function(e){
+    return confirm("정말 부대를 탈퇴하시겠습니까?");
+})
+$('.submitBtn').click(function(event){
+    if(event.isPropagationStopped()){
+        return false;
+    }
+    console.log('b');
+    var $this=$(this);
+
+    $.post({
+        url:'j_troop.php',
+        dataType:'json',
+        data:{
+            action:$this.val().replace(/\s/g, ''),
+            troop:$('input.troopId:checked').val(),
+            name:$('#troopName').val(),
+            gen:$('#genNo').val()
+        }
+    }).then(function(data){
+        console.log(data);
+        if(!data.result){
+            alert(data.reason);
+            location.reload();
+        }
+
+        location.reload();
+
+    }, function(){
+        alert('알 수 없는 에러가 발생했습니다.');
+    });
+    return false;
+});
+
+});
+</script>
 </head>
 
 <body>
@@ -88,7 +130,7 @@ uasort($troops, function($lhs, $rhs){
 <table width=1000 class='tb_layout bg0'>
     <tr><td>부 대 편 성<br><?=backButton()?></td></tr>
 </table>
-<form name=form1 method=post action=c_troop.php>
+<form id=form1 name=form1 method=post>
 <table id="troop_list" class='tb_layout bg0'>
     <thead>
     <tr>
@@ -102,9 +144,9 @@ uasort($troops, function($lhs, $rhs){
     <tfoot><tr><td colspan='5'>
     <?php if(!$troops): ?>
     <?php elseif($me['troop'] == 0): ?>
-        <input type=submit name=btn value='부 대 가 입'>
+        <input type=submit class='submitBtn' value='부 대 가 입'>
     <?php else: ?>
-        <input type=submit name=btn value='부 대 탈 퇴' onclick='return confirm("정말 부대를 탈퇴하시겠습니까?")'>
+        <input type=submit id="leaveTroop" class='submitBtn' value='부 대 탈 퇴'>
     <?php endif;?>
     </td></tr></tfoot>
     <tbody>
@@ -133,7 +175,7 @@ foreach ($troops as $troopNo=>$troop) {
 
 <?php if ($me['troop'] == 0): ?>
     <tr>
-        <td align=center rowspan=2><input type='radio' name='troop' value='<?=$troop['troop']?>'></td>
+        <td align=center rowspan=2><input type='radio' class='troopId' name='troop' value='<?=$troop['troop']?>'></td>
         <td align=center><?=$troop['name']?><br>【 <?=$cityText?> 】</td>
         <td height=64 class='generalIcon' style='background:no-repeat center url("<?=$troopLeader['pictureFullPath']?>");background-size:64px;'>&nbsp;</td>
         <td rowspan=2 width=62><?=$genlistText?></td>
@@ -152,15 +194,15 @@ foreach ($troops as $troopNo=>$troop) {
         <td rowspan=2 width=62><?=$genlistText?></td>
         <td rowspan=2>
         <?php if ($me['no'] == $troopLeader['no']): ?>
-            <select name=gen size=3 style=color:white;background-color:black;font-size:13px;width:128px;>";
+            <select id='genNo' name=gen size=3 style=color:white;background-color:black;font-size:13px;width:128px;>";
                 <?php foreach ($troop['users'] as $troopUser): ?>
                     <?php if ($troopUser['no'] == $me['no']) {
         continue;
     } ?>
-                    <option value='<?=$troopUser['no']?>'><?=$troopUser['name']?></option>
+                    <option  value='<?=$troopUser['no']?>'><?=$troopUser['name']?></option>
                 <?php endforeach; ?>
             </select><br>
-            <input type=submit name=btn value='부 대 추 방' style=width:130px;height:25px;>
+            <input type=submit class='submitBtn' value='부 대 추 방' style=width:130px;height:25px;>
         <?php else: ?>
             <?=$troopLeader['turnText']?>
         <?php endif; ?>
@@ -181,11 +223,11 @@ foreach ($troops as $troopNo=>$troop) {
 <table width=1000 class='tb_layout bg0'>
     <tr>
         <td width=80 id=bg1>부 대 명</td>
-        <td width=130><input type=text style=color:white;background-color:black; size=18 maxlength=9 name=name></td>
+        <td width=130><input id='troopName' type=text style=color:white;background-color:black; size=18 maxlength=9 name=name></td>
     <?php if($me['troop'] == 0): ?>
-        <td><input type=submit name=btn value='부 대 창 설'></td>
+        <td><input type=submit class='submitBtn' value='부 대 창 설'></td>
     <?php else: ?>
-        <td><input type=submit name=btn value='부 대 변 경'></td>
+        <td><input type=submit class='submitBtn' value='부 대 변 경'></td>
     <?php endif; ?>
     </tr>
 </table>

hwe/c_die_immediately.php

@@ -0,0 +1,49 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+$availableDieImmediately = false;
+
+//로그인 검사
+$session = Session::requireGameLogin();
+$userID = Session::getUserID();
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$general = $db->queryFirstRow('SELECT no,name,name2,npc,lastrefresh FROM general WHERE owner=%i AND npc = 0', $userID);
+
+if(!$general){
+    header('location:b_myPage.php');
+    die();
+}
+
+increaseRefresh("장수 삭제", 1);
+$gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
+
+if($gameStor->turntime <= $gameStor->opentime){
+    //서버 가오픈시 할 수 있는 행동
+    if(addTurn($general['lastrefresh'], $gameStor->turnterm, 2) <= TimeUtil::DatetimeNow()){
+        $availableDieImmediately = true;
+    }
+}
+
+if(!$availableDieImmediately){
+    header('location:b_myPage.php');
+    die();
+}
+
+
+if(!$db->query('DELETE FROM general WHERE owner=%i AND npc=0', $userID)){
+    trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
+}
+$generalName = $general['name'];
+$josaYi = JosaUtil::pick($generalName, '이');
+pushGeneralPublicRecord(["<C>●</>{$gameStor->month}월:<Y>{$generalName}</>{$josaYi} 이 홀연히 모습을 <R>감추었습니다</>"], $gameStor->year, $gameStor->month);
+
+
+
+$session->logoutGame();
+header('location:..');

hwe/c_dipcenter.php

@@ -18,16 +18,16 @@ $userID = Session::getUserID();
 
 $db = DB::db();
 
-$me = $db->queryFirstRow('SELECT `no`,nation,`level` FROM general WHERE `owner`=%i', $userID);
+$me = $db->queryFirstRow('SELECT `no`,nation,`level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
 
 //내가 수뇌부이어야함
 $permission = checkSecretPermission($me);
 if($permission < 0){
-    header('location:b_myBossInfo.php');
+    header('location:b_myBossInfo.php', true, 303);
     exit();
 }
 else if ($me['level'] < 5 && $permission != 4) {
-    header('location:b_myBossInfo.php');
+    header('location:b_myBossInfo.php', true, 303);
     exit();
 }
 

hwe/c_double.php

@@ -55,7 +55,7 @@ if($command == 46) {
         $query['turn'.$turnIdx] = $comStr;
     }
     $db->update('general', $query, 'owner=%i', $userID);
-    header('Location:./');
+    header('Location:./', true, 303);
     die();
 
 }
@@ -82,7 +82,7 @@ if($command == 53) {
         $query = "update nation set {$str} where nation='{$me['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     }
-    header('location:b_chiefcenter.php');
+    header('location:b_chiefcenter.php', true, 303);
     die();
 }
 
@@ -102,10 +102,35 @@ if($command == 61) {
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     }
 
-    header('location:b_chiefcenter.php');
+    header('location:b_chiefcenter.php', true, 303);
     die();
 } 
 
+// 국호변경
+if($command == 82) {
+    $query = "select no,nation,level from general where owner='{$userID}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $me = MYDB_fetch_array($result);
+    
+    $name = StringUtil::neutralize($name);
+    if($name == "") { $name = "무명"; }
+
+    $db->update('general', [
+        'makenation'=>$name
+    ], 'owner=%i', $userID);
+
+    $count = count($turn);
+    $str = "type=type";
+    for($i=0; $i < $count; $i++) {
+        $str .= ",l{$me['level']}turn{$turn[$i]}='{$comStr}'";
+    }
+    $query = "update nation set {$str} where nation='{$me['nation']}'";
+    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    
+    header('location:b_chiefcenter.php', true, 303);
+    die();
+}
+
 //포상, 몰수, 발령, 항복권고, 원조
 //선전포고, 종전, 파기, 초토화, 천도, 증축, 감축
 //백성동원, 수몰, 허보, 피장파장, 의병모집, 이호경식, 급습
@@ -126,15 +151,17 @@ if($command == 23 || $command == 24 || $command == 27 || $command == 51 || $comm
         $query = "update nation set {$str} where nation='{$me['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     }
-    header('location:b_chiefcenter.php');
+    header('location:b_chiefcenter.php', true, 303);
     die();  
 }
 
+
+
 //일반 턴
 $query = [];
 foreach($turn as $turnIdx){
     $query['turn'.$turnIdx] = $comStr;
 }
 $db->update('general', $query, 'owner=%i', $userID);
-header('Location:./');
+header('Location:./', true, 303);
 

hwe/c_myBossInfo.php

@@ -32,7 +32,7 @@ $ruler = MYDB_fetch_array($result);
 
 //수뇌가 아니면 아무것도 할 수 없음
 if($meLevel < 5){
-    header('location:b_myBossInfo.php');
+    header('location:b_myBossInfo.php', true, 303);
     exit();
 }
 
@@ -45,52 +45,52 @@ if($btn == "임명") {
     }
 
     if($genlist != 0 && !$general){
-        header('location:b_myBossInfo.php');
+        header('location:b_myBossInfo.php', true, 303);
         exit();
     }
 
     //임명할사람이 군주이면 불가, 내가 수뇌부이어야함, 공석아닌때는 국가가 같아야함
     if($meLevel < 5 || ($genlist != 0 && $general['nation'] != $me['nation']) || ($genlist != 0 && $general['level'] == 12)) {
-        header('location:b_myBossInfo.php');
+        header('location:b_myBossInfo.php', true, 303);
         exit();
     }
 } elseif($btn == "추방") {
     if(!$outlist){
-        header('location:b_myBossInfo.php');
+        header('location:b_myBossInfo.php', true, 303);
         exit();
     }
-    $query = "select no,name,gold,rice,nation,troop,level,npc,picture,imgsvr,permission,penalty from general where no='$outlist'";
+    $query = "select no,name,gold,rice,nation,troop,level,npc,picture,imgsvr,permission,penalty,belong from general where no='$outlist'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
 
     if(!$general){
-        header('location:b_myBossInfo.php');
+        header('location:b_myBossInfo.php', true, 303);
         exit();
     }
 
     //추방할사람이 군주이면 불가, 내가 수뇌부이어야함, 공석아닌때는 국가가 같아야함
     if($general['level'] == 12 || $meLevel < 5 || ($general['nation'] != $me['nation'] && $outlist != 0)) {
-        header('location:b_myBossInfo.php');
+        header('location:b_myBossInfo.php', true, 303);
         exit();
     }
 
     //추방할사람이 외교권자이면 불가
     $permission = checkSecretPermission($general);
     if($permission == 4){
-        header('location:b_myBossInfo.php');
+        header('location:b_myBossInfo.php', true, 303);
         exit();
     }
 
     //NPC 부대장 추방 불가
     if($general['npc'] == 5){
-        header('location:b_myBossInfo.php');
+        header('location:b_myBossInfo.php', true, 303);
         exit();
     }
 }
 
 //나와 대상 장수는 국가가 같아야 함
 if($genlist != 0 && $me['nation'] != $general['nation']){
-    header('location:b_myBossInfo.php');
+    header('location:b_myBossInfo.php', true, 303);
     exit();
 }
 
@@ -150,6 +150,7 @@ if($btn == "추방") {
                     'level'=>0,
                     'nation'=>0,
                     'belong'=>0,
+                    'permission'=>'normal',
                 ], 'no=%i', $general['no']);
             }
             else{
@@ -251,7 +252,7 @@ if($btn == "추방") {
         pushGenLog($general, $log);
         pushGeneralPublicRecord($alllog, $year, $month);
     }
-    header('location:b_myBossInfo.php');
+    header('location:b_myBossInfo.php', true, 303);
     die();
 }
 
@@ -302,34 +303,36 @@ if($btn == "임명" && $level >= 5 && $level <= 11) {
             }
         }
     }
-    header('location:b_myBossInfo.php');
+    header('location:b_myBossInfo.php', true, 303);
     die();
 } 
 
 
 if($btn == "임명" && $level >= 2 && $level <= 4 && $citylist > 0) {
     switch($level) {
-    case 4: $lv = 1; break;
-    case 3: $lv = 2; break;
-    case 2: $lv = 3; break;
+    case 4: $genlv = 'gen1'; $genlvset = 'gen1set'; break;
+    case 3: $genlv = 'gen2'; $genlvset = 'gen2set'; break;
+    case 2: $genlv = 'gen3'; $genlvset = 'gen3set'; break;
     }
 
-    $query = "select gen{$lv} from city where nation='{$me['nation']}' and city='$citylist'";
+    $query = "select {$genlv} from city where nation='{$me['nation']}' and city='$citylist'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $city = MYDB_fetch_array($result);
     if(!$city){
-        header('location:b_myBossInfo.php');
+        header('location:b_myBossInfo.php', true, 303);
         die();
     }
-    $oldlist = $city["gen{$lv}"];
+    $oldlist = $city[$genlv];
 
     if($oldlist != 0) {
         //기존 장수 일반으로
-        $query = "update general set level=1 where no='$oldlist'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('general', [
+            'level'=>1
+        ], 'no=%i', $oldlist);
         //기존 자리 공석으로
-        $query = "update city set gen{$lv}=0 where city='$citylist'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('city', [
+            $genlv=>0
+        ], 'city = %i AND nation = %i', $citylist , $me['nation']);
     }
     if($genlist != 0) {
         $valid = 0;
@@ -341,24 +344,33 @@ if($btn == "임명" && $level >= 2 && $level <= 4 && $citylist > 0) {
 
         if($valid == 1) {
             // 신임 장수의 원래 자리 해제
-            $query = "update city set gen1=0 where gen1='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update city set gen2=0 where gen2='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update city set gen3=0 where gen3='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $db->update('city', [
+                'gen1'=>0,
+            ], 'gen1=%i', $genlist);
+            $db->update('city', [
+                'gen2'=>0,
+            ], 'gen2=%i', $genlist);
+            $db->update('city', [
+                'gen3'=>0,
+            ], 'gen3=%i', $genlist);
+
             //신임 장수
-            $query = "update general set level='$level' where no='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update city set gen{$lv}='$genlist',gen{$lv}set='1' where city='$citylist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $db->update('city', [
+                $genlv=>$genlist,
+                $genlvset=>1
+            ], 'city=%i AND nation=%i', $citylist, $general['nation']);
+            if($db->affectedRows() > 0){
+                $db->update('general',[
+                    'level'=>$level
+                ], 'no=%i', $genlist);
+            }
         }
     }
-    header('location:b_myBossInfo.php');
+    header('location:b_myBossInfo.php', true, 303);
     die();
 }
 
 
-header('location:b_myBossInfo.php');
+header('location:b_myBossInfo.php', true, 303);
 
 

hwe/c_troop.php

@@ -1,66 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-// $btn, $name, $troop
-$btn = Util::getReq('btn');
-$name = Util::getReq('name');
-$gen = Util::getReq('gen', 'int');
-$troop = Util::getReq('troop', 'int');
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = $session::getUserID();
-
-$db = DB::db();
-
-$me = $db->queryFirstRow('SELECT `no`, nation, troop FROM general WHERE `owner`=%i', $userID);
-
-$name = trim($name);
-if($btn == "부 대 창 설" && $name != "" && $me['troop'] == 0) {
-    $db->insert('troop',[
-        'name'=>$name,
-        'nation'=>$me['nation'],
-        'no'=>$me['no']
-    ]);
-    $troopID = $db->insertId();
-
-    $db->update('general', [
-        'troop'=>$troopID
-    ], 'no=%i',$me['no']);
-} elseif($btn == "부 대 변 경" && $name != "") {
-    $db->update('troop', [
-        'name'=>$name
-    ], 'no=%i',$me['no']);
-} elseif($btn == "부 대 추 방" && $gen != 0) {
-    $db->update('general', [
-        'troop'=>0
-    ], 'no=%i AND troop=(SELECT troop FROM troop WHERE no = %i)', $gen, $me['no']);
-} elseif($btn == "부 대 가 입" && $troop != 0) {
-    $troopLeader = $db->queryFirstField('SELECT `no` FROM troop WHERE troop=%i', $troop);
-    $troopLeaderNation = $db->queryFirstField('SELECT `nation` FROM `general` WHERE `no`=%i AND `nation`=%i', $troopLeader, $me['nation']);
-    if($troopLeaderNation){
-        $db->update('general', [
-            'troop'=>$troop
-        ], 'no=%i', $me['no']);
-    }
-} elseif($btn == "부 대 탈 퇴") {
-    $troopLeader = $db->queryFirstField('SELECT `no` FROM troop WHERE troop=%i', $me['troop']);
-    
-    //부대장일 경우
-    if($troopLeader == $me['no']) {
-        // 모두 탈퇴
-        $db->update('general', [
-            'troop'=>0
-        ], 'troop=%i',$me['troop']);
-        // 부대 삭제
-        $db->delete('troop', 'troop=%i', $me['troop']);
-    } else {
-        $db->update('general', [
-            'troop'=>0
-        ], 'no=%i', $me['no']);
-    }
-}
-
-header('Location:b_troop.php');

hwe/c_vacation.php

@@ -10,10 +10,18 @@ $userID = Session::getUserID();
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 
+$autorun_user = $gameStor->autorun_user;
+if($autorun_user['limit_minutes']??false){
+    //자동 턴인 경우에는 휴가 불가
+    header('location:b_myPage.php', true, 303);
+}
+
 $killturn = $gameStor->killturn;
 
-$db->update('general', ['killturn'=>$killturn*3], 'owner=%i', $userID);
+$db->update('general', [
+    'killturn'=>$killturn*3,
+], 'owner=%i', $userID);
 
 
-header('location:b_myPage.php');
+header('location:b_myPage.php', true, 303);
 

hwe/c_vote.php

@@ -49,7 +49,7 @@ else if($btn == "댓글" && trim($comment) != "") {
 }
 
 if(!$isVoteAdmin){
-    header('location:a_vote.php');
+    header('location:a_vote.php', true, 303);
     die();
 }
 
@@ -85,4 +85,4 @@ if($btn == "수정") {
     $gameStor->voteopen = 2;
 }
 
-header('location:a_vote.php');
+header('location:a_vote.php', true, 303);

hwe/commandlist.php

@@ -8,66 +8,10 @@ $session = Session::getInstance()->setReadOnly();
 
 $db = DB::db();
 
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>커맨드리스트</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<script type="text/javascript">
-<?php
-if(!$session->isGameLoggedIn()){
-    echo 'window.parent.location.href = "../";';
+if (!$session->isGameLoggedIn()) {
+    die('<script>window.location.href = "../"</script>');
 }
-?>
-function myclock() {
-    lastday = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
 
-    date = document.clock.clock.value;
-
-    year = parseInt(date.substr(0, 4), 10);
-    month = parseInt(date.substr(5,2), 10);
-    day = parseInt(date.substr(8, 2), 10);
-    hour = parseInt(date.substr(11, 2), 10);
-    min = parseInt(date.substr(14, 2), 10);
-    sec = parseInt(date.substr(17, 2), 10);
-
-    //윤년계산
-    if(((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0)) { lastday[1] = 29; }
-    else { lastday[1] = 28; }
-
-//    if(term > 0) term--;
-
-    sec++;
-    if(sec >= 60) { sec = 0; min++; }
-    if(min >= 60) { min = 0; hour++; }
-    if(hour >= 24) { hour = 0; day++; }
-    if(day > lastday[month-1]) { month++; day = 1; }
-    if(month >= 13) { year++; month = 1; }
-    if(month < 10) { month = '0' + month; }
-    if(day < 10) { day = '0' + day; }
-    if(hour < 10) { hour = '0' + hour; }
-    if(min < 10) { min = '0' + min; }
-    if(sec < 10) { sec = '0' + sec; }
-    date = '' + year + '-' + month + '-' + day + ' ' + hour + ':' + min + ':' + sec;
-
-    document.clock.clock.value = date;
-
-    window.setTimeout("myclock();", 1000);
-}
-</script>
-
-</head>
-<body OnLoad='myclock()'>
-<?php
 myCommandList();
 
 function myCommandList() {
@@ -76,9 +20,10 @@ function myCommandList() {
     $userID = Session::getUserID();
 
     $date = date('Y-m-d H:i:s');
+    $date_precise = (new \DateTime())->format("Y-m-d H:i:s.u");
 
     // 명령 목록
-    $admin = $gameStor->getValues(['year','month','turnterm']);
+    $admin = $gameStor->getValues(['year','month','turnterm','turntime','opentime']);
 
     $me = $db->queryFirstRow("SELECT `no`,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 FROM general WHERE `owner`=%s", $userID);
     if(!$me){
@@ -88,16 +33,15 @@ function myCommandList() {
     $turn = getTurn($me, 2);
 
     echo "<table width=300 height=700 class='tb_layout bg2'>
-<form name=clock>
     <tr>
-        <td colspan=4 align=center id=bg0><b>- 명령 목록 - <input value='$date' type=text name=clock size=19 style=background-color:black;color:white;border-style:none;></b></td>
+        <td colspan=4 align=center id=bg0><b>- 명령 목록 - <input value='$date' type=text id=clock size=19 style=background-color:black;color:white;border-style:none; data-server-time='{$date_precise}'></b></td>
     </tr>";
 
     $year = $admin['year'];
     $month = $admin['month'];
     // 실행된 턴시간이면 +1
     $cutTurn = cutTurn($me['turntime'], $admin['turnterm']);
-    if($date <= $cutTurn) { $month++; }
+    if($date <= $cutTurn && $date >= $admin['opentime']) { $month++; }
 
     $totaldate = $me['turntime'];
 
@@ -111,7 +55,7 @@ function myCommandList() {
         echo "
     <tr height=28>
         <td width=24 align=center height=24 id=bg0><b>$j</b></td>
-        <td width=71 align=center height=24 id=bg1 style='overflow:hidden;'><b>{$year}年 {$month}月</b></td>
+        <td width=71 align=center height=24 id=bg1 style='max-width:68px;white-space:nowrap;overflow:hidden;'><b>{$year}年 {$month}月</b></td>
         <td width=42 align=center bgcolor=black><b>$turndate</b></td>
         <td width=150 align=center height=24 style=table-layout:fixed;>$turn[$i]</td>
     </tr>";
@@ -120,11 +64,6 @@ function myCommandList() {
     }
 
     echo "
-</form>
 </table>
 ";
-}
-?>
-
-</body>
-</html>
+}

hwe/css/board.css

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

hwe/css/common.css

@@ -192,10 +192,21 @@ div.bar_out div.bar_in{
     font-family: '맑은 고딕';
 }
 
+.tooltip_copyable_info .tooltiptext{
+    display: inline;
+    color: rgba(0,0,0,0);
+    font-size: 0;
+}
+
 .tooltiptext {
     display: none;
 }
 
+.hidden_but_copyable{
+    color: rgba(0,0,0,0);
+    font-size: 0;
+}
+
 .btn-group-xs > .btn, .btn-xs {
     padding  : .25rem .4rem;
     font-size  : .875rem;

hwe/css/diplomacy.css

@@ -0,0 +1,58 @@
+#newLetter {
+    width:1000px;
+    margin: 10px auto;
+}
+
+#newLetter th{
+    width:20ch;
+}
+
+#newLetter textarea{
+    width:100%;
+    min-height:3em;
+    color:white;
+    background-color:transparent;
+    border:none;
+}
+
+.letterFrame{
+    width:1000px;
+    margin: 10px auto;
+}
+
+.letterFrame th{
+    width:20ch;
+}
+
+.letterHeader{
+    position: relative;
+    font-size:200%;
+}
+
+.letterDate{
+    position: absolute;
+    right:1ch;
+    bottom:0.2em;
+    font-size:50%;
+
+}
+
+.letterBrief, .letterDetail{
+    text-align: left;
+}
+
+.letterSignerPlate{
+    text-align:center;
+}
+
+.letterSrc, .letterDest{
+    display:inline-block;
+    margin: 0 10px;
+    border: 1px solid gray;
+    width:110px;
+    text-align:center;
+}
+
+.signerNation, .signerName{
+    border-top: 1px solid gray;
+}

hwe/css/main.css

@@ -67,4 +67,4 @@ color:white;
 
 .nation_info td{
     height:18px;
-}
+}

hwe/css/map.css

@@ -61,6 +61,7 @@
     position:absolute;
     right:0;
     bottom:0;
+    text-align:right;
 }
 
 .map_body .map_toggle_cityname::after{
@@ -71,6 +72,18 @@
     content: "켜기"
 }
 
+.map_body .map_toggle_single_tap{
+    display:none;
+}
+
+.map_body .map_toggle_single_tap::after{
+    content: "끄기"
+}
+
+.map_body .map_toggle_single_tap.active::after{
+    content: "켜기"
+}
+
 .world_map .city_tooltip{
     position: absolute;
     z-index:6;

hwe/css/msg.css

@@ -60,11 +60,11 @@
 }
 
 .diplomacy_message{
-    height:667px;
+    flex: 1;
 }
 
 .national_message{
-    flex: 1;
+    height:667px;
 }
 
 .private_message{

hwe/d_setting/UniqueConst.orig.php

@@ -4,6 +4,7 @@ namespace sammo;
 class UniqueConst{
     public static $serverID = '_tK_serverID_';
     public static $serverName = '_tK_serverName_';
+    public static $seasonIdx = '_tK_seasonIdx_';
 
     private function __construct(){}
 

hwe/func.php

@@ -271,6 +271,11 @@ function myNationInfo() {
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $nation = MYDB_fetch_array($result);
 
+    if(!$nation){
+        $nation = getNationStaticInfo(0);
+        $nation['tech'] = 0;
+    }
+
     $query = "select COUNT(*) as cnt, SUM(pop) as totpop, SUM(pop2) as maxpop from city where nation='{$nation['nation']}'"; // 도시 이름 목록
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $city = MYDB_fetch_array($result);
@@ -341,6 +346,7 @@ function myNationInfo() {
 
     $techCall = getTechCall($nation['tech']);
 
+    
     if(TechLimit($admin['startyear'], $admin['year'], $nation['tech'])) { $nation['tech'] = "<font color=magenta>{$nation['tech']}</font>"; }
     else { $nation['tech'] = "<font color=limegreen>{$nation['tech']}</font>"; }
 
@@ -399,8 +405,22 @@ function myNationInfo() {
 ";
 }
 
-function checkSecretPermission($me){
-    if(!key_exists($me['penalty']) || !key_exists($me['permission'])){
+function checkSecretMaxPermission($me){
+    $secretMax = 4;
+    if($penalty['noTopSecret']??false){
+        $secretMax = 1;
+    }
+    else if($penalty['noChief']??false){
+        $secretMax = 1;
+    }
+    else if($penalty['noAmbassador']??false){
+        $secretMax = 2;
+    }
+    return $secretMax;
+}
+
+function checkSecretPermission($me, $checkSecretLimit=true){
+    if(!key_exists('penalty', $me) || !key_exists('permission', $me)){
         trigger_error ('canAccessSecret() 함수에 필요한 인자가 부족');
     }
     $penalty = Json::decode($me['penalty'])??[];
@@ -413,24 +433,15 @@ function checkSecretPermission($me){
     if($me['level'] == 0){
         return -1;
     }
-
-    $secretLimit = $db->queryFirstField('SELECT secretlimit FROM nation WHERE nation = %i', $me['nation']);
+    
 
     if($pernalty['noSecret']??false){
         return 0;
     }
 
     $secretMin = 0;
-    $secretMax = 3;
-    if($penalty['noTopSecret']??false){
-        $secretMax = 1;
-    }
-    else if($penalty['noChief']??false){
-        $secretMax = 1;
-    }
-    else if($penalty['noAmbassador']??false){
-        $secretMax = 2;
-    }    
+    $secretMax = checkSecretMaxPermission($me);
+    
 
     if($me['level'] == 12){
         $secretMin = 4;
@@ -447,8 +458,12 @@ function checkSecretPermission($me){
     else if($me['level'] > 1){
         $secretMin = 1;
     }
-    else if($me['belong'] >= $secretLimit){
-        $secretMin = 1;
+    else if($checkSecretLimit){
+        $db = DB::db();
+        $secretLimit = $db->queryFirstField('SELECT secretlimit FROM nation WHERE nation = %i', $me['nation']);
+        if ($me['belong'] >= $secretLimit) {
+            $secretMin = 1;
+        }
     }
 
     return min($secretMin, $secretMax);
@@ -459,20 +474,20 @@ function addCommand($typename, $value, $valid = 1, $color=0) {
         switch($color) {
             case 0:
                 echo "
-    <option style=color:white;background-color:black; value={$value}>{$typename}</option>";
+    <option style='color:white;background-color:black;' value='{$value}'>{$typename}</option>";
                 break;
             case 1:
                 echo "
-    <option style=color:skyblue;background-color:black; value={$value}>{$typename}</option>";
+    <option style='color:skyblue;background-color:black;' value='{$value}'>{$typename}</option>";
                 break;
             case 2:
                 echo "
-    <option style=color:orange;background-color:black; value={$value}>{$typename}</option>";
+    <option style='color:orange;background-color:black;' value='{$value}'>{$typename}</option>";
                 break;
         }
     } else {
         echo "
-    <option style=color:white;background-color:red; value={$value}>{$typename}(불가)</option>";
+    <option style='color:white;background-color:red;' value='{$value}'>{$typename}(불가)</option>";
     }
 }
 
@@ -648,10 +663,14 @@ function commandTable() {
     }
     commandGroup("", 1);
     commandGroup("======= 개 인 ========");
+    addCommand("내정 특기 초기화(3턴, 1회만)", 38);
+    addCommand("전투 특기 초기화(3턴, 1회만)", 39);
     if($me['level'] >= 1) {
         addCommand("단련(자금$develcost, 군량$develcost)", 41);
+        addCommand("숙련전환(통솔경험, 자금$develcost, 군량$develcost)", 58);
     } else {
         addCommand("단련(자금$develcost, 군량$develcost)", 41, 0);
+        addCommand("숙련전환(통솔경험, 자금$develcost, 군량$develcost)", 58, 0);
     }
     addCommand("견문(자금?, 군량?, 경험치?)", 42);
     if($city['trade'] > 0 || $me['special'] == 30) {
@@ -740,9 +759,10 @@ function CoreCommandTable() {
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $me = MYDB_fetch_array($result);
 
-    $query = "select level,can_change_flag from nation where nation='{$me['nation']}'";
+    $query = "select level,can_change_flag,aux from nation where nation='{$me['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $nation = MYDB_fetch_array($result);
+    $nationAux = Json::decode($nation['aux']);
 
     $query = "select no from general where nation='{$me['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -783,7 +803,7 @@ function CoreCommandTable() {
     commandGroup("====== 특 수 ======");
     addCommand("초토화", 65, $valid);
     addCommand("천도/3턴(금쌀{$develcost}0)", 66, $valid);
-    $cost = $develcost * 500 + 60000;   // 7만~13만
+    $cost = $develcost * GameConst::$expandCityCostCoef + GameConst::$expandCityDefaultCost;   // 7만~13만
     addCommand("증축/6턴(금쌀{$cost})", 67, $valid);
     addCommand("감축/6턴", 68, $valid);
     commandGroup("", 1);
@@ -812,6 +832,12 @@ function CoreCommandTable() {
     } else {
         addCommand("국기 변경", 81, 0);
     }
+    if($nation['level']==7 && !($nationAux['used_82']??0)){
+        addCommand("국호 변경", 82, 1);
+    }
+    else{
+        addCommand("국호 변경", 82, 0);
+    }
     commandGroup("", 1);
     echo "
 </select>
@@ -856,8 +882,6 @@ function generalInfo($no) {
         $lbonus = "";
     }
 
-    $troop = getTroop($general['troop']);
-
     $level = getLevel($general['level'], $nation['level']);
     if($general['level'] == 2)     {
         $query = "select name from city where gen3='{$general['no']}'";
@@ -901,8 +925,8 @@ function generalInfo($no) {
 
     if($nation['color'] == "") { $nation['color'] = "#000000"; }
 
-    if($general['age'] < 60)     { $general['age'] = "<font color=limegreen>{$general['age']} 세</font>"; }
-    elseif($general['age'] < 80) { $general['age'] = "<font color=yellow>{$general['age']} 세</font>"; }
+    if($general['age'] < GameConst::$retirementYear*0.75)     { $general['age'] = "<font color=limegreen>{$general['age']} 세</font>"; }
+    elseif($general['age'] < GameConst::$retirementYear) { $general['age'] = "<font color=yellow>{$general['age']} 세</font>"; }
     else                  { $general['age'] = "<font color=red>{$general['age']} 세</font>"; }
 
     $general['connect'] = Util::round($general['connect'] / 10) * 10;
@@ -925,7 +949,23 @@ function generalInfo($no) {
         default:
             $train = "{$general['train']}"; break;
     }
-    if($general['troop'] == 0)    { $troop['name'] = "-"; }
+    if($general['troop'] == 0){
+        $troopInfo = '-';
+    }
+    else{
+        $troop = getTroop($general['troop']);
+        $troopLeader = $db->queryFirstRow('SELECT city,turn0 FROM general WHERE no=%i', $troop['no']);
+        $troopInfo = $troop['name'];
+
+        if(DecodeCommand($troopLeader['turn0'])[0] != 26){
+            $troopInfo = "<strike style='color:gray;'>{$troopInfo}</strike>";
+        }
+        else if($troopLeader['city'] != $general['city']){
+            $troopCityName = CityConst::byID($troopLeader['city'])->name;
+            $troopInfo = "<span style='color:orange;'>{$troopInfo}({$troopCityName})</span>";
+        }
+        
+    }
     if($general['mode'] == 2)     { $general['mode'] = "<font color=limegreen>수비 함(훈사80)</font>"; }
     elseif($general['mode'] == 1) { $general['mode'] = "<font color=limegreen>수비 함(훈사60)</font>"; }
     else                        { $general['mode'] = "<font color=red>수비 안함</font>"; }
@@ -999,7 +1039,7 @@ function generalInfo($no) {
     </tr>
     <tr height=20>
         <td style='text-align:center;' class='bg1'><b>부대</b></td>
-        <td style='text-align:center;' colspan=3>{$troop['name']}</td>
+        <td style='text-align:center;' colspan=3>{$troopInfo}</td>
         <td style='text-align:center;' class='bg1'><b>벌점</b></td>
         <td style='text-align:center;' colspan=5>".getConnect($general['connect'])." {$general['connect']}({$general['con']})</td>
     </tr>
@@ -1258,8 +1298,9 @@ function increaseRefresh($type="", $cnt=1) {
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $gameStor->refresh = $gameStor->refresh+$cnt; //TODO: +로 증가하는 값은 별도로 분리
     $isunited = $gameStor->isunited;
+    $opentime = $gameStor->opentime;
 
-    if($isunited != 2 && $generalID && $userGrade < 6) {
+    if($isunited != 2 && $generalID && $userGrade < 6 && $opentime <= TimeUtil::DatetimeNow()) {
         $db->update('general', [
             'lastrefresh'=>$date,
             'con'=>$db->sqleval('con + %i', $cnt),
@@ -1433,10 +1474,10 @@ function checkDelay() {
         $threshold = 1;
     }
     else if($term >= 10){
-        $threshold = 2;
+        $threshold = 3;
     }
     else{
-        $threshold = 3;
+        $threshold = 6;
     }
     //지연 해야할 밀린 턴 횟수
     $iter = intdiv($timeMinDiff, $term);
@@ -1514,6 +1555,11 @@ function checkTurn() {
 
     $alllog = [];
 
+    if(date('Y-m-d H:i:s') < $gameStor->turntime){
+        //턴 시각 이전이면 아무것도 하지 않음
+        return true;
+    }
+
     // 잦은 갱신 금지 현재 5초당 1회
     if(!timeover()) { return; }
     // 현재 처리중이면 접근 불가
@@ -1548,7 +1594,12 @@ function checkTurn() {
         $db->update('plock', ['plock'=>1], true);
         return;
     }
+
+    $date = date('Y-m-d H:i:s');
+
     $gameStor->cacheAll();
+
+    
     // 1턴이상 갱신 없었으면 서버 지연
     //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', checkDelay');
     checkDelay();
@@ -1560,10 +1611,12 @@ function checkTurn() {
     CheckOverhead();
     //서버정보
 
-    $date = date('Y-m-d H:i:s');
+    $autorun_user = $gameStor->autorun_user;
+    
     // 최종 처리 월턴의 다음 월턴시간 구함
     $prevTurn = cutTurn($gameStor->turntime, $gameStor->turnterm);
     $nextTurn = addTurn($prevTurn, $gameStor->turnterm);
+    $computedPrevTurn = false;
     // 현재 턴 이전 월턴까지 모두처리.
     //최종 처리 이후 다음 월턴이 현재 시간보다 전이라면
     while($nextTurn <= $date) {
@@ -1577,12 +1630,15 @@ function checkTurn() {
             //if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이전 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general['turn0']})";
             //if(PROCESS_LOG) pushProcessLog($processlog);
             
-            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
-            if($general['npc'] >= 2) { processAI($general['no']); }    // npc AI 처리
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', PreprocessCommand');
             PreprocessCommand($general['no']);
+            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
+            $reduce_turn = false;
+            if($general['npc'] >= 2 || ($autorun_user['limit_minutes']??false)) {
+                processAI($general['no'], $reduce_turn); 
+            }    // npc AI 처리
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processCommand');
-            processCommand($general['no']);
+            processCommand($general['no'], $reduce_turn);
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateCommand');
             updateCommand($general['no']);
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateTurntime');
@@ -1669,12 +1725,16 @@ function checkTurn() {
         // 다음달로 넘김
         $prevTurn = $nextTurn;
         $nextTurn = addTurn($prevTurn, $gameStor->turnterm);
+        $computedPrevTurn = true;
     }
 
     //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', '.__LINE__);
         
     // 이시각 정각 시까지 업데이트 완료했음
-    $gameStor->turntime = $prevTurn;
+    if($computedPrevTurn){
+        $gameStor->turntime = $prevTurn;
+    }
+    
 
     // 그 시각 년도,월 저장
     list($gameStor->year, $gameStor->month) = turnDate($prevTurn);
@@ -1690,12 +1750,14 @@ function checkTurn() {
             //if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이후 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general['turn0']})";
             //if(PROCESS_LOG) pushProcessLog($processlog);
             
-            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
-            if($general['npc'] >= 2) { processAI($general['no']); }    // npc AI 처리
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', PreprocessCommand');
             PreprocessCommand($general['no']);
+            $reduce_turn = false;
+            if($general['npc'] >= 2 || ($autorun_user['limit_minutes']??false)) {
+                processAI($general['no'], $reduce_turn); 
+            } 
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processCommand');
-            processCommand($general['no']);
+            processCommand($general['no'], $reduce_turn);
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateCommand');
             updateCommand($general['no']);
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateTurntime');
@@ -1928,7 +1990,7 @@ function updateTurntime($no) {
 
     $admin = $gameStor->getValues(['year', 'month', 'isunited', 'turnterm']);
 
-    $query = "select no,name,name2,nation,troop,age,turntime,killturn,level,deadyear,npc,npc_org,affinity,npcid from general where no='$no'";
+    $query = "select no,owner,name,name2,nation,troop,age,startage,turntime,killturn,level,deadyear,npc,npc_org,affinity,npcid from general where no='$no'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
 
@@ -1944,6 +2006,7 @@ function updateTurntime($no) {
                 'npc'=>$general['npc_org'],
                 'killturn'=>$general['killturn'],
                 'mode'=>2,
+                'permission'=>'normal',
                 'name2'=>null
             ], 'no=%i',$no);
 
@@ -1959,7 +2022,7 @@ function updateTurntime($no) {
                 nextRuler($general);
             }
 
-            //도시의 태수, 군사, 시중직도 초기화
+            //도시의 태수, 군사, 종사직도 초기화
             $query = "update city set gen1='0' where gen1='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             $query = "update city set gen2='0' where gen2='{$general['no']}'";
@@ -1997,68 +2060,77 @@ function updateTurntime($no) {
             $query = "update nation set totaltech=tech*'$gencount',gennum='$gennum' where nation='{$general['nation']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
+            $generalName = $general['name'];
+
             // 병, 요절, 객사, 번개, 사채, 일확천금, 호랑이, 곰, 수영, 처형, 발견
-            $josaYi = JosaUtil::pick($general['name'], '이');
+            $josaYi = JosaUtil::pick($generalName, '이');
+
+            if($general['owner'] > 0 && $general['startage'] + 1 < $general['age']){
+                
+                $realName = RootDB::db()->queryFirstField('SELECT name FROM member WHERE no = %i', $general['owner'])??'??';
+                $generalName .= "({$realName})";
+            }
+
             switch(rand()%42) {
-            case 0:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 역병에 걸려 <R>죽고</> 말았습니다."; break;
-            case 1:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <R>요절</>하고 말았습니다."; break;
-            case 2:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 거리에서 갑자기 <R>객사</>하고 말았습니다."; break;
-            case 3:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 안타깝게도 번개에 맞아 <R>죽고</> 말았습니다."; break;
-            case 4:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 고리대금에 시달리다가 <R>자살</>하고 말았습니다."; break;
-            case 5:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 일확천금에 놀라 심장마비로 <R>죽고</> 말았습니다."; break;
-            case 6:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 산속에서 호랑이에게 물려 <R>죽고</> 말았습니다."; break;
-            case 7:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 산책중 곰에게 할퀴어 <R>죽고</> 말았습니다."; break;
-            case 8:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 수영을 하다 <R>익사</>하고 말았습니다."; break;
-            case 9:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 황제를 모독하다가 <R>처형</>당하고 말았습니다."; break;
-            case 10: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 이튿날 침실에서 <R>죽은채로</>발견되었습니다."; break;
-            case 11: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 색에 빠져 기력이 쇠진해 <R>죽고</>말았습니다."; break;
-            case 12: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 미녀를 보고 심장마비로 <R>죽고</>말았습니다."; break;
-            case 13: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 우울증에 걸려 <R>자살</>하고 말았습니다."; break;
-            case 14: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 천하 정세를 비관하며 <R>분신</>하고 말았습니다."; break;
-            case 15: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 어떤 관심도 못받고 쓸쓸히 <R>죽고</>말았습니다."; break;
-            case 16: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 유산 상속 문제로 다투다가 <R>살해</>당했습니다."; break;
-            case 17: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 누군가의 사주로 자객에게 <R>암살</>당했습니다."; break;
-            case 18: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 바람난 배우자에게 <R>독살</>당하고 말았습니다."; break;
-            case 19: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 농약을 술인줄 알고 마셔 <R>죽고</>말았습니다."; break;
-            case 20: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 아무 이유 없이 <R>죽고</>말았습니다."; break;
-            case 21: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 전재산을 잃고 화병으로 <R>죽고</>말았습니다."; break;
-            case 22: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 단식운동을 하다가 굶어 <R>죽고</>말았습니다."; break;
-            case 23: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 귀신에게 홀려 시름 앓다가 <R>죽고</>말았습니다."; break;
-            case 24: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 사람들에게 집단으로 맞아서 <R>죽고</>말았습니다."; break;
-            case 25: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 갑자기 성벽에서 뛰어내려 <R>죽고</>말았습니다."; break;
-            case 26: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 농사중 호미에 머리를 맞아 <R>죽고</>말았습니다."; break;
-            case 27: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 저세상이 궁금하다며 <R>자살</>하고 말았습니다."; break;
-            case 28: $alllog[0] = "<C>●</>{$admin['month']}월:운좋기로 소문난 <Y>{$general['name']}</>{$josaYi} 불운하게도 <R>죽고</>말았습니다."; break;
-            case 29: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 무리하게 단련을 하다가 <R>죽고</>말았습니다."; break;
-            case 30: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 생활고를 비관하며 <R>자살</>하고 말았습니다."; break;
-            case 31: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 평생 결혼도 못해보고 <R>죽고</> 말았습니다."; break;
-            case 32: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 과식하다 배가 터져 <R>죽고</> 말았습니다."; break;
-            case 33: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 웃다가 숨이 넘어가 <R>죽고</> 말았습니다."; break;
-            case 34: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 추녀를 보고 놀라서 <R>죽고</> 말았습니다."; break;
-            case 35: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 물에 빠진 사람을 구하려다 같이 <R>죽고</> 말았습니다."; break;
-            case 36: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 독살을 준비하다 독에 걸려 <R>죽고</> 말았습니다."; break;
-            case 37: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 뒷간에서 너무 힘을 주다가 <R>죽고</> 말았습니다."; break;
-            case 38: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 돌팔이 의사에게 치료받다가 <R>죽고</> 말았습니다."; break;
-            case 39: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 남의 보약을 훔쳐먹다 부작용으로 <R>죽고</> 말았습니다."; break;
-            case 40: $alllog[0] = "<C>●</>{$admin['month']}월:희대의 사기꾼 <Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다."; break;
-            case 41: $alllog[0] = "<C>●</>{$admin['month']}월:희대의 호색한 <Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다."; break;
-            default: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다."; break;
+            case 0:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 역병에 걸려 <R>죽고</> 말았습니다."; break;
+            case 1:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} <R>요절</>하고 말았습니다."; break;
+            case 2:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 거리에서 갑자기 <R>객사</>하고 말았습니다."; break;
+            case 3:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 안타깝게도 번개에 맞아 <R>죽고</> 말았습니다."; break;
+            case 4:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 고리대금에 시달리다가 <R>자살</>하고 말았습니다."; break;
+            case 5:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 일확천금에 놀라 심장마비로 <R>죽고</> 말았습니다."; break;
+            case 6:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 산속에서 호랑이에게 물려 <R>죽고</> 말았습니다."; break;
+            case 7:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 산책중 곰에게 할퀴어 <R>죽고</> 말았습니다."; break;
+            case 8:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 수영을 하다 <R>익사</>하고 말았습니다."; break;
+            case 9:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 황제를 모독하다가 <R>처형</>당하고 말았습니다."; break;
+            case 10: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 이튿날 침실에서 <R>죽은채로</>발견되었습니다."; break;
+            case 11: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 색에 빠져 기력이 쇠진해 <R>죽고</>말았습니다."; break;
+            case 12: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 미녀를 보고 심장마비로 <R>죽고</>말았습니다."; break;
+            case 13: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 우울증에 걸려 <R>자살</>하고 말았습니다."; break;
+            case 14: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 천하 정세를 비관하며 <R>분신</>하고 말았습니다."; break;
+            case 15: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 어떤 관심도 못받고 쓸쓸히 <R>죽고</>말았습니다."; break;
+            case 16: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 유산 상속 문제로 다투다가 <R>살해</>당했습니다."; break;
+            case 17: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 누군가의 사주로 자객에게 <R>암살</>당했습니다."; break;
+            case 18: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 바람난 배우자에게 <R>독살</>당하고 말았습니다."; break;
+            case 19: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 농약을 술인줄 알고 마셔 <R>죽고</>말았습니다."; break;
+            case 20: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 아무 이유 없이 <R>죽고</>말았습니다."; break;
+            case 21: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 전재산을 잃고 화병으로 <R>죽고</>말았습니다."; break;
+            case 22: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 단식운동을 하다가 굶어 <R>죽고</>말았습니다."; break;
+            case 23: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 귀신에게 홀려 시름 앓다가 <R>죽고</>말았습니다."; break;
+            case 24: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 사람들에게 집단으로 맞아서 <R>죽고</>말았습니다."; break;
+            case 25: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 갑자기 성벽에서 뛰어내려 <R>죽고</>말았습니다."; break;
+            case 26: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 농사중 호미에 머리를 맞아 <R>죽고</>말았습니다."; break;
+            case 27: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 저세상이 궁금하다며 <R>자살</>하고 말았습니다."; break;
+            case 28: $alllog[0] = "<C>●</>{$admin['month']}월:운좋기로 소문난 <Y>{$generalName}</>{$josaYi} 불운하게도 <R>죽고</>말았습니다."; break;
+            case 29: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 무리하게 단련을 하다가 <R>죽고</>말았습니다."; break;
+            case 30: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 생활고를 비관하며 <R>자살</>하고 말았습니다."; break;
+            case 31: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 평생 결혼도 못해보고 <R>죽고</> 말았습니다."; break;
+            case 32: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 과식하다 배가 터져 <R>죽고</> 말았습니다."; break;
+            case 33: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 웃다가 숨이 넘어가 <R>죽고</> 말았습니다."; break;
+            case 34: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 추녀를 보고 놀라서 <R>죽고</> 말았습니다."; break;
+            case 35: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 물에 빠진 사람을 구하려다 같이 <R>죽고</> 말았습니다."; break;
+            case 36: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 독살을 준비하다 독에 걸려 <R>죽고</> 말았습니다."; break;
+            case 37: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 뒷간에서 너무 힘을 주다가 <R>죽고</> 말았습니다."; break;
+            case 38: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 돌팔이 의사에게 치료받다가 <R>죽고</> 말았습니다."; break;
+            case 39: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 남의 보약을 훔쳐먹다 부작용으로 <R>죽고</> 말았습니다."; break;
+            case 40: $alllog[0] = "<C>●</>{$admin['month']}월:희대의 사기꾼 <Y>{$generalName}</>{$josaYi} <R>사망</>했습니다."; break;
+            case 41: $alllog[0] = "<C>●</>{$admin['month']}월:희대의 호색한 <Y>{$generalName}</>{$josaYi} <R>사망</>했습니다."; break;
+            default: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} <R>사망</>했습니다."; break;
             }
             // 엔피씨,엠피씨,의병 사망로그
             if($general['npc'] == 2 || $general['npc'] == 6) {
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다.";
+                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} <R>사망</>했습니다.";
             } elseif($general['npc'] >= 3) {
                 switch(rand()%10) {
-                case 0: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 푸대접에 실망하여 떠났습니다."; break;
-                case 1: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 갑자기 화를 내며 떠났습니다."; break;
-                case 2: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 의견차이를 좁히지 못하고 떠났습니다."; break;
-                case 3: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 판단 착오였다며 떠났습니다."; break;
-                case 4: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 생활고가 나아지지 않는다며 떠났습니다."; break;
-                case 5: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 기대가 너무 컸다며 떠났습니다."; break;
-                case 6: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 아무 이유 없이 떠났습니다."; break;
-                case 7: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 자기 목적은 달성했다며 떠났습니다."; break;
-                case 8: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 자기가 없어도 될것 같다며 떠났습니다."; break;
-                case 9: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 처자식이 그립다며 떠났습니다."; break;
+                case 0: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 푸대접에 실망하여 떠났습니다."; break;
+                case 1: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 갑자기 화를 내며 떠났습니다."; break;
+                case 2: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 의견차이를 좁히지 못하고 떠났습니다."; break;
+                case 3: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 판단 착오였다며 떠났습니다."; break;
+                case 4: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 생활고가 나아지지 않는다며 떠났습니다."; break;
+                case 5: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 기대가 너무 컸다며 떠났습니다."; break;
+                case 6: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 아무 이유 없이 떠났습니다."; break;
+                case 7: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 자기 목적은 달성했다며 떠났습니다."; break;
+                case 8: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 자기가 없어도 될것 같다며 떠났습니다."; break;
+                case 9: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 처자식이 그립다며 떠났습니다."; break;
                 }
             }
 
@@ -2068,7 +2140,7 @@ function updateTurntime($no) {
         }
     }
 
-    if($general['age'] >= 80 && $general['npc'] == 0) {
+    if($general['age'] >= GameConst::$retirementYear && $general['npc'] == 0) {
         if($admin['isunited'] == 0) {
             CheckHall($no);
         }
@@ -2141,6 +2213,11 @@ function CheckHall($no) {
 
     [$scenarioIdx, $scenarioName, $startTime] = $gameStor->getValuesAsArray(['scenario', 'scenario_text', 'starttime']);
 
+    $ownerName = $general['name2'];
+    if($general['owner']){
+        $ownerName = RootDB::db()->queryFirstField('SELECT name FROM member WHERE no = %i', $general['owner']);
+    }
+
     foreach($types as $idx=>$typeName) {
         
 
@@ -2170,7 +2247,7 @@ function CheckHall($no) {
             'imgsvr'=>$general['imgsvr'],
             'startTime'=>$startTime,
             'unitedTime'=>$unitedDate,
-            'owner_name'=>$general['name2'],
+            'owner_name'=>$ownerName,
             'serverID'=>UniqueConst::$serverID,
             'serverIdx'=>$serverCnt,
             'serverName'=>UniqueConst::$serverName,
@@ -2178,27 +2255,106 @@ function CheckHall($no) {
         ];
         $jsonAux = Json::encode($aux);
 
-        $db->insertUpdate('ng_hall', [
+        $db->insertIgnore('ng_hall', [
             'server_id'=>UniqueConst::$serverID,
+            'season'=>UniqueConst::$seasonIdx,
             'scenario'=>$scenarioIdx,
             'general_no'=>$no,
             'type'=>$idx,
             'value'=>$general[$typeName]??0,
             'owner'=>$general['owner']??null,
             'aux'=>$jsonAux
-        ],[
-            'value'=>$general[$typeName]??0,
-            'aux'=>$jsonAux
         ]);
+
+        if($db->affectedRows() == 0){
+            $db->update('ng_hall', [
+                'value'=>$general[$typeName]??0,
+                'aux'=>$jsonAux
+            ], 
+            'server_id = %s AND scenario = %i AND general_no = %i AND type = %i AND value < %d', 
+            UniqueConst::$serverID,
+            $scenarioIdx,
+            $no,
+            $idx,
+            $general[$typeName]??0);
+        }
+        
     }
 }
 
 
+function guaranteedUniqueItemLottery(array $weightedArray, string $headerText='아이템'):?int{
+    //NOTE: Util::choiceRandomUsingWeight 사용
+    //TODO: 또 재 구현해야함.... ㅜㅜ
+
+    if(!$weightedArray){
+        return null;
+    }
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+
+    $targetGeneralID = Util::choiceRandomUsingWeight($weightedArray);
+    
+    $alllog = [];
+    $history = [];
+    $occupied = [];
+    $item = [];
+
+    $admin = $gameStor->getValues(['year', 'month', 'scenario']);
+
+    $selGroup = [
+        20 - $db->queryFirstField('SELECT count(*) from general where weap > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where book > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where horse > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where item > 6')
+    ];
+
+    if(array_sum($selGroup) == 0){
+        return null;
+    }
+
+    $sel = Util::choiceRandomUsingWeight($selGroup);
+    switch($sel) {
+    case 0: [$type, $nameFunc] = ["weap", 'sammo\getWeapName']; break;
+    case 1: [$type, $nameFunc] = ["book", 'sammo\getBookName']; break;
+    case 2: [$type, $nameFunc] = ["horse", 'sammo\getHorseName']; break;
+    case 3: [$type, $nameFunc] = ["item", 'sammo\getItemName']; break;
+    }
+
+    foreach($db->queryFirstColumn('SELECT %b FROM general WHERE %b > 6', $type, $type) as $itemIdx){
+        $occupied[$itemIdx] = 1;
+    }
+    for($i=7; $i <= 26; $i++) {
+        if(!Util::array_get($occupied[$i])) {
+            $item[] = $i;
+        }
+    }
+    $it = Util::choiceRandom($item);
+
+    $general = $db->queryFirstRow('SELECT no, name, nation FROM general WHERE no = %i', $targetGeneralID);
+
+    $db->update('general', [$type=>$it], 'no=%i', $general['no']);
+
+    $nation = getNationStaticInfo($general['nation']);
+
+
+    $josaUl = JosaUtil::pick(($nameFunc)($it), '을');
+    $josaYi = JosaUtil::pick($general['name'], '이');
+    $log[] = "<C>●</><C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+    $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+    pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".($nameFunc)($it)."</>{$josaUl} 습득");
+    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【{$headerText}】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+
+    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
+    pushWorldHistory($history, $admin['year'], $admin['month']);
+    pushGenLog($general, $log);
+    return $targetGeneralID;
+}
+
 function uniqueItem($general, $log, $vote=0) {
     //TODO: uniqueItem 재 구현
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
     $alllog = [];
     $history = [];
     $occupied = [];
@@ -2209,118 +2365,71 @@ function uniqueItem($general, $log, $vote=0) {
 
     $admin = $gameStor->getValues(['year', 'month', 'scenario']);
 
-    $query = "select count(*) as cnt from general where npc<2";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gen = MYDB_fetch_array($result);
+    $genCnt = $db->queryFirstField('SELECT count(*) FROM general WHERE npc < 2');
 
-    if($admin['scenario'] < 100)  { $prob = $gen['cnt'] * 5; }  // 5~6개월에 하나씩 등장
-    else { $prob = $gen['cnt']; }  // 1~2개월에 하나씩 등장
+    if($admin['scenario'] < 100)  { $prob = $genCnt * 5; }  // 5~6개월에 하나씩 등장
+    else { $prob = $genCnt; }  // 1~2개월에 하나씩 등장
 
-    if($vote == 1) { $prob = Util::round($gen['cnt'] * 0.7 / 3); }     // 투표율 70%, 투표 한번에 2~3개 등장
-    elseif($vote == 2) { $prob = Util::round($gen['cnt'] / 10 / 2); }   // 랜임시 2개(10%) 등장(200명중 20명 랜임시도?)
-    elseif($vote == 3) { $prob = Util::round($gen['cnt'] / 10 / 4); }   // 건국시 4개(20%) 등장(200명시 20국 정도 됨)
+    if($vote == 1) { $prob = Util::round($genCnt * 0.7 / 3); }     // 투표율 70%, 투표 한번에 2~3개 등장
+    elseif($vote == 2) { $prob = Util::round($genCnt / 10 / 2); }   // 랜임시 2개(10%) 등장(200명중 20명 랜임시도?)
+    elseif($vote == 3) { $prob = Util::round($genCnt / 10 / 4); }   // 건국시 4개(20%) 등장(200명시 20국 정도 됨)
 
     if($prob < 3) { $prob = 3; }
     //아이템 습득 상황
-    if(rand() % $prob == 0) {
-        //셋중 선택
-        $sel = rand() % 4;
-        switch($sel) {
-        case 0: $type = "weap"; break;
-        case 1: $type = "book"; break;
-        case 2: $type = "horse"; break;
-        case 3: $type = "item"; break;
-        }
-        $query = "select no,{$type} from general where {$type}>6";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $count = MYDB_num_rows($result);
-        if($count < 20) {
-            for($i=0; $i < $count; $i++) {
-                $gen = MYDB_fetch_array($result);
-                $occupied[$gen[$type]] = 1;
-            }
-            for($i=7; $i <= 26; $i++) {
-                if(!Util::array_get($occupied[$i])) {
-                    $item[] = $i;
-                }
-            }
-            $it = $item[rand() % count($item)]??0;
+    if (rand() % $prob != 0) {
+        return $log;
 
-            $query = "update general set {$type}='$it' where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    }
+    //셋중 선택
+    $selGroup = [
+        20 - $db->queryFirstField('SELECT count(*) from general where weap > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where book > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where horse > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where item > 6')
+    ];
 
-            $nation = getNationStaticInfo($general['nation']);
+    if(array_sum($selGroup) == 0){
+        return $log;
+    }
 
-            switch($sel) {
-            case 0:
-                $josaUl = JosaUtil::pick(getWeapName($it), '을');
-                $josaYi = JosaUtil::pick($general['name'], '이');
-                $log[] = "<C>●</><C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getWeapName($it)."</>{$josaUl} 습득");
-                if($vote == 0) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                }
-                break;
-            case 1:
-                $josaUl = JosaUtil::pick(getBookName($it), '을');
-                $josaYi = JosaUtil::pick($general['name'], '이');
-                $log[] = "<C>●</><C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getBookName($it)."</>{$josaUl} 습득");
-                if($vote == 0) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                }
-                break;
-            case 2:
-                $josaUl = JosaUtil::pick(getHorseName($it), '을');
-                $josaYi = JosaUtil::pick($general['name'], '이');
-                $log[] = "<C>●</><C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getHorseName($it)."</>{$josaUl} 습득");
-                if($vote == 0) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                }
-                break;
-            case 3:
-                $josaUl = JosaUtil::pick(getItemName($it), '을');
-                $josaYi = JosaUtil::pick($general['name'], '이');
-                $log[] = "<C>●</><C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getItemName($it)."</>{$josaUl} 습득");
-                if($vote == 0) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                }
-                break;
-            }
-            pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-            pushWorldHistory($history, $admin['year'], $admin['month']);
+    $sel = Util::choiceRandomUsingWeight($selGroup);
+    switch($sel) {
+    case 0: [$type, $nameFunc] = ["weap", 'sammo\getWeapName']; break;
+    case 1: [$type, $nameFunc] = ["book", 'sammo\getBookName']; break;
+    case 2: [$type, $nameFunc] = ["horse", 'sammo\getHorseName']; break;
+    case 3: [$type, $nameFunc] = ["item", 'sammo\getItemName']; break;
+    }
+
+    switch($vote){
+    case 1: $voteTypeText = '설문상품'; break;
+    case 2: $voteTypeText = '랜덤임관상품'; break;
+    case 3: $voteTypeText = '건국상품'; break;
+    default: $voteTypeText = '아이템'; break;
+    }
+
+    foreach($db->queryFirstColumn('SELECT %b FROM general WHERE %b > 6', $type, $type) as $itemIdx){
+        $occupied[$itemIdx] = 1;
+    }
+    for($i=7; $i <= 26; $i++) {
+        if(!Util::array_get($occupied[$i])) {
+            $item[] = $i;
         }
     }
+    $it = Util::choiceRandom($item);
+
+    $db->update('general', [$type=>$it], 'no=%i', $general['no']);
+
+    $nation = getNationStaticInfo($general['nation']);
+
+    $josaUl = JosaUtil::pick(($nameFunc)($it), '을');
+    $josaYi = JosaUtil::pick($general['name'], '이');
+    $log[] = "<C>●</><C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+    $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+    pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".($nameFunc)($it)."</>{$josaUl} 습득");
+    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【{$voteTypeText}】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+
+    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
+    pushWorldHistory($history, $admin['year'], $admin['month']);
     return $log;
 }
 
@@ -2550,7 +2659,7 @@ function deleteNation($general) {
     $oldNation['aux'] = Json::decode($oldNation['aux']);
 
     // 전 장수 재야로    // 전 장수 소속 무소속으로
-    $query = "update general set belong=0,troop=0,level=0,nation=0,makelimit=12 where nation='{$general['nation']}'";
+    $query = "update general set belong=0,troop=0,level=0,nation=0,permission='normal',makelimit=12 where nation='{$general['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     // 도시 공백지로
     $query = "update city set nation=0,front=0,gen1=0,gen2=0,gen3=0 where nation='{$general['nation']}'";
@@ -2692,6 +2801,71 @@ function searchDistance(int $from, int $maxDist=99, bool $distForm = false) {
     }
 }
 
+/**
+ * $from 으로 지정한 도시의 인접 도시와 $to 도시의 최단 거리를 계산해 줌
+ * @param $from 기준 도시 코드
+ * @param $to 대상 도시 코드
+ * @param $linkNationList 경로에 해당하는 국가 리스트
+ * @return array  $dist=>[cityID, $nation] 배열 가장 앞이 가장 가까움
+ */
+function searchDistanceListToDest(int $from, int $to, array $linkNationList) {
+    $queue = new \SplQueue();
+
+    $cities = [];
+
+    $db = DB::db();
+
+    //TODO: 도시-국가 캐싱이 있으면 쓸모 있지 않을까 
+    $allowedCityList = [];
+    foreach($db->queryAllLists(
+        'SELECT city, nation FROM city WHERE nation IN %li',
+        $linkNationList
+    ) as [$cityID, $nationID]){
+        $allowedCityList[$cityID] = $nationID;
+    }
+
+    $remainFromCities = [];
+    foreach(array_keys(CityConst::byID($from)->path) as $fromCityID){
+        if(key_exists($fromCityID, $allowedCityList)){
+            $remainFromCities[$fromCityID] = true;
+        }
+    }
+
+    if(!key_exists($to, $allowedCityList)){
+        return [];
+    }
+
+    $result = [];
+    $queue->enqueue([$to, 0]);
+
+    while(!empty($remainFromCities) && !$queue->isEmpty()){
+        list($cityID, $dist) = $queue->dequeue();
+        if(key_exists($cityID, $cities)){
+            continue;
+        }
+
+        $cities[$cityID] = $dist;
+
+        if(key_exists($cityID, $remainFromCities)){
+            unset($remainFromCities[$cityID]);
+            $result[$dist][] = [$cityID, $allowedCityList[$cityID]];
+        }
+
+        foreach(array_keys(CityConst::byID($cityID)->path) as $connCityID){
+            if($allowedCityList !== null && !key_exists($connCityID, $allowedCityList)){
+                continue;
+            }
+            if(key_exists($connCityID, $cities)){
+                continue;
+            }
+            $queue->enqueue([$connCityID, $dist+1]);
+            
+        }
+    }
+
+    return $result;
+}
+
 function isNeighbor(int $nation1, int $nation2, bool $includeNoSupply=true) {
     if($nation1 === $nation2){
         return false;
@@ -2883,16 +3057,24 @@ function SabotageInjury($city, $type=0) {
     return $injuryCount;
 }
 
-function getRandTurn($term) {
+function getRandTurn($term, ?\DateTimeInterface $baseDateTime = null) {
+    if($baseDateTime === null){
+        $baseDateTime = new \DateTimeImmutable();
+    }
+    else if($baseDateTime instanceof \DateTime){
+        $baseDateTime = DateTimeImmutable::createFromMutable($baseDateTime);
+    }
     $randtime = rand(0, 60 * $term - 1);
-    $turntime = date('Y-m-d H:i:s', strtotime('now') + $randtime);
-
-    return $turntime;
+    return $baseDateTime->add(new \DateInterval('PT'.$randtime.'S'))->format('Y-m-d H:i:s');
 }
 
-function getRandTurn2($term) {
+function getRandTurn2($term, ?\DateTimeInterface $baseDateTime = null) {
+    if($baseDateTime === null){
+        $baseDateTime = new \DateTimeImmutable();
+    }
+    else if($baseDateTime instanceof \DateTime){
+        $baseDateTime = DateTimeImmutable::createFromMutable($baseDateTime);
+    }
     $randtime = rand(0, 60 * $term - 1);
-    $turntime = date('Y-m-d H:i:s', strtotime('now') - $randtime);
-
-    return $turntime;
+    return $baseDateTime->sub(new \DateInterval('PT'.$randtime.'S'))->format('Y-m-d H:i:s');
 }

hwe/func_command.php

@@ -103,21 +103,30 @@ function getTurn(array $general, $type, $font=1) {
                 $str[$i] = "【{$general['name']}】{$josaUl} 등용";
                 break;
             case 25: //임관
+                $third = $command[2];
                 $double = $command[1];
 
-                if($double == 98){
-                    $nationName = '건국된 임의 국가';
+                if($third == 98){
+                    $str[$i] = "【건국된 임의 국가】로 임관";
                 }
-                else if($double == 99){
-                    $nationName = '임의의 국가';
+                else if($third == 99){
+                    $str[$i] = "【임의의 국가】로 임관";
+                }
+                else if($third == 1){
+                    $generalName = $db->queryFirstField('SELECT name FROM general WHERE no=%i', $double)??'?!?!';
+                    $josaUl = JosaUtil::pick($generalName, '을');
+                    $str[$i] = "【{$generalName}】{$josaUl} 따라 임관";
+                }
+                else if($third == 0){
+                    $nationName = getNationStaticInfo($double)['name']??'?!?!';
+    
+                    $josaRo = JosaUtil::pick($nationName, '로');
+                    $str[$i] = "【{$nationName}】{$josaRo} 임관";
                 }
                 else{
-                    $nationName = getNationStaticInfo($double)['name']??'?!?!';
+                    $str[$i] = "????";
                 }
                 
-
-                $josaRo = JosaUtil::pick($nationName, '로');
-                $str[$i] = "【{$nationName}】{$josaRo} 임관";
                 break;
             case 26: //집합
                 $str[$i] = "집합";
@@ -161,6 +170,13 @@ function getTurn(array $general, $type, $font=1) {
                 $str[$i] = "【{$city['name']}】에 선동 실행";
                 break;
 
+                case 38: //내특 초기화
+                    $str[$i] = "내정 특기를 초기화";
+                    break;
+                case 39: //전특 초기화
+                    $str[$i] = "전투 특기를 초기화";
+                    break;
+    
             case 41: //단련
                 $str[$i] = "숙련도를 단련";
                 break;
@@ -251,7 +267,9 @@ function getTurn(array $general, $type, $font=1) {
             case 57: //모반 시도
                 $str[$i] = "모반 시도";
                 break;
-
+            case 58: //숙련 전환
+                $str[$i] = "숙련 전환";
+                break;
             default:
                 $str[$i] = "????";
                 break;
@@ -458,6 +476,9 @@ function getCoreTurn($nation, $level) {
 
                 $str[$i] = "【<font color={$color}>국기</font>】를 변경";
                 break;
+            case 82: //국호변경
+                $str[$i] = "국호를 변경";
+                break;
             default:
                 $str[$i] = "????";
                 break;
@@ -472,15 +493,13 @@ function getCoreTurn($nation, $level) {
 }
 
 
-function processCommand($no) {
+function processCommand($no, $reduceTurn) {
     $session = Session::getInstance();
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar from general where no='$no'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
+    $general = $db->queryFirstRow('SELECT npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar,myset,aux from general where no = %i', $no);
     
     list($month, $killturn) = $gameStor->getValuesAsArray(['month', 'killturn']);
     $log = [];
@@ -536,27 +555,37 @@ function processCommand($no) {
                 case 77: process_77($general); break; //이호경식
                 case 78: process_78($general); break; //급습
                 case 81: process_81($general); break; //국기변경
+                case 82: process_82($general); break; //국호변경
                 case 99: break; //수뇌부휴식
             }
 
             //장수정보 재로드
-            $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar from general where no='$no'";
+            $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar,myset,aux from general where no='$no'";
             $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             $general = MYDB_fetch_array($result);
         }
 
         $command = DecodeCommand($general['turn0']);
+        $newKillturn = $killturn;
         //삭턴 처리
         if($general['npc'] >= 2 || $general['killturn'] > $killturn) {
-            $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $newKillturn = $general['killturn'] - 1;
         } elseif($command[0] == 0) {
-            $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $newKillturn = $general['killturn'] - 1;
+        } elseif($reduceTurn == true){
+            $newKillturn = $general['killturn'] - 1;
         } else {
-            $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn='{$killturn}' where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $newKillturn = $killturn;
         }
+
+        $newMySet = min($general['myset'] + 1, 3);
+        $db->update('general', [
+            'recturn'=>$db->sqleval('turn0'),
+            'resturn'=>'FAIL',
+            'con'=>0,
+            'killturn'=>$newKillturn,
+            'myset'=>$newMySet
+        ], 'no = %i', $general['no']);
         //FIXME: 운영자 같이 사망하면 안되는 인물에 대한 처리가 필요
 
         //연속턴 아닌경우 텀 리셋
@@ -603,6 +632,9 @@ function processCommand($no) {
             case 34: process_34($general); break; //파괴
             case 35: process_35($general); break; //선동
 
+            case 38: process_38($general, '내정 특기', 'special', 'specage'); break; //내특 초기화
+            case 39: process_38($general, '전투 특기', 'special2', 'specage2'); break; //내특 초기화
+
             case 41: process_41($general); break; //단련
             case 42: process_42($general); break; //견문
             case 43: process_43($general); break; //증여
@@ -618,6 +650,8 @@ function processCommand($no) {
             case 55: process_55($general); break; //거병
             case 56: process_56($general); break; //해산
             case 57: process_57($general); break; //모반 시도
+
+            case 58: process_58($general); break; //숙련 전환
         }
     }
 }
@@ -702,8 +736,11 @@ where nation='{$general['nation']}'
 
 function command_Single($turn, $command) {
     if(!$turn){
-        header('location:commandlist.php');
-        return;
+        Json::die([
+            'result'=>true,
+            'nextPage'=>null,
+            'reason'=>'invalid turn'
+        ]);
     }
 
     $db = DB::db();
@@ -717,7 +754,11 @@ function command_Single($turn, $command) {
     }
     $db->update('general', $setValues, 'owner=%i',$userID);
     
-    header('location:commandlist.php');
+    Json::die([
+        'result'=>true,
+        'nextPage'=>null,
+        'reason'=>'success'
+    ]);
 }
 
 function command_Chief($turn, $command) {
@@ -740,41 +781,26 @@ function command_Chief($turn, $command) {
         $query = "update nation set {$str} where nation='{$me['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     }
-    header('location:b_chiefcenter.php');
+    header('location:b_chiefcenter.php', true, 303);
 }
 
 function command_Other($turn, $commandtype) {
-
-    $target = "processing.php?commandtype={$commandtype}";
-    foreach($turn as $turnItem){
-        $target.="&turn[]={$turnItem}";
+    if(!$turn){
+        Json::die([
+            'result'=>true,
+            'nextPage'=>null,
+            'reason'=>'invalid turn'
+        ]);
     }
-    $target.="&".mt_rand();
-    ?>
-<!DOCTYPE html>
-<html lang="ko">
-<head>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-    <script>
-parent.moveProcessing(<?=$commandtype?>, <?=Json::encode($turn)?>);
-</script>
-</head>
-<body style="background-color:black;">
 
-</body>
-</html>
-<?php
+    $unixNow = time();
+    $turnArg = join('&turn[]=', $turn);
 
-/*
-<form name='form1' action='processing.php' method='post' target=_parent>
-<?php foreach($turn as $turnItem): ?>
-    <input type='hidden' name='turn[]' value='<?=$turnItem?>'>
-<?php endforeach; ?>
-<input type=hidden name=commandtype value=<?=$commandtype?>>
-</form>&nbsp;
-<script>*/
+    Json::die([
+        'result'=>true,
+        'nextPage'=>"processing.php?commandtype={$commandtype}&turn[]={$turnArg}&t={$unixNow}",
+        'reason'=>'success'
+    ]);
 }
 
 

hwe/func_converter.php

@@ -174,13 +174,10 @@ function getGenSpecial($type) {
     return $call;
 }
 
-function getSpecialInfo(?int $type):?string{
-    if($type === null){
-        return null;
-    }
-
+function getSpecialTextList():array{
+    
     //앞칸은 '설명을 위해' '그냥' 적어둠
-    $infoText = [
+    return [
         0 => ['-', null],
         1 => ['경작', '[내정] 농지 개간 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
         2 => ['상재', '[내정] 상업 투자 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
@@ -219,6 +216,14 @@ function getSpecialInfo(?int $type):?string{
         74 => ['격노', '[전투] 상대방 필살 및 회피 시도시 일정 확률로 격노(필살) 발동, 공격 시 일정 확률로 진노(1페이즈 추가)'],
         75 => ['척사', '[전투] 지역·도시 병종 상대로 대미지 +10%, 아군 피해 -10%']
     ];
+}
+
+function getSpecialInfo(?int $type):?string{
+    if($type === null){
+        return null;
+    }
+
+    $infoText = getSpecialTextList();
 
     return $infoText[$type][1]??null;
 }
@@ -453,36 +458,32 @@ function getTechCall($tech) : string {
 function getDexLevelList(): array{
     return [
         [0, 'navy', 'F-'],
-        [2500, 'navy', 'F'],
-        [7500, 'navy', 'F+'],
-        [15000, 'skyblue', 'E-'],
-        [25000, 'skyblue', 'E'],
-        [37500, 'skyblue', 'E+'],
-        [52500, 'seagreen', 'D-'],
-        [70000, 'seagreen', 'D'],
-        [90000, 'seagreen', 'D+'],
-        [112500, 'teal', 'C-'],
-        [137500, 'teal', 'C'],
-        [165000, 'teal', 'C+'],
-        [195000, 'limegreen', 'B-'],
-        [227500, 'limegreen', 'B'],
-        [262500, 'limegreen', 'B+'],
-        [300000, 'gold', 'A-'],
-        [340000, 'gold', 'A'],
-        [382500, 'gold', 'A+'],
-        [427500, 'darkorange', 'S-'],
-        [475000, 'darkorange', 'S'],
-        [525000, 'darkorange', 'S+'],
-        [577500, 'tomato', 'SS-'],
-        [632500, 'tomato', 'SS'],
-        [690000, 'tomato', 'SS+'],
-        [750000, 'red', 'SSS-'],
-        [812500, 'red', 'SSS'],
-        [877500, 'red', 'SSS+'],
-        [945000, 'darkviolet', 'Z-'],
-        [1015000, 'darkviolet', 'Z'],
-        [1087500, 'darkviolet', 'Z+'],
-        [1162500, 'white', '?']
+        [350, 'navy', 'F'],
+        [1375, 'navy', 'F+'],
+        [3500, 'skyblue', 'E-'],
+        [7125, 'skyblue', 'E'],
+        [12650, 'skyblue', 'E+'],
+        [20475, 'seagreen', 'D-'],
+        [31000, 'seagreen', 'D'],
+        [44625, 'seagreen', 'D+'],
+        [61750, 'teal', 'C-'],
+        [82775, 'teal', 'C'],
+        [108100, 'teal', 'C+'],
+        [138125, 'limegreen', 'B-'],
+        [173250, 'limegreen', 'B'],
+        [213875, 'limegreen', 'B+'],
+        [260400, 'darkorange', 'A-'],
+        [313225, 'darkorange', 'A'],
+        [372750, 'darkorange', 'A+'],
+        [439375, 'tomato', 'S-'],
+        [513500, 'tomato', 'S'],
+        [595525, 'tomato', 'S+'],
+        [685850, 'darkviolet', 'Z-'],
+        [784875, 'darkviolet', 'Z'],
+        [893000, 'darkviolet', 'Z+'],
+        [1010625, 'gold', 'EX-'],
+        [1138150, 'gold', 'EX'],
+        [1275975, 'white', 'EX+'],
     ];
 }
 
@@ -520,7 +521,7 @@ function getDexLevel(int $dex) : int {
 }
 
 function getDexLog($dex1, $dex2) {
-    $ratio = (getDexLevel($dex1) - getDexLevel($dex2)) / 50 + 1;
+    $ratio = (getDexLevel($dex1) - getDexLevel($dex2)) / 55 + 1;
     return $ratio;
 }
 
@@ -757,15 +758,15 @@ function getItemInfo(?int $item):?string{
         9=>['도소연명(치료)', '[군사] 턴 실행 전 부상 회복.'],
         10=>['칠엽청점(치료)', '[군사] 턴 실행 전 부상 회복.'],
         11=>['정력견혈(치료)', '[군사] 턴 실행 전 부상 회복.'],
-        12=>['과실주(훈련)', '[전투] 훈련 보정 +5'],
-        13=>['이강주(훈련)', '[전투] 훈련 보정 +5'],
-        14=>['의적주(사기)', '[전투] 사기 보정 +5'],
-        15=>['두강주(사기)', '[전투] 사기 보정 +5'],
-        16=>['보령압주(사기)', '[전투] 사기 보정 +5'],
-        17=>['철벽서(훈련)', '[전투] 훈련 보정 +7'],
-        18=>['단결도(훈련)', '[전투] 훈련 보정 +7'],
-        19=>['춘화첩(사기)', '[전투] 사기 보정 +7'],
-        20=>['초선화(사기)', '[전투] 사기 보정 +7'],
+        12=>['과실주(훈련)', '[전투] 훈련 보정 +10'],
+        13=>['이강주(훈련)', '[전투] 훈련 보정 +10'],
+        14=>['의적주(사기)', '[전투] 사기 보정 +10'],
+        15=>['두강주(사기)', '[전투] 사기 보정 +10'],
+        16=>['보령압주(사기)', '[전투] 사기 보정 +10'],
+        17=>['철벽서(훈련)', '[전투] 훈련 보정 +14'],
+        18=>['단결도(훈련)', '[전투] 훈련 보정 +14'],
+        19=>['춘화첩(사기)', '[전투] 사기 보정 +14'],
+        20=>['초선화(사기)', '[전투] 사기 보정 +14'],
         21=>['육도(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p'],
         22=>['삼략(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p'],
         23=>['청낭서(의술)', '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 20% 확률로 치료 발동(아군 피해 1/3 감소)'],

hwe/func_gamerule.php

@@ -776,6 +776,7 @@ function checkMerge() {
 
         $db->update('general', [
             'nation'=>0,
+            'permission'=>'normal',
         ], 'nation=%i AND npc = 5', $me['nation']);
 
         $query = "delete from nation where nation='{$me['nation']}'";
@@ -922,6 +923,7 @@ function checkSurrender() {
 
         $db->update('general', [
             'nation'=>0,
+            'permission'=>'normal',
         ], 'nation=%i AND npc = 5', $me['nation']);
 
         $query = "delete from nation where nation='{$me['nation']}'";
@@ -971,7 +973,7 @@ function updateNationState() {
     $connect=$db->get();
 
     $history = array();
-    $admin = $gameStor->getValues(['year', 'month', 'fiction', 'startyear', 'show_img_level', 'turnterm']);
+    $admin = $gameStor->getValues(['year', 'month', 'fiction', 'startyear', 'show_img_level', 'turnterm', 'turntime', 'killturn']);
 
     $query = "select nation,name,level,gennum,tech from nation";
     $nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1003,14 +1005,17 @@ function updateNationState() {
         }
 
         if($nationlevel > $nation['level']) {
+            $levelDiff = $nationlevel - $nation['level'];
             $oldLevel = $nation['level'];
             $nation['level'] = $nationlevel;
+            
 
             switch($nationlevel) {
                 case 7:
                     $josaUl = JosaUtil::pick(getNationLevel($nationlevel), '을');
                     $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>".getNationLevel($nationlevel)."</>{$josaUl} 자칭하였습니다.";
                     pushNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>".getNationLevel($nationlevel)."</>{$josaUl} 자칭");
+                    $db->update('nation', ['can_change_flag'=>1], 'nation=%i', $nation['nation']);
                     break;
                 case 6:
                     $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>".getNationLevel($nationlevel)."</>에 등극하였습니다.";
@@ -1029,6 +1034,34 @@ function updateNationState() {
             }
 
             
+            foreach(range(1, $levelDiff) as $idx){
+                //유니크 아이템 하나 돌리자
+                $targetKillTurn = $admin['killturn'];
+                $targetKillTurn -= 24 * 60 / $admin['turnterm'];
+                $nationGenList = $db->query('SELECT no, level, belong, horse, weap, book, item FROM general WHERE nation = %i AND killturn >= %i AND npc < 2', $nation['nation'], $targetKillTurn);
+                $uniqueLotteryWeightList = [];
+
+                foreach($nationGenList as $nationGen){
+                    if($nationGen['horse'] > 6 || $nationGen['weap'] > 6 || $nationGen['book'] > 6 || $nationGen['item'] > 6){
+                        continue;
+                    }
+                    $score = $nationGen['belong'] + 5; //임관 년도 + 5
+                    if($nationGen['level'] == 12){
+                        $score += 200; //NOTE: 꼬우면 군주하세요.
+                    }
+                    else if($nationGen['level'] == 11){
+                        $score += 70;
+                    }
+                    else if($nationGen['level'] > 4){
+                        $score += 35;
+                    }
+                    $uniqueLotteryWeightList[$nationGen['no']] = $score;
+                }
+                guaranteedUniqueItemLottery($uniqueLotteryWeightList, '작위보상');
+            }
+            
+
+            
             $lastAssemblerID = $gameStor->assembler_id??0;
             for($levelGen = max(1, $oldLevel) + 1; $levelGen <= $nationlevel; $levelGen+=1){
                 if(in_array($levelGen, [3, 5, 7])){
@@ -1041,7 +1074,7 @@ function updateNationState() {
                 while($genStep > 0){
                     $lastAssemblerID += 1;
                     $npcObj = new Scenario\NPC(
-                        999, '부대장'.$lastAssemblerID, null, $nation['nation'], null, 
+                        999, sprintf('부대장%3d',$lastAssemblerID), null, $nation['nation'], null, 
                         10, 10, 10, 1, $admin['year'] - 15, $admin['year'] + 15,  '은둔', '척사'
                     );
                     $npcObj->npc = 5;
@@ -1284,6 +1317,7 @@ function convForOldGeneral(array $general, int $year, int $month){
 function storeOldGeneral(int $no, int $year, int $month){
     $db = DB::db();
     $general = $db->queryFirstRow('SELECT * FROM general WHERE `no` = %i', $no);
+    $general['aux'] = Json::decode($general['aux']);
     if(!$general){
         return;
     }

hwe/func_message.php

@@ -5,14 +5,15 @@ function getMailboxList(){
         
     $generalNations = [];
 
-    foreach(DB::db()->queryAllLists('select `no`, `name`, `nation`, `level`, `npc` from `general` where `npc` < 2') as $general)
+    foreach(DB::db()->query('select `no`, `name`, `nation`, `level`, `npc`, `permission`, `penalty` from `general` where `npc` < 2') as $general)
     {
-        list($generalID, $generalName, $nationID, $level, $npc) = $general;
+        [$generalID, $generalName, $nationID, $level, $npc] = [$general['no'], $general['name'], $general['nation'], $general['level'], $general['npc']];
         if(!isset($generalNations[$nationID])){
             $generalNations[$nationID] = [];
         }
 
         $obj = [$generalID, $generalName, 0];
+        $permission = checkSecretPermission($general, false);
 
         if($level == 12){
             $obj[2] |= 1;
@@ -22,6 +23,10 @@ function getMailboxList(){
             $obj[2] |= 2;
         }
 
+        if($permission == 4){
+            $obj[2] |= 4;
+        }
+
         $generalNations[$nationID][] = $obj;
     }
 
@@ -37,7 +42,7 @@ function getMailboxList(){
             "mailbox"=>$mailbox,
             "name"=>$nationName,
             "color"=>$color,
-            "general"=>$generals
+            "general"=>$generals,
         ];
     }, array_merge([getNationStaticInfo(0)], getAllNationStaticInfo()));
 

hwe/func_npc.php

@@ -1,10 +1,83 @@
 <?php
 namespace sammo;
 
+class AIAllowedAction{
+
+    public $develop = true;
+    public $warp = true;
+
+    public $recruitLowestCivil = false;
+    public $randomRecruit = true;
+    public $recruit = true;
+    public $recruit_high = false;
+    public $train = true;
+    public $atmos = true;
+    public $battle = true;
+
+    public $appointment = true;
+    public $changeWarCondition = true;
+    public $donation = true;
+    public $buySellRice = true;
+
+    public $staffAction = true;
+
+    function __construct($npc, $aiOptions){
+        if($npc >= 2){
+            return;
+        }
+
+        $this->develop = false;
+        $this->warp = false;
+
+        $this->randomRecruit = false;
+        $this->recruit = false;
+        $this->recruit_high = false;
+        $this->train = false;
+        $this->atmos = false;
+        $this->battle = false;
+
+        $this->appointment = false;
+        $this->changeWarCondition = false;
+        $this->donation = false;
+        $this->buySellRice = true;
+
+        $this->staffAction = false;
+
+        $this->recruitLowestCivil = true;
+
+        foreach($aiOptions as $key=>$value){
+            assert($value);
+            switch($key){
+            case 'develop':
+                $this->develop = true;
+                break;
+            case 'warp':
+                $this->warp = true;
+                break;
+            case 'recruit_high': 
+                $this->recruit_high = true;
+            case 'recruit': 
+                $this->recruit = true;
+                break;
+            case 'train':
+                $this->train = true;
+                $this->atmos = true;
+                break;
+            case 'battle':
+                $this->battle = true;
+                break;
+            }
+        }
+    }
+}
+
 function SetDevelop($genType, $no, $city, $tech) {
     $db = DB::db();
     $connect=$db->get();
 
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    [$startyear, $year] = $gameStor->getValuesAsArray(['startyear', 'year']);
+
     $query = "select rate,pop/pop2*100 as po,comm/comm2*100 as co,def/def2*100 as de,wall/wall2*100 as wa,secu/secu2*100 as se,agri/agri2*100 as ag from city where city='$city'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $city = MYDB_fetch_array($result);
@@ -43,20 +116,20 @@ function SetDevelop($genType, $no, $city, $tech) {
     case 3: //지내정장
         if($prob < 40) {
             if($city['ag'] < 99) { $command = EncodeCommand(0, 0, 0, 1); } //농업
-            elseif($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            elseif(!TechLimit($startyear, $year, $tech)) { $command = EncodeCommand(0, 0, 0, 3); } //기술
             elseif($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
             else { $command = EncodeCommand(0, 0, 0, 9); } //조달
         } elseif($prob < 80) {
             if($city['co'] < 99) { $command = EncodeCommand(0, 0, 0, 2); } //상업
-            elseif($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            elseif(!TechLimit($startyear, $year, $tech)) { $command = EncodeCommand(0, 0, 0, 3); } //기술
             elseif($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
             else { $command = EncodeCommand(0, 0, 0, 9); } //조달
         } elseif($prob < 90) {
-            if($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            if(!TechLimit($startyear, $year, $tech)) { $command = EncodeCommand(0, 0, 0, 3); } //기술
             elseif($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
             else { $command = EncodeCommand(0, 0, 0, 9); } //조달
         } else {
-            if($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3 + (rand() % 2) * 6); } //기술, 조달
+            if(!TechLimit($startyear, $year, $tech)) { $command = EncodeCommand(0, 0, 0, 3 + (rand() % 2) * 6); } //기술, 조달
             else { $command = EncodeCommand(0, 0, 0, 29); }
         }
         break;
@@ -80,7 +153,7 @@ function SetDevelop($genType, $no, $city, $tech) {
     return;
 }
 
-function SetCrew($no, $nationID, $personal, $gold, $leader, $genType, $tech, $dex0, $dex10, $dex20, $dex30, $dex40) {
+function SetCrew($no, $nationID, $personal, $gold, $leader, $genType, $tech, $dex0, $dex10, $dex20, $dex30, $dex40, $currentCrewType, AIAllowedAction $allowedAction) {
     $db = DB::db();
     $connect=$db->get();
 
@@ -96,7 +169,6 @@ function SetCrew($no, $nationID, $personal, $gold, $leader, $genType, $tech, $de
     [$startyear, $year] = $gameStor->getValuesAsArray(['startyear', 'year']);
     $relYear = Util::valueFit($year-$startyear, 0);
 
-    $type = 0;
     switch($genType) {
     case 0: //무장
     case 2: //무내정장
@@ -157,7 +229,13 @@ function SetCrew($no, $nationID, $personal, $gold, $leader, $genType, $tech, $de
     }
 
     if($types){
-        $type = Util::choiceRandom($types);
+        if(!$allowedAction->randomRecruit && in_array($currentCrewType, $types) && ($currentCrewType != GameUnitConst::DEFAULT_CREWTYPE && $currentCrewType != $types[0])){
+            $type = $currentCrewType;
+        }
+        else{
+            $type = Util::choiceRandom($types);
+        }
+        
     }
     else{
         $type = GameUnitConst::DEFAULT_CREWTYPE;
@@ -172,19 +250,25 @@ function SetCrew($no, $nationID, $personal, $gold, $leader, $genType, $tech, $de
 
     $crew = intdiv($gold, $cost);
     if($leader < $crew) { $crew = $leader; }
-    $command = EncodeCommand(0, $type, $crew, 11);
+
+    if($allowedAction->recruit_high && $crew * $cost * 6 < $gold){
+        $command = EncodeCommand(0, $type, $crew, 12);
+    }
+    else{
+        $command = EncodeCommand(0, $type, $crew, 11);
+    }
 
     $query = "update general set turn0='$command' where no='$no'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     return;
 }
 
-function processAI($no) {
+function processAI($no, &$reduce_turn) {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $admin = $gameStor->getValues(['startyear','year','month','turnterm','scenario','gold_rate','rice_rate']);
+    $admin = $gameStor->getValues(['startyear','year','month','turnterm','scenario','gold_rate','rice_rate','killturn','autorun_user']);
     // 초반 여부
     if($admin['startyear']+2 > $admin['year'] || ($admin['startyear']+2 == $admin['year'] && $admin['month'] < 5)) {
         $isStart = 1;
@@ -192,7 +276,8 @@ function processAI($no) {
         $isStart = 0;
     }
 
-    $query = "select no,turn0,npcid,name,nation,nations,city,level,npcmsg,personal,leader,intel,power,gold,rice,crew,train,atmos,troop,npc,affinity,mode,injury,picture,imgsvr,killturn,makelimit,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
+
+    $query = "select no,turn0,npcid,name,nation,nations,city,level,npcmsg,personal,leader,intel,power,horse,weap,book,item,special,special2,gold,rice,crew,crewtype,train,atmos,troop,npc,affinity,mode,injury,picture,imgsvr,killturn,makelimit,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
     $result = MYDB_query($query, $connect) or Error("processAI01 ".MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
 
@@ -204,7 +289,24 @@ function processAI($no) {
                 'killturn'=>1
             ], 'no=%i', $general['no']);
         }
+        else if($general['level'] == 12){
+            $newRuler = $db->queryFirstField('SELECT `no` FROM general WHERE nation = %i AND no != %i ORDER BY RAND() LIMIT 1', $general['nation'], $general['no']);
+            if($newRuler){
+                $command = EncodeCommand(0, 0, $newRuler, 54); //선양
+                $db->update('general', [
+                    'turn0'=>$command,
+                    'turn1'=>$command,
+                    'turn2'=>$command,
+                    'turn3'=>$command,
+                    'turn4'=>$command,
+                    'killturn'=>rand(70,75),
+                ], 'no=%i', $general['no']);
+            }
+            
+        }
         else{
+            $newKillTurn = ($general['killturn'] + Util::randRangeInt(1, 4)) % 5;
+            $newKillTurn += 70;
             $command = EncodeCommand(0, 0, 0, 26); //집합
             $db->update('general', [
                 'turn0'=>$command,
@@ -213,22 +315,65 @@ function processAI($no) {
                 'turn3'=>$command,
                 'turn4'=>$command,
                 'turn5'=>$command,
-                'killturn'=>rand(70,75),
+                'killturn'=>$newKillTurn,
             ], 'no=%i', $general['no']);
         }
 
         return;
     }
 
+    $autorun_user = $admin['autorun_user'];
+    if($general['npc'] < 2){
+        $autorun_limit_minutes = $autorun_user['limit_minutes']??0;
+        if(!$autorun_limit_minutes){
+            return;
+        }
+        if($general['nation'] == 0){
+            return;
+        }
+        $blankTurnCnt = $admin['killturn']-$general['killturn'];
+        if($blankTurnCnt * $admin['turnterm'] > $autorun_limit_minutes){
+            return;
+        }
+    }
+
     // 입력된 턴이 있으면 그것 실행
     if(DecodeCommand($general['turn0'])[0] != 0) {
         return;
     }
 
-    $query = "select city,region,nation,level,path,rate,gen1,gen2,gen3,pop,supply,front from city where city='{$general['city']}'";
+    $reduce_turn = true;
+
+    $allowedAction = new AIAllowedAction($general['npc'], $autorun_user['options']??[]);
+    if($general['troop'] && $allowedAction->warp){
+        $troopLeader = $db->queryFirstRow(
+            'SELECT general.no,general.name,general.city,turn0,troop,general.nation, city.nation AS city_nation FROM general JOIN city ON city.city = general.city WHERE troop = %i', $general['troop']
+        );
+
+        if(!$troopLeader){
+            //부대장 사망..?
+        }
+        else if(DecodeCommand($troopLeader['turn0'])[0] != 26){
+            //valid
+        }
+        else if($troopLeader['nation'] == $troopLeader['city_nation']){
+            //valid
+        }
+        else{
+            $allowedAction->warp = false;
+        }
+    }
+
+    $query = "select city,region,nation,level,path,rate,gen1,gen2,gen3,pop,supply,front,trade from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error("processAI02 ".MYDB_error($connect),"");
     $city = MYDB_fetch_array($result);
 
+    if ($general['npc'] < 2 && $allowedAction->buySellRice) {
+        if($city['trade'] == 0){
+            $allowedAction->buySellRice = false;
+        }
+    }
+
     $query = "select nation,level,tech,gold,rice,rate,type,color,name,war from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error("processAI03 ".MYDB_error($connect),"");
     $nation = MYDB_fetch_array($result)??[
@@ -241,6 +386,9 @@ function processAI($no) {
         'tech'=>0,
     ];
 
+    setLeadershipBonus($general, $nation['level']);
+    $leadership = getGeneralLeadership($general, false, true, true, true);
+
     $coreCommand = array();
     if($general['level'] >= 5) {
         $query = "select l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
@@ -307,17 +455,11 @@ function processAI($no) {
     $tech = getTechCost($nation['tech']);
     $resrc = $tech * 700;//XXX: 왜 700이지?
 
-    if($general['atmos'] >= 90 && $general['train'] >= 90) {
-        if($general['mode'] == 0) {
-            $query = "update general set mode=1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
-        }
-    } else {
-        if($general['mode'] == 1) {
-            $query = "update general set mode=0 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
-        }
+    if($allowedAction->changeWarCondition && $general['mode'] != 2){
+        $query = "update general set mode=2 where no='{$general['no']}'";
+        MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
     }
+    
 
     //운영자메시지 출력 하루 6번..?
     //특별 메세지 있는 경우 출력 하루 4번
@@ -349,7 +491,7 @@ function processAI($no) {
 
         $rulerNation = $db->queryFirstField('SELECT nation FROM general WHERE `level`=12 AND npc=9 and nation not in %li ORDER BY RAND() limit 1', Json::decode($general['nations']));
         
-        if($ruler) {
+        if($rulerNation) {
             $command = EncodeCommand(0, 0, $rulerNation, 25); //임관
         } else {
             $command = EncodeCommand(0, 0, 0, 42); //견문
@@ -357,7 +499,7 @@ function processAI($no) {
         $query = "update general set turn0='$command' where no='{$general['no']}'";
         MYDB_query($query, $connect) or Error("processAI07 ".MYDB_error($connect),"");
         return;
-    } elseif($general['npc'] != 9 && $general['level'] == 0) {
+    } elseif($general['npc'] != 9 && $general['level'] == 0 && $allowedAction->appointment) {
         switch(Util::choiceRandomUsingWeight([11.4, 40, 20, 28.6])) {
         //임관 10%
         case 0:
@@ -382,7 +524,7 @@ function processAI($no) {
             }
             else{
                 //랜임 커맨드 입력.
-                $command = EncodeCommand(0, 0, 99, 25); //임관
+                $command = EncodeCommand(0, 99, 0, 25); //임관
             }
             break;
         case 1: //거병이나 견문 40%
@@ -412,7 +554,7 @@ function processAI($no) {
 
     $rulerCommand = 0;
     //군주가 할일
-    if($general['level'] == 12) {
+    if($general['level'] == 12 && $allowedAction->staffAction) {
         //오랑캐인데 공격 못하면 바로 방랑/해산
         if($general['npc'] == 9 && $dipState == 0 && !$attackable) {
             //방랑군이냐 아니냐
@@ -527,7 +669,7 @@ function processAI($no) {
     }
 
     //방랑군 아니고, 입력된 턴이 없을때 수뇌부가 할일
-    if($nation['level'] != 0 && $general['level'] >= 5 && $rulerCommand == 0) {
+    if($nation['level'] != 0 && $general['level'] >= 5 && $rulerCommand == 0 && $allowedAction->staffAction) {
         $command = NPCStaffWork($general, $nation, $dipState);
         if($command){
             $db->update('nation', [
@@ -549,7 +691,7 @@ function processAI($no) {
     } elseif($general['injury'] > 10) {
     // 부상 2달 이상이면 요양
         $command = EncodeCommand(0, 0, 0, 50);  //요양
-    } elseif($nation['level'] == 0) {
+    } elseif($nation['level'] == 0 && $allowedAction->appointment) {
     //방랑군일때
         if($admin['startyear']+3 <= $admin['year']) {
             $command = EncodeCommand(0, 0, 0, 45); //하야
@@ -571,7 +713,7 @@ function processAI($no) {
             return;
         }
 
-        if($general['leader'] < 40){
+        if($general['leader'] < 40 && $allowedAction->donation){
             //무지장인데
             
             if(
@@ -606,7 +748,7 @@ function processAI($no) {
         }
 
         //국가 병량이 없을때 바로 헌납
-        if($nation['rice'] < 2000 && $general['rice'] > 200) {
+        if($nation['rice'] < 2000 && $general['rice'] > 200 && $allowedAction->donation) {
             $amount = intdiv($general['rice'] - 200, 100) + 1;
             if($amount > 20) { $amount = 20; }
             $command = EncodeCommand(0, 2, $amount, 44);  //헌납
@@ -626,23 +768,23 @@ function processAI($no) {
         
         $target = array();
         // 평시거나 초반아니면서 공격가능 없으면서 병사 있으면 해제(25%)
-        if($dipState == 0 && $isStart == 0 && !$attackable && $general['crew'] > 0 && rand()% 100 < 25) {
+        if($allowedAction->recruit && $dipState == 0 && $isStart == 0 && !$attackable && $general['crew'] > 0 && rand()% 100 < 25) {
             $command = EncodeCommand(0, 0, 0, 17);    //소집해제
         } elseif($dipState <= 1 || $isStart == 1) {
         //평시이거나 선포있어도 초반이면
             if($general['gold'] + $general['rice'] < 200) { $command = EncodeCommand(0, 0, 0, 9); } //금쌀없으면 조달9
-            elseif($general['rice'] > 100 && $city['rate'] < 95) { $command = EncodeCommand(0, 0, 0, 4); } //우선 선정
-            elseif($general['gold'] < 100) {                                      //금없으면 쌀팜
+            elseif($general['rice'] > 100 && $city['rate'] < 95 && $allowedAction->develop) { $command = EncodeCommand(0, 0, 0, 4); } //우선 선정
+            elseif($general['gold'] < 100 && $allowedAction->buySellRice) {                                      //금없으면 쌀팜
                 $amount = intdiv(($general['rice'] - $general['gold'])/2, 100);   // 100단위
                 $command = EncodeCommand(0, 1, $amount, 49);                    //팜
-            } elseif($general['gold'] < 500 && $general['rice'] < 500) { $command = EncodeCommand(0, 0, 0, 1); } //금쌀되면 내정
-            elseif($general['rice'] < 100) {                                      //쌀없으면 쌀삼
+            } elseif($general['gold'] < 500 && $general['rice'] < 500 && $allowedAction->develop) { $command = EncodeCommand(0, 0, 0, 1); } //금쌀되면 내정
+            elseif($general['rice'] < 100 && $allowedAction->buySellRice) {                                      //쌀없으면 쌀삼
                 $amount = intdiv(($general['gold'] - $general['rice'])/2, 100);  // 100단위
                 $command = EncodeCommand(0, 2, $amount, 49);                    //삼
-            } elseif($genType >= 2) { $command = EncodeCommand(0, 0, 0, 1); } //내정장일때 내정
+            } elseif($genType >= 2 && $allowedAction->develop) { $command = EncodeCommand(0, 0, 0, 1); } //내정장일때 내정
             else {
                 //현도시가 전방이면 공격 가능성 체크
-                if($city['front'] > 0) {
+                if($city['front'] > 0 && $allowedAction->battle) {
                     //주변도시 체크
                     $paths = explode('|', $city['path']);
                     for($i=0; $i < count($paths); $i++) {
@@ -667,6 +809,11 @@ function processAI($no) {
                     $sel = rand() % 10;
                     if($selCity['dev'] > 95) { $sel = 9; }
                     elseif($selCity['dev'] < 70) { $sel = 0; }
+
+                    if(!$allowedAction->warp){
+                        $sel = 0;
+                    }
+
                     switch($sel) {
                     case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: // 그대로 내정 80 %
                         $command = EncodeCommand(0, 0, 0, 1);
@@ -709,22 +856,22 @@ function processAI($no) {
 
                 } else {                // 공격인 경우
                     if($general['crew'] < 1000 && $general['gold'] >= $resrc && $general['rice'] >= $resrc) { //자원되고, 병사없을때
-                        if($city['pop'] > 40000) { $command = EncodeCommand(0, 0, 0, 11); }
+                        if($city['pop'] > 40000 && $allowedAction->recruit) { $command = EncodeCommand(0, 0, 0, 11); }
                         else { $command = EncodeCommand(0, 0, 0, 1); }
-                    } elseif($general['rice'] < $resrc && $general['rice'] <= $general['gold']) {
+                    } elseif($general['rice'] < $resrc && $general['rice'] <= $general['gold'] && $allowedAction->buySellRice) {
                         //금이 더 많으면 매매
                         $amount = intdiv(($general['gold'] - $general['rice']) / 2, 100);  // 100단위
                         if($amount > 0) { $command = EncodeCommand(0, 2, $amount, 49); }//삼
                         else { $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1); }   // 내정, 조달
-                    } elseif($general['gold'] < $resrc && $general['rice'] > $general['gold']) {
+                    } elseif($general['gold'] < $resrc && $general['rice'] > $general['gold'] && $allowedAction->buySellRice) {
                         //쌀이 더 많으면 매매
                         $amount = intdiv(($general['rice'] - $general['gold']) / 2, 100);  // 100단위
                         if($amount > 0) { $command = EncodeCommand(0, 1, $amount, 49); }//팜
                         else { $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1); }   // 내정, 조달
                     //자원, 병사 모두 충족
-                    } elseif($general['crew'] >= 1000 && $general['train'] < 90) {
+                    } elseif($general['crew'] >= 1000 && $general['train'] < 90 && $allowedAction->train) {
                         $command = EncodeCommand(0, 0, 0, 13);  //훈련
-                    } elseif($general['crew'] >= 1000 && $general['atmos'] < 90) {
+                    } elseif($general['crew'] >= 1000 && $general['atmos'] < 90 && $allowedAction->atmos) {
                         $command = EncodeCommand(0, 0, 0, 14);  //사기진작
                     } else {
                         //공격
@@ -744,18 +891,18 @@ function processAI($no) {
 
         //전시일때
             if($general['gold'] + $general['rice'] < $resrc*2) { $command = EncodeCommand(0, 0, 0, 9); } //금쌀없으면 조달
-            elseif($general['rice'] > $resrc && $city['rate'] < 95 && $city['front'] == 0) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
-            elseif($general['rice'] > $resrc && $city['rate'] < 50 && $city['front'] > 0) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
-            elseif($general['gold'] < $resrc || ($general['gold'] < $resrc *2 && $general['rice'] > $resrc * 6)) {                                   // 금없으면 쌀팜
+            elseif($general['rice'] > $resrc && $city['rate'] < 95 && $city['front'] == 0 && $allowedAction->develop) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
+            elseif($general['rice'] > $resrc && $city['rate'] < 50 && $city['front'] > 0 && $allowedAction->develop) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
+            elseif(($general['gold'] < $resrc || ($general['gold'] < $resrc *2 && $general['rice'] > $resrc * 6)) && $allowedAction->buySellRice) {                                   // 금없으면 쌀팜
                 $amount = intdiv(($general['rice'] - $general['gold'])/2, 100);   // 100단위
                 if($amount > 0) { $command = EncodeCommand(0, 1, $amount, 49); }// 팜
                 else { $command = EncodeCommand(0, 0, 0, 9); }                  // 조달
-            } elseif($general['rice'] < $resrc || ($general['rice'] < $resrc *2 && $general['gold'] > $resrc * 6)) {                                 // 쌀없으면 쌀삼
+            } elseif(($general['rice'] < $resrc || ($general['rice'] < $resrc *2 && $general['gold'] > $resrc * 6)) && $allowedAction->buySellRice) {                                 // 쌀없으면 쌀삼
                 $amount = intdiv(($general['gold'] - $general['rice'])/2, 100);   // 100단위
                 if($amount > 0) { $command = EncodeCommand(0, 2, $amount, 49); }// 팜
                 else { $command = EncodeCommand(0, 0, 0, 9); }                  // 조달
             } elseif($genType >= 2) { $command = EncodeCommand(0, 0, 0, 1); } //내정장일때 내정
-            elseif($general['crew'] < 1000 && $general['gold'] >= $resrc && $general['rice'] >= $resrc) {
+            elseif($general['crew'] < 1000 && $general['gold'] >= $resrc && $general['rice'] >= $resrc && $allowedAction->recruit) {
                 $query = "select no from general where nation='{$general['nation']}'";
                 $result = MYDB_query($query, $connect) or Error("processAI16 ".MYDB_error($connect),"");
                 $genCount = MYDB_num_rows($result);
@@ -773,38 +920,29 @@ function processAI($no) {
                 $ratio2 = Util::round($genCount2 / $genCount * 100);
                 $ratio3 = rand() % 100;
                 // 전체 인구 대비 확률로 현지에서 징병
-                if($city['pop'] > 40000 && 100 + $ratio - $ratio2 > $ratio3) {
+                $minRecruitPop = 30000 + max($allowedAction->recruitLowestCivil?0:20000, $leadership * 100);
+                if($city['pop'] >= $minRecruitPop && 100 + $ratio - $ratio2 > $ratio3) {
                     $command = EncodeCommand(0, 0, 0, 11);  //인구 되면 징병
-                } else {
-                    // 인구 안되면 4만 이상인 도시로 워프
-                    $query = "select city from city where nation='{$general['nation']}' and pop>40000 and supply='1' order by rand() limit 0,1";
-                    $result = MYDB_query($query, $connect) or Error("processAI16 ".MYDB_error($connect),"");
-                    $cityCount = MYDB_num_rows($result);
-                    if($cityCount > 0) {
+                } else{
+                    $warpCityID = $db->queryFirstField('SELECT city FROM city WHERE nation=%i AND pop>=%i AND supply=1 ORDER BY rand() limit 1', $general['nation'], $minRecruitPop);
+                    if($warpCityID && $allowedAction->warp) {
                         $selCity = MYDB_fetch_array($result);
                         //워프
-                        $query = "update general set city='{$selCity['city']}' where no='{$general['no']}'";
-                        MYDB_query($query, $connect) or Error("processAI18 ".MYDB_error($connect),"");
+                        $db->update('general', [
+                            'city'=>$warpCityID
+                        ], 'no=%i', $general['no']);
 
                         $command = EncodeCommand(0, 0, 0, 50);  //요양
                         $query = "update general set turn0='$command' where no='{$general['no']}'";
                         MYDB_query($query, $connect) or Error("processAI23 ".MYDB_error($connect),"");
                         return;
-                    } else {
+                    } else if($allowedAction->develop){
                         $command = EncodeCommand(0, 0, 0, 7);  //인구 안되면 정장
                     }
                 }
-            } elseif($general['crew'] >= 1000 && $general['train'] < 90) {
-                if($general['atmos'] >= 90 && $general['train'] >= 60 && $general['mode'] == 0) {
-                    $query = "update general set mode=1 where no='{$general['no']}'";
-                    MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
-                }
+            } elseif($general['crew'] >= 1000 && $general['train'] < 90 && $allowedAction->train) {
                 $command = EncodeCommand(0, 0, 0, 13);  //훈련
-            } elseif($general['crew'] >= 1000 && $general['atmos'] < 90) {
-                if($general['atmos'] >= 60 && $general['train'] >= 90 && $general['mode'] == 0) {
-                    $query = "update general set mode=1 where no='{$general['no']}'";
-                    MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
-                }
+            } elseif($general['crew'] >= 1000 && $general['atmos'] < 90 && $allowedAction->atmos) {
                 $command = EncodeCommand(0, 0, 0, 14);  //사기진작
             } elseif($dipState <= 3) {
                 $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1);   // 준비는 됐으나 아직 선포중이면 내정, 조달
@@ -824,32 +962,37 @@ function processAI($no) {
                         if($dip['state'] == 0) $target[] = $targetCity['city'];
                     }
                 }
-                if(count($target) == 0) {
-                    //전방 도시 선택, 30% 확률로 태수 있는 전방으로 워프
-                    if(rand()%100 < 30) {
-                        $query = "select city from city where nation='{$general['nation']}' and supply='1' and front>0 order by gen1 desc,rand() limit 0,1";
-                    } else {
-                        $query = "select city from city where nation='{$general['nation']}' and supply='1' and front>0 order by rand() limit 0,1";
+                if(count($target) == 0 && $allowedAction->warp) {
+                    //전방 도시 선택, 태수, 군사, 시중이 배정되어 있으면 이동 확률 증가
+                    $warpCities = $db->queryAllLists('SELECT city, gen1, gen2, gen3 FROM city WHERE nation = %i AND supply = 1 AND front > 0', $general['nation']);
+                    $warpCandidates = [];
+                    foreach($warpCities as [$cityID, $gen1, $gen2, $gen3]){
+                        $score = 1;
+                        if($gen1){
+                            $score += 1;
+                        }
+                        if($gen2){
+                            $score += 1;
+                        }
+                        if($gen3){
+                            $score += 1;
+                        }
+                        $warpCandidates[$cityID] = $score;
                     }
-                    $result = MYDB_query($query, $connect) or Error("processAI10 ".MYDB_error($connect),"");
-                    $cityCount = MYDB_num_rows($result);
-                    if($cityCount == 0) {
+                    if($warpCandidates){
+                        $selCity = Util::choiceRandomUsingWeight($warpCandidates);
+                    }
+                    else{
                         //도시 수, 랜덤(상위 20%) 선택, 저개발 도시 선택
-                        $query = "select city from city where nation='{$general['nation']}' and supply='1'";
-                        $result = MYDB_query($query, $connect) or Error("processAI10 ".MYDB_error($connect),"");
-                        $cityCount = MYDB_num_rows($result);
-                        $citySelect = rand() % (Util::round($cityCount/5) + 1);
+                        $cityCnt = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND supply=1', $general['nation']);
+                        $citySelect = Util::randRangeInt(0, Util::toInt($cityCnt/5));
 
-                        $query = "select city,(def+wall)/(def2+wall2) as dev from city where nation='{$general['nation']}' and supply='1' order by dev limit {$citySelect},1";
-                        $result = MYDB_query($query, $connect) or Error("processAI10 ".MYDB_error($connect),"");
-                        $selCity = MYDB_fetch_array($result);
-                    } else {
-                        $selCity = MYDB_fetch_array($result);
+                        $selCity = $db->queryFirstField('SELECT city, (def+wall)/(def2+wall2) as dev from city where nation=%i and supply=1 order by dev limit %i,1',$general['nation'], $citySelect);
                     }
 
-                    if($general['city'] != $selCity['city']) {
+                    if($general['city'] != $selCity) {
                         //워프
-                        $query = "update general set city='{$selCity['city']}' where no='{$general['no']}'";
+                        $query = "update general set city='{$selCity}' where no='{$general['no']}'";
                         MYDB_query($query, $connect) or Error("processAI18 ".MYDB_error($connect),"");
 
                         $command = EncodeCommand(0, 0, 0, 50);  //요양
@@ -859,20 +1002,36 @@ function processAI($no) {
                     } else {
                         $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1); //공격 가능도시가 없고 워프도 안되면 내정, 조달
                     }
-                } elseif($nation['war'] == 1) {
+                } elseif($nation['war'] == 1 || !$allowedAction->battle) {
                     //전금이면 내정, 조달
                     $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1);   //내정, 조달
-                } else { $command = EncodeCommand(0, 0, $target[rand()%count($target)], 16); }  //있으면 공격
+                } else if($target && $general['crew'] >= 1000){ $command = EncodeCommand(0, 0, $target[rand()%count($target)], 16); }  //있으면 공격
             }
         }
     }
 
     switch($command) {
     case EncodeCommand(0, 0, 0, 1): //내정
-        SetDevelop($genType, $general['no'], $general['city'], $nation['tech']);
+        if($allowedAction->develop){
+            SetDevelop($genType, $general['no'], $general['city'], $nation['tech']);
+        }
+        else{
+            $db->update('general', [
+                'turn0'=>EncodeCommand(0, 0, 0, 29)
+            ], 'no=%i', $general['no']);
+        }
+        
         return;
     case EncodeCommand(0, 0, 0, 11): //징병
-        SetCrew($general['no'], $general['nation'], $general['personal'], $general['gold'], $general['leader'], $genType, $nation['tech'], $general['dex0'], $general['dex10'], $general['dex20'], $general['dex30'], $general['dex40']);
+        if ($allowedAction->recruit) {
+            SetCrew($general['no'], $general['nation'], $general['personal'], $general['gold'], $leadership, $genType, $nation['tech'], $general['dex0'], $general['dex10'], $general['dex20'], $general['dex30'], $general['dex40'], $general['crewtype'], $allowedAction);
+        }
+        else{
+            $db->update('general', [
+                'turn0'=>EncodeCommand(0, 0, 0, 29)
+            ], 'no=%i', $general['no']);
+        }
+        
         return;
     default:
         $query = "update general set turn0='$command' where no='{$general['no']}'";
@@ -891,7 +1050,6 @@ function NPCStaffWork($general, $nation, $dipState){
 
     $nationCities = [];
     $frontCitiesID = [];
-    $frontImportantCitiesID = [];
     $supplyCitiesID = [];
     $backupCitiesID = [];
 
@@ -913,10 +1071,18 @@ function NPCStaffWork($general, $nation, $dipState){
         if($nationCity['supply']){
             $supplyCitiesID[] = $cityID;
             if($nationCity['front']){
-                $frontCitiesID[] = $cityID;
+                $score = 1;
                 if($nationCity['gen1']){
-                    $frontImportantCitiesID[] = $cityID;
+                    $score += 1;
                 }
+                if($nationCity['gen2']){
+                    $score += 1;
+                }
+                if($nationCity['gen3']){
+                    $score += 1;
+                }
+                $frontCitiesID[$cityID] = $score;
+                
             }
             else{
                 $backupCitiesID[] = $cityID;
@@ -924,7 +1090,6 @@ function NPCStaffWork($general, $nation, $dipState){
         }
     }
     Util::shuffle_assoc($nationCities);
-    shuffle($frontCitiesID);
     shuffle($supplyCitiesID);
 
     $nationGenerals = [];
@@ -982,7 +1147,7 @@ function NPCStaffWork($general, $nation, $dipState){
         $lostGeneral = $nationGenerals[$lostGeneralID];
         if($lostGeneral['npc'] < 2){
             if($dipState >= 3 && $frontCitiesID){
-                $selCityID = Util::choiceRandom($frontCitiesID);
+                $selCityID = Util::choiceRandomUsingWeight($frontCitiesID);
             }
             else{
                 $selCityID = Util::choiceRandom($supplyCitiesID);
@@ -1134,7 +1299,7 @@ function NPCStaffWork($general, $nation, $dipState){
             continue;
         }
         if($dipState >= 3 && $frontCitiesID){
-            $selCityID = Util::choiceRandom($frontCitiesID);
+            $selCityID = Util::choiceRandomUsingWeight($frontCitiesID);
         }
         else{
             $selCityID = Util::choiceRandom($supplyCitiesID);
@@ -1252,12 +1417,7 @@ function NPCStaffWork($general, $nation, $dipState){
                 $score *= 4;
             }
     
-            if(Util::randBool(0.3) && $frontImportantCitiesID){
-                $targetCityID = Util::choiceRandom($frontImportantCitiesID);
-            }
-            else{
-                $targetCityID = Util::choiceRandom($frontCitiesID);
-            }
+            $targetCityID = Util::choiceRandomUsingWeight($frontCitiesID);
             
             $command = EncodeCommand(0, $nationGeneral['no'], $targetCityID, 27);
 
@@ -1293,7 +1453,7 @@ function NPCStaffWork($general, $nation, $dipState){
             if(!$generalCity['front']){
                 continue;
             }
-            if($generalCity['pop'] - 33000 > $nationGeneral['leader']){
+            if($generalCity['pop'] - 33000 > $nationGeneral['leader'] * 100){
                 continue;
             }
             if($nationGeneral['troop'] != 0){
@@ -1308,7 +1468,7 @@ function NPCStaffWork($general, $nation, $dipState){
             $popTrial = 5;
             for($popTrial = 0; $popTrial < 5; $popTrial++){
                 $targetCity = $nationCities[Util::choiceRandom($backupCitiesID)];
-                if($targetCity['pop'] < 33000 + $nationGeneral['leader']){
+                if($targetCity['pop'] < 33000 + $nationGeneral['leader'] * 100){
                     continue;
                 }
                 if (Util::randBool($targetCity['pop'] / $targetCity['pop2'])) {
@@ -1416,6 +1576,10 @@ function Promotion($nation, $level) {
         $query = "update general set level={$i2} where no='{$level['no']}'";
         MYDB_query($query, $connect) or Error("Promotion_02 ".MYDB_error($connect),"");
     }
+
+    $db->update('general', [
+        'permission'=>'ambassador',
+    ], 'nation=%i AND npc < 2 AND level > 4', $nation);
 }
 
 function TaxRate($nation) {

hwe/func_process.php

@@ -159,6 +159,17 @@ function CriticalRatioDomestic(&$general, $type) {
     );
 }
 
+function calcLeadershipBonus($generalLevel, $nationLevel):int{
+    if($generalLevel == 12) {
+        $lbonus = $nationLevel * 2;
+    } elseif($generalLevel >= 5) {
+        $lbonus = $nationLevel;
+    } else {
+        $lbonus = 0;
+    }
+    return $lbonus;
+}
+
 /**
  * 수뇌직 통솔 보너스 계산
  * 
@@ -168,13 +179,7 @@ function CriticalRatioDomestic(&$general, $type) {
  * @return int 계산된 $general['lbonus'] 값
  */
 function setLeadershipBonus(&$general, $nationLevel){
-    if($general['level'] == 12) {
-        $lbonus = $nationLevel * 2;
-    } elseif($general['level'] >= 5) {
-        $lbonus = $nationLevel;
-    } else {
-        $lbonus = 0;
-    }
+    $lbonus = calcLeadershipBonus($general['level'], $nationLevel);
     $general['lbonus'] = $lbonus;
     return $lbonus;
 }
@@ -273,8 +278,15 @@ function process_1(&$general, $type) {
         $exp = CharExperience($exp, $general['personal']);
         $ded = CharDedication($ded, $general['personal']);
 
-        if($city['front'] == 1 && $city['city'] != $nation['capital']){
-            $score *= 0.5;
+        if($city['front'] == 1){
+            if($city['city'] == $nation['capital']){
+                $degrade = 1 - ($admin['year'] - $admin['startyear'] - 5) * 0.025;
+                $score *= Util::valueFit($degrade, 0.5, 1);
+            }
+            else{
+                $score *= 0.5;
+            }
+            
         }
 
         $score += $city["$stype"];
@@ -373,7 +385,7 @@ function process_3(&$general) {
         $gencount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i', $general['nation']);
         $gencnt_eff = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc != 5', $general['nation']);
         if ($gencnt_eff < GameConst::$initialNationGenLimit) {
-            $gencount = GameConst::$initialNationGenLimit;
+            $gencount = max(GameConst::$initialNationGenLimit, $gencount);
             $gencnt_eff = GameConst::$initialNationGenLimit;
         }
 
@@ -571,14 +583,27 @@ function process_5(&$general, $type) {
         $exp = $score * 0.7;
         $ded = $score * 1.0;
 
-        if($city['front'] == 1 && $city['city'] != $nation['capital']){
-            if($stype == 'def'){
-                $score *= 0.5;
+        if($city['front'] == 1){
+            if($city['city'] == $nation['capital']){
+                if($stype == 'def'){
+                    $degrade = 1 - ($admin['year'] - $admin['startyear'] - 5) * 0.025;
+                    $score *= Util::valueFit($degrade, 0.5, 1);
+                }
+                else{
+                    $degrade = 1 - ($admin['year'] - $admin['startyear'] - 5) * 0.0375;
+                    $score *= Util::valueFit($degrade, 0.25, 1);
+                }
             }
             else{
-                $score *= 0.25;
+                if($stype == 'def'){
+                    $score *= 0.5;
+                }
+                else{
+                    $score *= 0.25;
+                }
             }
             
+            
         }
 
         // 성격 보정
@@ -1248,7 +1273,6 @@ function process_15(&$general) {
 function process_16(&$general) {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
 
     $log = [];
     $alllog = [];
@@ -1257,71 +1281,134 @@ function process_16(&$general) {
 
     $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
-    $query = "select nation,war,sabotagelimit,tech from nation where nation='{$general['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    $query = "select nation,supply from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($result);
+    $nation = $db->queryFirstRow('SELECT nation,war,sabotagelimit,tech from nation where nation=%i', $general['nation']);
+    $city = $db->queryFirstRow('SELECT nation,supply from city where city=%i', $general['city']);
 
     $command = DecodeCommand($general['turn0']);
-    $destination = $command[1];
+    $finalTarget = $command[1];
+    $finalDestCityName = CityConst::byID($finalTarget)->name;
 
-    $query = "select * from city where city='$destination'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $destcity = MYDB_fetch_array($result);
-
-    $query = "select nation,sabotagelimit,tech from nation where nation='{$destcity['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $dnation = MYDB_fetch_array($result);
-
-    $query = "select state from diplomacy where me='{$general['nation']}' and you='{$destcity['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $dip = MYDB_fetch_array($result);
-
-    if(key_exists($destination, CityConst::byID($general['city'])->path)){
-        $nearCity = true;
-    }
-    else{
-        $nearCity = false;
-    }
-
-    $josaRo = JosaUtil::pick($destcity['name'], '로');
     if($admin['year'] < $admin['startyear']+3) {
-        $log[] = "<C>●</>{$admin['month']}월:현재 초반 제한중입니다. <G><b>{$destcity['name']}</b></>{$josaRo} 출병 실패. <1>$date</>";
-//    } elseif($city['supply'] == 0) {
-//        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. <G><b>{$destcity['name']}</b></>{$josaRo} 출병 실패. <1>$date</>";
-    } elseif(!$nearCity) {
-        $log[] = "<C>●</>{$admin['month']}월:인접도시가 아닙니다. <G><b>{$destcity['name']}</b></>{$josaRo} 출병 실패. <1>$date</>";
-    } elseif($general['level'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:재야입니다. <G><b>{$destcity['name']}</b></>{$josaRo} 출병 실패. <1>$date</>";
-    } elseif($general['crew'] <= 0) {
-        $log[] = "<C>●</>{$admin['month']}월:병사가 없습니다. <G><b>{$destcity['name']}</b></>{$josaRo} 출병 실패. <1>$date</>";
-    } elseif($general['rice'] <= Util::round($general['crew']/100)) {
-        $log[] = "<C>●</>{$admin['month']}월:군량이 모자랍니다. <G><b>{$destcity['name']}</b></>{$josaRo} 출병 실패. <1>$date</>";
-    } elseif($dip['state'] != 0) {
-        $log[] = "<C>●</>{$admin['month']}월:교전중인 국가가 아닙니다. <G><b>{$destcity['name']}</b></>{$josaRo} 출병 실패. <1>$date</>";
-    } elseif($general['nation'] != $city['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:본국에서만 출병가능합니다. <G><b>{$destcity['name']}</b></>{$josaRo} 출병 실패. <1>$date</>";
-    } elseif($nation['war'] == 1) {
-        $log[] = "<C>●</>{$admin['month']}월:현재 전쟁 금지입니다. <G><b>{$destcity['name']}</b></>{$josaRo} 출병 실패. <1>$date</>";
-    } elseif($general['nation'] == $destcity['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:본국입니다. <G><b>{$destcity['name']}</b></>{$josaRo} 출병 실패. <1>$date</>";
+        $log[] = "<C>●</>{$admin['month']}월:현재 초반 제한중입니다. <G><b>{$finalDestCityName}</b></> 방향으로 출병 실패. <1>$date</>";
+        pushGenLog($general, $log);
+        return;
+    } 
+    
+    if($general['level'] == 0) {
+        $log[] = "<C>●</>{$admin['month']}월:재야입니다. <G><b>{$finalDestCityName}</b></> 방향으로 출병 실패. <1>$date</>";
+        pushGenLog($general, $log);
+        return;
+    }
+    if($general['crew'] <= 0) {
+        $log[] = "<C>●</>{$admin['month']}월:병사가 없습니다. <G><b>{$finalDestCityName}</b></> 방향으로 출병 실패. <1>$date</>";
+        pushGenLog($general, $log);
+        return;
+    }
+    
+    if($general['rice'] <= Util::round($general['crew']/100)) {
+        $log[] = "<C>●</>{$admin['month']}월:군량이 모자랍니다. <G><b>{$finalDestCityName}</b></> 방향으로 출병 실패. <1>$date</>";
+        pushGenLog($general, $log);
+        return;
+    }
+
+    if($nation['war'] == 1) {
+        $log[] = "<C>●</>{$admin['month']}월:현재 전쟁 금지입니다. <G><b>{$finalDestCityName}</b></> 방향으로 출병 실패. <1>$date</>";
+        pushGenLog($general, $log);
+        return;
+    }
+
+    if($general['nation'] != $city['nation']) {
+        $log[] = "<C>●</>{$admin['month']}월:본국에서만 출병가능합니다. <G><b>{$finalDestCityName}</b></> 방향으로 출병 실패. <1>$date</>";
+        pushGenLog($general, $log);
+        return;
+    }
+
+    if($general['city'] == $finalTarget){
+        $log[] = "<C>●</>{$admin['month']}월:이미 도착했습니다. <G><b>{$finalDestCityName}</b></> 방향으로 출병 실패. <1>$date</>";
+        pushGenLog($general, $log);
+        return;
+    }
+    
+
+    $allowedNationList = $db->queryFirstColumn('SELECT you FROM diplomacy WHERE state = 0 AND me = %i', $general['nation']);
+    $allowedNationList[] = $general['nation'];
+    $allowedNationList[] = 0;
+
+    $distanceList = searchDistanceListToDest($general['city'], $finalTarget, $allowedNationList);
+
+    if(!$distanceList){
+        $log[] = "<C>●</>{$admin['month']}월:경로에 도달할 방법이 없습니다. <G><b>{$finalDestCityName}</b></> 방향으로 출병 실패. <1>$date</>";
+        pushGenLog($general, $log);
+        return;
+    }
+
+    $candidateCities = [];
+
+    $minDist = Util::array_first_key($distanceList);
+    do {
+        //1: 최단 거리 도시 중 공격 대상이 있는가 확인
+        //2: 최단 거리 + 1 도시 중 공격 대상이 있는가 확인
+        foreach($distanceList as $dist => $distCitiesInfo){
+            if($dist > $minDist + 1){
+                break;
+            }
+            $currDist = $dist;
+            foreach($distCitiesInfo as [$distCityID, $distCityNation]){
+                if($distCityNation !== $general['nation']){
+                    $candidateCities[] = $distCityID;
+                }
+            }
+
+            if($candidateCities){
+                break 2;
+            }
+        }
+
+        //3: 최단 거리 도시 중 아군 도시 선택
+        foreach($distanceList[$minDist] as [$distCityID, $distCityNation]){
+            if($distCityNation === $general['nation']){
+                $candidateCities[] = $distCityID;
+            }
+        }
+    }while(false);
+    
+    $destCityID = (int)Util::choiceRandom($candidateCities);
+    $destCity = $db->queryFirstRow('SELECT * FROM city WHERE city = %i', $destCityID);
+
+    if($general['nation'] == $destCity['nation']) {
+        $log[] = "<C>●</>{$admin['month']}월:경로에 적국 도시가 없습니다. <G><b>{$finalDestCityName}</b></> 방향으로 출병 실패. <1>$date</>";
+        $general['turn0'] = EncodeCommand(0, 0, $destCityID, 26);
         pushGenLog($general, $log);
         process_21($general);
         return;
-    } else {
-        // 전쟁 표시
-        $query = "update city set state=43,term=3 where city='{$destcity['city']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        // 숙련도 증가
-        addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $general['crewtype'], Util::round($general['crew']/100));
-        // 전투 처리
-        processWar($general, $destcity);
-        $log = uniqueItem($general, $log);
     }
 
+    $destCityName = CityConst::byID($destCityID)->name;
+    if($finalTarget !== $destCityID){
+        $josaRo = JosaUtil::pick($finalDestCityName, '로');
+        $josaUl = JosaUtil::pick($destCityName, '을');
+        if($minDist == $currDist){
+            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$finalDestCityName}</b></>{$josaRo} 가기 위해 <G><b>{$destCityName}</b></>{$josaUl} 거쳐야 합니다. <1>$date</>";
+        }
+        else{
+            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$finalDestCityName}</b></>{$josaRo} 가는 도중 <G><b>{$destCityName}</b></>{$josaUl} 거치기로 합니다. <1>$date</>";
+        }
+        
+        pushGenLog($general, $log);
+        $log = [];
+    }
+    
+    // 전쟁 표시
+    $db->update('city', [
+        'state'=>43,
+        'term'=>3
+    ], 'city = %i', $destCityID);
+    // 숙련도 증가
+    addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $general['crewtype'], Util::round($general['crew']/100));
+    // 전투 처리
+    processWar($general, $destCity);
+    $log = uniqueItem($general, $log);
+
     pushGenLog($general, $log);
 }
 
@@ -1771,6 +1858,55 @@ function process_31(&$general) {
     pushGenLog($general, $log);
 }
 
+function process_38(&$general, string $specName, string $specTypeKey, string $specAgeKey) {
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $connect=$db->get();
+
+    $log = [];
+    $date = substr($general['turntime'],11,5);
+
+    $admin = $gameStor->getValues(['year', 'month']);
+
+    $genAux = Json::decode($general['aux']);
+
+    
+    if($general['term']%100 == 38) {
+        $term = intdiv($general['term'], 100) + 1;
+        $code = $term * 100 + 38;
+    } else {
+        $term = 1;
+        $code = 100 + 38;
+    }
+
+    if($genAux['used_38_'.$specTypeKey]??0){
+        $log[] = "<C>●</>{$admin['month']}월:이미 {$specName}을 초기화했습니다. {$specName} 초기화 실패. <1>$date</>";
+    }
+    else if(!$general[$specTypeKey]) {
+        $log[] = "<C>●</>{$admin['month']}월:{$specName}를 갖고 있지 않습니다. {$specName} 초기화 실패. <1>$date</>";
+    } elseif($term < 3) {
+        $log[] = "<C>●</>{$admin['month']}월:새로운 적성을 찾는 중... ({$term}/3) <1>$date</>";
+
+        $query = "update general set resturn='ONGOING',term={$code} where no='{$general['no']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    } else {
+        
+        $genAux['used_38_'.$specTypeKey] = 1;
+        $general[$specAgeKey]=20;
+        $db->update('general', [
+            'resturn'=>'SUCCESS',
+            'term'=>0,
+            $specTypeKey=>0,
+            $specAgeKey=>$db->sqleval('age+1'),
+            'aux'=>Json::encode($genAux)
+        ], 'no = %i', $general['no']);
+
+        $log[] = "<C>●</>{$admin['month']}월:새로운 {$specName}를 가질 준비가 되었습니다. <1>$date</>";
+    }
+
+    pushGenLog($general, $log);
+}
+
 function process_41(&$general) {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -2503,6 +2639,82 @@ function process_50(&$general) {
     pushGenLog($general, $log);
 }
 
+
+function process_58(&$general) {
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+
+    $log = [];
+    $alllog = [];
+    $history = [];
+    $date = substr($general['turntime'],11,5);
+
+    $admin = $gameStor->getValues(['year', 'month', 'develcost']);
+
+    $command = DecodeCommand($general['turn0']);
+
+    $fromDexIdx = $command[1];
+    $toDexIdx = $command[2];
+
+
+    
+
+    if($general['nation'] == 0) {
+        $log[] = "<C>●</>{$admin['month']}월:재야입니다. 숙련 전환 실패. <1>$date</>";
+    } elseif($general['gold'] < $admin['develcost']) {
+        $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. 숙련 전환 실패. <1>$date</>";
+    } elseif($general['rice'] < $admin['develcost']) {
+        $log[] = "<C>●</>{$admin['month']}월:군량이 모자랍니다. 숙련 전환 실패. <1>$date</>";
+    } elseif($fromDexIdx < 0 || $fromDexIdx > 4 || $toDexIdx < 0 || $toDexIdx > 4){
+        $log[] = "<C>●</>{$admin['month']}월:올바르지 않은 병종 코드입니다. 숙련 전환 실패. <1>$date</>";
+    } elseif($general['dex'.($fromDexIdx*10)] == 0) {
+        $log[] = "<C>●</>{$admin['month']}월:전환할 병종 숙련이 없습니다. 숙련 전환 실패. <1>$date</>";
+    } else {
+
+        $fromOrigDex = $general['dex'.($fromDexIdx*10)];
+        $toOrigDex = $general['dex'.($toDexIdx*10)];
+
+        $cutDex = Util::toInt($fromOrigDex * 0.3);
+        $fromNewDex = $fromOrigDex - $cutDex;
+
+        if($fromDexIdx == $toDexIdx){
+            $toOrigDex = $fromNewDex;
+        }
+
+        $addDex = Util::toInt($cutDex * 2 / 3);
+        $toNewDex = $toOrigDex + $addDex;
+
+        if($fromDexIdx == $toDexIdx){
+            $fromNewDex = $toNewDex;
+        }
+
+        $exp = 10;
+        $exp = CharExperience($exp, $general['personal']);
+
+        $fromCrewStr = GameUnitConst::allType()[$fromDexIdx];
+        $toCrewStr = GameUnitConst::allType()[$toDexIdx];
+
+
+        $josaUl = JosaUtil::pick($cutDex, '을');
+        $josaRo = JosaUtil::pick($addDex, '로');
+        $log[] = "<C>●</>{$admin['month']}월:$fromCrewStr 숙련 {$cutDex}{$josaUl} $toCrewStr 숙련 {$addDex}{$josaRo} 전환했습니다. <1>$date</>";
+
+        $general['leader2'] += 2;
+
+        $db->update('general', [
+            'resturn'=>'SUCCESS',
+            'gold'=>$db->sqleval('gold-%i', $admin['develcost']),
+            'rice'=>$db->sqleval('rice-%i', $admin['develcost']),
+            'experience'=>$db->sqleval('experience+%i',$exp),
+            'leader2'=>$general['leader2'],
+            'dex'.($fromDexIdx*10)=>$fromNewDex,
+            'dex'.($toDexIdx*10)=>$toNewDex,
+        ], 'no=%i', $general['no']);
+    }
+    pushGenLog($general, $log);
+}
+
+
 function process_99(&$general) {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');

hwe/func_process_chief.php

@@ -1078,7 +1078,7 @@ function process_67(&$general) {
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $destcity = MYDB_fetch_array($result);
 
-    $amount = $admin['develcost'] * 500 + 60000;   // 7만~13만
+    $amount = $admin['develcost'] * GameConst::$expandCityCostCoef + GameConst::$expandCityDefaultCost;   // 7만~13만
 
     $code = $nation["l{$general['level']}term"];
     if($code%100 == 67) {
@@ -1131,8 +1131,16 @@ function process_67(&$general) {
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
         //수도 증축
-        $query = "update city set upgrading=upgrading+1,level=level+1,pop2=pop2+100000,agri2=agri2+2000,comm2=comm2+2000,def2=def2+2000,wall2=wall2+2000,secu2=secu2+2000 where city='{$destcity['city']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('city', [
+            'upgrading'=>$db->sqleval('upgrading+1'),
+            'level'=>$db->sqleval('level+1'),
+            'pop2'=>$db->sqleval('pop2 + %i', GameConst::$expandCityPopIncreaseAmount),
+            'agri2'=>$db->sqleval('agri2 + %i', GameConst::$expandCityDevelIncreaseAmount),
+            'comm2'=>$db->sqleval('comm2 + %i', GameConst::$expandCityDevelIncreaseAmount),
+            'secu2'=>$db->sqleval('secu2 + %i', GameConst::$expandCityDevelIncreaseAmount),
+            'def2'=>$db->sqleval('def2 + %i', GameConst::$expandCityWallIncreaseAmount),
+            'wall2'=>$db->sqleval('wall2 + %i', GameConst::$expandCityWallIncreaseAmount),
+        ], 'city=%i', $destcity['city']);
 
         //경험치, 공헌치
         $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
@@ -1172,7 +1180,7 @@ function process_68(&$general) {
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $destcity = MYDB_fetch_array($result);
 
-    $amount = $admin['develcost'] * 500 + 30000;   // 4만~10만
+    $amount = $admin['develcost'] * GameConst::$expandCityCostCoef + GameConst::$expandCityDefaultCost / 2;   // 4만~10만
 
     $code = $nation["l{$general['level']}term"];
     if($code%100 == 68) {
@@ -1187,12 +1195,10 @@ function process_68(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:수도에서 실행해야 합니다. 감축 실패. <1>$date</>";
     } elseif($nation['capital'] != $destcity['city']) {
         $log[] = "<C>●</>{$admin['month']}월:수도만 가능합니다. 감축 실패. <1>$date</>";
-    } elseif($destcity['level'] <= 3) {
-        $log[] = "<C>●</>{$admin['month']}월:수진, 진, 관문은 불가능합니다. 감축 실패. <1>$date</>";
-    } elseif($destcity['level'] <= 6) {
-        $log[] = "<C>●</>{$admin['month']}월:더이상 감축할 수 없습니다. 감축 실패. <1>$date</>";
     } elseif($destcity['upgrading'] <= 0) {
         $log[] = "<C>●</>{$admin['month']}월:증축된 도시가 아닙니다. 감축 실패. <1>$date</>";
+    } elseif($destcity['level'] <= 4) {
+        $log[] = "<C>●</>{$admin['month']}월:수, 진, 관문, 이성은 불가능합니다. 감축 실패. <1>$date</>";
     } elseif($general['level'] < 5) {
         $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 감축 실패. <1>$date</>";
     } elseif($nation['capset'] == 1) {
@@ -1224,12 +1230,12 @@ function process_68(&$general) {
         $query = "update nation set l{$general['level']}term='0',capset='1',gold=gold+'$amount',rice=rice+'$amount' where nation='{$general['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
-        $pop  = $destcity['pop']  - 100000;
-        $agri = $destcity['agri'] - 2000;
-        $comm = $destcity['comm'] - 2000;
-        $def  = $destcity['def']  - 2000;
-        $wall = $destcity['wall'] - 2000;
-        $secu = $destcity['secu'] - 2000;
+        $pop  = $destcity['pop']  - GameConst::$expandCityPopIncreaseAmount;
+        $agri = $destcity['agri'] - GameConst::$expandCityDevelIncreaseAmount;
+        $comm = $destcity['comm'] - GameConst::$expandCityDevelIncreaseAmount;
+        $def  = $destcity['def']  - GameConst::$expandCityWallIncreaseAmount;
+        $wall = $destcity['wall'] - GameConst::$expandCityWallIncreaseAmount;
+        $secu = $destcity['secu'] - GameConst::$expandCityDevelIncreaseAmount;
         if($pop  < 30000) { $pop  = 30000; }
         if($agri < 0)  { $agri = 0;  }
         if($comm < 0)  { $comm = 0;  }
@@ -1237,8 +1243,22 @@ function process_68(&$general) {
         if($wall < 0)  { $wall = 0;  }
         if($secu < 0)  { $secu = 0;  }
         //수도 감축
-        $query = "update city set upgrading=upgrading-1,level=level-1,pop2=pop2-100000,agri2=agri2-2000,comm2=comm2-2000,def2=def2-2000,wall2=wall2-2000,secu2=secu2-2000,pop='$pop',agri='$agri',comm='$comm',def='$def',wall='$wall',secu='$secu' where city='{$destcity['city']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('city', [
+            'upgrading'=>$db->sqleval('upgrading-1'),
+            'level'=>$db->sqleval('level-1'),
+            'pop2'=>$db->sqleval('pop2 - %i', GameConst::$expandCityPopIncreaseAmount),
+            'agri2'=>$db->sqleval('agri2 - %i', GameConst::$expandCityDevelIncreaseAmount),
+            'comm2'=>$db->sqleval('comm2 - %i', GameConst::$expandCityDevelIncreaseAmount),
+            'secu2'=>$db->sqleval('secu2 - %i', GameConst::$expandCityDevelIncreaseAmount),
+            'def2'=>$db->sqleval('def2 - %i', GameConst::$expandCityWallIncreaseAmount),
+            'wall2'=>$db->sqleval('wall2 - %i', GameConst::$expandCityWallIncreaseAmount),
+            'pop'=>$pop,
+            'agri'=>$agri,
+            'comm'=>$comm,
+            'secu'=>$secu,
+            'def'=>$def,
+            'wall'=>$wall
+        ], 'city=%i', $destcity['city']);
 
         //경험치, 공헌치
         $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
@@ -1894,7 +1914,7 @@ function process_76(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $admin = $gameStor->getValues(['startyear','year','month','develcost','npccount','turnterm']);
+    $admin = $gameStor->getValues(['startyear','year','month','develcost','npccount','turnterm','turntime']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1968,31 +1988,55 @@ function process_76(&$general) {
         $avgNation = MYDB_fetch_array($result);
         $gencount = 5 + Util::round($avgNation['gennum'] / 10);
 
-        $query = "select avg(age) as age, max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0) as dex0, avg(dex10) as dex10, avg(dex20) as dex20, avg(dex30) as dex30, avg(dex40) as dex40 from general where nation='{$general['nation']}'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $avgGen = MYDB_fetch_array($result);
+        $avgGen = $db->queryFirstRow('SELECT max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) as dex_t, avg(age) as age, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']);
+
+        $dexTotal = $avgGen['dex_t'];
 
         //의병추가
         $npc = 4;
         $npcid = $admin['npccount'];
         for($i=0; $i < $gencount; $i++) {
-            // 무장 40%, 지장 40%, 무지장 20%
-            $type = rand() % 10;
-            switch($type) {
-            case 0: case 1: case 2: case 3:
-                $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                $intel = GameConst::$defaultStatMin + rand()%6;
-                $power = GameConst::$defaultStatTotal - $leader - $intel;
+            //무장 50%, 지장 50%, 무지장 0%
+            $stat_tier1 = GameConst::$defaultStatMax - 10 + rand()%11;
+            $stat_tier3 = GameConst::$defaultStatMin + rand()%6;
+            $stat_tier2 = GameConst::$defaultStatTotal - $stat_tier1 - $stat_tier3;
+            $type = Util::choiceRandomUsingWeight([
+                'power0'=>1,
+                'power1'=>1,
+                'power2'=>1,
+                'intel'=>3,
+                'neutral'=>0
+            ]);
+            switch($type){
+            case 'power0':
+                $leader = $stat_tier1;
+                $power = $stat_tier2;
+                $intel = $stat_tier3;
+                $dexVal = [$dexTotal*5/8, $dexTotal/8, $dexTotal/8, $dexTotal/8];
                 break;
-            case 4: case 5: case 6: case 7:
-                $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                $power = GameConst::$defaultStatMin + rand()%6;
-                $intel = GameConst::$defaultStatTotal - $leader - $power;
+            case 'power1':
+                $leader = $stat_tier1;
+                $power = $stat_tier2;
+                $intel = $stat_tier3;
+                $dexVal = [$dexTotal/8, $dexTotal*5/8, $dexTotal/8, $dexTotal/8];
                 break;
-            case 8: case 9:
-                $leader = GameConst::$defaultStatMin + rand()%6;
-                $power = GameConst::$defaultStatMax - 10 + rand()%11;
-                $intel = GameConst::$defaultStatTotal - $leader - $power;
+            case 'power2':
+                $leader = $stat_tier1;
+                $power = $stat_tier2;
+                $intel = $stat_tier3;
+                $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal*5/8, $dexTotal/8];
+                break;
+            case 'intel':
+                $leader = $stat_tier1;
+                $power = $stat_tier3;
+                $intel = $stat_tier2;
+                $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal/8, $dexTotal*5/8];
+                break;
+            default:
+                $leader = $stat_tier3;
+                $power = $stat_tier1;
+                $intel = $stat_tier2;
+                $dexVal = [$dexTotal/4, $dexTotal/4, $dexTotal/4, $dexTotal/4];
                 break;
             }
             // 국내 최고능치 기준으로 랜덤성 스케일링
@@ -2026,7 +2070,7 @@ function process_76(&$general) {
                 $intel -= $over3;
             }
             // 낮은 능치쪽으로 합산
-            if($type == 0) {
+            if($type == 'power') {
                 $intel = $intel + $over1 + $over2 + $over3;
             } else {
                 $power = $power + $over1 + $over2 + $over3;
@@ -2046,7 +2090,7 @@ function process_76(&$general) {
             $affinity = rand() % 150 + 1;
             $name = "ⓖ의병장{$npcid}";
             $picture = 'default.jpg';
-            $turntime = getRandTurn($admin['turnterm']);
+            $turntime = getRandTurn($admin['turnterm'], new \DateTimeImmutable($admin['turntime']));
             $personal = rand() % 10;
             $bornyear = $admin['year'];
             $deadyear = $admin['year'] + 3;
@@ -2066,7 +2110,7 @@ function process_76(&$general) {
                     '1','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0',
                     '0','0','0','$turntime','$killturn','{$avgGen['age']}','1','$personal','0','0','0','0','',
                     '0','$bornyear','$deadyear',
-                    '{$avgGen['dex0']}','{$avgGen['dex10']}','{$avgGen['dex20']}','{$avgGen['dex30']}','{$avgGen['dex40']}'
+                    '{$dexVal[0]}','{$dexVal[1]}','{$dexVal[2]}','{$dexVal[3]}','{$avgGen['dex40']}'
                 )",
                 $connect
             ) or Error(__LINE__.MYDB_error($connect),"");
@@ -2433,3 +2477,83 @@ function process_81(&$general) {
     pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
     pushGenLog($general, $log);
 }
+
+function process_82(&$general) {
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $connect=$db->get();
+
+    $log = [];
+    $alllog = [];
+    $history = [];
+    
+    $date = substr($general['turntime'],11,5);
+
+    $admin = $gameStor->getValues(['year','month']);
+
+    $query = "select nation from city where city='{$general['city']}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $city = MYDB_fetch_array($result);
+
+    $query = "select nation,name,type,sabotagelimit,aux from nation where nation='{$general['nation']}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $nation = MYDB_fetch_array($result);
+    $nationAux = Json::decode($nation['aux']??'{}');
+    $newNationName = $general['makenation'];
+
+    $nationExists = $db->queryFirstField('SELECT nation FROM nation WHERE name = %s', $newNationName);
+    
+    if($nationExists){
+        $log[] = "<C>●</>{$admin['month']}월:이미 같은 국호를 가진 곳이 있습니다. 국호변경 실패. <1>$date</>";
+    }
+    else if($city['nation'] != $general['nation']) {
+        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 국호변경 실패. <1>$date</>";
+    } elseif($general['level'] < 5) {
+        $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 국호변경 실패. <1>$date</>";
+    } elseif($nationAux['used_82']??0) {
+        $log[] = "<C>●</>{$admin['month']}월:더이상 변경이 불가능합니다. 국호변경 실패. <1>$date</>";
+    } else {
+        $josaRo = JosaUtil::pick($newNationName, '로');
+        $log[] = "<C>●</>{$admin['month']}월:국호를 <D><b>{$newNationName}{$josaRo}</b></> 변경합니다. <1>$date</>";
+        $exp = 10;
+        $ded = 10;
+
+        // 성격 보정
+        $exp = CharExperience($exp, $general['personal']);
+        $ded = CharDedication($ded, $general['personal']);
+
+        $josaYi = JosaUtil::pick($general['name'], '이');
+        $josaYiNation = JosaUtil::pick($nation['name'], '이');
+
+        $query = "select no,name from general where nation='{$general['nation']}' and no!='{$general['no']}'";
+        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $cnt = MYDB_num_rows($result);
+        $genlog = ["<C>●</><Y>{$general['name']}</>{$josaYi} 국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경합니다."];
+        for($i=0; $i < $cnt; $i++) {
+            $gen = MYDB_fetch_array($result);
+            pushGenLog($gen, $genlog);
+        }
+
+        $alllog[] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경합니다.";
+        $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<L><b>【국호변경】</b></><D><b>{$nation['name']}</b></>{$josaYiNation} 국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경합니다.";
+        pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경");
+        pushNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 국호를 <D><b>{$newNationName}</b></>{$josaRo} 변경");
+
+        $nationAux['used_82'] = 1;
+        //국기변경
+        $db->update('nation', [
+            'name'=>$newNationName,
+            'aux'=>Json::encode($nationAux)
+        ], 'nation=%i', $nation['nation']);
+
+        //경험치, 공헌치
+        $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+        refreshNationStaticInfo();
+    }
+
+    pushWorldHistory($history, $admin['year'], $admin['month']);
+    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
+    pushGenLog($general, $log);
+}

hwe/func_process_personnel.php

@@ -80,10 +80,11 @@ function process_25(&$general) {
     $city = MYDB_fetch_array($result);
 
     $command = DecodeCommand($general['turn0']);
+    $type = $command[2];
     $where = $command[1];
 
-    if($admin['join_mode'] == 'onlyRandom' && $where < 98){
-        $where = 99;
+    if($admin['join_mode'] == 'onlyRandom' && $type < 98){
+        $type = 99;
     }
 
     $nation = null;
@@ -91,7 +92,7 @@ function process_25(&$general) {
     $joinedNations = Json::decode($general['nations']);
 
     // 랜덤임관인 경우
-    if($general['npc'] >= 2 && $where >= 98 && !$admin['fiction'] && 1000 <= $admin['scenario'] && $admin['scenario'] < 2000){
+    if($general['npc'] >= 2 && $type >= 98 && !$admin['fiction'] && 1000 <= $admin['scenario'] && $admin['scenario'] < 2000){
         //'사실' 모드에서는 '성향'에 우선을 두되, 장수수, 랜덤에 비중을 둠
         $nations = $db->query(
             'SELECT nation.`name` as `name`,nation.nation as nation,scout,nation.`level` as `level`,gennum,`affinity` FROM nation join general on general.nation = nation.nation and general.level = 12 WHERE nation.nation not in %li and gennum < %i and scout = 0',
@@ -124,13 +125,23 @@ function process_25(&$general) {
         }
             
     }
-    else if($where >= 98) {
+    else if($type >= 98) {
         //랜임
         $generals = [];
         foreach($db->queryAllLists('SELECT count(no), nation FROM general WHERE npc <= 2 AND nation > 0 GROUP BY nation') as list($cnt, $nation)){
             $generals[$nation] = $cnt;
         }
 
+        foreach($db->queryAllLists('SELECT count(no), nation FROM general WHERE 3 <= npc and npc <= 4 AND nation > 0 GROUP BY nation') as list($cnt, $nation)){
+            //의병, 인탐장은 1/3로 카운트
+            if(key_exists($nation, $generals)){
+                $generals[$nation] += $cnt / 3;
+            }
+            else{
+                $generals[$nation] = $cnt / 3;
+            }
+        }
+
         $allGen = array_sum($generals);
 
         $genLimit = GameConst::$defaultMaxGeneral;
@@ -151,7 +162,7 @@ function process_25(&$general) {
         $randVals = [];
         foreach($nations as $idx=>$testNation){
             // 임관금지없음 국가, 방랑군 제외
-            if($where == 98 && $testNation['level'] == 0){
+            if($type == 98 && $testNation['level'] == 0){
                 continue;
             }
 
@@ -171,7 +182,10 @@ function process_25(&$general) {
             $nation = null;
         }
 
-    } else {
+    } else if($type == 0) {
+        $nation = $db->queryFirstRow('SELECT `name`,nation,scout,`level` FROM nation WHERE nation=%i', $where);
+    } else if($type == 1){
+        $where = $db->queryFirstField('SELECT nation FROM general WHERE no=%i', $where)??0;
         $nation = $db->queryFirstRow('SELECT `name`,nation,scout,`level` FROM nation WHERE nation=%i', $where);
     }
 
@@ -182,10 +196,10 @@ function process_25(&$general) {
     
     if(!$nation) {
         $log[] = "<C>●</>{$admin['month']}월:임관할 국가가 없습니다. 임관 실패. <1>$date</>";
-        if($where >= 98 && $genLimit == GameConst::$initialNationGenLimitForRandInit){
+        if($type >= 98 && $genLimit == GameConst::$initialNationGenLimitForRandInit){
             //랜덤 모드, 초기화시에는 랜덤 임관을 대신 한턴 더 넣어준다.
             $db->update('general', [
-                'turn1'=>EncodeCommand(0, 0, $where, 25),
+                'turn1'=>EncodeCommand(0, $type, 0, 25),
             ], '`no` = %i', $general['no']);
             pushGenLog($general, $log);
             process_42($general);
@@ -207,7 +221,7 @@ function process_25(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:이미 임관했었던 국가입니다. 임관 실패. <1>$date</>";
     } else {
         $josaYi = JosaUtil::pick($general['name'], '이');
-        if($where == 99 || $where == 98) {
+        if($type == 99 || $type == 98) {
             $alllog[] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 어쩌다보니 <D><b>{$nation['name']}</b></>에 <S>임관</>했습니다.";
             $log[] = "<C>●</>{$admin['month']}월:<D>{$nation['name']}</>에 랜덤으로 임관했습니다. <1>$date</>";
             pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>에 임관");
@@ -243,6 +257,7 @@ function process_25(&$general) {
             'nation'=>$nation['nation'],
             'nations'=>Json::encode($joinedNations),
             'level'=>1,
+            'permission'=>'normal',
             'experience'=>$db->sqleval('experience + %i', $exp),
             'city'=>$king['city'],
             'belong'=>1
@@ -258,7 +273,7 @@ function process_25(&$general) {
         $query = "update nation set totaltech=tech*'$gencount',gennum='$gennum' where nation='{$nation['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
-        if($where < 99) {
+        if($type < 99) {
             $log = uniqueItem($general, $log);
         } else {
             $log = uniqueItem($general, $log, 2);
@@ -279,7 +294,7 @@ function process_29(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $admin = $gameStor->getValues(['startyear','year','month','develcost','npccount','turnterm','scenario']);
+    $admin = $gameStor->getValues(['startyear','year','month','develcost','npccount','turnterm','scenario','maxgeneral', 'turntime']);
 
     $query = "select nation,name,level,gennum,scout from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -290,30 +305,39 @@ function process_29(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:재야입니다. 인재탐색 실패. <1>$date</>";
     } elseif($nation['level'] <= 0) {
         $log[] = "<C>●</>{$admin['month']}월:방랑군입니다. 인재탐색 실패. <1>$date</>";
-    } elseif($admin['year'] < $admin['startyear']+3 && $nation['gennum'] >= GameConst::$initialNationGenLimit) {
-        $log[] = "<C>●</>{$admin['month']}월:현재 <D>{$nation['name']}</>{$josaUn} 탐색이 제한되고 있습니다. 인재탐색 실패.";
     } elseif($general['gold'] < $admin['develcost']) {
         $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. 인재탐색 실패. <1>$date</>";
     } else {
-        $query = "select no from general where nation='{$general['nation']}' and npc<2";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $gencount = MYDB_num_rows($result);
 
-        $query = "select no from general where nation='{$general['nation']}' and npc=3";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $npccount = MYDB_num_rows($result);
+        $max_gen_cnt = $admin['maxgeneral'];
 
-        $query = "select no from general where nation!='{$general['nation']}' and npc=3";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $otherNpccount = MYDB_num_rows($result);
-        $otherNpccount = Util::round(sqrt($otherNpccount + 1)) - 1;
-        
-        if($gencount <= 0) { $gencount = 1; }
-        if($npccount <= 0) { $npccount = 1; }
-        $criteria = $gencount * $npccount + $otherNpccount;
+        $total_gen_cnt = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc <= 2');
+        $total_npc_cnt = $db->queryFirstField('SELECT count(`no`) FROM general WHERE 3 <= npc AND npc <= 4');
+
+        $gen_cnt = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc <= 2 AND nation = %i', $general['nation']);
+        $npc_cnt = $db->queryFirstField('SELECT count(`no`) FROM general WHERE 3 <= npc AND npc <= 4 AND nation = %i', $general['nation']);
+
+        $nation_cnt = $db->queryFirstField('SELECT count(`nation`) FROM nation WHERE `level` > 0');
+
+        $curr_cnt = Util::toInt($total_gen_cnt + $total_npc_cnt / 2);
+        $remain_slot = $max_gen_cnt - $curr_cnt;
+
+        $avg_cnt = $curr_cnt / $nation_cnt;
+
+        $found_prop_main = pow($remain_slot / $max_gen_cnt, 6);
+        $found_prop_small = 1 / ($total_npc_cnt / 3 + 1);
+        $found_prop_big = 1 / $max_gen_cnt;
+
+        if($total_npc_cnt < 50){
+            $found_prop = max($found_prop_main, $found_prop_small);
+        }
+        else{
+            $found_prop = max($found_prop_main, $found_prop_big);
+        }
+        $found_npc = Util::randBool($found_prop);
 
         // 탐색 실패
-        if(rand() % $criteria > 0) {
+        if(!$found_npc) {
             $exp = 100;
             $ded = 70;
             switch(Util::choiceRandomUsingWeight([$general['leader'], $general['power'], $general['intel']])) {
@@ -343,7 +367,17 @@ function process_29(&$general) {
                 $name = "{$name}{$count}";
             }
 
-            if($nation['scout'] != 0) {
+            $join_prop = 0.55 * $avg_cnt / ($gen_cnt + $npc_cnt / 2);
+
+            $no_scout = false;
+            if($nation['scout'] != 0){
+                $no_scout = true;
+            }
+            else if($admin['year'] < $admin['startyear']+3 && $nation['gennum'] >= GameConst::$initialNationGenLimit){
+                $no_scout = true;
+            }
+
+            if($no_scout || !Util::randBool($join_prop)) {
                 $scoutType = "발견";
                 $scoutLevel = 0;
                 $scoutNation = 0;
@@ -359,50 +393,54 @@ function process_29(&$general) {
             $alllog[] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <Y>$name</>{$josaRa}는 <C>인재</>를 {$scoutType}하였습니다!";
             pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y>$name</>{$josaRa}는 <C>인재</>를 {$scoutType}");
 
-            $query = "select max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0) as dex0, avg(dex10) as dex10, avg(dex20) as dex20, avg(dex30) as dex30, avg(dex40) as dex40 from general where nation='{$general['nation']}'";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $avgGen = MYDB_fetch_array($result);
+            $avgGen = $db->queryFirstRow('SELECT max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) as dex_t, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']);
 
-            // 체섭시 무장 20%, 지장 20%, 무지장 60%
-            // 마이너 무장 40%, 지장 40%, 무지장 20%
-            $type = rand() % 10;
-            if($admin['scenario'] < 100) {
-                switch($type) {
-                case 0: case 1:
-                    $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $intel = GameConst::$defaultStatMin + rand()%6;
-                    $power = GameConst::$defaultStatTotal - $leader - $intel;
-                    break;
-                case 2: case 3:
-                    $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $power = GameConst::$defaultStatMin + rand()%6;
-                    $intel = GameConst::$defaultStatTotal - $leader - $power;
-                    break;
-                case 4: case 5: case 6: case 7: case 8: case 9:
-                    $leader = GameConst::$defaultStatMin + rand()%6;
-                    $power = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $intel = GameConst::$defaultStatTotal - $leader - $power;
-                    break;
-                }
-            } else {
-                switch($type) {
-                case 0: case 1: case 2: case 3:
-                    $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $intel = GameConst::$defaultStatMin + rand()%6;
-                    $power = GameConst::$defaultStatTotal - $leader - $intel;
-                    break;
-                case 4: case 5: case 6: case 7:
-                    $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $power = GameConst::$defaultStatMin + rand()%6;
-                    $intel = GameConst::$defaultStatTotal - $leader - $power;
-                    break;
-                case 8: case 9:
-                    $leader = GameConst::$defaultStatMin + rand()%6;
-                    $power = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $intel = GameConst::$defaultStatTotal - $leader - $power;
-                    break;
-                }
+            $dexTotal = $avgGen['dex_t'];
+
+            //무장 40%, 지장 40%, 무지장 20%
+            $stat_tier1 = GameConst::$defaultStatMax - 10 + rand()%11;
+            $stat_tier3 = GameConst::$defaultStatMin + rand()%6;
+            $stat_tier2 = GameConst::$defaultStatTotal - $stat_tier1 - $stat_tier3;
+            $type = Util::choiceRandomUsingWeight([
+                'power0'=>2,
+                'power1'=>2,
+                'power2'=>2,
+                'intel'=>6,
+                'neutral'=>3
+            ]);
+            switch($type){
+            case 'power0':
+                $leader = $stat_tier1;
+                $power = $stat_tier2;
+                $intel = $stat_tier3;
+                $dexVal = [$dexTotal*5/8, $dexTotal/8, $dexTotal/8, $dexTotal/8];
+                break;
+            case 'power1':
+                $leader = $stat_tier1;
+                $power = $stat_tier2;
+                $intel = $stat_tier3;
+                $dexVal = [$dexTotal/8, $dexTotal*5/8, $dexTotal/8, $dexTotal/8];
+                break;
+            case 'power2':
+                $leader = $stat_tier1;
+                $power = $stat_tier2;
+                $intel = $stat_tier3;
+                $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal*5/8, $dexTotal/8];
+                break;
+            case 'intel':
+                $leader = $stat_tier1;
+                $power = $stat_tier3;
+                $intel = $stat_tier2;
+                $dexVal = [$dexTotal/8, $dexTotal/8, $dexTotal/8, $dexTotal*5/8];
+                break;
+            default:
+                $leader = $stat_tier3;
+                $power = $stat_tier1;
+                $intel = $stat_tier2;
+                $dexVal = [$dexTotal/4, $dexTotal/4, $dexTotal/4, $dexTotal/4];
+                break;
             }
+
             // 국내 최고능치 기준으로 랜덤성 스케일링
             if($avgGen['lpi'] > 210) {
                 $leader = Util::round($leader * $avgGen['lpi'] / GameConst::$defaultStatTotal * (60+rand()%31)/100);
@@ -434,7 +472,7 @@ function process_29(&$general) {
                 $intel -= $over3;
             }
             // 낮은 능치쪽으로 합산
-            if($type == 0) {
+            if($type == 'power') {
                 $intel = $intel + $over1 + $over2 + $over3;
             } else {
                 $power = $power + $over1 + $over2 + $over3;
@@ -456,17 +494,17 @@ function process_29(&$general) {
             $npccount = 10000 + $npcid;
             $affinity = rand() % 150 + 1;
             $picture = 'default.jpg';
-            $turntime = getRandTurn($admin['turnterm']);
+            $turntime = getRandTurn($admin['turnterm'], new \DateTimeImmutable($admin['turntime']));
             $personal = rand() % 10;
             $bornyear = $admin['year'];
             $deadyear = $admin['year'] + 3;
             $age = 20;
-            $specage = Util::round((80 - $age)/12) + $age;
-            $specage2 = Util::round((80 - $age)/3) + $age;
+            $specage = Util::round((GameConst::$retirementYear - $age)/12) + $age;
+            $specage2 = Util::round((GameConst::$retirementYear - $age)/3) + $age;
             //$specage = $age + 1 + rand() % 3;
             //$specage2 = $age + 5 + rand() % 5;
-            // 10년 ~ 50년
-            $killturn = rand()%480 + 120;
+            // 20년 ~ 50년
+            $killturn = Util::randRangeInt(20, 50) * 12;
 
             @MYDB_query("
                 insert into general (
@@ -482,7 +520,7 @@ function process_29(&$general) {
                     '$scoutLevel','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0',
                     '0','0','0','$turntime','$killturn','$age','1','$personal','0','$specage','0','$specage2','',
                     '0','$bornyear','$deadyear',
-                    '{$avgGen['dex0']}','{$avgGen['dex10']}','{$avgGen['dex20']}','{$avgGen['dex30']}','{$avgGen['dex40']}'
+                    '{$dexVal[0]}','{$dexVal[1]}','{$dexVal[2]}','{$dexVal[3]}','{$avgGen['dex40']}'
                 )",
                 $connect
             ) or Error(__LINE__.MYDB_error($connect),"");
@@ -846,18 +884,28 @@ function process_54(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:현재 통합 진행중입니다. 선양 실패.";
     } else {
         //군주 교체
-        $query = "update general set level='12' where no='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        // 태수,군사,종사이었다면 해제
-        $query = "update city set gen1='0' where gen1='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $query = "update city set gen2='0' where gen2='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $query = "update city set gen3='0' where gen3='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('general', [
+            'level'=>12,
+            'permission'=>'normal'
+        ], 'no=%i', $who);
 
-        $query = "update general set resturn='SUCCESS',level='1',experience=experience*0.7 where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        // 태수,군사,종사이었다면 해제
+        $db->update('city', [
+            'gen1'=>0,
+        ], 'gen1=%i', $who);
+        $db->update('city', [
+            'gen2'=>0,
+        ], 'gen2=%i', $who);
+        $db->update('city', [
+            'gen3'=>0,
+        ], 'gen3=%i', $who);
+        
+        $db->update('general', [
+            'resturn'=>'SUCCESS',
+            'level'=>1,
+            'permission'=>'auditor',
+            'experience'=>$db->sqleval('experience*0.7'),
+        ], 'no=%i', $general['no']);
 
         $josaYi = JosaUtil::pick($general['name'], '이');
         $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【선양】</b></><Y>{$general['name']}</>{$josaYi} <D><b>{$nation['name']}</b></>의 군주 자리를 <Y>{$nextruler['name']}</>에게 선양했습니다.";
@@ -1027,7 +1075,7 @@ function process_57(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $admin = $gameStor->getValues(['year', 'month', 'killturn']);
+    $admin = $gameStor->getValues(['year', 'month', 'killturn', 'autorun_user', 'turn_term']);
 
     $query = "select nation,name from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1041,6 +1089,19 @@ function process_57(&$general) {
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $ruler = MYDB_fetch_array($result);
 
+    $killTurnLimit = $admin['killturn'];
+    $autorunLimit = $admin['autorun_user']['limit_minutes']??0;
+    if($autorunLimit){
+        $autorunLimit /= $admin['turn_term'];
+        if($autorunLimit < GameConst::$maxTurn){
+            $killTurnLimit -= $autorunLimit;
+        }
+        else{
+            $killTurnLimit -= Util::toInt(sqrt(GameConst::$maxTurn * $autorunLimit));
+        }
+    }
+
+
     if($general['level'] == 0) {
         $log[] = "<C>●</>{$admin['month']}월:재야 입니다. 모반 실패. <1>$date</>";
     } elseif($general['level'] < 5) {
@@ -1051,7 +1112,7 @@ function process_57(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 모반 실패. <1>$date</>";
     } elseif($general['level'] == 12) {
         $log[] = "<C>●</>{$admin['month']}월:이미 군주 입니다. 모반 실패. <1>$date</>";
-    } elseif($ruler['killturn'] >= $admin['killturn']) {
+    } elseif($ruler['killturn'] >= $killTurnLimit) {
         $log[] = "<C>●</>{$admin['month']}월:군주가 활동중입니다. 모반 실패. <1>$date</>";
     } elseif($ruler['npc'] >= 2) {
         $log[] = "<C>●</>{$admin['month']}월:군주가 NPC입니다. 모반 실패. <1>$date</>";

hwe/func_template.php

@@ -47,7 +47,7 @@ function turnTable() {
 
 function CoreTurnTable() {
     return "
-<select name=turn[] size=3 multiple style=color:white;background-color:black;font-size:13px;>
+<select name=turn[] size=6 multiple style=color:white;background-color:black;font-size:13px;>
     <option selected value=0> 1턴</option>
     <option value=1> 2턴</option>
     <option value=2> 3턴</option>
@@ -136,9 +136,9 @@ function commandButton() {
     }
     
     $db = DB::db();
-    $me = $db->queryFirstRow("select no,nation,level,belong from general where owner=%i", $userID);
+    $me = $db->queryFirstRow("select no,nation,level,belong,permission,penalty from general where owner=%i", $userID);
 
-    $nation = $db->queryFirstRow("select permission,penalty,nation,level,color,secretlimit from nation where nation=%i",$me['nation'])??[
+    $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i",$me['nation'])??[
         'nation'=>0,
         'level'=>0,
         'secretlimit'=>99,
@@ -163,7 +163,8 @@ function commandButton() {
         'fgColor'=>$fgColor,
         'meLevel'=>$me['level'],
         'nationLevel'=>$nation['level'],
-        'showSecret'=>$showSecret
+        'showSecret'=>$showSecret,
+        'permission'=>$permission,
     ]);
 }
 

hwe/func_time_event.php

@@ -40,7 +40,7 @@ function processSpring() {
 
     $admin = $gameStor->getValues(['year', 'month']);
 
-    pushWorldHistory(["<R>★</>{$admin['year']}년 {$admin['month']}월: <S>모두들 즐거운 게임 하고 계신가요? ^^ <Y>삼국일보</> 애독해 주시고, <M>훼접</>은 삼가주세요~</>"], $admin['year'], $admin['month']);
+    pushWorldHistory(["<R>★</>{$admin['year']}년 {$admin['month']}월: <S>모두들 즐거운 게임 하고 계신가요? ^^ <Y>매너 있는 플레이</> 부탁드리고, <M>지나친 훼접</>은 삼가주세요~</>"], $admin['year'], $admin['month']);
 }
 
 function processGoldIncome() {
@@ -178,7 +178,7 @@ function popIncrease() {
                 $ratio *= (1 - $city['secu']/$city['secu2']/10);    //치안에 따라 최대 10% 경감
             }
 
-            $pop = $city['pop'] + (int)($city['pop'] * $ratio) + 5000;  // 기본 5000명은 증가
+            $pop = $city['pop'] + (int)($city['pop'] * $ratio) + GameConst::$basePopIncreaseAmount;  // 기본인구는 증가
 
             $ratio = round($ratio*100, 2);
             $cityrate = $city['rate'];

hwe/func_tournament.php

@@ -235,6 +235,8 @@ function startTournament($auto, $type) {
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
+    $prevWinner = $gameStor->prev_winner;
+
     eraseTnmtFightLogAll();
 
     switch($auto) {
@@ -263,12 +265,24 @@ function startTournament($auto, $type) {
     $query = "truncate tournament";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
+    $opener = $db->queryFirstField('SELECT `general`.`name` FROM `general` JOIN `nation` ON `general`.`nation` = `nation`.`nation` WHERE `general`.`level` = 12 AND `nation`.`level` = 7 ORDER BY rand() LIMIT 1');
+    if(!$opener){
+        $opener = $gameStor->prev_winner;
+    }
+
+    if($opener){
+        $openerText = "황제 <Y>{$opener}</>의 명으로 ";
+    }
+    else{
+        $openerText = '';
+    }
+
     $history = [];
     switch($type) {
-    case 0: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>전력전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>영웅</span>들을 모집하고 있습니다!"; break;
-    case 1: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>통솔전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>명사</span>들을 모집하고 있습니다!"; break;
-    case 2: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>일기토</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>용사</span>들을 모집하고 있습니다!"; break;
-    case 3: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>설전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>책사</span>들을 모집하고 있습니다!"; break;
+    case 0: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>전력전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>영웅</span>들을 모집하고 있습니다!"; break;
+    case 1: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>통솔전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>명사</span>들을 모집하고 있습니다!"; break;
+    case 2: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>일기토</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>용사</span>들을 모집하고 있습니다!"; break;
+    case 3: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>설전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>책사</span>들을 모집하고 있습니다!"; break;
     }
     pushWorldHistory($history, $admin['year'], $admin['month']);
 }

hwe/index.php

@@ -44,7 +44,7 @@ if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
     ], 'owner=%i', $userID);
 }
 
-$admin = $gameStor->getValues(['develcost','online','conlimit','tournament','tnmt_type','turnterm','scenario','scenario_text','extended_general','fiction','npcmode','vote','vote_title','map_theme']);
+$admin = $gameStor->getValues(['develcost','online','conlimit','tournament','tnmt_type','turnterm','turntime','scenario','scenario_text','extended_general','fiction','npcmode','vote','vote_title','map_theme']);
 
 $plock = $db->queryFirstField('SELECT plock FROM plock LIMIT 1');
 
@@ -77,11 +77,13 @@ if ($admin['npcmode'] == 0) {
 }
 $color = "cyan";
 $mapTheme = $admin['map_theme'];
+$serverName = UniqueConst::$serverName;
+$serverCnt = $db->queryFirstField('SELECT count(*) FROM ng_games');
 ?>
 <!DOCTYPE html>
 <html>
 <head>
-<title><?=UniqueConst::$serverName?>: 메인</title>
+<title><?=$serverName?>: 메인</title>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
@@ -89,6 +91,8 @@ $mapTheme = $admin['map_theme'];
 <?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
 <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../e_lib/moment.min.js')?>
+<?=WebUtil::printJS('../e_lib/linkify/linkify.min.js')?>
+<?=WebUtil::printJS('../e_lib/linkify/linkify-string.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJS('js/main.js')?>
@@ -107,6 +111,8 @@ $(function(){
     setInterval(function(){
         refreshMsg();
     }, 5000);
+
+    reloadCommandList();
 });
 </script>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
@@ -115,6 +121,7 @@ $(function(){
 <?=WebUtil::printCSS('css/main.css')?>
 <?=WebUtil::printCSS('css/map.css')?>
 <?=WebUtil::printCSS('css/msg.css')?>
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
 <link href="https://fonts.googleapis.com/css?family=Nanum+Gothic|Nanum+Myeongjo|Nanum+Pen+Script" rel="stylesheet">
 
 </head>
@@ -124,7 +131,7 @@ $(function(){
 <div><?=allButton()?></div>
 <table class="tb_layout bg0" style="width:1000px;">
     <tr height=50>
-        <td colspan=5 align=center><font size=4>삼국지 모의전투 HiDCHe (<font color=cyan><?=$scenario?></font>)</font></td>
+        <td colspan=5 id="server_title" align=center><font size=4>삼국지 모의전투 HiDCHe <?=$serverName.$serverCnt?>기 (<font color=cyan><?=$scenario?></font>)</font></td>
     </tr>
 <?php if ($valid == 1): ?>
     <tr height=30>
@@ -142,12 +149,12 @@ $(function(){
         <td width=398 colspan=2><?=info(3)?></td>
     </tr>
     <tr height=30>
-        <td>
+        <td style='text-align:center;'>
 <?php
 if (!$plock) {
-    echo "<marquee scrollamount=2><font color=cyan>서버 가동중</font></marquee>";
+    echo "<span style='color:cyan;'>동작 시각: ".substr($admin['turntime'], 5)."</span>";
 } else {
-    echo "<font color=magenta>서버 동결중</font>";
+    echo "<span style='color:magenta;'>동작 시각: ".substr($admin['turntime'], 5)."</span>";
 }
 
 echo "
@@ -231,14 +238,14 @@ else if($session->userGrade == 4){
 ?>
 
 </table>
-<table class="tb_layout bg0" style="width:1000px;">
+<table class="tb_layout bg0" style="width:1000px;" id='map_position'>
     <tr>
         <td style='width:700px;height:520px;' colspan=2>
             <?=getMapHtml($mapTheme)?>
         </td>
-        <td style='width:300px;' rowspan=4><iframe seamless="seamless" name=commandlist src='commandlist.php' style='width:300px;height:700px;' frameborder=0 marginwidth=0 marginheight=0 topmargin=0 scrolling=no></iframe></td>
+        <td style='width:300px;' rowspan=4 id='commandlist'></td>
     </tr>
-<form name=form2 action=preprocessing.php method=post target=commandlist>
+<form id='form2' name=form2>
     <tr>
         <td rowspan=3 width=50 valign=top><?=turnTable()?></td>
         <td style="width:650px;border:none;text-align:center;"><?php cityInfo(); ?></td>
@@ -263,7 +270,7 @@ else if($session->userGrade == 4){
         </td>
     </tr>
     <tr>
-        <td align=right style="'width:650px;border:none;">
+        <td align=right style="'width:650px;border:none;"><br>
             <?php commandTable(); ?>
             <input id="mainBtnSubmit" type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='실 행' onclick='refreshing(this, 3,form2)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='갱 신' onclick='refreshing(this, 0,0)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;font-size:13px; value='로비로' onclick=location.replace('../')><br>
         </td>
@@ -277,7 +284,7 @@ else if($session->userGrade == 4){
     </tr>
     <tr><td colspan=2><?=commandButton()?></td></tr>
 </table>
-<table class="tb_layout bg0">
+<table class="tb_layout bg0" id='history_position'>
     <tr>
         <td width=498 class='bg1 center'><b>장수 동향</b></td>
         <td width=498 class='bg1 center'><b>개인 기록</b></td>
@@ -297,17 +304,17 @@ else if($session->userGrade == 4){
 
 
     </select>
-    <input type="textarea" id="msg_input" maxlength="99">
+    <input type="textarea" id="msg_input" maxlength="99" value="">
     <button id="msg_submit">서신전달&amp;갱신</button><br>
     내용 없이 '서신전달&amp;갱신'을 누르면 메세지창이 갱신됩니다.
 </div>
 <div><?=allButton()?></div>
 <div id="message_board"><div style="left:0;" class="board_side bg0">
-        <div class="board_header bg0">전체 메시지(최고99자)</div>
+        <div class="board_header bg0" id='public_talk_position'>전체 메시지(최고99자)</div>
         <section class="public_message">
         <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="public">이전 메시지 불러오기</button>
         </section>
-        <div class="board_header bg0">개인 메시지(최고99자)</div>
+        <div class="board_header bg0" id='secret_talk_position'>개인 메시지(최고99자)</div>
         <section class="private_message">
         <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="private">이전 메시지 불러오기</button>
         </section>
@@ -328,7 +335,7 @@ if ($con == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다!");
 }
 if ($me['newmsg'] == 1) {
-    MessageBox("개인 서신이 도착했습니다!");
+    MessageBox("새로운 서신이 도착했습니다!");
 }
 if ($me['newvote'] == 1) {
     $develcost = $admin['develcost']*5;

hwe/install.php

@@ -152,6 +152,101 @@ if($session->userGrade < 5 && !$allowReset){
                         </div>
                     </div>
 
+                    <div class="form-group row">
+                        <label class="col-sm-3 col-form-label">휴식 턴 시 장수 턴</label>
+                        <div class="col-sm-9">
+                            <div class="input-group">
+                                <div class="input-group-prepend btn-group btn-group-toggle" data-toggle="buttons">
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="develop" name="autorun_develop" id="autorun_develop">내정
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="warp" name="autorun_warp" id="autorun_warp">순간이동
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="recruit" name="autorun_recruit" id="autorun_recruit">징병
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="recruit_high" name="autorun_recruit_high" id="autorun_recruit_high">모병
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="train" name="autorun_train" id="autorun_train">훈사
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="battle" name="autorun_battle" id="autorun_battle">출병
+                                    </label>
+                                </div>
+                                <div class="input-group-append">
+                                    <span class="input-group-text">유효 시간</span>
+                                </div>
+                                <select class="custom-select" name="autorun_user_minutes" id="autorun_user_minutes">
+                                        <option value="0" selected>꺼짐</option>
+                                        <option value="43200">항상</option>
+                                        <option value="10">10분</option>
+                                        <option value="20">20분</option>
+                                        <option value="30">30분</option>
+                                        <option value="60">1시간</option>
+                                        <option value="120">2시간</option>
+                                        <option value="180">3시간</option>
+                                        <option value="240">4시간</option>
+                                        <option value="360">6시간</option>
+                                        <option value="480">8시간</option>
+                                        <option value="600">10시간</option>
+                                        <option value="720">12시간</option>
+                                        <option value="1440">24시간</option>
+                                        <option value="2160">36시간</option>
+                                        <option value="2880">48시간</option>
+                                        <option value="3600">60시간</option>
+                                        <option value="4320">72시간</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!--
+                    <div class="form-group row">
+                        <label class="col-sm-3 col-form-label">휴식 턴 시 사령 턴</label>
+                        <div class="col-sm-9">
+                            <div class="input-group">
+                                <div class="input-group-prepend btn-group btn-group-toggle" data-toggle="buttons">
+                                    <label class="btn btn-secondary">
+                                        <input type="radio" name="autorun_chief_reward" id="autorun_chief_reward">포상/몰수
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="radio" name="autorun_chief_warp" id="autorun_chief_warp">발령
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="radio" name="autorun_chief_declaration" id="autorun_chief_declaration">선포
+                                    </label>
+                                </div>
+                                <div class="input-group-append">
+                                    <span class="input-group-text">유효 시간</span>
+                                </div>
+                                <select class="custom-select" name="autorun_chief_minutes" id="autorun_chief_minutes">
+                                        <option value="0" selected>꺼짐</option>
+                                        <option value="43200">항상</option>
+                                        <option value="10">10분</option>
+                                        <option value="20">20분</option>
+                                        <option value="30">30분</option>
+                                        <option value="60">1시간</option>
+                                        <option value="120">2시간</option>
+                                        <option value="180">3시간</option>
+                                        <option value="240">4시간</option>
+                                        <option value="360">6시간</option>
+                                        <option value="480">8시간</option>
+                                        <option value="600">10시간</option>
+                                        <option value="720">12시간</option>
+                                        <option value="1440">24시간</option>
+                                        <option value="2160">36시간</option>
+                                        <option value="2880">48시간</option>
+                                        <option value="3600">60시간</option>
+                                        <option value="4320">72시간</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    -->
+
                     <div class="form-group row">
                         <label for="join_mode" class="col-sm-3 col-form-label">임관 모드</label>
                         <div class="col-sm-9">
@@ -225,6 +320,13 @@ if($session->userGrade < 5 && !$allowReset){
                         </div>
                     </div>
 
+                    <div class="form-group row">
+                        <label for="pre_reserve_open" class="col-sm-3 col-form-label">가오픈 예약</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" name="pre_reserve_open" id="pre_reserve_open"  placeholder="YYYY-MM-DD hh:mm" value="" />
+                        </div>
+                    </div>
+
                     <div class="form-group row">
                         <div class="col-sm-3"></div>
                         <div class="col-sm-9">

hwe/j_autoreset.php

@@ -88,7 +88,9 @@ $result = ResetHelper::buildScenario(
     $options['npcmode'],
     $options['show_img_level'],
     $options['tournament_trig'],
-    $options['join_mode']
+    $options['join_mode'],
+    $options['starttime'],
+    $options['autorun_user']?:null
 );
 
 $result['affected']=1;

hwe/j_basic_info.php

@@ -2,6 +2,7 @@
 namespace sammo;
 
 include('lib.php');
+include 'func.php';
 
 $result = [
     "generalID"=>null,
@@ -11,7 +12,7 @@ $result = [
 $session = Session::requireGameLogin([])->setReadOnly();
 $userID = Session::getUserID();
 
-$generalInfo = DB::db()->queryFirstRow('SELECT `no`, `nation`, `level`, penalty, permission from `general` where `owner`=%i', $userID);
+$generalInfo = DB::db()->queryFirstRow('SELECT `no`, `nation`, `level`, belong, penalty, permission from `general` where `owner`=%i', $userID);
 if(!$generalInfo){
     Json::die($result);
 }

hwe/j_board_article_add.php

@@ -15,7 +15,7 @@ $text = Util::getReq('text');
 
 increaseRefresh("회의실", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no, nation, name, level, permission, con, turntime, belong, penalty, `picture`,`imgsvr` FROM general WHERE owner=%i', $userID);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -57,12 +57,15 @@ else if ($isSecretBoard && $permission < 2) {
     ]);
 }
 
+$icon = GetImageURL($me['imgsvr'], $me['picture']);
+
 $db->insert('board', [
     'nation_no'=>$me['nation'],
     'is_secret'=>$isSecretBoard,
     'date'=>TimeUtil::DatetimeNow(),
     'general_no'=>$me['no'],
     'author'=>$me['name'],
+    'author_icon'=>$icon,
     'title'=>$title,
     'text'=>$text
 ]);

hwe/j_board_comment_add.php

@@ -14,7 +14,7 @@ $text = Util::getReq('text');
 
 increaseRefresh("회의실", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no, nation, name, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {

hwe/j_board_get_articles.php

@@ -62,7 +62,7 @@ foreach(
     ) as $comment
 ){
     //TODO:아이콘 받아오기?
-    $articles[$article['no']]['comment'] = $comment;
+    $articles[$comment['document_no']]['comment'][] = $comment;
 }
 
 Json::die([

hwe/j_diplomacy_destroy_letter.php

@@ -0,0 +1,134 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+
+$letterNo = Util::getReq('letterNo', 'int');
+
+increaseRefresh("외교부", 1);
+
+$me = $db->queryFirstRow('SELECT no, name, nation, level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+if($letterNo === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 입력입니다.'
+    ]);
+}
+
+
+$permission = checkSecretPermission($me);
+if ($permission < 4) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'권한이 부족합니다. 수뇌부가 아닙니다.'
+    ]);
+}
+
+$letter = $db->queryFirstRow('SELECT * FROM ng_diplomacy WHERE no=%i AND (src_nation_id = %i OR dest_nation_id = %i) AND state = \'activated\'', $letterNo, $me['nation'], $me['nation']);
+if(!$letter){
+    Json::die([
+        'result'=>false,
+        'reason'=>'서신이 없습니다.'
+    ]);
+}
+
+
+$aux = Json::decode($letter['aux']);
+
+
+$stateOpt = $aux['state_opt']??null;
+
+if(($stateOpt == 'try_destroy_src' && $letter['src_nation_id'] == $me['nation'])||
+($stateOpt == 'try_destroy_dest' && $letter['dest_nation_id'] == $me['nation'])){
+    Json::die([
+        'result'=>false,
+        'reason'=>'이미 파기 신청을 했습니다.'
+    ]);
+}
+
+$srcNation = getNationStaticInfo($letter['src_nation_id']);
+$destNation = getNationStaticInfo($letter['dest_nation_id']);
+$me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
+
+
+if($letter['src_nation_id'] == $me['nation']){
+    $src = new MessageTarget($me['no'], $me['name'], $srcNation['nation'], $srcNation['name'], $srcNation['color'], $me['icon']);
+    $dest = new MessageTarget(0, '', $destNation['nation'], $destNation['name'], $destNation['color']);
+}
+else{
+    $src = new MessageTarget($me['no'], $me['name'], $destNation['nation'], $destNation['name'], $destNation['color'], $me['icon']);
+    $dest = new MessageTarget(0, '', $srcNation['nation'], $srcNation['name'], $srcNation['color']);
+}
+
+
+$now = new \DateTime();
+$unlimited = new \DateTime('9999-12-31');
+
+if(in_array($stateOpt, ['try_destroy_src', 'try_destroy_dest'])){
+    $deleteLetterNo = $letterNo;
+    $db->update('ng_diplomacy', [
+        'state'=>'cancelled',
+        'aux'=>Json::encode($aux)
+    ], 'no=%i', $letterNo);
+    while(true){
+        $deleteLetter = $db->queryFirstRow('SELECT prev_no, aux FROM ng_diplomacy WHERE no = %i AND state = \'replaced\'', $currentLetterNo);
+        if(!$deleteLetter){
+            break;
+        }
+        $deleteAux = Json::decode($deleteLetter['aux']);
+        $deleteLetterNo = $deleteLetter['prev_no'];
+        $deleteAux['reason'] = [
+            'who'=>$me['no'],
+            'action'=>'destroy',
+            'reason'=>'파기'
+        ];
+    }
+    $msgText = "외교 서신 #{$letterNo}를 파기했습니다.";
+    $lastState = 'cancelled';
+}
+else{
+    if ($letter['src_nation_id'] == $me['nation']) {
+        $aux['state_opt'] = 'try_destroy_src';
+    }
+    else{
+        $aux['state_opt'] = 'try_destroy_dest';
+    }
+    $db->update('ng_diplomacy', [
+        'aux'=>Json::encode($aux)
+    ], 'no=%i', $letterNo);
+
+    $msgText = "외교 서신 #{$letterNo}를 파기 요청합니다.";
+    $lastState = 'activated';
+}
+
+$msg = new Message(
+    Message::MSGTYPE_DIPLOMACY,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success',
+    'state'=>$lastState
+]);

hwe/j_diplomacy_get_letter.php

@@ -38,17 +38,32 @@ $letters = [];
 
 foreach(
     $db->query(
-        'SELECT * FROM ng_diplomacy WHERE src_nation_id = %i OR dest_nation_id = %i ORDER BY date desc',
+        'SELECT * FROM ng_diplomacy WHERE (src_nation_id = %i OR dest_nation_id = %i) AND state != \'cancelled\' ORDER BY date desc',
         $me['nation'], $me['nation']
     ) as $letter
 ){
 
-    if($permission < 3){
-        $letter['detail'] = '(권한이 부족합니다)';
+    if($permission < 3 && $letter['text_detail']){
+        $letter['text_detail'] = '(권한이 부족합니다)';
     }
-    $letter['comment'] = [];
     $letter['aux'] = Json::decode($letter['aux']);
-    $letters[$letter['no']] = $letter;
+    $letter['src'] = $letter['aux']['src'];
+    $letter['dest'] = $letter['aux']['dest'];
+
+    $letter['src']['nationID'] = $letter['src_nation_id'];
+    $letter['dest']['nationID'] = $letter['dest_nation_id'];
+
+    $letters[$letter['no']] = [
+        'no'=>$letter['no'],
+        'src'=>$letter['src'],
+        'dest'=>$letter['dest'],
+        'prev_no'=>$letter['prev_no'],
+        'state'=>$letter['state'],
+        'state_opt'=>($letter['aux']['state_opt']??null),
+        'brief'=>$letter['text_brief'],
+        'detail'=>$letter['text_detail'],
+        'date'=>$letter['date']
+    ];
 }
 
 $nations = [];
@@ -63,6 +78,7 @@ Json::die([
     'result'=>true,
     'nations'=>$nations,
     'letters'=>$letters,
+    'myNationID'=>$me['nation'],
     'reason'=>'success'
 ]);
 

hwe/j_diplomacy_respond_letter.php

@@ -16,9 +16,9 @@ $reason = Util::getReq('reason', 'string', '');
 
 
 
-increaseRefresh("회의실", 1);
+increaseRefresh("외교부", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no, name, nation, level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -35,7 +35,6 @@ if($letterNo === null){
     ]);
 }
 
-
 $permission = checkSecretPermission($me);
 if ($permission < 4) {
     Json::die([
@@ -55,15 +54,36 @@ if(!$letter){
 }
 
 $aux = Json::decode($letter['aux']);
+$me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
+
+$srcNation = getNationStaticInfo($letter['src_nation_id']);
+$destNation = getNationStaticInfo($letter['dest_nation_id']);
+
+$src = new MessageTarget($me['no'], $me['name'], $destNation['nation'], $destNation['name'], $destNation['color'], $me['icon']);
+$dest = new MessageTarget(0, '', $srcNation['nation'], $srcNation['name'], $srcNation['color']);
+
+$now = new \DateTime();
+$unlimited = new \DateTime('9999-12-31');
 
 if($isAgree){
     $aux['dest']['generalName'] = $me['name'];
+    $aux['dest']['generalIcon'] = $me['icon'];
+
     $db->update('ng_diplomacy', [
         'state'=>'activated',
         'dest_signer'=>$me['no'],
         'aux'=>Json::encode($aux)
     ], 'no=%i', $letterNo);
     //TODO: 외교 서신에 대한 메시지를 양국에 발송해야함
+
+    $prevLetterNo = $letter['prev_no'];
+    while($prevLetterNo !== null){
+        $db->update('ng_diplomacy', [
+            'state'=>'replaced',
+        ], 'no=%i', $prevLetterNo);
+        $prevLetterNo = $db->queryFirstField('SELECT prev_no FROM ng_diplomacy WHERE state != \'cancelled\' AND no = %i', $prevLetterNo);
+    }
+    $msgText = "외교 서신 #{$letterNo}가 승인되었습니다.";
 }
 else{
     $aux['reason'] = [
@@ -74,10 +94,35 @@ else{
     $db->update('ng_diplomacy', [
         'state'=>'cancelled',
         'aux'=>Json::encode($aux)
-    ]);
-    //TODO: 외교 서신에 대한 메시지를 양국에 발송해야함
+    ], 'no=%i', $letterNo);
+    $msgText = "외교 서신 #{$letterNo}가 거부되었습니다.";
+    if($reason){
+        $msgText .= ' 이유 : '.$reason;
+    }
 }
 
+$msg = new Message(
+    Message::MSGTYPE_DIPLOMACY,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
+
+$msg = new Message(
+    Message::MSGTYPE_NATIONAL,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
+
 Json::die([
     'result'=>true,
     'reason'=>'success'

hwe/j_diplomacy_rollback_letter.php

@@ -0,0 +1,89 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+
+$letterNo = Util::getReq('letterNo', 'int');
+
+increaseRefresh("외교부", 1);
+
+$me = $db->queryFirstRow('SELECT no, name, nation, level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+if($letterNo === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 입력입니다.'
+    ]);
+}
+
+
+$permission = checkSecretPermission($me);
+if ($permission < 4) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'권한이 부족합니다. 수뇌부가 아닙니다.'
+    ]);
+}
+
+$reason = trim($reason);
+
+$letter = $db->queryFirstRow('SELECT * FROM ng_diplomacy WHERE no=%i AND src_nation_id = %i AND state = \'proposed\'', $letterNo, $me['nation']);
+if(!$letter){
+    Json::die([
+        'result'=>false,
+        'reason'=>'서신이 없습니다.'
+    ]);
+}
+
+$aux = Json::decode($letter['aux']);
+$me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
+
+$srcNation = getNationStaticInfo($letter['src_nation_id']);
+$destNation = getNationStaticInfo($letter['dest_nation_id']);
+
+$src = new MessageTarget($me['no'], $me['name'], $srcNation['nation'], $srcNation['name'], $srcNation['color'], $me['icon']);
+$dest = new MessageTarget(0, '', $destNation['nation'], $destNation['name'], $destNation['color']);
+
+$now = new \DateTime();
+$unlimited = new \DateTime('9999-12-31');
+
+$aux['reason'] = [
+    'who'=>$me['no'],
+    'action'=>'cancelled',
+    'reason'=>$reason
+];
+$db->update('ng_diplomacy', [
+    'state'=>'cancelled',
+    'aux'=>Json::encode($aux)
+], 'no=%i', $letterNo);
+$msgText = "외교 서신 #{$letterNo}가 회수되었습니다.";
+
+$msg = new Message(
+    Message::MSGTYPE_DIPLOMACY,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success'
+]);

hwe/j_diplomacy_send_letter.php

@@ -11,8 +11,8 @@ $db = DB::db();
 
 $destNationNo = Util::getReq('destNation', 'int', 0);
 $prevNo = Util::getReq('prevNo', 'int', null);
-$textBrief = Util::getReq('textBrief');
-$textDetail = Util::getReq('textDetail');
+$textBrief = Util::getReq('brief');
+$textDetail = Util::getReq('detail');
 
 increaseRefresh("외교부", 1);
 
@@ -20,7 +20,7 @@ if($prevNo < 1){
     $prevNo = null;
 }
 
-$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no, name, nation, level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -65,18 +65,10 @@ if ($permission < 4) {
 
 $srcNationNo = $me['nation'];
 
-$nations = $db->query('SELECT nation, name, color FROM nation WHERE nation IN (%i, %i)', $srcNationNo, $destNationNo);
-if(count($nations) != 2){
-    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 국가입니다.'
-    ]);
-}
-
 if($prevNo !== null){
     //state는 체크하지 않는걸로 하자. 파기한 것을 재 송신하는 경우도 있을 수 있음.
     $prevLetter = $db->queryFirstRow(
-        'SELECT no, state, aux FROM ng_diplomacy WHERE no = %i AND src_nation_id IN (%i, %i) AND dest_nation_id IN (%i, %i)',
+        'SELECT no, src_nation_id, dest_nation_id, state, aux FROM ng_diplomacy WHERE no = %i AND src_nation_id IN (%i, %i) AND dest_nation_id IN (%i, %i)',
         $prevNo,
         $srcNationNo, $destNationNo,
         $srcNationNo, $destNationNo
@@ -89,6 +81,24 @@ if($prevNo !== null){
         ]);
     }
 
+    //새로 나온 문서가 있는지 확인하자
+    $newerLetter = $db->queryFirstField(
+        'SELECT count(no) FROM ng_diplomacy WHERE prev_no = %i AND state != \'cancelled\'', $prevNo
+    );
+    if($newerLetter){
+        Json::die([
+            'result'=>false,
+            'reason'=>'해당 문서에 대한 새로운 문서가 이미 있습니다.'
+        ]);
+    }
+
+    if($prevLetter['src_nation_id'] != $srcNationNo){
+        $destNationNo = $prevLetter['src_nation_id'];
+    }
+    else{
+        $destNationNo = $prevLetter['dest_nation_id'];
+    }
+
     if($prevLetter['state'] == 'proposed'){
         $prevAux = Json::decode($prevLetter['aux']);
         $prevAux['reason'] = [
@@ -97,12 +107,20 @@ if($prevNo !== null){
             'reason'=>'new_letter'
         ];
         $db->update('ng_diplomacy', [
-            'state'=>'cancelled',
+            'state'=>'replaced',
             'aux'=>Json::encode($prevAux)
         ], 'no=%i', $prevNo);
     }
 }
 
+$nations = $db->query('SELECT nation, name, color FROM nation WHERE nation IN (%i, %i)', $srcNationNo, $destNationNo);
+if(count($nations) != 2){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 국가입니다.'
+    ]);
+}
+
 if($nations[0]['nation'] == $me['nation']){
     //index 순서에 따라 또 모름.
     $srcNation = $nations[0];
@@ -113,6 +131,8 @@ else{
     $destNation = $nations[0];
 }
 
+$me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
+
 $db->insert('ng_diplomacy', [
     'src_nation_id'=>$srcNation['nation'],
     'dest_nation_id'=>$destNation['nation'],
@@ -127,7 +147,8 @@ $db->insert('ng_diplomacy', [
         'src'=>[
             'nationName'=>$srcNation['name'],
             'nationColor'=>$srcNation['color'],
-            'generalName'=>$me['name']
+            'generalName'=>$me['name'],
+            'generalIcon'=>$me['icon']
         ],
         'dest'=>[
             'nationName'=>$destNation['name'],
@@ -135,9 +156,33 @@ $db->insert('ng_diplomacy', [
         ]
     ]),
 ]);
+$newLetterNo = $db->insertId();
+
+$src = new MessageTarget($me['no'], $me['name'], $srcNation['nation'], $srcNation['name'], $srcNation['color'], $me['icon']);
+$dest = new MessageTarget(0, '', $destNation['nation'], $destNation['name'], $destNation['color']);
+
+$now = new \DateTime();
+$unlimited = new \DateTime('9999-12-31');
+
+$josaYi = JosaUtil::pick($newLetterNo, '이');
+if($prevNo){
+    $msgText = "문서 #{$prevNo}의 새로운 외교 문서 #{$newLetterNo}{$josaYi} 준비되었습니다. 외교부에서 확인해주세요.";
+}
+else{
+    $msgText = "새로운 외교 문서 #{$newLetterNo}{$josaYi} 준비되었습니다. 외교부에서 확인해주세요.";
+}
 
 
-//TODO: 외교 서신에 대한 메시지를 양국에 발송해야함
+$msg = new Message(
+    Message::MSGTYPE_DIPLOMACY,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
 
 Json::die([
     'result'=>true,

hwe/j_general_set_permission.php

@@ -0,0 +1,80 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+// $btn, $level, $genlist, $outlist
+
+//TODO: 변경이 완료되면 항상 공지되어야함
+
+$isAmbassador = Util::getReq('isAmbassador', 'bool');
+$genlist = Util::getReq('genlist', 'array_int');
+
+//로그인 검사
+$session = Session::requireGameLogin([])->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$me = $db->queryFirstRow('SELECT no, level, nation FROM general WHERE owner = %i', $userID);
+
+if(!$me || $me['level'] != 12){
+    Json::die([
+        'result'=>false,
+        'reason'=>'군주가 아닙니다',
+        'tmp'=>$me
+    ]);
+}
+
+$nationID = $me['nation'];
+
+if($isAmbassador){
+    $targetType = 'ambassador';
+    $targetLevel = 4;
+    if($genlist && count($genlist) > 2){
+        Json::die([
+            'result'=>false,
+            'reason'=>'외교권자는 최대 둘까지만 설정 가능합니다.'
+        ]);
+    }
+}
+else{
+    $targetType = 'auditor';
+    $targetLevel = 3;
+}
+
+$db->update('general', [
+    'permission'=>'normal'
+], 'nation = %i AND permission = %s', $nationID, $targetType);
+
+if(!$genlist){
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+$realCandidates = [];
+foreach($db->query('SELECT no, nation, level, penalty, permission FROM general WHERE nation = %i AND level != 12 AND permission = \'normal\' AND no IN %li', $nationID, $genlist) as $candidate){
+    $maxPermission = checkSecretMaxPermission($candidate);
+    if($maxPermission < $targetLevel){
+        continue;
+    }
+    $realCandidates[] = $candidate['no'];
+}
+
+if(!$realCandidates){
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+$db->update('general', [
+    'permission'=>$targetType,
+], 'no IN %li', $realCandidates);
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success'
+]);

hwe/j_get_general_list.php

@@ -0,0 +1,109 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+
+//로그인 검사
+$session = Session::requireLogin();
+$userID = Session::getUserID();
+
+$db = DB::db();
+$withToken = Util::getReq('with_token', 'bool', false);
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+if($session->isGameLoggedIn()){
+    increaseRefresh("장수일람", 2);
+
+    $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
+    $con = checkLimit($me['con']);
+    if ($con >= 2) {
+        Json::die([
+            'result'=>false,
+            'reason'=>'접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.'
+        ]);
+    }
+}
+else{
+    $availableNextCall = $session->availableNextCallGetGeneralList??'2000-01-01 00:00:00';
+    $now = new \DateTimeImmutable();
+
+    if($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 5){
+        Json::die([
+            'result'=>false,
+            'reason'=>"장수 리스트는 10초에 한번 갱신 가능합니다.\n다음 시간 : ".$availableNextCall
+        ]);
+    }
+    
+    $availableNextCall = $now->add(new \DateInterval('PT10S'))->format('Y-m-d H:i:s');
+    $session->availableNextCallGetGeneralList = $availableNextCall;
+}
+
+$session->setReadOnly();
+
+$rawGeneralList = $db->queryAllLists('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,name2,injury,leader,power,intel,experience,dedication,level,killturn,connect from general');
+
+$ownerNameList = [];
+if($gameStor->isunited){
+    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
+
+$generalList = [];
+foreach($rawGeneralList as $rawGeneral){
+    [$owner,$no,$picture,$imgsvr,$npc,$age,$nation,$special,$special2,$personal,$name,$name2,$injury,$leader,$power,$intel,$experience,$dedication,$level,$killturn,$connect] = $rawGeneral;
+
+    if(key_exists($owner, $ownerNameList)){
+        $name2 = $ownerNameList[$owner];
+    }
+
+    $nationArr = getNationStaticInfo($nation);
+    $lbonus = calcLeadershipBonus($level, $nationArr['level']);
+
+    $generalList[] = [
+        $no,
+        $picture,
+        $imgsvr,
+        $npc,
+        $age,
+        $nationArr['name'],
+        getGenSpecial($special),
+        getGenSpecial($special2),
+        getGenChar($personal),
+        $name,
+        $name2,
+        $injury,
+        $leader,
+        $lbonus,
+        $power,
+        $intel,
+        getExpLevel($experience),
+        getHonor($experience),
+        getDed($dedication),
+        getLevel($level, $nationArr['level']),
+        $killturn,
+        $connect
+    ];
+}
+
+$result = [
+    'result'=>'true',
+    'list'=>$generalList,
+];
+
+if($withToken){
+    $now = (new \DateTimeImmutable())->format('Y-m-d H:i:s');
+    $tokens = [];
+    foreach($db->query('SELECT * FROM select_npc_token WHERE `valid_until`>=%s', $now) as $token){
+        $validUntil = $token['valid_until'];
+
+        foreach(Json::decode($token['pick_result']) as $pickResult){
+            $tokens[$pickResult['no']]=$pickResult['keepCnt'];
+        }
+    }
+    $result['token'] = $tokens;
+}
+
+Json::die($result);

hwe/j_get_select_npc_token.php

@@ -90,9 +90,11 @@ if($token && !$refresh){
 $candidates = [];
 
 $weight = [];
-foreach($db->query('SELECT `no`, `name`, leader, power, intel, imgsvr, picture, special, special2 FROM general WHERE npc=2') as $general){
+foreach($db->query('SELECT `no`, `name`, leader, power, nation, personal, intel, imgsvr, picture, special, special2 FROM general WHERE npc=2') as $general){
     $general['special'] = \sammo\SpecialityConst::DOMESTIC[$general['special']][0]??'-';
     $general['special2'] = \sammo\SpecialityConst::WAR[$general['special2']][0]??'-';
+    $general['personal'] = getGenChar($general['personal']);
+    $general['nation'] = getNationStaticInfo($general['nation'])['name'];
     $candidates[$general['no']] = $general + ['keepCnt'=>KEEP_CNT];
     $allStat = $general['leader'] + $general['power'] + $general['intel'];
     $weight[$general['no']] = pow($allStat, 1.5);

hwe/j_install.php

@@ -27,6 +27,20 @@ if($reserve_open && $reserve_open < date('Y-m-d H:i')){
     ]);
 }
 
+$pre_reserve_open = Util::getReq('pre_reserve_open');
+if($pre_reserve_open && !$reserve_open){
+    Json::die([
+        'result'=>false,
+        'reason'=>'가오픈 예약을 위해선 오픈 예약을 지정해야합니다.'
+    ]);
+}
+if($pre_reserve_open && $pre_reserve_open >= $reserve_open){
+    Json::die([
+        'result'=>false,
+        'reason'=>'가오픈 시간이 오픈 예약 시점보다 이전이어야 합니다.'
+    ]);
+}
+
 if($session->userGrade < 5 && !$allowReset){
     Json::die([
         'result'=>false,
@@ -43,7 +57,8 @@ $v->rule('required', [
     'extend',
     'join_mode',
     'npcmode',
-    'show_img_level'
+    'show_img_level',
+    'autorun_user_minutes'
 ])->rule('integer', [
     'turnterm',
     'sync',
@@ -53,6 +68,7 @@ $v->rule('required', [
     'npcmode',
     'show_img_level',
     'tournament_trig',
+    'autorun_user_minutes'
 ])->rule('in', 'join_mode', ['onlyRandom', 'full']);
 if(!$v->validate()){
     Json::die([
@@ -94,6 +110,30 @@ $npcmode = (int)$_POST['npcmode'];
 $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::getReq('autorun_user', 'array_string', []) as $autorun_option){
+    $autorun_user_options[$autorun_option] = 1;
+}
+
+if($autorun_user_minutes > 0 && !$autorun_user_options){
+    Json::die([
+        'result'=>false,
+        'reason'=>'적어도 자동 행동 중 하나는 선택을 해야합니다.'
+    ]);
+}
+
+if($autorun_user_minutes < 0){
+    Json::die([
+        'result'=>false,
+        'reason'=>'자동 행동 기한이 0보다 작을 수 없습니다.'
+    ]);
+}
+
+$autorun_user = $autorun_user_minutes?[
+    'limit_minutes'=>$autorun_user_minutes,
+    'options'=>$autorun_user_options
+]:null;
 
 if($reserve_open){
     $reserve_open = new \DateTime($reserve_open);
@@ -114,22 +154,36 @@ if($reserve_open){
     }
 
     $scenarioObj = new Scenario($scenario, true);
+    $open_date = $reserve_open->format('Y-m-d H:i:s');
+
+    $reserveInfo = [
+        'turnterm'=>$turnterm,
+        'sync'=>$sync,
+        'scenario'=>$scenario,
+        'scenarioName'=>$scenarioObj->getTitle(),
+        'fiction'=>$fiction,
+        'extend'=>$extend,
+        'npcmode'=>$npcmode,
+        'show_img_level'=>$show_img_level,
+        'tournament_trig'=>$tournament_trig,
+        'gameConf'=>$scenarioObj->getGameConf(),
+        'join_mode'=>$join_mode,
+        'starttime'=>$open_date,
+        'autorun_user'=>$autorun_user
+    ];
+
+    
+    if($pre_reserve_open){
+        $pre_reserve_open = new \DateTime($pre_reserve_open);
+        $open_date = $pre_reserve_open->format('Y-m-d H:i:s');
+    }
+
+
+    
     $db->delete('reserved_open', true);
     $db->insert('reserved_open', [
-        'options'=>Json::encode([
-            'turnterm'=>$turnterm,
-            'sync'=>$sync,
-            'scenario'=>$scenario,
-            'scenarioName'=>$scenarioObj->getTitle(),
-            'fiction'=>$fiction,
-            'extend'=>$extend,
-            'npcmode'=>$npcmode,
-            'show_img_level'=>$show_img_level,
-            'tournament_trig'=>$tournament_trig,
-            'gameConf'=>$scenarioObj->getGameConf(),
-            'join_mode'=>$join_mode,
-        ]),
-        'date'=>$reserve_open->format('Y-m-d H:i:s')
+        'options'=>Json::encode($reserveInfo),
+        'date'=>$open_date
     ]);
     AppConf::getList()[DB::prefix()]->closeServer();
     Json::die([
@@ -147,5 +201,7 @@ Json::die(ResetHelper::buildScenario(
     $npcmode,
     $show_img_level,
     $tournament_trig,
-    $join_mode
+    $join_mode,
+    TimeUtil::DatetimeNow(),
+    $autorun_user
 ));

hwe/j_msg_get_old.php

@@ -16,7 +16,7 @@ if($reqTo === null){
         'reason'=>'올바르지 않은 범위 입니다.'
     ]);
 }
-if($reqType === null || !in_array($reqType, ['private', 'public', 'national'])){
+if($reqType === null || !in_array($reqType, ['private', 'public', 'national', 'diplomacy'])){
     Json::die([
         'result'=>false,
         'reason'=>'올바르지 않은 타입입니다.'
@@ -50,20 +50,18 @@ if($delayTime){
 }
 $session->setReadOnly();
 
-list($generalID, $nationID, $generalName) = DB::db()->queryFirstList(
-    'select `no`, `nation`, `name` from `general` where owner = %i',
-    $userID
-);
+$me = DB::db()->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
 
-
-
-if($nationID === null){
+if($me === null){
     Json::die([
         'result'=>false,
         'reason'=>'장수가 사망했습니다.'
     ]);
 }
 
+[$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']];
+$permission = checkSecretPermission($me, false);
+
 $result = [
     'private'=>[],
     'public'=>[],
@@ -95,13 +93,26 @@ else if($reqType == 'public'){
         return $msg->toArray();
     }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_PUBLIC, Message::MSGTYPE_PUBLIC, $reqTo, 20));
 }
-else{
+else if($reqType == 'national'){
     $result['national'] = array_map(function(Message $msg)use (&$nextSequence){
         if($msg->id > $nextSequence){
             $nextSequence = $msg->id;
         }
         return $msg->toArray();
-    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, $reqTo, 40));
+    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, $reqTo, 20));
+}
+else{
+    $result['diplomacy'] = array_map(function(Message $msg)use (&$nextSequence, $permission){
+        if($msg->id > $nextSequence){
+            $nextSequence = $msg->id;
+        }
+        $values = $msg->toArray();
+        if($msg->dest->nationID != 0 && $permission < 3){
+            $values['text'] = '(외교 메시지입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
+            $values['option']['invalid'] = true;
+        }
+        return $values;
+    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, $reqTo, 20));
 }
 
 Json::die($result);

hwe/j_msg_get_recent.php

@@ -47,10 +47,8 @@ if($me === null){
     ]);
 }
 
-$generalID = $me['no'];
-$nationID = $me['nation'];
-$generalName = $me['name'];
-$permission = checkSecretPermission($me);
+[$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']];
+$permission = checkSecretPermission($me, false);
 
 $result = [];
 $result['result'] = true;
@@ -90,7 +88,7 @@ $result['national'] = array_map(function(Message $msg)use (&$nextSequence, &$min
         $lastType = 'national';
     }
     return $msg->toArray();
-}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, 40, $reqSequence));
+}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, 20, $reqSequence));
 
 $result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType, $permission){
     if($msg->id > $nextSequence){
@@ -101,11 +99,12 @@ $result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence, &$min
         $lastType = 'diplomacy';
     }
     $values = $msg->toArray();
-    if($permission < 3){
-        $values['text'] = '(외교 문서입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
+    if($msg->dest->nationID != 0 && $permission < 3){
+        $values['text'] = '(외교 메시지입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
+        $values['option']['invalid'] = true;
     }
     return $values;
-}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 40, $reqSequence));
+}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 20, $reqSequence));
 
 if($lastType !== null){
     array_pop($result[$lastType]);

hwe/j_msg_submit.php

@@ -49,7 +49,7 @@ $now = new \DateTime();
 $unlimited = new \DateTime('9999-12-31');
 
 $db = DB::db();
-$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
+$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission,belong FROM general WHERE `owner`=%i', $userID);
 
 if(!$me){
     $session->logoutGame();
@@ -150,8 +150,8 @@ if($mailbox > 0) {
     
     $session->lastMsg = $now->format('Y-m-d H:i:s');
 
-    $destUser = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`con`,`picture`,`imgsvr` FROM general WHERE `no`=%i',$mailbox);
-
+    $destUser = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,permission,penalty FROM general WHERE `no`=%i',$mailbox);
+    
     if(!$destUser){
         Json::die([
             'result' => false,
@@ -160,6 +160,15 @@ if($mailbox > 0) {
         ]);
     }
 
+    $destPermission = checkSecretPermission($destUser, false);
+    if($permission == 4 && $destPermission == 4 && $destUser['nation'] != $me['nation']){
+        Json::die([
+            'result' => false,
+            'reason' => '외교권자끼리는 메시지를 보낼 수 없습니다.',
+            'msgID' => null
+        ]);
+    }
+
     $destNation = getNationStaticInfo($destUser['nation']);
 
     $dest = new MessageTarget(

hwe/j_preprocessing.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
+$session = Session::requireGameLogin([])->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
@@ -17,8 +17,10 @@ $commandtype = Util::getReq('commandtype', 'int');
 increaseRefresh("턴입력", 1);
 
 if(!$turn || $commandtype === null || $sel === null){
-    header('location:commandlist.php');
-    die();
+    Json::die([
+        'result'=>true,
+        'reason'=>'empty command'
+    ]);
 }
 
 $count = count($turn);
@@ -80,6 +82,9 @@ switch($commandtype) {
 //    case 34: command_34($turn, 34); break; //파괴
 //    case 35: command_35($turn, 35); break; //선동
 
+    case 38: command_Single($turn, 38); break; //내특 초기화
+    case 39: command_Single($turn, 39); break; //전특 초기화
+
     case 41: command_Single($turn, 41); break; //단련
     case 42: command_Single($turn, 42); break; //견문
 //    case 43: command_43(    $turn, 43); break; //증여
@@ -98,6 +103,7 @@ switch($commandtype) {
     case 55: command_Single($turn, 55); break; //거병
     case 56: command_Single($turn, 56); break; //해산
     case 57: command_Single($turn, 57); break; //모반 시도
+//    case 58: command_Single($turn, 58); break; //숙련 전환
 
 //    case 61: command_61($turn, 61); break; //불가침
 //    case 62: command_62($turn, 62); break; //선포
@@ -118,6 +124,7 @@ switch($commandtype) {
 //    case 78: command_78($turn, 78); break; //급습
 
 //    case 81: command_81($turn, 81); break; //국기변경
+//    case 82: command_82($turn, 82); break; //국호변경
 
 //    case 99: command_99($turn); break; //수뇌부 후식
     default: command_Other($turn, $commandtype); break;

hwe/j_select_npc.php

@@ -22,6 +22,13 @@ $rootDB = RootDB::db();
 $oNow = new \DateTimeImmutable();
 $now = $oNow->format('Y-m-d H:i:s');
 
+list(
+    $year,
+    $month,
+    $maxgeneral,
+    $npcmode
+) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode']);
+
 $userNick = RootDB::db()->queryFirstField('SELECT `NAME` FROM member WHERE `NO`=%i',$userID);
 if(!$userNick){
     Json::die([
@@ -30,6 +37,8 @@ if(!$userNick){
     ]);
 }
 
+$db->query("lock tables general write, select_npc_token write");
+
 $pickResult = $db->queryFirstField('SELECT pick_result FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%s', $userID, $now);
 if(!$pickResult){
     Json::die([
@@ -38,7 +47,6 @@ if(!$pickResult){
     ]);
 }
 
-
 $pickResult = Json::decode($pickResult);
 if(!key_exists($pick, $pickResult)){
     Json::die([
@@ -50,14 +58,9 @@ $pickedNPC = $pickResult[$pick];
 
 
 $gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
-list(
-    $year,
-    $month,
-    $maxgeneral,
-    $npcmode
-) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode']);
 
 if(!$npcmode){
+    $db->query("unlock tables");
     Json::die([
         'result'=>false,
         'reason'=>'빙의 가능한 서버가 아닙니다'
@@ -65,22 +68,29 @@ if(!$npcmode){
 }
 
 if ($gencount >= $maxgeneral) {
+    $db->query("unlock tables");
     Json::die([
         'result'=>false,
         'reason'=>'더 이상 등록 할 수 없습니다.'
     ]);
 }
 
+
+
 //등록 시작
 $db->update('general', [
     'name2'=>$userNick,
     'npc'=>1,
     'killturn'=>6,
     'mode'=>2,
+    'permission'=>'normal',
     'owner'=>$userID,
 ], 'owner <= 0 AND npc = 2 AND no = %i', $pick);
 
+
+
 if(!$db->affectedRows()){
+    $db->query("unlock tables");
     Json::die([
         'result'=>false,
         'reason'=>'장수 등록에 실패했습니다.'
@@ -89,6 +99,8 @@ if(!$db->affectedRows()){
 
 $db->delete('select_npc_token', 'owner=%i or valid_until < %s', $userID, $now);
 
+$db->query("unlock tables");
+
 $josaYi = JosaUtil::pick($userNick, '이');
 pushGeneralHistory($pickedNPC, "<C>●</>{$year}년 {$month}월:<Y>{$pickedNPC['name']}</>의 육체에 <Y>{$userNick}</>{$josaYi} 빙의되다.");
 //pushGenLog($me, $mylog);

hwe/j_server_basic_info.php

@@ -3,6 +3,41 @@ namespace sammo;
 
 include "lib.php";
 
+$templates = new \League\Plates\Engine(__dir__.'/templates');
+
+function getAutorunInfo($autorunOption){
+    global $templates;
+    $auto_info = [];
+    foreach($autorunOption['options'] as $auto_option => $value){
+        assert($value);
+        switch($auto_option){
+            case 'develop': $auto_info['내정'] = '내정'; break;
+            case 'warp': $auto_info['순간이동'] = '순간이동'; break;
+            case 'recruit': $auto_info['징병'] = $auto_info['징병']??'징병'; break;
+            case 'recruit_high': $auto_info['징병'] = '모병'; break;
+            case 'train': $auto_info['훈사'] = '훈련/사기진작'; break;
+            case 'battle': $auto_info['출병'] = '출병'; break;
+        }
+    }
+    $limit = Util::toInt($autorunOption['limit_minutes']);
+    if($limit >= 43200){
+        $auto_info['제한'] = '항상 유효';
+    }
+    else if($limit % 60 == 0){
+        $auto_info['제한'] = ($limit/60).'시간 유효';
+    }
+    else{
+        $auto_info['제한'] = ($limit).'분 유효';
+    }
+    $auto_info = join(', ', array_values($auto_info));
+    return $templates->render('tooltip', [
+        'text'=>'자율행동',
+        'info'=>$auto_info,
+        'style'=>'text-decoration:underline',
+        'copyable_info'=>true
+    ]);
+}
+
 $session = Session::requireLogin([
     'game'=>null,
     'me'=>null
@@ -16,6 +51,7 @@ if(!class_exists('\\sammo\\DB')){
     ]);
 }
 
+
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 
@@ -38,6 +74,10 @@ if(file_exists(__dir__.'/.htaccess')){
         $otherTextInfo[] = '랜덤 임관 전용';
     }
 
+    if($options['autorun_user']['limit_minutes']??false){
+        $otherTextInfo[] = getAutorunInfo($options['autorun_user']);
+    }
+
     if(!$otherTextInfo){
         $otherTextInfo = '표준';
     }
@@ -53,6 +93,7 @@ if(file_exists(__dir__.'/.htaccess')){
             'fictionMode'=>($options['fiction']?'가상':'사실'),
             'npcMode'=>($options['npcmode']?'가능':'불가'),
             'openDatetime'=>$reserved['date'],
+            'starttime'=>$options['starttime'],
             'gameConf'=>$options['gameConf'],
             'otherTextInfo'=>$otherTextInfo
         ],
@@ -63,11 +104,13 @@ if(file_exists(__dir__.'/.htaccess')){
 
 //TODO: 천통시에도 예약 오픈 알림이 필요..?
 
-$admin = $gameStor->getValues(['isunited', 'npcmode', 'year', 'month', 'scenario', 'scenario_text', 'maxgeneral', 'turnterm']);
+$admin = $gameStor->getValues(['isunited', 'npcmode', 'year', 'month', 'scenario', 'scenario_text', 'maxgeneral', 'turnterm', 'opentime', 'turntime', 'join_mode', 'fiction', 'autorun_user']);
 $admin['maxUserCnt'] = $admin['maxgeneral'];
 $admin['npcMode'] = $admin['npcmode'];
 $admin['turnTerm'] = $admin['turnterm'];
 $admin['isUnited'] = $admin['isunited'];
+$admin['starttime'] = substr($admin['opentime'], 5, 11);
+$admin['turntime'] = substr($admin['turntime'], 5, 11);
 unset($admin['npcmode']);
 unset($admin['maxgeneral']);
 unset($admin['turnterm']);
@@ -82,6 +125,29 @@ $admin['userCnt'] = $genCnt;
 $admin['npcCnt'] = $npcCnt;
 $admin['nationCnt'] = $nationCnt;
 
+$admin['npcMode'] = $admin['npcMode']?'가능':'불가';
+$admin['fictionMode'] = $admin['fiction']?'가상':'사실';
+
+$otherTextInfo = [];
+
+if($admin['join_mode'] == 'onlyRandom'){
+    $otherTextInfo[] = '랜덤 임관 전용';
+}
+
+if($admin['autorun_user']['limit_minutes']??false){
+    $otherTextInfo[] = getAutorunInfo($admin['autorun_user']);
+}
+
+if(!$otherTextInfo){
+    $otherTextInfo = '표준';
+}
+else{
+    $otherTextInfo = join(', ', $otherTextInfo);
+}
+
+
+$admin['otherTextInfo'] = $otherTextInfo;
+$admin['defaultStatTotal'] = GameConst::$defaultStatTotal;
 $me = [];
 
 $general = $db->queryFirstRow('SELECT name, picture, imgsvr from general where owner=%i', $userID);

hwe/j_troop.php

@@ -0,0 +1,165 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+// $btn, $name, $troop
+$action = Util::getReq('action');
+$name = Util::getReq('name');
+$gen = Util::getReq('gen', 'int');
+$troop = Util::getReq('troop', 'int');
+
+//로그인 검사
+$session = Session::requireGameLogin([])->setReadOnly();
+$userID = $session::getUserID();
+
+$db = DB::db();
+
+$me = $db->queryFirstRow('SELECT `no`, name, nation, troop FROM general WHERE `owner`=%i', $userID);
+
+
+
+if($action == '부대창설'){
+    $name = trim($name);
+    if(!$name){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대 이름이 없습니다.'
+        ]);
+    }
+    if($me['troop'] != 0){
+        Json::die([
+            'result'=>false,
+            'reason'=>'이미 부대에 가입해있습니다.'
+        ]);
+    }
+    $db->insert('troop',[
+        'name'=>$name,
+        'nation'=>$me['nation'],
+        'no'=>$me['no']
+    ]);
+    $troopID = $db->insertId();
+
+    $db->update('general', [
+        'troop'=>$troopID
+    ], 'no=%i',$me['no']);
+
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+if($action == '부대변경'){
+    $name = trim($name);
+    if(!$name){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대 이름이 없습니다.'
+        ]);
+    }
+
+    $db->update('troop', [
+        'name'=>$name
+    ], 'no=%i',$me['no']);
+
+    if($db->affectedRows() == 0){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대장이 아닙니다.'
+        ]);
+    }
+
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+if($action == '부대추방'){
+    if (!$gen){
+        Json::die([
+            'result'=>false,
+            'reason'=>'장수를 지정해야 합니다.'
+        ]);
+    }
+
+    $db->update('general', [
+        'troop'=>0
+    ], 'no=%i AND troop=(SELECT troop FROM troop WHERE no = %i)', $gen, $me['no']);
+
+    if($db->affectedRows() == 0){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대장이 아니거나, 장수를 잘못 지정했습니다.'
+        ]);
+    }
+
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+if ($action == '부대가입') {
+    if(!$troop){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대를 지정해야 합니다.'
+        ]);
+    }
+
+    $troopLeader = $db->queryFirstField('SELECT `no` FROM troop WHERE troop=%i', $troop)?:0;
+    $troopLeaderNation = $db->queryFirstField('SELECT `nation` FROM `general` WHERE `no`=%i AND `nation`=%i', $troopLeader, $me['nation']);
+
+    if (!$troopLeaderNation) {
+        Json::die([
+            'result'=>false,
+            'reason'=>'올바른 부대장이 아닙니다.'
+        ]);
+    }
+
+    $db->update('general', [
+        'troop'=>$troop
+    ], 'no=%i', $me['no']);
+
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+if($action ==  "부대탈퇴") {
+
+    if($me['troop'] == 0){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대에 속해있지 않습니다.'
+        ]);
+    }
+    $troopLeader = $db->queryFirstField('SELECT `no` FROM troop WHERE troop=%i', $me['troop']);
+    
+    //부대장일 경우
+    if($troopLeader == $me['no']) {
+        // 모두 탈퇴
+        $db->update('general', [
+            'troop'=>0
+        ], 'troop=%i',$me['troop']);
+        // 부대 삭제
+        $db->delete('troop', 'troop=%i', $me['troop']);
+    } else {
+        $db->update('general', [
+            'troop'=>0
+        ], 'no=%i', $me['no']);
+    }
+
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+Json::die([
+    'result'=>false,
+    'reason'=>'올바르지 않은 명령입니다.'
+]);

hwe/j_turn.php

@@ -6,4 +6,66 @@ include "func.php";
 
 
 
-$session = Session::requireGameLogin([])->setReadOnly();
+$session = Session::requireGameLogin([])->setReadOnly();
+
+$type = Util::getReq('type', 'int', 0);
+$sel = Util::getReq('sel', 'int', 1);
+
+if($sel <= 0 || $sel > 12){
+    $sel = 1;
+}
+
+$userID = Session::getUserID();
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+increaseRefresh("턴반복", 1);
+
+$myActionCnt = $db->queryFirstField('SELECT con FROM general WHERE `owner`=%i', $userID);
+
+$con = checkLimit($myActionCnt);
+if($con >= 2) { 
+    Json::die([
+        'result'=>false,
+        'result'=>'접속 제한입니다.'
+    ]);
+ }
+
+switch($type) {
+case 0://반복
+    $valueMap = [];
+    foreach(range($sel, GameConst::$maxTurn - 1) as $idx){
+        $src = $idx % $sel;
+        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
+    }
+    $db->update('general', $valueMap, 'owner=%i', $userID);
+    break;
+case 1:
+    $valueMap = [];
+    foreach(range(GameConst::$maxTurn -1, $sel, -1) as $idx){
+        $src = $idx - $sel;
+        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
+    }
+    foreach(range($sel -1, 0, -1) as $idx){
+        $valueMap['turn'.$idx] = EncodeCommand(0, 0, 0, 0);
+    }
+    $db->update('general', $valueMap, 'owner=%i', $userID);
+    break;
+case 2:
+    $valueMap = [];
+    foreach(range(0, GameConst::$maxTurn - $sel - 1) as $idx){
+        $src = $idx + $sel;
+        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
+    }
+    foreach(range(GameConst::$maxTurn - $sel, GameConst::$maxTurn - 1) as $idx){
+        $valueMap['turn'.$idx] = EncodeCommand(0, 0, 0, 0);
+    }
+    $db->update('general', $valueMap, 'owner=%i', $userID);
+    break;
+}
+
+Json::die([
+    'result'=>true,
+    'result'=>'success'
+]);

hwe/join_post.php

@@ -68,9 +68,11 @@ if (!$member) {
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$gameStor->cacheValues(['year','month','maxgeneral','scenario','show_img_level','turnterm','genius','npcmode']);
+$gameStor->cacheValues(['year','month','maxgeneral','scenario','show_img_level','turnterm','turntime','genius','npcmode']);
 ########## 동일 정보 존재여부 확인. ##########
 
+$db->query("lock tables general write, city read, storage read");
+
 $gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
 $oldGeneral = $db->queryFirstField('SELECT `no` FROM general WHERE `owner`=%i', $userID);
 $oldName = $db->queryFirstField('SELECT `no` FROM general WHERE `name`=%s', $name);
@@ -80,6 +82,7 @@ if ($oldGeneral) {
       window.alert('이미 등록하셨습니다!')
       history.go(-1)
       </script>");
+    $db->query("unlock tables");
     exit;
 }
 if ($oldName) {
@@ -87,6 +90,7 @@ if ($oldName) {
       window.alert('이미 있는 장수입니다. 다른 이름으로 등록해 주세요!')
       history.go(-1)
       </script>");
+    $db->query("unlock tables");
     exit;
 }
 if ($gameStor->maxgeneral <= $gencount) {
@@ -94,6 +98,7 @@ if ($gameStor->maxgeneral <= $gencount) {
       window.alert('더이상 등록할 수 없습니다!')
       history.go(-1)
       </script>");
+    $db->query("unlock tables");
     exit;
 }
 if (mb_strlen($name) < 1) {
@@ -101,6 +106,7 @@ if (mb_strlen($name) < 1) {
       window.alert('이름이 짧습니다. 다시 가입해주세요!')
       history.go(-1)
       </script>");
+    $db->query("unlock tables");
     exit;
 }
 if (mb_strlen($name) > 9) {
@@ -108,6 +114,7 @@ if (mb_strlen($name) > 9) {
       window.alert('이름이 유효하지 않습니다. 다시 가입해주세요!')
       history.go(-1)
       </script>");
+    $db->query("unlock tables");
     exit;
 }
 if ($leader + $power + $intel > GameConst::$defaultStatTotal) {
@@ -115,6 +122,7 @@ if ($leader + $power + $intel > GameConst::$defaultStatTotal) {
       window.alert('능력치가 ".GameConst::$defaultStatTotal."을 넘어섰습니다. 다시 가입해주세요!')
       history.go(-1)
       </script>");
+    $db->query("unlock tables");
     exit;
 }
 
@@ -153,7 +161,7 @@ $leader = $leader + $pleader;
 $power = $power + $ppower;
 $intel = $intel + $pintel;
 
-$admin = $gameStor->getValues(['scenario', 'turnterm', 'show_img_level', 'startyear', 'year']);
+$admin = $gameStor->getValues(['scenario', 'turnterm', 'turntime', 'show_img_level', 'startyear', 'year']);
 $relYear = Util::valueFit($admin['year'] - $admin['startyear'], 0);
 
 $age = 20 + ($pleader + $ppower + $pintel) * 2 - (mt_rand(0, 1));
@@ -162,11 +170,11 @@ if ($genius) {
     $specage2 = $age;
     $special2 = getSpecial2($leader, $power, $intel);
 } else {
-    $specage2 = Util::valueFit(Util::round((80 - $age)/4 - $relYear / 2), 3) + $age;
+    $specage2 = Util::valueFit(Util::round((GameConst::$retirementYear - $age)/4 - $relYear / 2), 3) + $age;
     $special2 = 0;
 }
 //내특
-$specage = Util::valueFit(Util::round((80 - $age)/12 - $relYear / 2), 3) + $age;
+$specage = Util::valueFit(Util::round((GameConst::$retirementYear - $age)/12 - $relYear / 2), 3) + $age;
 $special = 0;
 
 if ($admin['scenario'] >= 1000) {
@@ -187,10 +195,10 @@ else{
     $experience *= 0.8;
 }
 
-$turntime = getRandTurn($admin['turnterm']);
+$turntime = getRandTurn($admin['turnterm'], new \DateTimeImmutable($admin['turntime']));
 
-$lastconnect = date('Y-m-d H:i:s');
-if ($lastconnect >= $turntime) {
+$now = date('Y-m-d H:i:s');
+if ($now >= $turntime) {
     $turntime = addTurn($turntime, $admin['turnterm']);
 }
 
@@ -233,7 +241,8 @@ $db->insert('general', [
     'level' => 0,
     'turntime' => $turntime,
     'killturn' => 6,
-    'lastconnect' => $lastconnect,
+    'lastconnect' => $now,
+    'lastrefresh' => $now,
     'crewtype'=>GameUnitConst::DEFAULT_CREWTYPE,
     'makelimit' => 0,
     'age' => $age,
@@ -246,6 +255,8 @@ $db->insert('general', [
 ]);
 $generalID = $db->insertId();
 
+$db->query("unlock tables");
+
 $cityname = CityConst::byID($city)->name;
 
 $me = [

hwe/js/board.js

@@ -2,8 +2,8 @@
 
 function submitArticle(){
     var $article = $('#newArticle');
-    var $title = $article.find('input.titleInput');
-    var $text = $article.find('input.contentInput');
+    var $title = $article.find('.titleInput');
+    var $text = $article.find('.contentInput');
     var title = $.trim($title.val());
     var text = $.trim($text.val());
 
@@ -48,7 +48,8 @@ function submitArticle(){
 
 function submitComment(){
     var $this = $(this);
-    var $article = $this.parents('.article').eq(0);
+    
+    var $article = $this.closest('.articleObj').eq(0);
     var articleNo = $article.data('no');
     var $text = $article.find('input.commentText');
     var text = $.trim($text.val());
@@ -87,25 +88,30 @@ function submitComment(){
     return false;
 }
 
-function drawArticle(articleObj){
+function drawArticle(idx, articleObj){
     var $articleFrame = $('#articleTemplate > .articleFrame');
-    var $commentFrame = $('#commentTemplate > .comment');
+    var $commentFrame = $($('#commentTemplate').prop('content'));
 
     var $article = $articleFrame.clone();
     $article.addClass('articleObj')
         .data('no', articleObj.no)
         .data('author', articleObj.general_no);
 
-    $article.find('.author').text(articleObj.author);
-    $article.find('.title').text(articleObj.title);
+    
+    $article.find('.articleNo').text(articleObj.no);
+    $article.find('.authorName').text(articleObj.author);
+    $article.find('.articleTitle').text(articleObj.title);
     $article.find('.date').text(articleObj.date);
+    if(articleObj.author_icon){
+        $article.find('.authorIcon').attr('src', articleObj.author_icon);
+    }
     //$article.find('.text').text(articleObj.text);
     $article.find('.text').html(nl2br(escapeHtml(articleObj.text)));
     //TODO: 바꿀 것
 
-    var $articleComment = $article.find('ul.commentList');
+    var $articleComment = $article.find('.commentList');
     
-    $.each(articleObj.comment, function(commentObj){
+    $.each(articleObj.comment, function(_, commentObj){
         var $comment = $commentFrame.clone();
         $comment.find('.author').text(commentObj.author);
         //$comment.find('.text').text(commentObj.text);
@@ -114,7 +120,19 @@ function drawArticle(articleObj){
         $articleComment.append($comment);
     });
 
-    $('#board').append($article);
+    $article.find('.submitComment').click(submitComment);
+    $article.find('.commentText').on('keypress', function (e) {
+        if(e.which === 13){
+            $article.find('.submitComment').click();
+        }
+    });
+    $article.find('.inputCommentHeader').click(function(){
+        $article.find('.commentText').focus();
+    })
+
+    var $board = $('#board');
+
+    $board.prepend($article);
 }
 
 function drawArticles(articlesObj){
@@ -143,10 +161,16 @@ function loadArticles(){
     });
 }
 
+function resizeTextarea($obj){
+    $obj.height(1).height($obj.prop('scrollHeight')+12 );
+}
+
 $(function(){
+    $('textarea.autosize').on('keydown keyup', function(){
+        resizeTextarea($(this));
+    })
 
 $('#submitArticle').click(submitArticle);
-$('.submitComment').click(submitComment);
 
 loadArticles()
 .then(drawArticles, errUnknown)

hwe/js/bossInfo.js

@@ -0,0 +1,81 @@
+function changePermission(isAmbassador, rawGeneralList){
+    console.log(isAmbassador);
+    console.log(rawGeneralList);
+
+    var generalList = [];
+    $.each(rawGeneralList, function(idx, value){
+        generalList.push(parseInt(value.id));
+    })
+
+    $.post({
+        url:'j_general_set_permission.php',
+        dataType:'json',
+        data:{
+            isAmbassador:isAmbassador,
+            genlist:generalList
+        },
+    }).then(function(data){
+        if(!data){
+            alert('변경하지 못했습니다.');
+            return false;
+        }
+        if(!data.result){
+            alert('변경하지 못했습니다. : '+data.reason);
+            return false;
+        }
+        alert('변경했습니다.');
+        location.reload();
+    }, errUnknown);
+}
+
+$(function(){
+    $('#selectAmbassador').select2({
+        theme: 'bootstrap4',
+        placeholder: "",
+        allowClear: true,
+        language: "ko",
+        width:300,
+        maximumSelectionLength: 2,
+        containerCss: {
+            display: "inline-block !important;",
+            color: 'white !important'
+        },
+        data:candidateAmbassadors,
+        //containerCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+        dropdownCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+    });
+
+    $('#selectAuditor').select2({
+        theme: 'bootstrap4',
+        placeholder: "",
+        allowClear: true,
+        language: "ko",
+        width:300,
+        maximumSelectionLength: 2,
+        containerCss: {
+            display: "inline-block !important;",
+            color: 'white !important'
+        },
+        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('외교권자를 변경할까요?')){
+            return false;
+        }
+        
+        changePermission(true, $('#selectAmbassador').select2('data'));
+        return false;
+    });
+
+    $('#changeAuditor').click(function(){
+        if(!confirm('조언자를 변경할까요?')){
+            return false;
+        }
+
+        changePermission(false, $('#selectAuditor').select2('data'));
+        return false;
+    })
+})

hwe/js/common.js

@@ -70,6 +70,27 @@ String.prototype.format = function() {
 };
 
 
+function hexToRgb(hex) {
+    var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+    return result ? {
+        r: parseInt(result[1], 16),
+        g: parseInt(result[2], 16),
+        b: parseInt(result[3], 16)
+    } : null;
+}
+
+
+function isBrightColor(color){
+    color = hexToRgb(color);
+    if ((color.r*0.299 + color.g*0.587 + color.b*0.114) > 140){
+        return true;
+    }
+    else{
+        return false;
+    }
+}
+
+
 /**
  * 게임내에서 지원하는 color type만 선택할 수 있도록 해주는 함수
  * @param {string} color #AAAAAA 또는 AAAAAA 형태로 작성된 RGB hex color string
@@ -102,6 +123,10 @@ function numberWithCommas(x) {
     return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 }
 
+function linkifyStrWithOpt(text){
+    return linkifyStr(text, {});
+}
+
 /**
  * 단순한 Template 함수.  <%변수명%>으로 template 가능
  * @see  https://github.com/krasimir/absurd/blob/master/lib/processors/html/helpers/TemplateEngine.js
@@ -122,6 +147,7 @@ var TemplateEngine = function (html, options) {
         return add;
     }
     options.e = escapeHtml;
+    options.linkifyStr = linkifyStrWithOpt;
     while (match = re.exec(html)) {
         add(html.slice(cursor, match.index))(match[1], true);
         cursor = match.index + match[0].length;
@@ -185,13 +211,16 @@ function activeFlipItem($img){
 }
 
 jQuery(function($){
-    $('.obj_tooltip').each(function(){
+    $('.obj_tooltip').mouseover(function(){
         var $objTooltip = $(this);
+        if($objTooltip.data('setObjTooltip')){
+            return true;
+        }
+
         var tooltipClassText = $objTooltip.data('tooltip-class');
         if(!tooltipClassText){
             tooltipClassText = '';
         }
-        console.log($objTooltip.data('tooltip-class'));
         var template = '<div class="tooltip {0}" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>'
             .format(tooltipClassText);
 
@@ -201,9 +230,15 @@ jQuery(function($){
             },
             template:template,
             html:true
-        });
-        
+        }).tooltip('show');
+
+        $objTooltip.data('setObjTooltip', true);
     });
+    /*each(function(){
+        var $objTooltip = $(this);
+        
+        
+    });*/
 
     activeFlip();
 

hwe/js/diplomacy.js

@@ -1,11 +1,10 @@
 
 
 function submitLetter(){
-    var $letter = $('#newLetter');
-    var $brief = $letter.find('input.briefInput');
-    var $detail = $letter.find('input.detailInput');
-    var $prevNo = $letter.find('input.prevNo');
-    var $destNation = $letter.find('input.destNation');
+    var $brief = $('#inputBrief');
+    var $detail = $('#inputDetail');
+    var $prevNo = $('#inputPrevNo');
+    var $destNation = $('#inputDestNation');
     var brief = $.trim($brief.val());
     var detail = $.trim($detail.val());
     var prevNo = parseInt($prevNo.val());
@@ -15,7 +14,7 @@ function submitLetter(){
         prevNo = null;
     }
 
-
+    console.log(brief);
     if(!brief){
         return false;
     }
@@ -34,18 +33,18 @@ function submitLetter(){
         }
     }).then(function(data){
         if(!data){
-            $title.val(title);
-            $text.val(text);
-            alert()
+            $brief.val(brief);
+            $detail.val(detail);
             return quickReject('외교 서신을 보내는데 실패했습니다.');
         }
         if(!data.result){
-            $title.val(title);
-            $text.val(text);
+            $brief.val(brief);
+            $detail.val(detail);
             return quickReject('외교 서신을 보내는데 실패했습니다. : '+data.reason);
         }
 
-        return loadLetters().done(drawLetters);
+        alert('전송했습니다.');
+        location.reload();
 
     }, errUnknown)
     .fail(function(reason){
@@ -55,31 +54,33 @@ function submitLetter(){
     return false;
 }
 
-function repondLetter(isAgree){
-    var $this = $(this);
-    var $letter = $this.parents('.letter').eq(0);
-    var letterNo = $letter.data('no');
-    
+function repondLetter(letterNo, isAgree, reason){
     $.post({
         url:'j_diplomacy_respond_letter.php',
         dataType:'json',
         data:{
             letterNo:letterNo,
             isAgree:isAgree,
-            reason:'', //TODO: reason 받기
+            reason:reason,
         }
     }).then(function(data){
         if(!data){
-            $text.val(text);
             alert()
             return quickReject('응답을 실패했습니다.');
         }
         if(!data.result){
-            $text.val(text);
             return quickReject('응답을 실패했습니다. : '+data.reason);
         }
 
-        return loadArticles().done(drawLetters);
+        if(isAgree){
+            alert('승인했습니다.');
+        }
+        else{
+            alert('거부했습니다.');
+        }
+
+        location.reload();
+        return false;
 
     }, errUnknown)
     .fail(function(reason){
@@ -89,22 +90,276 @@ function repondLetter(isAgree){
     return false;
 }
 
-function drawLetter(letterObj){
+function rollbackLetter(letterNo){
+    $.post({
+        url:'j_diplomacy_rollback_letter.php',
+        dataType:'json',
+        data:{
+            letterNo:letterNo,
+        }
+    }).then(function(data){
+        if(!data){
+            alert()
+            return quickReject('회수를 실패했습니다.');
+        }
+        if(!data.result){
+            return quickReject('회수를 실패했습니다. : '+data.reason);
+        }
+
+        alert('회수 했습니다.');
+
+        location.reload();
+        return false;
+
+    }, errUnknown)
+    .fail(function(reason){
+        alert(reason);
+    });
+
+    return false;
+}
+
+function destroyLetter(letterNo){
+    $.post({
+        url:'j_diplomacy_destroy_letter.php',
+        dataType:'json',
+        data:{
+            letterNo:letterNo,
+        }
+    }).then(function(data){
+        if(!data){
+            alert()
+            return quickReject('파기를 실패했습니다.');
+        }
+        if(!data.result){
+            return quickReject('파기를 실패했습니다. : '+data.reason);
+        }
+
+        if(data.state == 'activated'){
+            alert('파기를 요청 했습니다.');
+        }
+        else{
+            alert('파기 되었습니다.');
+        }
+
+        location.reload();
+        return false;
+
+    }, errUnknown)
+    .fail(function(reason){
+        alert(reason);
+    });
+
+    return false;
+}
+
+function drawLetter(idx, letterObj){
+    
+    if(letterObj.state == 'cancelled'){
+        //TODO: 취소되거나, 대체된 문서도 보여줄 방법을 찾아볼 것
+        return;
+    }
+
+    console.log(letterObj);
+
     var $letterFrame = $('#letterTemplate > .letterFrame');
 
+    var srcColorFormat = {
+        'background-color':letterObj.src.nationColor,
+        'color':isBrightColor(letterObj.src.nationColor)?'#000000':'#ffffff'
+    };
+
+    var destColorFormat = {
+        'background-color':letterObj.dest.nationColor,
+        'color':isBrightColor(letterObj.dest.nationColor)?'#000000':'#ffffff'
+    };
+
+    var targetNation = letterObj.src.nationID==myNationID?letterObj.dest:letterObj.src;
+    var targetColor = letterObj.src.nationID==myNationID?destColorFormat:srcColorFormat;
+
     var $letter = $letterFrame.clone();
+
+    if(letterObj.state == 'replaced'){
+        $letter.hide();
+    }
+
     $letter.addClass('letterObj')
         .data('no', letterObj.no)
+        .data('brief', letterObj.brief)
+        .data('detail', letterObj.detail)
+        .attr('id', 'letter_'+letterObj.no);
 
-    //TODO: 국가명, 수뇌명 입력
-    $letter.find('.date').text(letterObj.date);
+    $letter.find('.letterHeader').css(targetColor);
+    $letter.find('.letterNationName').text(targetNation.nationName);
+    $letter.find('.letterDate').text(letterObj.date);
     $letter.find('.letterNo').text('#'+letterObj.no);
-    $letter.find('.srcNation').text(letterObj.aux[''])
-    $letter.find('.brief').html(nl2br(escapeHtml(letterObj.brief)));
-    $letter.find('.detail').html(nl2br(escapeHtml(letterObj.detail)));
-    //TODO: 바꿀 것
 
-    $('#board').append($letter);
+    var stateText = {
+        'proposed':'제안됨',
+        'activated':'승인됨',
+        'cancelled':'거부됨',
+        'replaced':'대체됨',
+    };
+
+    var stateOptionText = {
+        'try_destroy_src':'송신측의 파기 요청',
+        'try_destroy_dest':'수신측의 파기 요청',
+    }
+    $letter.find('.letterStatus').text(stateText[letterObj.state]);
+
+    if(letterObj.state_opt !== null){
+        $letter.find('.letterStatusOpt').text('('+stateOptionText[letterObj.state_opt]+')');
+    }
+    if(letterObj.prev_no !== null){
+        var $showPrev = $('<a href="#">#{0}</a>'.format(letterObj.prev_no));
+        $showPrev.click(function(){
+            $('#letter_'+letterObj.prev_no).toggle();
+        })
+        $letter.find('.letterPrevNo').html($showPrev);
+    }
+    else{
+        $letter.find('.letterPrevNo').text('신규');
+    }
+    $letter.find('.letterBrief').html(nl2br(escapeHtml(letterObj.brief)));
+    $letter.find('.letterDetail').html(nl2br(escapeHtml(letterObj.detail)));
+
+    $letter.find('.letterSrc .signerImg img.generalIcon').attr('src', letterObj.src.generalIcon);
+    $letter.find('.letterSrc .signerNation').text(letterObj.src.nationName).css(srcColorFormat);
+    $letter.find('.letterSrc .signerName').text(letterObj.src.generalName).css(srcColorFormat);
+
+    if(letterObj.dest.generalName){
+        $letter.find('.letterDest .signerImg img.generalIcon').attr('src', letterObj.dest.generalIcon);
+        $letter.find('.letterDest .signerNation').text(letterObj.dest.nationName).css(destColorFormat);
+        $letter.find('.letterDest .signerName').text(letterObj.dest.generalName).css(destColorFormat);
+    }
+
+    if(letterObj.state == 'proposed' && letterObj.src.nationID != myNationID){
+        $letter.find('.btnAgree').show().click(function(){
+            if(!confirm('승인하시겠습니까?')){
+                return false;
+            }
+            return repondLetter(letterObj.no, true, null);
+        });
+        $letter.find('.btnDisagree').show().click(function(){
+            var reason = prompt('거부하시겠습니까? (이유 [최대 50자])');
+            if(reason === null){
+                return false;
+            }
+            reason = substr.substr(0, 50);
+            return repondLetter(letterObj.no, false, reason);
+        });
+    }
+
+    if(letterObj.state == 'proposed' && letterObj.src.nationID == myNationID){
+        $letter.find('.btnRollback').show().click(function(){
+            if(!confirm('회수하시겠습니까?')){
+                return false;
+            }
+            return rollbackLetter(letterObj.no);
+        });
+    }
+
+    if(letterObj.state == 'activated'){
+        var $btnDestroy = $letter.find('.btnDestroy');
+        if((letterObj.src.nationID==myNationID && letterObj.state_opt == 'try_destroy_src') || 
+            (letterObj.dest.nationID==myNationID && letterObj.state_opt == 'try_destroy_dest')){
+            $btnDestroy.show().prop('disabled', true);
+        }
+        else{
+            $btnDestroy.show().click(function(){
+                if(!confirm('본 문서를 파기하겠습니까? (상호 동의 필요)')){
+                    return false;
+                }
+                return destroyLetter(letterObj.no);
+            })
+            
+        }
+    }
+    
+
+    $letter.find('.btnRenew').click(function(){
+        var $inputPrevNo = $('#inputPrevNo');
+        $inputPrevNo.val(letterObj.no);
+        $inputPrevNo.trigger('change');
+    })
+
+
+    $('#letters').prepend($letter);
+}
+
+function initNewLetterForm(lettersObj){
+    console.log(lettersObj);
+    var nationList = [];
+    $.each(lettersObj.nations, function(idx, nation){
+        nation.id = nation.nation;
+        nation.text = nation.name;
+        nationList.push(nation);
+    })
+
+    var $destNation = $('#inputDestNation').select2({
+        theme: 'bootstrap4',
+        placeholder: "",
+        language: "ko",
+        width:300,
+        containerCss: {
+            display: "inline-block !important;",
+            color: 'white !important'
+        },
+        data:nationList,
+        templateResult: colorNation,
+        containerCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+        dropdownCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+    });
+
+    
+    var prevNoList = [{
+        id:0,
+        text:'-새 문서-',
+        nation:null,
+    }];
+
+    $.each(lettersObj.letters, function(idx, letterObj){
+        if(letterObj.state == 'replaced' || letterObj.state == 'cancelled'){
+            return true;
+        }
+        var targetNation = letterObj.src.nationID==myNationID?letterObj.dest:letterObj.src;
+        prevNoList.push({
+            id:letterObj.no,
+            text:'#{0} <{1}>'.format(letterObj.no, targetNation.nationName),
+            nation:targetNation.nationID
+        });
+    });
+
+    var $inputPrevNo = $('#inputPrevNo').select2({
+        theme: 'bootstrap4',
+        placeholder: "",
+        language: "ko",
+        width:300,
+        containerCss: {
+            display: "inline-block !important;",
+            color: 'white !important'
+        },
+        data:prevNoList,
+        containerCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+        dropdownCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+    });
+    $inputPrevNo.on('change', function(e){
+        var data = $inputPrevNo.select2('data')[0];
+        console.log(data);
+        if(data.nation == null){
+            $destNation.prop("disabled", false);
+        }
+        else{
+            $destNation.val(data.nation).prop("disabled", true);
+            var $targetLetter = $('#letter_'+data.id);
+            resizeTextarea($('#inputBrief').val($targetLetter.data('brief')));
+            resizeTextarea($('#inputDetail').val($targetLetter.data('detail')));
+        }
+    });
+
+    $('#btnSend').click(submitLetter);
+
+    $('#newLetter').show();
 }
 
 function drawLetters(lettersObj){
@@ -113,12 +368,17 @@ function drawLetters(lettersObj){
         return quickReject('받아오는데 실패했습니다.');
     }
 
-    //TODO: 국가 리스트 출력
-
     if(!lettersObj.result){
         return quickReject('에러가 발생했습니다. : '+lettersObj.reason);
     }
 
+    window.myNationID = lettersObj.myNationID;
+
+    if(permissionLevel == 4){
+        initNewLetterForm(lettersObj);
+        $('.letterActionPlate').show();
+    }
+
     $('.letterObj').detach();//첫 버전이니까 일괄 삭제 일괄 로드
     $.each(lettersObj.letters,  drawLetter);
     return true;
@@ -126,22 +386,35 @@ function drawLetters(lettersObj){
 
 function loadLetters(){
     return $.post({
-        url:'j_diplomacy_get_letters.php',
+        url:'j_diplomacy_get_letter.php',
         dataType:'json', //첫 버전이니까 전체 다 불러오자
         data:{
         }
     });
 }
 
+function colorNation(nationInfo){
+    if(!nationInfo.color){
+        return nationInfo.text;
+    }
+
+    var fgColor = isBrightColor(nationInfo.color)?'#000000':'#ffffff';
+    var $nationForm = $('<div>'+nationInfo.text+'</div>').css({
+        'color':fgColor,
+        'background-color':nationInfo.color
+    });
+    return $nationForm;
+}
+
+function resizeTextarea($obj){
+    $obj.height(1).height($obj.prop('scrollHeight')+12 );
+}
+
 $(function(){
 
-$('#submitLetter').click(submitLetter);
-$('.respondAgree').click(function(){
-    return repondLetter(true);
-});
-$('.respondDisagree').click(function(){
-    return repondLetter(false);
-});
+$('textarea.autosize').on('keydown keyup', function(){
+    resizeTextarea($(this));
+})
 
 loadLetters()
 .then(drawLetters, errUnknown)

hwe/js/ext.expand_city.js

@@ -330,16 +330,7 @@ $(function() {
                 //window.$html = $html;
                 
                 var cnt =0;
-                var $tmpTable = null;
-                $html.each(function(idx){
-                    if(this.tagName == "TABLE"){
-                        cnt+=1;
-                        if(cnt==5){
-                            $tmpTable = $(this);
-                            return false;
-                        }
-                    }
-                });
+                var $tmpTable = $html.filter('#officer_list').eq(0);
                 
                 $selects = $tmpTable.find("select");
                 if($selects.length == 0){

hwe/js/hallOfFame.js

@@ -1,7 +1,10 @@
 jQuery(function($){
     $('#by_scenario').change(function(){
-        var scenarioIdx = $(this).val();
-        $.redirect('a_hallOfFame.php', {scenarioIdx:scenarioIdx}, 'get');
+        var $this = $(this);
+        var scenarioIdx = $this.val();
+        var seasonIdx = $(this).find('option:selected').data('season');
+        
+        
+        $.redirect('a_hallOfFame.php', {scenarioIdx:scenarioIdx, seasonIdx:seasonIdx}, 'get');
     })
-    //$.redirect("processing.php",{ commandtype: commandtype, turn: turn}, 'post'); 
 });

hwe/js/history.js

@@ -0,0 +1,31 @@
+jQuery(function($){
+
+
+var currYear = startYear;
+var currMonth = startMonth;
+
+var $yearMonth = $('#yearmonth');
+var $elements = $();
+
+var endDate = lastYear * 12 + lastMonth - 1;
+var currDate = startYear * 12 + startMonth - 1;
+while(currDate <= endDate){
+
+    var target = currYear*100 + currMonth;
+    var sel = '';
+    if(currYear == selectYear && currMonth == selectMonth){
+        sel = 'selected="selected"';
+    }
+    var option = $('<option value="{0}" {1} >{2}년 {3}월</option>'.format(target, sel, currYear, currMonth));
+    $elements = $elements.add(option);
+
+    currMonth += 1;
+    if(currMonth > 12){
+        currYear += 1;
+        currMonth -= 12;
+    }
+    currDate += 1;
+}
+$yearMonth.empty();
+$yearMonth.append($elements);
+});

hwe/js/install.js

@@ -105,6 +105,22 @@ function scenarioPreview(){
 }
 
 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){
+                return false;
+            }
+            return true;
+        }
+
+        
+        if(checkCnt == 0){
+            return false;
+        }
+        return true;
+    }, "유효 시간과 옵션은 동시에 설정해야합니다.");
     $('#game_form').validate({
         rules:{
             turnterm:"required",
@@ -116,6 +132,7 @@ function formSetup(){
             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 ) {
@@ -140,6 +157,15 @@ function formSetup(){
         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(){
+                autorun_user.push($(this).data('key'));
+            });
+        }
+
         $.ajax({
             cache:false,
             type:'post',
@@ -155,7 +181,10 @@ function formSetup(){
                 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){
             var deferred = $.Deferred();

hwe/js/main.js

@@ -26,9 +26,9 @@ function refreshing(obj, arg1, arg2) {
     }
 //    if(term <= 0) {
     switch(arg1) {
-        case 0: location.reload(); break;
+        case 0: document.location.reload(); break;
         case 2: turn(arg2); break;
-        case 3: arg2.submit(); break;
+        case 3: $(arg2).submit(); break;
         case 4:
             arg2.submit();
             message.msg.value = "";
@@ -36,16 +36,51 @@ function refreshing(obj, arg1, arg2) {
             message.msg.focus();
             break;
     }
-}
-
-function moveProcessing(commandtype, turn){
-    console.log(commandtype, turn);
-    $.redirect("processing.php",{ commandtype: commandtype, turn: turn}, 'post'); 
+    return false;
 }
 
 function turn(type) {
-    num = form2.sel.value;
-    commandlist.location.replace('turn.php?type=' + type + '&sel=' + num);
+    $.post({
+        url:'j_turn.php',
+        dataType:'json',
+        data:{
+            type:type,
+            sel:form2.sel.value
+        }
+    }).then(function(data){
+        if(!data.result){
+            alert(data.reason);
+        }
+        reloadCommandList();
+    });
+}
+
+function reloadCommandList(){
+    $.get({
+        url:'commandlist.php',
+        cache: false,
+    }).then(function(rdata){
+        $('#commandlist').html(rdata);
+    });
+}
+
+function myclock() {
+
+    var $clock = $('#clock');
+    var now_clock = moment();
+
+    if(!$clock.attr('data-time-diff')){
+        var base_clock = moment($clock.attr('data-server-time'));
+        $clock.attr('data-time-diff', base_clock.diff(now_clock));
+    }
+
+    var game_clock = now_clock.add(parseInt($clock.attr('data-time-diff')), 'milliseconds');
+
+    $('#clock').val(game_clock.format('YYYY-MM-DD HH:mm:ss'));
+    
+    window.setTimeout(function(){
+        myclock();
+    }, 500);
 }
 
 jQuery(function($){
@@ -53,11 +88,40 @@ jQuery(function($){
         var $this = $(this);
         var target = $('[name="genlist"]').val();
         var msg = $('#msg').val();
-        console.log(target, msg);
         return false;
     });
 
     $('#mainBtnSubmit').click(function(){
 
     });
+
+    $('#form2').submit(function(){
+        var values = $(this).serializeArray();
+        console.log(values);
+        $.post({
+            url:'j_preprocessing.php',
+            dataType:'json',
+            data:values
+        }).then(function(data){
+            if(!data.result){
+                alert(data.reason);
+                reloadCommandList();
+                return;
+            }
+
+            if(!data.nextPage){
+                reloadCommandList();
+                return;
+            }
+
+            document.location = data.nextPage;
+            return;
+        }, function(){
+            alert('알 수 없는 에러');
+            location.reload();
+        });
+        return false;
+    });
+
+    myclock();
 });

hwe/js/map.js

@@ -1,5 +1,20 @@
 
+function is_touch_device() {
+    var prefixes = ' -webkit- -moz- -o- -ms- '.split(' ');
+    var mq = function(query) {
+      return window.matchMedia(query).matches;
+    }
 
+    if (('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch) { 
+        return true; 
+    }
+
+  
+    // include the 'heartz' as a way to have a non matching MQ to help terminate the join
+    // https://git.io/vznFH
+    var query = ['(', prefixes.join('touch-enabled),('), 'heartz', ')'].join('');
+    return mq(query);
+  }
 
 function reloadWorldMap(option){
     var $world_map = $('.world_map');
@@ -368,8 +383,76 @@ function reloadWorldMap(option){
 
         var $map_body = $('.world_map .map_body');
 
+        //터치스크린 탭
+
+        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')){
+                    $this.data('touchMode', 1);
+                }
+                else if(touchMode === undefined){
+                    $this.data('touchMode', 1);
+                }
+                else{
+                    $this.data('touchMode', touchMode + 1);
+                }
+                $map_body.data('touchMode', 1);
+    
+                $tooltip_city.data('target', $this.data('id'));
+                
+                
+            });
+            
+            $objs.on('touchend', function(e){    
+                if(window.sam_toggleSingleTap){
+                    return true;
+                }
+                var $this = $(this);
+                var position = $this.parent().position();
+                $tooltip_city.html($this.data('text'));
+                
+                var nation_text = $this.data('nation');
+                if(nation_text){
+                    $tooltip_nation.html(nation_text).show();
+                }
+                else{
+                    $tooltip_nation.html('').hide();
+                }
+                
+                $tooltip.css({'top': position.top + 25, 'left': position.left + 35}).show();
+                
+                var touchMode = $this.data('touchMode');
+                if(touchMode <= 1){
+                    return false;
+                }
+    
+                //xxx: touchend 다음 click 이벤트가 갈 수도 있고, 안 갈 수도 있다.
+                $this.data('touchMode', 0);
+            });
+    
+            $map_body.on('touchend',function(e){
+                if(window.sam_toggleSingleTap){
+                    return true;
+                }
+                //위의 touchend bind에 해당하지 않는 경우 -> 빈 지도 터치
+                $tooltip.hide();
+            });
+
+        }
+
         //Mouse over 모드 작동
+
         $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;
@@ -378,6 +461,10 @@ function reloadWorldMap(option){
         });
 
         $objs.on('mouseenter', function(e){
+            if($map_body.data('touchMode')){
+                return true;
+            }
+
             var $this = $(this);
 
             $tooltip_city.data('target', $this.data('id'));
@@ -398,7 +485,15 @@ function reloadWorldMap(option){
         });
 
         $objs.on('click', function(e){
-            return;
+            //xxx: touchend 다음 click 이벤트가 갈 수도 있고, 안 갈 수도 있다.
+            var touchMode = $(this).data('touchMode');
+            if(touchMode === undefined){
+                return;
+            }
+
+            if(touchMode === 1){
+                return false;
+            }
         });
 
 
@@ -448,6 +543,31 @@ function reloadWorldMap(option){
         }
     });
 
+    var $toggleSingleTapBtn = $world_map.find('.map_toggle_single_tap');
+    if(localStorage.getItem('sam.toggleSingleTap') == 'yes'){
+        window.sam_toggleSingleTap = true;
+        $toggleSingleTapBtn.addClass('active').attr('aria-pressed', 'true');
+    }
+    else{
+        window.sam_toggleSingleTap = false;
+    }
+
+    var $map_body = $('.world_map .map_body');
+
+    $toggleSingleTapBtn.click(function(){
+        //이전 상태 확인
+        var state = !$toggleSingleTapBtn.hasClass('active');
+        if(state){
+            $map_body.removeData('touchMode');
+            localStorage.setItem('sam.toggleSingleTap', 'yes');
+            window.sam_toggleSingleTap = true;
+        }
+        else{
+            localStorage.setItem('sam.toggleSingleTap', 'no');
+            window.sam_toggleSingleTap = false;
+        }
+    });
+
     if(isDetailMap){
         $world_map.addClass('map_detail');
     }
@@ -527,4 +647,8 @@ function reloadWorldMap(option){
         
     }
 }
-
+$(function(){
+    if(is_touch_device()){
+        $('.map_body .map_toggle_single_tap').show();
+    }
+})

hwe/js/map/theme_pokemon_v1.js

@@ -0,0 +1,20 @@
+function getCityPosition(){
+    return {"1":["태초마을",169,321],"2":["상록시티",169,231],"3":["회색시티",174,104],"4":["달맞이산",297,94],"5":["블루시티",452,92],"6":["갈색시티",451,278],"7":["보라타운",627,180],"8":["무지개시티",343,180],"9":["연분홍시티",357,377],"10":["노랑시티",451,180],"11":["홍련마을",169,454],"12":["챔피언로드(입구)",90,231],"13":["챔피언로드(동굴)",90,180],"14":["석영고원",90,29],"15":["사이클링로드(입구)",252,180],"16":["사이클링로드(출구)",252,377],"17":["관동15로",451,377],"18":["무인발전소",627,94],"19":["IC",627,278],"20":["관동13로",627,344],"21":["블루시티동굴",451,32],"22":["이수재의집",572,32],"23":["쌍둥이섬",263,454]};
+}
+
+function formatCityInfo(city) {
+            
+
+    var regionMap = {"관동 지방":1,"1":"관동 지방"};
+
+    var levelMap = {"수":1,"1":"수","진":2,"2":"진","관":3,"3":"관","이":4,"4":"이","소":5,"5":"소","중":6,"6":"중","대":7,"7":"대","특":8,"8":"특"};
+    
+    var region_str = regionMap[city.region];
+    var level_str = levelMap[city.level];
+    
+    city.text = '【' + region_str + '|' + level_str + '】' + city.name;
+    city.region_str = region_str;
+    city.level_str = level_str;
+
+    return city;
+}

hwe/js/msg.js

@@ -1,24 +1,5 @@
 
 
-function hexToRgb(hex) {
-    var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-    return result ? {
-        r: parseInt(result[1], 16),
-        g: parseInt(result[2], 16),
-        b: parseInt(result[3], 16)
-    } : null;
-}
-
-
-function isBrightColor(color){
-    color = hexToRgb(color);
-    if ((color.r*0.299 + color.g*0.587 + color.b*0.114) > 140){
-        return true;
-    }
-    else{
-        return false;
-    }
-}
 
 var messageTemplate = '';
 var myGeneralID=null;
@@ -29,6 +10,7 @@ var minMsgSeq = {
     'private':0x7fffffff,
     'public':0x7fffffff,
     'national':0x7fffffff,
+    'diplomacy':0x7fffffff,
 }
 
 var generalList = {};
@@ -376,6 +358,7 @@ function refreshMailboxList(obj){
             var generalName = this[1];
             var isNPC = !!(this[2] & 0x2);
             var isRuler = !!(this[2] & 0x1);
+            var isAmbassador = !!(this[2] & 0x4);
 
             
 
@@ -387,6 +370,9 @@ function refreshMailboxList(obj){
             if(isRuler){
                 textName = '*{0}*'.format(textName);
             }
+            else if(isAmbassador){
+                textName = '#{0}#'.format(textName);
+            }
 
             generalList[generalID] = {
                 id:generalID,
@@ -398,6 +384,10 @@ function refreshMailboxList(obj){
             };
 
             var $item = $('<option value="{0}">{1}</option>'.format(generalID, textName));
+
+            if(permissionLevel == 4 && isAmbassador && myNation.mailbox != nation.mailbox){
+                $item.prop('disabled', true);
+            }
             $optgroup.append($item);
         });
 
@@ -460,7 +450,7 @@ function registerGlobal(basicInfo){
     window.myGeneralID = basicInfo.generalID;
     window.isChief = basicInfo.isChief;
     window.myGeneralLevel = basicInfo.generalLevel;
-    window.permissionLevel = basicInfo.permissionLevel;
+    window.permissionLevel = basicInfo.permission;
 }
 
 function activateMessageForm(){
@@ -514,7 +504,7 @@ function activateMessageForm(){
 jQuery(function($){
 
     //tmp_template.html은 추후 msg.js에 통합될 수 있음
-    var getTemplate = $.get('js/templates/message.html?9',function(obj){
+    var getTemplate = $.get('js/templates/message.html?11',function(obj){
         messageTemplate = obj;
     });