game: 군주, 수뇌, 관직 전투력 상향

- 각 단계마다 총 수령액의 1/2씩, 잔여금은 1등상에게로
- 1등이 없는 경우 2등이 1등상+2등상 배분하여 수령
- 4개 선택시 각각, 56.25%, 25%, 12.5%, 6.25%를 나눠가짐
- 정답자가 전혀 없으면 포인트 환불

.eslintrc.cjs

@@ -3,20 +3,23 @@ module.exports = {
     parser: "vue-eslint-parser",
     "env": {
         "browser": true,
-        "es2021": true
+        "es2021": true,
+        'vue/setup-compiler-macros': true
     },
     ignorePatterns: ['*.test.ts', '.eslintrc.cjs', 'postcss.config.cjs', 'webpack.config.cjs', '*.js'],
     overrides: [{
         files: ['*.ts', '*.tsx', "*.vue"],
     }],
     plugins: [
-        "@typescript-eslint"
+        "@typescript-eslint",
+        "prettier"
     ],
 
     extends: [
         "eslint:recommended",
-        "plugin:vue/vue3-essential",
-        "plugin:@typescript-eslint/recommended"
+        "plugin:vue/vue3-recommended",
+        "plugin:@typescript-eslint/recommended",
+        "prettier",
     ],
     parserOptions: {
         "sourceType": "module",
@@ -27,6 +30,15 @@ module.exports = {
     },
     rules: {
         '@typescript-eslint/no-floating-promises': 'error',
+        'vue/script-setup-uses-vars': 'error',
+        'vue/max-attributes-per-line': [
+            'warn',
+            {
+                singleline: 4, //prettier와 싸우지 말자
+            },
+        ],
+        'vue/v-on-event-hyphenation': 'off', //vue3에선 필요없다고 생각
+        'vue/attribute-hyphenation': 'off', //vue3에선 필요없다고 생각
     },
     settings: {
         'import/resolver': {

.gitignore

@@ -5,8 +5,6 @@
 !.vscode/extensions.json
 
 /node_modules
-package-lock.json
-
 
 # 체섭 ignore
 *.log
@@ -19,10 +17,7 @@ sess_*
 */logs/*/*.txt
 */logs/preserved
 err.txt
-che/.htaccess
-kwe/.htaccess
-pwe/.htaccess
-twe/.htaccess
+
 hwe/.htaccess
 
 d_shared
@@ -47,7 +42,7 @@ d_setting/*.php
 */d_setting/templates/*.php
 !*.orig.php
 
-*/data/file_cache
+**/data/file_cache
 
 **/old/*
 test.*
@@ -59,11 +54,13 @@ test.*
 /pya
 /twe
 
+/hwe/data
+
+/vendor
 phpinfo.php
-vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/*
 *.sqlite3
 
 ingame/js/*
 ingame/css/*
 gateway/js/*
-gateway/css/*
+gateway/css/*

.mocharc.json

@@ -0,0 +1,12 @@
+{
+    "extension": ["ts"],
+    "spec": "hwe/test-ts/**/*.test.ts",
+    "require": [
+        "ts-node/register",
+        "tsconfig-paths/register"
+    ],
+    "node-option": [
+        "experimental-specifier-resolution=node",
+        "loader=ts-node/esm"
+    ]
+  }

.phan/config.php

@@ -101,8 +101,7 @@ return [
         'hwe/j_general_set_permission.php',
         'hwe/j_get_basic_general_list.php',
         'hwe/j_get_city_list.php',
-        'hwe/j_get_general_list.php',
-        'hwe/j_get_nation_general_list.php',
+        'hwe/j_get_reserved_command.php',
         'hwe/j_get_select_npc_token.php',
         'hwe/j_get_select_pool.php',
         'hwe/j_image_upload.php',

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "tabWidth": 2,
+  "useTabs": false,
+  "printWidth": 120
+}

.vscode/settings.json

@@ -13,7 +13,7 @@
         "/nya":true,
         "/pya":true,
         "/twe":true,
-        
+
     },
     "search.exclude": {
         "e_lib/*":true,
@@ -29,4 +29,5 @@
         "josa",
         "sammo"
     ],
+    "editor.tabSize": 2
 }

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2021 Hide_D, 62che
+Copyright (c) 2022 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

@@ -26,20 +26,20 @@ Docker를 이용한 설치도 제공하고 있습니다.
 
 ## Docker를 이용한 설치
 
-https://storage.hided.net/gogs/devsam/docker 를 참고해 주세요.
+https://storage.hided.net/gitea/devsam/docker 를 참고해 주세요.
 
 ## 수동 설치
 
 본 게임은 <code>git</code>을 이용한 업그레이드 시스템을 구현하였으므로, <code>git</code>이 필요합니다.
-또한 웹 서비스 데몬을 운영중인 사용자(일반적으로 <code>www-data</code>, <code>apache</code>)에게 디렉토리 권한이 주어져야합니다.
+또한 웹 서비스 데몬을 운영중인 사용자(일반적으로 <code>www-data</code>)에게 디렉토리 권한이 주어져야합니다.
 
 ### 다운로드
 
 웹 데몬 user가 <code>www-data</code>인 경우 다음과 같이 입력하여 최신 배포버전과 이미지 파일을 얻을 수 있습니다.
 
 ```
-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
+sudo -u www-data git clone https://storage.hided.net/gitea/devsam/core.git
+sudo -u www-data git clone https://storage.hided.net/gitea/devsam/image.git
 ```
 
 > 이미지는 hook/git_hook.php을 통해 동기화되며, 서버 설치 과정에 이미지 갱신 키를 지정하는 것으로 '훼' 서버 업데이트 시 동기화됩니다. 이미지 서버가 게임 서버와 별개여도 동작하나, php와 git을 지원해야합니다.

api.php

@@ -8,5 +8,9 @@ require(__DIR__ . '/vendor/autoload.php');
 if (!class_exists('\\sammo\\RootDB')) {
     Json::dieWithReason('No DB');
 }
+$eParams = $_GET;
+if(key_exists('path', $eParams)){
+    unset($eParams['path']);
+}
 
-APIHelper::launch(dirname(__FILE__));
+APIHelper::launch(dirname(__FILE__), $_GET['path']??'', $eParams, true);

composer.json

@@ -29,26 +29,28 @@
         "erusev/parsedown-extra": "^0.8.1",
         "nette/caching": "^3.0",
         "illuminate/database": "^8.61",
-        "illuminate/events": "^8.61"
+        "illuminate/events": "^8.61",
+        "spatie/data-transfer-object": "^3.7"
     },
     "autoload": {
         "psr-4": {
             "sammo\\": [
+                "d_setting",
                 "src/sammo"
             ],
             "kakao\\": [
+                "d_setting",
                 "src/kakao"
             ]
         },
-        "classmap": [
-            "d_setting/"
-        ],
         "exclude-from-classmap": [
             "**/*.orig.php"
         ],
         "files":[
             "f_config/config.php"
         ]
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5"
     }
-
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "94cfbcb22b9f475e421ad5009391006f",
+    "content-hash": "2b7ec5f1a1a908310f3d032f294eacec",
     "packages": [
         {
             "name": "brandonwamboldt/utilphp",
@@ -2636,6 +2636,69 @@
             },
             "time": "2021-06-29T04:31:23+00:00"
         },
+        {
+            "name": "spatie/data-transfer-object",
+            "version": "3.7.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/data-transfer-object.git",
+                "reference": "341f72c77e0fce40ea2e0dcb212cb54dc27bbe72"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/data-transfer-object/zipball/341f72c77e0fce40ea2e0dcb212cb54dc27bbe72",
+                "reference": "341f72c77e0fce40ea2e0dcb212cb54dc27bbe72",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "illuminate/collections": "^8.36",
+                "jetbrains/phpstorm-attributes": "^1.0",
+                "larapack/dd": "^1.1",
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\DataTransferObject\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brent Roose",
+                    "email": "brent@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Data transfer objects with batteries included",
+            "homepage": "https://github.com/spatie/data-transfer-object",
+            "keywords": [
+                "data-transfer-object",
+                "spatie"
+            ],
+            "support": {
+                "issues": "https://github.com/spatie/data-transfer-object/issues",
+                "source": "https://github.com/spatie/data-transfer-object/tree/3.7.3"
+            },
+            "funding": [
+                {
+                    "url": "https://spatie.be/open-source/support-us",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-12-30T20:31:10+00:00"
+        },
         {
             "name": "symfony/console",
             "version": "v5.3.10",
@@ -4165,7 +4228,1804 @@
             "time": "2019-08-07T17:19:21+00:00"
         }
     ],
-    "packages-dev": [],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^8.0",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "https://ocramius.github.io/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-10T18:47:58+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.10.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^7.1"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-11-13T09:40:50+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v4.13.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+            },
+            "time": "2021-11-30T19:35:32+00:00"
+        },
+        {
+            "name": "phar-io/manifest",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-phar": "*",
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+            },
+            "time": "2021-07-20T11:28:43+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
+            },
+            "time": "2022-02-21T01:04:05+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.15.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.2",
+                "php": "^7.2 || ~8.0, <8.2",
+                "phpdocumentor/reflection-docblock": "^5.2",
+                "sebastian/comparator": "^3.0 || ^4.0",
+                "sebastian/recursion-context": "^3.0 || ^4.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^6.0 || ^7.0",
+                "phpunit/phpunit": "^8.0 || ^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "support": {
+                "issues": "https://github.com/phpspec/prophecy/issues",
+                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
+            },
+            "time": "2021-12-08T12:19:24+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "9.2.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f4d60b6afe5546421462b76cd4e633ebc364ab4",
+                "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "ext-xmlwriter": "*",
+                "nikic/php-parser": "^4.13.0",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.3",
+                "phpunit/php-text-template": "^2.0.2",
+                "sebastian/code-unit-reverse-lookup": "^2.0.2",
+                "sebastian/complexity": "^2.0",
+                "sebastian/environment": "^5.1.2",
+                "sebastian/lines-of-code": "^1.0.3",
+                "sebastian/version": "^3.0.1",
+                "theseer/tokenizer": "^1.2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcov": "*",
+                "ext-xdebug": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.14"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-28T12:38:02+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "3.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-12-02T12:48:52+00:00"
+        },
+        {
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:58:55+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T05:33:50+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "5.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:16:10+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "9.5.16",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
+                "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.3.1",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.10.1",
+                "phar-io/manifest": "^2.0.3",
+                "phar-io/version": "^3.0.2",
+                "php": ">=7.3",
+                "phpspec/prophecy": "^1.12.1",
+                "phpunit/php-code-coverage": "^9.2.13",
+                "phpunit/php-file-iterator": "^3.0.5",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.3",
+                "phpunit/php-timer": "^5.0.2",
+                "sebastian/cli-parser": "^1.0.1",
+                "sebastian/code-unit": "^1.0.6",
+                "sebastian/comparator": "^4.0.5",
+                "sebastian/diff": "^4.0.3",
+                "sebastian/environment": "^5.1.3",
+                "sebastian/exporter": "^4.0.3",
+                "sebastian/global-state": "^5.0.1",
+                "sebastian/object-enumerator": "^4.0.3",
+                "sebastian/resource-operations": "^3.0.3",
+                "sebastian/type": "^2.3.4",
+                "sebastian/version": "^3.0.2"
+            },
+            "require-dev": {
+                "ext-pdo": "*",
+                "phpspec/prophecy-phpunit": "^2.0.1"
+            },
+            "suggest": {
+                "ext-soap": "*",
+                "ext-xdebug": "*"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.5-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.16"
+            },
+            "funding": [
+                {
+                    "url": "https://phpunit.de/sponsors.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-23T17:10:58+00:00"
+        },
+        {
+            "name": "sebastian/cli-parser",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:08:49+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:08:54+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:30:19+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "4.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
+                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:49:45+00:00"
+        },
+        {
+            "name": "sebastian/complexity",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
+                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.7",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T15:52:27+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:10:38+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "5.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-posix": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:52:38+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-11-11T14:18:36+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "5.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-14T08:28:10+00:00"
+        },
+        {
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.6",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-11-28T06:42:11+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:12:34+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:14:26+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:17:30+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:45:17+00:00"
+        },
+        {
+            "name": "sebastian/type",
+            "version": "2.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-06-15T12:49:02+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:39:44+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-07-28T10:34:58+00:00"
+        }
+    ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],

f_install/j_install_status.php

@@ -2,6 +2,11 @@
 
 namespace sammo;
 
