fix: 메시지 수정

fix: DummyGeneral에 penaltyList
fix: NoChief 처리 부실
2024-06-08 18:55:48 +00:00 · 2024-06-08 18:52:47 +00:00 · 2024-06-08 18:48:46 +00:00 · 2024-06-08 18:42:39 +00:00 · 2024-06-08 17:52:13 +00:00 · 2024-06-08 17:47:35 +00:00
82 changed files with 2361 additions and 1991 deletions
@@ -8,12 +8,12 @@
    ],
    "config": {
        "platform": {
-            "php": "8.2"
+            "php": "8.3"
        }
    },
    "require": {
        "brandonwamboldt/utilphp": "^1.1",
-        "sergeytsalkov/meekrodb": "^2.3",
+        "sergeytsalkov/meekrodb": "^2.5",
        "league/plates": "^3.5",
        "vlucas/valitron": "^1.4",
        "php-extended/php-tail": "^5.0",
@@ -22,10 +22,10 @@
        "xemlock/htmlpurifier-html5": "^0.1.7",
        "catfan/medoo": "^2.1",
        "phan/phan": "^5.4",
-        "nette/caching": "^3.2",
+        "nette/caching": "^3.3",
        "illuminate/database": "^10.0",
        "illuminate/events": "^10.0",
-        "php-ds/php-ds": "^1.4",
+        "php-ds/php-ds": "^1.5",
        "hided62/ldto": "^1.0",
        "league/uri": "^6.8"
    },
@@ -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": "e878a776667c3f0cbef0a48b3504d965",
+    "content-hash": "deed9afdc95bc42f84784df67d295223",
    "packages": [
        {
            "name": "brandonwamboldt/utilphp",
@@ -58,25 +58,25 @@
        },
        {
            "name": "brick/math",
-            "version": "0.11.0",
+            "version": "0.12.1",
            "source": {
                "type": "git",
                "url": "https://github.com/brick/math.git",
-                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478"
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478",
-                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478",
+                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
                "shasum": ""
            },
            "require": {
-                "php": "^8.0"
+                "php": "^8.1"
            },
            "require-dev": {
                "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^9.0",
-                "vimeo/psalm": "5.0.0"
+                "phpunit/phpunit": "^10.1",
+                "vimeo/psalm": "5.16.0"
            },
            "type": "library",
            "autoload": {
@@ -96,12 +96,17 @@
                "arithmetic",
                "bigdecimal",
                "bignum",
+                "bignumber",
                "brick",
-                "math"
+                "decimal",
+                "integer",
+                "math",
+                "mathematics",
+                "rational"
            ],
            "support": {
                "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.11.0"
+                "source": "https://github.com/brick/math/tree/0.12.1"
            },
            "funding": [
                {
@@ -109,20 +114,89 @@
                    "type": "github"
                }
            ],
-            "time": "2023-01-15T23:15:59+00:00"
+            "time": "2023-11-29T23:19:16+00:00"
        },
        {
-            "name": "catfan/medoo",
-            "version": "v2.1.8",
+            "name": "carbonphp/carbon-doctrine-types",
+            "version": "2.1.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/catfan/Medoo.git",
-                "reference": "b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4"
+                "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
+                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/catfan/Medoo/zipball/b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4",
-                "reference": "b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
+                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "doctrine/dbal": "<3.7.0 || >=4.0.0"
+            },
+            "require-dev": {
+                "doctrine/dbal": "^3.7.0",
+                "nesbot/carbon": "^2.71.0 || ^3.0.0",
+                "phpunit/phpunit": "^10.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Carbon\\Doctrine\\": "src/Carbon/Doctrine/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "KyleKatarn",
+                    "email": "kylekatarnls@gmail.com"
+                }
+            ],
+            "description": "Types to use Carbon in Doctrine",
+            "keywords": [
+                "carbon",
+                "date",
+                "datetime",
+                "doctrine",
+                "time"
+            ],
+            "support": {
+                "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
+                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/kylekatarnls",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/Carbon",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-12-11T17:09:12+00:00"
+        },
+        {
+            "name": "catfan/medoo",
+            "version": "v2.1.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/catfan/Medoo.git",
+                "reference": "d1ff4e0e873a3e032e3d8804031dd6be4e013b22"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/catfan/Medoo/zipball/d1ff4e0e873a3e032e3d8804031dd6be4e013b22",
+                "reference": "d1ff4e0e873a3e032e3d8804031dd6be4e013b22",
                "shasum": ""
            },
            "require": {
@@ -185,20 +259,20 @@
                    "type": "open_collective"
                }
            ],
-            "time": "2023-01-20T09:30:24+00:00"
+            "time": "2024-02-03T11:28:59+00:00"
        },
        {
            "name": "composer/pcre",
-            "version": "3.1.0",
+            "version": "3.1.3",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/pcre.git",
-                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
+                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
-                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
+                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
                "shasum": ""
            },
            "require": {
@@ -240,7 +314,7 @@
            ],
            "support": {
                "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.0"
+                "source": "https://github.com/composer/pcre/tree/3.1.3"
            },
            "funding": [
                {
@@ -256,20 +330,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-17T09:50:14+00:00"
+            "time": "2024-03-19T10:26:25+00:00"
        },
        {
            "name": "composer/semver",
-            "version": "3.3.2",
+            "version": "3.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/semver.git",
-                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
+                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
-                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
+                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
                "shasum": ""
            },
            "require": {
@@ -319,9 +393,9 @@
                "versioning"
            ],
            "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.3.2"
+                "source": "https://github.com/composer/semver/tree/3.4.0"
            },
            "funding": [
                {
@@ -337,20 +411,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-04-01T19:23:25+00:00"
+            "time": "2023-08-31T09:50:34+00:00"
        },
        {
            "name": "composer/xdebug-handler",
-            "version": "3.0.3",
+            "version": "3.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
                "shasum": ""
            },
            "require": {
@@ -361,7 +435,7 @@
            "require-dev": {
                "phpstan/phpstan": "^1.0",
                "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^6.0"
+                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
            },
            "type": "library",
            "autoload": {
@@ -385,9 +459,9 @@
                "performance"
            ],
            "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
            },
            "funding": [
                {
@@ -403,32 +477,79 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-02-25T21:32:43+00:00"
+            "time": "2024-05-06T16:37:16+00:00"
        },
        {
-            "name": "doctrine/inflector",
-            "version": "2.0.6",
+            "name": "doctrine/deprecations",
+            "version": "1.1.3",
            "source": {
                "type": "git",
-                "url": "https://github.com/doctrine/inflector.git",
-                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"
+                "url": "https://github.com/doctrine/deprecations.git",
+                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
-                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^9",
+                "phpstan/phpstan": "1.4.10 || 1.10.15",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "psalm/plugin-phpunit": "0.18.4",
+                "psr/log": "^1 || ^2 || ^3",
+                "vimeo/psalm": "4.30.0 || 5.12.0"
+            },
+            "suggest": {
+                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
+            "homepage": "https://www.doctrine-project.org/",
+            "support": {
+                "issues": "https://github.com/doctrine/deprecations/issues",
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
+            },
+            "time": "2024-01-30T19:34:25+00:00"
+        },
+        {
+            "name": "doctrine/inflector",
+            "version": "2.0.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/inflector.git",
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
                "shasum": ""
            },
            "require": {
                "php": "^7.2 || ^8.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^10",
+                "doctrine/coding-standard": "^11.0",
                "phpstan/phpstan": "^1.8",
                "phpstan/phpstan-phpunit": "^1.1",
                "phpstan/phpstan-strict-rules": "^1.3",
                "phpunit/phpunit": "^8.5 || ^9.5",
-                "vimeo/psalm": "^4.25"
+                "vimeo/psalm": "^4.25 || ^5.4"
            },
            "type": "library",
            "autoload": {
@@ -478,7 +599,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.6"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
            },
            "funding": [
                {
@@ -494,24 +615,24 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-10-20T09:10:12+00:00"
+            "time": "2024-02-18T20:23:39+00:00"
        },
        {
            "name": "ezyang/htmlpurifier",
-            "version": "v4.16.0",
+            "version": "v4.17.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8"
+                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8",
-                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c",
                "shasum": ""
            },
            "require": {
-                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
            },
            "require-dev": {
                "cerdic/css-tidy": "^1.7 || ^2.0",
@@ -553,9 +674,9 @@
            ],
            "support": {
                "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0"
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0"
            },
-            "time": "2022-09-18T07:06:19+00:00"
+            "time": "2023-11-17T15:01:25+00:00"
        },
        {
            "name": "felixfbecker/advanced-json-rpc",
@@ -604,16 +725,16 @@
        },
        {
            "name": "hided62/ldto",
-            "version": "v1.0.0",
+            "version": "v1.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/hided62/ldto.git",
-                "reference": "4c05401406f8afc1636a90763c13884f8fff0d14"
+                "reference": "7f0cc568e35120868fe1178e96265c4fa0624820"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/hided62/ldto/zipball/4c05401406f8afc1636a90763c13884f8fff0d14",
-                "reference": "4c05401406f8afc1636a90763c13884f8fff0d14",
+                "url": "https://api.github.com/repos/hided62/ldto/zipball/7f0cc568e35120868fe1178e96265c4fa0624820",
+                "reference": "7f0cc568e35120868fe1178e96265c4fa0624820",
                "shasum": ""
            },
            "require": {
@@ -652,22 +773,22 @@
            ],
            "support": {
                "issues": "https://github.com/hided62/ldto/issues",
-                "source": "https://github.com/hided62/ldto/tree/v1.0.0"
+                "source": "https://github.com/hided62/ldto/tree/v1.0.1"
            },
-            "time": "2022-08-05T14:30:13+00:00"
+            "time": "2023-03-04T07:51:45+00:00"
        },
        {
            "name": "illuminate/bus",
-            "version": "v10.1.5",
+            "version": "v10.48.10",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/bus.git",
-                "reference": "139999f560611623c7da494faa3d8a92f8e22e68"
+                "reference": "33993b8f54e91b03fb5000e55693e146e7370763"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/bus/zipball/139999f560611623c7da494faa3d8a92f8e22e68",
-                "reference": "139999f560611623c7da494faa3d8a92f8e22e68",
+                "url": "https://api.github.com/repos/illuminate/bus/zipball/33993b8f54e91b03fb5000e55693e146e7370763",
+                "reference": "33993b8f54e91b03fb5000e55693e146e7370763",
                "shasum": ""
            },
            "require": {
@@ -707,20 +828,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2022-11-30T17:23:35+00:00"
+            "time": "2024-02-23T15:38:25+00:00"
        },
        {
            "name": "illuminate/collections",
-            "version": "v10.1.5",
+            "version": "v10.48.10",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/collections.git",
-                "reference": "f48e6e52860edc9f261f414a85ed2b9b295a324c"
+                "reference": "f9589f1063a449111dcaa1d68285b507d9483a95"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/collections/zipball/f48e6e52860edc9f261f414a85ed2b9b295a324c",
-                "reference": "f48e6e52860edc9f261f414a85ed2b9b295a324c",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/f9589f1063a449111dcaa1d68285b507d9483a95",
+                "reference": "f9589f1063a449111dcaa1d68285b507d9483a95",
                "shasum": ""
            },
            "require": {
@@ -762,11 +883,11 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2023-02-22T14:38:35+00:00"
+            "time": "2024-03-20T20:09:13+00:00"
        },
        {
            "name": "illuminate/conditionable",
-            "version": "v10.1.5",
+            "version": "v10.48.10",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/conditionable.git",
@@ -812,16 +933,16 @@
        },
        {
            "name": "illuminate/container",
-            "version": "v10.1.5",
+            "version": "v10.48.10",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/container.git",
-                "reference": "fed3ee8f7389ad431833935d9ed665bc02ac2cca"
+                "reference": "ddc26273085fad3c471b2602ad820e0097ff7939"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/container/zipball/fed3ee8f7389ad431833935d9ed665bc02ac2cca",
-                "reference": "fed3ee8f7389ad431833935d9ed665bc02ac2cca",
+                "url": "https://api.github.com/repos/illuminate/container/zipball/ddc26273085fad3c471b2602ad820e0097ff7939",
+                "reference": "ddc26273085fad3c471b2602ad820e0097ff7939",
                "shasum": ""
            },
            "require": {
@@ -859,20 +980,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2023-01-25T18:11:51+00:00"
+            "time": "2023-06-18T09:12:03+00:00"
        },
        {
            "name": "illuminate/contracts",
-            "version": "v10.1.5",
+            "version": "v10.48.10",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/contracts.git",
-                "reference": "84f1da424ab9596a422ce118abd05667b0069624"
+                "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/84f1da424ab9596a422ce118abd05667b0069624",
-                "reference": "84f1da424ab9596a422ce118abd05667b0069624",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac",
+                "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac",
                "shasum": ""
            },
            "require": {
@@ -907,24 +1028,24 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2023-02-14T15:00:37+00:00"
+            "time": "2024-01-15T18:52:32+00:00"
        },
        {
            "name": "illuminate/database",
-            "version": "v10.1.5",
+            "version": "v10.48.10",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/database.git",
-                "reference": "782940a3092e86c8d022d6d8d168b64fb97933a5"
+                "reference": "eb8edf206d3a6eea8894bc6e21f53469e27dd5c9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/database/zipball/782940a3092e86c8d022d6d8d168b64fb97933a5",
-                "reference": "782940a3092e86c8d022d6d8d168b64fb97933a5",
+                "url": "https://api.github.com/repos/illuminate/database/zipball/eb8edf206d3a6eea8894bc6e21f53469e27dd5c9",
+                "reference": "eb8edf206d3a6eea8894bc6e21f53469e27dd5c9",
                "shasum": ""
            },
            "require": {
-                "brick/math": "^0.9.3|^0.10.2|^0.11",
+                "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
                "ext-pdo": "*",
                "illuminate/collections": "^10.0",
                "illuminate/container": "^10.0",
@@ -933,6 +1054,10 @@
                "illuminate/support": "^10.0",
                "php": "^8.1"
            },
+            "conflict": {
+                "carbonphp/carbon-doctrine-types": ">=3.0",
+                "doctrine/dbal": ">=4.0"
+            },
            "suggest": {
                "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
                "ext-filter": "Required to use the Postgres database driver.",
@@ -976,20 +1101,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2023-02-23T18:43:10+00:00"
+            "time": "2024-04-29T13:23:17+00:00"
        },
        {
            "name": "illuminate/events",
-            "version": "v10.1.5",
+            "version": "v10.48.10",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/events.git",
-                "reference": "c68138ea57360c19a145e5912fb474cfd1845366"
+                "reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/events/zipball/c68138ea57360c19a145e5912fb474cfd1845366",
-                "reference": "c68138ea57360c19a145e5912fb474cfd1845366",
+                "url": "https://api.github.com/repos/illuminate/events/zipball/a931bfa88edc6ac52c9abbfd7b769343d321d3eb",
+                "reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb",
                "shasum": ""
            },
            "require": {
@@ -1031,20 +1156,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2023-02-16T15:35:09+00:00"
+            "time": "2024-03-04T14:41:04+00:00"
        },
        {
            "name": "illuminate/macroable",
-            "version": "v10.1.5",
+            "version": "v10.48.10",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/macroable.git",
-                "reference": "7686fe9dba1e236e6f695a148b551264b9fd479e"
+                "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/macroable/zipball/7686fe9dba1e236e6f695a148b551264b9fd479e",
-                "reference": "7686fe9dba1e236e6f695a148b551264b9fd479e",
+                "url": "https://api.github.com/repos/illuminate/macroable/zipball/dff667a46ac37b634dcf68909d9d41e94dc97c27",
+                "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27",
                "shasum": ""
            },
            "require": {
@@ -1077,20 +1202,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2023-01-30T23:18:36+00:00"
+            "time": "2023-06-05T12:46:42+00:00"
        },
        {
            "name": "illuminate/pipeline",
-            "version": "v10.1.5",
+            "version": "v10.48.10",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/pipeline.git",
-                "reference": "549fc7f9b2e6fef0436ca0f68714e1a0e4de8aad"
+                "reference": "f802187e917a171332cc90f8c1a102939c57405d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/pipeline/zipball/549fc7f9b2e6fef0436ca0f68714e1a0e4de8aad",
-                "reference": "549fc7f9b2e6fef0436ca0f68714e1a0e4de8aad",
+                "url": "https://api.github.com/repos/illuminate/pipeline/zipball/f802187e917a171332cc90f8c1a102939c57405d",
+                "reference": "f802187e917a171332cc90f8c1a102939c57405d",
                "shasum": ""
            },
            "require": {
@@ -1125,20 +1250,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2022-06-10T06:51:19+00:00"
+            "time": "2023-12-19T14:47:26+00:00"
        },
        {
            "name": "illuminate/support",
-            "version": "v10.1.5",
+            "version": "v10.48.10",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/support.git",
-                "reference": "0311d96fb673e9694e1df838abb12f4e4019cdc4"
+                "reference": "ee3a1aaed36d916654ce0ae09dfbd38644a4f582"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/0311d96fb673e9694e1df838abb12f4e4019cdc4",
-                "reference": "0311d96fb673e9694e1df838abb12f4e4019cdc4",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/ee3a1aaed36d916654ce0ae09dfbd38644a4f582",
+                "reference": "ee3a1aaed36d916654ce0ae09dfbd38644a4f582",
                "shasum": ""
            },
            "require": {
@@ -1150,7 +1275,7 @@
                "illuminate/conditionable": "^10.0",
                "illuminate/contracts": "^10.0",
                "illuminate/macroable": "^10.0",
-                "nesbot/carbon": "^2.62.1",
+                "nesbot/carbon": "^2.67",
                "php": "^8.1",
                "voku/portable-ascii": "^2.0"
            },
@@ -1196,7 +1321,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2023-02-23T07:42:03+00:00"
+            "time": "2024-04-07T17:47:33+00:00"
        },
        {
            "name": "league/plates",
@@ -1435,16 +1560,16 @@
        },
        {
            "name": "microsoft/tolerant-php-parser",
-            "version": "v0.1.1",
+            "version": "v0.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/microsoft/tolerant-php-parser.git",
-                "reference": "6a965617cf484355048ac6d2d3de7b6ec93abb16"
+                "reference": "3eccfd273323aaf69513e2f1c888393f5947804b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/microsoft/tolerant-php-parser/zipball/6a965617cf484355048ac6d2d3de7b6ec93abb16",
-                "reference": "6a965617cf484355048ac6d2d3de7b6ec93abb16",
+                "url": "https://api.github.com/repos/microsoft/tolerant-php-parser/zipball/3eccfd273323aaf69513e2f1c888393f5947804b",
+                "reference": "3eccfd273323aaf69513e2f1c888393f5947804b",
                "shasum": ""
            },
            "require": {
@@ -1474,34 +1599,39 @@
            "description": "Tolerant PHP-to-AST parser designed for IDE usage scenarios",
            "support": {
                "issues": "https://github.com/microsoft/tolerant-php-parser/issues",
-                "source": "https://github.com/microsoft/tolerant-php-parser/tree/v0.1.1"
+                "source": "https://github.com/microsoft/tolerant-php-parser/tree/v0.1.2"
            },
-            "time": "2021-07-16T21:28:12+00:00"
+            "time": "2022-10-05T17:30:19+00:00"
        },
        {
            "name": "nesbot/carbon",
-            "version": "2.66.0",
+            "version": "2.72.3",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "496712849902241f04902033b0441b269effe001"
+                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/496712849902241f04902033b0441b269effe001",
-                "reference": "496712849902241f04902033b0441b269effe001",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83",
+                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83",
                "shasum": ""
            },
            "require": {
+                "carbonphp/carbon-doctrine-types": "*",
                "ext-json": "*",
                "php": "^7.1.8 || ^8.0",
+                "psr/clock": "^1.0",
                "symfony/polyfill-mbstring": "^1.0",
                "symfony/polyfill-php80": "^1.16",
                "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
            },
+            "provide": {
+                "psr/clock-implementation": "1.0"
+            },
            "require-dev": {
-                "doctrine/dbal": "^2.0 || ^3.1.4",
-                "doctrine/orm": "^2.7",
+                "doctrine/dbal": "^2.0 || ^3.1.4 || ^4.0",
+                "doctrine/orm": "^2.7 || ^3.0",
                "friendsofphp/php-cs-fixer": "^3.0",
                "kylekatarnls/multi-tester": "^2.0",
                "ondrejmirtes/better-reflection": "*",
@@ -1578,20 +1708,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-29T18:53:47+00:00"
+            "time": "2024-01-25T10:35:09+00:00"
        },
        {
            "name": "netresearch/jsonmapper",
-            "version": "v4.1.0",
+            "version": "v4.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f"
+                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f",
-                "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0",
+                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0",
                "shasum": ""
            },
            "require": {
@@ -1602,7 +1732,7 @@
                "php": ">=7.1"
            },
            "require-dev": {
-                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
+                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0",
                "squizlabs/php_codesniffer": "~3.5"
            },
            "type": "library",
@@ -1627,31 +1757,33 @@
            "support": {
                "email": "cweiske@cweiske.de",
                "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0"
+                "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1"
            },
-            "time": "2022-12-08T20:46:14+00:00"
+            "time": "2024-01-31T06:18:54+00:00"
        },
        {
            "name": "nette/caching",
-            "version": "v3.2.2",
+            "version": "v3.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/nette/caching.git",
-                "reference": "ceb814d7f0a2bb4eb5afbe908467801001187745"
+                "reference": "3053707a892e100e81efb53dc8c294dca5e076d0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/caching/zipball/ceb814d7f0a2bb4eb5afbe908467801001187745",
-                "reference": "ceb814d7f0a2bb4eb5afbe908467801001187745",
+                "url": "https://api.github.com/repos/nette/caching/zipball/3053707a892e100e81efb53dc8c294dca5e076d0",
+                "reference": "3053707a892e100e81efb53dc8c294dca5e076d0",
                "shasum": ""
            },
            "require": {
-                "nette/finder": "^2.4 || ^3.0",
-                "nette/utils": "^3.2 || ~4.0.0",
-                "php": ">=8.0 <8.3"
+                "nette/utils": "^4.0",
+                "php": "8.0 - 8.3"
+            },
+            "conflict": {
+                "latte/latte": ">=3.0.0 <3.0.12"
            },
            "require-dev": {
-                "latte/latte": "^2.11 || ^3.0",
+                "latte/latte": "^2.11 || ^3.0.12",
                "nette/di": "^3.1 || ^4.0",
                "nette/tester": "^2.4",
                "phpstan/phpstan": "^1.0",
@@ -1663,7 +1795,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.3-dev"
                }
            },
            "autoload": {
@@ -1698,79 +1830,26 @@
            ],
            "support": {
                "issues": "https://github.com/nette/caching/issues",
-                "source": "https://github.com/nette/caching/tree/v3.2.2"
+                "source": "https://github.com/nette/caching/tree/v3.3.0"
            },
-            "time": "2023-02-04T13:52:33+00:00"
-        },
-        {
-            "name": "nette/finder",
-            "version": "v3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nette/finder.git",
-                "reference": "027395c638637de95c8e9fad49a7c51249404ed2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nette/finder/zipball/027395c638637de95c8e9fad49a7c51249404ed2",
-                "reference": "027395c638637de95c8e9fad49a7c51249404ed2",
-                "shasum": ""
-            },
-            "require": {
-                "nette/utils": "^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause",
-                "GPL-2.0-only",
-                "GPL-3.0-only"
-            ],
-            "authors": [
-                {
-                    "name": "David Grudl",
-                    "homepage": "https://davidgrudl.com"
-                },
-                {
-                    "name": "Nette Community",
-                    "homepage": "https://nette.org/contributors"
-                }
-            ],
-            "description": "🔍 Nette Finder: find files and directories with an intuitive API.",
-            "homepage": "https://nette.org",
-            "keywords": [
-                "filesystem",
-                "glob",
-                "iterator",
-                "nette"
-            ],
-            "support": {
-                "issues": "https://github.com/nette/finder/issues",
-                "source": "https://github.com/nette/finder/tree/v3.0.0"
-            },
-            "time": "2022-12-14T17:05:54+00:00"
+            "time": "2024-03-10T22:07:25+00:00"
        },
        {
            "name": "nette/utils",
-            "version": "v4.0.0",
+            "version": "v4.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/nette/utils.git",
-                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e"
+                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/cacdbf5a91a657ede665c541eda28941d4b09c1e",
-                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e",
+                "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
+                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.0 <8.3"
+                "php": ">=8.0 <8.4"
            },
            "conflict": {
                "nette/finder": "<3",
@@ -1778,7 +1857,7 @@
            },
            "require-dev": {
                "jetbrains/phpstorm-attributes": "dev-master",
-                "nette/tester": "^2.4",
+                "nette/tester": "^2.5",
                "phpstan/phpstan": "^1.0",
                "tracy/tracy": "^2.9"
            },
@@ -1788,8 +1867,7 @@
                "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
                "ext-json": "to use Nette\\Utils\\Json",
                "ext-mbstring": "to use Strings::lower() etc...",
-                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()",
-                "ext-xml": "to use Strings::length() etc. when mbstring is not available"
+                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
            },
            "type": "library",
            "extra": {
@@ -1838,22 +1916,22 @@
            ],
            "support": {
                "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.0"
+                "source": "https://github.com/nette/utils/tree/v4.0.4"
            },
-            "time": "2023-02-02T10:41:53+00:00"
+            "time": "2024-01-17T16:50:36+00:00"
        },
        {
            "name": "phan/phan",
-            "version": "5.4.1",
+            "version": "5.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/phan/phan.git",
-                "reference": "fef40178a952bcfcc3f69b76989dd613c3d5c759"
+                "reference": "86a7acd99c1239b8867b49feca2398851212e7fe"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phan/phan/zipball/fef40178a952bcfcc3f69b76989dd613c3d5c759",
-                "reference": "fef40178a952bcfcc3f69b76989dd613c3d5c759",
+                "url": "https://api.github.com/repos/phan/phan/zipball/86a7acd99c1239b8867b49feca2398851212e7fe",
+                "reference": "86a7acd99c1239b8867b49feca2398851212e7fe",
                "shasum": ""
            },
            "require": {
@@ -1863,11 +1941,11 @@
                "ext-json": "*",
                "ext-tokenizer": "*",
                "felixfbecker/advanced-json-rpc": "^3.0.4",
-                "microsoft/tolerant-php-parser": "0.1.1",
+                "microsoft/tolerant-php-parser": "0.1.2",
                "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0|^4.0",
                "php": "^7.2.0|^8.0.0",
                "sabre/event": "^5.1.3",
-                "symfony/console": "^3.2|^4.0|^5.0|^6.0",
+                "symfony/console": "^3.2|^4.0|^5.0|^6.0|^7.0",
                "symfony/polyfill-mbstring": "^1.11.0",
                "symfony/polyfill-php80": "^1.20.0",
                "tysonandre/var_representation_polyfill": "^0.0.2|^0.1.0"
@@ -1913,26 +1991,27 @@
            "keywords": [
                "analyzer",
                "php",
-                "static"
+                "static",
+                "static analysis"
            ],
            "support": {
                "issues": "https://github.com/phan/phan/issues",
-                "source": "https://github.com/phan/phan/tree/5.4.1"
+                "source": "https://github.com/phan/phan/tree/5.4.3"
            },
-            "time": "2022-08-26T00:49:07+00:00"
+            "time": "2023-12-26T17:57:35+00:00"
        },
        {
            "name": "php-ds/php-ds",
-            "version": "v1.4.1",
+            "version": "v1.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/php-ds/polyfill.git",
-                "reference": "43d2df301a9e2017f67b8c11d94a5222f9c00fd1"
+                "reference": "7b2c5f1843466d50769a0682ce6fa9ddaaa99cb4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-ds/polyfill/zipball/43d2df301a9e2017f67b8c11d94a5222f9c00fd1",
-                "reference": "43d2df301a9e2017f67b8c11d94a5222f9c00fd1",
+                "url": "https://api.github.com/repos/php-ds/polyfill/zipball/7b2c5f1843466d50769a0682ce6fa9ddaaa99cb4",
+                "reference": "7b2c5f1843466d50769a0682ce6fa9ddaaa99cb4",
                "shasum": ""
            },
            "require": {
@@ -1940,10 +2019,10 @@
                "php": ">=7.0"
            },
            "provide": {
-                "ext-ds": "1.3.0"
+                "ext-ds": "1.5.0"
            },
            "require-dev": {
-                "php-ds/tests": "^1.3"
+                "php-ds/tests": "^1.5"
            },
            "suggest": {
                "ext-ds": "to improve performance and reduce memory usage"
@@ -1972,22 +2051,22 @@
            ],
            "support": {
                "issues": "https://github.com/php-ds/polyfill/issues",
-                "source": "https://github.com/php-ds/polyfill/tree/v1.4.1"
+                "source": "https://github.com/php-ds/polyfill/tree/v1.5.0"
            },
-            "time": "2022-03-09T20:39:30+00:00"
+            "time": "2023-12-19T16:52:21+00:00"
        },
        {
            "name": "php-extended/php-system",
-            "version": "5.0.0",
+            "version": "5.0.1",
            "source": {
                "type": "git",
                "url": "git@gitlab.com:php-extended/php-system.git",
-                "reference": "c269fbf3d358679b229b922b6c5be5dac9bbd1ab"
+                "reference": "a80365cc08f43e740f3d1b77505d3242d954555a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-system/repository/archive.zip?sha=c269fbf3d358679b229b922b6c5be5dac9bbd1ab",
-                "reference": "c269fbf3d358679b229b922b6c5be5dac9bbd1ab",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-system/repository/archive.zip?sha=a80365cc08f43e740f3d1b77505d3242d954555a",
+                "reference": "a80365cc08f43e740f3d1b77505d3242d954555a",
                "shasum": ""
            },
            "require": {
@@ -2025,20 +2104,20 @@
                "issues": "https://gitlab.com/php-extended/php-system/issues",
                "source": "https://gitlab.com/php-extended/php-system"
            },
-            "time": "2022-12-12T07:20:57+00:00"
+            "time": "2023-06-26T19:35:14+00:00"
        },
        {
            "name": "php-extended/php-tail",
-            "version": "5.0.0",
+            "version": "5.0.1",
            "source": {
                "type": "git",
                "url": "git@gitlab.com:php-extended/php-tail.git",
-                "reference": "d932ed124887b0e0691751a4bb197b759707e1d8"
+                "reference": "4a76745626d8e0359fee3bf87614e2478b3f80c5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-tail/repository/archive.zip?sha=d932ed124887b0e0691751a4bb197b759707e1d8",
-                "reference": "d932ed124887b0e0691751a4bb197b759707e1d8",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-tail/repository/archive.zip?sha=4a76745626d8e0359fee3bf87614e2478b3f80c5",
+                "reference": "4a76745626d8e0359fee3bf87614e2478b3f80c5",
                "shasum": ""
            },
            "require": {
@@ -2078,20 +2157,20 @@
                "issues": "https://gitlab.com/php-extended/php-tail/issues",
                "source": "https://gitlab.com/php-extended/php-tail"
            },
-            "time": "2022-12-18T11:15:32+00:00"
+            "time": "2023-06-26T19:35:24+00:00"
        },
        {
            "name": "php-extended/polyfill-php80-stringable",
-            "version": "1.2.0",
+            "version": "1.2.12",
            "source": {
                "type": "git",
-                "url": "git@gitlab.com:php-extended/polyfill-php80-stringable.git",
-                "reference": "a6199e7ea09ddafaae9c22d6bd297aa4704b6608"
+                "url": "https://gitlab.com/php-extended/polyfill-php80-stringable.git",
+                "reference": "ea728554a1d83c75ebb7eec69689fdb6c067b5e4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fpolyfill-php80-stringable/repository/archive.zip?sha=a6199e7ea09ddafaae9c22d6bd297aa4704b6608",
-                "reference": "a6199e7ea09ddafaae9c22d6bd297aa4704b6608",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fpolyfill-php80-stringable/repository/archive.zip?sha=ea728554a1d83c75ebb7eec69689fdb6c067b5e4",
+                "reference": "ea728554a1d83c75ebb7eec69689fdb6c067b5e4",
                "shasum": ""
            },
            "require": {
@@ -2126,7 +2205,7 @@
                "issues": "https://gitlab.com/php-extended/polyfill-php80-stringable/issues",
                "source": "https://gitlab.com/php-extended/polyfill-php80-stringable"
            },
-            "time": "2022-12-07T22:15:21+00:00"
+            "time": "2024-03-31T13:21:37+00:00"
        },
        {
            "name": "phpdocumentor/reflection-common",
@@ -2183,28 +2262,35 @@
        },
        {
            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
+            "version": "5.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
+                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a",
+                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a",
                "shasum": ""
            },
            "require": {
+                "doctrine/deprecations": "^1.1",
                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
+                "php": "^7.4 || ^8.0",
                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
+                "phpdocumentor/type-resolver": "^1.7",
+                "phpstan/phpdoc-parser": "^1.7",
                "webmozart/assert": "^1.9.1"
            },
            "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
+                "mockery/mockery": "~1.3.5",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-webmozart-assert": "^1.2",
+                "phpunit/phpunit": "^9.5",
+                "vimeo/psalm": "^5.13"
            },
            "type": "library",
            "extra": {
@@ -2228,36 +2314,39 @@
                },
                {
                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
+                    "email": "opensource@ijaap.nl"
                }
            ],
            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
            "support": {
                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0"
            },
-            "time": "2021-10-19T17:43:47+00:00"
+            "time": "2024-04-09T21:13:58+00:00"
        },
        {
            "name": "phpdocumentor/type-resolver",
-            "version": "1.6.2",
+            "version": "1.8.2",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d"
+                "reference": "153ae662783729388a584b4361f2545e4d841e3c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
-                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
+                "reference": "153ae662783729388a584b4361f2545e4d841e3c",
                "shasum": ""
            },
            "require": {
-                "php": "^7.4 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
+                "doctrine/deprecations": "^1.0",
+                "php": "^7.3 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.0",
+                "phpstan/phpdoc-parser": "^1.13"
            },
            "require-dev": {
                "ext-tokenizer": "*",
+                "phpbench/phpbench": "^1.2",
                "phpstan/extension-installer": "^1.1",
                "phpstan/phpstan": "^1.8",
                "phpstan/phpstan-phpunit": "^1.1",
@@ -2289,9 +2378,104 @@
            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
            "support": {
                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2"
            },
-            "time": "2022-10-14T12:47:21+00:00"
+            "time": "2024-02-23T11:10:43+00:00"
+        },
+        {
+            "name": "phpstan/phpdoc-parser",
+            "version": "1.29.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpdoc-parser.git",
+                "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/536889f2b340489d328f5ffb7b02bb6b183ddedc",
+                "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^2.0",
+                "nikic/php-parser": "^4.15",
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^1.5",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpstan/phpstan-strict-rules": "^1.0",
+                "phpunit/phpunit": "^9.5",
+                "symfony/process": "^5.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\PhpDocParser\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPDoc parser with support for nullable, intersection and generic types",
+            "support": {
+                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.0"
+            },
+            "time": "2024-05-06T12:04:23+00:00"
+        },
+        {
+            "name": "psr/clock",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/clock.git",
+                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+                "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Clock\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for reading the clock.",
+            "homepage": "https://github.com/php-fig/clock",
+            "keywords": [
+                "clock",
+                "now",
+                "psr",
+                "psr-20",
+                "time"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/clock/issues",
+                "source": "https://github.com/php-fig/clock/tree/1.0.0"
+            },
+            "time": "2022-11-25T14:36:26+00:00"
        },
        {
            "name": "psr/container",
@@ -2348,25 +2532,25 @@
        },
        {
            "name": "psr/http-message",
-            "version": "1.0.1",
+            "version": "1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3.0"
+                "php": "^7.2 || ^8.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                }
            },
            "autoload": {
@@ -2395,9 +2579,9 @@
                "response"
            ],
            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
+                "source": "https://github.com/php-fig/http-message/tree/1.1"
            },
-            "time": "2016-08-06T14:39:51+00:00"
+            "time": "2023-04-04T09:50:52+00:00"
        },
        {
            "name": "psr/log",
@@ -2568,16 +2752,16 @@
        },
        {
            "name": "sergeytsalkov/meekrodb",
-            "version": "v2.4",
+            "version": "v2.5.1",
            "source": {
                "type": "git",
                "url": "https://github.com/SergeyTsalkov/meekrodb.git",
-                "reference": "e30c240d54bc81f58c58507a9ed768032eb494a5"
+                "reference": "08b683a274365983aaf033cf9c589dcbe5190028"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/SergeyTsalkov/meekrodb/zipball/e30c240d54bc81f58c58507a9ed768032eb494a5",
-                "reference": "e30c240d54bc81f58c58507a9ed768032eb494a5",
+                "url": "https://api.github.com/repos/SergeyTsalkov/meekrodb/zipball/08b683a274365983aaf033cf9c589dcbe5190028",
+                "reference": "08b683a274365983aaf033cf9c589dcbe5190028",
                "shasum": ""
            },
            "require": {
@@ -2610,55 +2794,52 @@
            "support": {
                "email": "support@meekro.com",
                "issues": "https://github.com/SergeyTsalkov/meekrodb/issues",
-                "source": "https://github.com/SergeyTsalkov/meekrodb/tree/v2.4"
+                "source": "https://github.com/SergeyTsalkov/meekrodb/tree/v2.5.1"
            },
-            "time": "2021-06-29T04:31:23+00:00"
+            "time": "2023-10-10T00:28:49+00:00"
        },
        {
            "name": "symfony/console",
-            "version": "v6.2.7",
+            "version": "v7.0.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45"
+                "reference": "c981e0e9380ce9f146416bde3150c79197ce9986"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
-                "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c981e0e9380ce9f146416bde3150c79197ce9986",
+                "reference": "c981e0e9380ce9f146416bde3150c79197ce9986",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.1|^3",
+                "php": ">=8.2",
                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/string": "^5.4|^6.0"
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/string": "^6.4|^7.0"
            },
            "conflict": {
-                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<5.4",
-                "symfony/process": "<5.4"
+                "symfony/dependency-injection": "<6.4",
+                "symfony/dotenv": "<6.4",
+                "symfony/event-dispatcher": "<6.4",
+                "symfony/lock": "<6.4",
+                "symfony/process": "<6.4"
            },
            "provide": {
                "psr/log-implementation": "1.0|2.0|3.0"
            },
            "require-dev": {
                "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/lock": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/var-dumper": "^5.4|^6.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
            },
            "type": "library",
            "autoload": {
@@ -2687,12 +2868,12 @@
            "homepage": "https://symfony.com",
            "keywords": [
                "cli",
-                "command line",
+                "command-line",
                "console",
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v6.2.7"
+                "source": "https://github.com/symfony/console/tree/v7.0.7"
            },
            "funding": [
                {
@@ -2708,20 +2889,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-25T17:00:03+00:00"
+            "time": "2024-04-18T09:29:19+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
-            "version": "v3.2.1",
+            "version": "v3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "0121954c80fd17c18cf050fe73360e63bb43d4fb"
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0121954c80fd17c18cf050fe73360e63bb43d4fb",
-                "reference": "0121954c80fd17c18cf050fe73360e63bb43d4fb",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
                "shasum": ""
            },
            "require": {
@@ -2730,7 +2911,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.3-dev"
+                    "dev-main": "3.5-dev"
                },
                "thanks": {
                    "name": "symfony/contracts",
@@ -2759,7 +2940,7 @@
            "description": "A generic function and convention to trigger deprecation notices",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
            },
            "funding": [
                {
@@ -2775,33 +2956,34 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-02T07:48:03+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
        },
        {
            "name": "symfony/lock",
-            "version": "v6.2.7",
+            "version": "v6.4.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/lock.git",
-                "reference": "febdeed9473e568ff34bf4350c04760f5357dfe2"
+                "reference": "c6b3959c418a7c1115c060fab77927ca4bd2546a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/febdeed9473e568ff34bf4350c04760f5357dfe2",
-                "reference": "febdeed9473e568ff34bf4350c04760f5357dfe2",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/c6b3959c418a7c1115c060fab77927ca4bd2546a",
+                "reference": "c6b3959c418a7c1115c060fab77927ca4bd2546a",
                "shasum": ""
            },
            "require": {
                "php": ">=8.1",
-                "psr/log": "^1|^2|^3"
+                "psr/log": "^1|^2|^3",
+                "symfony/deprecation-contracts": "^2.5|^3"
            },
            "conflict": {
                "doctrine/dbal": "<2.13",
                "symfony/cache": "<6.2"
            },
            "require-dev": {
-                "doctrine/dbal": "^2.13|^3.0",
-                "predis/predis": "~1.0"
+                "doctrine/dbal": "^2.13|^3|^4",
+                "predis/predis": "^1.1|^2.0"
            },
            "type": "library",
            "autoload": {
@@ -2837,7 +3019,7 @@
                "semaphore"
            ],
            "support": {
-                "source": "https://github.com/symfony/lock/tree/v6.2.7"
+                "source": "https://github.com/symfony/lock/tree/v6.4.7"
            },
            "funding": [
                {
@@ -2853,20 +3035,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-24T10:42:00+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.27.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
                "shasum": ""
            },
            "require": {
@@ -2880,9 +3062,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -2919,7 +3098,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
            },
            "funding": [
                {
@@ -2935,20 +3114,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.27.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "511a08c03c1960e08a883f4cffcacd219b758354"
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354",
-                "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
                "shasum": ""
            },
            "require": {
@@ -2959,9 +3138,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -3000,7 +3176,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
            },
            "funding": [
                {
@@ -3016,20 +3192,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.27.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
-                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
                "shasum": ""
            },
            "require": {
@@ -3040,9 +3216,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -3084,7 +3257,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
            },
            "funding": [
                {
@@ -3100,20 +3273,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.27.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
                "shasum": ""
            },
            "require": {
@@ -3127,9 +3300,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -3167,7 +3337,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
            },
            "funding": [
                {
@@ -3183,20 +3353,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-php80",
-            "version": "v1.27.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
                "shasum": ""
            },
            "require": {
@@ -3204,9 +3374,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -3250,7 +3417,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
            },
            "funding": [
                {
@@ -3266,36 +3433,34 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/service-contracts",
-            "version": "v3.2.1",
+            "version": "v3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "aee5f59db63978f7785290b94d2f12286b1b590a"
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/aee5f59db63978f7785290b94d2f12286b1b590a",
-                "reference": "aee5f59db63978f7785290b94d2f12286b1b590a",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
                "shasum": ""
            },
            "require": {
                "php": ">=8.1",
-                "psr/container": "^2.0"
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
            },
            "conflict": {
                "ext-psr": "<1.1|>=2"
            },
-            "suggest": {
-                "symfony/service-implementation": ""
-            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.3-dev"
+                    "dev-main": "3.5-dev"
                },
                "thanks": {
                    "name": "symfony/contracts",
@@ -3335,7 +3500,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.2.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
            },
            "funding": [
                {
@@ -3351,38 +3516,38 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-16T12:50:33+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
        },
        {
            "name": "symfony/string",
-            "version": "v6.2.7",
+            "version": "v7.0.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "67b8c1eec78296b85dc1c7d9743830160218993d"
+                "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/67b8c1eec78296b85dc1c7d9743830160218993d",
-                "reference": "67b8c1eec78296b85dc1c7d9743830160218993d",
+                "url": "https://api.github.com/repos/symfony/string/zipball/e405b5424dc2528e02e31ba26b83a79fd4eb8f63",
+                "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                "symfony/polyfill-ctype": "~1.8",
                "symfony/polyfill-intl-grapheme": "~1.0",
                "symfony/polyfill-intl-normalizer": "~1.0",
                "symfony/polyfill-mbstring": "~1.0"
            },
            "conflict": {
-                "symfony/translation-contracts": "<2.0"
+                "symfony/translation-contracts": "<2.5"
            },
            "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/intl": "^6.2",
-                "symfony/translation-contracts": "^2.0|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0"
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/var-exporter": "^6.4|^7.0"
            },
            "type": "library",
            "autoload": {
@@ -3421,7 +3586,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v6.2.7"
+                "source": "https://github.com/symfony/string/tree/v7.0.7"
            },
            "funding": [
                {
@@ -3437,32 +3602,35 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-24T10:42:00+00:00"
+            "time": "2024-04-18T09:29:19+00:00"
        },
        {
            "name": "symfony/translation",
-            "version": "v6.2.7",
+            "version": "v6.4.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "90db1c6138c90527917671cd9ffa9e8b359e3a73"
+                "reference": "7495687c58bfd88b7883823747b0656d90679123"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/90db1c6138c90527917671cd9ffa9e8b359e3a73",
-                "reference": "90db1c6138c90527917671cd9ffa9e8b359e3a73",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/7495687c58bfd88b7883823747b0656d90679123",
+                "reference": "7495687c58bfd88b7883823747b0656d90679123",
                "shasum": ""
            },
            "require": {
                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/translation-contracts": "^2.3|^3.0"
+                "symfony/translation-contracts": "^2.5|^3.0"
            },
            "conflict": {
                "symfony/config": "<5.4",
                "symfony/console": "<5.4",
                "symfony/dependency-injection": "<5.4",
+                "symfony/http-client-contracts": "<2.5",
                "symfony/http-kernel": "<5.4",
+                "symfony/service-contracts": "<2.5",
                "symfony/twig-bundle": "<5.4",
                "symfony/yaml": "<5.4"
            },
@@ -3470,25 +3638,19 @@
                "symfony/translation-implementation": "2.3|3.0"
            },
            "require-dev": {
-                "nikic/php-parser": "^4.13",
+                "nikic/php-parser": "^4.18|^5.0",
                "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/console": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/finder": "^5.4|^6.0",
-                "symfony/http-client-contracts": "^1.1|^2.0|^3.0",
-                "symfony/http-kernel": "^5.4|^6.0",
-                "symfony/intl": "^5.4|^6.0",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/console": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/finder": "^5.4|^6.0|^7.0",
+                "symfony/http-client-contracts": "^2.5|^3.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/intl": "^5.4|^6.0|^7.0",
                "symfony/polyfill-intl-icu": "^1.21",
-                "symfony/routing": "^5.4|^6.0",
-                "symfony/service-contracts": "^1.1.2|^2|^3",
-                "symfony/yaml": "^5.4|^6.0"
-            },
-            "suggest": {
-                "nikic/php-parser": "To use PhpAstExtractor",
-                "psr/log-implementation": "To use logging capability in translator",
-                "symfony/config": "",
-                "symfony/yaml": ""
+                "symfony/routing": "^5.4|^6.0|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/yaml": "^5.4|^6.0|^7.0"
            },
            "type": "library",
            "autoload": {
@@ -3519,7 +3681,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.2.7"
+                "source": "https://github.com/symfony/translation/tree/v6.4.7"
            },
            "funding": [
                {
@@ -3535,32 +3697,29 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-24T10:42:00+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
        },
        {
            "name": "symfony/translation-contracts",
-            "version": "v3.2.1",
+            "version": "v3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "1f40e77fbb12a16d841688f42fecefd8ceb43ed6"
+                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1f40e77fbb12a16d841688f42fecefd8ceb43ed6",
-                "reference": "1f40e77fbb12a16d841688f42fecefd8ceb43ed6",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
                "shasum": ""
            },
            "require": {
                "php": ">=8.1"
            },
-            "suggest": {
-                "symfony/translation-implementation": ""
-            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.3-dev"
+                    "dev-main": "3.5-dev"
                },
                "thanks": {
                    "name": "symfony/contracts",
@@ -3600,7 +3759,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.2.1"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0"
            },
            "funding": [
                {
@@ -3616,7 +3775,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-16T12:50:33+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
        },
        {
            "name": "tysonandre/var_representation_polyfill",
@@ -3930,16 +4089,16 @@
    "packages-dev": [
        {
            "name": "myclabs/deep-copy",
-            "version": "1.11.0",
+            "version": "1.11.1",
            "source": {
                "type": "git",
                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
                "shasum": ""
            },
            "require": {
@@ -3977,7 +4136,7 @@
            ],
            "support": {
                "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
            },
            "funding": [
                {
@@ -3985,29 +4144,31 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-03-03T13:19:32+00:00"
+            "time": "2023-03-08T13:26:56+00:00"
        },
        {
            "name": "nikic/php-parser",
-            "version": "v4.15.3",
+            "version": "v5.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
+                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
-                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
+                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
                "shasum": ""
            },
            "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
                "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.4"
            },
            "require-dev": {
                "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
            },
            "bin": [
                "bin/php-parse"
@@ -4015,7 +4176,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "4.9-dev"
+                    "dev-master": "5.0-dev"
                }
            },
            "autoload": {
@@ -4039,26 +4200,27 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
            },
-            "time": "2023-01-16T22:05:37+00:00"
+            "time": "2024-03-05T20:51:40+00:00"
        },
        {
            "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                "shasum": ""
            },
            "require": {
                "ext-dom": "*",
+                "ext-libxml": "*",
                "ext-phar": "*",
                "ext-xmlwriter": "*",
                "phar-io/version": "^3.0.1",
@@ -4099,9 +4261,15 @@
            "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"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
            },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
        },
        {
            "name": "phar-io/version",
@@ -4156,23 +4324,23 @@
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "10.0.1",
+            "version": "10.1.14",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "b9c21a93dd8c8eed79879374884ee733259475cc"
+                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b9c21a93dd8c8eed79879374884ee733259475cc",
-                "reference": "b9c21a93dd8c8eed79879374884ee733259475cc",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
                "shasum": ""
            },
            "require": {
                "ext-dom": "*",
                "ext-libxml": "*",
                "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.15",
+                "nikic/php-parser": "^4.18 || ^5.0",
                "php": ">=8.1",
                "phpunit/php-file-iterator": "^4.0",
                "phpunit/php-text-template": "^3.0",
@@ -4184,16 +4352,16 @@
                "theseer/tokenizer": "^1.2.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^10.1"
            },
            "suggest": {
-                "ext-pcov": "*",
-                "ext-xdebug": "*"
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "10.0-dev"
+                    "dev-main": "10.1-dev"
                }
            },
            "autoload": {
@@ -4221,7 +4389,8 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.0.1"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
            },
            "funding": [
                {
@@ -4229,20 +4398,20 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-25T05:35:03+00:00"
+            "time": "2024-03-12T15:33:41+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
-            "version": "4.0.1",
+            "version": "4.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd"
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
-                "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
                "shasum": ""
            },
            "require": {
@@ -4281,7 +4450,8 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.0.1"
+                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
            },
            "funding": [
                {
@@ -4289,7 +4459,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-10T16:53:14+00:00"
+            "time": "2023-08-31T06:24:48+00:00"
        },
        {
            "name": "phpunit/php-invoker",
@@ -4356,16 +4526,16 @@
        },
        {
            "name": "phpunit/php-text-template",
-            "version": "3.0.0",
+            "version": "3.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "9f3d3709577a527025f55bcf0f7ab8052c8bb37d"
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/9f3d3709577a527025f55bcf0f7ab8052c8bb37d",
-                "reference": "9f3d3709577a527025f55bcf0f7ab8052c8bb37d",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
                "shasum": ""
            },
            "require": {
@@ -4403,7 +4573,8 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.0"
+                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
            },
            "funding": [
                {
@@ -4411,7 +4582,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T06:56:46+00:00"
+            "time": "2023-08-31T14:07:24+00:00"
        },
        {
            "name": "phpunit/php-timer",
@@ -4474,16 +4645,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "10.0.13",
+            "version": "10.5.20",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c37a88d7a905266eab6498817a1bf1170043313f"
+                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c37a88d7a905266eab6498817a1bf1170043313f",
-                "reference": "c37a88d7a905266eab6498817a1bf1170043313f",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
+                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3",
                "shasum": ""
            },
            "require": {
@@ -4497,7 +4668,7 @@
                "phar-io/manifest": "^2.0.3",
                "phar-io/version": "^3.0.2",
                "php": ">=8.1",
-                "phpunit/php-code-coverage": "^10.0",
+                "phpunit/php-code-coverage": "^10.1.5",
                "phpunit/php-file-iterator": "^4.0",
                "phpunit/php-invoker": "^4.0",
                "phpunit/php-text-template": "^3.0",
@@ -4507,15 +4678,15 @@
                "sebastian/comparator": "^5.0",
                "sebastian/diff": "^5.0",
                "sebastian/environment": "^6.0",
-                "sebastian/exporter": "^5.0",
-                "sebastian/global-state": "^6.0",
+                "sebastian/exporter": "^5.1",
+                "sebastian/global-state": "^6.0.1",
                "sebastian/object-enumerator": "^5.0",
                "sebastian/recursion-context": "^5.0",
                "sebastian/type": "^4.0",
                "sebastian/version": "^4.0"
            },
            "suggest": {
-                "ext-soap": "*"
+                "ext-soap": "To be able to generate mocks based on WSDL files"
            },
            "bin": [
                "phpunit"
@@ -4523,7 +4694,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "10.0-dev"
+                    "dev-main": "10.5-dev"
                }
            },
            "autoload": {
@@ -4554,7 +4725,8 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.0.13"
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20"
            },
            "funding": [
                {
@@ -4570,20 +4742,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-02-27T13:07:57+00:00"
+            "time": "2024-04-24T06:32:35+00:00"
        },
        {
            "name": "sebastian/cli-parser",
-            "version": "2.0.0",
+            "version": "2.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae"
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efdc130dbbbb8ef0b545a994fd811725c5282cae",
-                "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
                "shasum": ""
            },
            "require": {
@@ -4618,7 +4790,8 @@
            "homepage": "https://github.com/sebastianbergmann/cli-parser",
            "support": {
                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.0"
+                "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
            },
            "funding": [
                {
@@ -4626,7 +4799,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T06:58:15+00:00"
+            "time": "2024-03-02T07:12:49+00:00"
        },
        {
            "name": "sebastian/code-unit",
@@ -4741,16 +4914,16 @@
        },
        {
            "name": "sebastian/comparator",
-            "version": "5.0.0",
+            "version": "5.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "72f01e6586e0caf6af81297897bd112eb7e9627c"
+                "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/72f01e6586e0caf6af81297897bd112eb7e9627c",
-                "reference": "72f01e6586e0caf6af81297897bd112eb7e9627c",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
+                "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
                "shasum": ""
            },
            "require": {
@@ -4761,7 +4934,7 @@
                "sebastian/exporter": "^5.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^10.0"
+                "phpunit/phpunit": "^10.3"
            },
            "type": "library",
            "extra": {
@@ -4805,7 +4978,8 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.0"
+                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
            },
            "funding": [
                {
@@ -4813,24 +4987,24 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T07:07:16+00:00"
+            "time": "2023-08-14T13:18:12+00:00"
        },
        {
            "name": "sebastian/complexity",
-            "version": "3.0.0",
+            "version": "3.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "e67d240970c9dc7ea7b2123a6d520e334dd61dc6"
+                "reference": "68ff824baeae169ec9f2137158ee529584553799"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/e67d240970c9dc7ea7b2123a6d520e334dd61dc6",
-                "reference": "e67d240970c9dc7ea7b2123a6d520e334dd61dc6",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
+                "reference": "68ff824baeae169ec9f2137158ee529584553799",
                "shasum": ""
            },
            "require": {
-                "nikic/php-parser": "^4.10",
+                "nikic/php-parser": "^4.18 || ^5.0",
                "php": ">=8.1"
            },
            "require-dev": {
@@ -4839,7 +5013,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.0-dev"
+                    "dev-main": "3.2-dev"
                }
            },
            "autoload": {
@@ -4862,7 +5036,8 @@
            "homepage": "https://github.com/sebastianbergmann/complexity",
            "support": {
                "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/3.0.0"
+                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
            },
            "funding": [
                {
@@ -4870,20 +5045,20 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T06:59:47+00:00"
+            "time": "2023-12-21T08:37:17+00:00"
        },
        {
            "name": "sebastian/diff",
-            "version": "5.0.0",
+            "version": "5.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "70dd1b20bc198da394ad542e988381b44e64e39f"
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/70dd1b20bc198da394ad542e988381b44e64e39f",
-                "reference": "70dd1b20bc198da394ad542e988381b44e64e39f",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
                "shasum": ""
            },
            "require": {
@@ -4891,12 +5066,12 @@
            },
            "require-dev": {
                "phpunit/phpunit": "^10.0",
-                "symfony/process": "^4.2 || ^5"
+                "symfony/process": "^6.4"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "5.1-dev"
                }
            },
            "autoload": {
@@ -4928,7 +5103,8 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/5.0.0"
+                "security": "https://github.com/sebastianbergmann/diff/security/policy",
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
            },
            "funding": [
                {
@@ -4936,20 +5112,20 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T07:00:31+00:00"
+            "time": "2024-03-02T07:15:17+00:00"
        },
        {
            "name": "sebastian/environment",
-            "version": "6.0.0",
+            "version": "6.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc"
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/b6f3694c6386c7959915a0037652e0c40f6f69cc",
-                "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
+                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
                "shasum": ""
            },
            "require": {
@@ -4964,7 +5140,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "6.0-dev"
+                    "dev-main": "6.1-dev"
                }
            },
            "autoload": {
@@ -4991,7 +5167,8 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/6.0.0"
+                "security": "https://github.com/sebastianbergmann/environment/security/policy",
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
            },
            "funding": [
                {
@@ -4999,20 +5176,20 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T07:03:04+00:00"
+            "time": "2024-03-23T08:47:14+00:00"
        },
        {
            "name": "sebastian/exporter",
-            "version": "5.0.0",
+            "version": "5.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0"
+                "reference": "955288482d97c19a372d3f31006ab3f37da47adf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0",
-                "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
+                "reference": "955288482d97c19a372d3f31006ab3f37da47adf",
                "shasum": ""
            },
            "require": {
@@ -5026,7 +5203,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "5.1-dev"
                }
            },
            "autoload": {
@@ -5068,7 +5245,8 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/5.0.0"
+                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2"
            },
            "funding": [
                {
@@ -5076,20 +5254,20 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T07:06:49+00:00"
+            "time": "2024-03-02T07:17:12+00:00"
        },
        {
            "name": "sebastian/global-state",
-            "version": "6.0.0",
+            "version": "6.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "aab257c712de87b90194febd52e4d184551c2d44"
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/aab257c712de87b90194febd52e4d184551c2d44",
-                "reference": "aab257c712de87b90194febd52e4d184551c2d44",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
                "shasum": ""
            },
            "require": {
@@ -5123,13 +5301,14 @@
                }
            ],
            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "homepage": "https://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/6.0.0"
+                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
            },
            "funding": [
                {
@@ -5137,24 +5316,24 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T07:07:38+00:00"
+            "time": "2024-03-02T07:19:19+00:00"
        },
        {
            "name": "sebastian/lines-of-code",
-            "version": "2.0.0",
+            "version": "2.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "17c4d940ecafb3d15d2cf916f4108f664e28b130"
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/17c4d940ecafb3d15d2cf916f4108f664e28b130",
-                "reference": "17c4d940ecafb3d15d2cf916f4108f664e28b130",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
                "shasum": ""
            },
            "require": {
-                "nikic/php-parser": "^4.10",
+                "nikic/php-parser": "^4.18 || ^5.0",
                "php": ">=8.1"
            },
            "require-dev": {
@@ -5186,7 +5365,8 @@
            "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/2.0.0"
+                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
            },
            "funding": [
                {
@@ -5194,7 +5374,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-02-03T07:08:02+00:00"
+            "time": "2023-12-21T08:38:20+00:00"
        },
        {
            "name": "sebastian/object-enumerator",
@@ -5482,16 +5662,16 @@
        },
        {
            "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "version": "1.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
                "shasum": ""
            },
            "require": {
@@ -5520,7 +5700,7 @@
            "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"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
            },
            "funding": [
                {
@@ -5528,7 +5708,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-07-28T10:34:58+00:00"
+            "time": "2024-03-03T12:36:25+00:00"
        }
    ],
    "aliases": [],
@@ -5539,7 +5719,7 @@
    "platform": [],
    "platform-dev": [],
    "platform-overrides": {
-        "php": "8.2"
+        "php": "8.3"
    },
    "plugin-api-version": "2.3.0"
 }
@@ -17,18 +17,11 @@ if (!class_exists('\\sammo\\RootDB')) {

 $rootDB = RootDB::db();

-$rootDB->throw_exception_on_nonsql_error = false;
-$rootDB->nonsql_error_handler = function ($params) {
-    Json::die([
-        'step' => 'conn_fail'
-    ]);
-};
-
-$rootDB->error_handler = function ($params) {
+$rootDB->addHook('run_failed', function ($params) {
    Json::die([
        'step' => 'sql_fail'
    ]);
-};
+});

 $memberCnt = $rootDB->queryFirstField('SELECT count(`NO`) from member');
 if ($memberCnt == 0) {
@@ -150,20 +150,12 @@ if (!file_exists(ROOT . '/d_setting/.htaccess')) {
 $rootDB = new \MeekroDB($host, $username, $password, $dbName, $port, 'utf8mb4');
 $rootDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;

-$rootDB->throw_exception_on_nonsql_error = false;
-$rootDB->nonsql_error_handler = function ($params) {
+$rootDB->addHook('run_failed', function ($args) {
    Json::die([
        'result' => false,
-        'reason' => 'DB 접속에 실패했습니다.'
+        'reason' => '에러.'. $args['error']
    ]);
-};
-
-$rootDB->error_handler = function ($params) {
-    Json::die([
-        'result' => false,
-        'reason' => 'SQL을 제대로 실행하지 못했습니다. DB상태를 확인해 주세요.'
-    ]);
-};
+});

 $mysqli_obj = $rootDB->get(); //로그인에 실패할 경우 자동으로 dbConnFail()이 실행됨.

@@ -136,13 +136,21 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                                <option value='<?= $targetDefenceTrain ?>' <?= $me->getVar('defence_train') == $targetDefenceTrain ? "selected" : ""; ?>><?= formatDefenceTrain($targetDefenceTrain) ?>(훈사<?= $targetDefenceTrain ?>)</option>
                            <?php endforeach; ?>
                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>
-                            <?php if($changeDefence999Train != 0 || $changeDefence999Train != 0):
-                            ?>[<?=$changeDefence999Train!=0?"훈련 {$changeDefence999Train},":''?><?=$changeDefence999Atmos!=0?"사기 {$changeDefence999Atmos}":''
-                            ?>]<?php endif?></option>
+                                <?php if ($changeDefence999Train != 0 || $changeDefence999Train != 0) :
+                                ?>[<?= $changeDefence999Train != 0 ? "훈련 {$changeDefence999Train}," : '' ?><?= $changeDefence999Atmos != 0 ? "사기 {$changeDefence999Atmos}" : ''
+                                                                                                ?>]<?php endif ?></option>
                        </select>
                        】<br><br>
                        <input type=<?= $submit ?> id='set_my_setting' name=btn style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px; value=설정저장><br>
                        ∞<span style='color:orange'>설정저장은 이달중 <?= $myset ?>회 남았습니다.</span><br><br>
+
+                        <?php if ($me->getPenaltyList()->count()) : ?>
+                            징계 목록(저장 시 갱신)<br>
+                            <?php foreach ($me->getPenaltyList() as $penaltyKey => $penalty) : ?>
+                                <span style='color:red'><?= $penaltyKey->getHelptext() ?> : <?= $penalty ?></span><br>
+                            <?php endforeach; ?>
+                            <br />
+                        <?php endif; ?>
                        <?php if (!($gameStor->autorun_user['limit_minutes'] ?? false)) : ?>
                            휴 가 신 청<br>
                            <button type="button" id='vacation' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>휴가 신청</button><br><br>
@@ -9,6 +9,7 @@ use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\GeneralColumn;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
+use sammo\Enums\PenaltyKey;
 use sammo\Enums\RankColumn;

 require_once 'process_war.php';
@@ -376,11 +377,11 @@ function myNationInfo(General $generalObj)
 function checkSecretMaxPermission($penalty)
 {
    $secretMax = 4;
-    if ($penalty['noTopSecret'] ?? false) {
+    if ($penalty[PenaltyKey::NoTopSecret->value] ?? false) {
        $secretMax = 1;
-    } else if ($penalty['noChief'] ?? false) {
+    } else if ($penalty[PenaltyKey::NoChief->value] ?? false) {
        $secretMax = 1;
-    } else if ($penalty['noAmbassador'] ?? false) {
+    } else if ($penalty[PenaltyKey::NoAmbassador->value] ?? false) {
        $secretMax = 2;
    }
    return $secretMax;
@@ -403,19 +404,19 @@ function checkSecretPermission(array $me, $checkSecretLimit = true)
    }


-    if ($penalty['noSecret'] ?? false) {
+    if ($penalty[PenaltyKey::NoChief->value] ?? false) {
        return 0;
    }

    $secretMin = 0;
-    $secretMax = checkSecretMaxPermission($me, $penalty);
+    $secretMax = checkSecretMaxPermission($penalty);


    if ($me['officer_level'] == 12) {
        $secretMin = 4;
-    } else if ($me['permission'] == 'ambassador') {
+    } else if ($permission == 'ambassador') {
        $secretMin = 4;
-    } else if ($me['permission'] == 'auditor') {
+    } else if ($permission == 'auditor') {
        $secretMin = 3;
    } else if ($me['officer_level'] >= 5) {
        $secretMin = 2;
@@ -1054,10 +1055,10 @@ function increaseRefresh($type = "", $cnt = 1)
        'ip' => $ip,
        'date' => $date,
        'path' => "refresh",
-        'arg' => JSON::encode([
+        'arg' => Json::encode([
            'type' => $type,
        ]),
-        'aux' => JSON::encode([
+        'aux' => Json::encode([
            'generalID' => $generalID,
            'generalName' => $session->generalName,
            'userName' => $session->userName,
@@ -3,6 +3,7 @@ namespace sammo;

 use sammo\Command\GeneralCommand;
 use sammo\Command\NationCommand;
+use sammo\Enums\PenaltyKey;

 function getGeneralTurnBrief(General $generalObj, array $turnList) {
    $result = [];
@@ -213,7 +214,7 @@ function _setGeneralCommand(GeneralCommand $command, array $turnList):void {

    $db->update('general_turn', [
        'action'=>$commandName,
-        'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
+        'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
        'brief'=>$brief
    ], 'general_id = %i AND turn_idx IN %li', $generalID, $turnList);
 }
@@ -233,7 +234,7 @@ function _setNationCommand(NationCommand $command, array $turnList):void  {

    $db->update('nation_turn', [
        'action'=>$commandName,
-        'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
+        'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
        'brief'=>$brief
    ], 'nation_id = %i AND officer_level = %i AND turn_idx IN %li', $nationID, $officerLevel, $turnList);
 }
@@ -434,6 +435,13 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
        ];
    }

+    if($general->hasPenalty(PenaltyKey::NoChiefTurnInput)){
+        return [
+            'result'=>false,
+            'reason'=>'수뇌 턴 입력 불가능'
+        ];
+    }
+
    try{
        $commandObj = buildNationCommandClass($command, $general, $env, $general->getLastTurn(), $arg);
    }
@@ -372,7 +372,7 @@ function postUpdateMonthly(RandUtil $rng)
            continue;
        }

-        //양측 기간 모두 0이 되는 상황이면 휴전
+        //양측 기간 모두 0이 되는 상황이면 종전
        $nation1 = getNationStaticInfo($me);
        $name1 = $nation1['name'];
        $nation2 = getNationStaticInfo($you);
@@ -381,7 +381,7 @@ function postUpdateMonthly(RandUtil $rng)
        $josaWa = JosaUtil::pick($name1, '와');
        $josaYi = JosaUtil::pick($name2, '이');

-        $globalLogger->pushGlobalHistoryLog("<R><b>【휴전】</b></><D><b>$name1</b></>{$josaWa} <D><b>$name2</b></>{$josaYi} <S>휴전</>합니다.");
+        $globalLogger->pushGlobalHistoryLog("<R><b>【종전】</b></><D><b>$name1</b></>{$josaWa} <D><b>$name2</b></>{$josaYi} <S>종전</>합니다.");
        $db->update('diplomacy', [
            'state' => 2,
            'term' => 0,
@@ -899,7 +899,7 @@ function checkEmperior()
        'tiger' => $tigerstr,
        'eagle' => $eaglestr,
        'gen' => $gen,
-        'history' => JSON::encode($nationHistory),
+        'history' => Json::encode($nationHistory),
        'aux' => $statGeneral['aux']
    ]);

@@ -951,8 +951,19 @@ function updateMaxDomesticCritical(General $general, $score)
    }
 }

-function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil
+function genGenericUniqueRNG(int $year, int $month, int $generalID, ?string $reason = null): RandUtil
 {
+    if($reason){
+        return new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+            UniqueConst::$hiddenSeed,
+            'unique',
+            $year,
+            $month,
+            $generalID,
+            $reason
+        )));
+    }
+
    return new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
        UniqueConst::$hiddenSeed,
        'unique',
@@ -962,7 +973,7 @@ function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil
    )));
 }

-function genGenericUniqueRNGFromGeneral(General $general): RandUtil
+function genGenericUniqueRNGFromGeneral(General $general, string $reason): RandUtil
 {
    $logger = $general->getLogger();
    if (!$logger) {
@@ -971,5 +982,5 @@ function genGenericUniqueRNGFromGeneral(General $general): RandUtil
    $year = $logger->getYear();
    $month = $logger->getMonth();
    $generalID = $general->getID();
-    return genGenericUniqueRNG($year, $month, $generalID);
+    return genGenericUniqueRNG($year, $month, $generalID, $reason);
 }
@@ -53,22 +53,17 @@ if($fullReset){
    }
 }

-function dbConnFail($params){
+$db = new \MeekroDB($host,$username,$password,$dbName,$port,'utf8mb4');
+$db->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
+
+$db->addHook('run_failed', function(){
    Json::die([
        'result'=>false,
        'reason'=>'DB 접속에 실패했습니다.'
    ]);
-}
+});

-
-$db = new \MeekroDB($host,$username,$password,$dbName,$port,'utf8mb4');
-$db->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
-
-$db->throw_exception_on_nonsql_error = false;
-$db->nonsql_error_handler = 'dbConnFail';
-
-
-$mysqli_obj = $db->get(); //로그인에 실패할 경우 자동으로 dbConnFail()이 실행됨.
+$mysqli_obj = $db->get();

 $prefix = basename(__DIR__);

@@ -84,8 +79,6 @@ $result = Util::generateFileUsingSimpleTemplate(
    ], true
 );

-
-
 if($result !== true){
    Json::die([
        'result'=>false,
@@ -93,7 +86,29 @@ if($result !== true){
    ]);
 }

-ResetHelper::clearDB();
+//최소한의 테이블 처리를 위해 수동으로 초기화하도록 하자
+if($mysqli_obj->multi_query(file_get_contents(__DIR__.'/sql/reset.sql'))){
+    while(true){
+        if (!$mysqli_obj->more_results()) {
+            break;
+        }
+        if(!$mysqli_obj->next_result()){
+            break;
+        }
+    }
+
+}
+
+if($mysqli_obj->multi_query(file_get_contents(__DIR__.'/sql/schema.sql'))){
+    while(true){
+        if (!$mysqli_obj->more_results()) {
+            break;
+        }
+        if(!$mysqli_obj->next_result()){
+            break;
+        }
+    }
+}

 ServConfig::getServerList()[$prefix]->closeServer();

@@ -19,7 +19,15 @@ if(!prepareDir('data/file_cache')){
 	]);
 }

-$storage = new \Nette\Caching\Storages\FileStorage('data/file_cache');
+$absolutePath = realpath('data/file_cache');
+if(!$absolutePath){
+    Json::die([
+        'result'=>false,
+        'reason'=>'cache 불가'
+    ]);
+}
+
+$storage = new \Nette\Caching\Storages\FileStorage($absolutePath);
 $cache = new Cache($storage);
 $serverID = UniqueConst::$serverID;

@@ -1,9 +1,12 @@
 <?php
+
 namespace sammo;

+use sammo\Enums\GeneralColumn;
 use sammo\Enums\GeneralLiteQueryMode;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\MessageType;
+use sammo\Enums\PenaltyKey;

 include "lib.php";
 include "func.php";
@@ -21,92 +24,99 @@ $userID = Session::getUserID();

 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$gameStor->cacheValues(['startyear','year','month','scenario']);
+$gameStor->cacheValues(['startyear', 'year', 'month', 'scenario']);

-$me = $db->queryFirstRow('SELECT no,nation,officer_level from general where owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no,nation,officer_level,penalty from general where owner=%i', $userID);
 $myOfficerLevel = $me['officer_level'];
 $nationID = $me['nation'];
+$myPenalty = Json::decode($me['penalty'] ?? '{}');

 //수뇌가 아니면 아무것도 할 수 없음
-if($myOfficerLevel < 5){
+if ($myOfficerLevel < 5) {
    Json::die([
-        'result'=>false,
-        'reason'=>'수뇌가 아닙니다.'
+        'result' => false,
+        'reason' => '수뇌가 아닙니다.'
    ]);
 }

-if($action === '추방' && $destGeneralID==0){
+if ($action === '추방' && $destGeneralID == 0) {
    Json::die([
-        'result'=>false,
-        'reason'=>'장수가 지정되지 않았습니다.'
+        'result' => false,
+        'reason' => '장수가 지정되지 않았습니다.'
    ]);
 }

-if($destGeneralID==0){
+if ($destGeneralID == 0) {
    $general = new DummyGeneral(true);
    $general->setVar('nation', $nationID);
-}
-else{
+} else {
    $general = General::createObjFromDB($destGeneralID);

-    if($general instanceof DummyGeneral){
+    if ($general instanceof DummyGeneral) {
        Json::die([
-            'result'=>false,
-            'reason'=>'올바르지 않은 장수입니다.'
+            'result' => false,
+            'reason' => '올바르지 않은 장수입니다.'
        ]);
    }

-    if($nationID != $general->getNationID()){
+    if ($nationID != $general->getNationID()) {
        Json::die([
-            'result'=>false,
-            'reason'=>'아국 장수가 아닙니다'
+            'result' => false,
+            'reason' => '아국 장수가 아닙니다'
        ]);
    }
 }

-if($officerLevel == 12){
+if ($officerLevel == 12) {
    Json::die([
-        'result'=>false,
-        'reason'=>'군주를 대상으로 할 수 없습니다.'
+        'result' => false,
+        'reason' => '군주를 대상으로 할 수 없습니다.'
    ]);
 }

-function do수뇌임명(General $general, int $targetOfficerLevel):?string{
+function do수뇌임명(General $general, int $targetOfficerLevel): ?string
+{
+    global $myPenalty;
+
+    if ($myPenalty[PenaltyKey::NoChiefChange->value] ?? false) {
+        return '수뇌를 임명할 수 없는 상태입니다.';
+    }
+
    $generalID = $general->getID();
    $nationID = $general->getNationID();

+    if($general->hasPenalty(PenaltyKey::NoChief)){
+        return '수뇌가 될 수 없는 상태입니다.';
+    }
+
    $db = DB::db();

-    [$chiefSet, $nationLevel] = $db->queryFirstList('SELECT chief_set,level FROM nation WHERE nation = %i',$nationID);
+    [$chiefSet, $nationLevel] = $db->queryFirstList('SELECT chief_set,level FROM nation WHERE nation = %i', $nationID);

-	// 임명가능 레벨
+    // 임명가능 레벨
    $lv = getNationChiefLevel($nationLevel);

-    if($targetOfficerLevel < $lv){
+    if ($targetOfficerLevel < $lv) {
        return '임명불가능한 관직입니다.';
    }

-    if(isOfficerSet($chiefSet, $targetOfficerLevel)){
+    if (isOfficerSet($chiefSet, $targetOfficerLevel)) {
        return '지금은 임명할 수 없습니다.';
    }

    //기존 장수 일반으로
    $db->update('general', [
-        'officer_level'=>1,
-        'officer_city'=>0,
+        'officer_level' => 1,
+        'officer_city' => 0,
    ], 'nation=%i AND officer_level=%i AND no!=%i', $nationID, $targetOfficerLevel, $generalID);

-    if($targetOfficerLevel === 11){
-
-    }
-    else if($targetOfficerLevel % 2 == 0){
-        if($general->getVar('strength') < GameConst::$chiefStatMin){
+    if ($targetOfficerLevel === 11) {
+    } else if ($targetOfficerLevel % 2 == 0) {
+        if ($general->getVar('strength') < GameConst::$chiefStatMin) {
            return '무력이 부족합니다.';
        }
-
-    }
-    else{
-        if($general->getVar('intel') < GameConst::$chiefStatMin){
+    } else {
+        if ($general->getVar('intel') < GameConst::$chiefStatMin) {
            return '지력이 부족합니다.';
        }
    }
@@ -115,52 +125,59 @@ function do수뇌임명(General $general, int $targetOfficerLevel):?string{
    $general->setVar('officer_level', $targetOfficerLevel);
    $general->setVar('officer_city', 0);
    $db->update('nation', [
-        'chief_set'=> $db->sqleval('chief_set | %i', doOfficerSet(0, $targetOfficerLevel)),
+        'chief_set' => $db->sqleval('chief_set | %i', doOfficerSet(0, $targetOfficerLevel)),
    ], 'nation=%i', $nationID);
    $general->applyDB($db);

    return null;
 }

-function do도시임명(General $general, int $cityID, int $targetOfficerLevel):?string{
+function do도시임명(General $general, int $cityID, int $targetOfficerLevel): ?string
+{
+    global $myPenalty;
+
    $nationID = $general->getNationID();

    $db = DB::db();

-    if(CityConst::byID($cityID) === null){
+    if (CityConst::byID($cityID) === null) {
        return '올바르지 않은 도시입니다';
    }

+    if ($general->getVar(GeneralColumn::officer_level) >= 4 && $myPenalty[PenaltyKey::NoChiefChange->value] ?? false) {
+        return '수뇌인 장수를 변경할 수 없는 상태입니다.';
+    }
+
    $officerSet = $db->queryFirstField('SELECT officer_set FROM city WHERE nation=%i AND city=%i', $nationID, $cityID);
-    if($officerSet === null){
+    if ($officerSet === null) {
        return '아국 도시가 아닙니다';
    }

-    if(isOfficerSet($officerSet, $targetOfficerLevel)){
+    if (isOfficerSet($officerSet, $targetOfficerLevel)) {
        return '이미 다른 장수가 임명되어있습니다';
    }

    //기존 장수 일반으로
    $db->update('general', [
-        'officer_level'=>1,
-        'officer_city'=>0,
+        'officer_level' => 1,
+        'officer_city' => 0,
    ], 'officer_level=%i AND officer_city=%i AND no!=%i', $targetOfficerLevel, $cityID, $general->getID());

-    if($general instanceof DummyGeneral){
+    if ($general instanceof DummyGeneral) {
        return null;
    }

-    if($targetOfficerLevel === 4 && $general->getVar('strength') < GameConst::$chiefStatMin){
+    if ($targetOfficerLevel === 4 && $general->getVar('strength') < GameConst::$chiefStatMin) {
        return '무력이 부족합니다.';
    }

-    if($targetOfficerLevel === 3 && $general->getVar('intel') < GameConst::$chiefStatMin){
+    if ($targetOfficerLevel === 3 && $general->getVar('intel') < GameConst::$chiefStatMin) {
        return '지력이 부족합니다.';
    }

    //신임 장수
    $db->update('city', [
-        'officer_set'=>$db->sqleval('officer_set | %i', doOfficerSet(0, $targetOfficerLevel)),
+        'officer_set' => $db->sqleval('officer_set | %i', doOfficerSet(0, $targetOfficerLevel)),
    ], 'city=%i AND nation=%i', $cityID, $nationID);
    $general->setVar('officer_level', $targetOfficerLevel);
    $general->setVar('officer_city', $cityID);
@@ -169,22 +186,25 @@ function do도시임명(General $general, int $cityID, int $targetOfficerLevel):
    return null;
 }

-function do추방(General $general, int $myOfficerLevel):?string{
+function do추방(General $general, int $myOfficerLevel): ?string
+{
    $generalID = $general->getID();
    $generalName = $general->getVar('name');
    $nationID = $general->getNationID();

-
+    if ($myPenalty[PenaltyKey::NoBanGeneral->value] ?? false) {
+        return '추방할 수 없는 상태입니다.';
+    }

    //추방할사람이 외교권자이면 불가
    $permission = checkSecretPermission($general->getRaw());
-    if($permission == 4){
+    if ($permission == 4) {
        return '외교권자는 추방할 수 없습니다.';
    }

    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $env = $gameStor->getValues(['startyear','year','month','scenario']);
+    $env = $gameStor->getValues(['startyear', 'year', 'month', 'scenario']);

    $nation = $db->queryFirstRow('SELECT name,chief_set,color FROM nation WHERE nation=%i', $nationID);
    $nationName = $nation['name'];
@@ -192,17 +212,17 @@ function do추방(General $general, int $myOfficerLevel):?string{
    $logger = $general->getLogger();

    //이미 지정했다면 무시
-    if(isOfficerSet($nation['chief_set'], $myOfficerLevel) || ($myOfficerLevel == 0 && $myOfficerLevel == 12)) {
+    if (isOfficerSet($nation['chief_set'], $myOfficerLevel) || ($myOfficerLevel == 0 && $myOfficerLevel == 12)) {
        return '이미 추방 권한을 사용했습니다.';
    }
    $gold = 0;
    $rice = 0;
    // 금쌀1000이상은 남김
-    if($general->getVar('gold') > GameConst::$defaultGold) {
+    if ($general->getVar('gold') > GameConst::$defaultGold) {
        $gold = $general->getVar('gold') - GameConst::$defaultGold;
        $general->setVar('gold', GameConst::$defaultGold);
    }
-    if($general->getVar('rice') > GameConst::$defaultRice) {
+    if ($general->getVar('rice') > GameConst::$defaultRice) {
        $rice = $general->getVar('rice') - GameConst::$defaultRice;
        $general->setVar('rice', GameConst::$defaultRice);
    }
@@ -220,27 +240,26 @@ function do추방(General $general, int $myOfficerLevel):?string{
    $logger->pushGeneralActionLog("<D><b>{$nationName}</b></>에서 <R>추방</>당했습니다.", ActionLogger::PLAIN);

    // 명성/공헌 N*10%감소
-    if($env['year'] <= $env['startyear'] && $general->getNPCType() < 2){
+    if ($env['year'] <= $env['startyear'] && $general->getNPCType() < 2) {
        $general->setVar('makelimit', $oldMakeLimit);
-    }
-    else{
+    } else {
        $betrayCnt = $general->getVar('betray');
-        $general->addExperience(-$general->getVar('experience')*0.15*$betrayCnt);
-        $general->addDedication(-$general->getVar('dedication')*0.15*$betrayCnt);
+        $general->addExperience(-$general->getVar('experience') * 0.15 * $betrayCnt);
+        $general->addDedication(-$general->getVar('dedication') * 0.15 * $betrayCnt);
        $general->increaseVarWithLimit('betray', 1, null, GameConst::$maxBetrayCnt);
    }

    //부대장일 경우
-    if($general->getVar('troop') == $generalID){
+    if ($general->getVar('troop') == $generalID) {
        // 모두 탈퇴
        $db->update('general', [
-            'troop'=>0,
+            'troop' => 0,
        ], 'troop = %i', $generalID);
        $db->delete('troop', 'troop_leader=%i', $generalID);
    }
    $general->setVar('troop', 0);

-    if($general->getNPCType() >= 2){
+    if ($general->getNPCType() >= 2) {
        $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
            UniqueConst::$hiddenSeed,
            'BanNPC',
@@ -279,24 +298,24 @@ function do추방(General $general, int $myOfficerLevel):?string{
        }
    }

-    if($env['year'] < $env['startyear']+3) {
+    if ($env['year'] < $env['startyear'] + 3) {
        //초반엔 군주 부상 증가(엔장 임관지양)
        $db->update('general', [
-            'injury'=>$db->sqleval('least(injury + 1, %i)', 80),
+            'injury' => $db->sqleval('least(injury + 1, %i)', 80),
        ], 'nation=%i AND officer_level=12', $nationID);

        $db->update('nation', [
-            'gennum'=>$db->sqleval('gennum - %i', $general->getNPCType()!=5?1:0),
-            'gold'=>$db->sqleval('gold + %i', $gold),
-            'rice'=>$db->sqleval('rice + %i', $rice),
+            'gennum' => $db->sqleval('gennum - %i', $general->getNPCType() != 5 ? 1 : 0),
+            'gold' => $db->sqleval('gold + %i', $gold),
+            'rice' => $db->sqleval('rice + %i', $rice),
        ], 'nation = %i', $nationID);
    } else {
        //이번분기는 추방불가(초반 제외)
        $db->update('nation', [
-            'chief_set'=>$db->sqleval('chief_set | %i', doOfficerSet(0, $myOfficerLevel)),
-            'gennum'=>$db->sqleval('gennum - %i', $general->getNPCType()!=5?1:0),
-            'gold'=>$db->sqleval('gold + %i', $gold),
-            'rice'=>$db->sqleval('rice + %i', $rice),
+            'chief_set' => $db->sqleval('chief_set | %i', doOfficerSet(0, $myOfficerLevel)),
+            'gennum' => $db->sqleval('gennum - %i', $general->getNPCType() != 5 ? 1 : 0),
+            'gold' => $db->sqleval('gold + %i', $gold),
+            'rice' => $db->sqleval('rice + %i', $rice),
        ], 'nation = %i', $nationID);
    }

@@ -308,62 +327,62 @@ function do추방(General $general, int $myOfficerLevel):?string{



-if($action == "임명") {
-    if(2 <= $officerLevel && $officerLevel <= 4){
-        if(!$destCityID){
+if ($action == "임명") {
+    if (2 <= $officerLevel && $officerLevel <= 4) {
+        if (!$destCityID) {
            Json::die([
-                'result'=>false,
-                'reason'=>'도시가 지정되지 않았습니다.'
+                'result' => false,
+                'reason' => '도시가 지정되지 않았습니다.'
            ]);
        }
        $result = do도시임명($general, $destCityID, $officerLevel);
-        if($result !== null){
+        if ($result !== null) {
            Json::die([
-                'result'=>false,
-                'reason'=>$result
+                'result' => false,
+                'reason' => $result
            ]);
        }
        Json::die([
-            'result'=>true,
-            'reason'=>'success'
+            'result' => true,
+            'reason' => 'success'
        ]);
    }

-    if(5 <= $officerLevel && $officerLevel < 12){
+    if (5 <= $officerLevel && $officerLevel < 12) {
        $result = do수뇌임명($general, $officerLevel);
-        if($result !== null){
+        if ($result !== null) {
            Json::die([
-                'result'=>false,
-                'reason'=>$result
+                'result' => false,
+                'reason' => $result
            ]);
        }
        Json::die([
-            'result'=>true,
-            'reason'=>'success'
+            'result' => true,
+            'reason' => 'success'
        ]);
    }

    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 지정입니다.'
+        'result' => false,
+        'reason' => '올바르지 않은 지정입니다.'
    ]);
 }

-if($action == "추방") {
+if ($action == "추방") {
    $result = do추방($general, $myOfficerLevel);
-    if($result !== null){
+    if ($result !== null) {
        Json::die([
-            'result'=>false,
-            'reason'=>$result
+            'result' => false,
+            'reason' => $result
        ]);
    }
    Json::die([
-        'result'=>true,
-        'reason'=>'success'
+        'result' => true,
+        'reason' => 'success'
    ]);
 }

 Json::die([
-    'result'=>false,
-    'reason'=>'올바르지 않은 명령입니다.'
-]);
+    'result' => false,
+    'reason' => '올바르지 않은 명령입니다.'
+]);
@@ -27,14 +27,25 @@ $rootDB = RootDB::db();
 $oNow = new \DateTimeImmutable();
 $now = $oNow->format('Y-m-d H:i:s');

-$userNick = RootDB::db()->queryFirstField('SELECT `NAME` FROM member WHERE `NO`=%i',$userID);
-if(!$userNick){
+$member = $rootDB->queryFirstRow('SELECT `name`, `penalty` FROM member WHERE `NO`=%i', $userID);
+if(!$member){
    Json::die([
        'result'=>false,
        'reason'=>'멤버 정보를 가져오지 못했습니다.'
    ]);
 }

+$userNick = $member['name'];
+$memberPenalty = Json::decode($member['penalty'] ?? '{}');
+$penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
+
+$penalty = [];
+foreach($penaltyInfo as $penaltyKey => $penaltyValue){
+    if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
+        $penalty[$penaltyKey] = $penaltyValue['value'];
+    }
+}
+
 $pickResult = $db->queryFirstField('SELECT pick_result FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%s', $userID, $now);
 if(!$pickResult){
    Json::die([
@@ -86,7 +97,8 @@ $db->update('general', [
    'defence_train'=>80,
    'permission'=>'normal',
    'owner'=>$userID,
-    'aux'=>Json::encode($genAux)
+    'aux'=>Json::encode($genAux),
+    'penalty'=>Json::encode($penalty),
 ], 'owner <= 0 AND npc = 2 AND no = %i', $pick);
 $db->insertIgnore('general_access_log', [
    GeneralAccessLogColumn::generalID->value => $pick,
@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 include "lib.php";
@@ -24,14 +25,13 @@ if ($defence_train <= 40) {
    $defence_train = 40;
 }

-if($defence_train <= 90){
+if ($defence_train <= 90) {
    $defence_train = Util::round($defence_train, -1);
-}
-else{
+} else {
    $defence_train = 999;
 }

-if($tnmt < 0 || $tnmt > 1){
+if ($tnmt < 0 || $tnmt > 1) {
    $tnmt = 1;
 }

@@ -39,8 +39,8 @@ $db = DB::db();
 $me = General::createObjFromDB($generalID);


-if($defence_train !== $me->getVar('defence_train')){
-    if($defence_train == 999){
+if ($defence_train !== $me->getVar('defence_train')) {
+    if ($defence_train == 999) {
        $me->increaseVar('myset', -1);
        $me->setVar('defence_train', $defence_train);
        $affectedTrain = -3;
@@ -49,8 +49,7 @@ if($defence_train !== $me->getVar('defence_train')){
        $affectedAtmos = $me->onCalcDomestic('changeDefenceTrain', "atmos{$defence_train}", $affectedAtmos);
        $me->increaseVarWithLimit('train', $affectedTrain, 20, GameConst::$maxTrainByWar);
        $me->increaseVarWithLimit('atmos', $affectedAtmos, 20, GameConst::$maxAtmosByWar);
-    }
-    else{
+    } else {
        $me->increaseVar('myset', -1);
        $me->setVar('defence_train', $defence_train);
    }
@@ -60,21 +59,44 @@ $me->setAuxVar('use_treatment', Util::valueFit($use_treatment, 10, 100));
 $me->setAuxVar('use_auto_nation_turn', $use_auto_nation_turn);
 $me->setVar('tnmt', $tnmt);

-if($me->getNPCType() == 1 && $detachNPC){
+if ($me->getNPCType() == 1 && $detachNPC) {
    $turnterm = $gameStor->turnterm;

-    if($turnterm < 10){
+    if ($turnterm < 10) {
        $targetKillTurn = 30 / $turnterm;
-    }
-    else{
+    } else {
        $targetKillTurn = 60 / $turnterm;
    }
    $me->setVar('killturn', $targetKillTurn);
 }

+$rootDB = RootDB::db();
+//회원 테이블에서 정보확인
+$member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr, `penalty` FROM member WHERE no=%i', $userID);
+
+if (!$member) {
+    //이런 경우가 있나?
+    //TODO: 로그 남겨둘 것
+    Json::die([
+        'result' => false,
+        'reason' => '회원 정보를 찾을 수 없습니다.'
+    ]);
+}
+
+$memberPenalty = Json::decode($member['penalty'] ?? "{}");
+$penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
+
+$penalty = [];
+foreach ($penaltyInfo as $penaltyKey => $penaltyValue) {
+    if ($penaltyValue['expire'] ?? 0 > TimeUtil::now()) {
+        $penalty[$penaltyKey] = $penaltyValue['value'];
+    }
+}
+$me->setVar('penalty', Json::encode($penalty));
+
 $me->applyDB($db);

 Json::die([
-    'result'=>true,
-    'reason'=>'success'
-]);
+    'result' => true,
+    'reason' => 'success'
+]);
@@ -6,6 +6,7 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\GameConst;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
@@ -32,8 +33,18 @@ class GetReservedCommand extends \sammo\BaseAPI
        $gameStor = KVStorage::getStorage($db, 'game_env');
        $generalID = $session->generalID;

+        $invalidTurnList = 0;
+
        $rawTurn = $db->queryAllLists('SELECT turn_idx, action, arg, brief FROM general_turn WHERE general_id = %i ORDER BY turn_idx ASC', $generalID);
        foreach ($rawTurn as [$turn_idx, $action, $arg, $brief]) {
+            if($turn_idx < 0) {
+                $invalidTurnList = -1;
+                $turn_idx += GameConst::$maxTurn;
+            }
+            else if($turn_idx >= GameConst::$maxTurn) {
+                $invalidTurnList = 1;
+                $turn_idx -= GameConst::$maxTurn;
+            }
            $commandList[$turn_idx] = [
                'action' => $action,
                'brief' => $brief,
@@ -41,6 +52,19 @@ class GetReservedCommand extends \sammo\BaseAPI
            ];
        }

+        if($invalidTurnList != 0){
+            if($invalidTurnList > 0){
+                $db->update('general_turn', [
+                    'turn_idx' => $db->sqleval('turn_idx - %i', GameConst::$maxTurn)
+                ], 'general_id=%i AND turn_idx >= %i', $generalID, GameConst::$maxTurn);
+            }
+            else{
+                $db->update('general_turn', [
+                    'turn_idx' => $db->sqleval('turn_idx + %i', GameConst::$maxTurn)
+                ], 'general_id=%i AND turn_idx < 0', $generalID);
+            }
+        }
+

        [$turnTerm, $year, $month, $lastExecute] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month', 'turntime']);

@@ -90,6 +90,9 @@ class BuildNationCandidate extends \sammo\BaseAPI
      return '거병을 실패했습니다.';
    }

+    $generalObj->setVar('killturn', $env['killturn']);
+    $generalObj->applyDB($db);
+
    return null;
  }
 }
@@ -54,7 +54,7 @@ class Join extends \sammo\BaseAPI
                'leadership',
                'strength',
                'intel',
-                'inheritTurntime',
+                'inheritTurntimeZone',
            ])
            ->rule('boolean', [
                'pic'
@@ -72,7 +72,8 @@ class Join extends \sammo\BaseAPI
            ], GameConst::$defaultStatMax)
            ->rule('in', 'character', array_merge(GameConst::$availablePersonality, ['Random']))
            ->rule('in', 'inheritSpecial', GameConst::$availableSpecialWar)
-            ->rule('min', 'inheritTurntime', 0)
+            ->rule('min', 'inheritTurntimeZone', 0)
+            ->rule('max', 'inheritTurntimeZone', 59)
            ->rule('in', 'inheritCity', array_keys(CityConst::all()))
            ->rule('integerArray', 'inheritBonusStat');

@@ -139,22 +140,28 @@ class Join extends \sammo\BaseAPI
        $intel = $this->args['intel'];

        $inheritSpecial = $this->args['inheritSpecial'] ?? null;
-        $inheritTurntime = $this->args['inheritTurntime'] ?? null;
+        $inheritTurntimeZone = $this->args['inheritTurntimeZone'] ?? null;
        $inheritCity = $this->args['inheritCity'] ?? null;
        $inheritBonusStat = $this->args['inheritBonusStat'] ?? null;

-        if ($inheritTurntime !== null && $inheritCity !== null) {
-            return '턴과 도시를 동시에 지정할 수 없습니다.';
-        }
-
        $rootDB = RootDB::db();
        //회원 테이블에서 정보확인
-        $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr FROM member WHERE no=%i', $userID);
+        $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr, `penalty` FROM member WHERE no=%i', $userID);

        if (!$member) {
            return "잘못된 접근입니다!!!";
        }

+        $memberPenalty = Json::decode($member['penalty'] ?? "{}");
+        $penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
+
+        $penalty = [];
+        foreach($penaltyInfo as $penaltyKey => $penaltyValue){
+            if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
+                $penalty[$penaltyKey] = $penaltyValue['value'];
+            }
+        }
+
        $db = DB::db();
        $gameStor = KVStorage::getStorage($db, 'game_env');
        $gameStor->cacheValues(['year', 'month', 'maxgeneral', 'scenario', 'show_img_level', 'block_general_create', 'turnterm', 'turntime', 'genius', 'npcmode']);
@@ -232,7 +239,7 @@ class Join extends \sammo\BaseAPI
        if ($inheritSpecial !== null) {
            $inheritRequiredPoint += GameConst::$inheritBornSpecialPoint;
        }
-        if ($inheritTurntime !== null) {
+        if ($inheritTurntimeZone !== null) {
            $inheritRequiredPoint += GameConst::$inheritBornTurntimePoint;
        }

@@ -347,12 +354,14 @@ class Join extends \sammo\BaseAPI
            $experience *= 0.8;
        }

-        if ($inheritTurntime !== null) {
-            $inheritTurntime = $inheritTurntime % ($admin['turnterm'] * 60);
+        if ($inheritTurntimeZone !== null) {
+            $inheritTurntime = $inheritTurntimeZone * $admin['turnterm'];
+            $inheritTurntime += $rng->nextRangeInt(0, Util::clamp($admin['turnterm'] - 1, 0));

            $userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime % 60), "inheritPoint");

            $inheritTurntime += $rng->nextRangeInt(0, 999999) / 1000000;
+
            $turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $admin['turnterm']));
            $turntime = $turntime->add(TimeUtil::secondsToDateInterval($inheritTurntime));
            $turntime = TimeUtil::format($turntime, true);
@@ -424,7 +433,8 @@ class Join extends \sammo\BaseAPI
            'specage' => $specage,
            'special' => $special,
            'specage2' => $specage2,
-            'special2' => $special2
+            'special2' => $special2,
+            'penalty' => Json::encode($penalty),
        ]);
        $generalID = $db->insertId();
        $db->insert('general_access_log', [
@@ -55,7 +55,11 @@ class GetCachedMap extends \sammo\BaseAPI
      return 'cache 불가';
    }

-    $storage = new \Nette\Caching\Storages\FileStorage('data/file_cache');
+    $absolutePath = realpath('data/file_cache');
+    if (!$absolutePath) {
+      return 'cache 불가';
+    }
+    $storage = new \Nette\Caching\Storages\FileStorage($absolutePath);
    $cache = new Cache($storage);

    $now = TimeUtil::nowDateTimeImmutable();
@@ -288,6 +288,10 @@ class GetConst extends \sammo\BaseAPI
        if (!prepareDir($cacheDir)) {
            throw new RuntimeException('cache 폴더 없음');
        }
+        $absolutePath = realpath($cacheDir);
+        if (!$absolutePath) {
+            throw new RuntimeException('cache 폴더 없음');
+        }
        $storage = new \Nette\Caching\Storages\FileStorage($cacheDir);
        $cache = new Cache($storage);

@@ -0,0 +1,154 @@
+<?php
+
+namespace sammo\API\InheritAction;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\Enums\APIRecoveryType;
+use sammo\Enums\MessageType;
+use sammo\Enums\RankColumn;
+use sammo\GameConst;
+use sammo\General;
+use sammo\KVStorage;
+use sammo\Message;
+use sammo\MessageTarget;
+use sammo\RootDB;
+use sammo\TimeUtil;
+use sammo\UserLogger;
+use sammo\Validator;
+
+use function sammo\GetImageURL;
+use function sammo\getNationStaticInfo;
+
+/**
+ *
+ * 유산 포인트 1000 포인트를 사용하면 지정한 상대의 본래 유저명을 확인 가능.
+ * 개인 메시지로 전달되며, 이 기능이 사용되었음을 상대에게도 알림.
+ */
+class CheckOwner extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        $v = new Validator($this->args);
+        $v->rule('required', [
+            'destGeneralID',
+        ])
+            ->rule('int', 'destGeneralID')
+            ->rule('min', 'destGeneralID', 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): null|string|array|APIRecoveryType
+    {
+        $userID = $session->userID;
+        $generalID = $session->generalID;
+
+        $destGeneralID = $this->args['destGeneralID'];
+        if ($generalID == $destGeneralID) {
+            return '자신의 정보는 확인할 수 없습니다.';
+        }
+
+        $general = General::createObjFromDB($generalID);
+        if ($userID != $general->getVar('owner')) {
+            return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
+        }
+
+        $db = DB::db();
+        $destRawGeneral = $db->queryFirstRow('SELECT no,name,nation,owner,owner_name,imgsvr,picture FROM general WHERE no = %i', $destGeneralID);
+
+        if (!$destRawGeneral) {
+            return '대상 장수가 존재하지 않습니다.';
+        }
+
+        if (!$destRawGeneral['owner']) {
+            return '대상 장수는 NPC입니다.';
+        }
+
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        if ($gameStor->isunited) {
+            return '이미 천하가 통일되었습니다.';
+        }
+
+        $reqPoint = GameConst::$inheritCheckOwnerPoint;
+
+        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
+        $previousPoint = ($inheritStor->getValue('previous') ?? [0, 0])[0];
+        if ($previousPoint < $reqPoint) {
+            return '충분한 유산 포인트를 가지고 있지 않습니다.';
+        }
+
+        $userLogger = new UserLogger($userID);
+        $userLogger->push("{$reqPoint} 포인트로 장수 소유자 확인", "inheritPoint");
+        $userLogger->flush();
+
+        $destGeneralName = $destRawGeneral['name'];
+        $destGeneralOwnerName = $destRawGeneral['owner_name'];
+        if (!$destGeneralOwnerName) {
+            $rootDB = RootDB::db();
+            $destGeneralOwnerName = $rootDB->queryFirstField('SELECT name FROM member WHERE no = %i', $destRawGeneral['owner']) ?? '알수없음';
+        }
+
+        $src = new MessageTarget(0, '', 0, 'System', '#000000');
+
+        if (true) {
+            $staticNation = $general->getStaticNation();
+            $dest = new MessageTarget(
+                $generalID,
+                $general->getName(),
+                $general->getNationID(),
+                $staticNation['name'],
+                $staticNation['color'],
+                GetImageURL($general->getVar('imgsvr'), $general->getVar('picture'))
+            );
+            $msg = new Message(
+                MessageType::private,
+                $src,
+                $dest,
+                "{$destGeneralName}의 소유자는 {$destGeneralOwnerName} 입니다.",
+                new \DateTime(),
+                new \DateTime('9999-12-31'),
+                []
+            );
+            $msg->send(true);
+        }
+
+        $inheritStor->setValue('previous', [$previousPoint - $reqPoint, null]);
+        $general->increaseRankVar(RankColumn::inherit_point_spent_dynamic, $reqPoint);
+        $general->applyDB($db);
+
+        if(true){
+            $destStaticNation = getNationStaticInfo($destRawGeneral['nation']);
+            $dest = new MessageTarget(
+                $destGeneralID,
+                $destGeneralName,
+                $destRawGeneral['nation'],
+                $destStaticNation['name'],
+                $destStaticNation['color'],
+                GetImageURL($destRawGeneral['imgsvr'], $destRawGeneral['picture'])
+            );
+            $msg = new Message(
+                MessageType::private,
+                $src,
+                $dest,
+                "소유자명이 누군가에 의해 확인되었습니다.",
+                new \DateTime(),
+                new \DateTime('9999-12-31'),
+                []
+            );
+            $msg->send(true);
+        }
+
+        return null;
+    }
+}
@@ -70,13 +70,13 @@ class ResetTurnTime extends \sammo\BaseAPI
            UniqueConst::$hiddenSeed,
            'ResetTurnTime',
            $userID,
-            $general->getTurnTime()
+            $general->getAuxVar('nextTurnTimeBase') ?? $general->getTurnTime()
        )));

        $afterTurn = $rng->nextFloat1() * $turnTerm * 60;

        $userLogger = new UserLogger($userID);
-        $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾸어 다음 턴부터 %02d:%02d 적용", intdiv(Util::toInt($afterTurn), 60), $afterTurn % 60), "inheritPoint");
+        $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾸어 다다음 턴부터 %02d:%02d 적용", intdiv(Util::toInt($afterTurn), 60), $afterTurn % 60), "inheritPoint");
        $userLogger->flush();

        $general->setAuxVar('inheritResetTurnTime', $nextLevel);
@@ -7,9 +7,12 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\MessageType;
+use sammo\Enums\PenaltyKey;
+use sammo\Json;
 use sammo\Message;
 use sammo\MessageTarget;
 use sammo\Validator;
+use sammo\Util;

 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
@@ -170,6 +173,8 @@ class SendMessage extends \sammo\BaseAPI
      return '장수가 없습니다.';
    }

+    $penalty = Json::decode($me['penalty'] ?? '{}');
+
    $limitState = checkLimit($me['refresh_score']);
    if ($limitState >= 2) {
      return '접속 제한입니다.';
@@ -187,6 +192,9 @@ class SendMessage extends \sammo\BaseAPI

    // 전체 메세지
    if ($mailbox === Message::MAILBOX_PUBLIC) {
+      if($penalty[PenaltyKey::NoSendPublicMsg->value] ?? 0) {
+        return '공개 메세지를 보낼 수 없습니다.';
+      }
      $msgID = $this->genPublicMessage($src, $text)->send();
      return [
        'msgType' => 'public',
@@ -226,8 +234,14 @@ class SendMessage extends \sammo\BaseAPI
      $now = new \DateTime();
      $lastMsg = new \DateTime($session->lastMsg ?? '0000-00-00');
      $msg_interval = $now->getTimestamp() - $lastMsg->getTimestamp();
-      if ($msg_interval < 2) {
-        return '개인메세지는 2초당 1건만 보낼 수 있습니다!';
+
+      if($penalty[PenaltyKey::NoSendPrivateMsg->value] ?? 0) {
+        return '개인 메세지를 보낼 수 없습니다.';
+      }
+
+      $msg_min_interval = $penalty[PenaltyKey::SendPrivateMsgDelay->value] ?? 2;
+      if ($msg_interval < $msg_min_interval) {
+        return "개인메세지는 {$msg_min_interval}초당 1건만 보낼 수 있습니다!";
      }
      $session->lastMsg = $now->format('Y-m-d H:i:s');

@@ -313,7 +313,7 @@ class GeneralList extends \sammo\BaseAPI
        foreach ($rawGeneralList as $rawGeneral) {
            //General 생성?
            if (key_exists('aux', $rawGeneral)) {
-                $rawGeneral['aux'] = \sammo\JSON::decode($rawGeneral['aux']);
+                $rawGeneral['aux'] = \sammo\Json::decode($rawGeneral['aux']);
            }

            $item = [];
@@ -73,6 +73,11 @@ class GetReservedCommand extends \sammo\BaseAPI
        }

        $nationTurnList = [];
+
+        //혹시 정규 턴을 벗어난 턴이 있는지 체크
+        $invalidUnderTurnList = [];
+        $invalidOverTurnList = [];
+
        foreach ($db->queryAllLists(
            'SELECT officer_level, turn_idx, action, arg, brief FROM nation_turn WHERE nation_id = %i ORDER BY officer_level DESC, turn_idx ASC',
            $me['nation']
@@ -80,6 +85,14 @@ class GetReservedCommand extends \sammo\BaseAPI
            if (!key_exists($officer_level, $nationTurnList)) {
                $nationTurnList[$officer_level] = [];
            }
+            if($turn_idx < 0){
+                $invalidUnderTurnList[$officer_level] = $turn_idx;
+                $turn_idx += GameConst::$maxChiefTurn;
+            }
+            else if($turn_idx >= GameConst::$maxChiefTurn){
+                $invalidOverTurnList[$officer_level] = $turn_idx;
+                $turn_idx -= GameConst::$maxChiefTurn;
+            }
            $nationTurnList[$officer_level][$turn_idx] = [
                'action' => $action,
                'brief' => $brief,
@@ -87,6 +100,21 @@ class GetReservedCommand extends \sammo\BaseAPI
            ];
        }

+        if($invalidUnderTurnList){
+            $db->update(
+                'nation_turn', [
+                    'turn_idx' => $db->sqleval('`turn_idx` + %i', GameConst::$maxChiefTurn)
+                ], 'nation_id = %i AND officer_level IN %li AND turn_idx < 0', $me['nation'], array_keys($invalidUnderTurnList)
+            );
+        }
+        if($invalidOverTurnList){
+            $db->update(
+                'nation_turn', [
+                    'turn_idx' => $db->sqleval('`turn_idx` - %i', GameConst::$maxChiefTurn)
+                ], 'nation_id = %i AND officer_level IN %li AND turn_idx >= %i', $me['nation'], array_keys($invalidOverTurnList), GameConst::$maxChiefTurn
+            );
+        }
+
        $troopList = [];
        foreach ($db->queryAllLists(
            'SELECT troop_leader, `name` FROM troop WHERE `nation` = %i',
@@ -9,7 +9,7 @@ class che_오두미도 extends \sammo\BaseNation{
    protected $name = '오두미도';
    protected $info = '';
    static $pros = '쌀수입↑ 인구↑';
-    static $cons = '기술↓ 수성↓ 내정↓';
+    static $cons = '기술↓ 수성↓ 농상↓';


    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
@@ -40,4 +40,4 @@ class che_오두미도 extends \sammo\BaseNation{
        return $amount;
    }

-}
+}
@@ -8,7 +8,7 @@ class che_유가 extends \sammo\BaseNation{

    protected $name = '유가';
    protected $info = '';
-    static $pros = '내정↑ 민심↑';
+    static $pros = '농상↑ 민심↑';
    static $cons = '쌀수입↓';

    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
@@ -31,4 +31,4 @@ class che_유가 extends \sammo\BaseNation{
        
        return $amount;
    }
-}
+}
@@ -8,7 +8,7 @@ class che_음양가 extends \sammo\BaseNation{

    protected $name = '음양가';
    protected $info = '';
-    static $pros = '내정↑ 인구↑';
+    static $pros = '농상↑ 인구↑';
    static $cons = '기술↓ 전략↓';

    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
@@ -29,14 +29,14 @@ class che_음양가 extends \sammo\BaseNation{
        if($type == 'pop' && $amount > 0){
            return $amount * 1.2;
        }
-        
+
        return $amount;
    }

    public function onCalcStrategic(string $turnType, string $varType, $value){
        if($varType == 'delay'){
-            return $value * 2;
+            return Util::round($value * 4 / 3);
        }
        return $value;
    }
-}
+}
@@ -9,7 +9,7 @@ class che_종횡가 extends \sammo\BaseNation{
    protected $name = '종횡가';
    protected $info = '';
    static $pros = '전략↑ 수성↑';
-    static $cons = '금수입↓ 내정↓';
+    static $cons = '금수입↓ 농상↓';

    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
        if($turnType == '수비' || $turnType == '성벽'){
@@ -42,4 +42,4 @@ class che_종횡가 extends \sammo\BaseNation{
        }
        return $value;
    }
-}
+}
@@ -158,7 +158,7 @@ class che_강행 extends Command\GeneralCommand
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -174,7 +174,7 @@ class che_거병 extends Command\GeneralCommand{

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -18,6 +18,7 @@ use function \sammo\getAllNationStaticInfo;

 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
+use sammo\Enums\PenaltyKey;

 use function sammo\buildNationTypeClass;
 use function sammo\genGenericUniqueRNGFromGeneral;
@@ -81,7 +82,8 @@ class che_건국 extends Command\GeneralCommand

        $this->minConditionConstraints = [
            ConstraintHelper::BeOpeningPart($relYear + 1),
-            ConstraintHelper::ReqNationValue('level', '국가규모', '==', 0, '정식 국가가 아니어야합니다.')
+            ConstraintHelper::ReqNationValue('level', '국가규모', '==', 0, '정식 국가가 아니어야합니다.'),
+            ConstraintHelper::NoPenalty(PenaltyKey::NoFoundNation),
        ];
    }

@@ -102,6 +104,7 @@ class che_건국 extends Command\GeneralCommand
            ConstraintHelper::CheckNationNameDuplicate($nationName),
            ConstraintHelper::AllowJoinAction(),
            ConstraintHelper::ConstructableCity(),
+            ConstraintHelper::NoPenalty(PenaltyKey::NoFoundNation),
        ];
    }

@@ -201,7 +204,7 @@ class che_건국 extends Command\GeneralCommand
        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '건국');
+        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국');
        $general->applyDB($db);

        return true;
@@ -112,7 +112,7 @@ class che_견문 extends Command\GeneralCommand{
        $general->addExperience($exp);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -178,7 +178,7 @@ class che_군량매매 extends Command\GeneralCommand{

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -95,7 +95,7 @@ class che_귀환 extends Command\GeneralCommand{
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -134,7 +134,7 @@ class che_기술연구 extends che_상업투자{

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -126,7 +126,7 @@ class che_단련 extends Command\GeneralCommand{
        $general->increaseVar($incStat, 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -169,7 +169,7 @@ class che_등용 extends Command\GeneralCommand

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -281,7 +281,7 @@ class che_랜덤임관 extends Command\GeneralCommand
        $general->addExperience($exp);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '랜덤 임관');
+        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '랜덤 임관');
        $general->applyDB($db);

        return true;
@@ -216,7 +216,7 @@ class che_무작위건국 extends Command\GeneralCommand
        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '건국');
+        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국');
        $general->applyDB($db);

        return true;
@@ -148,7 +148,7 @@ class che_물자조달 extends Command\GeneralCommand{

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -106,7 +106,7 @@ class che_사기진작 extends Command\GeneralCommand{
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -218,7 +218,7 @@ class che_상업투자 extends Command\GeneralCommand{
        $general->increaseVar(static::$statKey.'_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -179,7 +179,7 @@ class che_숙련전환 extends Command\GeneralCommand
        $general->increaseVar('leadership_exp', 2);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -75,7 +75,7 @@ class che_은퇴 extends Command\GeneralCommand{
        $logger->pushGeneralActionLog("은퇴하였습니다. <1>$date</>");

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -164,7 +164,7 @@ class che_이동 extends Command\GeneralCommand
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -152,7 +152,7 @@ class che_인재탐색 extends Command\GeneralCommand
            $general->increaseVar($incStat, 1);
            $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
            $general->checkStatChange();
-            tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+            tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
            $general->applyDB($db);
            return true;
        }
@@ -218,7 +218,7 @@ class che_인재탐색 extends Command\GeneralCommand
        $general->increaseVar($incStat, 3);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);
        return true;
    }
@@ -17,6 +17,7 @@ use function \sammo\getNationStaticInfo;

 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
+use sammo\Enums\PenaltyKey;

 class che_임관 extends Command\GeneralCommand
 {
@@ -66,7 +67,8 @@ class che_임관 extends Command\GeneralCommand
        $this->minConditionConstraints = [
            ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
            ConstraintHelper::BeNeutral(),
-            ConstraintHelper::AllowJoinAction()
+            ConstraintHelper::AllowJoinAction(),
+            ConstraintHelper::NoPenalty(PenaltyKey::NoChosenAssignment),
        ];
    }

@@ -92,7 +94,8 @@ class che_임관 extends Command\GeneralCommand
            ConstraintHelper::BeNeutral(),
            ConstraintHelper::ExistsDestNation(),
            ConstraintHelper::AllowJoinDestNation($relYear),
-            ConstraintHelper::AllowJoinAction()
+            ConstraintHelper::AllowJoinAction(),
+            ConstraintHelper::NoPenalty(PenaltyKey::NoChosenAssignment),
        ];
    }

@@ -172,7 +175,7 @@ class che_임관 extends Command\GeneralCommand
        $general->addExperience($exp);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -196,7 +196,7 @@ class che_장비매매 extends Command\GeneralCommand
        $general->addExperience($exp);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -170,7 +170,7 @@ class che_장수대상임관 extends Command\GeneralCommand{
        $general->addExperience($exp);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -121,7 +121,7 @@ class che_전투태세 extends Command\GeneralCommand{
        $general->increaseVar('leadership_exp', 3);
        $this->setResultTurn($turnResult);
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -103,7 +103,7 @@ class che_전투특기초기화 extends Command\GeneralCommand{
        $logger->pushGeneralActionLog("새로운 {$specialName}를 가질 준비가 되었습니다. <1>$date</>");

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -188,7 +188,7 @@ class che_정착장려 extends Command\GeneralCommand{
        $general->increaseVar(static::$statKey.'_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -188,7 +188,7 @@ class che_주민선정 extends Command\GeneralCommand{
        $general->increaseVar(static::$statKey.'_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -170,7 +170,7 @@ class che_증여 extends Command\GeneralCommand

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);
        $destGeneral->applyDB($db);
@@ -103,7 +103,7 @@ class che_집합 extends Command\GeneralCommand{
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -227,7 +227,7 @@ class che_징병 extends Command\GeneralCommand
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
        $general->setAuxVar('armType', $reqCrewType->armType);
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -253,7 +253,7 @@ class che_출병 extends Command\GeneralCommand

        processWar($warRngSeed, $general, $this->nation, $this->destCity);

-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -105,8 +105,8 @@ class che_해산 extends Command\GeneralCommand{
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));

        $nationGenerals = deleteNation($general, false);
+        $general->setVar('makelimit', 12);
        foreach($nationGenerals as $oldGeneral){
-            $oldGeneral->setVar('makelimit', 12);
            $oldGeneral->applyDB($db);
        }
        $general->applyDB($db);
@@ -146,7 +146,7 @@ class che_헌납 extends Command\GeneralCommand
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();

-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -107,7 +107,7 @@ class che_훈련 extends Command\GeneralCommand{
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -201,7 +201,7 @@ class cr_건국 extends Command\GeneralCommand
        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '건국');
+        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국');
        $general->applyDB($db);

        return true;
@@ -105,7 +105,7 @@ class cr_맹훈련 extends Command\GeneralCommand{
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -1,9 +1,11 @@
 <?php
+
 namespace sammo\Constraint;

-abstract class Constraint{
-    private function __construct(){
-
+abstract class Constraint
+{
+    private function __construct()
+    {
    }

    const REQ_GENERAL = 0x10;
@@ -18,7 +20,8 @@ abstract class Constraint{
    const REQ_NUMERIC_ARG = self::REQ_ARG | 0x4000;
    const REQ_BOOLEAN_ARG = self::REQ_ARG | 0x8000;
    const REQ_ARRAY_ARG = self::REQ_ARG | 0x10000;
-    
+    const REQ_BACKED_ENUM_ARG = self::REQ_ARG | 0x20000;
+
    const REQ_VALUES = 0;

    protected $general = null;
@@ -37,182 +40,241 @@ abstract class Constraint{
    protected $tested = false;
    protected $reason = null;

-    abstract public function test():bool;
+    abstract public function test(): bool;


-    static public function requiredValueType():int{
+    static public function requiredValueType(): int
+    {
        return static::REQ_VALUES;
    }

-    public function setGeneral(array $general){
+    public function setGeneral(array $general)
+    {
        $this->general = $general;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setCity(array $city){
+    public function setCity(array $city)
+    {
        $this->city = $city;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setNation(array $nation){
+    public function setNation(array $nation)
+    {
        $this->nation = $nation;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setArg($arg){
+    public function setArg($arg)
+    {
        $this->arg = $arg;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setEnv($env){
+    public function setEnv($env)
+    {
        $this->env = $env;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setCmdArg($cmd_arg){
+    public function setCmdArg($cmd_arg)
+    {
        $this->cmd_arg = $cmd_arg;
        $this->tested = false;
        $this->reason = null;
    }

-    public function setDestGeneral(array $general){
+    public function setDestGeneral(array $general)
+    {
        $this->destGeneral = $general;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setDestCity(array $city){
+    public function setDestCity(array $city)
+    {
        $this->destCity = $city;
        $this->tested = false;
        $this->reason = null;
    }
-    public function setDestNation(array $nation){
+    public function setDestNation(array $nation)
+    {
        $this->destNation = $nation;
        $this->tested = false;
        $this->reason = null;
    }

-    static public function build(array $input):self{
+    static public function build(array $input): self
+    {
        $self = new static();
-        foreach($input as $key=>$value){
-            if($value === null){
+        foreach ($input as $key => $value) {
+            if ($value === null) {
                continue;
            }
-            switch($key){
-                case 'general': $self->setGeneral($value); break;
-                case 'city': $self->setCity($value); break;
-                case 'nation': $self->setNation($value); break;
-                case 'cmd_arg': $self->setCmdArg($value); break;
+            switch ($key) {
+                case 'general':
+                    $self->setGeneral($value);
+                    break;
+                case 'city':
+                    $self->setCity($value);
+                    break;
+                case 'nation':
+                    $self->setNation($value);
+                    break;
+                case 'cmd_arg':
+                    $self->setCmdArg($value);
+                    break;

-                case 'destGeneral': $self->setDestGeneral($value); break;
-                case 'destCity': $self->setDestCity($value); break;
-                case 'destNation': $self->setDestNation($value); break;
+                case 'destGeneral':
+                    $self->setDestGeneral($value);
+                    break;
+                case 'destCity':
+                    $self->setDestCity($value);
+                    break;
+                case 'destNation':
+                    $self->setDestNation($value);
+                    break;
            }
        }
-        
+
        return $self;
    }

-    public function checkInputValues(bool $throwExeception=true):bool{
+    public function checkInputValues(bool $throwExeception = true): bool
+    {
        $valueType = static::requiredValueType();

-        if(($valueType&static::REQ_GENERAL) && $this->general === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_GENERAL) && $this->general === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require general');
        }

-        if(($valueType&static::REQ_CITY) && $this->city === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_CITY) && $this->city === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require city');
        }

-        if(($valueType&static::REQ_NATION) && $this->nation === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_NATION) && $this->nation === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require nation');
        }

-        if(($valueType&static::REQ_DEST_GENERAL) && $this->destGeneral === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_DEST_GENERAL) && $this->destGeneral === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require dest general');
        }

-        if(($valueType&static::REQ_DEST_CITY) && $this->destCity === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_DEST_CITY) && $this->destCity === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require dest city');
        }

-        if(($valueType&static::REQ_DEST_NATION) && $this->destNation === null){
-            if(!$throwExeception){return false; }
+        if (($valueType & static::REQ_DEST_NATION) && $this->destNation === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require dest nation');
        }

-        if (!($valueType&static::REQ_ARG)) {
-           return true;
+        if (!($valueType & static::REQ_ARG)) {
+            return true;
        }

-        if($valueType === null){
-            if(!$throwExeception){return false; }
+        if ($valueType === null) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require arg');
        }

-        if((($valueType&static::REQ_STRING_ARG)===static::REQ_STRING_ARG) && !is_string($this->arg)){
-            if(!$throwExeception){return false; }
+        if ((($valueType & static::REQ_STRING_ARG) === static::REQ_STRING_ARG) && !is_string($this->arg)) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require string arg');
        }

-        if((($valueType&static::REQ_BOOLEAN_ARG)===static::REQ_BOOLEAN_ARG) && !is_bool($this->arg)){
-            if(!$throwExeception){return false; }
+        if ((($valueType & static::REQ_BOOLEAN_ARG) === static::REQ_BOOLEAN_ARG) && !is_bool($this->arg)) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require bool arg');
        }

-        if((($valueType&static::REQ_INT_ARG)===static::REQ_INT_ARG) && !is_int($this->arg)){
-            if(!$throwExeception){return false; }
+        if ((($valueType & static::REQ_INT_ARG) === static::REQ_INT_ARG) && !is_int($this->arg)) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require int arg');
        }

-        if((($valueType&static::REQ_NUMERIC_ARG)===static::REQ_NUMERIC_ARG) && !is_numeric($this->arg)){
-            if(!$throwExeception){return false; }
+        if ((($valueType & static::REQ_NUMERIC_ARG) === static::REQ_NUMERIC_ARG) && !is_numeric($this->arg)) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require numeric arg');
        }

-        if((($valueType&static::REQ_ARRAY_ARG)===static::REQ_ARRAY_ARG) && !is_array($this->arg)){
-            if(!$throwExeception){return false; }
+        if ((($valueType & static::REQ_ARRAY_ARG) === static::REQ_ARRAY_ARG) && !is_array($this->arg)) {
+            if (!$throwExeception) {
+                return false;
+            }
            throw new \InvalidArgumentException('require array arg');
        }

+        if ((($valueType & static::REQ_BACKED_ENUM_ARG) === static::REQ_BACKED_ENUM_ARG) && !($this->arg instanceof \BackedEnum)) {
+            if (!$throwExeception) {
+                return false;
+            }
+            throw new \InvalidArgumentException('require backed enum arg');
+        }
+
        return true;
    }

-    public function reason():?string{
-        if($this->tested === false){
-            throw new \RuntimeException(get_class($this).'::test가 실행되지 않음');
+    public function reason(): ?string
+    {
+        if ($this->tested === false) {
+            throw new \RuntimeException(get_class($this) . '::test가 실행되지 않음');
        }
        return $this->reason;
    }

-    public static function testAll(array $constraintPacks, array $input, array $env):?array{
-        foreach($constraintPacks as $constraintArgs){
-            if (!$constraintArgs){
+    public static function testAll(array $constraintPacks, array $input, array $env): ?array
+    {
+        foreach ($constraintPacks as $constraintArgs) {
+            if (!$constraintArgs) {
                continue;
            }

            $constraintName = $constraintArgs[0];
-            $method = __NAMESPACE__.'\\'.$constraintName.'::build';
+            $method = __NAMESPACE__ . '\\' . $constraintName . '::build';

            /** @var \sammo\Constraint\Constraint $contraint */
-            $constraint = call_user_func($method,$input);
+            $constraint = call_user_func($method, $input);

            assert($constraint instanceof Constraint);
            $constraint->setEnv($env);
-            if(count($constraintArgs) == 2){
+            if (count($constraintArgs) == 2) {
                $arg = $constraintArgs[1];
                $constraint->setArg($arg);
            }
-        

-            if(!$constraint->test()){

-                if($constraint->reason() === null){
-                    throw new \RuntimeException('Reason is not set:'.$constraintName);
+            if (!$constraint->test()) {
+
+                if ($constraint->reason() === null) {
+                    throw new \RuntimeException('Reason is not set:' . $constraintName);
                }
                return [$constraintName, $constraint->reason()];
            }
@@ -220,5 +282,4 @@ abstract class Constraint{

        return null;
    }
-
-}
+}
@@ -2,6 +2,8 @@

 namespace sammo\Constraint;

+use sammo\Enums\PenaltyKey;
+
 class ConstraintHelper{

    static function AdhocCallback(callable $callback):array{
@@ -176,6 +178,10 @@ class ConstraintHelper{
        return [__FUNCTION__];
    }

+    static function NoPenalty(PenaltyKey $penaltyKey):array{
+        return [__FUNCTION__, $penaltyKey];
+    }
+
    static function OccupiedCity(bool $allowNeutral=false):array{
        return [__FUNCTION__, $allowNeutral];
    }
@@ -0,0 +1,44 @@
+<?php
+
+namespace sammo\Constraint;
+
+use sammo\Enums\PenaltyKey;
+use sammo\Json;
+
+class NoPenalty extends Constraint{
+    const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_ARG|Constraint::REQ_BACKED_ENUM_ARG;
+
+    public function checkInputValues(bool $throwExeception=true):bool{
+        if(!parent::checkInputValues($throwExeception) && !$throwExeception){
+            return false;
+        }
+
+        if(!key_exists('penalty', $this->general)){
+            if(!$throwExeception){return false; }
+            throw new \InvalidArgumentException("require penalty in general");
+        }
+
+        if(!($this->arg instanceof PenaltyKey)){
+            if(!$throwExeception){return false; }
+            throw new \InvalidArgumentException("require penalty key");
+        }
+
+        return true;
+    }
+
+    public function test():bool{
+        $this->checkInputValues();
+        $this->tested = true;
+
+        /** @var PenaltyKey */
+        $checkKey = $this->arg;
+
+        $peneltyList = JSON::decode($this->general['penalty']);
+        if(!key_exists($checkKey->value, $peneltyList)){
+            return true;
+        }
+
+        $this->reason = "징계 사유: {$peneltyList[$checkKey->value]}";
+        return false;
+    }
+}
@@ -2,6 +2,7 @@

 namespace sammo;

+use Ds\Map;
 use sammo\Enums\InheritanceKey;

 class DummyGeneral extends General
@@ -31,6 +32,7 @@ class DummyGeneral extends General
        $this->raw = $raw;

        $this->resultTurn = new LastTurn();
+        $this->penaltyList = new Map();

        if ($initLogger) {
            $this->initLogger(1, 1);
@@ -0,0 +1,40 @@
+<?php
+
+namespace sammo\Enums;
+
+/**
+ * Penalty Key
+ * general의 penalty 항목
+ */
+enum PenaltyKey: string
+{
+    case SendPrivateMsgDelay = 'sendPrivateMsgDelay';
+    case NoSendPrivateMsg = 'noSendPrivateMsg';
+    case NoSendPublicMsg = 'noSendPublicMsg';
+    case NoTopSecret = 'noTopSecret';
+    case NoChief = 'noChief';
+    case NoAmbassador = 'noAmbassador';
+    case NoBanGeneral = 'noBanGeneral';
+    case NoChiefTurnInput = 'noChiefTurnInput';
+    case NoChiefChange = 'noChiefChange';
+    case NoFoundNation = 'noFoundNation';
+    case NoChosenAssignment = 'noChosenAssignment';
+
+    public function getHelptext(): string
+    {
+        return match ($this) {
+            PenaltyKey::SendPrivateMsgDelay => '개인 메세지 보내기 제한 시간',
+            PenaltyKey::NoSendPrivateMsg => '개인 메세지 보내기 금지',
+            PenaltyKey::NoSendPublicMsg => '공개 메세지 보내기 금지',
+            PenaltyKey::NoTopSecret => '암행부 열람 금지',
+            PenaltyKey::NoChief => '수뇌 금지',
+            PenaltyKey::NoAmbassador => '외교권자 금지',
+            PenaltyKey::NoBanGeneral => '장수 추방 금지',
+            PenaltyKey::NoChiefTurnInput => '수뇌 턴 입력 금지',
+            PenaltyKey::NoChiefChange => '수뇌 임명/해임 금지',
+            PenaltyKey::NoFoundNation => '건국 금지',
+            PenaltyKey::NoChosenAssignment => '지정 임관 금지',
+            default => "페널티({$this->value})",
+        };
+    }
+}
@@ -67,12 +67,14 @@ class RaiseInvader extends \sammo\Event\Action

        foreach ($db->queryAllLists('SELECT capital, nation from nation WHERE capital in %li', $cities) as $row) {
            [$oldCapital, $nation] = $row;
-            $capitalCandidates = $db->queryFirstColumn('SELECT from city WHERE nation = %i AND city != %i', $nation);
+            $capitalCandidates = $db->queryFirstColumn('SELECT city from city WHERE nation = %i AND city != %i AND city NOT IN %li', $nation, $oldCapital, $cities);
            if (!$capitalCandidates) {
                $disabledInvaderCity->add($oldCapital);
                continue;
            }
+
            $newCapital = $rng->choice($capitalCandidates);
+
            $db->update('nation', ['capital' => $newCapital], 'nation=%i', $nation);
            $db->update('general', ['city' => $newCapital], 'nation=%i and city=%i', $nation, $oldCapital);
        }
@@ -89,6 +91,10 @@ class RaiseInvader extends \sammo\Event\Action
            'supply' => 1,
        ], 'city in %li', $cities);

+        if(!$disabledInvaderCity->isEmpty()){
+            refreshNationStaticInfo();
+        }
+
        return $disabledInvaderCity;
    }

@@ -216,7 +216,7 @@ class GameConstBase

    public static $minMonthToAllowInheritItem = 4;
    public static $inheritBornSpecialPoint = 6000;
-    public static $inheritBornTurntimePoint = 3000;
+    public static $inheritBornTurntimePoint = 2500;
    public static $inheritBornCityPoint = 1000;
    public static $inheritBornStatPoint = 1000;
    public static $inheritItemUniqueMinPoint = 5000;
@@ -224,6 +224,7 @@ class GameConstBase
    public static $inheritBuffPoints = [0, 200, 600, 1200, 2000, 3000];
    public static $inheritSpecificSpecialPoint = 4000;
    public static $inheritResetAttrPointBase = [1000, 1000, 2000, 3000];//필요하면 늘려서 쓰기
+    public static $inheritCheckOwnerPoint = 1000;

    /** @var ?string */
    public static $scenarioEffect = null;
@@ -318,7 +319,6 @@ class GameConstBase
            'che_치안강화',
            'che_정착장려',
            'che_주민선정',
-            'che_물자조달',
        ],
        '군사' => [
            'che_징병',
@@ -349,6 +349,7 @@ class GameConstBase
        '국가' => [
            'che_증여',
            'che_헌납',
+            'che_물자조달',
            'che_하야',
            'che_거병',
            'che_건국',
@@ -7,6 +7,7 @@ use sammo\Command\GeneralCommand;
 use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
+use sammo\Enums\PenaltyKey;
 use sammo\Enums\RankColumn;
 use sammo\WarUnitTrigger as WarUnitTrigger;

@@ -28,6 +29,10 @@ class General extends GeneralBase implements iAction
    protected $logActivatedSkill = [];
    protected $isFinished = false;

+
+    /** @var Map<PenaltyKey,int|float|string> */
+    protected Map $penaltyList;
+
    /** @var ?iAction */
    protected $nationType = null;
    /** @var ?iAction */
@@ -86,6 +91,16 @@ class General extends GeneralBase implements iAction
            $this->rankVarRead = new Map();
        }

+        $penaltyList = new Map();
+        foreach(Json::decode($raw['penalty'] ?? '{}') as $rawPenaltyKey => $penaltyValue){
+            $penaltyKey = PenaltyKey::tryFrom($rawPenaltyKey);
+            if($penaltyKey === null){
+                throw new \InvalidArgumentException('Invalid PenaltyKey: ' . $rawPenaltyKey);
+            }
+            $penaltyList[$penaltyKey] = $penaltyValue;
+        }
+        $this->penaltyList = $penaltyList;
+
        $this->accessLogRead = $rawAccessLog;


@@ -244,6 +259,17 @@ class General extends GeneralBase implements iAction
        return $this->crewType;
    }

+    function hasPenalty(PenaltyKey $penaltyKey): bool
+    {
+        return $this->penaltyList->hasKey($penaltyKey);
+    }
+
+    /** @return Map<PenaltyKey,int|float|string> */
+    function getPenaltyList(): Map
+    {
+        return $this->penaltyList;
+    }
+
    function calcRecentWarTurn(int $turnTerm): int
    {
        $cacheKey = "recent_war_turn_{$turnTerm}";
@@ -365,14 +391,14 @@ class General extends GeneralBase implements iAction
            }
        }

-        $this->calcCache[$cKey] = $statValue;
-
        $statValue = Util::clamp($statValue, 0, GameConst::$maxLevel);

        if ($useFloor) {
            return Util::toInt($statValue);
        }

+        $this->calcCache[$cKey] = $statValue;
+
        return $statValue;
    }

@@ -806,7 +832,7 @@ class General extends GeneralBase implements iAction
                continue;
            }
            /** @var iAction $iObj */
-            $value = $iObj->onCalcStat($this, $statName, $value, $aux);
+            $value = $iObj->onCalcStat($general, $statName, $value, $aux);
        }
        return $value;
    }
@@ -819,7 +845,7 @@ class General extends GeneralBase implements iAction
                continue;
            }
            /** @var iAction $iObj */
-            $value = $iObj->onCalcOpposeStat($this, $statName, $value, $aux);
+            $value = $iObj->onCalcOpposeStat($general, $statName, $value, $aux);
        }
        return $value;
    }
@@ -5,6 +5,7 @@ namespace sammo;
 use sammo\Command\GeneralCommand;
 use sammo\Command\NationCommand;
 use sammo\Enums\MessageType;
+use sammo\Enums\PenaltyKey;
 use sammo\Enums\RankColumn;
 use sammo\Scenario\NPC;

@@ -82,8 +83,9 @@ class GeneralAI
    const d직전 = 3;
    const d전쟁 = 4;

-    protected function updateInstance(): void{
-        if(!$this->reqUpdateInstance){
+    protected function updateInstance(): void
+    {
+        if (!$this->reqUpdateInstance) {
            return;
        }

@@ -215,11 +217,10 @@ class GeneralAI
        );

        if ($yearMonth <= Util::joinYearMonth($env['startyear'] + 2, 5)) {
-            if(!$warTarget){
+            if (!$warTarget) {
                $this->dipState = self::d평화;
                $this->attackable = false;
-            }
-            else{
+            } else {
                $this->dipState = self::d선포;
                $this->attackable = false;
            }
@@ -2992,7 +2993,7 @@ class GeneralAI
        }

        foreach ($this->frontCities as $frontCity) {
-            if(!$frontCity['supply']){
+            if (!$frontCity['supply']) {
                continue;
            }
            $candidateCities[$frontCity['city']] = $frontCity['important'];
@@ -3120,6 +3121,11 @@ class GeneralAI
    {
        $db = DB::db();

+        $dupLord = $db->queryFirstField('SELECT COUNT(*) FROM general WHERE officer_level = 12 AND city = %i', $this->general->getCityID());
+        if($dupLord <= 1 && !in_array($this->general->getRawCity()['level'], [5, 6])) {
+            return null;
+        }
+
        $general = $this->general;
        $lordCities = $db->queryFirstColumn('SELECT city.city as city FROM general LEFT JOIN city ON general.city = city.city WHERE general.officer_level = 12 AND city.nation = 0');
        $nationCities = $db->queryFirstColumn('SELECT city FROM city WHERE nation != 0');
@@ -3352,10 +3358,9 @@ class GeneralAI
                if ($this->rng->nextBool(pow(1 / ($nationCnt + 1) / pow($notFullNationCnt, 3), 1 / 4))) {
                    return null;
                }
-            }
-            else{
+            } else {
                //임관 기간이 끝나면 고정 확률로 낮춤 0.3 * 0.5 = 0.15
-                if ($this->rng->nextBool()){
+                if ($this->rng->nextBool()) {
                    return null;
                }
            }
@@ -3439,8 +3444,12 @@ class GeneralAI

        $cmd = buildGeneralCommandClass($this->rng->choice($candidate), $this->general, $this->env);
        if (!$cmd->hasFullConditionMet()) {
-            return buildGeneralCommandClass('che_물자조달', $this->general, $this->env);
+            $cmd = buildGeneralCommandClass('che_물자조달', $this->general, $this->env);
+            if (!$cmd->hasFullConditionMet()) {
+                $cmd = buildGeneralCommandClass('che_견문', $this->general, $this->env);
+            }
        }
+
        return $cmd;
    }

@@ -3477,7 +3486,7 @@ class GeneralAI
            }
            if ($nationCity['front']) {
                $frontCities[$cityID] = $nationCity;
-            } else if($nationCity['supply']) {
+            } else if ($nationCity['supply']) {
                $backupCities[$cityID] = $nationCity;
            }

@@ -3779,21 +3788,28 @@ class GeneralAI

        if ($npcType >= 2 && $general->getVar('officer_level') == 12 && !$this->nation['capital']) {
            //방랑군 건국
-            $result = $this->do건국();
-            if ($result !== null) {
-                $result->reason = 'do건국';
-                return $result;
+            $relYearMonth = Util::joinYearMonth($this->env['year'], $this->env['month']) - Util::joinYearMonth($this->env['init_year'], $this->env['init_month']);
+
+            if ($relYearMonth > 1) {
+                $result = $this->do건국();
+                if ($result !== null) {
+                    $result->reason = 'do건국';
+                    return $result;
+                }
            }
+
            $result = $this->do방랑군이동();
            if ($result !== null) {
                $result->reason = 'do방랑군이동';
                return $result;
            }

-            $result = $this->do해산();
-            if ($result !== null) {
-                $result->reason = 'do해산';
-                return $result;
+            if ($relYearMonth > 1) {
+                $result = $this->do해산();
+                if ($result !== null) {
+                    $result->reason = 'do해산';
+                    return $result;
+                }
            }
        }

@@ -3964,9 +3980,10 @@ class GeneralAI
                continue;
            }
            $chief = $this->chiefGenerals[$chiefLevel];
-            if ($chief->getNPCType() < 2 && $chief->getVar('killturn') >= $minUserKillturn) {
+            if ($chief->getNPCType() < 2 && $chief->getVar('killturn') >= $minUserKillturn && !$chief->hasPenalty(PenaltyKey::NoAmbassador)) {
                $userChiefCnt += 1;
                $chief->setVar('permission', 'ambassador');
+                $chief->applyDB($db);
            }
        }

@@ -3978,12 +3995,41 @@ class GeneralAI
        /** @var General[] */
        $nextChiefs = [];

-        if ($userChiefCnt == 0 && $this->userGenerals && !isOfficerSet($nation['chief_set'], 11)) {
+        $availableUserChiefCnt = 0;
+        foreach($this->userGenerals as $general){
+            if ($general->getVar('killturn') < $minUserKillturn) {
+                continue;
+            }
+            if ($general->getVar('belong') < $minBelong) {
+                continue;
+            }
+            if($general->hasPenalty(PenaltyKey::NoChief)){
+                continue;
+            }
+            $availableUserChiefCnt += 1;
+        }
+
+        if ($userChiefCnt == 0 && $availableUserChiefCnt && !isOfficerSet($nation['chief_set'], 11)) {
            $userGenerals = $this->userGenerals;
            uasort($userGenerals, function (General $lhs, General $rhs) {
+                if ($lhs->hasPenalty(PenaltyKey::NoChief) && !$rhs->hasPenalty(PenaltyKey::NoChief)) {
+                    return 1;
+                }
+                if (!$lhs->hasPenalty(PenaltyKey::NoChief) && $rhs->hasPenalty(PenaltyKey::NoChief)) {
+                    return -1;
+                }
+                if ($lhs->hasPenalty(PenaltyKey::NoAmbassador) && !$rhs->hasPenalty(PenaltyKey::NoAmbassador)) {
+                    return 1;
+                }
+                if (!$lhs->hasPenalty(PenaltyKey::NoAmbassador) && $rhs->hasPenalty(PenaltyKey::NoAmbassador)) {
+                    return -1;
+                }
                return - ($lhs->getVar('leadership') <=> $rhs->getVar('leadership'));
            });
            foreach ($userGenerals as $general) {
+                if ($general->hasPenalty(PenaltyKey::NoChief)) {
+                    continue;
+                }
                if ($general->getVar('killturn') < $minUserKillturn) {
                    continue;
                }
@@ -3996,7 +4042,9 @@ class GeneralAI
                $nextChiefs[11] = $general;
                $general->setVar('officer_level', 11);
                $general->setVar('officer_city', 0);
-                $general->setVar('permission', 'ambassador');
+                if(!$general->hasPenalty(PenaltyKey::NoAmbassador)){
+                    $general->setVar('permission', 'ambassador');
+                }
                $nation['chief_set'] |= doOfficerSet(0, 11);
                $updatedChiefSet |= doOfficerSet(0, 11);
                $userChiefCnt += 1;
@@ -4035,7 +4083,7 @@ class GeneralAI
            if (!key_exists($chiefLevel, $this->chiefGenerals) && !key_exists($chiefLevel, $nextChiefs)) {
                $newChiefProb = 1;
            } else {
-                $newChiefProb = $this->rng->nextBool(0.1)?1:0;
+                $newChiefProb = $this->rng->nextBool(0.1) ? 1 : 0;
            }

            if ($newChiefProb < 1 && !$this->rng->nextBool($newChiefProb)) {
@@ -4054,6 +4102,9 @@ class GeneralAI
                if ($general->getNPCType() >= 2 && $general->getVar('killturn') < $minNPCKillturn) {
                    continue;
                }
+                if($general->hasPenalty(PenaltyKey::NoChief)){
+                    continue;
+                }

                if ($chiefLevel == 11) {
                } else if ($chiefLevel % 2 == 0 && $general->getStrength(false, false, false, false) < GameConst::$chiefStatMin) {
@@ -4076,7 +4127,9 @@ class GeneralAI

            if ($newChief->getNPCType() < 2) {
                $userChiefCnt += 1;
-                $newChief->setVar('permission', 'ambassador');
+                if(!$newChief->hasPenalty(PenaltyKey::NoAmbassador)){
+                    $newChief->setVar('permission', 'ambassador');
+                }
            }

            $nextChiefs[$chiefLevel] = $newChief;
@@ -8,7 +8,7 @@ class ResetHelper{

    }

-    static public function clearDB(){
+    static public function clearDB():array{
        $servRoot = realpath(__DIR__.'/../');

        if(!file_exists($servRoot.'/logs') || !file_exists($servRoot.'/data')){
@@ -73,12 +73,12 @@ class ResetHelper{
        }

        $prefix = DB::prefix();
+
        ServConfig::getServerList()[$prefix]->closeServer();

        $db = DB::db();
-        $mysqli_obj = $db->get();

-        $serverID = DB::prefix().'_'.date("ymd").'_'.Util::randomStr(4);
+        $serverID = $prefix.'_'.date("ymd").'_'.Util::randomStr(4);

        mkdir($servRoot.'/logs/'.$serverID, 0775);
        mkdir($servRoot.'/data/'.$serverID, 0775);
@@ -110,6 +110,7 @@ class ResetHelper{
            $servRoot.'/d_setting/GameConst.php',
        );

+        $mysqli_obj = $db->get();
        if($mysqli_obj->multi_query(file_get_contents($servRoot.'/sql/reset.sql'))){
            while(true){
                if (!$mysqli_obj->more_results()) {
@@ -24,6 +24,12 @@ class che_저지발동 extends BaseWarUnitTrigger{
        }
        $selfEnv['저지발동'] = true;

+        $self->addPhase(-1);
+        $oppose->addPhase(-1);
+        if($self->getPhase() < $self->getMaxPhase()){
+            $oppose->addBonusPhase(-1);
+        }
+
        $self->getLogger()->pushGeneralBattleDetailLog("상대를 <C>저지</>했다!", ActionLogger::PLAIN);
        $oppose->getLogger()->pushGeneralBattleDetailLog("저지</>당했다!", ActionLogger::PLAIN);

@@ -1,954 +1,313 @@
 {
-    "title": "【가상모드28】 천하제일 삼모대회",
+    "title": "【가상모드28】 강서유서 소설 월드",
    "startYear": 180,
    "history": [
-        "<C>●</>180년 1월:<L><b>【가상모드28】</b>천하제일 삼모대회</>",
-        "<C>●</>180년 1월:<L><b>【이벤트】</b></>세계관 최강자들의 모임에서 살아남을 자는 누구인가?!"
+        "<C>●</>180년 1월:<L><b>【가상모드28】</b>강서유서 소설 월드</>",
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>강서유서의 소설 캐릭터들이 날뛰는곳"
    ],
    "stat": {
-        "total": 310,
+        "total": 210,
        "min": 40,
-        "max": 140
+        "max": 90
    },
    "iconPath": ".",
    "fiction": 1,
-    "nation":[],
+    "nation":[
+        ["TOG", "#FFD700", 13000, 60000, "반정부주의 단체", 0, "병가", 2, ["대", "유구"]],
+        ["초대 선받아", "#00FFFF", 8000, 25000, "초대 선택받은 아이들의 세력, 원작과는 다르다 달라", 0, "명가", 2, ["천수", "저"]],
+        ["견휘", "#008000", 20000, 40000, "연휘아님 소설 출현 캐릭터(허락받음 오래전에)", 0, "법가", 3, ["장안", "함곡"]],
+        ["강인", "#00FF00", 15000, 40000, "블로거분 소설 캐릭터(소설 여전히 진짜 적게 연재", 0, "법가", 3, ["한중", "양평"]],
+        ["테란 자치령", "#000080", 40000, 60000, "스타크래프트 테란 자치령 소속", 0, "법가", 7, ["성도"]]
+    ],
    "diplomacy":[],
-    "const": {
-        "npcBanMessageProb": 0,
-        "npcSeizureMessageProb": 0,
-        "npcMessageFreqByDay": 8,
-        "availableSpecialWar": [
-            "che_귀병",
-            "che_신산",
-            "che_환술",
-            "che_집중",
-            "che_신중",
-            "che_반계",
-            "che_보병",
-            "che_궁병",
-            "che_기병",
-            "che_공성",
-            "che_돌격",
-            "che_무쌍",
-            "che_견고",
-            "che_위압",
-            "che_저격",
-            "che_필살",
-            "che_징병",
-            "che_의술",
-            "che_격노",
-            "che_척사"
-        ],
-        "allItems": {
-            "horse": {
-                "che_명마_01_노기": 0,
-                "che_명마_02_조랑": 0,
-                "che_명마_03_노새": 0,
-                "che_명마_04_나귀": 0,
-                "che_명마_05_갈색마": 0,
-                "che_명마_06_흑색마": 0,
-                "che_명마_07_백마": 0,
-                "che_명마_07_기주마": 0,
-                "che_명마_07_오환마": 0,
-                "che_명마_07_백상": 0,
-                "che_명마_08_양주마": 0,
-                "che_명마_08_흉노마": 0,
-                "che_명마_09_과하마": 0,
-                "che_명마_09_의남백마": 0,
-                "che_명마_10_대완마": 0,
-                "che_명마_10_옥추마": 0,
-                "che_명마_11_서량마": 0,
-                "che_명마_11_화종마": 0,
-                "che_명마_12_사륜거": 0,
-                "che_명마_12_옥란백용구": 0,
-                "che_명마_13_절영": 0,
-                "che_명마_13_적로": 0,
-                "che_명마_14_적란마": 0,
-                "che_명마_14_조황비전": 0,
-                "che_명마_15_한혈마": 0,
-                "che_명마_15_적토마": 0
-            },
-            "weapon": {
-                "che_무기_01_단도": 0,
-                "che_무기_02_단궁": 0,
-                "che_무기_03_단극": 0,
-                "che_무기_04_목검": 0,
-                "che_무기_05_죽창": 0,
-                "che_무기_06_소부": 0,
-                "che_무기_07_동추": 0,
-                "che_무기_07_철편": 0,
-                "che_무기_07_철쇄": 0,
-                "che_무기_07_맥궁": 0,
-                "che_무기_08_유성추": 0,
-                "che_무기_08_철질여골": 0,
-                "che_무기_09_쌍철극": 0,
-                "che_무기_09_동호비궁": 0,
-                "che_무기_10_삼첨도": 0,
-                "che_무기_10_대부": 0,
-                "che_무기_11_고정도": 0,
-                "che_무기_11_이광궁": 0,
-                "che_무기_12_철척사모": 0,
-                "che_무기_12_칠성검": 0,
-                "che_무기_13_사모": 0,
-                "che_무기_13_양유기궁": 0,
-                "che_무기_14_언월도": 0,
-                "che_무기_14_방천화극": 0,
-                "che_무기_15_청홍검": 0,
-                "che_무기_15_의천검": 0
-            },
-            "book": {
-                "che_서적_01_효경전": 0,
-                "che_서적_02_회남자": 0,
-                "che_서적_03_변도론": 0,
-                "che_서적_04_건상역주": 0,
-                "che_서적_05_여씨춘추": 0,
-                "che_서적_06_사민월령": 0,
-                "che_서적_07_위료자": 0,
-                "che_서적_07_사마법": 0,
-                "che_서적_07_한서": 0,
-                "che_서적_07_논어": 0,
-                "che_서적_08_전론": 0,
-                "che_서적_08_사기": 0,
-                "che_서적_09_장자": 0,
-                "che_서적_09_역경": 0,
-                "che_서적_10_시경": 0,
-                "che_서적_10_구국론": 0,
-                "che_서적_11_상군서": 0,
-                "che_서적_11_춘추전": 0,
-                "che_서적_12_산해경": 0,
-                "che_서적_12_맹덕신서": 0,
-                "che_서적_13_관자": 0,
-                "che_서적_13_병법24편": 0,
-                "che_서적_14_한비자": 0,
-                "che_서적_14_오자병법": 0,
-                "che_서적_15_노자": 0,
-                "che_서적_15_손자병법": 0
-            },
-            "item": {
-                "che_치료_환약": 0,
-                "che_저격_수극": 0,
-                "che_사기_탁주": 0,
-                "che_훈련_청주": 0,
-                "che_계략_이추": 0,
-                "che_계략_향낭": 0,
-                "event_전투특기_격노": 0,
-                "event_전투특기_견고": 0,
-                "event_전투특기_공성": 0,
-                "event_전투특기_궁병": 0,
-                "event_전투특기_귀병": 0,
-                "event_전투특기_기병": 0,
-                "event_전투특기_돌격": 0,
-                "event_전투특기_무쌍": 0,
-                "event_전투특기_반계": 0,
-                "event_전투특기_보병": 0,
-                "event_전투특기_신산": 0,
-                "event_전투특기_신중": 0,
-                "event_전투특기_위압": 0,
-                "event_전투특기_의술": 0,
-                "event_전투특기_저격": 0,
-                "event_전투특기_집중": 0,
-                "event_전투특기_징병": 0,
-                "event_전투특기_척사": 0,
-                "event_전투특기_필살": 0,
-                "event_전투특기_환술": 0,
-                "che_의술_정력견혈산": 0,
-                "che_의술_청낭서": 0,
-                "che_의술_태평청령": 0,
-                "che_의술_상한잡병론": 0,
-                "che_보물_도기": 0,
-                "che_조달_주판": 0,
-                "che_내정_납금박산로": 0,
-                "che_전략_평만지장도": 0,
-                "che_숙련_동작": 0,
-                "che_명성_구석": 0,
-                "che_척사_오악진형도": 0,
-                "che_격노_구정신단경": 0,
-                "che_징병_낙주": 0,
-                "che_저격_매화수전": 0,
-                "che_저격_비도": 0,
-                "che_위압_조목삭": 0,
-                "che_공성_묵자": 0,
-                "che_집중_전국책": 0,
-                "che_환술_논어집해": 0,
-                "che_진압_박혁론": 0,
-                "che_부적_태현청생부": 0,
-                "che_저지_삼황내문": 0,
-                "che_행동_서촉지형도": 0,
-                "che_간파_노군입산부": 0,
-                "che_불굴_상편": 0,
-                "che_약탈_옥벽": 0,
-                "che_농성_주서음부": 0,
-                "che_농성_위공자병법": 0,
-                "che_계략_육도": 0,
-                "che_계략_삼략": 0,
-                "che_상성보정_과실주": 0,
-                "che_능력치_지력_이강주": 0,
-                "che_능력치_무력_두강주": 0,
-                "che_능력치_통솔_보령압주": 0,
-                "che_훈련_철벽서": 0,
-                "che_훈련_단결도": 0,
-                "che_사기_춘화첩": 0,
-                "che_사기_초선화": 0,
-                "che_회피_태평요술": 0,
-                "che_필살_둔갑천서": 0
-            }
-        }
-    },
    "general":[
-        [0, "40장로", null, 0, null, 94, 94, 94, 0, 160, 300, null, null],
-        [0, "4水Ke", null, 0, null, 77, 109, 56, 0, 160, 300, null, null],
-        [0, "ARES군주", null, 0, null, 99, 102, 60, 0, 160, 300, null, null],
-        [0, "Card", null, 0, null, 100, 99, 65, 0, 160, 300, null, null],
-        [0, "Cure", null, 0, null, 98, 69, 104, 0, 160, 300, null, null],
-        [0, "Hide_D", null, 0, null, 101, 66, 105, 0, 160, 300, null, null],
-        [0, "ITZY 예지", null, 0, null, 90, 91, 61, 0, 160, 300, null, null],
-        [0, "ITZY 유나", null, 0, null, 88, 61, 91, 0, 160, 300, null, null],
-        [0, "PG 7", null, 0, null, 97, 112, 72, 0, 160, 300, null, null],
-        [0, "PG 9", null, 0, null, 97, 72, 112, 0, 160, 300, null, null],
-        [0, "Per", null, 0, null, 102, 63, 99, 0, 160, 300, null, null],
-        [0, "Pray", null, 0, null, 97, 104, 66, 0, 160, 300, null, null, "탈영 마렵다"],
-        [0, "SARS", null, 0, null, 100, 67, 101, 0, 160, 300, null, null, "아마존 주식 떡상 기원"],
-        [0, "n아텐 누", null, 0, null, 101, 60, 101, 0, 160, 300, null, null],
-        [0, "くま", null, 0, null, 99, 101, 63, 0, 160, 300, null, null],
-        [0, "가규", null, 0, null, 86, 67, 92, 0, 160, 300, null, null],
-        [0, "가넷", null, 0, null, 99, 60, 116, 0, 160, 300, null, null],
-        [0, "가웨인", null, 0, null, 92, 95, 90, 0, 160, 300, null, null, null],
-        [0, "가인", null, 0, null, 82, 83, 82, 0, 160, 300, null, null],
-        [0, "가토 기요마사", null, 0, null, 98, 99, 70, 0, 160, 300, null, null],
-        [0, "가화", null, 0, null, 89, 60, 98, 0, 160, 300, null, null],
-        [0, "간옹", null, 0, null, 102, 100, 49, 0, 160, 300, null, null, "삼대장 간손미에서 간을 맡고 있습니다"],
-        [0, "갈근", null, 0, null, 104, 59, 104, 0, 160, 300, null, null],
-        [0, "감녕", null, 0, null, 101, 105, 81, 0, 160, 300, null, null],
-        [0, "강감찬", null, 0, null, 100, 72, 102, 0, 160, 300, null, null],
-        [0, "강도경", null, 0, null, 81, 73, 83, 0, 160, 300, null, null],
-        [0, "강민", null, 0, null, 88, 83, 88, 0, 160, 300, null, null],
-        [0, "강민첨", null, 0, null, 98, 99, 68, 0, 160, 300, null, null],
-        [0, "강상", null, 0, null, 104, 54, 110, 0, 160, 300, null, null],
-        [0, "강유", null, 0, null, 101, 79, 102, 0, 160, 300, null, null],
-        [0, "개미호랑이", null, 0, null, 100, 60, 101, 0, 160, 300, null, null],
-        [0, "갤러헤드", null, 0, null, 94, 91, 91, 0, 160, 300, null, null, null],
-        [0, "거북왕", null, 0, null, 80, 84, 101, 0, 160, 300, null, null],
-        [0, "거칠부", null, 0, null, 98, 78, 96, 0, 160, 300, null, null],
-        [0, "걸스데이 민아", null, 0, null, 99, 60, 98, 0, 160, 300, null, "환술"],
-        [0, "걸스데이 소진", null, 0, null, 88, 97, 62, 0, 160, 300, null, "무쌍"],
-        [0, "견훤", null, 0, null, 97, 69, 96, 0, 160, 300, null, null],
-        [0, "경리", null, 0, null, 93, 95, 55, 0, 160, 300, null, null],
-        [0, "계백", null, 0, null, 99, 76, 100, 0, 160, 300, null, null],
-        [0, "고건무", null, 0, null, 103, 97, 76, 0, 160, 300, null, null],
-        [0, "고길동", null, 0, null, 88, 100, 72, 0, 160, 300, null, null, "마! 내가 홍콩영화 한두편 본줄 알아?"],
-        [0, "고노자", null, 0, null, 99, 102, 66, 0, 160, 300, null, null],
-        [0, "고니시 유키나가", null, 0, null, 102, 72, 100, 0, 160, 300, null, null],
-        [0, "고무", null, 0, null, 96, 99, 67, 0, 160, 300, null, null],
-        [0, "고순", null, 0, null, 96, 98, 66, 0, 160, 300, null, null],
-        [0, "고정", null, 0, null, 94, 63, 96, 0, 160, 300, null, null],
-        [0, "고지", null, 0, null, 76, 101, 111, 0, 160, 300, null, null],
-        [0, "공구", null, 0, null, 75, 77, 100, 0, 160, 300, null, null],
-        [0, "공손찬", null, 0, null, 95, 90, 68, 0, 160, 300, null, null],
-        [0, "공지", null, 0, null, 96, 97, 60, 0, 160, 300, null, null],
-        [0, "곽가", null, 0, null, 99, 105, 47, 0, 160, 300, null, null],
-        [0, "곽거병", null, 0, null, 102, 101, 58, 0, 160, 300, null, null],
-        [0, "곽자의", null, 0, null, 105, 103, 65, 0, 160, 300, null, null],
-        [0, "곽재우", null, 0, null, 98, 76, 98, 0, 160, 300, null, null],
-        [0, "곽회", null, 0, null, 96, 82, 91, 0, 160, 300, null, null],
-        [0, "관구검", null, 0, null, 92, 95, 68, 0, 160, 300, null, null],
-        [0, "관우", null, 0, null, 106, 109, 84, 0, 160, 300, null, null],
-        [0, "관이오", null, 0, null, 94, 70, 109, 0, 160, 300, null, null],
-        [0, "관정", null, 0, null, 92, 97, 63, 0, 160, 300, null, null],
-        [0, "관지평", null, 0, null, 95, 95, 95, 0, 160, 300, null, null],
-        [0, "관평", null, 0, null, 86, 90, 66, 0, 160, 300, null, null],
-        [0, "관흥", null, 0, null, 84, 92, 68, 0, 160, 300, null, null],
-        [0, "광개토대왕", null, 0, null, 107, 106, 76, 0, 160, 300, null, null],
-        [0, "괴력몬", null, 0, null, 91, 106, 76, 0, 160, 300, null, null],
-        [0, "구유카", null, 0, null, 95, 96, 96, 0, 160, 300, null, null, "신이라 해도, 힘이야말로 전부야!"],
-        [0, "권나라", null, 0, null, 101, 100, 67, 0, 160, 300, null, "무쌍"],
-        [0, "권율", null, 0, null, 100, 75, 99, 0, 160, 300, null, null],
-        [0, "그단세자르", null, 0, null, 96, 85, 91, 0, 160, 300, null, null],
-        [0, "그린하트", null, 0, null, 84, 91, 86, 0, 160, 300, null, null],
-        [0, "근초고왕", null, 0, null, 99, 99, 75, 0, 160, 300, null, null],
-        [0, "기가이", null, 0, null, 94, 120, 67, 0, 160, 300, null, null],
-        [0, "기령", null, 0, null, 94, 92, 56, 0, 160, 300, null, null],
-        [0, "기욤패트리", null, 0, null, 82, 81, 81, 0, 160, 300, null, null],
-        [0, "기타노시오리", null, 0, null, 100, 95, 96, 0, 160, 300, null, "위압", "언니는 내가 지켜….!"],
-        [0, "길가메쉬", null, 0, null, 95, 104, 87, 0, 160, 300, null, null, "시공의 끝까지, 이 세계는 남김없이 나의 정원이다. 그렇기에 내가 보증하지. 세계는 결코 그대(そなた)를 질리게 하지 않을 것이다."],
-        [0, "김가을", null, 0, null, 88, 89, 81, 0, 160, 300, null, null],
-        [0, "김광현", null, 0, null, 83, 89, 85, 0, 160, 300, null, "무쌍", "제가 현진이형보단 낫죠"],
-        [0, "김기태", null, 0, null, 85, 89, 75, 0, 160, 300, null, null],
-        [0, "김나영", null, 0, null, 102, 99, 70, 0, 160, 300, null, null, "김나영 머리에서 김나영"],
-        [0, "김동수", null, 0, null, 86, 88, 79, 0, 160, 300, null, null],
-        [0, "김명운", null, 0, null, 86, 83, 88, 0, 160, 300, null, null],
-        [0, "김무력", null, 0, null, 96, 99, 67, 0, 160, 300, null, null],
-        [0, "김민철", null, 0, null, 88, 80, 86, 0, 160, 300, null, null],
-        [0, "김병현", null, 0, null, 96, 91, 72, 0, 160, 300, null, "필살"],
-        [0, "김선", null, 0, null, 97, 57, 100, 0, 160, 300, null, null],
-        [0, "김세정", null, 0, null, 103, 72, 103, 0, 160, 300, null, "집중"],
-        [0, "김시민", null, 0, null, 99, 77, 102, 0, 160, 300, null, null],
-        [0, "김영미", null, 0, null, 82, 73, 80, 0, 160, 300, null, null],
-        [0, "김웅원", null, 0, null, 98, 97, 70, 0, 160, 300, null, null],
-        [0, "김유신", null, 0, null, 103, 75, 106, 0, 160, 300, null, null],
-        [0, "김윤환Z", null, 0, null, 80, 72, 84, 0, 160, 300, null, null],
-        [0, "김일융", null, 0, null, 87, 82, 78, 0, 160, 300, null, null],
-        [0, "김재현", null, 0, null, 84, 85, 76, 0, 160, 300, null, null],
-        [0, "김정민", null, 0, null, 81, 78, 82, 0, 160, 300, null, null],
-        [0, "김정우", null, 0, null, 89, 96, 88, 0, 160, 300, null, null],
-        [0, "김종서", null, 0, null, 99, 70, 98, 0, 160, 300, null, null],
-        [0, "김준영", null, 0, null, 93, 77, 85, 0, 160, 300, null, null],
-        [0, "김지은", null, 0, null, 81, 77, 82, 0, 160, 300, null, null],
-        [0, "김지혜", null, 0, null, 87, 83, 79, 0, 160, 300, null, null],
-        [0, "김택용", null, 0, null, 97, 93, 93, 0, 160, 300, null, null],
-        [0, "김현아", null, 0, null, 95, 95, 74, 0, 160, 300, null, null],
-        [0, "김현욱", null, 0, null, 81, 84, 83, 0, 160, 300, null, null],
-        [0, "나기 스 라갈", null, 0, null, 99, 60, 118, 0, 160, 300, null, null],
-        [0, "나나", null, 0, null, 104, 58, 102, 0, 160, 300, null, null],
-        [0, "나시", null, 0, null, 96, 96, 86, 0, 160, 300, null, null],
-        [0, "나오에 아이", null, 0, null, 106, 68, 108, 0, 160, 300, null, null],
-        [0, "나헌", null, 0, null, 95, 68, 90, 0, 160, 300, null, null],
-        [0, "네로메루", null, 0, null, 97, 69, 98, 0, 160, 300, null, null],
-        [0, "네로스", null, 0, null, 102, 92, 85, 0, 160, 300, null, null],
-        [0, "네시", null, 0, null, 114, 131, 49, 0, 160, 300, null, "필살", "안 자고 싸우면 이겨요"],
-        [0, "네이미", null, 0, null, 100, 102, 61, 0, 160, 300, null, null],
-        [0, "네프기어", null, 0, null, 87, 90, 83, 0, 160, 300, null, null, "에? 에!? 오네짱이다!! 보고싶었어!!"],
-        [0, "노기 와카바", null, 0, null, 90, 88, 82, 0, 160, 300, null, null],
-        [0, "노숙", null, 0, null, 98, 61, 102, 0, 160, 300, null, null],
-        [0, "노스", null, 0, null, 88, 123, 74, 0, 160, 300, null, null],
-        [0, "노식", null, 0, null, 95, 69, 90, 0, 160, 300, null, null],
-        [0, "노하라 마사에", null, 0, null, 88, 97, 83, 0, 160, 300, null, null, "부모란, 자식을 위해선 뭐든지 할 수 있는 사람들이에요."],
-        [0, "농", null, 0, null, 96, 64, 97, 0, 160, 300, null, null],
-        [0, "느와르", null, 0, null, 99, 116, 75, 0, 160, 300, null, null],
-        [0, "능통", null, 0, null, 91, 98, 66, 0, 160, 300, null, null],
-        [0, "니드퀸", null, 0, null, 91, 93, 88, 0, 160, 300, null, null],
-        [0, "니드킹", null, 0, null, 82, 103, 78, 0, 160, 300, null, null],
-        [0, "니무에", null, 0, null, 92, 92, 92, 0, 160, 300, null, null, null],
-        [0, "니시무라 소이치", null, 0, null, 89, 101, 85, 0, 160, 300, null, null, "우리 교사는 모범을 보여야 하는 존재다. 그런데 도전하는 학생을 정면에서 받아 주지도 못하면서 무엇을 가르칠 수 있다는 거냐"],
-        [0, "니얀다카렌", null, 0, null, 87, 93, 83, 0, 160, 300, null, null, "공포의 마우스 3총사라니 이름 촌스러워"],
-        [0, "니얀다카멘", null, 0, null, 91, 100, 91, 0, 160, 300, null, "무쌍", "살려달라고 말하면 누구든 구할 거야. 적이라도 상관 없어!"],
-        [0, "니코페리", null, 0, null, 98, 62, 116, 0, 160, 300, null, null],
-        [0, "닝닝", null, 0, null, 92, 64, 90, 0, 160, 300, null, null],
-        [0, "달가", null, 0, null, 97, 64, 102, 0, 160, 300, null, null],
-        [0, "담웅", null, 0, null, 90, 63, 106, 0, 160, 300, null, null],
-        [0, "답돈", null, 0, null, 92, 90, 67, 0, 160, 300, null, null],
-        [0, "대교", null, 0, null, 108, 99, 57, 0, 160, 300, null, null, "손책 너무 무능하다."],
-        [0, "대래동주", null, 0, null, 98, 63, 96, 0, 160, 300, null, null],
-        [0, "대무예", null, 0, null, 96, 103, 63, 0, 160, 300, null, null],
-        [0, "대조영", null, 0, null, 102, 98, 67, 0, 160, 300, null, null],
-        [0, "데구리", null, 0, null, 55, 96, 116, 0, 160, 300, null, null],
-        [0, "데이비스", null, 0, null, 88, 82, 76, 0, 160, 300, null, null],
-        [0, "도겸", null, 0, null, 98, 91, 61, 0, 160, 300, null, null],
-        [0, "도요토미 히데나가", null, 0, null, 100, 75, 98, 0, 160, 300, null, null],
-        [0, "도요토미 히데요시", null, 0, null, 105, 75, 103, 0, 160, 300, null, null],
-        [0, "도재욱", null, 0, null, 91, 89, 70, 0, 160, 300, null, null],
-        [0, "도쿠가와 이에야스", null, 0, null, 98, 72, 97, 0, 160, 300, null, null],
-        [0, "도쿠로왕", null, 0, null, 88, 98, 83, 0, 160, 300, null, "돌격", "하지마!! 이대로 봉인되긴 싫단말이다!!"],
-        [0, "독구", null, 0, null, 105, 100, 68, 0, 160, 300, null, null, "웃자 ^-^"],
-        [0, "독황상제", null, 0, null, 117, 49, 132, 0, 160, 300, null, "집중", "나는 나보다 약한 녀석의 명령 따위는 듣지 않는다"],
-        [0, "동민", null, 0, null, 98, 56, 96, 0, 160, 300, null, null],
-        [0, "동승", null, 0, null, 92, 96, 60, 0, 160, 300, null, null],
-        [0, "동탁", null, 0, null, 100, 96, 74, 0, 160, 300, null, null],
-        [0, "두예", null, 0, null, 106, 76, 105, 0, 160, 300, null, null],
-        [0, "등무", null, 0, null, 87, 60, 100, 0, 160, 300, null, null],
-        [0, "등애", null, 0, null, 101, 80, 104, 0, 160, 300, null, null],
-        [0, "디올트 스티아트", null, 0, null, 100, 90, 86, 0, 160, 300, null, null],
-        [0, "딘", null, 0, null, 92, 92, 81, 0, 160, 300, null, null],
-        [0, "딱구리", null, 0, null, 70, 111, 111, 0, 160, 300, null, null],
-        [0, "또도가스", null, 0, null, 65, 91, 121, 0, 160, 300, null, null],
-        [0, "라 사이젤", null, 0, null, 92, 121, 66, 0, 160, 300, null, null],
-        [0, "라 하우젤", null, 0, null, 92, 121, 66, 0, 160, 300, null, null],
-        [0, "라유", null, 0, null, 105, 106, 79, 0, 160, 300, null, null],
-        [0, "라이제", null, 0, null, 101, 82, 109, 0, 160, 300, null, null],
-        [0, "라피스", null, 0, null, 100, 100, 92, 0, 160, 300, null, null],
-        [0, "란마루", null, 0, null, 108, 99, 70, 0, 160, 300, null, null],
-        [0, "란스", null, 0, null, 100, 124, 61, 0, 160, 300, null, null],
-        [0, "레드", null, 0, null, 101, 77, 104, 0, 160, 300, null, "위압", "나는 정점이다."],
-        [0, "레드아이", null, 0, null, 91, 103, 103, 0, 160, 300, null, null],
-        [0, "레류코프 바코프", null, 0, null, 105, 100, 72, 0, 160, 300, null, null],
-        [0, "레밀리아", null, 0, null, 106, 107, 79, 0, 160, 300, null, null, "당신은 이제껏 먹어 온 빵이 몇 개인지 알고 있어?"],
-        [0, "레온", null, 0, null, 96, 100, 71, 0, 160, 300, null, null],
-        [0, "레이", null, 0, null, 91, 126, 60, 0, 160, 300, null, null],
-        [0, "레이라 글레크니", null, 0, null, 110, 105, 73, 0, 160, 300, null, null],
-        [0, "레이무", null, 0, null, 102, 94, 93, 0, 160, 300, null, null, "인간을 쉽사리 죽게 내버려 둘까 보냐!"],
-        [0, "레지나", null, 0, null, 88, 88, 88, 0, 160, 300, null, null],
-        [0, "레프라혼", null, 0, null, 92, 90, 94, 0, 160, 300, null, null],
-        [0, "로렉스 가드라스", null, 0, null, 99, 114, 66, 0, 160, 300, null, null],
-        [0, "로로나", null, 0, null, 95, 92, 97, 0, 160, 300, null, null, "와 토토리 짱이다!"],
-        [0, "로리", null, 0, null, 101, 60, 101, 0, 160, 300, null, null],
-        [0, "로벨", null, 0, null, 99, 104, 95, 0, 160, 300, null, null],
-        [0, "로이드 포저", null, 0, null, 96, 83, 104, 0, 160, 300, null, null, "예기치 않은 스텔라 획득이란 것도 큰 성과지만⋯. 왜 그럴까. 그보다도, 테러를 미연에 방지했을 때처럼⋯. 자랑스러운 기분이다"],
-        [0, "로제", null, 0, null, 91, 62, 96, 0, 160, 300, null, null],
-        [0, "루루아", null, 0, null, 82, 84, 91, 0, 160, 300, null, null],
-        [0, "루피나", null, 0, null, 96, 101, 77, 0, 160, 300, null, null],
-        [0, "류현진", null, 0, null, 96, 97, 91, 0, 160, 300, null, "위압", "야구는 수비를 믿지 말고 내가 잘해야 이긴다"],
-        [0, "르메이", null, 0, null, 100, 114, 64, 0, 160, 300, null, null],
-        [0, "리사", null, 0, null, 92, 94, 65, 0, 160, 300, null, null],
-        [0, "리아P리자스", null, 0, null, 118, 72, 98, 0, 160, 300, null, null],
-        [0, "리에하르", null, 0, null, 92, 101, 71, 0, 160, 300, null, null],
-        [0, "리오스", null, 0, null, 93, 86, 94, 0, 160, 300, null, null],
-        [0, "리즈나", null, 0, null, 107, 97, 70, 0, 160, 300, null, null, "야겜 하고 싶다"],
-        [0, "리즈나 란프비트", null, 0, null, 102, 73, 110, 0, 160, 300, null, null],
-        [0, "리틀그레이", null, 0, null, 101, 100, 92, 0, 160, 300, null, null, null],
-        [0, "리페", null, 0, null, 91, 90, 96, 0, 160, 300, null, null, null],
-        [0, "릭 아디슨", null, 0, null, 104, 118, 74, 0, 160, 300, null, null],
-        [0, "마대", null, 0, null, 87, 94, 68, 0, 160, 300, null, null],
-        [0, "마르몰", null, 0, null, 92, 87, 83, 0, 160, 300, null, null],
-        [0, "마르첼라손", null, 0, null, 101, 97, 101, 0, 160, 300, null, null],
-        [0, "마리스", null, 0, null, 99, 78, 117, 0, 160, 300, null, null],
-        [0, "마리아", null, 0, null, 87, 95, 80, 0, 160, 300, null, null],
-        [0, "마리아 카스타드", null, 0, null, 100, 85, 106, 0, 160, 300, null, null],
-        [0, "마리안", null, 0, null, 95, 77, 101, 0, 160, 300, null, null],
-        [0, "마막", null, 0, null, 106, 108, 78, 0, 160, 300, null, null],
-        [0, "마미야 치아키", null, 0, null, 90, 82, 89, 0, 160, 300, null, null, "미래에서 기다릴게."],
-        [0, "마사무네", null, 0, null, 114, 114, 64, 0, 160, 300, null, null],
-        [0, "마요이", null, 0, null, 102, 65, 102, 0, 160, 300, null, null, "로열방 없습니다"],
-        [0, "마초", null, 0, null, 95, 107, 48, 0, 160, 300, null, null],
-        [0, "마틸다", null, 0, null, 94, 102, 73, 0, 160, 300, null, null],
-        [0, "만샘", null, 0, null, 101, 60, 101, 0, 160, 300, null, null],
-        [0, "만총", null, 0, null, 97, 70, 96, 0, 160, 300, null, null],
-        [0, "망나뇽", null, 0, null, 92, 101, 96, 0, 160, 300, null, null],
-        [0, "망아장", null, 0, null, 99, 56, 96, 0, 160, 300, null, null],
-        [0, "메구레 경부", null, 0, null, 97, 82, 91, 0, 160, 300, null, null, "지금 당신이 하고 있는 행동은 정의를 위한 것도, 죽은 아들을 위한 것도 아니야. 그저 홧김에 저지른 범죄일 뿐. 자기 고집만 믿고 사람의 생명을 위협하는 행동은 아무 의미도 없고 어리석은 행동에 지나지 않아! 그걸 아직도 모르겠나!!!"],
-        [0, "메디우사", null, 0, null, 90, 121, 72, 0, 160, 300, null, null],
-        [0, "메이린", null, 0, null, 100, 71, 101, 0, 160, 300, null, "신산"],
-        [0, "명림답부", null, 0, null, 100, 72, 106, 0, 160, 300, null, null],
-        [0, "모니카", null, 0, null, 99, 66, 102, 0, 160, 300, null, null, "론조.."],
-        [0, "모드레드", null, 0, null, 100, 100, 93, 0, 160, 300, null, null, null],
-        [0, "모리 란", null, 0, null, 82, 109, 85, 0, 160, 300, null, "돌격"],
-        [0, "모스크바 동장군", null, 0, null, 102, 87, 87, 0, 160, 300, null, null],
-        [0, "목라근자", null, 0, null, 95, 96, 72, 0, 160, 300, null, null],
-        [0, "목록대왕", null, 0, null, 102, 65, 109, 0, 160, 300, null, null, "코끼리만 있으면 너도 한 방 나도 한 방"],
-        [0, "목호", null, 0, null, 95, 73, 95, 0, 160, 300, null, null],
-        [0, "몽념", null, 0, null, 96, 95, 71, 0, 160, 300, null, null],
-        [0, "몽염", null, 0, null, 97, 88, 76, 0, 160, 300, null, null],
-        [0, "무기노 시즈리", null, 0, null, 81, 93, 83, 0, 160, 300, null, null],
-        [0, "무휼", null, 0, null, 105, 99, 77, 0, 160, 300, null, null],
-        [0, "문무왕", null, 0, null, 98, 78, 102, 0, 160, 300, null, null],
-        [0, "문빙", null, 0, null, 97, 94, 71, 0, 160, 300, null, null],
-        [0, "문앙", null, 0, null, 84, 106, 71, 0, 160, 300, null, null],
-        [0, "문추", null, 0, null, 96, 105, 54, 0, 160, 300, null, null],
-        [0, "뮤", null, 0, null, 96, 96, 96, 0, 160, 300, null, null],
-        [0, "뮤츠", null, 0, null, 102, 106, 91, 0, 160, 300, null, null],
-        [0, "미네바 마가렛", null, 0, null, 96, 114, 73, 0, 160, 300, null, null],
-        [0, "미마", null, 0, null, 85, 102, 106, 0, 160, 300, null, null, "나도 인간계의 신이야. (거짓말)"],
-        [0, "미방", null, 0, null, 95, 55, 97, 0, 160, 300, null, null],
-        [0, "미사카 미코토", null, 0, null, 81, 96, 91, 0, 160, 300, null, null, "당신이 살아있는 것만으로도, 구원받은 생명도 있어.\n당신이 그렇게 앞만 보고 달리는 것만으로, 용기를 얻은 사람도 있어."],
-        [0, "미스테리아 토우", null, 0, null, 91, 68, 118, 0, 160, 300, null, null],
-        [0, "미연", null, 0, null, 92, 61, 91, 0, 160, 300, null, null],
-        [0, "미요시 카린", null, 0, null, 88, 91, 83, 0, 160, 300, null, null],
-        [0, "미축", null, 0, null, 99, 100, 57, 0, 160, 300, null, null, "돈도 많고 싸움도 잘하는 간손미 에이스 미축입니다"],
-        [0, "미치루", null, 0, null, 87, 89, 83, 0, 160, 300, null, null],
-        [0, "미코", null, 0, null, 99, 82, 110, 0, 160, 300, null, null, "장난은 끝이다!"],
-        [0, "미키 사야카", null, 0, null, 89, 88, 80, 0, 160, 300, null, null, "이거 실례네~? 나는 네가 알고 있는 그대로의 나야 전.학.,생~?"],
-        [0, "밀키로즈", null, 0, null, 87, 101, 75, 0, 160, 300, null, null],
-        [0, "바이넨", null, 0, null, 92, 100, 73, 0, 160, 300, null, null],
-        [0, "박경락", null, 0, null, 83, 86, 70, 0, 160, 300, null, null],
-        [0, "박성균", null, 0, null, 83, 82, 87, 0, 160, 300, null, null],
-        [0, "박성준", null, 0, null, 89, 97, 84, 0, 160, 300, null, null],
-        [0, "박소현", null, 0, null, 81, 67, 87, 0, 160, 300, null, null],
-        [0, "박용욱", null, 0, null, 81, 80, 81, 0, 160, 300, null, null],
-        [0, "박용택", null, 0, null, 91, 89, 91, 0, 160, 300, null, "신중", "팬 여러분 올해는 유광잠바 준비하셔야 될 겁니다"],
-        [0, "박일아", null, 0, null, 102, 65, 102, 0, 160, 300, null, null],
-        [0, "박재홍", null, 0, null, 86, 94, 93, 0, 160, 300, null, "무쌍"],
-        [0, "박정석", null, 0, null, 87, 84, 80, 0, 160, 300, null, null],
-        [0, "박지수", null, 0, null, 82, 82, 82, 0, 160, 300, null, null],
-        [0, "박찬호", null, 0, null, 101, 102, 95, 0, 160, 300, null, "위압", "안녕하세요 제가 LA에 있을 시절부터 놀란 라이언같은 투수가 되고 싶었는데요. 그래서 런닝도 하고 웨이트도 하다보니 어느덧 강속구 투수가 되어서…"],
-        [0, "박철순", null, 0, null, 88, 81, 79, 0, 160, 300, null, "무쌍"],
-        [0, "박태민", null, 0, null, 87, 80, 94, 0, 160, 300, null, null],
-        [0, "방난", null, 0, null, 97, 105, 73, 0, 160, 300, null, null],
-        [0, "방덕", null, 0, null, 98, 104, 77, 0, 160, 300, null, null],
-        [0, "배영수", null, 0, null, 78, 85, 86, 0, 160, 300, null, null],
-        [0, "백기", null, 0, null, 110, 97, 76, 0, 160, 300, null, null],
-        [0, "밴헤켄", null, 0, null, 79, 81, 85, 0, 160, 300, null, "환술"],
-        [0, "뱌쿠렌", null, 0, null, 94, 102, 93, 0, 160, 300, null, null, "아아, 법의 세계에 빛이 가득해."],
-        [0, "법정", null, 0, null, 90, 52, 104, 0, 160, 300, null, null],
-        [0, "베제르아이", null, 0, null, 105, 112, 73, 0, 160, 300, null, null],
-        [0, "변길섭", null, 0, null, 79, 88, 69, 0, 160, 300, null, null],
-        [0, "병리학적자세", null, 0, null, 100, 60, 102, 0, 160, 300, null, null],
-        [0, "보아", null, 0, null, 98, 102, 99, 0, 160, 300, null, "위압"],
-        [0, "부분노", null, 0, null, 103, 72, 102, 0, 160, 300, null, null],
-        [0, "부사인", null, 0, null, 104, 52, 91, 0, 160, 300, null, null],
-        [0, "부첨", null, 0, null, 80, 94, 68, 0, 160, 300, null, null],
-        [0, "북오더", null, 0, null, 100, 64, 101, 0, 160, 300, null, null],
-        [0, "브리티쉬", null, 0, null, 96, 112, 78, 0, 160, 300, null, null],
-        [0, "블랙 트레이더", null, 0, null, 89, 98, 81, 0, 160, 300, null, null],
-        [0, "블랙핑크 제니", null, 0, null, 95, 70, 94, 0, 160, 300, null, null],
-        [0, "블랙핑크 지수", null, 0, null, 93, 63, 93, 0, 160, 300, null, null],
-        [0, "블러디", null, 0, null, 75, 92, 93, 0, 160, 300, null, null, "소중한 것들은 그걸 잃어버리고 난 뒤에야 그 가치를 깨닫게 되지…"],
-        [0, "비니", null, 0, null, 92, 96, 52, 0, 160, 300, null, null],
-        [0, "비연", null, 0, null, 88, 68, 98, 0, 160, 300, null, null],
-        [0, "비의", null, 0, null, 90, 61, 97, 0, 160, 300, null, null],
-        [0, "비주기", null, 0, null, 91, 86, 91, 0, 160, 300, null, null],
-        [0, "빅토리아", null, 0, null, 92, 91, 62, 0, 160, 300, null, null],
-        [0, "뿔카노", null, 0, null, 81, 86, 96, 0, 160, 300, null, null],
-        [0, "사가라 미사에", null, 0, null, 88, 90, 88, 0, 160, 300, null, "위압", "언제까지나 나를 사랑해줘. 시마 카츠키."],
-        [0, "사나", null, 0, null, 97, 91, 55, 0, 160, 300, null, null],
-        [0, "사나다 노부시게", null, 0, null, 100, 98, 75, 0, 160, 300, null, null],
-        [0, "사나다 마사유키", null, 0, null, 99, 70, 96, 0, 160, 300, null, null],
-        [0, "사리엘", null, 0, null, 96, 77, 116, 0, 160, 300, null, null, "죽는다면 모두 함께"],
-        [0, "사마사", null, 0, null, 92, 70, 98, 0, 160, 300, null, null],
-        [0, "사마소", null, 0, null, 94, 63, 97, 0, 160, 300, null, null],
-        [0, "사마의", null, 0, null, 109, 69, 108, 0, 160, 300, null, null],
-        [0, "사마착", null, 0, null, 99, 97, 70, 0, 160, 300, null, null],
-        [0, "사법명", null, 0, null, 97, 70, 98, 0, 160, 300, null, null],
-        [0, "사스케", null, 0, null, 120, 47, 130, 0, 160, 300, null, "돌격", "언젠가는 제 기록을 넘겨주실 분도 나오길 바랍니다"],
-        [0, "사이타마", null, 0, null, 86, 109, 77, 0, 160, 300, null, "무쌍", "압도적인 힘이라는 건 참 시시한 거야."],
-        [0, "사치코 센터즈", null, 0, null, 103, 91, 82, 0, 160, 300, null, null],
-        [0, "사카가미 토모요", null, 0, null, 83, 95, 90, 0, 160, 300, null, "무쌍"],
-        [0, "사쿠야", null, 0, null, 99, 101, 88, 0, 160, 300, null, null, "당신의 시간 또한 나의 것"],
-        [0, "사테라", null, 0, null, 98, 100, 100, 0, 160, 300, null, null],
-        [0, "새논", null, 0, null, 87, 96, 77, 0, 160, 300, null, null],
-        [0, "샨푸", null, 0, null, 92, 97, 76, 0, 160, 300, null, null],
-        [0, "서서", null, 0, null, 94, 70, 104, 0, 160, 300, null, null],
-        [0, "서성", null, 0, null, 92, 86, 83, 0, 160, 300, null, null],
-        [0, "서영", null, 0, null, 101, 88, 68, 0, 160, 300, null, null],
-        [0, "서지수", null, 0, null, 89, 89, 89, 0, 160, 300, null, null],
-        [0, "서지훈", null, 0, null, 88, 88, 85, 0, 160, 300, null, null, "엄마 많이 사랑해요!"],
-        [0, "서황", null, 0, null, 105, 104, 81, 0, 160, 300, null, null],
-        [0, "석탈해", null, 0, null, 105, 76, 99, 0, 160, 300, null, null],
-        [0, "선동열", null, 0, null, 103, 95, 98, 0, 160, 300, null, "집중", "무등산 폭격기"],
-        [0, "설윤", null, 0, null, 101, 67, 95, 0, 160, 300, null, null],
-        [0, "세라자드", null, 0, null, 100, 96, 82, 0, 160, 300, null, null],
-        [0, "세렌", null, 0, null, 97, 97, 71, 0, 160, 300, null, "돌격"],
-        [0, "세실 카나", null, 0, null, 112, 98, 68, 0, 160, 300, null, null],
-        [0, "세이", null, 0, null, 95, 96, 83, 0, 160, 300, null, "무쌍"],
-        [0, "세이렌", null, 0, null, 96, 97, 87, 0, 160, 300, null, null, null],
-        [0, "세이메이", null, 0, null, 93, 94, 92, 0, 160, 300, null, null, null],
-        [0, "세정", null, 0, null, 97, 75, 101, 0, 160, 300, null, null],
-        [0, "셀레미", null, 0, null, 115, 52, 126, 0, 160, 300, null, "환술", "식물키우세요🍀"],
-        [0, "소교", null, 0, null, 107, 105, 57, 0, 160, 300, null, null, "주유 너무 무능하다."],
-        [0, "소노가미 린네", null, 0, null, 91, 98, 78, 0, 160, 300, null, null, "나는 시도의 소꿉친구라도, 연인이라도, 아내라도, 동생이라도, 누나라도, 어머니라도, 딸이라도, 상사라도, 부하라도, 적이라도, 원수라도, 타인이라도, 상관 없어―시도가 행복하다면 그것만으로"],
-        [0, "소원", null, 0, null, 93, 91, 56, 0, 160, 300, null, "필살"],
-        [0, "소진", null, 0, null, 99, 52, 106, 0, 160, 300, null, null],
-        [0, "소피", null, 0, null, 98, 85, 102, 0, 160, 300, null, "집중", "피리스, 연금술 해보지 않을래?"],
-        [0, "손건", null, 0, null, 106, 102, 56, 0, 160, 300, null, null, "삼대장 간손미에서 손을 맡고 있습니다"],
-        [0, "손견", null, 0, null, 104, 105, 80, 0, 160, 300, null, null],
-        [0, "손권", null, 0, null, 95, 67, 89, 0, 160, 300, null, null],
-        [0, "손나은", null, 0, null, 95, 56, 95, 0, 160, 300, null, "귀병"],
-        [0, "손민한", null, 0, null, 84, 83, 93, 0, 160, 300, null, null, "팝콘이 먹고싶다"],
-        [0, "손상향", null, 0, null, 108, 64, 101, 0, 160, 300, null, null],
-        [0, "손소", null, 0, null, 90, 87, 65, 0, 160, 300, null, null],
-        [0, "손책", null, 0, null, 102, 104, 81, 0, 160, 300, null, null],
-        [0, "손휴", null, 0, null, 91, 99, 57, 0, 160, 300, null, null],
-        [0, "송병구", null, 0, null, 90, 90, 87, 0, 160, 300, null, null],
-        [0, "송지만", null, 0, null, 77, 88, 85, 0, 160, 300, null, null],
-        [0, "송진우", null, 0, null, 79, 82, 85, 0, 160, 300, null, "환술"],
-        [0, "쇼우", null, 0, null, 90, 93, 81, 0, 160, 300, null, null],
-        [0, "수부타이", null, 0, null, 100, 76, 97, 0, 160, 300, null, null],
-        [0, "수장", null, 0, null, 102, 63, 100, 0, 160, 300, null, null],
-        [0, "수지", null, 0, null, 103, 60, 94, 0, 160, 300, null, "신중"],
-        [0, "순호", null, 0, null, 87, 116, 90, 0, 160, 300, null, null, "지금의 너로썬 내 힘 앞에선 무력, 절대적으로 무력하도다!"],
-        [0, "슈란", null, 0, null, 90, 95, 78, 0, 160, 300, null, "저격"],
-        [0, "슈퍼 간지", null, 0, null, 102, 60, 118, 0, 160, 300, null, null],
-        [0, "스 프로반스", null, 0, null, 114, 90, 90, 0, 160, 300, null, null],
-        [0, "스노우화이트", null, 0, null, 89, 87, 82, 0, 160, 300, null, "돌격", "사람들을 도울수 있는게 기뻐서!"],
-        [0, "스와코", null, 0, null, 108, 92, 92, 0, 160, 300, null, null, "아~우~~"],
-        [0, "스테르크", null, 0, null, 83, 108, 84, 0, 160, 300, null, "무쌍"],
-        [0, "슬기", null, 0, null, 96, 97, 65, 0, 160, 300, null, null],
-        [0, "슬라임", null, 0, null, 99, 61, 102, 0, 160, 300, null, null],
-        [0, "시그룬", null, 0, null, 100, 98, 95, 0, 160, 300, null, null],
-        [0, "시뉴카린", null, 0, null, 100, 99, 65, 0, 160, 300, null, null],
-        [0, "시득", null, 0, null, 105, 71, 96, 0, 160, 300, null, null],
-        [0, "시라베", null, 0, null, 88, 95, 80, 0, 160, 300, null, null],
-        [0, "시마즈 이에히사", null, 0, null, 102, 100, 67, 0, 160, 300, null, null],
-        [0, "시바", null, 0, null, 91, 101, 70, 0, 160, 300, null, null],
-        [0, "시삭", null, 0, null, 97, 60, 91, 0, 160, 300, null, null],
-        [0, "시슌", null, 0, null, 82, 96, 82, 0, 160, 300, null, null],
-        [0, "시시라라빠삐", null, 0, null, 86, 85, 105, 0, 160, 300, null, null],
-        [0, "시시라라오버", null, 0, null, 97, 93, 101, 0, 160, 300, null, null],
-        [0, "시아레스", null, 0, null, 96, 97, 76, 0, 160, 300, null, null],
-        [0, "시온", null, 0, null, 91, 110, 86, 0, 160, 300, null, null, "나도 좋아서 가난하게 살고 있는 게 아닌데~"],
-        [0, "시키에이키", null, 0, null, 95, 87, 111, 0, 160, 300, null, null, "보랏빛 벚꽃은 죄 깊은 인간의 영혼이 깃드는 꽃. 너는 그 보랏빛 벚꽃이 떨어져내리는 밑에서, 단죄하거라!"],
-        [0, "신상문", null, 0, null, 81, 83, 72, 0, 160, 300, null, null],
-        [0, "신키", null, 0, null, 109, 104, 83, 0, 160, 300, null, null, "나의 세계에서 저지른 죄값은 크지. 용서할 리가 없잖아."],
-        [0, "신탐", null, 0, null, 92, 64, 95, 0, 160, 300, null, null],
-        [0, "신헌영", null, 0, null, 94, 105, 66, 0, 160, 300, null, null],
-        [0, "실 플라인", null, 0, null, 92, 67, 122, 0, 160, 300, null, null],
-        [0, "실비아 셔우드", null, 0, null, 97, 80, 93, 0, 160, 300, null, null, "네 빈약한 경험치로 모든 일을 판단하지 마. 너도 첩보원 나부랭이라면 객관적인 사고로 움직여. 자잘한 정보 하나조차 사람의 목숨이 걸려 있다는 걸 잊지 마라"],
-        [0, "실키 리틀레즌", null, 0, null, 94, 122, 72, 0, 160, 300, null, null],
-        [0, "심배", null, 0, null, 88, 66, 92, 0, 160, 300, null, null],
-        [0, "아길레다", null, 0, null, 114, 102, 60, 0, 160, 300, null, null],
-        [0, "아레프갈드", null, 0, null, 97, 76, 114, 0, 160, 300, null, null],
-        [0, "아벨트 세프티", null, 0, null, 93, 120, 73, 0, 160, 300, null, null],
-        [0, "아서 팬드리건", null, 0, null, 93, 100, 83, 0, 160, 300, null, null, "묻겠다, 그대가 나의 마스터인가?"],
-        [0, "아쉐리트", null, 0, null, 104, 60, 99, 0, 160, 300, null, null],
-        [0, "아이샤", null, 0, null, 101, 101, 78, 0, 160, 300, null, "위압"],
-        [0, "아이오네", null, 0, null, 101, 109, 79, 0, 160, 300, null, null],
-        [0, "아이유", null, 0, null, 93, 57, 103, 0, 160, 300, null, "집중"],
-        [0, "아이작", null, 0, null, 102, 87, 96, 0, 160, 300, null, "집중"],
-        [0, "아카이 슈이치", null, 0, null, 89, 93, 104, 0, 160, 300, null, "저격"],
-        [0, "아카츠키 키리카", null, 0, null, 80, 95, 83, 0, 160, 300, null, null],
-        [0, "아케미 호무라", null, 0, null, 88, 89, 83, 0, 160, 300, null, "집중", "원래 기적이라는건 인간의 생명으로도 사고팔수 있는게 아니야"],
-        [0, "아테나2호", null, 0, null, 82, 97, 97, 0, 160, 300, null, null],
-        [0, "아하소과", null, 0, null, 98, 59, 99, 0, 160, 300, null, null],
-        [0, "악비", null, 0, null, 109, 100, 78, 0, 160, 300, null, null],
-        [0, "악의", null, 0, null, 108, 83, 106, 0, 160, 300, null, null],
-        [0, "악진", null, 0, null, 88, 94, 61, 0, 160, 300, null, null],
-        [0, "안량", null, 0, null, 97, 106, 47, 0, 160, 300, null, null],
-        [0, "안유진", null, 0, null, 94, 95, 63, 0, 160, 300, null, "위압"],
-        [0, "암즈 아크", null, 0, null, 100, 117, 68, 0, 160, 300, null, null],
-        [0, "앤 마이어", null, 0, null, 100, 96, 89, 0, 160, 300, null, null, "그야 당연하잖아… 난 여전히 프레이를 좋아해."],
-        [0, "앨리스", null, 0, null, 93, 93, 63, 0, 160, 300, null, "위압"],
-        [0, "앨리스 투베르크", null, 0, null, 88, 98, 88, 0, 160, 300, null, null],
-        [0, "앵벌스", null, 0, null, 119, 129, 44, 0, 160, 300, null, "의술", "다람쥐는 위대하고 그 외에 다른 설치류는 없다"],
-        [0, "야가미 타이치", null, 0, null, 94, 88, 79, 0, 160, 300, null, null, "내가 해 온 모든일이. 내가 살아왔다는 둘도 없는 증거인거야!"],
-        [0, "야람쥐", null, 0, null, 100, 88, 54, 0, 160, 300, null, null],
-        [0, "야마모토 란기", null, 0, null, 108, 102, 70, 0, 160, 300, null, null],
-        [0, "양규", null, 0, null, 101, 70, 99, 0, 160, 300, null, null],
-        [0, "양만춘", null, 0, null, 105, 73, 97, 0, 160, 300, null, null],
-        [0, "양송", null, 0, null, 110, 71, 108, 0, 160, 300, null, null, "군신 악의만이 나와 비견될만 하다"],
-        [0, "양준혁", null, 0, null, 96, 97, 90, 0, 160, 300, null, "무쌍", "내보다 강미노가 머리 더 큰데?"],
-        [0, "양추", null, 0, null, 97, 60, 99, 0, 160, 300, null, null],
-        [0, "양추2", null, 0, null, 80, 61, 106, 0, 160, 300, null, null],
-        [0, "양호", null, 0, null, 104, 76, 101, 0, 160, 300, null, null],
-        [0, "어우동", null, 0, null, 101, 99, 93, 0, 160, 300, null, null, null],
-        [0, "엄백호", null, 0, null, 106, 76, 109, 0, 160, 300, null, null, "내가 바로 동오의 엄덕왕이다!"],
-        [0, "엄안", null, 0, null, 90, 91, 68, 0, 160, 300, null, null],
-        [0, "엄여", null, 0, null, 99, 57, 106, 0, 160, 300, null, null, "내가 바로 동오의 엄덕왕 동생이다!"],
-        [0, "에도가와 코난", null, 0, null, 88, 75, 103, 0, 160, 300, null, null, "미궁을 모르는 명탐정! 진실은 언제나 하나!"],
-        [0, "에루다", null, 0, null, 85, 88, 93, 0, 160, 300, null, null],
-        [0, "에미야 키리츠쿠", null, 0, null, 93, 98, 92, 0, 160, 300, null, null, "나는 너를 죽이고…세계를 구한다….!"],
-        [0, "에스카", null, 0, null, 87, 78, 93, 0, 160, 300, null, null],
-        [0, "에이린", null, 0, null, 82, 86, 119, 0, 160, 300, null, null, "아하하. 너희는 어리석구나."],
-        [0, "엑셀레이터", null, 0, null, 73, 114, 93, 0, 160, 300, null, "위압", "압축, 압축, 공기를 압축..."],
-        [0, "엘", null, 0, null, 91, 87, 99, 0, 160, 300, null, null, null],
-        [0, "엘레노아 란", null, 0, null, 104, 93, 93, 0, 160, 300, null, null],
-        [0, "여몽", null, 0, null, 97, 86, 96, 0, 160, 300, null, null],
-        [0, "여위황", null, 0, null, 90, 63, 95, 0, 160, 300, null, null],
-        [0, "여포", null, 0, null, 98, 110, 46, 0, 160, 300, null, null],
-        [0, "연개소문", null, 0, null, 98, 70, 97, 0, 160, 300, null, null],
-        [0, "연채홍", null, 0, null, 107, 52, 106, 0, 160, 300, null, null],
-        [0, "염우", null, 0, null, 97, 54, 98, 0, 160, 300, null, null],
-        [0, "염종석", null, 0, null, 82, 89, 92, 0, 160, 300, null, null],
-        [0, "염파", null, 0, null, 107, 106, 83, 0, 160, 300, null, null],
-        [0, "염행", null, 0, null, 86, 99, 64, 0, 160, 300, null, null],
-        [0, "영정", null, 0, null, 107, 60, 101, 0, 160, 300, null, null],
-        [0, "영포", null, 0, null, 90, 100, 59, 0, 160, 300, null, null],
-        [0, "옌렌", null, 0, null, 100, 97, 78, 0, 160, 300, null, "무쌍"],
-        [0, "오가와 켄타로", null, 0, null, 94, 115, 75, 0, 160, 300, null, null],
-        [0, "오고타이 칸", null, 0, null, 105, 99, 68, 0, 160, 300, null, null],
-        [0, "오기", null, 0, null, 104, 73, 105, 0, 160, 300, null, null],
-        [0, "오다 노부나가", null, 0, null, 91, 116, 80, 0, 160, 300, null, null],
-        [0, "오리헨", null, 0, null, 102, 98, 82, 0, 160, 300, null, null],
-        [0, "오마치", null, 0, null, 94, 66, 122, 0, 160, 300, null, null],
-        [0, "오승환", null, 0, null, 96, 91, 88, 0, 160, 300, null, "위압"],
-        [0, "오영종", null, 0, null, 86, 78, 85, 0, 160, 300, null, null],
-        [0, "오키나", null, 0, null, 99, 99, 98, 0, 160, 300, null, null, "요괴가 아니라 신이에요~"],
-        [0, "오키타 노조미", null, 0, null, 72, 115, 91, 0, 160, 300, null, null],
-        [0, "오티누스", null, 0, null, 107, 52, 107, 0, 160, 300, null, null],
-        [0, "온몸이근육", null, 0, null, 102, 102, 57, 0, 160, 300, null, null, "불끈불끈"],
-        [0, "올돌골", null, 0, null, 106, 59, 109, 0, 160, 300, null, null, "남만이 낳은 천재 올돌골님이시다"],
-        [0, "왕건", null, 0, null, 102, 72, 105, 0, 160, 300, null, null],
-        [0, "왕기", null, 0, null, 89, 70, 95, 0, 160, 300, null, null],
-        [0, "왕돈", null, 0, null, 88, 59, 104, 0, 160, 300, null, null],
-        [0, "왕분", null, 0, null, 95, 97, 72, 0, 160, 300, null, null],
-        [0, "왕상", null, 0, null, 96, 98, 57, 0, 160, 300, null, null],
-        [0, "왕윤", null, 0, null, 96, 97, 57, 0, 160, 300, null, null],
-        [0, "왕전", null, 0, null, 101, 70, 99, 0, 160, 300, null, null],
-        [0, "왕준", null, 0, null, 94, 70, 92, 0, 160, 300, null, null],
-        [0, "왕평", null, 0, null, 97, 89, 67, 0, 160, 300, null, null],
-        [0, "왕흘", null, 0, null, 99, 98, 64, 0, 160, 300, null, null],
-        [0, "외심장", null, 0, null, 100, 63, 101, 0, 160, 300, null, null],
-        [0, "요르 포저", null, 0, null, 89, 106, 65, 0, 160, 300, null, "무쌍"],
-        [0, "요리히메", null, 0, null, 102, 111, 84, 0, 160, 300, null, null],
-        [0, "요시야마 가즈코", null, 0, null, 88, 79, 92, 0, 160, 300, null, null, "현대인이든 미래인이든 소중한건 하나뿐.. 너는 내가 좋아하는 사람이라는 것이야. 진실은 그것뿐이야./기다릴께 이쪽에서 …"],
-        [0, "우금", null, 0, null, 94, 90, 68, 0, 160, 300, null, null],
-        [0, "우르자", null, 0, null, 110, 111, 72, 0, 160, 300, null, null],
-        [0, "우보", null, 0, null, 90, 66, 98, 0, 160, 300, null, null],
-        [0, "우스피라 신토", null, 0, null, 102, 61, 116, 0, 160, 300, null, null],
-        [0, "우에스기 겐신", null, 0, null, 104, 116, 62, 0, 160, 300, null, null],
-        [0, "우즈마키 나루토", null, 0, null, 98, 97, 75, 0, 160, 300, null, "돌격", "난···닌자학교의 졸업시험에 3번을 떨어졌다···. ···재수없게 졸업시험에 나온 테스트가 항상··· ···항상 꼭 내가 제일 못하는 술법이었기 때문이었지. 분신술은··· 내가 제일 못하는 술법이었어. 운명이 어떻다느니··· 바꿀 수 없다느니 그딴 따분한 소리는 그만 칭얼대라! 넌 나랑 달리··· 쓰레기 따위가 아니니까."],
-        [0, "원소", null, 0, null, 99, 68, 89, 0, 160, 300, null, null],
-        [0, "웬디", null, 0, null, 86, 62, 98, 0, 160, 300, null, null],
-        [0, "위막", null, 0, null, 95, 64, 89, 0, 160, 300, null, null],
-        [0, "위만", null, 0, null, 99, 96, 66, 0, 160, 300, null, null],
-        [0, "위연", null, 0, null, 100, 99, 77, 0, 160, 300, null, null],
-        [0, "위유", null, 0, null, 98, 98, 61, 0, 160, 300, null, null],
-        [0, "윈터", null, 0, null, 99, 68, 97, 0, 160, 300, null, null],
-        [0, "유기체", null, 0, null, 101, 61, 105, 0, 160, 300, null, null, "흠... 그렇다면 어쩔 수 없이 흉노로 가야겠군요..."],
-        [0, "유나", null, 0, null, 94, 102, 81, 0, 160, 300, null, null],
-        [0, "유메미", null, 0, null, 106, 82, 103, 0, 160, 300, null, null, "기합 넣어! 죽어 버렸다간 데리고 돌아갈 수 없으니까."],
-        [0, "유방", null, 0, null, 99, 73, 94, 0, 160, 300, null, null],
-        [0, "유비", null, 0, null, 97, 86, 65, 0, 160, 300, null, null],
-        [0, "유빈", null, 0, null, 80, 88, 82, 0, 160, 300, null, null],
-        [0, "유선", null, 0, null, 107, 71, 106, 0, 160, 300, null, null, "촉은 제갈량이 다 말아먹었다"],
-        [0, "유섭", null, 0, null, 86, 56, 106, 0, 160, 300, null, null],
-        [0, "유아", null, 0, null, 96, 60, 95, 0, 160, 300, null, "집중"],
-        [0, "유우키 아스나", null, 0, null, 100, 97, 90, 0, 160, 300, null, "무쌍", "내이름… 어떻게 안거야…?"],
-        [0, "유우키 유우나", null, 0, null, 91, 94, 81, 0, 160, 300, null, null, "유우키 유우나! 용자부소속이야!"],
-        [0, "유유코", null, 0, null, 110, 91, 92, 0, 160, 300, null, null, "새는 잔뼈가 많아서 싫어."],
-        [0, "유장", null, 0, null, 109, 99, 52, 0, 160, 300, null, null],
-        [0, "유즈하라 유즈미", null, 0, null, 98, 112, 64, 0, 160, 300, null, null],
-        [0, "유카", null, 0, null, 100, 101, 63, 0, 160, 300, null, null],
-        [0, "유카리", null, 0, null, 99, 86, 109, 0, 160, 300, null, null, "아름답고 잔혹하게 이 대지에서 사라져라!"],
-        [0, "유키", null, 0, null, 97, 73, 115, 0, 160, 300, null, null],
-        [0, "육손", null, 0, null, 105, 78, 106, 0, 160, 300, null, null],
-        [0, "육항", null, 0, null, 104, 75, 102, 0, 160, 300, null, null],
-        [0, "윤미래", null, 0, null, 58, 82, 105, 0, 160, 300, null, null],
-        [0, "윤아", null, 0, null, 97, 97, 61, 0, 160, 300, null, "위압"],
-        [0, "윤용태", null, 0, null, 82, 88, 70, 0, 160, 300, null, null],
-        [0, "윤지현", null, 0, null, 88, 80, 92, 0, 160, 300, null, null],
-        [0, "융버메", null, 0, null, 94, 101, 78, 0, 160, 300, null, null],
-        [0, "은하", null, 0, null, 94, 62, 93, 0, 160, 300, null, "환술"],
-        [0, "을지문덕", null, 0, null, 106, 75, 105, 0, 160, 300, null, null],
-        [0, "이그드라실", null, 0, null, 79, 85, 101, 0, 160, 300, null, null],
-        [0, "이나경", null, 0, null, 97, 65, 94, 0, 160, 300, null, null],
-        [0, "이누보자키 후우", null, 0, null, 88, 93, 83, 0, 160, 300, null, null],
-        [0, "이드", null, 0, null, 101, 102, 58, 0, 160, 300, null, null],
-        [0, "이마가와 요시모토", null, 0, null, 95, 97, 76, 0, 160, 300, null, null],
-        [0, "이목", null, 0, null, 102, 73, 105, 0, 160, 300, null, null],
-        [0, "이병규", null, 0, null, 92, 89, 88, 0, 160, 300, null, "필살"],
-        [0, "이사부", null, 0, null, 96, 77, 99, 0, 160, 300, null, null],
-        [0, "이상훈", null, 0, null, 94, 89, 86, 0, 160, 300, null, "무쌍"],
-        [0, "이성계", null, 0, null, 102, 66, 98, 0, 160, 300, null, null],
-        [0, "이소로쿠", null, 0, null, 106, 103, 76, 0, 160, 300, null, null],
-        [0, "이순신", null, 0, null, 110, 81, 108, 0, 160, 300, null, null, "나의 죽음을 적에게 알리지 마라"],
-        [0, "이스칸다르", null, 0, null, 97, 101, 70, 0, 160, 300, null, null, "아아... 이번 원정도 가슴뛰는 것이었군..."],
-        [0, "이시리스", null, 0, null, 102, 65, 101, 0, 160, 300, null, null],
-        [0, "이신", null, 0, null, 89, 97, 69, 0, 160, 300, null, null],
-        [0, "이쓰미", null, 0, null, 101, 64, 100, 0, 160, 300, null, null],
-        [0, "이엄", null, 0, null, 91, 92, 69, 0, 160, 300, null, null],
-        [0, "이에야스", null, 0, null, 99, 114, 63, 0, 160, 300, null, null],
-        [0, "이영호", null, 0, null, 102, 98, 98, 0, 160, 300, null, null, "정말 득도를 했어요 정말 스타를 깨달았어요!"],
-        [0, "이오시프", null, 0, null, 108, 64, 106, 0, 160, 300, null, null],
-        [0, "이요지마 안즈", null, 0, null, 79, 91, 89, 0, 160, 300, null, "궁병", "만일 다시 태어난다면… 타마코와 자매로 태어나기를…."],
-        [0, "이윤열", null, 0, null, 97, 93, 98, 0, 160, 300, null, null, "전 전설로 남고 싶셒습니다"],
-        [0, "이제동", null, 0, null, 97, 100, 94, 0, 160, 300, null, null],
-        [0, "이종미", null, 0, null, 90, 85, 91, 0, 160, 300, null, null],
-        [0, "이종범", null, 0, null, 90, 92, 102, 0, 160, 300, null, "환술", "내겐 보이지 않는 무언가가 있다"],
-        [0, "이지스 카라", null, 0, null, 111, 104, 70, 0, 160, 300, null, null],
-        [0, "이지혜", null, 0, null, 79, 79, 79, 0, 160, 300, null, null],
-        [0, "이츠카 시도", null, 0, null, 90, 85, 83, 0, 160, 300, null, "환술", "이 세상 모든 사람이 널 부정해도 난 그들보다 몇 배는 더 널 긍정해주겠어"],
-        [0, "이츠카 코토리", null, 0, null, 90, 94, 81, 0, 160, 300, null, null],
-        [0, "이카로스", null, 0, null, 93, 95, 91, 0, 160, 300, null, null],
-        [0, "이택근", null, 0, null, 85, 79, 82, 0, 160, 300, null, null],
-        [0, "이현주", null, 0, null, 86, 87, 80, 0, 160, 300, null, null],
-        [0, "이효리", null, 0, null, 97, 96, 65, 0, 160, 300, null, null],
-        [0, "임요환", null, 0, null, 84, 89, 99, 0, 160, 300, null, null, "역시 콩은 까야 제맛이지"],
-        [0, "임창용", null, 0, null, 82, 85, 79, 0, 160, 300, null, null],
-        [0, "자무카", null, 0, null, 103, 102, 64, 0, 160, 300, null, null],
-        [0, "자비에르", null, 0, null, 91, 120, 68, 0, 160, 300, null, null],
-        [0, "잠혼", null, 0, null, 110, 109, 64, 0, 160, 300, null, null, "이 몸이 만부부당이라 불리는 맹장 잠혼이다."],
-        [0, "장간", null, 0, null, 89, 92, 70, 0, 160, 300, null, null],
-        [0, "장개", null, 0, null, 106, 59, 90, 0, 160, 300, null, null],
-        [0, "장군보", null, 0, null, 101, 99, 68, 0, 160, 300, null, null],
-        [0, "장료", null, 0, null, 106, 104, 81, 0, 160, 300, null, null],
-        [0, "장막", null, 0, null, 97, 96, 65, 0, 160, 300, null, null],
-        [0, "장보", null, 0, null, 91, 66, 89, 0, 160, 300, null, null],
-        [0, "장보고", null, 0, null, 106, 77, 102, 0, 160, 300, null, null],
-        [0, "장비", null, 0, null, 96, 108, 79, 0, 160, 300, null, null],
-        [0, "장수왕", null, 0, null, 103, 100, 67, 0, 160, 300, null, null],
-        [0, "장원영", null, 0, null, 100, 97, 54, 0, 160, 300, null, "무쌍"],
-        [0, "장의거", null, 0, null, 76, 100, 78, 0, 160, 300, null, null],
-        [0, "장임", null, 0, null, 91, 90, 83, 0, 160, 300, null, null],
-        [0, "장임2", null, 0, null, 99, 98, 78, 0, 160, 300, null, null],
-        [0, "장종훈", null, 0, null, 80, 93, 82, 0, 160, 300, null, "무쌍", "신고선수의 전설"],
-        [0, "장합", null, 0, null, 101, 98, 76, 0, 160, 300, null, null],
-        [0, "쟈하룻카스", null, 0, null, 91, 112, 76, 0, 160, 300, null, null],
-        [0, "저수", null, 0, null, 95, 50, 105, 0, 160, 300, null, null],
-        [0, "전단2", null, 0, null, 106, 83, 105, 0, 160, 300, null, null],
-        [0, "전문", null, 0, null, 87, 74, 98, 0, 160, 300, null, null],
-        [0, "전상욱", null, 0, null, 82, 80, 81, 0, 160, 300, null, null],
-        [0, "전예", null, 0, null, 99, 91, 85, 0, 160, 300, null, null],
-        [0, "전풍", null, 0, null, 90, 47, 106, 0, 160, 300, null, null],
-        [0, "정명원", null, 0, null, 88, 83, 75, 0, 160, 300, null, null],
-        [0, "정명훈", null, 0, null, 90, 89, 88, 0, 160, 300, null, null],
-        [0, "정보", null, 0, null, 92, 87, 65, 0, 160, 300, null, null],
-        [0, "정봉", null, 0, null, 89, 101, 76, 0, 160, 300, null, null],
-        [0, "정승필", null, 0, null, 118, 130, 46, 0, 160, 300, null, "견고", "건업만큼은 안된다 이놈들아!"],
-        [0, "정예인", null, 0, null, 93, 93, 61, 0, 160, 300, null, "위압"],
-        [0, "정지", null, 0, null, 94, 97, 70, 0, 160, 300, null, null],
-        [0, "정카다시안", null, 0, null, 96, 95, 95, 0, 160, 300, null, null],
-        [0, "제갈균", null, 0, null, 89, 60, 97, 0, 160, 300, null, null],
-        [0, "제갈량", null, 0, null, 108, 47, 110, 0, 160, 300, null, null],
-        [0, "제노에이지", null, 0, null, 102, 67, 102, 0, 160, 300, null, null],
-        [0, "제로스", null, 0, null, 109, 102, 77, 0, 160, 300, null, null],
-        [0, "제르시퍼", null, 0, null, 95, 103, 83, 0, 160, 300, null, null],
-        [0, "제베", null, 0, null, 99, 103, 72, 0, 160, 300, null, null],
-        [0, "제시카", null, 0, null, 97, 101, 91, 0, 160, 300, null, null],
-        [0, "조범", null, 0, null, 101, 99, 64, 0, 160, 300, null, null],
-        [0, "조비", null, 0, null, 83, 70, 96, 0, 160, 300, null, null],
-        [0, "조순", null, 0, null, 94, 91, 69, 0, 160, 300, null, null],
-        [0, "조예", null, 0, null, 97, 97, 53, 0, 160, 300, null, null],
-        [0, "조온", null, 0, null, 94, 84, 109, 0, 160, 300, null, null, "우리가 왜 최흉최악의 자매인지 그 몸으로 이해해라!"],
-        [0, "조용호", null, 0, null, 89, 88, 83, 0, 160, 300, null, null],
-        [0, "조운", null, 0, null, 99, 106, 83, 0, 160, 300, null, null],
-        [0, "조유리", null, 0, null, 94, 55, 96, 0, 160, 300, null, "집중"],
-        [0, "조인", null, 0, null, 104, 99, 77, 0, 160, 300, null, null],
-        [0, "조조", null, 0, null, 110, 79, 106, 0, 160, 300, null, null],
-        [0, "조창", null, 0, null, 95, 100, 65, 0, 160, 300, null, null],
-        [0, "조커", null, 0, null, 79, 93, 93, 0, 160, 300, null, null],
-        [0, "조휴", null, 0, null, 92, 86, 64, 0, 160, 300, null, null],
-        [0, "종리목", null, 0, null, 92, 67, 90, 0, 160, 300, null, null],
-        [0, "종회", null, 0, null, 97, 68, 102, 0, 160, 300, null, null],
-        [0, "주삭", null, 0, null, 99, 57, 99, 0, 160, 300, null, null],
-        [0, "주유", null, 0, null, 107, 78, 107, 0, 160, 300, null, null],
-        [0, "주준", null, 0, null, 98, 63, 84, 0, 160, 300, null, null],
-        [0, "주태", null, 0, null, 92, 99, 53, 0, 160, 300, null, null],
-        [0, "주형광", null, 0, null, 78, 85, 83, 0, 160, 300, null, null],
-        [0, "주환", null, 0, null, 93, 90, 82, 0, 160, 300, null, null],
-        [0, "중달", null, 0, null, 102, 101, 61, 0, 160, 300, null, null],
-        [0, "지니", null, 0, null, 97, 96, 58, 0, 160, 300, null, null],
-        [0, "지마 바카스코", null, 0, null, 108, 103, 68, 0, 160, 300, null, null],
-        [0, "지연", null, 0, null, 93, 63, 85, 0, 160, 300, null, null],
-        [0, "지크", null, 0, null, 108, 96, 96, 0, 160, 300, null, null],
-        [0, "진", null, 0, null, 82, 90, 93, 0, 160, 300, null, "돌격", "시체가 없다는건 죽지 않았다는 거지"],
-        [0, "진궁", null, 0, null, 92, 60, 99, 0, 160, 300, null, null],
-        [0, "진기", null, 0, null, 90, 71, 101, 0, 160, 300, null, null],
-        [0, "진등", null, 0, null, 87, 65, 89, 0, 160, 300, null, null],
-        [0, "진랑", null, 0, null, 90, 66, 94, 0, 160, 300, null, null],
-        [0, "진응", null, 0, null, 86, 64, 100, 0, 160, 300, null, null],
-        [0, "진진", null, 0, null, 101, 99, 56, 0, 160, 300, null, null],
-        [0, "진태", null, 0, null, 92, 82, 95, 0, 160, 300, null, null],
-        [0, "진흥왕", null, 0, null, 97, 70, 97, 0, 160, 300, null, null],
-        [0, "쩌둥", null, 0, null, 108, 106, 64, 0, 160, 300, null, null],
-        [0, "채염", null, 0, null, 108, 109, 54, 0, 160, 300, null, null],
-        [0, "채중", null, 0, null, 99, 50, 97, 0, 160, 300, null, null],
-        [0, "척준경", null, 0, null, 96, 115, 65, 0, 160, 300, null, null],
-        [0, "천괴은", null, 0, null, 117, 129, 47, 0, 160, 300, null, "견고", "헤헤.."],
-        [0, "초롱레아", null, 0, null, 102, 103, 79, 0, 160, 300, null, null],
-        [0, "초선", null, 0, null, 109, 108, 65, 0, 160, 300, null, null, "동탁 이리와봐 한대만 맞자"],
-        [0, "초절정미녀", null, 0, null, 105, 71, 105, 0, 160, 300, null, null],
-        [0, "최동원", null, 0, null, 97, 93, 95, 0, 160, 300, null, "환술", "무쇠팔 최동원"],
-        [0, "최연성", null, 0, null, 99, 102, 89, 0, 160, 300, null, null, "별로.. 별로 안좋아요"],
-        [0, "최영", null, 0, null, 102, 98, 76, 0, 160, 300, null, null],
-        [0, "최정", null, 0, null, 88, 90, 87, 0, 160, 300, null, "무쌍"],
-        [0, "추신수", null, 0, null, 98, 98, 95, 0, 160, 300, null, "무쌍", "Go! Choo! Go! Choo!"],
-        [0, "축융", null, 0, null, 108, 71, 105, 0, 160, 300, null, null],
-        [0, "춘향", null, 0, null, 98, 103, 92, 0, 160, 300, null, null, null],
-        [0, "칠디 샤프", null, 0, null, 102, 111, 74, 0, 160, 300, null, null],
-        [0, "칭기즈 칸", null, 0, null, 107, 106, 67, 0, 160, 300, null, null],
-        [0, "카나메 마도카", null, 0, null, 93, 101, 86, 0, 160, 300, null, "집중", "자아! 이루어줘 인큐베이터!"],
-        [0, "카나코", null, 0, null, 95, 110, 87, 0, 160, 300, null, null, "나를 부른 이는 누구인가?"],
-        [0, "카리나", null, 0, null, 100, 101, 65, 0, 160, 300, null, null],
-        [0, "카리야", null, 0, null, 102, 64, 105, 0, 160, 300, null, null, "깡!"],
-        [0, "카린", null, 0, null, 100, 78, 95, 0, 160, 300, null, "반계", "사실 넌 황제와 조정을 진정한 주인으로 생각한 적이 없잖아?"],
-        [0, "카미라", null, 0, null, 88, 69, 124, 0, 160, 300, null, null],
-        [0, "카오루", null, 0, null, 87, 83, 89, 0, 160, 300, null, null],
-        [0, "카오루Q카구라", null, 0, null, 109, 98, 73, 0, 160, 300, null, null],
-        [0, "카오스피닉스", null, 0, null, 102, 64, 101, 0, 160, 300, null, null, "=ㅁ="],
-        [0, "카이트", null, 0, null, 85, 122, 74, 0, 160, 300, null, null],
-        [0, "카츄사 봇슈", null, 0, null, 97, 106, 78, 0, 160, 300, null, null],
-        [0, "카페 아트풀", null, 0, null, 99, 61, 116, 0, 160, 300, null, null],
-        [0, "칸나", null, 0, null, 92, 86, 90, 0, 160, 300, null, null],
-        [0, "칸나즈키 아오이", null, 0, null, 89, 87, 91, 0, 160, 300, null, null],
-        [0, "캐롤", null, 0, null, 92, 85, 96, 0, 160, 300, null, null],
-        [0, "케셀링크", null, 0, null, 94, 123, 78, 0, 160, 300, null, null],
-        [0, "케이브리스", null, 0, null, 93, 126, 74, 0, 160, 300, null, null],
-        [0, "케이코", null, 0, null, 88, 69, 118, 0, 160, 300, null, null],
-        [0, "케이코쿠", null, 0, null, 92, 64, 121, 0, 160, 300, null, null],
-        [0, "코뿌리", null, 0, null, 86, 100, 81, 0, 160, 300, null, null],
-        [0, "콘", null, 0, null, 100, 101, 61, 0, 160, 300, null, null],
-        [0, "콘노 마코토", null, 0, null, 87, 80, 92, 0, 160, 300, null, null, "응… 금방 뛰어갈게."],
-        [0, "콘노유우키", null, 0, null, 103, 92, 88, 0, 160, 300, null, null, "나, 최선을 다해, 살았어…….이 곳에서, 살았어……."],
-        [0, "콘스탄틴", null, 0, null, 103, 99, 92, 0, 160, 300, null, null, null],
-        [0, "쿠루미", null, 0, null, 89, 95, 86, 0, 160, 300, null, null],
-        [0, "큐어 다이아몬드", null, 0, null, 89, 91, 93, 0, 160, 300, null, null],
-        [0, "큐어 드림", null, 0, null, 101, 100, 62, 0, 160, 300, null, "통찰", "희망이가진 위대한 힘! 큐어드림!"],
-        [0, "큐어 리듬", null, 0, null, 80, 88, 91, 0, 160, 300, null, null],
-        [0, "큐어 문라이트", null, 0, null, 85, 91, 87, 0, 160, 300, null, null],
-        [0, "큐어 뮤즈", null, 0, null, 89, 95, 84, 0, 160, 300, null, null],
-        [0, "큐어 이그렛", null, 0, null, 85, 91, 97, 0, 160, 300, null, null],
-        [0, "큐어 하트", null, 0, null, 96, 93, 98, 0, 160, 300, null, "위압"],
-        [0, "큐어 화이트", null, 0, null, 80, 93, 93, 0, 160, 300, null, null],
-        [0, "크렌스", null, 0, null, 108, 59, 102, 0, 160, 300, null, null],
-        [0, "크룩 모프스", null, 0, null, 106, 67, 114, 0, 160, 300, null, null],
-        [0, "크리스", null, 0, null, 83, 96, 80, 0, 160, 300, null, null],
-        [0, "클레어", null, 0, null, 102, 95, 99, 0, 160, 300, null, null],
-        [0, "키리시마 쇼우코", null, 0, null, 90, 76, 102, 0, 160, 300, null, null],
-        [0, "키리야", null, 0, null, 80, 92, 88, 0, 160, 300, null, null, "고마워요..선배들…이세계에 살아가는 의미를 알게해줘서…"],
-        [0, "키리토", null, 0, null, 88, 100, 83, 0, 160, 300, null, "무쌍", "스타….!버스트! 스트림..!"],
-        [0, "키쿄우", null, 0, null, 89, 93, 75, 0, 160, 300, null, null],
-        [0, "타마구시 후카", null, 0, null, 97, 72, 111, 0, 160, 300, null, null],
-        [0, "타치바나 도세츠", null, 0, null, 97, 95, 76, 0, 160, 300, null, null],
-        [0, "타치바나 무네시게", null, 0, null, 96, 73, 94, 0, 160, 300, null, null],
-        [0, "타치바나 카나데", null, 0, null, 92, 91, 77, 0, 160, 300, null, null, "좋아해 유즈루 나에게 심장을 줘서 고마워…"],
-        [0, "타카나시 소라", null, 0, null, 89, 83, 88, 0, 160, 300, null, null],
-        [0, "타카마치 나노하", null, 0, null, 98, 109, 88, 0, 160, 300, null, "위압", "잠깐 머리좀 식힐까?"],
-        [0, "타카이시 요코", null, 0, null, 88, 73, 104, 0, 160, 300, null, null],
-        [0, "타카이시 타케루", null, 0, null, 90, 94, 78, 0, 160, 300, null, null, "모두의 희망은 곧 나의 희망이야"],
-        [0, "타카하시 쇼운", null, 0, null, 98, 97, 75, 0, 160, 300, null, null],
-        [0, "태사자", null, 0, null, 104, 104, 79, 0, 160, 300, null, null],
-        [0, "태연", null, 0, null, 90, 55, 97, 0, 160, 300, null, null],
-        [0, "태조대왕", null, 0, null, 98, 67, 97, 0, 160, 300, null, null],
-        [0, "테리메", null, 0, null, 94, 99, 98, 0, 160, 300, null, null],
-        [0, "테리온", null, 0, null, 91, 80, 98, 0, 160, 300, null, null],
-        [0, "테임즈", null, 0, null, 93, 95, 75, 0, 160, 300, null, "무쌍", "황재균은 섹x머신이다"],
-        [0, "토고 미모리", null, 0, null, 91, 95, 98, 0, 160, 300, null, null],
-        [0, "토마 리프톤", null, 0, null, 98, 118, 61, 0, 160, 300, null, null],
-        [0, "토요히메", null, 0, null, 109, 78, 108, 0, 160, 300, null, null],
-        [0, "토쿠가와 센", null, 0, null, 97, 116, 69, 0, 160, 300, null, null],
-        [0, "토토리", null, 0, null, 89, 89, 93, 0, 160, 300, null, null],
-        [0, "트와이스 미나", null, 0, null, 85, 99, 57, 0, 160, 300, null, null],
-        [0, "파이어", null, 0, null, 86, 96, 81, 0, 160, 300, null, null],
-        [0, "파파이아 서버", null, 0, null, 96, 66, 117, 0, 160, 300, null, null],
-        [0, "패튼 미스날지", null, 0, null, 112, 102, 78, 0, 160, 300, null, null],
-        [0, "퍼플하트", null, 0, null, 89, 91, 80, 0, 160, 300, null, "돌격"],
-        [0, "페어리루 골", null, 0, null, 87, 89, 93, 0, 160, 300, null, null],
-        [0, "페이", null, 0, null, 93, 87, 98, 0, 160, 300, null, null, null],
-        [0, "페이트", null, 0, null, 101, 65, 99, 0, 160, 300, null, null],
-        [0, "페이트 하라오운", null, 0, null, 92, 98, 76, 0, 160, 300, null, null, "우리들의 어떤 것도 아직 시작하지도 않았어. 그러니까 진정한 자신을 시작하기 위해서, 지금까지의 자신을 끝내러 가자"],
-        [0, "평민킬러", null, 0, null, 105, 101, 60, 0, 160, 300, null, null],
-        [0, "포륭", null, 0, null, 90, 59, 100, 0, 160, 300, null, null],
-        [0, "푸크푹", null, 0, null, 108, 82, 83, 0, 160, 300, null, "환술", "어서와 섀도게일 언니."],
-        [0, "프레이 마이어", null, 0, null, 104, 122, 72, 0, 160, 300, null, "위압", "내기도….들어줬어… 내 친구야 내가 태어난 의미가 여기있어"],
-        [0, "프로디테오", null, 0, null, 93, 85, 97, 0, 160, 300, null, null],
-        [0, "플라흐타", null, 0, null, 87, 75, 105, 0, 160, 300, null, "환술"],
-        [0, "피사로", null, 0, null, 99, 64, 114, 0, 160, 300, null, null],
-        [0, "피텐 차오", null, 0, null, 100, 112, 68, 0, 160, 300, null, null],
-        [0, "핀 다무네", null, 0, null, 92, 91, 87, 0, 160, 300, null, "통찰"],
-        [0, "하노아", null, 0, null, 93, 98, 75, 0, 160, 300, null, null],
-        [0, "하니킹", null, 0, null, 105, 121, 62, 0, 160, 300, null, null],
-        [0, "하리", null, 0, null, 108, 106, 75, 0, 160, 300, null, null],
-        [0, "하야미", null, 0, null, 106, 74, 94, 0, 160, 300, null, null],
-        [0, "하우렌 프로반스", null, 0, null, 103, 97, 78, 0, 160, 300, null, null],
-        [0, "하제", null, 0, null, 91, 67, 90, 0, 160, 300, null, null],
-        [0, "하진", null, 0, null, 98, 99, 49, 0, 160, 300, null, null, "돼지 잡던 내가 대장군?"],
-        [0, "하츄핑", null, 0, null, 114, 50, 128, 0, 160, 300, null, "집중", "애교가 넘치는 사랑의 티니핑, 츄!"],
-        [0, "하후돈", null, 0, null, 100, 97, 75, 0, 160, 300, null, null],
-        [0, "하후무", null, 0, null, 108, 110, 80, 0, 160, 300, null, null, "나와 싸워 이길 자 누구인가!"],
-        [0, "하후연", null, 0, null, 105, 101, 79, 0, 160, 300, null, null],
-        [0, "하후연묘재", null, 0, null, 101, 57, 105, 0, 160, 300, null, null],
-        [0, "하후은", null, 0, null, 96, 57, 96, 0, 160, 300, null, null],
-        [0, "하후패", null, 0, null, 87, 94, 69, 0, 160, 300, null, null],
-        [0, "하후혜", null, 0, null, 99, 97, 53, 0, 160, 300, null, null],
-        [0, "하후화", null, 0, null, 99, 95, 56, 0, 160, 300, null, null],
-        [0, "학소", null, 0, null, 96, 76, 94, 0, 160, 300, null, null],
-        [0, "한당", null, 0, null, 84, 94, 67, 0, 160, 300, null, null],
-        [0, "한동욱", null, 0, null, 83, 81, 85, 0, 160, 300, null, null],
-        [0, "한미경", null, 0, null, 83, 78, 75, 0, 160, 300, null, null],
-        [0, "한복", null, 0, null, 90, 96, 91, 0, 160, 300, null, null],
-        [0, "한숭", null, 0, null, 94, 94, 65, 0, 160, 300, null, null],
-        [0, "한신", null, 0, null, 110, 81, 105, 0, 160, 300, null, null],
-        [0, "한현", null, 0, null, 106, 56, 107, 0, 160, 300, null, null],
-        [0, "항연", null, 0, null, 98, 88, 67, 0, 160, 300, null, null],
-        [0, "항적", null, 0, null, 109, 110, 71, 0, 160, 300, null, null],
-        [0, "해커", null, 0, null, 84, 87, 88, 0, 160, 300, null, "집중", "x까! x빨놈아!"],
-        [0, "허영무", null, 0, null, 86, 86, 86, 0, 160, 300, null, null, "게임 알지도 못하는 놈들아 너네들이 와서 함 해볼래!?"],
-        [0, "헌제", null, 0, null, 97, 101, 57, 0, 160, 300, null, null, "한 황실의 미래는 내 알바 아니다"],
-        [0, "헤이지", null, 0, null, 88, 86, 98, 0, 160, 300, null, null],
-        [0, "헤카티아", null, 0, null, 96, 95, 107, 0, 160, 300, null, null, "꿈의 세계에선 무방비하니까 간단한 일이었지."],
-        [0, "헹이", null, 0, null, 102, 65, 108, 0, 160, 300, null, null],
-        [0, "혜리", null, 0, null, 93, 60, 93, 0, 160, 300, null, "환술"],
-        [0, "호넷", null, 0, null, 88, 72, 126, 0, 160, 300, null, null],
-        [0, "호야", null, 0, null, 102, 88, 56, 0, 160, 300, null, null, "호야꿀드새오"],
-        [0, "호쥬누에", null, 0, null, 96, 108, 82, 0, 160, 300, null, null, "자아, 나의 정체를 알아버린 당신을 죽여버리고, 정체불명으로 돌아가야겠어."],
-        [0, "홍진호", null, 0, null, 89, 90, 87, 0, 160, 300, null, null, "오늘의 전 홍진호도 아니고 폭풍저그도 아니었습니다. 그냥.. 그냥.. 저그 였습니다. 저그.."],
-        [0, "화웅", null, 0, null, 86, 99, 60, 0, 160, 300, null, null],
-        [0, "황개", null, 0, null, 88, 95, 70, 0, 160, 300, null, null],
-        [0, "황권", null, 0, null, 83, 65, 97, 0, 160, 300, null, null],
-        [0, "황보숭", null, 0, null, 100, 67, 90, 0, 160, 300, null, null],
-        [0, "황약사", null, 0, null, 101, 101, 66, 0, 160, 300, null, null],
-        [0, "황월영", null, 0, null, 104, 107, 64, 0, 160, 300, null, null, "어쩌다 저런 걸 남편이라고…."],
-        [0, "황충", null, 0, null, 97, 106, 71, 0, 160, 300, null, null],
-        [0, "황헐", null, 0, null, 89, 75, 97, 0, 160, 300, null, null],
-        [0, "황호", null, 0, null, 108, 110, 74, 0, 160, 300, null, null],
-        [0, "흑치상지", null, 0, null, 96, 78, 98, 0, 160, 300, null, null],
-        [0, "히아라기 네무", null, 0, null, 83, 80, 100, 0, 160, 300, null, null]
+        [1, "키타노 유키코", null, 1, "대", 86, 31, 95, 1, 160, 300, "대의", "저격", "모든것은 우리들의 꿈을 이루기 위해…"],
+        [1, "키타노 시오리", null, 1, "대", 94, 96, 89, 1, 160, 300, "대의", "무쌍", "언니를 지켜보일거야"],
+        [1, "이치가와 아이리", null, 1, "대", 78, 88, 94, 11, 160, 300, "대의", null, "유키코를 지킬거야. 내 속죄를 위해"],
+        [1, "이즈카에 에리카", null, 1, "유구", 77, 93, 72, 1, 160, 300, "의협", "저격"],
+        [1, "타에구치 유카리", null, 1, "유구", 71, 66, 80, 1, 160, 300, "할거", null, "아버지와 어머니를 지키기 위해 미래에서 왓어 난"],
+        [1, "오모타 아미유", null, 1, "대", 64, 51, 44, 1, 160, 300, "대의", null],
+        [1, "소카이 요시나", null, 1, "유구", 79, 62, 80, 1, 160, 300, "의협", null],
+        [1, "소미타키 코토키", null, 1, "유구", 86, 79, 55, 1, 160, 300, "재간", null],
+        [1, "타카이시 유키", null, 1, "유구", 83, 64, 72, 1, 160, 300, "재간", null],
+        [1, "스즈카 아야로", null, 1, "대", 62, 88, 47, 1, 160, 300, "의협", null],
+        [1, "요리시마 사치코", null, 1, "유구", 51, 81, 70, 1, 160, 300, "대의", "저격"],
+        [0, "큐어 스플릿", null, 0, null, 80, 90, 56, 0, 160, 300, null, "무쌍"],
+        [0, "큐어 솔크", null, 0, null, 93, 97, 67, 0, 160, 300, null, null, "아버지를 이겨보일거야."],
+        [0, "큐어 샤인", null, 0, null, 99, 75, 99, 0, 160, 300, "패권", "신산", "디지털 월드와 인간세계 모두를 위해"],
+        [0, "큐어 러브", null, 0, null, 77, 86, 54, 0, 160, 300, null, null, "사랑을 추구하는 전사 큐어 러브"],
+        [0, "큐어 프로즌", null, 0, null, 64, 88, 72, 0, 160, 300, null, null],
+        [0, "큐어 바이올렛", null, 0, null, 49, 89, 77, 0, 160, 300, null, "상재"],
+        [0, "큐어 드림", null, 0, null, 97, 99, 71, 0, 160, 300, null, "무쌍"],
+        [0, "큐어 뮤즈", null, 0, null, 71, 95, 64, 0, 160, 300, null, null],
+        [0, "큐어 플리오네", null, 0, null, 89, 102, 86, 0, 148, 300, null, null],
+        [0, "큐어 리큐브", null, 0, null, 67, 88, 82, 0, 152, 300, null, null],
+        [0, "큐어 퓨리", null, 0, null, 83, 84, 42, 0, 160, 300, null, null],
+        [0, "큐어 뮤직", null, 0, null, 79, 84, 60, 0, 160, 300, null, null],
+        [0, "큐어 포르테", null, 0, null, 72, 77, 55, 0, 160, 300, null, null],
+        [0, "큐어 리스", null, 0, null, 89, 80, 67, 0, 160, 300, null, null],
+        [0, "분비", null, 0, null, 85, 94, 90, 0, 148, 300, null, null],
+        [0, "시비렛타", null, 0, null, 82, 73, 90, 0, 127, 300, null, null],
+        [0, "히토", null, 0, null, 64, 88, 80, 0, 115, 300, null, null],
+        [2, "모요코모 미에카", null, 2, "천수", 91, 60, 97, 12, 141, 300, "할거", null, "모든것은 분비님이 부활시키려는 그자를 막기 위해서야! 그자는 우리가 죽을뻔한 초대 선택받은 아이들의 적이니까!"],
+        [2, "노자미 미노코", null, 2, "천수", 80, 77, 80, 11, 143, 300, null, null, "도대체 요시미츠님(분비님)은 뭔 생각이신거야…"],
+        [2, "노자미 미에키", null, 0, null, 73, 70, 55, 0, 160, 300, null, null],
+        [999, "리아", null, 0, null, 99, 34, 100, 0, 132, 300, null, "집중", "이 세계를 부디 안정시켜줄 사람이 필요해…."],
+        [0, "코구라 아치모토", null, 0, null, 51, 44, 114, 0, 160, 300, null, "발명", "크흐흐…다크 프리큐어여 모습을 드러내라…!"],
+        [0, "다크 프리큐어즈", null, 0, null, 84, 97, 92, 0, 160, 300, null, null, "모든건… 그분의 부활을 위해."],
+        [0, "레톨프", null, 0, null, 87, 88, 64, 0, 160, 300, null, null],
+        [2, "사사토케 라이라", null, 2, "천수", 71, 80, 74, 1, 151, 300, null, null, "다시한번 주어진 기회. 이번엔 그녀를 지킬거야."],
+        [2, "하루사키 츠보미", null, 2, "천수", 88, 51, 97, 1, 153, 300, "할거", null, "똑같은 악당짓을 다시는 하지않게, 나자신을 바꿀거야, 사랑하는 라이라 오빠와 함께."],
+        [2, "아야토케 나이미", null, 2, "천수", 76, 44, 88, 1, 151, 300, null, null],
+        [2, "히마즈라 유게키", null, 2, "천수", 54, 80, 12, 1, 149, 300, null, null],
+        [2, "하루사키 유나", null, 2, "저", 77, 44, 91, 1, 150, 300, null, null],
+        [0, "야가미 타이치", null, 0, null, 89, 88, 67, 0, 153, 300, null, null],
+        [0, "야가미 소라", null, 0, null, 62, 37, 75, 0, 153, 300, null, null],
+        [0, "야가미 유메", null, 0, null, 80, 55, 78, 0, 160, 300, null, null],
+        [0, "이시다 야마토", null, 0, null, 72, 77, 60, 0, 153, 300, null, null],
+        [0, "이시다 나데히코", null, 0, null, 80, 50, 79, 0, 160, 300, null, null],
+        [0, "이즈미 코시로", null, 0, null, 34, 17, 99, 0, 154, 300, null, "발명"],
+        [0, "이즈미 미미", null, 0, null, 51, 23, 66, 0, 154, 300, null, null],
+        [0, "이즈미 토모", null, 0, null, 37, 30, 89, 0, 160, 300, null, null],
+        [0, "이즈미 쥰", null, 0, null, 77, 77, 31, 0, 160, 300, null, null],
+        [0, "아마노 유우", null, 0, null, 77, 70, 85, 0, 160, 300, null, null, "모든건 그분을 위하여"],
+        [2, "사사토케 키아라", null, 0, null, 85, 83, 60, 0, 160, 300, null, null, "감히 엄마를 그렇게 만들었겟다… 그 디지몬 절대로 용서하지 않을거야!"],
+        [2, "야카기 츠에루", null, 0, null, 83, 80, 51, 0, 160, 300, null, null, "할머니의 업보… 제가 대신 갚아나갈 거에요"],
+        [0, "사이온지 카나타", null, 0, null, 81, 79, 85, 0, 160, 300, null, null, "내가 먼저 말할게 좋아해 미유,"],
+        [0, "사이온지 미유", null, 0, null, 78, 64, 82, 0, 160, 300, null, null, "미우… 방금 뭐라고?.....루? 루란 말이야?"],
+        [0, "사이온지 미우", null, 0, null, 85, 91, 33, 0, 160, 300, null, "견고", "크하하… 모두 박살나 버려라, 이딴 세상!"],
+        [0, "오카자키 나기사", null, 0, null, 77, 17, 91, 0, 160, 300, null, null, "경단~ 경단~ 경단~경단 경단 대가족~"],
+        [0, "오카자키 토모야", null, 0, null, 79, 82, 51, 0, 160, 300, null, null],
+        [0, "오카자키 우시오", null, 0, null, 67, 77, 68, 0, 160, 300, null, null, "미우를 구하기 위해..! 난 싸울거야 친구니까!"],
+        [0, "최산해", null, 0, null, 82, 88, 33, 0, 160, 300, null, null],
+        [0, "유에", null, 0, null, 56, 14, 80, 0, 160, 300, null, null, "백성을 우선시하는게 통치의 근본."],
+        [0, "에이", null, 0, null, 64, 33, 97, 0, 160, 300, null, null, "유에는 소중한 친구이자 주군,"],
+        [0, "견휘", null, 3, "장안", 85, 44, 92, 12, 160, 300, null, "집중"],
+        [0, "고현", null, 3, "장안", 52, 37, 81, 1, 160, 300, null, null],
+        [5, "고순", null, 3, "함곡", 88, 86, 66, 1, 160, 300, null, "기병"],
+        [5, "장료", null, 3, "장안", 85, 92, 78, 1, 160, 300, null, "무쌍"],
+        [5, "가후", null, 3, "장안", 80, 46, 98, 11, 160, 300, null, null],
+        [5, "견린", null, 3, "장안", 70, 42, 88, 1, 160, 300, null, null],
+        [5, "견정", null, 3, "장안", 66, 40, 55, 1, 160, 300, null, null],
+        [5, "헌제", null, 3, "장안", 47, 44, 83, 1, 160, 300, null, null],
+        [5, "곽가", null, 3, "함곡", 61, 33, 91, 1, 160, 300, null, "귀모"],
+        [5, "강인", null, 4, "한중", 90, 53, 91, 12, 160, 300, null, null, "나는 강인 백약, 사마사의 아내야"],
+        [5, "사마예은", null, 4, "한중", 53, 37, 82, 1, 160, 300, null, null],
+        [3, "유혜은", null, 4, "한중", 69, 57, 72, 1, 160, 300, null, null],
+        [3, "유현아", null, 4, "한중", 65, 68, 51, 1, 160, 300, null, null],
+        [3, "장연지", null, 4, "한중", 31, 15, 66, 1, 160, 300, null, null],
+        [3, "장서연", null, 4, "한중", 74, 73, 44, 1, 160, 300, null, null],
+        [3, "유하연", null, 4, "한중", 68, 61, 65, 1, 160, 300, null, null],
+        [3, "유희", null, 4, "한중", 64, 75, 62, 1, 160, 300, null, null],
+        [3, "나지현", null, 4, "한중", 64, 33, 71, 1, 160, 300, null, null],
+        [3, "아사쿠라 나오", null, 0, null, 81, 63, 83, 0, 160, 300, null, "저격", "모든건 우리를 싸우게 만들고 서로 죽이게 한 어른들에 대한 복수,"],
+        [3, "아오이 타쿠마", null, 0, null, 77, 89, 55, 0, 160, 300, null, null],
+        [0, "우라베 슈고", null, 0, null, 53, 68, 61, 0, 160, 300, null, null],
+        [0, "카사이 오사무", null, 0, null, 66, 54, 39, 0, 160, 300, null, null],
+        [0, "카케이 쿄코", null, 0, null, 77, 55, 81, 0, 160, 300, null, null],
+        [0, "사쿠라이 하루야", null, 0, null, 63, 79, 51, 0, 160, 300, null, null],
+        [0, "히카사 쇼타", null, 0, null, 55, 31, 44, 0, 160, 300, null, null],
+        [0, "토츠카 호나미", null, 0, null, 81, 77, 53, 0, 160, 300, null, null],
+        [0, "니이미 레나", null, 0, null, 66, 78, 55, 0, 160, 300, null, null],
+        [0, "큐어 트윙클", null, 0, null, 81, 88, 55, 0, 160, 300, null, null],
+        [0, "모토무라 아스카", null, 0, null, 64, 77, 81, 0, 160, 300, null, null],
+        [0, "야기 아야네", null, 0, null, 78, 83, 55, 0, 160, 300, null, "저격"],
+        [0, "야자와 아이", null, 0, null, 67, 89, 57, 0, 160, 300, null, "무쌍"],
+        [0, "유키 카나", null, 0, null, 79, 24, 88, 0, 160, 300, null, "통찰"],
+        [0, "노다 샤토미", null, 0, null, 61, 55, 69, 0, 160, 300, null, null],
+        [0, "사사가와 류헤이", null, 0, null, 66, 58, 66, 0, 160, 300, null, null],
+        [0, "키리야마 카즈오", null, 0, null, 91, 92, 99, 0, 160, 300, "패권", "위압", "뒷면이 나오면…이 게임을 받아들이기로…!"],
+        [0, "이치가와 쥬리", null, 0, null, 34, 32, 91, 0, 160, 300, null, "발명"],
+        [0, "모토무라 아야네", null, 0, null, 77, 67, 55, 0, 163, 300, null, null],
+        [0, "코토히키 카요코", null, 0, null, 78, 33, 78, 0, 160, 300, null, null],
+        [0, "스기무라 히로키", null, 0, null, 67, 90, 45, 0, 160, 300, "유지", null],
+        [0, "민유희", null, 0, null, 89, 55, 81, 0, 163, 300, null, null],
+        [0, "사카키 유코", null, 0, null, 45, 34, 60, 0, 160, 300, null, null],
+        [0, "사쿠라이 사키", null, 0, null, 78, 77, 66, 0, 160, 300, null, "저격"],
+        [0, "마키", null, 0, null, 72, 74, 56, 0, 160, 300, null, null],
+        [0, "마이", null, 0, null, 70, 70, 60, 0, 160, 300, null, null],
+        [0, "소마 미츠코", null, 0, null, 93, 66, 90, 0, 160, 300, null, null, "나는 뺏는쪽에 서서 살아가는 거잖아…?"],
+        [0, "타카구치유이치로", null, 0, null, 77, 54, 79, 0, 160, 300, null, null],
+        [0, "스즈키 아야로", null, 1, "유구", 55, 44, 77, 1, 160, 300, null, null],
+        [0, "아사기 유미", null, 0, null, 84, 56, 66, 0, 160, 300, null, null],
+        [1, "아오조야 하나코", null, 0, null, 89, 66, 94, 0, 160, 300, null, null],
+        [1, "아유카 시로미", null, 0, null, 3, 15, 64, 0, 160, 300, null, null],
+        [0, "아유카 시코", null, 0, null, 7, 9, 66, 0, 160, 300, null, null],
+        [0, "아카타 마야코", null, 0, null, 35, 40, 55, 0, 160, 300, null, null],
+        [0, "아타키 류야", null, 0, null, 64, 12, 80, 0, 160, 300, null, null],
+        [0, "우츠미 유키에", null, 0, null, 71, 44, 82, 0, 160, 300, null, null, "바보야…모두 바보야! 모두 살아돌아갈수도 있엇는데…."],
+        [0, "아제라크", null, 0, null, 81, 89, 68, 0, 160, 300, null, null, "프리큐어…! 모조리 거미밥으로 만들어주마!"],
+        [0, "악튜러스 멩스크", null, 5, "성도", 95, 71, 99, 12, 151, 300, "패권", "집중", "누구도 날 막을 수 없어. 네놈이건, 연합이건, 프로토스건, 그 누구도! 코프룰루를 가질 수 없다면 차라리 잿더미로 만들어 버릴테다!"],
+        [0, "발레리안 멩스크", null, 5, "성도", 85, 63, 88, 1, 160, 300, null, null, "난 국민의 편이오. 아버지의 죄는 용서받을 수 없다는 걸 알고 있소. 권좌에서… 내려오셔야 한다는 것도."],
+        [10, "호러스 워필드", null, 5, "성도", 95, 83, 82, 1, 160, 300, "대의", "인덕", "캐리건... 잘 들어라. 지금 왕복선 3대엔 부상병들만 타고 있다. 다들 누군가의... 남편이자, 아버지야. 저들은 그냥 보내다오. 알겠나? 독한 것. 넌 인간도 아니야. 넌 우릴 배신했어. 뭣 때문에? 그깟 복수 때문에?\n무고한 사람들을 얼마나 죽인 거야? 또 얼마나 더 죽일 셈이야?\n레이너가 널 보면 뭐라고 할까?"],
+        [10, "캐롤라이나", null, 5, "성도", 80, 51, 75, 1, 160, 300, null, null],
+        [10, "노바 테라", null, 5, "성도", 71, 92, 55, 1, 160, 300, null, "저격", "노바, 작전준비"],
+        [10, "헥터 산티아고", null, 5, "성도", 85, 55, 84, 1, 160, 300, null, null],
+        [10, "클레리아 듀크", null, 0, null, 89, 64, 88, 0, 146, 300, null, null, "가족들과 같이 마지막 까지 살아남아 돌아가겟어."],
+        [10, "에밀리아 듀크", null, 0, null, 82, 84, 66, 0, 160, 300, null, "저격", "어머니랑 다시 만나서 기뻐"],
+        [0, "에르지나 듀크", null, 0, null, 75, 87, 62, 0, 160, 300, null, "저격"],
+        [0, "헤일리 듀크", null, 0, null, 70, 64, 84, 0, 160, 300, null, null],
+        [0, "존 레이너", null, 0, null, 77, 89, 62, 0, 160, 300, null, "저격"],
+        [0, "베르카 나바렌", null, 0, null, 81, 51, 93, 0, 160, 300, null, null],
+        [0, "마리에 베넷", null, 0, null, 66, 33, 66, 0, 160, 300, null, null],
+        [0, "유리아 베넷", null, 0, null, 76, 41, 55, 0, 160, 300, null, null],
+        [0, "루미 베레스", null, 0, null, 77, 33, 89, 0, 160, 300, null, null],
+        [0, "타이커스", null, 0, null, 61, 85, 40, 0, 160, 300, null, null],
+        [0, "제임스 레이너", null, 0, null, 99, 88, 72, 0, 160, 300, "대의", "돌격", "피닉스! 안돼!!"],
+        [0, "맷 호너", null, 0, null, 87, 64, 95, 0, 160, 300, null, null],
+        [0, "로리 스완", null, 0, null, 32, 55, 93, 0, 160, 300, null, "발명"],
+        [0, "이곤 스텟먼", null, 0, null, 11, 7, 91, 0, 160, 300, null, "발명"],
+        [0, "가브리엘 토시", null, 0, null, 85, 96, 55, 0, 160, 300, null, "저격"],
+        [0, "로사 모랄레스", null, 0, null, 51, 44, 67, 0, 160, 300, null, null],
+        [0, "레베카 레이너", null, 0, null, 81, 93, 44, 0, 160, 300, null, null],
+        [0, "케이트 록웰", null, 0, null, 43, 10, 78, 0, 160, 300, null, null],
+        [0, "아리엘 헨슨", null, 0, null, 17, 1, 89, 0, 160, 300, null, "발명"],
+        [0, "미라 호너", null, 0, null, 89, 66, 94, 0, 160, 300, null, null],
+        [0, "알렌 세자르", null, 0, null, 85, 61, 82, 0, 160, 300, null, null],
+        [0, "마이클 리버티", null, 0, null, 64, 33, 71, 0, 160, 300, null, null],
+        [0, "시온 크루스", null, 5, "성도", 51, 14, 85, 1, 160, 300, null, null],
+        [0, "사라 케리건", null, 0, null, 95, 95, 81, 0, 160, 300, null, "무쌍"],
+        [10, "드랄리스카", null, 0, null, 82, 93, 78, 0, 160, 300, null, null, "케리건님이 죽다니…근데 왜 내가 그 중임을 이어받아야 하는거야?"],
+        [0, "에레니카", null, 0, null, 78, 38, 91, 0, 160, 300, null, null, "곧있으면 위대하신 아몬님이 완전히 부활할거야 드랄리스카 언니 후후후…."],
+        [0, "세페니아", null, 0, null, 75, 81, 51, 0, 160, 300, null, null, "에레니카 언니 뭔가 이상해"],
+        [0, "이즈샤", null, 0, null, 31, 55, 81, 0, 160, 300, null, null, "여왕님의 명을 받듭니다"],
+        [0, "자가라", null, 0, null, 87, 91, 46, 0, 160, 300, null, null],
+        [0, "데히카", null, 0, null, 75, 91, 55, 0, 160, 300, null, null],
+        [0, "스투코프 부제독", null, 0, null, 87, 71, 93, 0, 160, 300, null, null],
+        [0, "니아드라", null, 0, null, 80, 83, 52, 0, 160, 300, null, null],
+        [0, "아바투르", null, 0, null, 43, 33, 81, 0, 160, 300, null, "발명"],
+        [0, "다고쓰", null, 0, null, 81, 85, 80, 0, 160, 300, null, null, "휴우… 드랄리스카도 환생자라 다행이야, 죽을일은 없겠네… 근데 케리건이 죽을줄이야…"],
+        [0, "초월체", null, 0, null, 95, 55, 99, 0, 160, 300, null, null],
+        [0, "자츠", null, 0, null, 82, 55, 71, 0, 160, 300, null, null],
+        [0, "곤", null, 0, null, 79, 56, 77, 0, 160, 300, null, null],
+        [0, "카그", null, 0, null, 80, 55, 69, 0, 160, 300, null, null],
+        [0, "아우자", null, 0, null, 64, 71, 86, 0, 160, 300, null, null],
+        [0, "제라드 듀갈", null, 0, null, 87, 51, 80, 0, 160, 300, null, null],
+        [0, "맘스틴 대령", null, 0, null, 80, 51, 66, 0, 160, 300, null, null],
+        [0, "스투코프 주니어", null, 0, null, 81, 56, 72, 0, 160, 300, null, null, "ued 2차원정대로 우린 아몬과의 결전에 참가할거야."],
+        [0, "레비나 스투코프", null, 0, null, 66, 31, 90, 0, 160, 300, null, null, "근데 우리 병사로 괜찮을까 오빠"],
+        [0, "제라툴", null, 0, null, 85, 90, 82, 0, 160, 300, null, null, "젤나가 맙소사! 누가 이런 끔찍한 혼종을 만들었단 말인가"],
+        [0, "테사다르", "`", 0, null, 82, 77, 86, 0, 160, 300, null, null, "난 죽음을 경험한 적이 없네"],
+        [0, "피닉스", null, 0, null, 79, 80, 65, 0, 160, 300, null, null],
+        [0, "알다리스", null, 0, null, 80, 51, 77, 0, 160, 300, null, null],
+        [0, "탈란다르", null, 0, null, 84, 66, 80, 0, 160, 300, null, null],
+        [0, "아르타니스", null, 0, null, 80, 71, 84, 0, 160, 300, null, null, "모조리 용기병으로 만들어주마!"],
+        [0, "라자갈", null, 0, null, 90, 75, 89, 0, 160, 300, null, null],
+        [0, "우룬 제독", null, 0, null, 84, 80, 55, 0, 160, 300, null, null],
+        [0, "셀렌디스", null, 0, null, 80, 80, 67, 0, 160, 300, null, null],
+        [0, "보라준", null, 0, null, 87, 51, 91, 0, 160, 300, null, null],
+        [0, "알라리크", null, 0, null, 89, 92, 87, 0, 160, 300, null, null],
+        [0, "말라쉬", null, 0, null, 80, 96, 65, 0, 160, 300, null, null],
+        [0, "니온", null, 0, null, 62, 73, 43, 0, 160, 300, null, null],
+        [0, "지나라", null, 0, null, 75, 90, 55, 0, 160, 300, null, null],
+        [0, "아리샤", null, 0, null, 51, 81, 50, 0, 160, 300, null, null, "난 XX부르드의 울트라 대표 아리샤다!"],
+        [0, "아몬", null, 0, null, 97, 107, 85, 0, 160, 300, null, null, "나는 너희들의 시작이었으니 또한 끝이리라….!"],
+        [0, "에밀 나루드", null, 0, null, 85, 92, 96, 0, 160, 300, null, null, "아몬께서 별빛으로 속삭이셨다. 그분은 돌아오신다고 하셨다. 그분은 파괴한다고 하셨다. 멸종. 모든 것이 종말을 맞이할 것이라고"],
+        [0, "오로스", null, 0, null, 80, 79, 55, 0, 160, 300, null, null],
+        [0, "도로시 멩스크", null, 0, null, 52, 74, 81, 0, 160, 300, null, null],
+        [0, "유다미", null, 0, null, 40, 78, 3, 0, 160, 300, null, null],
+        [0, "유지혜", null, 0, null, 77, 64, 80, 0, 160, 300, null, null, "언니를 이번에야 말로 지킬거야… 그럴려고 마법소녀가 된걸!"],
+        [0, "유하준", null, 0, null, 78, 70, 70, 0, 160, 300, null, null],
+        [0, "유당찬", null, 0, null, 83, 69, 55, 0, 160, 300, null, null],
+        [0, "유시하", "`", 0, null, 67, 55, 81, 0, 160, 300, null, null],
+        [0, "유미하", null, 0, null, 41, 34, 48, 0, 160, 300, null, null],
+        [0, "유지은", null, 0, null, 55, 78, 64, 0, 160, 300, null, null],
+        [0, "유혜선", null, 0, null, 78, 89, 55, 0, 160, 300, null, null],
+        [0, "최정윤", null, 0, null, 85, 71, 66, 0, 160, 300, null, null, "우리는 다미키즈, 다미의 친구들이자 다미에 의해 도움을 받은 아이들"],
+        [0, "이선아", null, 0, null, 83, 88, 56, 0, 160, 300, null, null, "나는 마콧치, 마법나라 감사부문의 부부장이야."],
+        [0, "나서희", null, 0, null, 81, 77, 44, 0, 160, 300, null, null, "다미를 지킬거야"],
+        [0, "스노우 화이트", null, 0, null, 71, 80, 66, 0, 160, 300, null, null, "이번에야 말로 친구들을 지켜 보이겠어. 소타도, 아카리도"],
+        [0, "워터 스플렛", null, 0, null, 65, 80, 52, 0, 160, 300, null, null, "이번생에는 그런 셔플린 따위에게 지지 않을거야,"],
+        [0, "스노우 슬러스", null, 0, null, 69, 75, 53, 0, 160, 300, null, null, "저번생이랑 달라! 나도 강해졋다고!"],
+        [0, "리하나", null, 0, null, 79, 70, 65, 0, 160, 300, null, null, "프흐레 언니…"],
+        [0, "블루베리", null, 0, null, 81, 88, 73, 0, 160, 300, null, null],
+        [0, "스윔스윔", null, 0, null, 54, 90, 71, 0, 163, 300, null, null, "룰러가 그랫어 마법소녀는 본모습을 남에게 보여주면 안된다고"],
+        [0, "이선화", null, 0, null, 66, 55, 79, 0, 160, 300, null, null, "다미는 우리의 소중한 친구"],
+        [0, "정혜림", null, 0, null, 91, 88, 80, 0, 160, 300, null, null, "우리 다미키즈는 다미언니에 의해 많은걸 받은 아이들이야,"],
+        [0, "하나조노 아무", null, 0, null, 67, 53, 81, 0, 160, 300, null, null, "캐릭터 변신! 애뮬릿 다이아!"],
+        [0, "하나조노 카렌", null, 0, null, 66, 51, 80, 0, 160, 300, null, null, "나는 하나조노 카렌, 전 이름은 하나무라 카렌이야."],
+        [0, "하나조노 아리스", null, 0, null, 53, 14, 61, 0, 160, 300, null, null],
+        [0, "린", null, 0, null, 38, 32, 69, 0, 160, 300, null, null, "난 용담꽃의 페어리루 린이야~"],
+        [0, "하나조노 마츠아", null, 0, null, 44, 40, 55, 0, 160, 300, null, null],
+        [0, "롭프", null, 0, null, 55, 47, 50, 0, 160, 300, null, null],
+        [0, "이정선 황제", null, 0, null, 74, 44, 85, 0, 160, 300, null, null, "감히 우리 제국에 반기를 든자들! 용서하지 않는다! Tog!"],
+        [0, "이양선 대공", null, 0, null, 77, 42, 79, 0, 160, 300, null, null, "형님이 저리 화를 내시다니 내심 대단하구나 그들은"],
+        [0, "이을용 황태자", null, 0, null, 51, 33, 69, 0, 160, 300, null, null],
+        [0, "카라시프 장군", null, 0, null, 75, 69, 71, 0, 160, 300, null, null],
+        [0, "카몬 요네미", null, 0, null, 40, 8, 66, 0, 160, 300, null, null],
+        [0, "키타노 타케시", null, 0, null, 43, 14, 75, 0, 160, 300, null, null, "우리가족의 행복과 안전을 우선시해야지"],
+        [0, "키타노 유리아", null, 0, null, 32, 8, 69, 0, 160, 300, null, null],
+        [0, "후타바 안즈", null, 0, null, 67, 44, 90, 0, 160, 300, null, null, "나도 하메르도 행복하길"],
+        [0, "하메르", null, 0, null, 66, 32, 73, 0, 160, 300, null, null, "이번생에는 행복하고 싶어"],
+        [0, "나츠세 유우", null, 0, null, 66, 30, 70, 0, 160, 300, null, null],
+        [0, "크로노스 신", null, 0, null, 50, 15, 90, 0, 160, 300, null, null],
+        [0, "프흐레", null, 0, null, 69, 24, 100, 0, 160, 300, null, null, "마법나라가 바라는 마법소녀란 말이지…"],
+        [999, "나나하라 슈야", null, 0, null, 73, 72, 62, 0, 160, 300, null, null, "전세계의 어른들에게 선전포고 한다!"],
+        [0, "타에구치유이치로", null, 0, null, 51, 63, 44, 0, 160, 300, null, null],
+        [0, "카와다 소교", null, 0, null, 49, 70, 85, 0, 160, 300, null, null],
+        [0, "카에리 유카리", null, 0, null, 41, 31, 53, 0, 160, 300, null, null],
+        [0, "사에구치 미나", null, 0, null, 44, 55, 36, 0, 160, 300, null, null],
+        [0, "큐어 카루티", null, 0, null, 62, 81, 55, 0, 160, 300, null, null],
+        [0, "큐어 리프렛", null, 0, null, 71, 89, 72, 0, 160, 300, null, null],
+        [0, "큐어 실프", null, 0, null, 83, 92, 88, 0, 160, 300, null, null],
+        [0, "큐어 아네모스", null, 0, null, 69, 80, 55, 0, 160, 300, null, null],
+        [0, "카마디야", null, 0, null, 85, 93, 55, 0, 160, 300, null, null, "크흐흐… 감히 인간 따위가!! 나에게 덤비다니 용서못한다!!"],
+        [0, "토토리몬", null, 0, null, 69, 88, 44, 0, 160, 300, null, null, "모든것은 카마디야님의 부활을 위해서…."],
+        [0, "카와리노", null, 0, null, 73, 91, 80, 0, 160, 300, null, null, "나를 그곳에 꺼내주신 카마디야 님을 위해 난 일한다!"],
+        [0, "가마오", null, 0, null, 41, 65, 13, 0, 160, 300, null, null, "이씨 너무 배고파…"],
+        [0, "밀키 로즈", null, 0, null, 64, 82, 52, 0, 160, 300, null, null],
+        [0, "옐로우 미치", null, 0, null, 61, 80, 80, 0, 160, 300, null, null, "난 마법나라 외교부문의 부문장 옐로우 미치야"],
+        [0, "마왕팜", null, 0, null, 50, 90, 70, 0, 160, 300, null, null, "무지개? 어째서…!"],
+        [0, "그림하트", null, 0, null, 74, 63, 41, 0, 160, 300, null, null, "목을 쳐라!!"],
+        [0, "루다", null, 0, null, 62, 66, 62, 0, 160, 300, null, null],
+        [0, "아이카와 준", null, 0, null, 90, 88, 65, 0, 160, 300, null, null],
+        [0, "아이카와 린", null, 0, null, 74, 12, 85, 0, 160, 300, null, null],
+        [0, "타카이시 히야미", null, 0, null, 86, 75, 77, 0, 161, 300, "대의", "인덕", "이나라를 안정시키려는데 힘이 부족해…"],
+        [0, "타카이시 카린", null, 0, null, 41, 14, 79, 0, 160, 300, "재간", null, "우리딸이 행복해야 할텐데…."],
+        [0, "타카이시 에이린", null, 0, null, 75, 51, 92, 0, 160, 300, null, null],
+        [0, "정군호", null, 0, null, 94, 65, 88, 0, 160, 300, null, null, "우리 제국의 대장군으로써, 이나라를 수호한다!"],
+        [0, "슈리", null, 0, null, 81, 34, 100, 0, 160, 300, null, "신산", "하와와"],
+        [0, "미나미", null, 0, null, 85, 56, 98, 0, 160, 300, null, "귀모"],
+        [0, "린린", null, 0, null, 92, 99, 44, 0, 160, 300, null, "무쌍", "~거다"],
+        [0, "아이샤", null, 0, null, 96, 98, 71, 0, 160, 300, null, "위압"],
+        [0, "모토미야 미야코", null, 0, null, 71, 64, 77, 0, 160, 300, null, null],
+        [0, "모토미야 메이", null, 0, null, 81, 55, 80, 0, 160, 300, null, null],
+        [0, "모토미야 유지", null, 0, null, 86, 31, 88, 0, 160, 300, null, "상재", "허허…. 이나라가 어찌되련지…"],
+        [0, "타카이시 나츠히코", null, 0, null, 51, 33, 67, 0, 160, 300, null, null],
+        [0, "유해", null, 0, null, 85, 87, 64, 0, 160, 300, null, null],
+        [0, "유채", null, 0, null, 64, 71, 23, 0, 160, 300, null, null],
+        [0, "유창", null, 0, null, 59, 68, 33, 0, 160, 300, null, null],
+        [0, "타카이시 타케루", null, 0, null, 80, 92, 65, 0, 160, 300, null, "무쌍"],
+        [0, "타카이시 히카리", null, 0, null, 31, 11, 90, 0, 160, 300, null, "인덕"],
+        [0, "타카이시 노조미", null, 0, null, 82, 66, 81, 0, 160, 300, null, null],
+        [0, "타카이시 미츠루", null, 0, null, 85, 51, 71, 0, 160, 300, null, null, "이 나라가 왜이리 망가져 버린걸까"],
+        [0, "유상", null, 0, null, 66, 77, 51, 0, 160, 300, null, null],
+        [0, "유상호", null, 0, null, 39, 56, 44, 0, 160, 300, null, null, "쯧. 저런애가 내 딸이라니 수치야"],
+        [0, "서유현", null, 0, null, 42, 44, 60, 0, 160, 300, null, null, "하… 내가 교육을 잘못했구나"],
+        [0, "오준", null, 0, null, 69, 12, 84, 0, 160, 300, null, null, "이 지역은 이제부터 내것이다!"],
+        [10, "도니 버밀리언", null, 0, null, 48, 14, 66, 0, 160, 300, null, null],
+        [0, "모한다르", null, 0, null, 68, 81, 45, 0, 160, 300, null, null],
+        [0, "월리엄 와이트", null, 0, null, 55, 64, 88, 0, 160, 300, null, null, "아니 나를 별명으로 부르지 말라고!"],
+        [0, "도미니크 헥터", null, 0, null, 57, 69, 41, 0, 160, 300, null, null],
+        [0, "리만 베리오스", null, 0, null, 55, 69, 40, 0, 160, 300, null, null],
+        [1, "고야 나카타", null, 0, null, 73, 55, 77, 0, 160, 300, null, null, "유키코, 난 너를 언제나 사랑할거야"],
+        [1, "니시나 묘토", null, 0, null, 63, 67, 44, 0, 160, 300, null, null, "에휴 유키코를 지키는데 이유는 없지만 말이지"],
+        [0, "오오시 마카코", null, 0, null, 55, 73, 55, 0, 160, 300, null, null, "젠장…! 유키코 놈들 절대로 가만두지 않을거다!"],
+        [0, "스즈이 이로키", null, 0, null, 63, 59, 37, 0, 160, 300, null, null, "우리는 고사모! 유키코와 동료들을 증오하는 클래스 메이트!"],
+        [0, "스즈키 이로이", null, 0, null, 59, 64, 44, 0, 160, 300, null, null, "유키노는 증오의 철퇴를 마주보아라!"],
+        [0, "히라구시 토노", null, 0, null, 51, 58, 59, 0, 160, 300, null, null],
+        [0, "미타키 신고", null, 0, null, 68, 77, 64, 0, 160, 300, null, null],
+        [0, "섀도 게일", null, 0, null, 57, 69, 62, 0, 160, 300, null, null],
+        [0, "사야코", null, 0, null, 69, 75, 60, 0, 160, 300, null, null],
+        [0, "미요가타노 나코", null, 0, null, 77, 55, 79, 0, 160, 300, null, null, "fucking doll!"],
+        [0, "첼너 마우스", null, 0, null, 51, 85, 2, 0, 160, 300, null, null, "체르나는 그런거 싫단 말이야! 내꺼라고!"],
+        [0, "페치카", null, 0, null, 68, 8, 80, 0, 160, 300, null, null]
    ],
    "general_ex":[

    ],
-    "events": [
+    "initialEvents": [
        [
-            "month",
-            1000,
            true,
            [
                "ChangeCity",
@@ -957,6 +316,128 @@
                    "trade": 100
                }
            ]
+        ]
+    ],
+    "events": [
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                180,
+                1
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                180,
+                7
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                181,
+                1
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                181,
+                7
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                182,
+                1
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                182,
+                7
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
        ],
        [
            "destroy_nation",
@@ -0,0 +1,110 @@
+{
+    "title":"【공백지】 이벤트 클래식",
+    "startYear":180,
+    "history": [
+        "<C>●</>180년 1월:<L><b>【공백지】</b></>예전 지도에서 장비를 많이 가지고 즐겨보는 이벤트 깃수"
+    ],
+    "const": {
+        "joinRuinedNPCProp":0,
+        "npcBanMessageProb":1,
+        "uniqueTrialCoef": 2,
+        "maxUniqueTrialProb": 0.5,
+        "defaultMaxGenius": 9999,
+        "defaultMaxGeneral": 700,
+        "allItems": {
+            "horse" : {
+                "che_명마_01_노기" : 0, "che_명마_02_조랑" : 0, "che_명마_03_노새" : 0,
+                "che_명마_04_나귀" : 0, "che_명마_05_갈색마" : 0, "che_명마_06_흑색마" : 0,
+
+                "che_명마_07_백마" : 8, "che_명마_07_기주마" : 8, "che_명마_07_오환마" : 8, "che_명마_07_백상" : 8,
+                "che_명마_08_양주마" : 8, "che_명마_08_흉노마" : 8, "che_명마_09_과하마" : 8, "che_명마_09_의남백마" : 8,
+                "che_명마_10_대완마" : 8, "che_명마_10_옥추마" : 8, "che_명마_11_서량마" : 8, "che_명마_11_화종마" : 8,
+                "che_명마_12_사륜거" : 8, "che_명마_12_옥란백용구": 8, "che_명마_13_절영" : 8, "che_명마_13_적로" : 8,
+                "che_명마_14_적란마" : 8, "che_명마_14_조황비전" : 8, "che_명마_15_한혈마" : 8, "che_명마_15_적토마" : 8
+            },
+            "weapon" : {
+                "che_무기_01_단도" : 0, "che_무기_02_단궁" : 0, "che_무기_03_단극" : 0,
+                "che_무기_04_목검" : 0, "che_무기_05_죽창" : 0, "che_무기_06_소부" : 0,
+
+                "che_무기_07_동추" : 8, "che_무기_07_철편" : 8, "che_무기_07_철쇄" : 8, "che_무기_07_맥궁" : 8,
+                "che_무기_08_유성추" : 8, "che_무기_08_철질여골" : 8, "che_무기_09_쌍철극" : 8, "che_무기_09_동호비궁" : 8,
+                "che_무기_10_삼첨도" : 8, "che_무기_10_대부" : 8, "che_무기_11_고정도" : 8, "che_무기_11_이광궁" : 8,
+                "che_무기_12_철척사모" : 8, "che_무기_12_칠성검" : 8, "che_무기_13_사모" : 8, "che_무기_13_양유기궁" : 8,
+                "che_무기_14_언월도" : 8, "che_무기_14_방천화극" : 8, "che_무기_15_청홍검" : 8, "che_무기_15_의천검" : 8
+            },
+            "book" : {
+                "che_서적_01_효경전" : 0, "che_서적_02_회남자" : 0, "che_서적_03_변도론" : 0,
+                "che_서적_04_건상역주" : 0, "che_서적_05_여씨춘추" : 0, "che_서적_06_사민월령" : 0,
+
+                "che_서적_07_위료자" : 8, "che_서적_07_사마법" : 8, "che_서적_07_한서" : 8, "che_서적_07_논어" : 8,
+                "che_서적_08_전론" : 8, "che_서적_08_사기" : 8, "che_서적_09_장자" : 8, "che_서적_09_역경" : 8,
+                "che_서적_10_시경" : 8, "che_서적_10_구국론" : 8, "che_서적_11_상군서" : 8, "che_서적_11_춘추전" : 8,
+                "che_서적_12_산해경" : 8, "che_서적_12_맹덕신서" : 8, "che_서적_13_관자" : 8, "che_서적_13_병법24편" : 8,
+                "che_서적_14_한비자" : 8, "che_서적_14_오자병법" : 8, "che_서적_15_노자" : 8, "che_서적_15_손자병법" : 8
+            },
+            "item" : {
+                "che_치료_환약" : 0, "che_저격_수극" : 0, "che_사기_탁주" : 0,
+                "che_훈련_청주" : 0, "che_계략_이추" : 0, "che_계략_향낭" : 0,
+
+                "che_의술_정력견혈산" : 4, "che_의술_청낭서" : 4, "che_의술_태평청령" : 4, "che_의술_상한잡병론" : 4,
+                "che_보물_도기" : 4, "che_조달_주판" : 4,
+                "che_내정_납금박산로" : 4, "che_전략_평만지장도" : 4, "che_숙련_동작" : 4, "che_명성_구석" : 4,
+
+                "che_척사_오악진형도" : 4, "che_격노_구정신단경" : 4, "che_징병_낙주" : 4,
+                "che_저격_매화수전" : 4, "che_저격_비도":4, "che_위압_조목삭" : 4, "che_공성_묵자" : 4,
+                "che_집중_전국책" : 4, "che_환술_논어집해" : 4,
+
+                "che_진압_박혁론" : 4, "che_부적_태현청생부" : 4, "che_저지_삼황내문" : 4,
+                "che_행동_서촉지형도" : 4, "che_간파_노군입산부" : 4, "che_불굴_상편" : 4,
+                "che_약탈_옥벽" : 4,
+
+                "che_농성_주서음부" : 4, "che_농성_위공자병법" : 4,
+                "che_계략_육도" : 4, "che_계략_삼략" : 4,
+
+                "che_상성보정_과실주" : 4,
+                "che_능력치_지력_이강주" : 4, "che_능력치_무력_두강주" : 4, "che_능력치_통솔_보령압주" : 4,
+                "che_훈련_철벽서" : 4, "che_훈련_단결도" : 4, "che_사기_춘화첩" : 4, "che_사기_초선화" : 4,
+                "che_회피_태평요술" : 4, "che_필살_둔갑천서" : 4
+            }
+        }
+    },
+    "events":[
+        [
+            "month", 1000,
+            ["or", ["Date", "==", null, 12], ["Date", "==", null, 6]],
+            ["CreateManyNPC", 10, 10],
+            ["DeleteEvent"]
+        ],
+        [
+            "month", 1000,
+            ["Date", "==", 181, 1],
+            ["RaiseNPCNation"],
+            ["DeleteEvent"]
+        ],
+        [
+            "month", 999,
+            ["Date", "==", 181, 1],
+            ["OpenNationBetting", 4, 5000],
+            ["OpenNationBetting", 1, 2000],
+            ["DeleteEvent"]
+        ],
+        [
+            "month", 999,
+            ["and",
+                ["Date", ">=", 183, 1],
+                ["RemainNation", "<=", 8]
+            ],
+            ["OpenNationBetting", 1, 1000],
+            ["DeleteEvent"]
+        ],
+        [
+            "destroy_nation", 1000,
+            ["and",
+                ["Date", ">=", 183, 1],
+                ["RemainNation", "==", 1]
+            ],
+            ["BlockScoutAction"],
+            ["DeleteEvent"]
+        ]
+    ]
+}
@@ -1,25 +1,17 @@
 <template>
  <TopBackBar :title="title" />
-  <div
-    id="container"
-    class="bg0 px-2"
-    style="max-width: 1000px; margin: auto; border: solid 1px #888888; overflow: hidden"
-  >
+  <div id="container" class="bg0 px-2"
+    style="max-width: 1000px; margin: auto; border: solid 1px #888888; overflow: hidden">
    <div id="inheritance_list" class="row">
      <template v-for="(text, key) in inheritanceViewText" :key="key">
        <div :id="`inherit_${key}`" class="col col-sm-4 col-12 inherit_item inherit_template_item">
          <div class="row">
            <label :id="`inherit_${key}_head`" class="inherit_head col col-lg-6 col-sm-7 col-6 col-form-label">{{
-              text.title
-            }}</label>
+    text.title
+  }}</label>
            <div class="col col-lg-6 col-sm-5 col-6">
-              <input
-                :id="`inherit_${key}_value`"
-                type="text"
-                class="form-control inherit_value f_tnum"
-                readonly
-                :value="Math.floor(items[key]).toLocaleString()"
-              />
+              <input :id="`inherit_${key}_value`" type="text" class="form-control inherit_value f_tnum" readonly
+                :value="Math.floor(items[key]).toLocaleString()" />
            </div>
          </div>

@@ -53,13 +45,9 @@
            </div>
          </div>
          <div class="a-right">
-            <small class="form-text text-muted"
-              ><!-- eslint-disable-next-line vue/no-v-html -->
+            <small class="form-text text-muted"><!-- eslint-disable-next-line vue/no-v-html -->
              <span style="color: white" v-html="availableSpecialWar[nextSpecialWar].info" /><br />다음에 얻을 전투
-              특기를 정합니다.<br /><span style="color: white"
-                >필요 포인트: {{ inheritActionCost.nextSpecial }}</span
-              ></small
-            >
+              특기를 정합니다.<br /><span style="color: white">필요 포인트: {{ inheritActionCost.nextSpecial }}</span></small>
          </div>
          <div class="row px-4">
            <BButton class="col-6 offset-6" variant="primary" @click="setNextSpecialWar"> 구입 </BButton>
@@ -79,17 +67,12 @@
          </div>
          <div class="row px-4">
            <div class="col f_tnum">
-              <NumberInputWithInfo
-                v-model="specificUniqueAmount"
-                title="입찰 포인트"
-                :min="inheritActionCost.minSpecificUnique"
-                :max="items.previous"
-              />
+              <NumberInputWithInfo v-model="specificUniqueAmount" title="입찰 포인트"
+                :min="inheritActionCost.minSpecificUnique" :max="items.previous" />
            </div>
          </div>
          <div class="a-right">
-            <small class="form-text text-muted"
-              >얻고자 하는 유니크 아이템으로 경매를 시작합니다. 24턴 동안 진행됩니다.<br />
+            <small class="form-text text-muted">얻고자 하는 유니크 아이템으로 경매를 시작합니다. 24턴 동안 진행됩니다.<br />
              <!-- eslint-disable-next-line vue/no-v-html -->
              <span style="color: white" v-html="specificUnique == null ? '' : availableUnique[specificUnique].info" />
            </small>
@@ -110,11 +93,8 @@
            <BButton class="col-6" variant="primary" @click="tryResestTurnTime()"> 구입 </BButton>
          </div>
          <div class="a-right">
-            <small class="form-text text-muted"
-              >다다음턴부터 시간이 랜덤하게 바뀝니다. (필요 포인트가 피보나치식으로 증가합니다)<br /><span style="color: white"
-                >필요 포인트: {{ inheritActionCost.resetTurnTime }}</span
-              ></small
-            >
+            <small class="form-text text-muted">다다음턴부터 시간이 랜덤하게 바뀝니다. (필요 포인트가 피보나치식으로 증가합니다)<br /><span
+                style="color: white">필요 포인트: {{ inheritActionCost.resetTurnTime }}</span></small>
          </div>
        </div>
        <div class="col col-lg-4 col-sm-6 col-12 py-2">
@@ -123,11 +103,8 @@
            <BButton class="col-6" variant="primary" @click="buySimple('BuyRandomUnique')"> 구입 </BButton>
          </div>
          <div class="a-right">
-            <small class="form-text text-muted"
-              >다음 턴에 랜덤 유니크를 얻습니다.<br /><span style="color: white"
-                >필요 포인트: {{ inheritActionCost.randomUnique }}</span
-              ></small
-            >
+            <small class="form-text text-muted">다음 턴에 랜덤 유니크를 얻습니다.<br /><span style="color: white">필요 포인트: {{
+    inheritActionCost.randomUnique }}</span></small>
          </div>
        </div>
        <div class="col col-lg-4 col-sm-6 col-12 py-2">
@@ -136,11 +113,9 @@
            <BButton class="col-6" variant="primary" @click="buySimple('ResetSpecialWar')"> 구입 </BButton>
          </div>
          <div class="a-right">
-            <small class="form-text text-muted"
-              >즉시 전투 특기를 초기화합니다. (필요 포인트가 피보나치식으로 증가합니다)<br /><span style="color: white"
-                >필요 포인트: {{ inheritActionCost.resetSpecialWar }}</span
-              ></small
-            >
+            <small class="form-text text-muted">즉시 전투 특기를 초기화합니다. (필요 포인트가 피보나치식으로 증가합니다)<br /><span
+                style="color: white">필요
+                포인트: {{ inheritActionCost.resetSpecialWar }}</span></small>
          </div>
        </div>
      </div>
@@ -153,33 +128,48 @@
        <div class="row">
          <label class="col col-sm-6 col-form-label" :for="`buff-${buffKey}`">{{ info.title }}</label>
          <div class="col col-sm-6 f_tnum">
-            <b-form-input
-              :id="`buff-${buffKey}`"
-              v-model.number="inheritBuff[buffKey]"
-              type="number"
-              :min="prevInheritBuff[buffKey] ?? 0"
-              :max="maxInheritBuff"
-            />
+            <b-form-input :id="`buff-${buffKey}`" v-model.number="inheritBuff[buffKey]" type="number"
+              :min="prevInheritBuff[buffKey] ?? 0" :max="maxInheritBuff" />
          </div>
        </div>
        <div style="text-align: right">
-          <small class="form-text text-muted f_tnum"
-            >{{ info.info }}<br /><span style="color: white"
-              >필요 포인트:
+          <small class="form-text text-muted f_tnum">{{ info.info }}<br /><span style="color: white">필요 포인트:
              {{
-                inheritActionCost.buff[inheritBuff[buffKey]] - inheritActionCost.buff[prevInheritBuff[buffKey] ?? 0]
-              }}</span
-            ></small
-          >
+    inheritActionCost.buff[inheritBuff[buffKey]] - inheritActionCost.buff[prevInheritBuff[buffKey] ?? 0]
+  }}</span></small>
        </div>
        <div class="row px-4" style="margin-bottom: 1em">
-          <BButton
-            variant="secondary"
-            class="col col-lg-6 col-4 offset-lg-0 offset-4"
-            @click="inheritBuff[buffKey] = prevInheritBuff[buffKey] ?? 0"
-          >
-            리셋 </BButton
-          ><BButton variant="primary" class="col col-lg-6 col-4" @click="buyInheritBuff(buffKey)"> 구입 </BButton>
+          <BButton variant="secondary" class="col col-lg-6 col-4 offset-lg-0 offset-4"
+            @click="inheritBuff[buffKey] = prevInheritBuff[buffKey] ?? 0">
+            리셋 </BButton>
+          <BButton variant="primary" class="col col-lg-6 col-4" @click="buyInheritBuff(buffKey)"> 구입 </BButton>
+        </div>
+      </div>
+    </div>
+    <div style="width: 100%; padding: 0 10px">
+      <hr :style="{ opacity: 0.5 }" />
+    </div>
+    <div class="row">
+      <div class="col col-lg-4 col-sm-6 col-12 py-2">
+        <div class="row px-4">
+          <div class="a-right col-6 align-self-center">장수 소유자 확인</div>
+          <div class="col-6">
+            <select v-model="targetOwner" class="form-select col-6">
+              <option disabled selected :value="null">장수 선택</option>
+              <option v-for="(name, key) in availableTargetGeneral" :key="key" :value="key">
+                {{ name }}
+              </option>
+            </select>
+          </div>
+        </div>
+        <div class="a-right">
+          <small class="form-text text-muted">장수의 소유자를 찾습니다.<br />
+          </small>
+          <span style="color: white">필요 포인트: {{ inheritActionCost.checkOwner }}</span>
+        </div>
+
+        <div class="row px-4">
+          <BButton class="col-6 offset-6" variant="primary" @click="checkOwner"> 소유자 찾기 </BButton>
        </div>
      </div>
    </div>
@@ -196,7 +186,9 @@
        {{ log.text }}
      </div>
    </div>
-    <div class="d-grid"><BButton @click="getMoreLog()">더 가져오기</BButton></div>
+    <div class="d-grid">
+      <BButton @click="getMoreLog()">더 가져오기</BButton>
+    </div>
  </div>
 </template>

@@ -231,6 +223,7 @@ declare const staticValues: {
    randomUnique: number;
    nextSpecial: number;
    minSpecificUnique: number;
+    checkOwner: number;
  };
  resetTurnTimeLevel: number;
  resetSpecialWarLevel: number;
@@ -252,6 +245,7 @@ declare const staticValues: {
      info: string;
    }
  >;
+  availableTargetGeneral: Record<number, string>;
 };
 </script>
 <script lang="ts" setup>
@@ -394,6 +388,7 @@ const {
  currentInheritBuff: prevInheritBuff,
  availableSpecialWar,
  availableUnique,
+  availableTargetGeneral,
 } = staticValues;

 const nextSpecialWar = ref(Object.keys(availableSpecialWar)[0]);
@@ -450,7 +445,7 @@ async function buyInheritBuff(buffKey: inheritBuffType) {
  location.reload();
 }

-async function tryResestTurnTime(){
+async function tryResestTurnTime() {
  const cost = inheritActionCost.resetTurnTime;

  if (items.value.previous < cost) {
@@ -586,16 +581,43 @@ async function openUniqueItemAuction() {
  location.reload();
 }

-async function getMoreLog(): Promise<void>{
-  try{
+const targetOwner = ref<string | null>(null);
+
+async function checkOwner(): Promise<void> {
+  if (targetOwner.value === null) {
+    alert("장수를 선택해주세요.");
+    return;
+  }
+
+  const targetName = availableTargetGeneral[parseInt(targetOwner.value)];
+
+  if (!confirm(`${targetName}의 소유자를 찾겠습니까? 대상에게도 알림이 전송됩니다.`)) {
+    return;
+  }
+
+  try {
+    const result = await SammoAPI.InheritAction.CheckOwner({
+      destGeneralID: parseInt(targetOwner.value)
+    });
+    alert('결과가 개인 메시지로 전송되었습니다.');
+  } catch (e) {
+    console.error(e);
+    alert(`실패했습니다: ${e}`);
+    return;
+  }
+
+}
+
+async function getMoreLog(): Promise<void> {
+  try {
    const result = await SammoAPI.InheritAction.GetMoreLog({
      lastID: lastLogID.value
    });
-    for(const log of result.log){
+    for (const log of result.log) {
      inheritPointLogs.value.set(log.id, log);
      lastLogID.value = Math.min(lastLogID.value, log.id);
    }
-  }catch(e){
+  } catch (e) {
    console.error(e);
    alert(`실패했습니다: ${e}`);
    return;
@@ -616,4 +638,4 @@ async function getMoreLog(): Promise<void>{
 .tnum {
  font-feature-settings: "tnum";
 }
-</style>
+</style>
@@ -186,58 +186,45 @@
        </div>

        <div class="col col-lg-6 col-sm-6 col-12 p-2 align-self-center">
-          <div class="a-center">
-            <label> <input v-model="inheritTurnTimeSet" type="checkbox" />턴 시간 고정 </label>
-          </div>
-          <div class="row turn_time_pad">
-            <div class="col col-lg-4 offset-lg-3 col-4 offset-3">
-              <NumberInputWithInfo
-                v-model="inheritTurnTimeMinute"
-                :readonly="!inheritTurnTimeSet"
-                :min="0"
-                :max="turnterm - 1"
-                :right="true"
-                title="분"
-              />
-            </div>
-            <div class="col col-lg-4 col-4">
-              <NumberInputWithInfo
-                v-model="inheritTurnTimeSecond"
-                :readonly="!inheritTurnTimeSet"
-                :min="0"
-                :max="60"
-                :right="true"
-                title="초"
-              />
+          <div class="row">
+            <div class="col col-6 a-right align-self-center">턴 시간 지정</div>
+            <div class="col col-6 align-self-center">
+              <select v-model.number="inheritTurnTimeZone" class="form-select form-inline" style="max-width: 24ch">
+                <option :value="undefined">사용안함</option>
+                <option v-for="(zone, idx) in turnTimeZoneList" :key="idx" :value="idx">
+                    {{ zone }}
+                </option>
+              </select>
            </div>
          </div>
        </div>

-        <div class="col col-lg-6 col-12 p-2">
-          <div class="a-center">추가 능력치 고정</div>
+        <div class="col col-lg-6 col-sm-6 col-12 p-2 align-self-center">
          <div class="row">
+            <div class="col col-6 a-right align-self-center">추가 능력치 고정(통/무/지)</div>
+            <div class="col col-6 align-self-center">
+              <div class="row g-1">
            <div class="col">
              <NumberInputWithInfo
                v-model="(args.inheritBonusStat ?? [0, 0, 0])[0]"
                :max="stats.bonusMax"
-                title="통솔"
              />
            </div>
            <div class="col">
              <NumberInputWithInfo
                v-model="(args.inheritBonusStat ?? [0, 0, 0])[1]"
                :max="stats.bonusMax"
-                title="무력"
              />
            </div>
            <div class="col">
              <NumberInputWithInfo
                v-model="(args.inheritBonusStat ?? [0, 0, 0])[2]"
                :max="stats.bonusMax"
-                title="지력"
              />
            </div>
          </div>
+            </div>
+          </div>
        </div>
      </div>
    </div>
@@ -284,7 +271,7 @@ import TopBackBar from "@/components/TopBackBar.vue";
 import { getIconPath } from "@util/getIconPath";
 import { isBrightColor } from "@util/isBrightColor";
 import { abilityLeadint, abilityLeadpow, abilityPowint, abilityRand } from "@util/generalStats";
-import { shuffle, sum } from "lodash-es";
+import { range, shuffle, sum } from "lodash-es";
 import NumberInputWithInfo from "@/components/NumberInputWithInfo.vue";
 import { SammoAPI } from "./SammoAPI";
 import type { JoinArgs } from "./defs/API/General";
@@ -378,7 +365,7 @@ watch(gameConstStore, (gameConst) => {
    inheritCity: undefined,
    inheritBonusStat: [0, 0, 0],
    inheritSpecial: undefined,
-    inheritTurntime: undefined,
+    inheritTurntimeZone: undefined,
  };
 });

@@ -462,7 +449,7 @@ const inheritRequiredPoint = computed(() => {
  if (args.value.inheritSpecial !== undefined) {
    inheritRequiredPoint += gameConst.inheritBornSpecialPoint;
  }
-  if (args.value.inheritTurntime !== undefined) {
+  if (args.value.inheritTurntimeZone !== undefined) {
    inheritRequiredPoint += gameConst.inheritBornTurntimePoint;
  }
  if (args.value.inheritBonusStat !== undefined && sum(args.value.inheritBonusStat) != 0) {
@@ -494,55 +481,37 @@ watch(inheritCity, (newValue: undefined | number) => {
  args.value.inheritCity = inheritCity.value;
 });

-const inheritTurnTimeSet = ref(false);
-watch(inheritTurnTimeSet, (newValue: boolean) => {
-  if (!args.value) throw "nyc";

-  if (!newValue) {
-    args.value.inheritTurntime = undefined;
-    return;
+const inheritTurnTimeZone = ref<number>();
+const turnTimeZoneList: string[] = (()=>{
+  const result: string[] = [];
+  const zoneSec = turnterm; // * 60 / 60
+  let zoneCur = 0;
+  for(const idx of range(60)){
+    const zoneNext = zoneCur + zoneSec;
+
+    const zoneCurMin = Math.floor(zoneCur / 60);
+    const zoneCurSec = zoneCur % 60;
+    const zoneCurText = `${zoneCurMin.toString().padStart(2, "0")}:${zoneCurSec.toString().padStart(2, "0")}.000`;
+
+    const zoneCurEnd = zoneCur + zoneSec - 1;
+    const zoneCurEndMin = Math.floor(zoneCurEnd / 60);
+    const zoneCurEndSec = zoneCurEnd % 60;
+    const zoneCurEndText = `${zoneCurEndMin.toString().padStart(2, "0")}:${zoneCurEndSec.toString().padStart(2, "0")}.999`;
+
+    // aa:bb.000 ~ cc:dd.999
+    const zoneStr = `${zoneCurText} ~ ${zoneCurEndText}`;
+    result.push(zoneStr);
+    zoneCur = zoneNext;
  }
-  args.value.inheritTurntime = inheritTurnTimeMinute.value * 60 + inheritTurnTimeSecond.value;
+  return result;
+})();
+
+watch(inheritTurnTimeZone, (newValue: undefined | number) => {
+  if (!args.value) throw "nyc";
+  args.value.inheritTurntimeZone = inheritTurnTimeZone.value;
 });

-watch(
-  [inheritCity, inheritTurnTimeSet],
-  ([newInheritCity, newInheritTurnTimeSet], [oldInheritCity, oldInheritTurnTimeSet]) => {
-    if (newInheritCity === undefined || newInheritTurnTimeSet === false) {
-      return;
-    }
-    alert("도시와 턴 시간을 동시에 설정할 수 없습니다.");
-
-    if (newInheritCity !== oldInheritCity) {
-      inheritCity.value = undefined;
-    }
-    if (newInheritTurnTimeSet !== oldInheritTurnTimeSet) {
-      inheritTurnTimeSet.value = false;
-    }
-  },
-  { immediate: true }
-);
-
-const inheritTurnTimeMinute = ref(0);
-watch(inheritTurnTimeMinute, (newValue: number) => {
-  if (!args.value) throw "nyc";
-  if (!inheritTurnTimeSet.value) {
-    args.value.inheritTurntime = undefined;
-    return;
-  }
-  args.value.inheritTurntime = newValue * 60 + inheritTurnTimeSecond.value;
-});
-
-const inheritTurnTimeSecond = ref(0);
-watch(inheritTurnTimeSecond, (newValue: number) => {
-  if (!args.value) throw "nyc";
-
-  if (!inheritTurnTimeSet.value) {
-    args.value.inheritTurntime = undefined;
-    return;
-  }
-  args.value.inheritTurntime = inheritTurnTimeMinute.value * 60 + newValue;
-});
 </script>
 <style lang="scss">
@import "@scss/common/base.scss";
@@ -569,10 +538,6 @@ watch(inheritTurnTimeSecond, (newValue: number) => {
 .col-form-label {
  text-align: right;
 }
-
-.turn_time_pad .col-form-label {
-  text-align: left;
-}
 </style>

 <style lang="scss" scoped>
@@ -179,7 +179,10 @@ const apiRealPath = {
    }>,
    GetMoreLog: GET as APICallT<{
      lastID: number
-    }, InheritLogResponse>
+    }, InheritLogResponse>,
+    CheckOwner: PUT as APICallT<{
+      destGeneralID: number;
+    }>,
  },
  Message: {
    DeleteMessage: PATCH as APICallT<{
@@ -152,7 +152,7 @@ async function refreshDetail() {
    currentAuction.value = await SammoAPI.Auction.GetUniqueItemAuctionDetail({ auctionID });
    const bidList = currentAuction.value.bidList;
    const highestBidAmount = Math.max(bidList[0].amount, bidList[bidList.length-1].amount);
-    bidAmount.value = Math.max(bidAmount.value, Math.ceil(highestBidAmount * 1.01));
+    bidAmount.value = Math.ceil(highestBidAmount * 1.01);
  } catch (e) {
    console.error(e);
    if (isString(e)) {
@@ -6,7 +6,7 @@ export type JoinArgs = {
  pic: boolean;
  character: string;
  inheritSpecial?: string;
-  inheritTurntime?: number;
+  inheritTurntimeZone?: number;
  inheritCity?: number;
  inheritBonusStat?: [number, number, number];
 };
@@ -16,7 +16,10 @@ $gameStor = KVStorage::getStorage($db, 'game_env');

 $me = General::createObjFromDB($generalID);

-
+$availableTargetGeneral = [];
+foreach ($db->query('SELECT no, name FROM general WHERE npc < 2') as $row) {
+    $availableTargetGeneral[$row['no']] = $row['name'];
+}

 $currentInheritBuff = [];
 foreach ($me->getAuxVar('inheritBuff') ?? [] as $buff => $buffLevel) {
@@ -95,10 +98,12 @@ $lastInheritPointLogs = $db->query('SELECT id, server_id, year, month, date, tex
                'randomUnique' => GameConst::$inheritItemRandomPoint,
                'nextSpecial' => GameConst::$inheritSpecificSpecialPoint,
                'minSpecificUnique' => GameConst::$inheritItemUniqueMinPoint,
+                'checkOwner' => GameConst::$inheritCheckOwnerPoint,
            ],
            'availableSpecialWar' => $avilableSpecialWar,
            'availableUnique' => $availableUnique,
            'lastInheritPointLogs' => $lastInheritPointLogs,
+            'availableTargetGeneral' => $availableTargetGeneral,
        ]
    ]) ?>
 </head>
@@ -93,8 +93,8 @@ class APIHelper
                    'ip' => $ip,
                    'date' => $date,
                    'path' => $actionPath,
-                    'arg' => JSON::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    'arg' => Json::encode($filteredArgs),
+                    'aux' => Json::encode([
                        'result' => false,
                        'state' => 'validate',
                        'reason' => $validateResult
@@ -123,8 +123,8 @@ class APIHelper
                    'ip' => $ip,
                    'date' => $date,
                    'path' => $actionPath,
-                    'arg' => JSON::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    'arg' => Json::encode($filteredArgs),
+                    'aux' => Json::encode([
                        'result' => false,
                        'state' => 'launch',
                        'reason' => $result
@@ -139,8 +139,8 @@ class APIHelper
                    'ip' => $ip,
                    'date' => $date,
                    'path' => $actionPath,
-                    'arg' => JSON::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    'arg' => Json::encode($filteredArgs),
+                    'aux' => Json::encode([
                        'result' => false,
                        'state' => 'launch',
                        'reason' => $recoveryType->info(),
@@ -168,8 +168,8 @@ class APIHelper
                            'ip' => $ip,
                            'date' => $date,
                            'path' => $actionPath,
-                            'arg' => JSON::encode($filteredArgs),
-                            'aux' => JSON::encode([
+                            'arg' => Json::encode($filteredArgs),
+                            'aux' => Json::encode([
                                'result' => true,
                                'state' => 'cache_not_modified',
                            ]),
@@ -183,8 +183,8 @@ class APIHelper
                        'ip' => $ip,
                        'date' => $date,
                        'path' => $actionPath,
-                        'arg' => JSON::encode($filteredArgs),
-                        'aux' => JSON::encode([
+                        'arg' => Json::encode($filteredArgs),
+                        'aux' => Json::encode([
                            'result' => true,
                            'state' => 'cache_not_modified',
                        ]),
@@ -199,8 +199,8 @@ class APIHelper
                    'ip' => $ip,
                    'date' => $date,
                    'path' => $actionPath,
-                    'arg' => JSON::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    'arg' => Json::encode($filteredArgs),
+                    'aux' => Json::encode([
                        'result' => true,
                        'state' => 'success_simple',
                        'set_cache' => $setCache,
@@ -216,8 +216,8 @@ class APIHelper
                'ip' => $ip,
                'date' => $date,
                'path' => $actionPath,
-                'arg' => JSON::encode($filteredArgs),
-                'aux' => JSON::encode([
+                'arg' => Json::encode($filteredArgs),
+                'aux' => Json::encode([
                    'result' => true,
                    'state' => 'success_complex',
                    'set_cache' => $setCache,
@@ -225,7 +225,8 @@ class APIHelper
            ]);
            $result['result'] = $result['result'] ?? true;
            Json::die($result, $setCache ? 0 : Json::NO_CACHE);
-        } catch (\Exception $e) {
+        } catch (\MeekroDBException $e) {
+            $session = Session::getInstance();
            $errMsg = $e->getMessage();
            $errTrace = $e->getTraceAsString();
            $logDB->insert('api_log', [
@@ -233,8 +234,27 @@ class APIHelper
                'ip' => $ip,
                'date' => $date,
                'path' => $actionPath,
-                'arg' => JSON::encode($filteredArgs),
-                'aux' => JSON::encode([
+                'arg' => Json::encode($filteredArgs),
+                'aux' => Json::encode([
+                    'result' => false,
+                    'state' => 'error_exception',
+                    'errMsg' => $errMsg,
+                    'errTrace' => $errTrace,
+                ]),
+            ]);
+            logError('MeekroDBException', $errMsg, $actionPath, $e->getTrace());
+            Json::dieWithReason("{$errMsg}\n{$errTrace}");
+        } catch (\Exception $e) {
+            $session = Session::getInstance();
+            $errMsg = $e->getMessage();
+            $errTrace = $e->getTraceAsString();
+            $logDB->insert('api_log', [
+                'user_id' => $session->userID ?? 0,
+                'ip' => $ip,
+                'date' => $date,
+                'path' => $actionPath,
+                'arg' => Json::encode($filteredArgs),
+                'aux' => Json::encode([
                    'result' => false,
                    'state' => 'error_exception',
                    'errMsg' => $errMsg,
@@ -244,6 +264,7 @@ class APIHelper
            Json::dieWithReason("{$errMsg}\n{$errTrace}");
        } catch (\Throwable $e) {
            logExceptionByCustomHandler($e, false);
+            $session = Session::getInstance();
            $errMsg = $e->getMessage();
            $errTrace = $e->getTraceAsString();
            $logDB->insert('api_log', [
@@ -251,8 +272,8 @@ class APIHelper
                'ip' => $ip,
                'date' => $date,
                'path' => $actionPath,
-                'arg' => JSON::encode($filteredArgs),
-                'aux' => JSON::encode([
+                'arg' => Json::encode($filteredArgs),
+                'aux' => Json::encode([
                    'result' => false,
                    'state' => 'error_throwable',
                    'errMsg' => $errMsg,
@@ -261,14 +282,15 @@ class APIHelper
            ]);
            Json::dieWithReason("{$errMsg}\n{$errTrace}");
        } catch (mixed $e) {
+            $session = Session::getInstance();
            $errStr = strval($e);
            $logDB->insert('api_log', [
                'user_id' => $session->userID ?? 0,
                'ip' => $ip,
                'date' => $date,
                'path' => $actionPath,
-                'arg' => JSON::encode($filteredArgs),
-                'aux' => JSON::encode([
+                'arg' => Json::encode($filteredArgs),
+                'aux' => Json::encode([
                    'result' => false,
                    'state' => 'error_mixed',
                    'errMsg' => $errStr,
Author	SHA1	Message	Date
Hide_D	28cea4ee09	fix: 메시지 수정	2024-06-08 18:55:48 +00:00
Hide_D	8e7227c29d	fix: DummyGeneral에 penaltyList	2024-06-08 18:52:47 +00:00
Hide_D	f0cc22d9d8	fix: NoChief 처리 부실	2024-06-08 18:48:46 +00:00
Hide_D	b6f19fa38b	feat: 유산포인트로 장수 소유자 확인	2024-06-08 18:42:39 +00:00
Hide_D	86305087f7	Revert "장수목록에서 장수명에 마우스를 올리면 본닉 공개" This reverts commit `a3d7ef30dd`.	2024-06-08 17:52:13 +00:00
Hide_D	7b6f64db61	fix: 유저장이 수뇌 금지 장수밖에 없을때 NPC 임명 동작	2024-06-08 17:47:35 +00:00
Hide_D	06f086bcf0	fix: penalty 오타	2024-06-08 17:37:43 +00:00
Hide_D	606c1664f2	feat: 내정보에 징계목록 출력	2024-06-08 17:37:33 +00:00
Hide_D	0c07060f4d	feat: 메시지 전송 페널티	2024-06-08 17:22:10 +00:00
Hide_D	8bd0cc1c64	feat: 건국 금지, 지정 임관 금지 패널티	2024-06-08 17:21:55 +00:00
Hide_D	f12262b946	feat: 건국 불가 페널티	2024-06-08 16:16:52 +00:00
Hide_D	9415d79a3a	feat: Constraint 시스템에 NoPaneltyKey 추가	2024-06-08 16:15:19 +00:00
Hide_D	ad223a9c75	feat: NPC 임명로직에 NoChief, NoAmbassador 반영	2024-06-08 16:06:22 +00:00
Hide_D	8737b19e79	fix: 이미 수뇌인 장수는 NPC에게 외교권을 못받는 버그 수정	2024-06-08 15:58:52 +00:00
Hide_D	552d73430c	feat: 유저장의 수뇌 임명 불가 penalty	2024-06-08 15:55:26 +00:00
Hide_D	fba5fbdb6b	feat: PenaltyKey::NoChiefTurnInput	2024-06-08 15:48:01 +00:00
Hide_D	3da11bf21c	feat: 내 정보 설정 저장지 페널티 갱신	2024-06-08 15:41:27 +00:00
Hide_D	c83f9a0465	game: 휴전 -> 종전	2024-06-08 14:43:40 +00:00
Hide_D	9f67ae1f4e	feat: General::penaltyList	2024-06-08 14:38:31 +00:00
Hide_D	383431b79f	feat: PenaltyKey enum	2024-06-08 14:06:12 +00:00
Hide_D	d5c0d16758	game: 저지 작동 방식 변경 - 최대 페이즈를 1 깎는 형태로 변경	2024-06-08 13:24:32 +00:00
Hide_D	c45758b054	game: 이벤트 클래식 유니크 최대 획득 확률 계수 수정	2024-05-22 17:45:45 +00:00
Hide_D	a84f07f3ad	game: 이벤트 클래식 시나리오	2024-05-22 17:43:29 +00:00
Hide_D	3c6ed3441b	fix: MeekroDB 최신버전에서는 $db->get()으로 raw 호출을 먼저 시작해선 안됨	2024-05-22 17:00:27 +00:00
Hide_D	68cd61d86e	fix: file_cache 문제 추가 수정	2024-05-22 16:47:20 +00:00
Hide_D	3470817e9e	Nette FileStorage 요구 주소 문제	2024-05-22 16:45:29 +00:00
sars	a3d7ef30dd	장수목록에서 장수명에 마우스를 올리면 본닉 공개	2024-05-20 19:03:51 -07:00
Hide_D	db09e8da89	composer upgrade	2024-05-17 18:26:08 +00:00
Hide_D	37fa5321cc	초기 설치 코드 정돈, meekrodb 반영	2024-05-17 18:18:37 +00:00
Hide_D	63edb03193	APIHelper에 MeekroDBExceptionr에러시 logError	2024-05-17 18:16:54 +00:00
Hide_D	8d02102024	dep	2024-05-17 18:14:32 +00:00
Hide_D	75a13094e0	game: 해산시 군주외 장수는 즉시 임관 가능	2024-03-16 18:18:35 +00:00
Hide_D	7a4c70ada2	game: 강서유서 소설 월드	2024-03-16 18:07:59 +00:00
Hide_D	65c84a29e1	fix: 방랑군이동시 현재 소재 위치 확인	2024-03-16 18:07:42 +00:00
Hide_D	eea34dadad	fix: 이민족 수도 이동	2024-03-05 16:44:27 +00:00
Hide_D	f1e6ac7b89	fix: 이민족 도시 이동 규칙 재작성 - 무한루프일 수 있으므로 그냥 SQL에 NOT IN을 넣자..	2024-02-29 10:35:32 +09:00
Hide_D	7b24f66f93	fix: 버그 수정	2024-02-29 10:28:10 +09:00
Hide_D	b2b2934ce9	refac: 전체 penalty는 expire와 value - 게임 개시시 expire가 되지 않은 것을 기준 value만 전달 - 즉, 페널티는 깃수 단위 적용	2024-02-29 10:27:04 +09:00
Hide_D	6ed3e673df	game: 내정이라는 용어의 중의성 해소를 위해, 국가 성향의 내정이란 용어를 농상으로 바꾸고, 물자조달 커맨드를 내정의 하위 분류에서 국가로 이동 (#249 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/249	2024-02-29 10:18:00 +09:00
Hide_D	aa7dcab1fd	fix: 이민족 발동 시 수도가 이성이라 수도를 옮겼는데 다시 이성이 되는 경우 해결 (#250 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/250	2024-02-29 10:17:52 +09:00
devsamanddevsam	e2e578e485	game: 내정이라는 용어의 중의성 해소를 위해, 국가 성향의 내정이란 용어를 농상으로 바꾸고, 물자조달 커맨드를 내정의 하위 분류에서 국가로 이동	2024-02-29 08:09:23 +09:00
devsamanddevsam	6cebc903c9	fix: typo	2024-02-29 08:02:11 +09:00
devsamanddevsam	c0190959e3	fix: 이민족 발동 시 수도가 이성이라 수도를 옮겼는데 다시 이성이 되는 경우 해결	2024-02-29 08:01:02 +09:00
Hide_D	bb26366769	fix: 이민족 발동 시 이성이 수도인 경우 문제 해결	2024-02-26 16:05:37 +00:00
Hide_D	71849a457b	game: 종횡가의 전략 디메리트 감소 - 전략 쿨타임 2배 -> 4/3배	2024-02-26 16:01:16 +00:00
Hide_D	7c1a8d96a2	fix: 정규턴에 어긋나는 개인턴, 사령턴을 보정 - 조회시에만 사용	2024-02-26 15:58:41 +00:00
Hide_D	cebd152daf	fix: 경매장 소수점 제거	2024-02-26 15:43:07 +00:00
Hide_D	2ca03389d2	fix: 유니크 경매 항목 변경시 금액이 자동 조절되도록 수정 - 굳이 기존 값을 남길 이유가 없어보임	2024-02-24 15:14:24 +00:00
Hide_D	cacf0981ce	game: 턴 시간과 도시 지정을 같이 가능하도록 변경	2024-02-24 12:05:49 +00:00
Hide_D	bcf5b5cb7d	game: 턴 지정 단위를 1/30에서 1/60으로 변경	2024-02-24 11:46:32 +00:00
Hide_D	66b2f1a8f2	game: NPC는 건국 한턴 기다림	2024-02-24 11:45:08 +00:00
Hide_D	40ecca5440	game, feat: 커맨드마다 다른 랜덤값으로 유니크 시도 - 사전 거병 후 개인 턴일 때, 유니크 중복이 발생하는 경우가 있었음	2024-02-24 11:28:38 +00:00
Hide_D	a96c2312d0	game, feat: 턴 시간 지정 방식을 30단계 중 선택하도록 변경 - 1분서버인 경우 120초 단위로 - 유산포인트 3000 -> 2500	2024-02-24 11:21:04 +00:00
Hide_D	faff3f4e6a	JSON -> Json - 대체 왜 어떤 파일에는 에러가 나지 않았는가	2024-02-20 18:45:40 +09:00
Hide_D	83abf44380	feat: 유저의 제재 목록을 장수 생성/빙의시 가져옴	2024-02-18 03:24:21 +00:00
Hide_D	e83960d67f	fix: 사전거병시 삭턴 정상 반영	2024-02-18 03:10:42 +00:00
Hide_D	c6b2e64c05	penalty에 sendPrivateMsgDelay추가	2024-02-18 03:08:21 +00:00
Hide_D	029f719112	fix: 스탯 계산 시에 캐시 사용하는 부분 수정 시도 (#241 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/241	2024-02-17 00:01:49 +09:00
Hide_D	46f460c8ad	Merge branch 'devel' into stat_cache_fix	2024-02-17 00:01:40 +09:00
Hide_D	af4401d9bb	fix: 사전거병 후 군주가 사라지는 경우에 대한 수정 (#247 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/247	2024-02-17 00:01:34 +09:00
devsamanddevsam	2f00aee947	아주 약간 효율적으로 수정	2024-01-26 22:17:06 +09:00
devsamanddevsam	dd2b032fa3	리뷰 내용 반영	2024-01-26 22:13:44 +09:00
Hide_D	1b858ae36c	fix: onCalcOpposeStat이 제대로 전파되지 않았음	2023-12-30 04:15:33 +00:00
devsamanddevsam	69f4d8e2c7	fix: 사전거병 후 군주가 사라지는 경우에 대한 수정	2023-12-29 12:07:59 +09:00
Hide_D	f24aea0120	fix: 수정된 턴 시간 변경 로직에서 바뀌기 이전 턴을 시드로 계속 사용하는 문제 수정 (#246 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/246 Reviewed-by: Hide_D <hided62@gmail.com>	2023-12-27 17:42:48 +09:00
Jinhyun Kim	f6dc7f49e2	fix: 수정된 턴 시간 변경 로직에서 바뀌기 이전 턴을 시드로 계속 사용하는 문제 수정	2023-12-27 17:25:51 +09:00
포스트모더니즘	c5ed2d47fc	fix: 스탯 계산 시에 캐시 사용하는 부분 수정 시도	2023-10-29 09:05:29 +09:00