+if(!file_exists(__DIR__ . '/../vendor/autoload.php')){
+    http_response_code(503);
+    die('not_ready');
+}
+
 require(__DIR__ . '/../vendor/autoload.php');
 
 if (!class_exists('\\sammo\\RootDB')) {

f_install/sql/common_schema.sql

@@ -31,8 +31,8 @@ CREATE TABLE `member` (
 	`NAME` VARCHAR(64) NOT NULL,
 	`PICTURE` VARCHAR(64) NULL DEFAULT 'default.jpg',
 	`IMGSVR` INT(1) NULL DEFAULT '0',
-	`acl` TEXT NOT NULL DEFAULT '{}' COMMENT 'json',
-	`penalty` TEXT NOT NULL DEFAULT '{}' COMMENT 'json',
+	`acl` TEXT NOT NULL DEFAULT '{}' COLLATE 'utf8mb4_bin',
+	`penalty` TEXT NOT NULL DEFAULT '{}' COLLATE 'utf8mb4_bin',
 	`GRADE` INT(1) NULL DEFAULT '1',
 	`REG_NUM` INT(3) NULL DEFAULT '0',
 	`REG_DATE` DATETIME NOT NULL,
@@ -43,9 +43,12 @@ CREATE TABLE `member` (
 	UNIQUE INDEX `ID` (`ID`),
 	UNIQUE INDEX `EMAIL` (`EMAIL`),
 	UNIQUE INDEX `kauth_id` (`oauth_id`),
-	INDEX `delete_after` (`delete_after`)
+	INDEX `delete_after` (`delete_after`),
+	CONSTRAINT `json1` CHECK (json_valid(`acl`)),
+	CONSTRAINT `json2` CHECK (json_valid(`penalty`))
 )
-ENGINE=Aria DEFAULT CHARSET=utf8mb4;
+COLLATE='utf8mb4_general_ci'
+ENGINE=Aria;
 
 -- 로그인 로그 테이블
 CREATE TABLE `member_log` (
@@ -53,12 +56,14 @@ CREATE TABLE `member_log` (
 	`member_no` INT(11) NOT NULL,
 	`date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	`action_type` ENUM('reg','try_login','login','logout','oauth','change_pw','make_general','access_server','delete') NOT NULL,
-	`action` TEXT NULL DEFAULT NULL COMMENT 'JSON',
+	`action` TEXT NULL DEFAULT NULL COLLATE 'utf8mb4_bin',
 	PRIMARY KEY (`id`),
 	INDEX `action` (`member_no`, `action_type`, `date`),
-	INDEX `member` (`member_no`, `date`)
+	INDEX `member` (`member_no`, `date`),
+	CONSTRAINT `json` CHECK (json_valid(`action`))
 )
-ENGINE=Aria DEFAULT CHARSET=utf8mb4;
+COLLATE='utf8mb4_general_ci'
+ENGINE=Aria;
 
 ###################
 # KV storage
@@ -69,9 +74,10 @@ CREATE TABLE if not exists `storage` (
 	`key` VARCHAR(40) NOT NULL,
 	`value` TEXT NOT NULL,
 	PRIMARY KEY (`id`),
-	UNIQUE INDEX `key` (`namespace`, `key`)
+	UNIQUE INDEX `key` (`namespace`, `key`),
+	CONSTRAINT `json` CHECK (json_valid(`value`))
 )
-COLLATE='utf8mb4_general_ci'
+COLLATE='utf8mb4_bin'
 ENGINE=Aria;
 
 CREATE TABLE `login_token` (
@@ -86,5 +92,4 @@ CREATE TABLE `login_token` (
 	INDEX `by_date` (`user_id`, `expire_date`)
 )
 COLLATE='utf8mb4_general_ci'
-ENGINE=Aria
-;
+ENGINE=Aria;

hwe/_admin2.php

@@ -59,10 +59,10 @@ $db = DB::db();
                         if ($general['block']         > 0) {
                             $style .= "background-color:red;";
                         }
-                        if ($general['npc']          >= 2) {
-                            $style .= "color:cyan;";
-                        } elseif ($general['npc']      == 1) {
-                            $style .= "color:skyblue;";
+
+                        $npcColor = getNPCColor($general['npc']);
+                        if($npcColor !== null){
+                            $style .= "color:{$npcColor};";
                         }
 
                         echo "

hwe/_admin4.php

@@ -70,13 +70,10 @@ function colorBlockedName($general)
                         if ($general['block']         > 0) {
                             $style .= "background-color:red;";
                         }
-                        if ($general['npc']          >= 2) {
-                            $style .= "color:cyan;";
-                        } elseif ($general['npc']      == 1) {
-                            $style .= "color:skyblue;";
-                        }
-                        if ($general['con'] > $conlimit) {
-                            $style .= "color:red;";
+
+                        $npcColor = getNPCColor($general['npc']);
+                        if($npcColor !== null){
+                            $style .= "color:{$npcColor};";
                         }
 
                         echo "

hwe/a_genList.php

@@ -155,13 +155,7 @@ if ($gameStor->isunited) {
 
 
 
-        if ($general['npc'] >= 2) {
-            $name = "<font color=cyan>{$general['name']}</font>";
-        } elseif ($general['npc'] == 1) {
-            $name = "<font color=skyblue>{$general['name']}</font>";
-        } else {
-            $name =  "{$general['name']}";
-        }
+        $name = formatName($general['name'], $general['npc']);
 
         if (key_exists($general['owner'], $ownerNameList)) {
             $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
@@ -178,6 +172,7 @@ if ($gameStor->isunited) {
         data-general-strength='{$general['strength']}'
         data-general-intel='{$general['intel']}'
         data-is-npc='" . ($general['npc'] >= 2 ? 'true' : 'false') . "'
+        data-npc-type='{$general['npc']}'
     >
         <td align=center><img class='generalIcon' width='64' height='64' src='{$imageTemp}/{$general['picture']}'></img></td>
         <td align=center>$name</td>

hwe/a_history.php

@@ -5,7 +5,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 $btn = Util::getReq('btn');
-$yearmonth = Util::getReq('yearmonth', 'int');
+$yearMonth = Util::getReq('yearmonth', 'int');
 $serverID = Util::getReq('serverID', 'string', null);
 
 //로그인 검사
@@ -23,7 +23,7 @@ if ($serverID === UniqueConst::$serverID) {
     increaseRefresh("연감", 1);
 }
 
-$admin = $gameStor->getValues(['startyear', 'year', 'month', 'map_theme']);
+$admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
 $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner = %i', $userID);
 
@@ -36,7 +36,7 @@ if ($con >= 2) {
 
 
 [$s_year, $s_month] = $db->queryFirstList('SELECT year, month FROM ng_history WHERE server_id = %s ORDER BY year ASC, month ASC LIMIT 1', $serverID);
-$s = $s_year * 12 + $s_month;
+$s = Util::joinYearMonth($s_year, $s_month);
 
 if ($s_year === null) {
     echo '인자 에러';
@@ -44,51 +44,56 @@ if ($s_year === null) {
 }
 
 [$e_year, $e_month] = $db->queryFirstList('SELECT year, month FROM ng_history WHERE server_id = %s ORDER BY year DESC, month DESC LIMIT 1', $serverID);
-$e = $e_year * 12 + $e_month;
+$e = Util::joinYearMonth($e_year, $e_month);
 
 if ($serverID !== UniqueConst::$serverID) {
-    $mapTheme = $db->queryFirstField('SELECT map FROM ng_games WHERE server_id=%s', $serverID) ?: 'che';
+    $mapName = $db->queryFirstField('SELECT map FROM ng_games WHERE server_id=%s', $serverID) ?: 'che';
 } else {
-    $mapTheme = $admin['map_theme'] ?? 'che';
+    $mapName = GameConst::$mapName;
 }
 
 //FIXME: $yearmonth가 올바르지 않을 경우에 처리가 필요.
-if ($serverID !== UniqueConst::$serverID && !$yearmonth) {
-    $year = $s_year;
-    $month = $s_month;
-} else if (!$yearmonth) {
-    $year = $admin['year'];
-    $month = $admin['month'] - 1;
+if ($serverID !== UniqueConst::$serverID && !$yearMonth) {
+    $yearMonth = $s;
+} else if (!$yearMonth) {
+    $yearMonth = Util::joinYearMonth($admin['year'], $admin['month']);
 } else {
-    $year = intdiv($yearmonth, 100);
-    $month = $yearmonth % 100;
-
     if ($btn == "◀◀ 이전달") {
-        $month -= 1;
+        $yearMonth -= 1;
     } elseif ($btn == "다음달 ▶▶") {
-        $month += 1;
+        $yearMonth += 1;
     }
 }
-$now = ($year * 12) + $month;
 
-if ($now < $s) {
-    $now = $s;
+$isCurrent = false;
+if ($yearMonth < $s) {
+    $yearMonth = $s;
 }
-if ($now > $e) {
-    $now = $e;
+if ($yearMonth > $e) {
+    $isCurrent = true;
+    $yearMonth = $e + 1;
 }
 
-$year = intdiv($now, 12);
-$month = $now % 12;
-if ($month <= 0) {
-    $year -= 1;
-    $month += 12;
+[$year, $month] = Util::parseYearMonth($yearMonth);
+
+function getHistory($serverID, $year, $month):array{
+    $db = DB::db();
+    $history = $db->queryFirstRow('SELECT * FROM ng_history WHERE server_id = %s AND year = %i AND month = %i', $serverID, $year, $month);
+    $history['global_history'] = Json::decode($history['global_history']);
+    $history['global_action'] = Json::decode($history['global_action']);
+    $history['nations'] = Json::decode($history['nations']);
+    return $history;
 }
 
-$history = $db->queryFirstRow('SELECT * FROM ng_history WHERE server_id = %s AND year = %i AND month = %i', $serverID, $year, $month);
 
+if($isCurrent){
+    $history = getCurrentHistory();
+}
+else{
+    $history = getHistory($serverID, $year, $month);
+}
 
-$nations = Json::decode($history['nations']);
+$nations = $history['nations'];
 ?>
 <!DOCTYPE html>
 <html>
@@ -99,22 +104,26 @@ $nations = Json::decode($history['nations']);
     <meta name="viewport" content="width=1024" />
     <title><?= UniqueConst::$serverName ?>: 연감</title>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS("js/map/theme_{$mapTheme}.js") ?>
+    <?= WebUtil::printJS("js/map/theme_{$mapName}.js") ?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printCSS('css/map.css') ?>
     <?= WebUtil::printCSS('css/history.css') ?>
+    <?= WebUtil::printStaticValues([
+        'staticValues' => [
+            'startYear' => $s_year,
+            'startMonth' => $s_month,
+            'lastYear' => $e_year,
+            'lastMonth' => $e_month,
+            'selectYear' => $year,
+            'selectMonth' => $month,
+            'nations' => $nations ? $history['nations'] : [],
+            'serverNick' => DB::prefix(),
+            'serverID' => UniqueConst::$serverID,
+        ]
+    ])?>
     <?= WebUtil::printDist('ts', ['common', 'history']) ?>
 
-    <script>
-        var startYear = <?= $s_year ?>;
-        var startMonth = <?= $s_month ?>;
-        var lastYear = <?= $e_year ?>;
-        var lastMonth = <?= $e_month ?>;
-        var selectYear = <?= $year ?>;
-        var selectMonth = <?= $month ?>;
-        var nations = <?= $nations ? $history['nations'] : '{}' ?>;
-    </script>
 </head>
 
 <body>
@@ -129,7 +138,7 @@ $nations = Json::decode($history['nations']);
                     <input type=submit name=btn value="◀◀ 이전달">
                     <select id='yearmonth' name=yearmonth size=1>
                         <option selected='selected'><?= $year ?>년 <?= $month ?>월</option>
-                        <option><?= $e_year ?>년 12월</option>
+                        <option><?= $e_year ?>년 12월 (현재)</option>
                     </select>
                     <input type=submit name=btn value='조회하기'>
                     <input type=submit name=btn value="다음달 ▶▶">
@@ -146,7 +155,7 @@ $nations = Json::decode($history['nations']);
         <tbody>
             <tr height=520>
                 <td width=698>
-                    <?= getMapHtml($mapTheme) ?>
+                    <?= getMapHtml($mapName) ?>
                 </td>
                 <td id='nation_list_frame'>
                     <table id='nation_list'>
@@ -177,7 +186,7 @@ $nations = Json::decode($history['nations']);
             </tr>
             <tr>
                 <td colspan=5 valign=top>
-                    <?= formatHistoryToHTML(Json::decode($history['global_history'])) ?>
+                    <?= formatHistoryToHTML($history['global_history']) ?>
                 </td>
             </tr>
             <tr>
@@ -185,7 +194,7 @@ $nations = Json::decode($history['nations']);
             </tr>
             <tr>
                 <td colspan=5 valign=top>
-                    <?= formatHistoryToHTML(Json::decode($history['global_action'])) ?>
+                    <?= formatHistoryToHTML($history['global_action']) ?>
                 </td>
             </tr>
         </tbody>
@@ -199,8 +208,13 @@ $nations = Json::decode($history['nations']);
         </tr>
     </table>
     <script>
-        window.serverNick = '<?= DB::prefix() ?>';
-        window.serverID = '<?= UniqueConst::$serverID ?>';
+        <?php if($isCurrent): ?>
+        reloadWorldMap({
+            showMe: false,
+            neutralView: true,
+            useCachedMap: true,
+        });
+        <?php else: ?>
         reloadWorldMap({
             targetJson: 'j_map_history.php?year=<?= $year ?>&month=<?= $month ?>&serverID=<?= $serverID ?>',
             showMe: false,
@@ -209,6 +223,8 @@ $nations = Json::decode($history['nations']);
             year: <?= $year ?>,
             month: <?= $month ?>,
         });
+        <?php endif; ?>
+
     </script>
 </body>
 

hwe/a_kingdomList.php

@@ -10,7 +10,7 @@ $userID = Session::getUserID();
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-
+$gameStor->cacheValues(['killturn', 'autorun_user', 'turnterm']);
 increaseRefresh("세력일람", 2);
 
 $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
@@ -33,6 +33,7 @@ if ($con >= 2) {
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printDist('ts', ['common', 'extKingdoms']) ?>
+    <?= WebUtil::printStaticValues($gameStor->getValues(['killturn', 'autorun_user', 'turnterm'])) ?>
 </head>
 
 <body>
@@ -110,7 +111,7 @@ if ($con >= 2) {
             }
             $chief = $chiefs[$chiefLevel] ?? ['name' => '-', 'npc' => 0];
             $officerLevelText = getOfficerLevelText($chiefLevel, $nation['level']);
-            $chiefText = getColoredName($chief['name'], $chief['npc']);
+            $chiefText = formatName($chief['name'], $chief['npc']);
             echo "<td class='center bg1'>{$officerLevelText}</td>
         <td class='center'>{$chiefText}</td>";
         }
@@ -144,13 +145,7 @@ if ($con >= 2) {
     <tr>
         <td colspan=8> 장수 일람 : ";
         foreach ($generals as $general) {
-            if ($general['npc'] >= 2) {
-                echo "<font color=cyan>{$general['name']}</font>, ";
-            } elseif ($general['npc'] == 1) {
-                echo "<font color=skyblue>{$general['name']}</font>, ";
-            } else {
-                echo "{$general['name']}, ";
-            }
+            echo formatName($general['name'], $general['npc']).', ';
         }
         echo "
         </td>
@@ -183,7 +178,7 @@ if ($con >= 2) {
     <tr>
         <td colspan=5> 장수 일람 : ";
     foreach ($nations[0]['generals'] as $general) {
-        $generalText = getColoredName($general['name'], $general['npc']);
+        $generalText = formatName($general['name'], $general['npc']);
         echo "{$generalText}, ";
     }
     echo "

hwe/a_npcList.php

@@ -111,7 +111,7 @@ $sel[$type] = "selected";
         </tr>
         <?php foreach ($generalList as $general) : ?>
             <tr>
-                <td align=center><?= getColoredName($general['name'], $general['npc']) ?></td>
+                <td align=center><?= formatName($general['name'], $general['npc']) ?></td>
                 <td align=center><?= $general['owner_name'] ?></td>
                 <td align=center>Lv <?= $general['explevel'] ?></td>
                 <td align=center><?= $nationName[$general['nation']] ?></td>

hwe/a_status.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-increaseRefresh("세력도", 2);
-TurnExecutionHelper::executeAllCommand();
-
-$mapTheme = $gameStor->map_theme ?? 'che';
-
-$me = $db->queryFirstRow('SELECT con,turntime from general where owner=%i', $userID);
-
-$con = checkLimit($me['con']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1024" />
-    <title><?= UniqueConst::$serverName ?>: 세력도</title>
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <?= WebUtil::printCSS('css/normalize.css') ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printCSS('css/map.css') ?>
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('d_shared/base_map.js') ?>
-    <?= WebUtil::printDist('ts', ['common', 'map']) ?>
-    <script>
-        window.serverNick = '<?= DB::prefix() ?>';
-        window.serverID = '<?= UniqueConst::$serverID ?>';
-        $(function() {
-
-            reloadWorldMap({
-                neutralView: true,
-                showMe: true,
-                useCachedMap: true
-            });
-
-        });
-    </script>
-</head>
-
-<body>
-    <table align=center width=1200 class='tb_layout bg0'>
-        <tr>
-            <td>세 력 도<br><?= closeButton() ?></td>
-        </tr>
-    </table>
-    <table align=center width=1200 height=520 class='tb_layout bg0'>
-        <tr height=520>
-            <td width=498 valign=top>
-                <?= formatHistoryToHTML(getGlobalActionLogRecent(34)) ?>
-            </td>
-            <td width=698>
-                <?= getMapHtml($mapTheme) ?>
-            </td>
-        </tr>
-        <tr>
-            <td colspan=2 valign=top>
-                <?= formatHistoryToHTML(getGlobalHistoryLogRecent(34)) ?>
-            </td>
-        </tr>
-    </table>
-    <table align=center width=1200 class='tb_layout bg0'>
-        <tr>
-            <td><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td><?= banner() ?> </td>
-        </tr>
-    </table>
-</body>
-
-</html>

hwe/api.php

@@ -5,4 +5,9 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 
-APIHelper::launch(dirname(__FILE__));
+$eParams = $_GET;
+if(key_exists('path', $eParams)){
+    unset($eParams['path']);
+}
+
+APIHelper::launch(dirname(__FILE__), $_GET['path']??'', $eParams, true);

hwe/b_battleCenter.php

@@ -133,7 +133,7 @@ $showGeneral = General::createGeneralObjFromDB($gen);
         </tr>
         <tr>
             <td>
-                <form name=form1 method=post>
+                <form name=form1 method=get>
                     정렬순서 :
                     <select name='query_type' size=1>
                         <?php foreach ($queryMap as $queryType => [$queryTypeText,]) : ?>

hwe/b_betting.php

@@ -38,25 +38,25 @@ if ($con >= 2) {
 switch ($admin['tnmt_type']) {
     default:
         throw new \RuntimeException('Invalid tnmt_type');
-    case 0:
+    case convertTournamentType('전력전'):
         $tnmt_type = "<font color=cyan>전력전</font>";
         $tp = "total";
         $tp2 = "종합";
         $tp3 = "total";
         break;
-    case 1:
+    case convertTournamentType('통솔전'):
         $tnmt_type = "<font color=cyan>통솔전</font>";
         $tp = "leadership";
         $tp2 = "통솔";
         $tp3 = "leadership";
         break;
-    case 2:
+    case convertTournamentType('일기토'):
         $tnmt_type = "<font color=cyan>일기토</font>";
         $tp = "strength";
         $tp2 = "무력";
         $tp3 = "strength";
         break;
-    case 3:
+    case convertTournamentType('설전'):
         $tnmt_type = "<font color=cyan>설전</font>";
         $tp = "intel";
         $tp2 = "지력";
@@ -69,7 +69,7 @@ $str2 = getTournamentTime();
 if ($str2) {
     $str2 = ', ' . $str2;
 }
-$str3 = getTournamentTerm();
+$str3 = getTournamentTermText();
 if ($str3) {
     $str3 = ', ' . $str3;
 }
@@ -132,11 +132,8 @@ if ($str3) {
                 if ($general['name'] == "") {
                     $general['name'] = "-";
                 }
-                if ($general['npc'] >= 2) {
-                    $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-                } elseif ($general['npc'] == 1) {
-                    $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-                }
+
+                $general['name'] = formatName($general['name'], $general['npc']);
                 echo "<td colspan=16>{$general['name']}</td>";
             }
 
@@ -162,11 +159,7 @@ if ($str3) {
                 if ($general['name'] == "") {
                     $general['name'] = "-";
                 }
-                if ($general['npc'] >= 2) {
-                    $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-                } elseif ($general['npc'] == 1) {
-                    $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-                }
+                $general['name'] = formatName($general['name'], $general['npc']);
                 if ($general['win'] > 0) {
                     $line[$i] = "<font color=red>";
                     $cent[intdiv($i, 2)] = "<font color=red>";
@@ -208,11 +201,7 @@ if ($str3) {
                 if ($general['name'] == "") {
                     $general['name'] = "-";
                 }
-                if ($general['npc'] >= 2) {
-                    $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-                } elseif ($general['npc'] == 1) {
-                    $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-                }
+                $general['name'] = formatName($general['name'], $general['npc']);
                 if ($general['win'] > 0) {
                     $line[$i] = "<font color=red>";
                     $cent[intdiv($i, 2)] = "<font color=red>";
@@ -254,11 +243,7 @@ if ($str3) {
                 if ($general['name'] == "") {
                     $general['name'] = "-";
                 }
-                if ($general['npc'] >= 2) {
-                    $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-                } elseif ($general['npc'] == 1) {
-                    $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-                }
+                $general['name'] = formatName($general['name'], $general['npc']);
                 if ($general['win'] > 0) {
                     $line[$i] = "<font color=red>";
                     $cent[intdiv($i, 2)] = "<font color=red>";
@@ -288,7 +273,7 @@ if ($str3) {
             for ($i = 0; $i < 8; $i++) {
                 $cent[$i] = "<font color=white>";
             }
-            $generalList = $db->query('SELECT npc,name,win from tournament where grp>=20 order by grp, grp_no LIMIT 16');
+            $generalList = $db->query('SELECT npc,name,win,leadership,strength,intel,leadership+strength+intel as total from tournament where grp>=20 order by grp, grp_no LIMIT 16');
             while (count($generalList) < 16) {
                 $generalList[] = [
                     'name' => '-',
@@ -300,11 +285,7 @@ if ($str3) {
                 if ($general['name'] == "") {
                     $general['name'] = "-";
                 }
-                if ($general['npc'] >= 2) {
-                    $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-                } elseif ($general['npc'] == 1) {
-                    $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-                }
+                $general['name'] = formatName($general['name'], $general['npc']);
                 if ($general['win'] > 0) {
                     $line[$i] = "<font color=red>";
                     $cent[intdiv($i, 2)] = "<font color=red>";
@@ -312,6 +293,7 @@ if ($str3) {
                     $line[$i] = "<font color=white>";
                 }
                 $gen[$i] = $general['name'];
+                $stat[$i] = $general[$tp];
             }
             for ($i = 0; $i < 8; $i++) {
                 $cent[$i] = $cent[$i] . "┻" . "</font>";
@@ -319,40 +301,43 @@ if ($str3) {
                 $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━┓" . "</font>";
                 echo "<td colspan=2>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
             }
-            echo "
-    </tr>
-    <tr align=center>";
-
-            for ($i = 0; $i < 16; $i++) {
-                echo "<td width=70>{$gen[$i]}</td>";
-            }
-
-            $bet = [];
-            $gold = [];
-
-            for ($i = 0; $i < 16; $i++) {
-                if ($globalBet[$i] == 0) {
-                    $bet[$i] = "∞";
-                } else {
-                    $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
-                }
-            }
-
-            for ($i = 0; $i < 16; $i++) {
-                if (!is_numeric($bet[$i])) {
-                    $gold[$i] = 0;
-                } else {
-                    $gold[$i] = Util::round($myBet[$i] * $bet[$i]);
-                }
-            }
             ?>
-        </tr>
+    </tr>
+      <tr align=center>
+        <?php for ($i = 0; $i < 16; $i++) { ?>
+            <td width=70><?=$gen[$i]?></td>
+        <?php } ?>
+      </tr>
+      <tr align=center>
+        <?php for ($i = 0; $i < 16; $i++) { ?>
+            <td width=70 style="font-size: 14px"><?=$stat[$i]?></td>
+        <?php } ?>
+      </tr>
     </table>
-    <table align=center width=1120 class='tb_layout bg0'>
+    <table align=center width=1120 style="table-layout: fixed" class='tb_layout bg0'>
         <tr align=center>
             <td height=10 colspan=16></td>
         </tr>
         <?php
+
+          $bet = [];
+          $gold = [];
+
+          for ($i = 0; $i < 16; $i++) {
+              if ($globalBet[$i] == 0) {
+                  $bet[$i] = "∞";
+              } else {
+                  $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
+              }
+          }
+
+          for ($i = 0; $i < 16; $i++) {
+              if (!is_numeric($bet[$i])) {
+                  $gold[$i] = 0;
+              } else {
+                  $gold[$i] = Util::round($myBet[$i] * $bet[$i]);
+              }
+          }
         echo "
     <tr align=center>";
 

hwe/b_currentCity.php

@@ -337,6 +337,7 @@ $templates = new \League\Plates\Engine('templates');
                                     'ourGeneral' => $ourGeneral,
                                     'iconPath' => GetImageURL($general['imgsvr']) . '/' . $general['picture'],
                                     'isNPC' => $isNPC,
+                                    'npc' => $general['npc'],
                                     'wounded' => $wounded,
                                     'name' => $name,
                                     'nameText' => $nameText,
@@ -364,7 +365,7 @@ $templates = new \League\Plates\Engine('templates');
                             }
 
                             $generalsName = array_map(function ($gen) {
-                                return getColoredName($gen['name'], $gen['npc']);
+                                return formatName($gen['name'], $gen['npc']);
                             }, $generals);
 
                             $enemyCrew = 0;

hwe/b_diplomacy.php

@@ -13,8 +13,6 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("중원정보", 1);
 
-$mapTheme = $gameStor->map_theme ?? 'che';
-
 $me = $db->queryFirstRow('SELECT no,nation FROM general WHERE owner=%i', $userID);
 $myNationID = $me['nation'];
 
@@ -97,20 +95,15 @@ $neutralStateCharMap = [
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printCSS('css/map.css') ?>
     <?= WebUtil::printCSS('css/history.css') ?>
+    <?= WebUtil::printStaticValues([
+        'staticValues' => [
+            'serverNick' => DB::prefix(),
+            'serverID' => UniqueConst::$serverID,
+            'unitSet' => GameConst::$unitSet,
+            'mapName' => GameConst::$mapName,
+        ],
+    ]) ?>
     <?= WebUtil::printDist('ts', ['common', 'map']) ?>
-    <script>
-        window.serverNick = '<?= DB::prefix() ?>';
-        window.serverID = '<?= UniqueConst::$serverID ?>';
-        $(function() {
-
-            reloadWorldMap({
-                neutralView: true,
-                showMe: true,
-                useCachedMap: true
-            });
-
-        });
-    </script>
 </head>
 
 <body>
@@ -194,7 +187,7 @@ $neutralStateCharMap = [
         </tr>
         <tr>
             <td width=698 height=420>
-                <?= getMapHtml($mapTheme) ?>
+                <?= getMapHtml() ?>
             </td>
             <td id='nation_list_frame'>
                 <table id='nation_list'>
@@ -231,6 +224,13 @@ $neutralStateCharMap = [
             <td><?= banner() ?></td>
         </tr>
     </table>
+    <script>
+        reloadWorldMap({
+            neutralView: true,
+            showMe: true,
+            useCachedMap: true
+        });
+    </script>
 </body>
 
 </html>

hwe/b_genList.php

@@ -172,7 +172,7 @@ $templates = new \League\Plates\Engine('templates');
 
         $general['expLevelText'] = getExpLevel($general['experience']);
 
-        $general['nameText'] = getColoredName($general['name'], $general['npc']);
+        $general['nameText'] = formatName($general['name'], $general['npc']);
 
         $general['modeText'] = formatDefenceTrain($general['defence_train']);
         $general['crewtypeText'] = GameUnitConst::byId($general['crewtype'])->name ?? '-';

hwe/b_myCityInfo.php

@@ -71,7 +71,8 @@ $sel = [$type => "selected"];
     </table>
     <?php
 
-    $nation = getNationStaticInfo($me['nation']);  //국가정보
+    $nation = $db->queryFirstRow('SELECT nation, name, color, type, level, capital, gennum, `power`, `rate` from nation WHERE nation = %i', $nationID);  //국가정보
+    $nationTypeObj = buildNationTypeClass($nation['type']);
 
     $officerList = [];
     foreach ($db->query('SELECT no,name,npc,city,officer_level,officer_city,belong FROM general WHERE nation = %i AND 2 <= officer_level AND officer_level <= 4', $nationID) as $officer) {
@@ -82,6 +83,17 @@ $sel = [$type => "selected"];
         $officerList[$officerCityID][$officer['officer_level']] = $officer;
     }
 
+    $generalList = $db->query('SELECT npc, name, city FROM general WHERE nation = %i', $me['nation']);
+    $cityGeneralList = [];
+    foreach ($generalList as $general) {
+        $cityID = $general['city'];
+        if (!key_exists($cityID, $cityGeneralList)) {
+            $cityGeneralList[$cityID] = [];
+        }
+
+        $cityGeneralList[$cityID][] = formatName($general['name'], $general['npc']);
+    }
+
 
     $cityList = $db->query('SELECT *,pop/pop_max as poprate from city where nation=%i', $nationID);
 
@@ -171,8 +183,12 @@ $sel = [$type => "selected"];
         ];
 
         $cityOfficerList = $officerList[$cityID] ?? [];
+        $effectiveOfficerCnt = 0;
         foreach ($cityOfficerList as $cityOfficer) {
-            $officerName[$cityOfficer['officer_level']] = getColoredName($cityOfficer['name'], $cityOfficer['npc']);
+            if ($cityOfficer['city'] == $cityID) {
+                $effectiveOfficerCnt += 1;
+            }
+            $officerName[$cityOfficer['officer_level']] = formatName($cityOfficer['name'], $cityOfficer['npc']);
         }
 
         if ($type == 10 && $city['region'] != $region) {
@@ -187,62 +203,60 @@ $sel = [$type => "selected"];
             $city['trade'] = "- ";
         }
 
-        echo "
-<table align=center width=1000 class='tb_layout bg2'>
-    <tr>
-        <td colspan=12 style=color:" . newColor($nation['color']) . "; bgcolor={$nation['color']}><font size=2>【 " . CityConst::$regionMap[$city['region']] . " | " . CityConst::$levelMap[$city['level']] . " 】 {$city['name']}</font></td>
-    </tr>
-    <tr>
-        <td align=center width=46 class='bg1'>주민</td>
-        <td align=center width=140>{$city['pop']}/{$city['pop_max']}</td>
-        <td align=center width=46 class='bg1'>농업</td>
-        <td align=center width=140>{$city['agri']}/{$city['agri_max']}</td>
-        <td align=center width=46 class='bg1'>상업</td>
-        <td align=center width=140>{$city['comm']}/{$city['comm_max']}</td>
-        <td align=center width=46 class='bg1'>치안</td>
-        <td align=center width=140>{$city['secu']}/{$city['secu_max']}</td>
-        <td align=center width=46 class='bg1'>수비</td>
-        <td align=center width=140>{$city['def']}/{$city['def_max']}</td>
-        <td align=center width=46 class='bg1'>성벽</td>
-        <td align=center width=140>{$city['wall']}/{$city['wall_max']}</td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'>민심</td>
-        <td align=center>" . round($city['trust'], 1) . "</td>
-        <td align=center class='bg1'>시세</td>
-        <td align=center>{$city['trade']}%</td>
-        <td align=center class='bg1'>인구</td>
-        <td align=center>" . round($city['pop'] / $city['pop_max'] * 100, 2) . " %</td>
-        <td align=center class='bg1'>태수</td>
-        <td align=center>";
-        echo $officerName[4];
-        echo "</td>
-        <td align=center class='bg1'>군사</td>
-        <td align=center>";
-        echo $officerName[3];
-        echo "</td>
-        <td align=center class='bg1'>종사</td>
-        <td align=center>";
-        echo $officerName[2];
-        echo "</td>
-    </tr>
-    <tr>
-        <td align=center class='bg1'>장수</td>
-        <td colspan=11>";
-        $generalList = $db->query('SELECT npc, name FROM general WHERE city = %i AND nation = %i', $city['city'], $me['nation']);
-        if (!$generalList) {
-            echo "-";
-        }
-        foreach ($generalList as $general) {
-            echo getColoredName($general['name'], $general['npc']) . ', ';
-        }
-        echo "
-        </td>
-    </tr>
-</table>
-";
-    }
+
+        $cityGoldIncome = $nation['rate'] / 20 * calcCityGoldIncome($city, $effectiveOfficerCnt, $nation['capital'] == $cityID, $nation['level'], $nationTypeObj);
+        $cityRiceIncome = $nation['rate'] / 20 * calcCityRiceIncome($city, $effectiveOfficerCnt, $nation['capital'] == $cityID, $nation['level'], $nationTypeObj);
+        $cityWallIncome = $nation['rate'] / 20 * calcCityWallRiceIncome($city, $effectiveOfficerCnt, $nation['capital'] == $cityID, $nation['level'], $nationTypeObj);
+
     ?>
+        <table align=center width=1000 class='tb_layout bg2'>
+            <tr>
+                <td colspan=10 style="color:<?= newColor($nation['color']) ?>; background-color:<?= $nation['color'] ?>;">
+                    <font size=2>【 <?= CityConst::$regionMap[$city['region']] ?> | <?= CityConst::$levelMap[$city['level']] ?> 】 <?= $city['name'] ?></font>
+                </td>
+            </tr>
+            <tr style='text-align:center;'>
+                <td width=60 class='bg1'>주민</td>
+                <td width=140 class='pop-value'><?= $city['pop'] ?>/<?= $city['pop_max'] ?></td>
+                <td width=60 class='bg1'>인구율</td>
+                <td width=140 class='pop-prop-value'><?= round($city['pop'] / $city['pop_max'] * 100, 2) ?>%</td>
+                <td width=60 class='bg1'>자금 수입</td>
+                <td width=140 class='gold-income'><?= number_format($cityGoldIncome) ?></td>
+                <td width=60 class='bg1'>군량 수입</td>
+                <td width=140 class='rice-income'><?= number_format($cityRiceIncome) ?></td>
+                <td width=60 class='bg1'>둔전 수입</td>
+                <td width=140 class='wall-income'><?= number_format($cityWallIncome) ?></td>
+            </tr>
+            <tr style='text-align:center;'>
+                <td class='bg1'>농업</td>
+                <td class='agri-value'><?= $city['agri'] ?>/<?= $city['agri_max'] ?></td>
+                <td class='bg1'>상업</td>
+                <td class='comm-value'><?= $city['comm'] ?>/<?= $city['comm_max'] ?></td>
+                <td class='bg1'>치안</td>
+                <td class='secu-value'><?= $city['secu'] ?>/<?= $city['secu_max'] ?></td>
+                <td class='bg1'>수비</td>
+                <td class='def-value'><?= $city['def'] ?>/<?= $city['def_max'] ?></td>
+                <td class='bg1'>성벽</td>
+                <td class='wall-value'><?= $city['wall'] ?>/<?= $city['wall_max'] ?></td>
+            </tr>
+            <tr style='text-align:center;'>
+                <td class='bg1'>민심</td>
+                <td class='trust-value'><?= round($city['trust'], 1) ?></td>
+                <td class='bg1'>시세</td>
+                <td class='trade-value'><?= $city['trade'] ?>%</td>
+                <td class='bg1'>태수</td>
+                <td class='officer-4-value'><?= $officerName[4] ?></td>
+                <td class='bg1'>군사</td>
+                <td class='officer-3-value'><?= $officerName[3] ?></td>
+                <td class='bg1'>종사</td>
+                <td class='officer-2-value'><?= $officerName[2] ?></td>
+            </tr>
+            <tr>
+                <td style='text-align:center;' class='bg1'>장수</td>
+                <td colspan=9 class='city-generals'><?= key_exists($cityID, $cityGeneralList) ? join(', ', $cityGeneralList[$cityID]) : '-' ?></td>
+            </tr>
+        </table>
+    <?php } ?>
 
     <table align=center width=1000 class='tb_layout bg0 anchor'>
         <tr>
@@ -252,7 +266,7 @@ $sel = [$type => "selected"];
             <td><?= banner() ?></td>
         </tr>
     </table>
+    <div id="helper_genlist" style="display:none;"></div>
 </body>
-<div id="helper_genlist" style="display:none;"></div>
 
 </html>

hwe/b_myGenInfo.php

@@ -146,13 +146,7 @@ if ($gameStor->isunited) {
             $intel = "{$general['intel']}";
         }
 
-        if ($general['npc'] >= 2) {
-            $name = "<font color=cyan>{$general['name']}</font>";
-        } elseif ($general['npc'] == 1) {
-            $name = "<font color=skyblue>{$general['name']}</font>";
-        } else {
-            $name =  "{$general['name']}";
-        }
+        $name = formatName($general['name'], $general['npc']);
 
         if (key_exists($general['owner'], $ownerNameList)) {
             $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';

hwe/b_tournament.php

@@ -198,7 +198,7 @@ switch ($admin['tnmt_type']) {
         if ($str2) {
             $str2 = ', ' . $str2;
         }
-        $str3 = getTournamentTerm();
+        $str3 = getTournamentTermText();
         if ($str3) {
             $str3 = ', ' . $str3;
         }
@@ -240,11 +240,7 @@ switch ($admin['tnmt_type']) {
             if ($general['name'] == "") {
                 $general['name'] = "-";
             }
-            if ($general['npc'] >= 2) {
-                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-            } elseif ($general['npc'] == 1) {
-                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-            }
+            $general['name'] = formatName($general['name'], $general['npc']);
             echo "<td colspan=16>{$general['name']}</td>";
         }
 
@@ -270,11 +266,7 @@ switch ($admin['tnmt_type']) {
             if ($general['name'] == "") {
                 $general['name'] = "-";
             }
-            if ($general['npc'] >= 2) {
-                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-            } elseif ($general['npc'] == 1) {
-                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-            }
+            $general['name'] = formatName($general['name'], $general['npc']);
             if ($general['win'] > 0) {
                 $line[$i] = "<font color=red>";
                 $cent[intdiv($i, 2)] = "<font color=red>";
@@ -316,11 +308,7 @@ switch ($admin['tnmt_type']) {
             if ($general['name'] == "") {
                 $general['name'] = "-";
             }
-            if ($general['npc'] >= 2) {
-                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-            } elseif ($general['npc'] == 1) {
-                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-            }
+            $general['name'] = formatName($general['name'], $general['npc']);
             if ($general['win'] > 0) {
                 $line[$i] = "<font color=red>";
                 $cent[intdiv($i, 2)] = "<font color=red>";
@@ -363,11 +351,7 @@ switch ($admin['tnmt_type']) {
             if ($general['name'] == "") {
                 $general['name'] = "-";
             }
-            if ($general['npc'] >= 2) {
-                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-            } elseif ($general['npc'] == 1) {
-                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-            }
+            $general['name'] = formatName($general['name'], $general['npc']);
             if ($general['win'] > 0) {
                 $line[$i] = "<font color=red>";
                 $cent[intdiv($i, 2)] = "<font color=red>";
@@ -409,11 +393,7 @@ switch ($admin['tnmt_type']) {
             if ($general['name'] == "") {
                 $general['name'] = "-";
             }
-            if ($general['npc'] >= 2) {
-                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-            } elseif ($general['npc'] == 1) {
-                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-            }
+            $general['name'] = formatName($general['name'], $general['npc']);
             if ($general['win'] > 0) {
                 $line[$i] = "<font color=red>";
                 $cent[intdiv($i, 2)] = "<font color=red>";

hwe/c_tournament.php

@@ -15,7 +15,7 @@ $sel = Util::getPost('sel', 'int');
 $trig = Util::getPost('trig', 'int');
 
 //로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
+$session = Session::requireGameLogin();
 $userID = Session::getUserID();
 
 $db = DB::db();
@@ -24,7 +24,11 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 $admin = $gameStor->getValues(['tournament','phase','tnmt_type','develcost']);
 
 $me = $db->queryFirstRow('SELECT no,name,tournament from general where owner=%i',$userID);
-
+if(!$me){
+    $session->logoutGame();
+    header('location:b_tournament.php');
+    exit(1);
+}
 switch($admin['tnmt_type']) {
 case 0: $tp = "total";  $tp2 = "전력전"; $tp3 = "leadership+strength+intel"; break;
 case 1: $tp = "leadership"; $tp2 = "통솔전"; $tp3 = "leadership"; break;
@@ -40,6 +44,10 @@ if($btn == '참가') {
     }
 
     $general = $db->queryFirstRow('SELECT no,name,npc,leadership,strength,intel,explevel,gold,horse,weapon,book FROM general WHERE `no`=%i', $me['no']);
+    if(!$general){
+        header('location:b_tournament.php');
+        exit(1);
+    }
 
     //{$admin['develcost']}원 참가비
     if($general['gold'] < $admin['develcost']) {
@@ -90,8 +98,8 @@ if($btn == '참가') {
         ], 'no=%i', $general['no']);
     }
 
-    $grpCount = $db->queryFirstField('SELECT count(*) FROM tournament where grp<10 GROUP BY grp HAVING count(*)=8');
-    if($grpCount >= 8) {
+    $grpCount = $db->queryFirstColumn('SELECT count(grp) FROM tournament where grp<10 GROUP BY grp;');
+    if(min($grpCount) >= 8) {
         $gameStor->tournament = 2;
         $gameStor->phase = 0;
     }

hwe/d_setting/templates/allButton.php.orig

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

hwe/func.php

@@ -171,7 +171,7 @@ function cityInfo(General $generalObj)
     ];
 
     foreach ($db->query('SELECT `officer_level`, `name`, npc, no FROM general WHERE officer_city = %i', $cityID) as $officer) {
-        $officerName[$officer['officer_level']] = getColoredName($officer['name'], $officer['npc']);
+        $officerName[$officer['officer_level']] = formatName($officer['name'], $officer['npc']);
     }
 
     $city['officerName'] = $officerName;
@@ -199,8 +199,8 @@ function myNationInfo(General $generalObj)
 
     $topChiefs = Util::convertArrayToDict($db->query('SELECT officer_level, no, name, npc FROM general WHERE nation = %i AND officer_level >= 11', $nationID), 'officer_level');
 
-    $level12Name = key_exists(12, $topChiefs) ? getColoredName($topChiefs[12]['name'], $topChiefs[12]['npc']) : '-';
-    $level11Name = key_exists(11, $topChiefs) ? getColoredName($topChiefs[11]['name'], $topChiefs[11]['npc']) : '-';
+    $level12Name = key_exists(12, $topChiefs) ? formatName($topChiefs[12]['name'], $topChiefs[12]['npc']) : '-';
+    $level11Name = key_exists(11, $topChiefs) ? formatName($topChiefs[11]['name'], $topChiefs[11]['npc']) : '-';
 
     $impossibleStrategicCommandLists = [];
     $strategicCommandLists = GameConst::$availableChiefCommand['전략'];
@@ -1937,8 +1937,8 @@ function tryUniqueItemLottery(General $general, string $acquireType = '아이템
     $prob = Util::valueFit($prob, null, 1 / 4); //최대치 감소
     $result = false;
 
-    $prob /= sqrt(2);
-    $moreProb = pow(2, 1 / 4);
+    $prob /= sqrt(7);
+    $moreProb = pow(10, 1 / 4);
 
     if ($general->getAuxVar('inheritRandomUnique') && $availableBuyUnique) {
         //포인트로 랜덤 유니크 획득
@@ -2415,7 +2415,9 @@ function SabotageInjury(array $cityGeneralList, string $reason): int
 
     foreach ($cityGeneralList as $general) {
         /** @var General $general */
-        if (!Util::randBool(0.3)) {
+        $injuryProb = 0.3;
+        $injuryProb = $general->onCalcStat($general, 'injuryProb', $injuryProb);
+        if (!Util::randBool($injuryProb)) {
             continue;
         }
         $general->getLogger()->pushGeneralActionLog($text);

hwe/func_command.php

@@ -393,6 +393,7 @@ function setGeneralCommand(int $generalID, array $rawTurnList, string $command,
     _setGeneralCommand($commandObj, $turnList);
     return [
         'result'=>true,
+        'brief'=>$commandObj->getBrief(),
         'reason'=>'success'
     ];
 }
@@ -474,6 +475,7 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
     _setNationCommand($commandObj, $turnList);
     return [
         'result'=>true,
+        'brief'=>$commandObj->getBrief(),
         'arg_test'=>true,
         'reason'=>'success'
     ];

hwe/func_converter.php

@@ -64,6 +64,15 @@ function getNationLevel(int $level) {
     ][$level];
 }
 
+function convertTournamentType(string $type){
+  return[
+    '전력전'=>0,
+    '통솔전'=>1,
+    '일기토'=>2,
+    '설전'=>3,
+  ][$type]??-1;
+}
+
 function getGenChar(?string $type) {
     if($type === null){
         return '-';
@@ -692,21 +701,35 @@ function isConsumable(?string $item) : bool{
     return $itemClass->isConsumable();
 }
 
-function getNameColor(int $npcType):?string{
-    if($npcType >= 2){
-        return 'cyan';
-    }
-    if($npcType == 1){
+function getNPCColor(int $npc): ?string{
+    if ($npc == 1) {
         return 'skyblue';
     }
+    if ($npc == 4){
+        return 'deepskyblue';
+    }
+    if ($npc == 5){
+        return 'darkcyan';
+    }
+    if ($npc == 6){
+        return 'mediumaquamarine';
+    }
+
+    if ($npc > 1) {
+        return 'cyan';
+    }
+
     return null;
 }
-function getColoredName(string $name, int $npcType):string{
-    $color = getNameColor($npcType);
+
+function formatName(string $name, int $npc): string
+{
+    $color = getNPCColor($npc);
     if($color === null){
         return $name;
     }
-    return "<span style='color:{$color}'>{$name}</span>";
+
+    return "<span style='color:{$color}'>$name</span>";
 }
 
 function ConvertLog(?string $str, $type=1) : string {

hwe/func_gamerule.php

@@ -371,7 +371,7 @@ function postUpdateMonthly()
                 sum(pop)*sum(pop+agri+comm+secu+wall+def)/sum(pop_max+agri_max+comm_max+secu_max+wall_max+def_max)/100
             ) from city where nation=A.nation and supply=1
         ))
-        +(select SUM((ra.value + 1000)/(rb.value + 1000)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)*2 + (SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/2)
+        +(select SUM((ra.value + 1000)/(rb.value + 1000)*(CASE WHEN g.`npc` < 2 THEN 1.2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)*2 + (SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/2)
                 FROM general AS g
                 LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = \'killcrew_person\'
                 LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = \'deathcrew_person\'
@@ -673,17 +673,17 @@ function updateNationState()
                         continue;
                     }
 
-                    $score = $nationGen->getVar('belong') + 5;
+                    $score = $nationGen->getVar('belong') + 10;
 
                     if ($nationGen->getVar('officer_level') == 12) {
-                        $score += 100; //NOTE: 꼬우면 군주하세요.
+                        $score += 60;
                     } else if ($nationGen->getVar('officer_level') == 11) {
-                        $score += 50;
+                        $score += 30;
                     } else if ($nationGen->getVar('officer_level') > 4) {
-                        $score += 35;
+                        $score += 15;
                     }
 
-                    $score *= $trialCnt;
+                    $score *= 2**$trialCnt;
 
                     $uniqueLotteryWeightList[$nationGen->getID()] = [$nationGen, $score];
                 }

hwe/func_history.php

@@ -371,10 +371,11 @@ function getGlobalActionLogWithDate(int $year, int $month):array {
     return $texts;
 }
 
-function LogHistory($isFirst=0) {
+function getCurrentHistory($isFirst=false) {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $obj = $gameStor->getValues(['startyear', 'year', 'month']);
+    [$startYear, $year, $month]= $gameStor->getValuesAsArray(['startyear', 'year', 'month']);
+    $yearMonth = Util::joinYearMonth($year, $month);
 
     $map = getWorldMap([
         'year'=>null,
@@ -384,21 +385,14 @@ function LogHistory($isFirst=0) {
         'aux'=>[]
     ]);
 
-
-    $map['month'] = $obj['month'];
-    $map['year'] = $obj['year'];
-    $map['startYear'] = $obj['startyear'];
-    if($isFirst == 1){
-        $map['month'] -= 1;
-        if($map['month'] == 0){
-            $map['month'] = 12;
-            $map['year'] -= 1;
-        }
+    if($isFirst){
+        $yearMonth -= 1;
     }
 
-    $year = $map['year'];
-    $month = $map['month'];
-
+    [$year, $month] = Util::parseYearMonth($yearMonth);
+    $map['startYear'] = $startYear;
+    $map['year'] = $year;
+    $map['month'] = $month;
 
     $globalHistory = getGlobalHistoryLogWithDate($year, $month);
     $globalAction = getGlobalActionLogWithDate($year, $month);
@@ -418,15 +412,27 @@ function LogHistory($isFirst=0) {
         return -($lhs['power']<=>$rhs['power']);
     });
 
-    $db->insert('ng_history', [
+    return [
         'server_id' => UniqueConst::$serverID,
         'year' => $year,
         'month' => $month,
-        'map' => Json::encode($map),
-        'global_history' => Json::encode($globalHistory),
-        'global_action' => Json::encode($globalAction),
-        'nations' => Json::encode($nations),
-    ]);
+        'map' => $map,
+        'global_history' => $globalHistory,
+        'global_action' => $globalAction,
+        'nations' => $nations,
+    ];
+}
+
+function LogHistory($isFirst=false) {
+    $history = getCurrentHistory($isFirst);
+    $db = DB::db();
+
+    $history['map'] = Json::encode($history['map']);
+    $history['global_history'] = Json::encode($history['global_history']);
+    $history['global_action'] = Json::encode($history['global_action']);
+    $history['nations'] = Json::encode($history['nations']);
+
+    $db->insert('ng_history', $history);
 
     return true;
 }

hwe/func_template.php

@@ -167,6 +167,20 @@ function commandButton(array $opts = [])
     $templates = new \League\Plates\Engine(__DIR__ . '/templates');
     $showSecret = false;
     $permission = checkSecretPermission($me);
+    $btnClassForTournament = $opts['btnClass'];
+    if ($opts['isTournamentApplicationOpen']) {
+      if ($btnClassForTournament != 'dropdown-item') {
+        $btnClassForTournament = 'toolbarButton2';
+      }
+    }
+
+    $btnClassForBetting = $opts['btnClass'];
+    if ($opts['isBettingActive']) {
+      if ($btnClassForTournament != 'dropdown-item') {
+        $btnClassForBetting = 'toolbarButton2';
+      }
+    }
+
     if ($permission >= 1) {
         $showSecret = true;
     } else if ($me['officer_level'] == 0) {
@@ -180,6 +194,8 @@ function commandButton(array $opts = [])
         'nationLevel' => $nation['level'],
         'showSecret' => $showSecret,
         'permission' => $permission,
+        'btnClassForTournament' => $btnClassForTournament,
+        'btnClassForBetting' => $btnClassForBetting,
     ], $opts));
 }
 
@@ -215,36 +231,23 @@ function formatLeadershipBonus(int $value): string
     return "<font color=cyan>+{$value}</font>";
 }
 
-function formatName(string $name, int $npc): string
-{
-    if ($npc == 1) {
-        $name = "<font color='skyblue'>$name</font>";
-    } else if ($npc > 1) {
-        $name = "<font color='cyan'>$name</font>";
-    }
-    return $name;
-}
+
 
 function getMapTheme(): string
 {
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $mapTheme = $gameStor->map_theme ?? 'che';
-    return $mapTheme;
+    return GameConst::$mapName;
 }
 
-function getMapHtml(?string $mapTheme = null)
+function getMapHtml(?string $mapName = null)
 {
     $templates = new \League\Plates\Engine(__DIR__ . '/templates');
 
-    if ($mapTheme === null) {
-        $db = DB::db();
-        $gameStor = KVStorage::getStorage($db, 'game_env');
-        $mapTheme = $gameStor->map_theme ?? 'che';
+    if($mapName === null){
+        $mapName = GameConst::$mapName;
     }
 
     return $templates->render('map', [
-        'mapTheme' => $mapTheme
+        'mapName' => $mapName
     ]);
 }
 

hwe/func_time_event.php

@@ -4,14 +4,12 @@ namespace sammo;
  * 시간 단위로 일어나는 이벤트들에 대한 함수 모음
  */
 
- 
+
 //1월마다 실행
 function processSpring() {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    //인구 증가
-    popIncrease();
     // 1월엔 무조건 내정 1% 감소
     $db->update('city',[
         'dead'=>0,
@@ -22,6 +20,9 @@ function processSpring() {
         'wall'=>$db->sqleval('wall * 0.99'),
     ],true);
 
+    //인구 증가
+    popIncrease();
+
     // > 10000 유지비 3%, > 1000 유지비 1%
     // 유지비 1%
     $db->update('general', [
@@ -100,7 +101,7 @@ function processGoldIncome() {
             $generalObj = new General($rawGeneral, null, null, null, $year, $month, false);
             $gold = Util::round(getBill($generalObj->getVar('dedication'))*$ratio);
             $generalObj->increaseVar('gold', $gold);
-            
+
             $logger = $generalObj->getLogger();
             if($generalObj->getVar('officer_level') > 4){
                 $logger->pushGeneralActionLog($incomeLog, $logger::PLAIN);
@@ -121,9 +122,9 @@ function processGoldIncome() {
 
 function popIncrease() {
     $db = DB::db();
-    
+
     $nationList = $db->queryAllLists('SELECT nation,rate_tmp,type FROM nation');
-    
+
     // 인구 및 민심
 
     $db->update('city', [
@@ -138,7 +139,7 @@ function popIncrease() {
     foreach($nationList as [$nationID, $taxRate, $nationType]){
         $nationTypeObj = buildNationTypeClass($nationType);
 
-        
+
         $popRatio = (30 - $taxRate)/200;  // 20일때 5% 5일때 12.5% 50일때 -10%
         $popRatio = $nationTypeObj->onCalcNationalIncome('pop', $popRatio);
 
@@ -246,7 +247,7 @@ function getGoldIncome(int $nationID, int $nationLevel, float $taxRate, int $cap
     }
 
     $cityIncome *= ($taxRate / 20);
-    
+
     return $cityIncome;
 }
 
@@ -290,9 +291,6 @@ function getWarGoldIncome(string $nationType, array $cityList){
 function processFall() {
     $db = DB::db();
 
-    //인구 증가
-    popIncrease();
-    
     // 7월엔 무조건 내정 1% 감소
     $db->update('city',[
         'dead'=>0,
@@ -303,6 +301,8 @@ function processFall() {
         'wall'=>$db->sqleval('wall * 0.99'),
     ],true);
 
+    //인구 증가
+    popIncrease();
 
     // > 10000 유지비 3%, > 1000 유지비 1%
     // 유지비 1%
@@ -378,7 +378,7 @@ function processRiceIncome() {
             $generalObj = new General($rawGeneral, null, null, null, $year, $month, false);
             $rice = Util::round(getBill($generalObj->getVar('dedication'))*$ratio);
             $generalObj->increaseVar('rice', $rice);
-            
+
             $logger = $generalObj->getLogger();
             if($generalObj->getVar('officer_level') > 4){
                 $logger->pushGeneralActionLog($incomeLog, $logger::PLAIN);
@@ -418,7 +418,7 @@ function getRiceIncome(int $nationID, int $nationLevel, float $taxRate, int $cap
     }
 
     $cityIncome *= ($taxRate / 20);
-    
+
     return $cityIncome;
 }
 
@@ -439,12 +439,12 @@ function getWallIncome(int $nationID, int $nationLevel, float $taxRate, int $cap
     $cityIncome = 0;
     foreach($cityList as $rawCity){
         $cityID = $rawCity['city'];
-        
+
         $cityIncome += calcCityWallRiceIncome($rawCity, $officersCnt[$cityID]??0, $capitalID == $cityID, $nationLevel, $nationTypeObj);
     }
 
     $cityIncome *= ($taxRate / 20);
-    
+
     return $cityIncome;
 }
 
@@ -520,7 +520,7 @@ function disaster() {
         }
         else {
             $raiseProp = 0.06 - ($city['secu'] / $city['secu_max']) * 0.05; // 1 ~ 6%
-        }    
+        }
 
         if(Util::randBool($raiseProp)) {
             $targetCityList[] = $city;
@@ -576,7 +576,7 @@ function disaster() {
     $logger->flush();
 
     if (!$isGood) {
-        $generalListByCity = Util::arrayGroupBy($db->query('SELECT no, nation, city, injury, crew, atmos, train FROM general WHERE city IN %li', Util::squeezeFromArray($targetCityList, 'city')), 'city');
+        $generalListByCity = Util::arrayGroupBy($db->query('SELECT no, name, nation, city, officer_level, injury, leadership, strength, intel, horse, weapon, book, item, crew, crewtype, atmos, train, special, special2 FROM general WHERE city IN %li', Util::squeezeFromArray($targetCityList, 'city')), 'city');
         //NOTE: 쿼리 1번이지만 복잡하기 vs 쿼리 여러번이지만 조금 더 깔끔하기
         foreach ($targetCityList as $city) {
             $affectRatio = Util::valueFit($city['secu'] / $city['secu_max'] / 0.8, 0, 1);
@@ -592,11 +592,11 @@ function disaster() {
                 'def'=>$db->sqleval('def * %d', $affectRatio),
                 'wall'=>$db->sqleval('wall * %d', $affectRatio),
             ], 'city = %i', $city['city']);
-            
+
             $generalList = array_map(
                 function($rawGeneral) use ($city, $year, $month){
                     return new General($rawGeneral, null, $city, null, $year, $month, false);
-                }, 
+                },
                 $generalListByCity[$city['city']]??[]
             );
 
@@ -619,7 +619,7 @@ function disaster() {
                 'wall'=>$db->sqleval('least(wall * %d, wall_max)', $affectRatio),
             ], 'city = %i', $city['city']);
 
-            
+
         }
     }
 

hwe/func_tournament.php

@@ -164,40 +164,47 @@ function processTournament()
     $gameStor->tnmt_time = (new \DateTimeImmutable($admin['tnmt_time']))->add(new \DateInterval("PT{$second}S"))->format('Y-m-d H:i:s');
 }
 
-function getTournamentTerm()
-{
+function getTournamentTerm(): ?int{
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     $tnmt_auto = $gameStor->tnmt_auto;
-
-    switch ($tnmt_auto) {
-        case 0:
-            $str = '';
-            break;
-        case 1:
-            $str = "경기당 12분";
-            break;
-        case 2:
-            $str = "경기당 7분";
-            break;
-        case 3:
-            $str = "경기당 3분";
-            break;
-        case 4:
-            $str = "경기당 1분";
-            break;
-        case 5:
-            $str = "경기당 30초";
-            break;
-        case 6:
-            $str = "경기당 15초";
-            break;
-        case 7:
-            $str = "경기당 5초";
-            break;
+    if($tnmt_auto === null){
+        $tnmt_auto = $gameStor->tnmt_trig;
     }
-    return $str;
+    switch($tnmt_auto){
+        case 0: return null;
+        case 1: return 12 * 60;
+        case 2: return 7 * 60;
+        case 3: return 3 * 60;
+        case 4: return 1 * 60;
+        case 5: return 30;
+        case 6: return 15;
+        case 7: return 5;
+    }
+    return null;
+}
+
+function getTournamentTermText()
+{
+    $term = getTournamentTerm();
+
+    if($term === null){
+        return '수동';
+    }
+
+    if($term % 60 === 0){
+        $termMin = intdiv($term, 60);
+        return "경기당 {$termMin}분";
+    }
+
+    if($term > 60){
+        $termSec = $term % 60;
+        $termMin = intdiv($term, 60);
+        return "경기당 {$termMin}분 {$termSec}초";
+    }
+
+    return "경기당 {$term}초";
 }
 
 function getTournamentTime()
@@ -261,10 +268,8 @@ function printRow($k, $npc, $name, $abil, $tgame, $win, $draw, $lose, $gd, $gl,
     $k += 1;
     if ($prmt > 0) {
         $name = "<font color=orange>" . $name . "</font>";
-    } elseif ($npc >= 2) {
-        $name = "<font color=cyan>" . $name . "</font>";
-    } elseif ($npc == 1) {
-        $name = "<font color=skyblue>" . $name . "</font>";
+    } else if($npc > 0){
+        $name = formatName($name, $npc);
     }
     echo "<tr align=center><td class='bg2'>$k</td><td style='font-size:80%;'>$name</td><td>$abil</td><td>$tgame</td><td>$win</td><td>$draw</td><td>$lose</td><td>$gd</td><td>$gl</td></tr>";
 }

hwe/index.php

@@ -47,7 +47,7 @@ if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
     ], 'owner=%i', $userID);
 }
 
-$plock = $db->queryFirstField('SELECT plock FROM plock LIMIT 1');
+$plock = boolval($db->queryFirstField('SELECT plock FROM plock LIMIT 1'));
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -83,11 +83,13 @@ if ($gameStor->npcmode == 0) {
     $npcmode = "선택 생성";
 }
 $color = "cyan";
-$mapTheme = $gameStor->map_theme;
 $serverName = UniqueConst::$serverName;
 $serverCnt = $gameStor->server_cnt;
 
 $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
+$isTournamentActive = $gameStor->tournament > 0;
+$isTournamentApplicationOpen = $gameStor->tournament == 1;
+$isBettingActive = $gameStor->tournament == 6;
 
 $myNationStatic = getNationStaticInfo($generalObj->getNationID());
 $nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
@@ -123,13 +125,34 @@ if (!$otherTextInfo) {
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printCSS('css/map.css') ?>
     <?= WebUtil::printStaticValues([
+        //deprecated, staticValues를 이용할 것
+        'serverName' => $serverName,
+        'serverCnt' => $serverCnt,
         'serverNick' => DB::prefix(),
         'serverID' => UniqueConst::$serverID,
         'maxTurn' => GameConst::$maxTurn,
         'maxPushTurn' => 12,
-        'commandList' => getCommandTable($generalObj),
         'serverNow' => TimeUtil::now(false),
-        'baseColor2' => GameConst::$basecolor2,
+        'lastExecuted' => $gameStor->turntime,
+        'isLocked' => $plock,
+        'isTournamentActive' => $isTournamentActive,
+        'isBettingActive' => $isBettingActive,
+        'staticValues' => [
+            'serverName' => $serverName,
+            'serverCnt' => $serverCnt,
+            'serverNick' => DB::prefix(),
+            'serverID' => UniqueConst::$serverID,
+            'maxTurn' => GameConst::$maxTurn,
+            'maxPushTurn' => 12,
+            'commandList' => getCommandTable($generalObj),
+            'serverNow' => TimeUtil::now(false),
+            'lastExecuted' => $gameStor->turntime,
+            'isLocked' => $plock,
+            'isTournamentActive' => $isTournamentActive,
+            'isBettingActive' => $isBettingActive,
+            'mapName' => GameConst::$mapName,
+            'unitSet' => GameConst::$unitSet,
+        ]
     ]) ?>
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
 </head>
@@ -149,14 +172,14 @@ if (!$otherTextInfo) {
                     <?= $scenario ?>
                 </div>
                 <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
-                    NPC수 : <?= $extend ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
-                    NPC상성 : <?= $fiction ?>
+                    NPC 수, 상성 : <?= $extend ?>,<?= $fiction ?>
                 </div>
                 <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
                     NPC선택 : <?= $npcmode ?>
                 </div>
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                    토너먼트 : <?= getTournamentTermText() ?>
+                </div>
                 <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
                     기타 설정: <?= $otherTextInfo ?>
                 </div>
@@ -165,19 +188,15 @@ if (!$otherTextInfo) {
                 <div class="s-border-t col py-2 col-4 col-md-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
                 <div class="s-border-t col py-2 col-4 col-md-2">턴당 갱신횟수 : <?= $gameStor->conlimit ?>회</div>
                 <div class="s-border-t col py-2 col-8 col-md-4"><?= info(3) ?></div>
-                <div class="s-border-t py-2 col col-6 col-md-4"><?php if ($gameStor->tournament == 0) : ?>
-                        <span style='color:magenta'>현재 토너먼트 경기 없음</span>
-                    <?php else : ?>
-                        ↑<span style='color:cyan'><?=
-                                                                    ([
-                                                                        '전력전', '통솔전', '일기토', '설전',
-                                                                    ])[$gameStor->tnmt_type] ?? '' ?> <?= getTournament($gameStor->tournament) ?> <?= getTournamentTime() ?></span>↑
-
-
-                    <?php endif; ?>
+                <div class="s-border-t py-2 col col-6 col-md-4">
+                  <?php if ($isTournamentActive) : ?>
+                    ↑<span style='color:cyan'><?=(['전력전', '통솔전', '일기토', '설전',])[$gameStor->tnmt_type] ?? '' ?> <?= getTournament($gameStor->tournament) ?> <?= getTournamentTime() ?></span>↑
+                  <?php else : ?>
+                    <span style='color:magenta'>현재 토너먼트 경기 없음</span>
+                  <?php endif; ?>
                 </div>
                 <div class="s-border-t py-2 col col-6 col-md-2">
-                    <div style="display:inline-block;"><?= !$plock ? ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
+                    <div style="display:inline-block;"><?= $plock ? ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
                 </div>
                 <div class="s-border-t py-2 col col-6 col-md-2">
                     <?php if ($auctionCount > 0) : ?>
@@ -237,7 +256,7 @@ if (!$otherTextInfo) {
                 </div>
             <?php endif; ?>
             <div id="map_view" class="gx-0">
-                <div id="mapZone" class="view-item"><?= getMapHtml($mapTheme) ?></div>
+                <div id="mapZone" class="view-item"><?= getMapHtml() ?></div>
                 <div class="view-item" id="reservedCommandZone">
                     <div id="reservedCommandList"></div>
                     <div id="actionMiniPlate" class="gx-0 row">
@@ -253,7 +272,7 @@ if (!$otherTextInfo) {
                 <div id="nation-position"><?php myNationInfo($generalObj); ?></div>
                 <div id="general-position"><?php generalInfo($generalObj); ?></div>
                 <div id="generalCommandButton" class="row gx-0">
-                    <div class="buttonPlate bg2"><?= commandButton(['btnClass' => 'btn btn-sammo-nation']) ?></div>
+                    <div class="buttonPlate bg2"><?= commandButton(['btnClass' => 'btn btn-sammo-nation', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?></div>
                 </div>
             </div>
         </div>
@@ -353,7 +372,7 @@ if (!$otherTextInfo) {
                             국가 메뉴
                         </div>
                         <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
-                            <?= commandButton(['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item']) ?>
+                            <?= commandButton(['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?>
                         </ul>
                     </li>
                     <li class="nav-item dropup">

hwe/j_diplomacy_rollback_letter.php

@@ -41,8 +41,6 @@ if ($permission < 4) {
     ]);
 }
 
-$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([
@@ -66,7 +64,7 @@ $unlimited = new \DateTime('9999-12-31');
 $aux['reason'] = [
     'who'=>$me['no'],
     'action'=>'cancelled',
-    'reason'=>$reason
+    'reason'=>'회수',
 ];
 $db->update('ng_diplomacy', [
     'state'=>'cancelled',

hwe/j_get_general_list.php

@@ -1,109 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-
-//로그인 검사
-$session = Session::requireLogin([]);
-$userID = Session::getUserID();
-
-$db = DB::db();
-$withToken = Util::getPost('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,owner_name as ownerName,injury,leadership,strength,intel,experience,dedication,officer_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,$ownerName,$injury,$leadership,$strength,$intel,$experience,$dedication,$officerLevel,$killturn,$connectCnt] = $rawGeneral;
-
-    if(key_exists($owner, $ownerNameList)){
-        $ownerName = $ownerNameList[$owner];
-    }
-
-    $nationArr = getNationStaticInfo($nation);
-    $lbonus = calcLeadershipBonus($officerLevel, $nationArr['level']);
-
-    $generalList[] = [
-        $no,
-        $picture,
-        $imgsvr,
-        $npc,
-        $age,
-        $nationArr['name'],
-        getGeneralSpecialDomesticName($special),
-        getGeneralSpecialWarName($special2),
-        getGenChar($personal),
-        $name,
-        $npc==1?$ownerName:null,
-        $injury,
-        $leadership,
-        $lbonus,
-        $strength,
-        $intel,
-        getExpLevel($experience),
-        getHonor($experience),
-        getDed($dedication),
-        getOfficerLevelText($officerLevel, $nationArr['level']),
-        $killturn,
-        $connectCnt
-    ];
-}
-
-$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_nation_general_list.php

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

hwe/j_map_recent.php

@@ -31,17 +31,12 @@ $now = time();
 if($mapInfo && ($now - $mapInfo['timestamp'] < 600)){
 	$mapEtag = $mapInfo['etag'];
 	$mapModified = $mapInfo['timestamp'];
-	
-    header("Last-Modified: ".gmdate("D, d M Y H:i:s", $mapModified)." GMT"); 
-    header("Etag: $mapEtag"); 
-
-    if (
-		strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']??'2000-01-01') === $mapModified || 
-		trim($_SERVER['HTTP_IF_NONE_MATCH']??'') === $mapEtag
-	) { 
-        header("HTTP/1.1 304 Not Modified"); 
-		die();
-	}
+    WebUtil::setCacheHeader(new APICacheResult(TimeUtil::secondsToDateTime($mapModified), $mapEtag));
+    $reqMapEtag = WebUtil::parseETag();
+    $reqModifiedSince = WebUtil::parseLastModified();
+    if($mapEtag === $reqMapEtag || $mapModified === $reqModifiedSince){
+        WebUtil::dieWithNotModified();
+    }
 
 	Json::die($mapInfo['data'], 0);
 }
@@ -65,10 +60,9 @@ $rawMap = getWorldMap([
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$mapTheme = $gameStor->map_theme ?? 'che';
 
 $rawMap['history'] = $history;
-$rawMap['theme'] = $mapTheme;
+$rawMap['theme'] = GameConst::$mapName;
 
 $etag = hash('sha256', $serverID.$now);
 $map = [
@@ -77,7 +71,6 @@ $map = [
 	'data'=>$rawMap,
 ];
 $cache->save("recent_map", $map);
-header("Last-Modified: ".gmdate("D, d M Y H:i:s", $now)." GMT"); 
-header("Etag: $etag"); 
+WebUtil::setCacheHeader(new APICacheResult(TimeUtil::secondsToDateTime($now), $etag));
 
 Json::die($map['data'], 0);

hwe/j_myBossInfo.php

@@ -241,7 +241,7 @@ function do추방(General $general, int $myOfficerLevel):?string{
     }
     $general->setVar('troop', 0);
 
-    if($general->getNPCType() >= 2 && ($env['scenario'] < 100 || Util::randBool(0.01))) {
+    if($general->getNPCType() >= 2 && Util::randBool(GameConst::$npcBanMessageProb)) {
 
         $str = Util::choiceRandom([
             '날 버리다니... 곧 전장에서 복수해주겠다...',

hwe/process_war.php

@@ -1,28 +1,29 @@
 <?php
+
 namespace sammo;
 
 
-function processWar(General $attackerGeneral, array $rawAttackerNation, array $rawDefenderCity){
+function processWar(General $attackerGeneral, array $rawAttackerNation, array $rawDefenderCity)
+{
 
     $db = DB::db();
 
     $attackerNationID = $attackerGeneral->getNationID();
     $defenderNationID = $rawDefenderCity['nation'];
 
-    if($defenderNationID == 0){
+    if ($defenderNationID == 0) {
         $rawDefenderNation =  [
-            'nation'=>0,
-            'name'=>'재야',
-            'capital'=>0,
-            'level'=>0,
-            'gold'=>0,
-            'rice'=>10000,
-            'type'=>GameConst::$neutralNationType,
-            'tech'=>0,
-            'gennum'=>1
+            'nation' => 0,
+            'name' => '재야',
+            'capital' => 0,
+            'level' => 0,
+            'gold' => 0,
+            'rice' => 10000,
+            'type' => GameConst::$neutralNationType,
+            'tech' => 0,
+            'gennum' => 1
         ];
-    }
-    else{
+    } else {
         $rawDefenderNation = $db->queryFirstRow('SELECT nation,`level`,`name`,capital,gennum,tech,`type`,gold,rice FROM nation WHERE nation = %i', $defenderNationID);
     }
 
@@ -36,29 +37,29 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
     $defenderIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0 and crew > 0 and rice>(crew/100) and train>=defence_train and atmos>=defence_train', $city->getVar('nation'), $city->getVar('city'));
     $defenderList = General::createGeneralObjListFromDB($defenderIDList, null, 2);
 
-    usort($defenderList, function(General $lhs, General $rhs){
-        return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
+    usort($defenderList, function (General $lhs, General $rhs) {
+        return - (extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
     });
 
     $iterDefender = new \ArrayIterator($defenderList);
     $iterDefender->rewind();
 
-    $getNextDefender = function(?WarUnit $prevDefender, bool $reqNext) use ($iterDefender, $rawDefenderNation, $rawDefenderCity, $db) {
-        if($prevDefender !== null){
+    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext) use ($iterDefender, $rawDefenderNation, $rawDefenderCity, $db) {
+        if ($prevDefender !== null) {
             $prevDefender->applyDB($db);
         }
 
-        if(!$reqNext){
+        if (!$reqNext) {
             return null;
         }
 
-        if(!$iterDefender->valid()){
+        if (!$iterDefender->valid()) {
             return null;
         }
 
         $nextDefender = $iterDefender->current();
         $nextDefender->setRawCity($rawDefenderCity);
-        if(extractBattleOrder($nextDefender) <= 0){
+        if (extractBattleOrder($nextDefender) <= 0) {
             return null;
         }
 
@@ -82,8 +83,8 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
     $updateAttackerNation = [];
     $updateDefenderNation = [];
 
-    if($city->getVar('supply')){
-        if($city->getPhase() > 0){
+    if ($city->getVar('supply')) {
+        if ($city->getPhase() > 0) {
             $rice = $city->getKilled() / 100 * 0.8;
             $rice *= $city->getCrewType()->rice;
             $rice *= getTechCost($rawDefenderNation['tech']);
@@ -91,12 +92,10 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
             Util::setRound($rice);
 
             $updateDefenderNation['rice'] = max(0, $rawDefenderNation['rice'] - $rice);
-        }
-        else if($conquerCity){
-            if($rawDefenderNation['capital'] == $rawDefenderCity['city']){
+        } else if ($conquerCity) {
+            if ($rawDefenderNation['capital'] == $rawDefenderCity['city']) {
                 $updateDefenderNation['rice'] = $rawDefenderNation['rice'] + 1000;
-            }
-            else{
+            } else {
                 $updateDefenderNation['rice'] = $rawDefenderNation['rice'] + 500;
             }
         }
@@ -120,29 +119,29 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
     $attackerGenCnt_eff = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc != 5', $rawAttackerNation['nation']);
     $defenderGenCnt_eff = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc != 5', $rawDefenderNation['nation']);
 
-    if($attackerGenCnt_eff < GameConst::$initialNationGenLimit){
+    if ($attackerGenCnt_eff < GameConst::$initialNationGenLimit) {
         $attackerGenCnt = GameConst::$initialNationGenLimit;
         $attackerGenCnt_eff = GameConst::$initialNationGenLimit;
     }
 
-    if($defenderGenCnt_eff < GameConst::$initialNationGenLimit){
+    if ($defenderGenCnt_eff < GameConst::$initialNationGenLimit) {
         $defenderGenCnt = GameConst::$initialNationGenLimit;
         $defenderGenCnt_eff = GameConst::$initialNationGenLimit;
     }
 
-    if($attackerGenCnt != $attackerGenCnt_eff){
+    if ($attackerGenCnt != $attackerGenCnt_eff) {
         $attackerIncTech *= $attackerGenCnt / $attackerGenCnt_eff;
     }
 
-    if($defenderGenCnt != $defenderGenCnt_eff){
+    if ($defenderGenCnt != $defenderGenCnt_eff) {
         $defenderIncTech *= $defenderGenCnt / $defenderGenCnt_eff;
     }
 
 
-    if(TechLimit($startYear, $year, $rawAttackerNation['tech'])){
+    if (TechLimit($startYear, $year, $rawAttackerNation['tech'])) {
         $attackerIncTech /= 4;
     }
-    if(TechLimit($startYear, $year, $rawDefenderNation['tech'])){
+    if (TechLimit($startYear, $year, $rawDefenderNation['tech'])) {
         $defenderIncTech /= 4;
     }
 
@@ -159,41 +158,42 @@ function processWar(General $attackerGeneral, array $rawAttackerNation, array $r
     $db->update('nation', $updateDefenderNation, 'nation=%i', $defenderNationID);
 
     $db->update('diplomacy', [
-        'dead'=>$db->sqleval('dead + %i', $attacker->getDead())
+        'dead' => $db->sqleval('dead + %i', $attacker->getDead())
     ], 'me = %i and you = %i', $attackerNationID, $defenderNationID);
 
     $db->update('diplomacy', [
-        'dead'=>$db->sqleval('dead + %i', $attacker->getKilled())
+        'dead' => $db->sqleval('dead + %i', $attacker->getKilled())
     ], 'me = %i and you = %i', $defenderNationID, $attackerNationID);
 
-    if(!$conquerCity){
+    if (!$conquerCity) {
         return;
     }
 
     ConquerCity([
-        'startyear'=>$startYear,
-        'year'=>$year,
-        'month'=>$month,
-        'city_rate'=>$cityRate,
-        'join_mode'=>$joinMode,
+        'startyear' => $startYear,
+        'year' => $year,
+        'month' => $month,
+        'city_rate' => $cityRate,
+        'join_mode' => $joinMode,
     ], $attacker->getGeneral(), $city->getRaw());
 }
 
-function extractBattleOrder(General $general){
-    if($general->getVar('crew') == 0){
+function extractBattleOrder(General $general)
+{
+    if ($general->getVar('crew') == 0) {
         return 0;
     }
 
-    if($general->getVar('rice') <= $general->getVar('crew') / 100){
+    if ($general->getVar('rice') <= $general->getVar('crew') / 100) {
         return 0;
     }
 
     $defence_train = $general->getVar('defence_train');
-    if($general->getVar('train') < $defence_train){
+    if ($general->getVar('train') < $defence_train) {
         return 0;
     }
 
-    if($general->getVar('atmos') < $defence_train){
+    if ($general->getVar('atmos') < $defence_train) {
         return 0;
     }
 
@@ -210,8 +210,8 @@ function processWar_NG(
     callable $getNextDefender,
     WarUnitCity $city,
     int $relYear
-):bool{
-    $templates = new \League\Plates\Engine(__DIR__.'/templates');
+): bool {
+    $templates = new \League\Plates\Engine(__DIR__ . '/templates');
 
     $logger = $attacker->getLogger();
 
@@ -231,11 +231,14 @@ function processWar_NG(
     $logger->pushGlobalActionLog("<D><b>{$attacker->getNationVar('name')}</b></>의 <Y>{$attacker->getName()}</>{$josaYi} <G><b>{$city->getName()}</b></>{$josaRo} 진격합니다.");
     $logger->pushGeneralActionLog("<G><b>{$city->getName()}</b></>{$josaRo} <M>진격</>합니다. <1>$date</>");
 
-    for($currPhase = 0; $currPhase < $attacker->getMaxPhase(); $currPhase+=1){
-        if($defender === null){
+    $logWritten = false;
+
+    while($attacker->getPhase() < $attacker->getMaxPhase()){
+        $logWritten = false;
+        if ($defender === null) {
             $defender = $city;
 
-            if($city->getNationVar('rice') <= 0 && $city->getVar('supply')){
+            if ($city->getNationVar('rice') <= 0 && $city->getVar('supply')) {
                 //병량 패퇴
                 $attacker->setOppose($defender);
                 $defender->setOppose($attacker);
@@ -256,8 +259,8 @@ function processWar_NG(
             }
         }
 
-        if($defender->getPhase() == 0){
-            $defender->setPrePhase($currPhase);
+        if ($defender->getPhase() == 0 && $defender->getOppose() == null) {
+            $defender->setPrePhase($attacker->getPhase());
 
             $attacker->addTrain(1);
             $defender->addTrain(1);
@@ -276,7 +279,7 @@ function processWar_NG(
             $attackerName = $attacker->getName();
             $attackerCrewTypeName = $attacker->getCrewTypeName();
 
-            if($defender instanceof WarUnitGeneral){
+            if ($defender instanceof WarUnitGeneral) {
                 $defenderName = $defender->getName();
                 $defenderCrewTypeName = $defender->getCrewTypeName();
 
@@ -291,8 +294,7 @@ function processWar_NG(
                 $josaRo = JosaUtil::pick($defenderCrewTypeName, '로');
                 $josaUl = JosaUtil::pick($attackerCrewTypeName, '을');
                 $defender->getLogger()->pushGeneralActionLog("{$defenderCrewTypeName}{$josaRo} <Y>{$attackerName}</>의 {$attackerCrewTypeName}{$josaUl} <M>수비</>합니다.");
-            }
-            else{
+            } else {
                 $josaYi = JosaUtil::pick($attackerName, '이');
                 $josaRo = JosaUtil::pick($attackerCrewTypeName, '로');
                 $logger->pushGlobalActionLog("<Y>{$attackerName}</>{$josaYi} {$attackerCrewTypeName}{$josaRo} 성벽을 공격합니다.");
@@ -324,16 +326,15 @@ function processWar_NG(
         $attackerHP = $attacker->getHP();
         $defenderHP = $defender->getHP();
 
-        if($deadAttacker > $attackerHP || $deadDefender > $defenderHP){
+        if ($deadAttacker > $attackerHP || $deadDefender > $defenderHP) {
             $deadAttackerRatio = $deadAttacker / max(1, $attackerHP);
             $deadDefenderRatio = $deadDefender / max(1, $defenderHP);
 
-            if($deadDefenderRatio > $deadAttackerRatio){
+            if ($deadDefenderRatio > $deadAttackerRatio) {
                 //수비자가 더 병력 부족
                 $deadAttacker /= $deadDefenderRatio;
                 $deadDefender = $defenderHP;
-            }
-            else{
+            } else {
                 //공격자가 더 병력 부족
                 $deadDefender /= $deadAttackerRatio;
                 $deadAttacker = $attackerHP;
@@ -349,15 +350,22 @@ function processWar_NG(
         $attacker->increaseKilled($deadDefender);
         $defender->increaseKilled($deadAttacker);
 
-        $phaseNickname = $currPhase + 1;
+        if($defender->getPhase() < 0){
+            $phaseNickname = '先';
+        }
+        else{
+            $currPhase = $attacker->getPhase() + 1;
+            $phaseNickname = "{$currPhase} ";
+        }
 
-        if($deadAttacker > 0 || $deadDefender > 0){
+
+        if ($deadAttacker > 0 || $deadDefender > 0) {
             $attacker->getLogger()->pushGeneralBattleDetailLog(
-                "$phaseNickname : <Y1>【{$attacker->getName()}】</> <C>{$attacker->getHP()} (-$deadAttacker)</> VS <C>{$defender->getHP()} (-$deadDefender)</> <Y1>【{$defender->getName()}】</>"
+                "$phaseNickname: <Y1>【{$attacker->getName()}】</> <C>{$attacker->getHP()} (-$deadAttacker)</> VS <C>{$defender->getHP()} (-$deadDefender)</> <Y1>【{$defender->getName()}】</>"
             );
 
             $defender->getLogger()->pushGeneralBattleDetailLog(
-                "$phaseNickname : <Y1>【{$defender->getName()}】</> <C>{$defender->getHP()} (-$deadDefender)</> VS <C>{$attacker->getHP()} (-$deadAttacker)</> <Y1>【{$attacker->getName()}】</>"
+                "$phaseNickname: <Y1>【{$defender->getName()}】</> <C>{$defender->getHP()} (-$deadDefender)</> VS <C>{$attacker->getHP()} (-$deadAttacker)</> <Y1>【{$attacker->getName()}】</>"
             );
         }
 
@@ -365,7 +373,9 @@ function processWar_NG(
         $attacker->addPhase();
         $defender->addPhase();
 
-        if(!$attacker->continueWar($noRice)){
+        if (!$attacker->continueWar($noRice)) {
+            $logWritten = true;
+
             $attacker->logBattleResult();
             $defender->logBattleResult();
 
@@ -377,10 +387,9 @@ function processWar_NG(
 
             $josaYi = JosaUtil::pick($attacker->getCrewTypeName(), '이');
             $logger->pushGlobalActionLog("<Y>{$attacker->getName()}</>의 {$attacker->getCrewTypeName()}{$josaYi} 퇴각했습니다.");
-            if($noRice){
+            if ($noRice) {
                 $attacker->getLogger()->pushGeneralActionLog("군량 부족으로 퇴각합니다.", ActionLogger::PLAIN);
-            }
-            else{
+            } else {
                 $attacker->getLogger()->pushGeneralActionLog("퇴각했습니다.", ActionLogger::PLAIN);
             }
             $defender->getLogger()->pushGeneralActionLog("<Y>{$attacker->getName()}</>의 {$attacker->getCrewTypeName()}{$josaYi} 퇴각했습니다.", ActionLogger::PLAIN);
@@ -388,7 +397,8 @@ function processWar_NG(
             break;
         }
 
-        if(!$defender->continueWar($noRice)){
+        if (!$defender->continueWar($noRice)) {
+            $logWritten = true;
 
             $attacker->logBattleResult();
             $defender->logBattleResult();
@@ -399,7 +409,7 @@ function processWar_NG(
             $attacker->tryWound();
             $defender->tryWound();
 
-            if($defender === $city){
+            if ($defender === $city) {
                 $attacker->addLevelExp(1000);
                 $conquerCity = true;
                 break;
@@ -407,33 +417,30 @@ function processWar_NG(
 
             $josaYi = JosaUtil::pick($defender->getCrewTypeName(), '이');
 
-            if($noRice){
+            if ($noRice) {
                 $logger->pushGlobalActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.");
-            $attacker->getLogger()->pushGeneralActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.", ActionLogger::PLAIN);
+                $attacker->getLogger()->pushGeneralActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.", ActionLogger::PLAIN);
                 $defender->getLogger()->pushGeneralActionLog("군량 부족으로 패퇴합니다.", ActionLogger::PLAIN);
-            }
-            else{
+            } else {
                 $logger->pushGlobalActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 전멸했습니다.");
-            $attacker->getLogger()->pushGeneralActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 전멸했습니다.", ActionLogger::PLAIN);
+                $attacker->getLogger()->pushGeneralActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 전멸했습니다.", ActionLogger::PLAIN);
                 $defender->getLogger()->pushGeneralActionLog("전멸했습니다.", ActionLogger::PLAIN);
             }
 
-            if($currPhase + 1 == $attacker->getMaxPhase()){
+            if ($attacker->getPhase() >= $attacker->getMaxPhase()) {
                 break;
             }
 
             $defender->finishBattle();
             $defender = ($getNextDefender)($defender, true);
 
-            if($defender !== null && !($defender instanceof WarUnitGeneral)){
+            if ($defender !== null && !($defender instanceof WarUnitGeneral)) {
                 throw new \RuntimeException('다음 수비자를 받아오는데 실패');
             }
-
         }
-
     }
 
-    if($currPhase == $attacker->getMaxPhase()){
+    if (!$logWritten) {
         //마지막 페이즈의 전투 마무리
         $attacker->logBattleResult();
         $defender->logBattleResult();
@@ -445,9 +452,9 @@ function processWar_NG(
     $attacker->finishBattle();
     $defender->finishBattle();
 
-    if($defender instanceof WarUnitCity){
+    if ($defender instanceof WarUnitCity) {
         $newConflict = $defender->addConflict();
-        if($newConflict){
+        if ($newConflict) {
             $nationName = $attacker->getNationVar('name');
             $josaYi = JosaUtil::pick($nationName, '이');
             $logger->pushGlobalHistoryLog("<M><b>【분쟁】</b></><D><b>{$nationName}</b></>{$josaYi} <G><b>{$defender->getName()}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다.");
@@ -459,33 +466,36 @@ function processWar_NG(
     return $conquerCity;
 }
 
-function DeleteConflict($nation) {
+function DeleteConflict($nation)
+{
     $db = DB::db();
 
-    foreach($db->queryAllLists('SELECT city, conflict FROM city WHERE conflict!=%s', '{}') as list($cityID, $rawConflict)){
+    foreach ($db->queryAllLists('SELECT city, conflict FROM city WHERE conflict!=%s', '{}') as list($cityID, $rawConflict)) {
         $conflict = Json::decode($rawConflict);
 
-        if(!$conflict || !is_array($conflict)){
+        if (!$conflict || !is_array($conflict)) {
             continue;
         }
-        if(!key_exists($nation, $conflict)){
+        if (!key_exists($nation, $conflict)) {
             continue;
         }
 
         unset($conflict[$nation]);
 
         $db->update('city', [
-            'conflict'=>Json::encode($conflict)
+            'conflict' => Json::encode($conflict)
         ], 'city=%i', $cityID);
     }
 }
 
-function getConquerNation($city) : int {
+function getConquerNation($city): int
+{
     $conflict = Json::decode($city['conflict']);
     return Util::array_first_key($conflict);
 }
 
-function ConquerCity(array $admin, General $general, array $city) {
+function ConquerCity(array $admin, General $general, array $city)
+{
     $db = DB::db();
 
     $year = $admin['year'];
@@ -506,7 +516,7 @@ function ConquerCity(array $admin, General $general, array $city) {
 
     $defenderNationLogger = new ActionLogger(0, $defenderNationID, $year, $month);
 
-    if($defenderNationID) {
+    if ($defenderNationID) {
         $defenderNationDecoration = "<D><b>{$defenderNationName}</b></>의";
     } else {
         $defenderNationDecoration = "공백지인";
@@ -524,8 +534,29 @@ function ConquerCity(array $admin, General $general, array $city) {
 
     $defenderNationLogger->pushNationalHistoryLog("<D><b>{$attackerNationName}</b></>의 <Y>{$attackerGeneralName}</>에 의해 <G><b>{$cityName}</b></>{$josaYiCity} <O>함락</>");
 
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+
+    // 이벤트 핸들러 동작
+    $e_env = null;
+    foreach (DB::db()->query('SELECT * FROM event WHERE target = "OCCUPY_CITY" ORDER BY `priority` DESC, `id` ASC') as $rawEvent) {
+        if ($e_env === null) {
+            $e_env = $gameStor->getAll(false);
+        }
+        $eventID = $rawEvent['id'];
+        $cond = Json::decode($rawEvent['condition']);
+        $action = Json::decode($rawEvent['action']);
+        $event = new Event\EventHandler($cond, $action);
+        $e_env['currentEventID'] = $eventID;
+
+        $event->tryRunEvent($e_env);
+    }
+
+    if ($e_env !== null) {
+        $gameStor->resetCache();
+    }
+
     // 국가 멸망시
-    if($defenderNationID && $db->queryFirstField('SELECT count(city) FROM city WHERE nation = %i', $defenderNationID) === 1) {
+    if ($defenderNationID && $db->queryFirstField('SELECT count(city) FROM city WHERE nation = %i', $defenderNationID) === 1) {
         $defenderNationLogger->flush();
         unset($defenderNationLogger);
 
@@ -545,17 +576,17 @@ function ConquerCity(array $admin, General $general, array $city) {
 
         $loseGeneralGold = 0;
         $loseGeneralRice = 0;
-        foreach($oldNationGenerals as $oldGeneral){
-            $loseGold = intdiv($oldGeneral->getVar('gold') * (rand()%30+20), 100);
-            $loseRice = intdiv($oldGeneral->getVar('rice') * (rand()%30+20), 100);
+        foreach ($oldNationGenerals as $oldGeneral) {
+            $loseGold = intdiv($oldGeneral->getVar('gold') * (rand() % 30 + 20), 100);
+            $loseRice = intdiv($oldGeneral->getVar('rice') * (rand() % 30 + 20), 100);
             $oldGeneral->getLogger()->pushGeneralActionLog(
                 "도주하며 금<C>$loseGold</> 쌀<C>$loseRice</>을 분실했습니다.",
                 ActionLogger::PLAIN
             );
             $oldGeneral->increaseVar('gold', -$loseGold);
             $oldGeneral->increaseVar('rice', -$loseRice);
-            $oldGeneral->addExperience(-$oldGeneral->getVar('experience')*0.1, false);
-            $oldGeneral->addDedication(-$oldGeneral->getVar('dedication')*0.5, false);
+            $oldGeneral->addExperience(-$oldGeneral->getVar('experience') * 0.1, false);
+            $oldGeneral->addDedication(-$oldGeneral->getVar('dedication') * 0.5, false);
 
             $loseGeneralGold += $loseGold;
             $loseGeneralRice += $loseRice;
@@ -563,21 +594,21 @@ function ConquerCity(array $admin, General $general, array $city) {
             $oldGeneral->applyDB($db);
 
             //모두 등용장 발부
-            if($admin['join_mode'] != 'onlyRandom' && Util::randBool(0.5)) {
+            if ($admin['join_mode'] != 'onlyRandom' && Util::randBool(0.5)) {
                 $msg = ScoutMessage::buildScoutMessage($attackerID, $oldGeneral->getID());
-                if($msg){
+                if ($msg) {
                     $msg->send(true);
                 }
             }
 
             //NPC인 경우 일정 확률로 임관(엔장, 인재, 의병)
             $npcType = $oldGeneral->getNPCType();
-            if($admin['join_mode'] != 'onlyRandom' && 2 <= $npcType && $npcType <= 8 && $npcType != 5 && Util::randBool(GameConst::$joinRuinedNPCProp)) {
+            if ($admin['join_mode'] != 'onlyRandom' && 2 <= $npcType && $npcType <= 8 && $npcType != 5 && Util::randBool(GameConst::$joinRuinedNPCProp)) {
                 $cmd = buildGeneralCommandClass('che_임관', $oldGeneral, $admin, [
-                    'destNationID'=>$attackerNationID
+                    'destNationID' => $attackerNationID
                 ]);
                 $joinTurn = Util::randRangeInt(0, 12);
-                if($joinTurn){
+                if ($joinTurn) {
                     _setGeneralCommand(buildGeneralCommandClass('che_견문', $oldGeneral, $admin), iterator_to_array(Util::range($joinTurn)));
                 }
                 _setGeneralCommand($cmd, [$joinTurn]);
@@ -596,37 +627,56 @@ function ConquerCity(array $admin, General $general, array $city) {
 
         // 기본량 제외 금쌀50% + 장수들 분실 금쌀50% 흡수
         $db->update('nation', [
-            'gold'=>$db->sqleval('gold + %i', $loseNationGold),
-            'rice'=>$db->sqleval('rice + %i', $loseNationRice),
+            'gold' => $db->sqleval('gold + %i', $loseNationGold),
+            'rice' => $db->sqleval('rice + %i', $loseNationRice),
         ], 'nation=%i', $attackerNationID);
 
         //아국 수뇌부에게 로그 전달
         $loseNationGoldText = number_format($loseNationGold);
         $loseNationRiceText = number_format($loseNationRice);
         $resourceLog = "<D><b>{$defenderNationName}</b></> 정복으로 금<C>{$loseNationGoldText}</> 쌀<C>{$loseNationRiceText}</>을 획득했습니다.";
-        foreach($db->queryFirstColumn(
-            'SELECT no FROM general WHERE nation=%i AND officer_level>=5', $attackerNationID
-            ) as $attackerChiefID
-        ){
-            if($attackerChiefID == $attackerID){
+        foreach ($db->queryFirstColumn(
+            'SELECT no FROM general WHERE nation=%i AND officer_level>=5',
+            $attackerNationID
+        ) as $attackerChiefID) {
+            if ($attackerChiefID == $attackerID) {
                 $attackerLogger->pushGeneralActionLog($resourceLog, ActionLogger::PLAIN);
-            }
-            else{
+            } else {
                 $chiefLogger = new ActionLogger($attackerChiefID, $attackerNationID, $year, $month);
                 $chiefLogger->pushGeneralActionLog($resourceLog, ActionLogger::PLAIN);
                 $chiefLogger->flush();
             }
         }
-    // 멸망이 아니면
+
+        // 이벤트 핸들러 동작
+        $e_env = null;
+        foreach (DB::db()->query('SELECT * FROM event WHERE target = "DESTROY_NATION" ORDER BY `priority` DESC, `id` ASC') as $rawEvent) {
+            if ($e_env === null) {
+                $e_env = $gameStor->getAll(false);
+            }
+            $eventID = $rawEvent['id'];
+            $cond = Json::decode($rawEvent['condition']);
+            $action = Json::decode($rawEvent['action']);
+            $event = new Event\EventHandler($cond, $action);
+            $e_env['currentEventID'] = $eventID;
+
+            $event->tryRunEvent($e_env);
+        }
+
+        if ($e_env !== null) {
+            $gameStor->resetCache();
+        }
+
+        // 멸망이 아니면
     } else {
         // 태수,군사,종사은 일반으로...
-        $db->update('general',[
-            'officer_level'=>1,
-            'officer_city'=>0,
-        ], 'officer_city = %i',$cityID);
+        $db->update('general', [
+            'officer_level' => 1,
+            'officer_city' => 0,
+        ], 'officer_city = %i', $cityID);
 
         //수도였으면 긴급 천도
-        if($defenderNationID && $defenderStaticNation['capital'] == $cityID) {
+        if ($defenderNationID && $defenderStaticNation['capital'] == $cityID) {
             $minCity = findNextCapital($cityID, $defenderNationID);
 
             $minCityName = CityConst::byID($minCity)->name;
@@ -636,10 +686,10 @@ function ConquerCity(array $admin, General $general, array $city) {
 
             $moveLog = "수도가 함락되어 <G><b>$minCityName</b></>으로 <M>긴급천도</>합니다.";
             //아국 수뇌부에게 로그 전달
-            foreach($db->queryFirstColumn(
-                'SELECT no FROM general WHERE nation=%i AND officer_level>=5', $defenderNationID
-                ) as $defenderChiefID
-            ){
+            foreach ($db->queryFirstColumn(
+                'SELECT no FROM general WHERE nation=%i AND officer_level>=5',
+                $defenderNationID
+            ) as $defenderChiefID) {
                 $chiefLogger = new ActionLogger($defenderChiefID, $defenderNationID, $year, $month);
                 $chiefLogger->pushGeneralActionLog($moveLog, ActionLogger::PLAIN);
                 $chiefLogger->flush();
@@ -647,22 +697,22 @@ function ConquerCity(array $admin, General $general, array $city) {
 
             //천도
             $db->update('nation', [
-                'capital'=>$minCity,
-                'gold'=>$db->sqleval('gold * 0.5'),
-                'rice'=>$db->sqleval('rice * 0.5'),
+                'capital' => $minCity,
+                'gold' => $db->sqleval('gold * 0.5'),
+                'rice' => $db->sqleval('rice * 0.5'),
             ], 'nation=%i', $defenderNationID);
             //보급도시로 만듬
             $db->update('city', [
-                'supply'=>1
+                'supply' => 1
             ], 'city=%i', $minCity);
             //수뇌부 이동
             $db->update('general', [
-                'city'=>$minCity
-            ], 'nation=%i AND officer_level>=5',$defenderNationID);
+                'city' => $minCity
+            ], 'nation=%i AND officer_level>=5', $defenderNationID);
             //장수 사기 감소
             $db->update('general', [
-                'atmos'=>$db->sqleval('atmos*0.8')
-            ], 'nation=%i',$defenderNationID);
+                'atmos' => $db->sqleval('atmos*0.8')
+            ], 'nation=%i', $defenderNationID);
 
             refreshNationStaticInfo();
         }
@@ -673,10 +723,9 @@ function ConquerCity(array $admin, General $general, array $city) {
     if ($conquerNation == $attackerNationID) {
         // 이동
         $db->update('general', [
-            'city'=>$cityID
+            'city' => $cityID
         ], 'no=%i', $attackerID);
-    }
-    else{
+    } else {
         $conquerNationName = getNationStaticInfo($conquerNation)['name'];
         $conquerNationLogger = new ActionLogger(0, $conquerNation, $year, $month);
 
@@ -690,16 +739,16 @@ function ConquerCity(array $admin, General $general, array $city) {
     }
 
     $query = [
-        'supply'=>1,
-        'term'=>0,
-        'conflict'=>'{}',
-        'agri'=>$db->sqleval('agri*0.7'),
-        'comm'=>$db->sqleval('comm*0.7'),
-        'secu'=>$db->sqleval('secu*0.7'),
-        'nation'=>$conquerNation,
-        'officer_set'=>0,
+        'supply' => 1,
+        'term' => 0,
+        'conflict' => '{}',
+        'agri' => $db->sqleval('agri*0.7'),
+        'comm' => $db->sqleval('comm*0.7'),
+        'secu' => $db->sqleval('secu*0.7'),
+        'nation' => $conquerNation,
+        'officer_set' => 0,
     ];
-    if($city['level'] > 3) {
+    if ($city['level'] > 3) {
         $query['def'] = 1000;
         $query['wall'] = 1000;
     } else {
@@ -717,45 +766,44 @@ function ConquerCity(array $admin, General $general, array $city) {
 
     $nearNationsID[] = $conquerNation;
     $nearNationsID = array_unique($nearNationsID);
-    foreach($nearNationsID as $nationNationID){
+    foreach ($nearNationsID as $nationNationID) {
         SetNationFront($nationNationID);
     }
 }
 
-function findNextCapital(int $capitalID, int $nationID):int{
+function findNextCapital(int $capitalID, int $nationID): int
+{
     $distList = searchDistance($capitalID, 99, true);
 
     $cities = [];
-    foreach(
-        DB::db()->query(
+    foreach (DB::db()->query(
             'SELECT city, pop FROM city WHERE nation=%i and city!=%i',
             $nationID,
             $capitalID
-        ) as $row
-    ){
+        ) as $row) {
         $cities[$row['city']] = $row['pop'];
     };
 
-    foreach($distList as $dist=>$distSubList){
+    foreach ($distList as $dist => $distSubList) {
         $maxCityPop = 0;
         $minCity = 0;
 
-        foreach($distSubList as $cityID){
-            if(!key_exists($cityID, $cities)){
+        foreach ($distSubList as $cityID) {
+            if (!key_exists($cityID, $cities)) {
                 continue;
             }
             $cityPop = $cities[$cityID];
 
-            if($cityPop < $maxCityPop){
+            if ($cityPop < $maxCityPop) {
                 continue;
             }
             $minCity = $cityID;
             $maxCityPop = $cityPop;
         }
 
-        if($minCity){
+        if ($minCity) {
             return $minCity;
         }
     }
     throw new \RuntimeException('도시가 남지 않았는데 긴천을 시도하고 있습니다');
-}
+}

hwe/recent_map.php

@@ -16,8 +16,10 @@ include "func.php";
     <title>최근 지도</title>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
     <?= WebUtil::printStaticValues([
-        'serverNick' => DB::prefix(),
-        'serverID' => UniqueConst::$serverID
+        'staticValues' => [
+            'serverNick' => DB::prefix(),
+            'serverID' => UniqueConst::$serverID
+        ],
     ]) ?>
     <?= WebUtil::printJS('d_shared/base_map.js') ?>
 

hwe/sammo/API/Betting/Bet.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace sammo\API\Betting;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\Betting;
+use sammo\DB;
+use sammo\DTO\BettingItem;
+use sammo\Validator;
+use sammo\GameConst;
+use sammo\KVStorage;
+use sammo\UserLogger;
+use sammo\Util;
+
+class Bet extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'bettingID',
+            'bettingType',
+            'amount'
+        ])
+            ->rule('integer', 'bettingID')
+            ->rule('integerArray', 'bettingType')
+            ->rule('integer', 'amount')
+            ->rule('min', 'amount', 1);
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        /** @var int */
+        $bettingID = $this->args['bettingID'];
+        /** @var int[] */
+        $bettingType = $this->args['bettingType'];
+        /** @var int */
+        $amount = $this->args['amount'];
+
+        $bettingHelper = new Betting($bettingID);
+        try{
+            $bettingHelper->bet($session->generalID, $session->userID, $bettingType, $amount);
+        }
+        catch(\Throwable $e){
+            return $e->getMessage();
+        }
+
+        return [
+            'result' => true
+        ];
+    }
+}

hwe/sammo/API/Betting/GetBettingDetail.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace sammo\API\Betting;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\DTO\BettingInfo;
+use sammo\General;
+use sammo\KVStorage;
+use sammo\Util;
+use sammo\Validator;
+
+use function sammo\increaseRefresh;
+
+class GetBettingDetail extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'betting_id',
+        ])
+            ->rule('integer', 'betting_id');
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        $db = DB::db();
+
+        /** @var int */
+        $bettingID = $this->args['betting_id'];
+
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $bettingStor = KVStorage::getStorage($db, 'betting');
+        $rawBettingInfo = $bettingStor->getValue("id_{$bettingID}");
+        if($rawBettingInfo === null){
+            return '해당 베팅이 없습니다';
+        }
+
+        try{
+            $bettingInfo = new BettingInfo($rawBettingInfo);
+        }
+        catch(\Error $e){
+            return $e->getMessage();
+        }
+
+        [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
+
+        $bettingDetail = [];
+
+        foreach ($db->queryAllLists(
+            'SELECT betting_type, sum(amount) as sum_amount FROM ng_betting WHERE betting_id = %i GROUP BY betting_type',
+            $bettingID
+        ) as [$bettingType, $amount]) {
+            $bettingDetail[] = [$bettingType, Util::toInt($amount)];
+        }
+
+        [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
+
+        $myBetting = [];
+        foreach($db->queryAllLists(
+            'SELECT betting_type, sum(amount) as sum_amount FROM ng_betting WHERE betting_id = %i AND user_id = %i GROUP BY betting_type',
+            $bettingID, $session->userID
+        ) as [$bettingType, $amount]){
+            $myBetting[] = [$bettingType, Util::toInt($amount)];
+        }
+
+        if($bettingInfo->reqInheritancePoint){
+            $inheritStor = KVStorage::getStorage($db, "inheritance_{$session->userID}");
+            $remainPoint = ($inheritStor->getValue('previous') ?? [0,0])[0];
+        }
+        else{
+            $remainPoint = $db->queryFirstField('SELECT gold FROM general WHERE no = %i', $session->generalID)??0;
+        }
+
+        return [
+            'result' => true,
+            'bettingInfo' => $rawBettingInfo,
+            'bettingDetail' => $bettingDetail,
+            'myBetting' => $myBetting,
+            'remainPoint' => $remainPoint,
+            'year' => $year,
+            'month' => $month,
+        ];
+    }
+}

hwe/sammo/API/Betting/GetBettingList.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace sammo\API\Betting;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\DTO\BettingInfo;
+use sammo\KVStorage;
+
+use function sammo\checkLimit;
+use function sammo\increaseRefresh;
+
+class GetBettingList extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        $db = DB::db();
+
+        increaseRefresh("베팅장", 1);
+
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $bettingStor = KVStorage::getStorage($db, 'betting');
+        $userID = $session->userID;
+
+        $me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,penalty,permission FROM general WHERE owner=%i', $userID);
+        $con = checkLimit($me['con']);
+        if ($con >= 2) {
+            return "접속 제한중입니다.";
+        }
+
+        $bettingList = [];
+        foreach ($bettingStor->getAll() as $_key => $rawItem) {
+            $item = new BettingInfo($rawItem);
+            unset($rawItem['candidates']);
+            $bettingList[$item->id] = $rawItem;
+            $bettingList[$item->id]['totalAmount'] = 0;
+        }
+
+        [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
+
+        if(!$bettingList){
+            return [
+                'result' => true,
+                'bettingList' => $bettingList,
+                'year' => $year,
+                'month' => $month,
+            ];
+        }
+
+        $bettingIDList = array_keys($bettingList);
+        // XXX: query cache만 믿고 sum을 하는 짓을 벌여도 되는가?
+        foreach ($db->queryAllLists(
+            'SELECT betting_id, sum(amount) as total_amount FROM ng_betting WHERE betting_id IN %li GROUP BY betting_id',
+            $bettingIDList
+        ) as [$bettingID, $totalAmount]) {
+            if (!key_exists($bettingID, $bettingList)) {
+                continue;
+            }
+            $bettingList[$bettingID]['totalAmount'] = $totalAmount;
+        }
+
+
+        return [
+            'result' => true,
+            'bettingList' => $bettingList,
+            'year' => $year,
+            'month' => $month,
+        ];
+    }
+}

hwe/sammo/API/Command/ReserveBulkCommand.php

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

hwe/sammo/API/Global/GeneralList.php

@@ -0,0 +1,165 @@
+<?php
+
+namespace sammo\API\List\Nation;
+
+use sammo\DB;
+use sammo\General;
+use sammo\Json;
+use sammo\KVStorage;
+use sammo\RootDB;
+use sammo\Session;
+use sammo\Util;
+use sammo\Validator;
+
+use function sammo\calcLeadershipBonus;
+use function sammo\checkLimit;
+use function sammo\checkSecretPermission;
+use function sammo\getDed;
+use function sammo\getDedLevelText;
+use function sammo\getExpLevel;
+use function sammo\getGenChar;
+use function sammo\getGeneralSpecialDomesticName;
+use function sammo\getGeneralSpecialWarName;
+use function sammo\getHonor;
+use function sammo\getNationStaticInfo;
+use function sammo\getOfficerLevelText;
+use function sammo\increaseRefresh;
+
+class GeneralList extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v
+            ->rule('boolean', 'with_token');
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_LOGIN;
+    }
+
+    public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        $db = DB::db();
+        $withToken = $this->args['with_token']??false;
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+
+        $userID = $session->userID;
+        if ($session->isGameLoggedIn()) {
+            increaseRefresh("장수일람", 2);
+            $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
+            $con = checkLimit($me['con']);
+            if ($con >= 2) {
+                return '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.';
+            }
+        } else {
+            $availableNextCall = $session->availableNextCallGetGeneralList ?? '2000-01-01 00:00:00';
+            $now = new \DateTimeImmutable();
+
+            if ($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 5) {
+                return "장수 리스트는 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,owner_name as ownerName,injury,leadership,strength,intel,experience,dedication,officer_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, $ownerName, $injury, $leadership, $strength, $intel, $experience, $dedication, $officerLevel, $killturn, $connectCnt] = $rawGeneral;
+
+            if (key_exists($owner, $ownerNameList)) {
+                $ownerName = $ownerNameList[$owner];
+            }
+
+            $nationArr = getNationStaticInfo($nation);
+            $lbonus = calcLeadershipBonus($officerLevel, $nationArr['level']);
+
+            $generalList[] = [
+                $no,
+                $picture,
+                $imgsvr,
+                $npc,
+                $age,
+                $nationArr['name'],
+                getGeneralSpecialDomesticName($special),
+                getGeneralSpecialWarName($special2),
+                getGenChar($personal),
+                $name,
+                $npc == 1 ? $ownerName : null,
+                $injury,
+                $leadership,
+                $lbonus,
+                $strength,
+                $intel,
+                getExpLevel($experience),
+                getHonor($experience),
+                getDed($dedication),
+                getOfficerLevelText($officerLevel, $nationArr['level']),
+                $killturn,
+                $connectCnt
+            ];
+        }
+
+        $resultColumns = [
+            'no',
+            'picture',
+            'imgsvr',
+            'npc',
+            'age',
+            'nationName',
+            'special',
+            'special2',
+            'personal',
+            'name',
+            'ownerName',
+            'injury',
+            'leadership',
+            'lbonus',
+            'strength',
+            'intel',
+            'explevel',
+            'honorText',
+            'dedLevelText',
+            'officerLevelText',
+        ];
+
+        $result = [
+            'result' => 'true',
+            'column' => $resultColumns,
+            '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;
+        }
+        return $result;
+    }
+}

hwe/sammo/API/Global/GetConst.php

@@ -0,0 +1,325 @@
+<?php
+
+namespace sammo\API\Global;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\VersionGit;
+use Nette\Caching\Cache;
+use RuntimeException;
+use sammo\APICacheResult;
+use sammo\CityConst;
+use sammo\GameConst;
+use sammo\GameUnitConst;
+use sammo\Json;
+use sammo\TimeUtil;
+use sammo\UniqueConst;
+
+use function sammo\prepareDir;
+
+class GetConst extends \sammo\BaseAPI
+{
+    /** 반환하는 StaticValues 타입이 달라지면 +1 */
+    const CONST_API_VERSION = 2;
+    const CACHE_KEY = 'JSConst';
+
+    private ?string $cacheKey = null;
+
+    public function __construct(string $rootPath, array $args)
+    {
+        parent::__construct($rootPath, $args);
+    }
+
+    public function validateArgs(): ?string
+    {
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_LOGIN;
+    }
+
+    public function findLastModified(): ?int
+    {
+        $rawResult = explode("\n", shell_exec('git status -u -s --no-rename'));
+        $files = [];
+        foreach ($rawResult as $rawLine) {
+            if (strlen($rawLine) < 3) {
+                continue;
+            }
+            $filePath = trim(substr($rawLine, 3));
+            if ($filePath[0] == '"') {
+                $filePath = substr($filePath, 1, strlen($filePath) - 2);
+            }
+            if (!file_exists($filePath)) {
+                continue;
+            }
+            $files[] = $filePath;
+        }
+
+        $lastModified = null;
+        foreach ($files as $filePath) {
+            $fileModified = filemtime($filePath);
+            if ($fileModified === false) {
+                continue;
+            }
+            if ($lastModified === null) {
+                $lastModified = $fileModified;
+                continue;
+            }
+            if ($lastModified > $fileModified) {
+                continue;
+            }
+            $lastModified = $fileModified;
+        }
+        if ($lastModified === null) {
+            return null;
+        }
+        return $lastModified;
+    }
+
+    public function getCacheKey(): string
+    {
+        if ($this->cacheKey !== null) {
+            return $this->cacheKey;
+        }
+
+        if (is_subclass_of('\\sammo\\VersionGit', '\\sammo\VersionGitDynamic')) {
+            $lastModified = $this->findLastModified();
+            if ($lastModified !== null) {
+                $versionHash = "lt{$lastModified}";
+            } else {
+                $versionHash = VersionGit::getHash();
+            }
+        } else {
+            $versionHash = VersionGit::getHash();
+        }
+
+        $apiVersion = static::CONST_API_VERSION;
+        $serverID = UniqueConst::$serverID;
+
+
+        $cacheKey = "{$apiVersion}_{$serverID}_{$versionHash}";
+        $this->cacheKey = $cacheKey;
+
+        return $cacheKey;
+    }
+
+    public function tryCache(): ?APICacheResult
+    {
+        if (is_subclass_of('\\sammo\\VersionGit', '\\sammo\VersionGitDynamic')) {
+            return new APICacheResult(TimeUtil::secondsToDateTime($this->findLastModified()??\time(), true, true));
+        }
+
+        return new APICacheResult(null, $this->getCacheKey());
+    }
+
+    public function readCache(Cache $cache): null|string|array|int|float|bool
+    {
+        $rawJSONCache = $cache->load(static::CACHE_KEY);
+        if ($rawJSONCache === null) {
+            return null;
+        }
+        $jsonCache = Json::decode($rawJSONCache);
+        if (!key_exists('cacheKey', $jsonCache)) {
+            return null;
+        }
+
+        $jsonCacheKey = $jsonCache['cacheKey'];
+        if ($jsonCacheKey !== $this->getCacheKey()) {
+            return null;
+        }
+
+        return $jsonCache['data'] ?? null;
+    }
+
+    public function extractObjClassInfo(string $objKey, callable $callerFunction): array
+    {
+        /** @var \sammo\iAction */
+        $target = $callerFunction($objKey);
+        if (!($target instanceof \sammo\iAction)) {
+            throw new \RuntimeException("{$objKey}의 대상이 iAction이 아님");
+        }
+        return [
+            'value' => $objKey,
+            'name' => $target->getName(),
+            'info' => $target->getInfo(),
+        ];
+    }
+
+    public function extractObjClassInfoFromArray(array $constArray, callable $callerFunction): array
+    {
+        $result = [];
+        foreach ($constArray as $key => $target) {
+            if (is_string($target)) {
+                $actionInfo = $this->extractObjClassInfo($target, $callerFunction);
+                if (is_string($key)) {
+                    $result[$key] = $actionInfo;
+                } else {
+                    $result[$target] = $actionInfo;
+                }
+                continue;
+            }
+            if (is_array($target)) {
+                $result[$key] = $this->extractObjClassInfoFromArray($target, $callerFunction);
+                continue;
+            }
+            if(is_string($key) && is_int($target)){
+                //역전된 상황이다.
+                $result[$key] = $this->extractObjClassInfo($key, $callerFunction);
+                continue;
+            }
+            $result[$key] = $target;
+        }
+        return $result;
+    }
+
+    public function extractObjClassInfoFromGameConst(string $gameConstKey, callable $callerFunction): array
+    {
+        $gameConstKeyList = explode(".", $gameConstKey);
+        $target = (GameConst::${$gameConstKeyList[0]}) ?? [];
+        foreach(\array_slice($gameConstKeyList, 1) as $gameConstSubKey){
+            $target = $target[$gameConstSubKey] ?? [];
+        }
+
+        if (is_string($target)) {
+            return [$target => $this->extractObjClassInfo($target, $callerFunction)];
+        }
+
+        if (!is_array($target)) {
+            throw new \RuntimeException("GameConst::{$gameConstKey}의 값이 {$target}임");
+        }
+
+        return $this->extractObjClassInfoFromArray($target, $callerFunction);
+    }
+
+    public function genConstData()
+    {
+        $gameConstKeys = [
+            'nationType' => [
+                '\sammo\buildNationTypeClass',
+                ['availableNationType', 'neutralNationType']
+            ],
+            'specialDomestic' => [
+                '\sammo\buildGeneralSpecialDomesticClass',
+                ['defaultSpecialDomestic', 'availableSpecialDomestic', 'optionalSpecialDomestic']
+            ],
+            'specialWar' => [
+                '\sammo\buildGeneralSpecialWarClass',
+                ['defaultSpecialWar', 'availableSpecialWar', 'optionalSpecialWar']
+            ],
+            'personality' => [
+                '\sammo\buildPersonalityClass',
+                ['neutralPersonality', 'availablePersonality', 'optionalPersonality']
+            ],
+            'item' => [
+                '\sammo\buildItemClass',
+                ['allItems'],
+                1
+            ],
+        ];
+        //GameConst 중 BaseCommand는 시간 흐름, 장수에 따라 정보가 달라지므로 따로 처리해야함
+
+
+        $iActionInfo = [];
+        $iActionKeyMap = [];
+        foreach ($gameConstKeys as $mappedKey => $callerTarget) {
+            $flatLevel = 0;
+            if (is_array($callerTarget)) {
+                $callerFunction = $callerTarget[0];
+                $gameConstSubKey = $callerTarget[1];
+                if(count($callerTarget) > 2){
+                    /** @var int */
+                    $flatLevel = $callerTarget[2];
+                }
+            } else {
+                $gameConstSubKey = [$mappedKey];
+                $callerFunction = $callerTarget;
+            }
+
+            if (!is_callable($callerFunction)) {
+                throw new \RuntimeException("{$mappedKey} => {$callerFunction}이 callable이 아님");
+            }
+
+            $actionInfo = [];
+            foreach ($gameConstSubKey as $key) {
+                $appendInfo = $this->extractObjClassInfoFromGameConst($key, $callerFunction);
+                $actionInfo = array_merge($actionInfo, $appendInfo);
+                $iActionKeyMap[$key] = $mappedKey;
+            }
+
+            if($flatLevel > 0){
+                foreach(range(0, $flatLevel - 1) as $tryFlatLevel){
+                    $actionInfo = array_merge(...array_values($actionInfo));
+                }
+            }
+
+
+            $iActionInfo[$mappedKey] = $actionInfo;
+        }
+
+        $crewtypeMap = [];
+        foreach(GameUnitConst::all() as $crewtypeObj){
+            $crewtypeMap[$crewtypeObj->id] = [
+                'value'=>(string)$crewtypeObj->id,
+                'name'=>$crewtypeObj->name,
+                'info'=>$crewtypeObj->getInfo(),
+            ];
+        }
+        $iActionInfo['crewtype'] = $crewtypeMap;
+
+
+        return [
+            'gameConst' => get_class_vars('\sammo\GameConst'),
+            'gameUnitConst' => GameUnitConst::all(),
+            'cityConst' => CityConst::all(),
+            'cityConstMap' => [
+                'region' => CityConst::$regionMap,
+                'level' => CityConst::$levelMap,
+            ],
+            'iActionInfo' => $iActionInfo,
+            'iActionKeyMap' => $iActionKeyMap,
+        ];
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        $cacheDir = $this->rootPath . '/data/file_cache';
+
+        if (!prepareDir($cacheDir)) {
+            throw new RuntimeException('cache 폴더 없음');
+        }
+        $storage = new \Nette\Caching\Storages\FileStorage($cacheDir);
+        $cache = new Cache($storage);
+
+        $currentCacheKey = $this->tryCache();
+        if($modifiedSince !== null && $currentCacheKey->lastModified == $modifiedSince){
+            return null;
+        }
+        if($reqEtag !== null && $currentCacheKey->etag == $reqEtag){
+            return null;
+        }
+
+        $constCache = $this->readCache($cache);
+        if ($constCache !== null) {
+            return [
+                'result' => true,
+                'cacheKey' => $this->getCacheKey(),
+                'data' => $constCache,
+            ];
+        }
+
+        $constCache = $this->genConstData();
+        $cache->save(static::CACHE_KEY, Json::encode([
+            'cacheKey' => $this->getCacheKey(),
+            'data' => $constCache
+        ]));
+
+        return [
+            'result' => true,
+            'cacheKey' => $this->getCacheKey(),
+            'data' => $constCache,
+        ];
+    }
+}

hwe/sammo/API/Global/GetNationList.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace sammo\API\Global;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+
+use function sammo\getAllNationStaticInfo;
+use function sammo\getNationStaticInfo;
+
+class GetNationList extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        $db = DB::db();
+
+        $nations = getAllNationStaticInfo();
+        uasort($nations, function ($lhs, $rhs) {
+            return $rhs['power'] <=> $lhs['power'];
+        });
+
+        $nations[0] = getNationStaticInfo(0);
+
+        foreach ($db->query('SELECT npc,name,nation,officer_level,permission FROM `general` ORDER BY dedication DESC') as $general) {
+            $nationID = $general['nation'];
+
+            $permission = $general['permission'];
+            if($permission != 'auditor' && $permission != 'ambassador'){
+                unset($general['permission']);
+            }
+
+            if($general['officer_level'] < 5){
+                $general['officer_level'] = 1;
+            }
+
+            if (!key_exists('generals', $nations[$nationID])) {
+                $nations[$nationID]['generals'] = [];
+            }
+            $nations[$nationID]['generals'][] = $general;
+        }
+
+        foreach ($db->queryAllLists('SELECT city, name, nation FROM city') as [$cityID, $cityName, $nationID]) {
+            if (!key_exists('cities', $nations[$nationID])) {
+                $nations[$nationID]['cities'] = [];
+            }
+            $nations[$nationID]['cities'][$cityID] = $cityName;
+        }
+
+        return [
+            'result' => true,
+            'nations' => $nations,
+        ];
+    }
+}

hwe/sammo/API/Nation/GeneralList.php

@@ -0,0 +1,285 @@
+<?php
+
+namespace sammo\API\Nation;
+
+use sammo\DB;
+use sammo\General;
+use sammo\Session;
+use sammo\Util;
+use sammo\Validator;
+
+use function sammo\calcLeadershipBonus;
+use function sammo\checkLimit;
+use function sammo\checkSecretPermission;
+use function sammo\getBillByLevel;
+use function sammo\getDedLevelText;
+use function sammo\getGenChar;
+use function sammo\getGeneralSpecialDomesticName;
+use function sammo\getGeneralSpecialWarName;
+use function sammo\getHonor;
+use function sammo\getNationStaticInfo;
+use function sammo\getOfficerLevelText;
+use function sammo\increaseRefresh;
+
+class GeneralList extends \sammo\BaseAPI
+{
+    private int $permission;
+
+    static $viewColumns = [
+        'no' => 0,
+        'name' => 0,
+        'nation' => 0,
+        'npc' => 0,
+        'injury' => 0,
+        'leadership' => 0,
+        'strength' => 0,
+        'intel' => 0,
+        'explevel' => 0,
+        'dedlevel' => 0,
+        'gold' => 0,
+        'rice' => 0,
+        'killturn' => 0,
+        'picture' => 0,
+        'imgsvr' => 0,
+        'age' => 0,
+        'special' => 0,
+        'special2' => 0,
+        'personal' => 0,
+        'belong' => 0,
+        'connect' => 0,
+
+
+        'city' => 1,
+        'experience' => 1,
+        'dedication' => 1,
+
+        'officer_level' => 2,
+        'officer_city' => 2,
+        'defence_train' => 2,
+        'troop' => 2,
+        'crewtype' => 2,
+        'crew' => 2,
+        'train' => 2,
+        'atmos' => 2,
+        'turntime' => 2,
+        'horse' => 2,
+        'weapon' => 2,
+        'book' => 2,
+        'item' => 2,
+        'recent_war' => 2,
+
+        'aux' => 2,
+
+
+        'owner_name' => 9,//안씀.
+
+        //RANK
+        'warnum' => 2,
+        'killnum' => 2,
+        'deathnum' => 2,
+        'killcrew' => 2,
+        'deathcrew' => 2,
+        'firenum' => 2,
+    ];
+
+    static $columnRemap = [
+        'special' => 'specialDomestic',
+        'special2' => 'specialWar',
+        'aux' => null,
+    ];
+
+    static $customViewColumns = [
+        'officerLevel' => 0,
+        'officerLevelText' => 0,
+        'lbonus' => 0,
+        'ownerName' => 0,
+        'honorText' => 0,
+        'dedLevelText' => 0,
+        'bill' => 0,
+        'reservedCommand' => 2,
+
+        'autorun_limit' => 2,
+    ];
+
+    public function validateArgs(): ?string
+    {
+        //TODO: 장기적으로는 요청에 따라 반환해야...
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    private function getOfficerLevel($rawGeneral)
+    {
+        $level = $rawGeneral['officer_level'];
+        if ($level >= 5) {
+            return $level;
+        }
+        if ($this->permission > 1) {
+            return $level;
+        }
+        return 1;
+    }
+
+    public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag)
+    {
+        increaseRefresh("세력장수", 1);
+
+        $db = DB::db();
+
+        $gameStor = \sammo\KVStorage::getStorage($db, 'game_env');
+        $env = $gameStor->getValues(['year', 'month', 'turntime', 'turnterm', 'autorun_user', 'killturn']);
+
+        $me = $db->queryFirstRow('SELECT con, turntime, belong, nation, officer_level, permission, penalty FROM general WHERE owner=%i', $session->getUserID());
+        $con = checkLimit($me['con']);
+        if ($con >= 2) {
+            return '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.';
+        }
+
+        $nationID = $me['nation'];
+        $this->permission = checkSecretPermission($me, true);
+
+        $nationArr = getNationStaticInfo($nationID);
+
+
+
+        [$queryColumns, $rankColumns] = General::mergeQueryColumn(array_keys(static::$viewColumns), 1);
+
+        $rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE nation = %i ORDER BY turntime ASC', Util::formatListOfBackticks($queryColumns), $nationID), 'no');
+
+        $reservedCommand = [];
+        if ($this->permission >= 2) {
+            $nonNPCGeneralIDList = [];
+            foreach ($rawGeneralList as $rawGeneral) {
+                if ($rawGeneral['npc'] < 2) {
+                    $nonNPCGeneralIDList[] = $rawGeneral['no'];
+                }
+            }
+
+            $rawTurnList = $db->query(
+                'SELECT general_id, turn_idx, action, arg, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id asc, turn_idx asc',
+                $nonNPCGeneralIDList
+            );
+
+            foreach ($rawTurnList as $rawTurn) {
+                [
+                    'general_id' => $generalID,
+                    'action' => $action,
+                    'arg' => $arg,
+                    'brief' => $brief,
+                ] = $rawTurn;
+                if (!key_exists($generalID, $reservedCommand)) {
+                    $reservedCommand[$generalID] = [];
+                }
+                $reservedCommand[$generalID][] = [
+                    'action' => $action,
+                    'arg' => $arg,
+                    'brief' => $brief
+                ];
+            }
+        }
+
+        $rankList = [];
+        if ($rankColumns) {
+            $rawRankList = $db->query('SELECT general_id, `type`, `value` FROM rank_data WHERE nation_id = %i AND `type` IN %ls', $nationID, $rankColumns);
+            foreach ($rawRankList as $rawRank) {
+                [
+                    'general_id' => $generalID,
+                    'type' => $type,
+                    'value' => $value
+                ] = $rawRank;
+
+                if (!key_exists($generalID, $rankList)) {
+                    $rankList[$generalID] = [];
+                }
+                $rankList[$generalID][$type] = $value;
+            }
+        }
+
+        $getRankVar = fn ($key) => (fn ($rawGeneral) => (($rankList[$rawGeneral['no']] ?? [])[$key] ?? 0));
+
+        $specialViewFilter = [
+            'officerLevel' => fn ($rawGeneral) => $this->getOfficerLevel($rawGeneral),
+            'officerLevelText' => fn ($rawGeneral) => getOfficerLevelText($this->getOfficerLevel($rawGeneral), $nationArr['level']),
+            'lbonus' => fn ($rawGeneral) => calcLeadershipBonus($rawGeneral['officer_level'], $nationArr['level']),
+            'ownerName' => fn ($rawGeneral) => ($rawGeneral['npc'] != 1) ? null : $rawGeneral['owner_name'],
+            'honorText' => fn ($rawGeneral) => getHonor($rawGeneral['experience']),
+            'dedLevelText' => fn ($rawGeneral) => getDedLevelText($rawGeneral['dedlevel']),
+            //'0000-00-00 11:23';
+            'turntime' => fn ($rawGeneral) => substr($rawGeneral['turntime'], 0, 19),
+            'recent_war' => fn ($rawGeneral) => substr($rawGeneral['recent_war'], 0, 19),
+            'bill' => fn ($rawGeneral) => getBillByLevel($rawGeneral['dedlevel']),
+            'reservedCommand' => fn ($rawGeneral) => $reservedCommand[$rawGeneral['no']] ?? null,
+            'autorun_limit' => fn ($rawGeneral) => ($rawGeneral['aux'] ?? [])['autorun_limit'] ?? 0,
+        ];
+
+        foreach ($rankColumns as $rankKey) {
+            $specialViewFilter[$rankKey] = $getRankVar($rankKey);
+        }
+
+
+        $resultColumns = [];
+        foreach (static::$viewColumns as $column => $reqPermission) {
+            if ($reqPermission > $this->permission) {
+                continue;
+            }
+            if (key_exists($column, static::$columnRemap)) {
+                $newColumn = static::$columnRemap[$column];
+                if($newColumn !== null){
+                    $resultColumns[$newColumn] = $column;
+                }
+            } else {
+                $resultColumns[$column] = $column;
+            }
+        }
+
+        foreach (static::$customViewColumns as $column => $reqPermission) {
+            if ($reqPermission > $this->permission) {
+                continue;
+            }
+            $resultColumns[$column] = $column;
+        }
+
+        $generalList = [];
+        foreach ($rawGeneralList as $rawGeneral) {
+            //General 생성?
+            if (key_exists('aux', $rawGeneral)) {
+                $rawGeneral['aux'] = \sammo\JSON::decode($rawGeneral['aux']);
+            }
+
+            $item = [];
+            foreach ($resultColumns as $column) {
+                if (key_exists($column, $specialViewFilter)) {
+                    $value = $specialViewFilter[$column]($rawGeneral);
+                } else {
+                    $value = $rawGeneral[$column];
+                }
+                $item[] = $value;
+            }
+
+            $generalList[] = $item;
+        }
+
+        if($this->permission >= 2){
+            $troops = $db->queryAllLists('SELECT troop_leader,name FROM troop WHERE nation = %i', $nationID);
+        }
+        else{
+            $troops = null;
+        }
+
+
+        $result = [
+            'result' => true,
+            'permission' => $this->permission,
+            'column' => array_keys($resultColumns),
+            'list' => $generalList,
+            'troops' => $troops,
+            'env' => $env,
+        ];
+
+        return $result;
+    }
+}

hwe/sammo/API/Nation/SetBlockScout.php

@@ -47,6 +47,11 @@ class SetBlockScout extends \sammo\BaseAPI
             return "권한이 부족합니다.";
         }
 
+        $gameStor = new KVStorage($db, 'game_env');
+        $blockChangeScout = $gameStor->getValue('block_change_scout')??false;
+        if ($blockChangeScout){
+            return "임관 설정을 바꿀 수 없도록 설정되어 있습니다.";
+        }
 
         $nationID = $me['nation'];
 

hwe/sammo/API/Nation/SetSecretLimit.php

@@ -53,7 +53,7 @@ class SetSecretLimit extends \sammo\BaseAPI
         $nationID = $me['nation'];
 
         $db->update('nation', [
-            'bill' => $amount
+            'secretlimit' => $amount
         ], 'nation=%i', $nationID);
 
         return [

hwe/sammo/API/NationCommand/GetReservedCommand.php

@@ -117,6 +117,8 @@ class GetReservedCommand extends \sammo\BaseAPI
             'autorun_limit' => $generalObj->getAuxVar('autorun_limit'),
             'officerLevel' => $me['officer_level'],
             'commandList' => getChiefCommandTable($generalObj),
+            'mapName' => GameConst::$mapName,
+            'unitSet' => GameConst::$unitSet,
         ];
     }
 }

hwe/sammo/API/NationCommand/ReserveBulkCommand.php

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

hwe/sammo/ActionItem/None.php

@@ -5,7 +5,6 @@ use \sammo\General;
 
 class None extends \sammo\BaseItem{
 
-    protected $id = 0;
     protected $name = '-';
     protected $info = null;
     protected $cost = 0;

hwe/sammo/ActionItem/che_간파_노군입산부.php

@@ -0,0 +1,23 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+
+class che_간파_노군입산부 extends \sammo\BaseItem{
+
+    protected $rawName = '노군입산부';
+    protected $name = '노군입산부(간파)';
+    protected $info = '[전투] 상대 회피 확률 -30%p, 상대 필살 확률 -10%p';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onCalcOpposeStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'warAvoidRatio'){
+            return $value - 0.30;
+        }
+        if($statName === 'warCriticalRatio'){
+            return $value - 0.10;
+        }
+        return $value;
+    }
+}

hwe/sammo/ActionItem/che_격노_구정신단경.php

@@ -0,0 +1,25 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use \sammo\SpecialityHelper;
+use \sammo\WarUnit;
+use sammo\WarUnitTriggerCaller;
+use sammo\WarUnitTrigger\che_격노시도;
+use sammo\WarUnitTrigger\che_격노발동;
+
+class che_격노_구정신단경 extends \sammo\BaseItem{
+
+    protected $rawName = '구정신단경';
+    protected $name = '구정신단경(격노)';
+    protected $info = '[전투] 상대방 필살 시 격노(필살) 발동, 회피 시도시 25% 확률로 격노 발동, 공격 시 일정 확률로 진노(1페이즈 추가)';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_격노시도($unit, che_격노시도::TYPE_ITEM),
+            new che_격노발동($unit)
+        );
+    }
+}

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

@@ -5,7 +5,6 @@ use \sammo\General;
 
 class che_계략_삼략 extends \sammo\BaseItem{
 
-    protected $id = 22;
     protected $rawName = '삼략';
     protected $name = '삼략(계략)';
     protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p<br>[전투] 계략 시도 확률 +10%p, 계략 성공 확률 +10%p';
@@ -16,7 +15,7 @@ class che_계략_삼략 extends \sammo\BaseItem{
         if($turnType == '계략'){
             if($varType == 'success') return $value + 0.2;
         }
-        
+
         return $value;
     }
 

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

@@ -5,7 +5,6 @@ use \sammo\General;
 
 class che_계략_육도 extends \sammo\BaseItem{
 
-    protected $id = 21;
     protected $rawName = '육도';
     protected $name = '육도(계략)';
     protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p<br>[전투] 계략 시도 확률 +10%p, 계략 성공 확률 +10%p';
@@ -16,7 +15,7 @@ class che_계략_육도 extends \sammo\BaseItem{
         if($turnType == '계략'){
             if($varType == 'success') return $value + 0.2;
         }
-        
+
         return $value;
     }
 

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

@@ -5,7 +5,6 @@ use \sammo\General;
 
 class che_계략_이추 extends \sammo\BaseItem{
 
-    protected $id = 5;
     protected $rawName = '이추';
     protected $name = '이추(계략)';
     protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p';
@@ -18,11 +17,11 @@ class che_계략_이추 extends \sammo\BaseItem{
         if($turnType == '계략'){
             if($varType == 'success') return $value + 0.2;
         }
-        
+
         return $value;
     }
 
-    function isConsumableNow(string $actionType, string $command):bool{
+    function tryConsumeNow(General $general, string $actionType, string $command):bool{
         if($actionType == 'GeneralCommand' && $command == '계략'){
             return true;
         }

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

@@ -5,7 +5,6 @@ use \sammo\General;
 
 class che_계략_향낭 extends \sammo\BaseItem{
 
-    protected $id = 5;
     protected $rawName = '항냥';
     protected $name = '항냥(계략)';
     protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +50%p';
@@ -18,11 +17,11 @@ class che_계략_향낭 extends \sammo\BaseItem{
         if($turnType == '계략'){
             if($varType == 'success') return $value + 0.5;
         }
-        
+
         return $value;
     }
 
-    function isConsumableNow(string $actionType, string $command):bool{
+    function tryConsumeNow(General $general, string $actionType, string $command):bool{
         if($actionType == 'GeneralCommand' && $command == '계략'){
             return true;
         }

hwe/sammo/ActionItem/che_공성_묵자.php

@@ -0,0 +1,24 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use \sammo\SpecialityHelper;
+use \sammo\GameUnitConst;
+use \sammo\WarUnit;
+use \sammo\WarUnitCity;
+
+class che_공성_묵자 extends \sammo\BaseItem{
+
+    protected $rawName = '묵자';
+    protected $name = '묵자(공성)';
+    protected $info = '[전투] 성벽 공격 시 대미지 +50%';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getWarPowerMultiplier(WarUnit $unit):array{
+        if($unit->getOppose() instanceof WarUnitCity){
+            return [1.5, 1];
+        }
+        return [1, 1];
+    }
+}

hwe/sammo/ActionItem/che_내정_납금박산로.php

@@ -0,0 +1,21 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use sammo\Util;
+
+class che_내정_납금박산로 extends \sammo\BaseItem{
+
+    protected $rawName = '납금박산로';
+    protected $name = '납금박산로(내정)';
+    protected $info = '[내정] 내정 성공률 +20%p';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onCalcStrategic(string $turnType, string $varType, $value){
+        if(in_array($turnType, ['상업', '농업', '기술', '성벽', '수비', '치안', '민심', '인구'])){
+            if($varType == 'success') return $value + 0.2;
+        }
+        return $value;
+    }
+}

hwe/sammo/ActionItem/che_농성_위공자병법.php

@@ -0,0 +1,32 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use sammo\WarUnit;
+
+class che_농성_위공자병법 extends \sammo\BaseItem{
+
+    protected $rawName = '위공자병법';
+    protected $name = '위공자병법(농성)';
+    protected $info = '[계략] 장수 주둔 도시 화계·탈취·파괴·선동 : 성공률 -30%p<br>[전투] 상대 계략 시도 확률 -10%p, 상대 계략 성공 확률 -10%p';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'sabotageDefence'){
+            return $value + 0.3;
+        }
+        return $value;
+    }
+
+    public function onCalcOpposeStat(General $general, string $statName, $value, $aux = null)
+    {
+        if($statName === 'warMagicTrialProb'){
+            return $value - 0.1;
+        }
+        if($statName === 'warMagicSuccessProb'){
+            return $value - 0.1;
+        }
+        return $value;
+    }
+}

hwe/sammo/ActionItem/che_농성_주서음부.php

@@ -0,0 +1,32 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use sammo\WarUnit;
+
+class che_농성_주서음부 extends \sammo\BaseItem{
+
+    protected $rawName = '주서음부';
+    protected $name = '주서음부(농성)';
+    protected $info = '[계략] 장수 주둔 도시 화계·탈취·파괴·선동 : 성공률 -30%p<br>[전투] 상대 계략 시도 확률 -10%p, 상대 계략 성공 확률 -10%p';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'sabotageDefence'){
+            return $value + 0.3;
+        }
+        return $value;
+    }
+
+    public function onCalcOpposeStat(General $general, string $statName, $value, $aux = null)
+    {
+        if($statName === 'warMagicTrialProb'){
+            return $value - 0.1;
+        }
+        if($statName === 'warMagicSuccessProb'){
+            return $value - 0.1;
+        }
+        return $value;
+    }
+}

hwe/sammo/ActionItem/che_능력치_무력_두강주.php

@@ -0,0 +1,28 @@
+<?php
+namespace sammo\ActionItem;
+
+use sammo\DB;
+use sammo\GameConst;
+use \sammo\iAction;
+use \sammo\General;
+use sammo\KVStorage;
+use sammo\Util;
+
+class che_능력치_무력_두강주 extends \sammo\BaseItem{
+
+    protected $rawName = '두강주';
+    protected $name = '두강주(무력)';
+    protected $info = '[능력치] 무력 +5 +(5년마다 +1)';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'strength'){
+            $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
+            [$year, $startYear] = $gameStor->getValuesAsArray(['year', 'startyear']);
+            $relYear = $year - $startYear;
+            return $value + 5 + Util::valueFit(intdiv($relYear, 5), 0, GameConst::$maxTechLevel);
+        }
+        return $value;
+    }
+}

hwe/sammo/ActionItem/che_능력치_지력_이강주.php

@@ -0,0 +1,28 @@
+<?php
+namespace sammo\ActionItem;
+
+use sammo\DB;
+use sammo\GameConst;
+use \sammo\iAction;
+use \sammo\General;
+use sammo\KVStorage;
+use sammo\Util;
+
+class che_능력치_지력_이강주 extends \sammo\BaseItem{
+
+    protected $rawName = '이강주';
+    protected $name = '이강주(지력)';
+    protected $info = '[능력치] 지력 +5 +(5년마다 +1)';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'intel'){
+            $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
+            [$year, $startYear] = $gameStor->getValuesAsArray(['year', 'startyear']);
+            $relYear = $year - $startYear;
+            return $value + 5 + Util::valueFit(intdiv($relYear, 5), 0, GameConst::$maxTechLevel);
+        }
+        return $value;
+    }
+}

hwe/sammo/ActionItem/che_능력치_통솔_보령압주.php

@@ -0,0 +1,28 @@
+<?php
+namespace sammo\ActionItem;
+
+use sammo\DB;
+use sammo\GameConst;
+use \sammo\iAction;
+use \sammo\General;
+use sammo\KVStorage;
+use sammo\Util;
+
+class che_능력치_통솔_보령압주 extends \sammo\BaseItem{
+
+    protected $rawName = '보령압주';
+    protected $name = '보령압주(통솔)';
+    protected $info = '[능력치] 통솔 +5 +(5년마다 +1)';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName === 'leadership'){
+            $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
+            [$year, $startYear] = $gameStor->getValuesAsArray(['year', 'startyear']);
+            $relYear = $year - $startYear;
+            return $value + 5 + Util::valueFit(intdiv($relYear, 5), 0, GameConst::$maxTechLevel);
+        }
+        return $value;
+    }
+}

hwe/sammo/ActionItem/che_명마_12_옥란백용구.php

@@ -10,7 +10,7 @@ class che_명마_12_옥란백용구 extends \sammo\BaseStatItem{
     public function __construct()
     {
         parent::__construct();
-        $this->info .= "<br>[전투] 남은 병력에 따라 회피 확률 증가. 최대 +30%p";
+        $this->info .= "<br>[전투] 남은 병력이 적을수록 회피 확률 증가. 최대 +30%p";
     }
 
     public function onCalcStat(General $general, string $statName, $value, $aux = null)

hwe/sammo/ActionItem/che_명성_구석.php

@@ -0,0 +1,20 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+
+class che_명성_구석 extends \sammo\BaseItem{
+
+    protected $rawName = '구석';
+    protected $name = '구석(명성)';
+    protected $info = '명성 +15%';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName == 'experience'){
+            return $value * 1.15;
+        }
+        return $value;
+    }
+}

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

@@ -12,10 +12,9 @@ use \sammo\WarUnitTrigger\che_반계발동;
 
 class che_반계_백우선 extends \sammo\BaseItem{
 
-    protected $id = 45;
     protected $rawName = '백우선';
     protected $name = '백우선(반계)';
-    protected $info = '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 20% 확률로 되돌림';
+    protected $info = '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 30% 확률로 되돌림, 반목 성공시 대미지 추가(+60% → +100%), 소모 군량 +10%';
     protected $cost = 200;
     protected $consumable = false;
 
@@ -27,9 +26,19 @@ class che_반계_백우선 extends \sammo\BaseItem{
         return $value - $debuff;
     }
 
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName == 'killRice'){
+            return $value * 1.1;
+        }
+        if($statName === 'warMagicSuccessDamage' && $aux === '반목'){
+            return $value + 0.4;
+        }
+        return $value;
+    }
+
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new che_반계시도($unit, BaseWarUnitTrigger::TYPE_ITEM +BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*301, 0.2),
+            new che_반계시도($unit, BaseWarUnitTrigger::TYPE_ITEM +BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*301, 0.3),
             new che_반계발동($unit)
         );
     }

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

@@ -12,7 +12,6 @@ use \sammo\WarUnitTrigger\che_반계발동;
 
 class che_반계_파초선 extends \sammo\BaseItem{
 
-    protected $id = 45;
     protected $rawName = '파초선';
     protected $name = '파초선(반계)';
     protected $info = '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 20% 확률로 되돌림';

hwe/sammo/ActionItem/che_반계저지_박혁론.php

@@ -0,0 +1,23 @@
+<?php
+namespace sammo\ActionItem;
+
+use sammo\BaseWarUnitTrigger;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_저지발동;
+use sammo\WarUnitTrigger\WarActivateSkills;
+use sammo\WarUnitTriggerCaller;
+
+class che_반계저지_박혁론 extends \sammo\BaseItem{
+
+    protected $rawName = '박혁론';
+    protected $name = '박혁론(반계저지)';
+    protected $info = '[전투] 상대의 계략 되돌림 불가';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '반계불가'),
+        );
+    }
+}

hwe/sammo/ActionItem/che_보물_도기.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace sammo\ActionItem;
+
+use sammo\DB;
+use \sammo\iAction;
+use \sammo\General;
+use sammo\KVStorage;
+use sammo\Util;
+
+class che_보물_도기 extends \sammo\BaseItem
+{
+
+    protected $rawName = '도기';
+    protected $name = '도기(보물)';
+    protected $info = '[개인] 판매 시 장수 소지금과 국고에 금, 쌀 중 하나를 추가 (총 +10,000, 5년마다 +10,000)';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onArbitraryAction(General $general, string $actionType, ?string $phase = null, $aux = null): ?array
+    {
+        if ($aux === null){
+            return $aux;
+        }
+        if ($actionType !== '장비매매') {
+            return $aux;
+        }
+        if ($phase !== '판매') {
+            return $aux;
+        }
+        if (($aux['itemCode']??'') !== Util::getClassNameFromObj($this)){
+            return $aux;
+        }
+
+        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        [$year, $startYear] = $gameStor->getValuesAsArray(['year', 'startyear']);
+        $relYear = $year - $startYear;
+
+        $score = 10000 * (1 + Util::valueFit(intdiv($relYear, 5), 0));
+
+        [$resName, $resKey] = Util::choiceRandom([
+            ['금', 'gold'],
+            ['쌀', 'rice']
+        ]);
+
+        $nationId = $general->getVar('nation');
+
+        if ($nationId != 0) {
+          $db->update('nation', [
+            $resKey => $db->sqleval('%b + %i', $resKey, Util::toInt($score / 2))
+          ], 'nation=%i', $nationId);
+        }
+        $general->increaseVar($resKey, $score - Util::toInt($score / 2));
+
+        $score = Util::round($score);
+        $scoreText = number_format($score, 0);
+
+        $logger = $general->getLogger();
+        $logger->pushGeneralActionLog("재산과 국고에 총 {$resName} <C>{$scoreText}</>을 보충합니다.");
+        return $aux;
+    }
+}

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

@@ -15,13 +15,20 @@ use sammo\WarUnitTrigger\WarActivateSkills;
 class che_부적_태현청생부 extends \sammo\BaseItem
 {
 
-    protected $id = 9;
     protected $rawName = '태현청생부';
     protected $name = '태현청생부(부적)';
     protected $info = '[전투] 저격 불가, 부상 없음';
     protected $cost = 200;
     protected $consumable = false;
 
+    public function onCalcStat(General $general, string $statName, $value, $aux = null)
+    {
+        if($statName === 'injuryProb'){
+            return $value -= 1;
+        }
+        return $value;
+    }
+
     public function getBattleInitSkillTriggerList(WarUnit $unit): ?WarUnitTriggerCaller
     {
         return new WarUnitTriggerCaller(

hwe/sammo/ActionItem/che_불굴_상편.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace sammo\ActionItem;
+
+use \sammo\iAction;
+use \sammo\General;
+use sammo\Util;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\전투력보정;
+use sammo\WarUnitTriggerCaller;
+
+class che_불굴_상편 extends \sammo\BaseItem
+{
+
+    protected $rawName = '상편';
+    protected $name = '상편(불굴)';
+    protected $info = '[전투] 남은 병력이 적을수록 공격력 증가. 최대 +50%';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit): ?WarUnitTriggerCaller
+    {
+        $leadership = $unit->getGeneral()->getLeadership();
+        $crew = $unit->getGeneral()->getVar('crew');
+
+        $crewRatio = Util::valueFit($crew / ($leadership * 100), 0, 1);
+        return new WarUnitTriggerCaller(
+            new 전투력보정($unit, 1 + 0.5 * (1 - $crewRatio))
+        );
+    }
+}

hwe/sammo/ActionItem/che_사기_두강주.php

@@ -5,7 +5,6 @@ use \sammo\General;
 
 class che_사기_두강주 extends \sammo\BaseItem{
 
-    protected $id = 15;
     protected $rawName = '두강주';
     protected $name = '두강주(사기)';
     protected $info = '[전투] 사기 보정 +10';
@@ -18,4 +17,6 @@ class che_사기_두강주 extends \sammo\BaseItem{
         }
         return $value;
     }
-}
+}
+
+//NOTE: 구버전

hwe/sammo/ActionItem/che_사기_보령압주.php

@@ -5,7 +5,6 @@ use \sammo\General;
 
 class che_사기_보령압주 extends \sammo\BaseItem{
 
-    protected $id = 16;
     protected $rawName = '보령압주';
     protected $name = '보령압주(사기)';
     protected $info = '[전투] 사기 보정 +10';
@@ -18,4 +17,6 @@ class che_사기_보령압주 extends \sammo\BaseItem{
         }
         return $value;
     }
-}
+}
+
+//NOTE: 구버전

hwe/sammo/ActionItem/che_사기_의적주.php

@@ -5,7 +5,6 @@ use \sammo\General;
 
 class che_사기_의적주 extends \sammo\BaseItem{
 
-    protected $id = 14;
     protected $rawName = '의적주';
     protected $name = '의적주(사기)';
     protected $info = '[전투] 사기 보정 +10';

hwe/sammo/ActionItem/che_사기_초선화.php

@@ -5,16 +5,15 @@ use \sammo\General;
 
 class che_사기_초선화 extends \sammo\BaseItem{
 
-    protected $id = 20;
     protected $rawName = '초선화';
     protected $name = '초선화(사기)';
-    protected $info = '[전투] 사기 보정 +14';
+    protected $info = '[전투] 사기 보정 +15';
     protected $cost = 200;
     protected $consumable = false;
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
         if($statName === 'bonusAtmos'){
-            return $value + 14;
+            return $value + 15;
         }
         return $value;
     }

hwe/sammo/ActionItem/che_사기_춘화첩.php

@@ -5,16 +5,15 @@ use \sammo\General;
 
 class che_사기_춘화첩 extends \sammo\BaseItem{
 
-    protected $id = 19;
     protected $rawName = '춘화첩';
     protected $name = '춘화첩(사기)';
-    protected $info = '[전투] 사기 보정 +14';
+    protected $info = '[전투] 사기 보정 +15';
     protected $cost = 200;
     protected $consumable = false;
 
     public function onCalcStat(General $general, string $statName, $value, $aux=null){
         if($statName === 'bonusAtmos'){
-            return $value + 14;
+            return $value + 15;
         }
         return $value;
     }

hwe/sammo/ActionItem/che_사기_탁주.php

@@ -3,16 +3,16 @@ namespace sammo\ActionItem;
 use \sammo\iAction;
 use \sammo\General;
 use \sammo\BaseWarUnitTrigger;
+use sammo\GameConst;
 use \sammo\WarUnit;
 use \sammo\WarUnitTriggerCaller;
 use \sammo\WarUnitTrigger\능력치변경;
 
 class che_사기_탁주 extends \sammo\BaseItem{
 
-    protected $id = 3;
     protected $rawName = '탁주';
     protected $name = '탁주(사기)';
-    protected $info = '[전투] 사기 +6. 1회용';
+    protected $info = '[전투] 사기 +30(한도 내). 1회용';
     protected $cost = 1000;
     protected $consumable = true;
     protected $buyable = true;
@@ -20,7 +20,7 @@ class che_사기_탁주 extends \sammo\BaseItem{
 
     public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
-            new 능력치변경($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM, 'atmos', '+', 6)
+            new 능력치변경($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM, 'atmos', '+', 30, null, GameConst::$maxAtmosByWar)
         );
     }
 }

hwe/sammo/ActionItem/che_상성보정_과실주.php

@@ -0,0 +1,28 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\전투력보정;
+use sammo\WarUnitTriggerCaller;
+
+class che_상성보정_과실주 extends \sammo\BaseItem{
+
+    protected $rawName = '과실주';
+    protected $name = '과실주(상성)';
+    protected $info = '[전투] 대등/유리한 병종 전투시 공격력 +10%, 피해 -10%';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit): ?WarUnitTriggerCaller
+    {
+        $oppose = $unit->getOppose();
+        $attackCoef = $unit->getCrewType()->getAttackCoef($oppose->getCrewType());
+        if($attackCoef < 1){
+            return null;
+        }
+        return new WarUnitTriggerCaller(
+            new 전투력보정($unit, 1.1, 0.9)
+        );
+    }
+}

hwe/sammo/ActionItem/che_숙련_동작.php

@@ -0,0 +1,20 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+
+class che_숙련_동작 extends \sammo\BaseItem{
+
+    protected $rawName = '동작';
+    protected $name = '동작(숙련)';
+    protected $info = '숙련 +15%';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
+        if($statName == 'addDex'){
+            return $value * 1.15;
+        }
+        return $value;
+    }
+}

hwe/sammo/ActionItem/che_약탈_옥벽.php

@@ -0,0 +1,24 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_약탈발동;
+use sammo\WarUnitTrigger\che_약탈시도;
+use sammo\WarUnitTriggerCaller;
+
+class che_약탈_옥벽 extends \sammo\BaseItem{
+
+    protected $rawName = '옥벽';
+    protected $name = '옥벽(약탈)';
+    protected $info = '[전투] 새로운 상대와 전투 시 20% 확률로 상대 금, 쌀 10% 약탈';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_약탈시도($unit, che_약탈시도::TYPE_ITEM, 0.2, 0.1),
+            new che_약탈발동($unit, che_약탈발동::TYPE_ITEM)
+        );
+    }
+}

hwe/sammo/ActionItem/che_위압_조목삭.php

@@ -0,0 +1,25 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use \sammo\SpecialityHelper;
+use \sammo\WarUnit;
+use sammo\WarUnitTriggerCaller;
+use \sammo\WarUnitTrigger\che_위압시도;
+use \sammo\WarUnitTrigger\che_위압발동;
+
+class che_위압_조목삭 extends \sammo\BaseItem{
+
+    protected $rawName = '조목삭';
+    protected $name = '조목삭(위압)';
+    protected $info = '[전투] 첫 페이즈 위압 발동(적 공격, 회피 불가, 사기 5 감소)';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new che_위압시도($unit),
+            new che_위압발동($unit)
+        );
+    }
+}

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

@@ -11,7 +11,6 @@ use sammo\WarUnitTrigger\che_전투치료시도;
 
 class che_의술_상한잡병론 extends \sammo\BaseItem{
 
-    protected $id = 24;
     protected $rawName = '상한잡병론';
     protected $name = '상한잡병론(의술)';
     protected $info = '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 40% 확률로 치료 발동(아군 피해 1/3 감소, 부상 회복)';
@@ -29,7 +28,7 @@ class che_의술_상한잡병론 extends \sammo\BaseItem{
         return new WarUnitTriggerCaller(
             new che_전투치료시도($unit, BaseWarUnitTrigger::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*301),
             new che_전투치료발동($unit, BaseWarUnitTrigger::TYPE_ITEM)
-            
+
         );
     }
 }

hwe/sammo/ActionItem/che_의술_정력견혈산.php

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

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

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

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

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

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

@@ -12,7 +12,6 @@ use \sammo\WarUnitTrigger\che_저격발동;
 
 class che_저격_매화수전 extends \sammo\BaseItem{
 
-    protected $id = 70;
     protected $rawName = '매화수전';
     protected $name = '매화수전(저격)';
     protected $info = '[전투] 새로운 상대와 전투 시 50% 확률로 저격 발동, 성공 시 사기+20';

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

@@ -12,7 +12,6 @@ use \sammo\WarUnitTrigger\che_저격발동;
 
 class che_저격_비도 extends \sammo\BaseItem{
 
-    protected $id = 70;
     protected $rawName = '비도';
     protected $name = '비도(저격)';
     protected $info = '[전투] 새로운 상대와 전투 시 50% 확률로 저격 발동, 성공 시 사기+20';

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

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

hwe/sammo/ActionItem/che_저지_삼황내문.php

@@ -0,0 +1,34 @@
+<?php
+namespace sammo\ActionItem;
+
+use sammo\BaseWarUnitTrigger;
+use sammo\Util;
+use sammo\WarUnit;
+use sammo\WarUnitTrigger\che_저지발동;
+use sammo\WarUnitTrigger\WarActivateSkills;
+use sammo\WarUnitTriggerCaller;
+
+class che_저지_삼황내문 extends \sammo\BaseItem{
+    protected $rawName = '삼황내문';
+    protected $name = '삼황내문(저지)';
+    protected $info = '[전투] 수비 시 첫 페이즈 저지, 50% 확률로 2 페이즈 저지';
+    protected $cost = 200;
+    protected $consumable = false;
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        if($unit->isAttacker()){
+            return null;
+        }
+        if($unit->getPhase() >= 2){
+            return null;
+        }
+        if($unit->getPhase() == 1 && Util::randBool(0.5)){
+            return null;
+        }
+
+        return new WarUnitTriggerCaller(
+            new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, true, '특수', '저지'),
+            new che_저지발동($unit)
+        );
+    }
+}