Merge branch 'devel' into userName

- 무한루프일 수 있으므로 그냥 SQL에 NOT IN을 넣자..

composer.json

@@ -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"
     },

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "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",
+                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
-                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478",
+                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.0"
+                "php": "^8.1"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^9.0",
+                "phpunit/phpunit": "^10.1",
-                "vimeo/psalm": "5.0.0"
+                "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",
+            "name": "carbonphp/carbon-doctrine-types",
-            "version": "v2.1.8",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/catfan/Medoo.git",
+                "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
-                "reference": "b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4"
+                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/catfan/Medoo/zipball/b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
-                "reference": "b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4",
+                "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",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
-                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+                "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",
+                "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
-                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "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",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
-                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+                "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",
+            "name": "doctrine/deprecations",
-            "version": "2.0.6",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/inflector.git",
+                "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"
+                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
-                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
+                "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",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c",
-                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8",
+                "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",
+                "url": "https://api.github.com/repos/hided62/ldto/zipball/7f0cc568e35120868fe1178e96265c4fa0624820",
-                "reference": "4c05401406f8afc1636a90763c13884f8fff0d14",
+                "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",
+                "url": "https://api.github.com/repos/illuminate/bus/zipball/33993b8f54e91b03fb5000e55693e146e7370763",
-                "reference": "139999f560611623c7da494faa3d8a92f8e22e68",
+                "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",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/f9589f1063a449111dcaa1d68285b507d9483a95",
-                "reference": "f48e6e52860edc9f261f414a85ed2b9b295a324c",
+                "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",
+                "url": "https://api.github.com/repos/illuminate/container/zipball/ddc26273085fad3c471b2602ad820e0097ff7939",
-                "reference": "fed3ee8f7389ad431833935d9ed665bc02ac2cca",
+                "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",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac",
-                "reference": "84f1da424ab9596a422ce118abd05667b0069624",
+                "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",
+                "url": "https://api.github.com/repos/illuminate/database/zipball/eb8edf206d3a6eea8894bc6e21f53469e27dd5c9",
-                "reference": "782940a3092e86c8d022d6d8d168b64fb97933a5",
+                "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",
+                "url": "https://api.github.com/repos/illuminate/events/zipball/a931bfa88edc6ac52c9abbfd7b769343d321d3eb",
-                "reference": "c68138ea57360c19a145e5912fb474cfd1845366",
+                "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",
+                "url": "https://api.github.com/repos/illuminate/macroable/zipball/dff667a46ac37b634dcf68909d9d41e94dc97c27",
-                "reference": "7686fe9dba1e236e6f695a148b551264b9fd479e",
+                "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",
+                "url": "https://api.github.com/repos/illuminate/pipeline/zipball/f802187e917a171332cc90f8c1a102939c57405d",
-                "reference": "549fc7f9b2e6fef0436ca0f68714e1a0e4de8aad",
+                "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",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/ee3a1aaed36d916654ce0ae09dfbd38644a4f582",
-                "reference": "0311d96fb673e9694e1df838abb12f4e4019cdc4",
+                "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",
+                "url": "https://api.github.com/repos/microsoft/tolerant-php-parser/zipball/3eccfd273323aaf69513e2f1c888393f5947804b",
-                "reference": "6a965617cf484355048ac6d2d3de7b6ec93abb16",
+                "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",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83",
-                "reference": "496712849902241f04902033b0441b269effe001",
+                "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/dbal": "^2.0 || ^3.1.4 || ^4.0",
-                "doctrine/orm": "^2.7",
+                "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",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0",
-                "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f",
+                "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",
+                "url": "https://api.github.com/repos/nette/caching/zipball/3053707a892e100e81efb53dc8c294dca5e076d0",
-                "reference": "ceb814d7f0a2bb4eb5afbe908467801001187745",
+                "reference": "3053707a892e100e81efb53dc8c294dca5e076d0",
                 "shasum": ""
             },
             "require": {
-                "nette/finder": "^2.4 || ^3.0",
+                "nette/utils": "^4.0",
-                "nette/utils": "^3.2 || ~4.0.0",
+                "php": "8.0 - 8.3"
-                "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"
+            "time": "2024-03-10T22:07:25+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"
         },
         {
             "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",
+                "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
-                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e",
+                "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-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
-                "ext-xml": "to use Strings::length() etc. when mbstring is not available"
             },
             "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",
+                "url": "https://api.github.com/repos/phan/phan/zipball/86a7acd99c1239b8867b49feca2398851212e7fe",
-                "reference": "fef40178a952bcfcc3f69b76989dd613c3d5c759",
+                "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",
+                "url": "https://api.github.com/repos/php-ds/polyfill/zipball/7b2c5f1843466d50769a0682ce6fa9ddaaa99cb4",
-                "reference": "43d2df301a9e2017f67b8c11d94a5222f9c00fd1",
+                "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",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-system/repository/archive.zip?sha=a80365cc08f43e740f3d1b77505d3242d954555a",
-                "reference": "c269fbf3d358679b229b922b6c5be5dac9bbd1ab",
+                "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",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-tail/repository/archive.zip?sha=4a76745626d8e0359fee3bf87614e2478b3f80c5",
-                "reference": "d932ed124887b0e0691751a4bb197b759707e1d8",
+                "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",
+                "url": "https://gitlab.com/php-extended/polyfill-php80-stringable.git",
-                "reference": "a6199e7ea09ddafaae9c22d6bd297aa4704b6608"
+                "reference": "ea728554a1d83c75ebb7eec69689fdb6c067b5e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fpolyfill-php80-stringable/repository/archive.zip?sha=a6199e7ea09ddafaae9c22d6bd297aa4704b6608",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fpolyfill-php80-stringable/repository/archive.zip?sha=ea728554a1d83c75ebb7eec69689fdb6c067b5e4",
-                "reference": "a6199e7ea09ddafaae9c22d6bd297aa4704b6608",
+                "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",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
+                "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",
+                "mockery/mockery": "~1.3.5",
-                "psalm/phar": "^4.8"
+                "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",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
-                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
+                "reference": "153ae662783729388a584b4361f2545e4d841e3c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0",
+                "doctrine/deprecations": "^1.0",
-                "phpdocumentor/reflection-common": "^2.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",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "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",
+                "url": "https://api.github.com/repos/SergeyTsalkov/meekrodb/zipball/08b683a274365983aaf033cf9c589dcbe5190028",
-                "reference": "e30c240d54bc81f58c58507a9ed768032eb494a5",
+                "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",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c981e0e9380ce9f146416bde3150c79197ce9986",
-                "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
+                "reference": "c981e0e9380ce9f146416bde3150c79197ce9986",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
-                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^5.4|^6.0"
+                "symfony/string": "^6.4|^7.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
+                "symfony/dependency-injection": "<6.4",
-                "symfony/dotenv": "<5.4",
+                "symfony/dotenv": "<6.4",
-                "symfony/event-dispatcher": "<5.4",
+                "symfony/event-dispatcher": "<6.4",
-                "symfony/lock": "<5.4",
+                "symfony/lock": "<6.4",
-                "symfony/process": "<5.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/config": "^6.4|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
-                "symfony/lock": "^5.4|^6.0",
+                "symfony/http-foundation": "^6.4|^7.0",
-                "symfony/process": "^5.4|^6.0",
+                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/var-dumper": "^5.4|^6.0"
+                "symfony/lock": "^6.4|^7.0",
-            },
+                "symfony/messenger": "^6.4|^7.0",
-            "suggest": {
+                "symfony/process": "^6.4|^7.0",
-                "psr/log": "For using the console logger",
+                "symfony/stopwatch": "^6.4|^7.0",
-                "symfony/event-dispatcher": "",
+                "symfony/var-dumper": "^6.4|^7.0"
-                "symfony/lock": "",
-                "symfony/process": ""
             },
             "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",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
-                "reference": "0121954c80fd17c18cf050fe73360e63bb43d4fb",
+                "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",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/c6b3959c418a7c1115c060fab77927ca4bd2546a",
-                "reference": "febdeed9473e568ff34bf4350c04760f5357dfe2",
+                "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",
+                "doctrine/dbal": "^2.13|^3|^4",
-                "predis/predis": "~1.0"
+                "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",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
+                "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",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
-                "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
+                "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",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
-                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+                "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",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "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",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "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",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
-                "reference": "aee5f59db63978f7785290b94d2f12286b1b590a",
+                "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",
+                "url": "https://api.github.com/repos/symfony/string/zipball/e405b5424dc2528e02e31ba26b83a79fd4eb8f63",
-                "reference": "67b8c1eec78296b85dc1c7d9743830160218993d",
+                "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/error-handler": "^6.4|^7.0",
-                "symfony/http-client": "^5.4|^6.0",
+                "symfony/http-client": "^6.4|^7.0",
-                "symfony/intl": "^6.2",
+                "symfony/intl": "^6.4|^7.0",
-                "symfony/translation-contracts": "^2.0|^3.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.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",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/7495687c58bfd88b7883823747b0656d90679123",
-                "reference": "90db1c6138c90527917671cd9ffa9e8b359e3a73",
+                "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/config": "^5.4|^6.0|^7.0",
-                "symfony/console": "^5.4|^6.0",
+                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/finder": "^5.4|^6.0",
+                "symfony/finder": "^5.4|^6.0|^7.0",
-                "symfony/http-client-contracts": "^1.1|^2.0|^3.0",
+                "symfony/http-client-contracts": "^2.5|^3.0",
-                "symfony/http-kernel": "^5.4|^6.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/intl": "^5.4|^6.0",
+                "symfony/intl": "^5.4|^6.0|^7.0",
                 "symfony/polyfill-intl-icu": "^1.21",
-                "symfony/routing": "^5.4|^6.0",
+                "symfony/routing": "^5.4|^6.0|^7.0",
-                "symfony/service-contracts": "^1.1.2|^2|^3",
+                "symfony/service-contracts": "^2.5|^3",
-                "symfony/yaml": "^5.4|^6.0"
+                "symfony/yaml": "^5.4|^6.0|^7.0"
-            },
-            "suggest": {
-                "nikic/php-parser": "To use PhpAstExtractor",
-                "psr/log-implementation": "To use logging capability in translator",
-                "symfony/config": "",
-                "symfony/yaml": ""
             },
             "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",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
-                "reference": "1f40e77fbb12a16d841688f42fecefd8ceb43ed6",
+                "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",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "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",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
-                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+                "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",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
-                "reference": "b9c21a93dd8c8eed79879374884ee733259475cc",
+                "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-pcov": "PHP extension that provides line coverage",
-                "ext-xdebug": "*"
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
-                "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
-                "reference": "9f3d3709577a527025f55bcf0f7ab8052c8bb37d",
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
-                "reference": "c37a88d7a905266eab6498817a1bf1170043313f",
+                "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/exporter": "^5.1",
-                "sebastian/global-state": "^6.0",
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
-                "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae",
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
-                "reference": "72f01e6586e0caf6af81297897bd112eb7e9627c",
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
-                "reference": "e67d240970c9dc7ea7b2123a6d520e334dd61dc6",
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
-                "reference": "70dd1b20bc198da394ad542e988381b44e64e39f",
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
-                "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc",
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
-                "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0",
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
-                "reference": "aab257c712de87b90194febd52e4d184551c2d44",
+                "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",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
-                "reference": "17c4d940ecafb3d15d2cf916f4108f664e28b130",
+                "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",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "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"
 }

f_install/j_install_status.php

@@ -17,18 +17,11 @@ if (!class_exists('\\sammo\\RootDB')) {
 
 $rootDB = RootDB::db();
 
-$rootDB->throw_exception_on_nonsql_error = false;
+$rootDB->addHook('run_failed', function ($params) {
-$rootDB->nonsql_error_handler = function ($params) {
-    Json::die([
-        'step' => 'conn_fail'
-    ]);
-};
-
-$rootDB->error_handler = function ($params) {
     Json::die([
         'step' => 'sql_fail'
     ]);
-};
+});
 
 $memberCnt = $rootDB->queryFirstField('SELECT count(`NO`) from member');
 if ($memberCnt == 0) {

f_install/j_setup_db.php

@@ -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->addHook('run_failed', function ($args) {
-$rootDB->nonsql_error_handler = function ($params) {
     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()이 실행됨.
 

hwe/a_genList.php

@@ -32,10 +32,8 @@ if ($type <= 0 || $type > 15) {
 }
 
 $ownerNameList = [];
-if ($gameStor->isunited) {
+foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
-    foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+    $ownerNameList[$ownerID] = $ownerName;
-        $ownerNameList[$ownerID] = $ownerName;
-    }
 }
 
 ?>
@@ -54,6 +52,15 @@ if ($gameStor->isunited) {
     <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', 'common') ?>
 
+    <style>
+        .hidden {
+            display: none;
+        }
+
+        .generalName:hover > .hidden {
+            display: block;
+        }
+    </style>
 </head>
 
 <body>
@@ -168,7 +175,11 @@ if ($gameStor->isunited) {
         $name = formatName($general['name'], $general['npc']);
 
         if (key_exists($general['owner'], $ownerNameList)) {
-            $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
+            if ($gameStor->isunited) {
+                $name = $name . '<br><small class=\'userName\'>(' . $ownerNameList[$general['owner']] . ')</small>';
+            } else {
+                $name = $name . '<br><small class=\'userName hidden\'>(' . $ownerNameList[$general['owner']] . ')</small>';
+            }
         }
 
         $general['refresh_score_total'] = Util::round($general['refresh_score_total'], -1);
@@ -185,7 +196,7 @@ if ($gameStor->isunited) {
         data-npc-type='{$general['npc']}'
     >
         <td align=center><img class='generalIcon' width='64' height='64' src='{$imageTemp}/{$general['picture']}'></img></td>
-        <td align=center>$name</td>
+        <td align=center class='generalName' onclick=''>$name</td>
         <td align=center>{$general['age']}세</td>
         <td align=center>" . displayCharInfo($general['personal']) . "</td>
         <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>

hwe/func.php

@@ -408,14 +408,14 @@ function checkSecretPermission(array $me, $checkSecretLimit = true)
     }
 
     $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 +1054,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,

hwe/func_command.php

@@ -213,7 +213,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 +233,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);
 }

hwe/func_gamerule.php

@@ -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);
 }

hwe/func_template.php

@@ -148,63 +148,6 @@ function allButton(bool $seizeNPCMode, array $opts = [])
     ], $opts));
 }
 
-
-function commandButton(array $opts = [])
-{
-    $session = Session::getInstance();
-    $userID = Session::getUserID();
-    if (!$session->isGameLoggedIn()) {
-        return '';
-    }
-
-    $db = DB::db();
-    $me = $db->queryFirstRow("select no,nation,officer_level,belong,permission,penalty from general where owner=%i", $userID);
-
-    $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i", $me['nation']) ?? [
-        'nation' => 0,
-        'level' => 0,
-        'secretlimit' => 99,
-        'color' => '#000000'
-    ];
-
-    $bgColor = $nation['color'] ?? '#000000';
-    $fgColor = newColor($bgColor);
-
-    $templates = new \League\Plates\Engine(__DIR__ . '/templates');
-    $showSecret = false;
-    $permission = checkSecretPermission($me);
-    $btnClassForTournament = $opts['btnClass'];
-    if ($opts['isTournamentApplicationOpen']) {
-        if ($btnClassForTournament != 'dropdown-item') {
-            $btnClassForTournament = 'toolbarButton2';
-        }
-    }
-
-    $btnClassForBetting = $opts['btnClass'];
-    if ($opts['isBettingActive']) {
-        if ($btnClassForTournament != 'dropdown-item') {
-            $btnClassForBetting = 'toolbarButton2';
-        }
-    }
-
-    if ($permission >= 1) {
-        $showSecret = true;
-    } else if ($me['officer_level'] == 0) {
-        $showSecret = false;
-    }
-
-    return $templates->render('commandButton', array_merge([
-        'bgColor' => $bgColor,
-        'fgColor' => $fgColor,
-        'meLevel' => $me['officer_level'],
-        'nationLevel' => $nation['level'],
-        'showSecret' => $showSecret,
-        'permission' => $permission,
-        'btnClassForTournament' => $btnClassForTournament,
-        'btnClassForBetting' => $btnClassForBetting,
-    ], $opts));
-}
-
 function formatWounded(int $value, int $wound): string
 {
     if ($wound == 0) {

hwe/j_install_db.php

@@ -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 접속에 실패했습니다.'
     ]);
-}
+});
 
-
+$mysqli_obj = $db->get();
-$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()이 실행됨.
 
 $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();
 

hwe/j_map_recent.php

@@ -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;
 

hwe/j_select_npc.php

@@ -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);
+$member = $rootDB->queryFirstRow('SELECT `name`, `penalty` FROM member WHERE `NO`=%i', $userID);
-if(!$userNick){
+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,

hwe/old_index.php

@@ -285,19 +285,6 @@ if ($lastVoteID) {
                 <div id="general-position"><?php generalInfo($generalObj); ?></div>
                 <div id="generalCommandButton" class="row gx-0">
                     <div class="buttonPlate bg2">
-                        <?= commandButton([
-                            'splitBtnBegin' => '<div class="btn-group">',
-                            'splitBtnEnd' => '</div>',
-                            'splitZoneSign' => '<button type="button" class="btn btn-sammo-nation dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"><span class="visually-hidden">Toggle Dropdown</span></button>',
-                            'splitZoneBegin' => '<ul class="dropdown-menu dropdown-menu-end">',
-                            'splitZoneEnd' => '</ul>',
-                            'splitSubBtnBegin' => '<li>',
-                            'splitSubBtnEnd' => '</li>',
-                            'btnClass' => 'btn btn-sammo-nation',
-                            'btnSplitClass' => 'dropdown-item',
-                            'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
-                            'isBettingActive' => $isBettingActive
-                        ])
                         ?></div>
                 </div>
             </div>
@@ -398,18 +385,6 @@ if ($lastVoteID) {
                             국가 메뉴
                         </div>
                         <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
-                            <?= commandButton([
-                                'btnBegin' => '<li>',
-                                'btnEnd' => '</li>',
-                                'splitMainBegin' => '<div class="d-none">',
-                                'splitMainEnd' => '</div>',
-                                'splitSubBtnBegin' => '<li>',
-                                'splitSubBtnEnd' => '</li>',
-                                'btnClass' => 'dropdown-item',
-                                'btnSplitClass' => 'dropdown-item',
-                                'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
-                                'isBettingActive' => $isBettingActive
-                            ]) ?>
                         </ul>
                     </li>
                     <li class="nav-item dropup">

hwe/process_war.php

@@ -37,12 +37,12 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
 
     $city = new WarUnitCity($rng, $rawDefenderCity, $rawDefenderNation, $year, $month, $startYear);
 
-    $defenderIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0 and crew > 0 and rice>(crew/100) and train>=defence_train and atmos>=defence_train', $city->getVar('nation'), $city->getVar('city'));
+    $defenderCityGeneralIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0', $city->getVar('nation'), $city->getVar('city'));
-    $defenderGeneralList = General::createObjListFromDB($defenderIDList, null);
+    $defenderCityGeneralList = General::createObjListFromDB($defenderCityGeneralIDList, null);
 
     /** @var WarUnit[] */
     $defenderList = [];
-    foreach($defenderGeneralList as $defenderGeneral){
+    foreach($defenderCityGeneralList as $defenderGeneral){
         $defenderGeneral->setRawCity($rawDefenderCity);
         $defenderCandidate = new WarUnitGeneral($rng, $defenderGeneral, $rawDefenderNation, false);
         if(extractBattleOrder($defenderCandidate, $attacker) <= 0){
@@ -186,7 +186,7 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
         'year' => $year,
         'month' => $month,
         'join_mode' => $joinMode,
-    ], $attacker->getGeneral(), $city->getRaw());
+    ], $attacker->getGeneral(), $city->getRaw(), $defenderCityGeneralList);
 }
 
 function extractBattleOrder(WarUnit $defender, WarUnit $attacker)
@@ -529,8 +529,9 @@ function getConquerNation($city): int
     return Util::array_first_key($conflict);
 }
 
-function ConquerCity(array $admin, General $general, array $city)
+function ConquerCity(array $admin, General $general, array $city, array $defenderCityGeneralList)
 {
+    /** @var General[] $defenderCityGeneralList */
     $db = DB::db();
 
     $year = $admin['year'];
@@ -585,6 +586,21 @@ function ConquerCity(array $admin, General $general, array $city)
     if(TurnExecutionHelper::runEventHandler($db, $gameStor, EventTarget::OccupyCity)){
         $gameStor->cacheAll();
     }
+    $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+        UniqueConst::$hiddenSeed,
+        'ConquerCity',
+        $year,
+        $month,
+        $attackerNationID,
+        $attackerID,
+        $cityID
+    )));
+    foreach($defenderCityGeneralList as $defenderCityGeneral){
+        $defenderCityGeneral->onArbitraryAction($defenderCityGeneral, $rng, 'ConquerCity', null, [
+            'attacker' => $general
+        ]);
+        $defenderCityGeneral->applyDB($db);
+    }
 
 
     // 국가 멸망시

hwe/sammo/API/Command/GetReservedCommand.php

@@ -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']);
 

hwe/sammo/API/General/BuildNationCandidate.php

@@ -90,6 +90,9 @@ class BuildNationCandidate extends \sammo\BaseAPI
       return '거병을 실패했습니다.';
     }
 
+    $generalObj->setVar('killturn', $env['killturn']);
+    $generalObj->applyDB($db);
+
     return null;
   }
 }

hwe/sammo/API/General/Join.php

@@ -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) {
+        if ($inheritTurntimeZone !== null) {
-            $inheritTurntime = $inheritTurntime % ($admin['turnterm'] * 60);
+            $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', [

hwe/sammo/API/Global/GetCachedMap.php

@@ -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();

hwe/sammo/API/Global/GetConst.php

@@ -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);
 

hwe/sammo/API/InheritAction/ResetTurnTime.php

@@ -52,7 +52,7 @@ class ResetTurnTime extends \sammo\BaseAPI
 
         $db = DB::db();
         $gameStor = KVStorage::getStorage($db, 'game_env');
-        if($gameStor->isunited){
+        if ($gameStor->isunited) {
             return '이미 천하가 통일되었습니다.';
         }
         $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
@@ -62,36 +62,25 @@ class ResetTurnTime extends \sammo\BaseAPI
         }
 
         $gameStor = KVStorage::getStorage($db, 'game_env');
-        [$turnTerm, $serverTurnTime] = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
+        $turnTerm = $gameStor->getValue('turnterm');
 
         $currTurnTime = new DateTimeImmutable($general->getTurnTime());
-        $serverTurnTimeObj = new DateTimeImmutable($serverTurnTime);
 
         $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
             UniqueConst::$hiddenSeed,
             'ResetTurnTime',
             $userID,
-            $general->getTurnTime()
+            $general->getAuxVar('nextTurnTimeBase') ?? $general->getTurnTime()
         )));
 
-        $afterTurn = $rng->nextRange($turnTerm * -60 / 2, $turnTerm * 60 / 2);
+        $afterTurn = $rng->nextFloat1() * $turnTerm * 60;
 
         $userLogger = new UserLogger($userID);
-        if($afterTurn >= 0){
+        $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");
-        }
-        else{
-            $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 앞으로 당김", intdiv(Util::toInt(-$afterTurn), 60), (-$afterTurn)%60), "inheritPoint");
-        }
         $userLogger->flush();
 
-        $turnTime = $currTurnTime->add(TimeUtil::secondsToDateInterval($afterTurn));
-        if ($turnTime <= $serverTurnTimeObj && $serverTurnTimeObj <= $currTurnTime) {
-            $turnTime = $turnTime->add(TimeUtil::secondsToDateInterval($turnTerm * 60));
-        }
-
-        $general->setVar('turntime', TimeUtil::format($turnTime, true));
         $general->setAuxVar('inheritResetTurnTime', $nextLevel);
+        $general->setAuxVar('nextTurnTimeBase', $afterTurn);
         $inheritStor->setValue('previous', [$previousPoint - $reqPoint, null]);
         $general->increaseRankVar(RankColumn::inherit_point_spent_dynamic, $reqPoint);
         $general->applyDB($db);

hwe/sammo/API/Message/SendMessage.php

@@ -7,9 +7,11 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\MessageType;
+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 +172,8 @@ class SendMessage extends \sammo\BaseAPI
       return '장수가 없습니다.';
     }
 
+    $penalty = Json::decode($me['penalty'] ?? '{}');
+
     $limitState = checkLimit($me['refresh_score']);
     if ($limitState >= 2) {
       return '접속 제한입니다.';
@@ -226,8 +230,10 @@ 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건만 보낼 수 있습니다!';
+      $msg_min_interval = $penalty['sendPrivateMsgDelay'] ?? 2;
+      if ($msg_interval < $msg_min_interval) {
+        return "개인메세지는 {$msg_min_interval}초당 1건만 보낼 수 있습니다!";
       }
       $session->lastMsg = $now->format('Y-m-d H:i:s');
 

hwe/sammo/API/Nation/GeneralList.php

@@ -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 = [];

hwe/sammo/API/NationCommand/GetReservedCommand.php

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

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

@@ -21,7 +21,7 @@ class che_무기_02_단궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 102, 0.01, 10, 30),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 102)
         );
     }
 }

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

@@ -20,7 +20,7 @@ class che_무기_07_맥궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 107, 0.2, 20, 40),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 107)
         );
     }
 }

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

@@ -20,7 +20,7 @@ class che_무기_09_동호비궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 109, 0.2, 20, 40, 20),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 109)
         );
     }
 }

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

@@ -20,7 +20,7 @@ class che_무기_11_이광궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 111, 0.10, 20, 40, 10),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 111)
         );
     }
 }

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

@@ -20,7 +20,7 @@ class che_무기_13_양유기궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 113, 0.1, 20, 40, 10),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 113)
         );
     }
 }

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

@@ -21,7 +21,7 @@ class che_저격_매화수전 extends \sammo\BaseItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*304, 0.5, 20, 40),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*304)
         );
     }
 }

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

@@ -21,7 +21,7 @@ class che_저격_비도 extends \sammo\BaseItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*305, 0.5, 20, 40),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*305)
         );
     }
 }

hwe/sammo/ActionNationType/che_오두미도.php

@@ -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;
     }
 
-}
+}

hwe/sammo/ActionNationType/che_유가.php

@@ -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;
     }
-}
+}

hwe/sammo/ActionNationType/che_음양가.php

@@ -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;
     }
-}
+}

hwe/sammo/ActionNationType/che_종횡가.php

@@ -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;
     }
-}
+}

hwe/sammo/ActionSpecialDomestic/che_event_저격.php

@@ -25,7 +25,7 @@ class che_event_저격 extends \sammo\BaseSpecial{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_NONE, 0.5, 20, 40),
-            new che_저격발동($unit)
+            new che_저격발동($unit, che_저격시도::TYPE_NONE)
         );
     }
 }

hwe/sammo/Auction.php

@@ -267,7 +267,7 @@ abstract class Auction
     if ($isRollback) {
       $highestBid = $this->getHighestBid();
       if ($highestBid !== null) {
-        $this->refundBid($highestBid, "{$this->info->id}번 {$this->info->detail->title} 경매가 취소되었습니다.");
+        $this->refundBid($highestBid, "{$this->info->id}번 {$this->info->detail->title}가 취소되었습니다.");
       }
       $this->rollbackAuction();
     }

hwe/sammo/Command/General/che_강행.php

@@ -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);
 

hwe/sammo/Command/General/che_거병.php

@@ -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);
 

hwe/sammo/Command/General/che_건국.php

@@ -201,7 +201,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;

hwe/sammo/Command/General/che_견문.php

@@ -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);
 

hwe/sammo/Command/General/che_군량매매.php

@@ -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);
 

hwe/sammo/Command/General/che_귀환.php

@@ -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);
 

hwe/sammo/Command/General/che_기술연구.php

@@ -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;

hwe/sammo/Command/General/che_단련.php

@@ -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;

hwe/sammo/Command/General/che_등용.php

@@ -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);
 

hwe/sammo/Command/General/che_등용수락.php

@@ -169,7 +169,7 @@ class che_등용수락 extends Command\GeneralCommand{
         $logger->pushGeneralActionLog("<D>{$destNationName}</>{$josaRo} 망명하여 수도로 이동합니다.");
         $destLogger->pushGeneralActionLog("<Y>{$generalName}</> 등용에 성공했습니다.");
 
-        $logger->pushGeneralHistoryLog("<D>{$destNationName}</>{$josaRo} 망명");
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>{$josaRo} 망명");
         $destLogger->pushGeneralHistoryLog("<Y>{$generalName}</> 등용에 성공");
 
         $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <D><b>{$destNationName}</b></>{$josaRo} <S>망명</>하였습니다.");
@@ -212,4 +212,4 @@ class che_등용수락 extends Command\GeneralCommand{
 
         return true;
     }
-}
+}

hwe/sammo/Command/General/che_랜덤임관.php

@@ -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;

hwe/sammo/Command/General/che_무작위건국.php

@@ -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;

hwe/sammo/Command/General/che_물자조달.php

@@ -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);
 

hwe/sammo/Command/General/che_사기진작.php

@@ -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;

hwe/sammo/Command/General/che_상업투자.php

@@ -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;

hwe/sammo/Command/General/che_숙련전환.php

@@ -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;

hwe/sammo/Command/General/che_은퇴.php

@@ -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;

hwe/sammo/Command/General/che_이동.php

@@ -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);
 

hwe/sammo/Command/General/che_인재탐색.php

@@ -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;
     }

hwe/sammo/Command/General/che_임관.php

@@ -172,7 +172,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;

hwe/sammo/Command/General/che_장비매매.php

@@ -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;

hwe/sammo/Command/General/che_장수대상임관.php

@@ -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;

hwe/sammo/Command/General/che_전투태세.php

@@ -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;

hwe/sammo/Command/General/che_전투특기초기화.php

@@ -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;

hwe/sammo/Command/General/che_정착장려.php

@@ -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;

hwe/sammo/Command/General/che_주민선정.php

@@ -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;

hwe/sammo/Command/General/che_증여.php

@@ -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);

hwe/sammo/Command/General/che_집합.php

@@ -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;

hwe/sammo/Command/General/che_징병.php

@@ -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;

hwe/sammo/Command/General/che_출병.php

@@ -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;

hwe/sammo/Command/General/che_하야.php

@@ -30,11 +30,8 @@ class che_하야 extends Command\GeneralCommand{
 
         $this->setNation();
 
-        $relYear = $env['year'] - $env['startyear'];
-
         $this->fullConditionConstraints=[
             ConstraintHelper::NotBeNeutral(),
-            ConstraintHelper::NotOpeningPart($relYear),
             ConstraintHelper::NotLord(),
         ];
     }

hwe/sammo/Command/General/che_해산.php

@@ -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);

hwe/sammo/Command/General/che_헌납.php

@@ -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;

hwe/sammo/Command/General/che_훈련.php

@@ -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;

hwe/sammo/Command/General/cr_건국.php

@@ -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;

hwe/sammo/Command/General/cr_맹훈련.php

@@ -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;

hwe/sammo/Command/Nation/che_급습.php

@@ -182,6 +182,7 @@ class che_급습 extends Command\NationCommand
         $destNationLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$generalName}</>{$josaYi} 아국에 <M>{$commandName}</>{$josaUl} 발동");
         $destNationLogger->flush();
 
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>에 <M>{$commandName}</>{$josaUl} 발동");
         $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <D><b>{$destNationName}</b></>에 <M>{$commandName}</>{$josaUl} 발동");
 
         $db->update('nation', [

hwe/sammo/Command/Nation/che_백성동원.php

@@ -156,7 +156,7 @@ class che_백성동원 extends Command\NationCommand
             'wall' => $db->sqleval('GREATEST(wall_max * 0.8, wall)'),
         ], 'city=%i', $destCityID);
 
-        $logger->pushGeneralHistoryLog('<M>백성동원</>을 발동');
+        $logger->pushGeneralHistoryLog("<G><b>{$destCityName}</b></>에 <M>백성동원</>을 발동");
         $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <G><b>{$destCityName}</b></>에 <M>백성동원</>을 발동");
 
         $db->update('nation', [

hwe/sammo/Command/Nation/che_불가침제의.php

@@ -117,6 +117,7 @@ class che_불가침제의 extends Command\NationCommand
             ConstraintHelper::BeChief(),
             ConstraintHelper::NotBeNeutral(),
             ConstraintHelper::ExistsDestNation(),
+            ConstraintHelper::DifferentDestNation(),
             ConstraintHelper::DisallowDiplomacyBetweenStatus([
                 0 => '아국과 이미 교전중입니다.',
                 1 => '아국과 이미 선포중입니다.',

hwe/sammo/Command/Nation/che_선전포고.php

@@ -146,6 +146,7 @@ class che_선전포고 extends Command\NationCommand
         $destLogger = new ActionLogger(0, $destNationID, $env['year'], $env['month']);
 
         $logger->pushGeneralActionLog("<D><b>{$destNationName}</b></>에 선전 포고 했습니다.<1>$date</>");
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>에 선전 포고");
         $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <D><b>{$destNationName}</b></>에 선전 포고");
         $destLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$generalName}</>{$josaYi} 아국에 선전 포고");
 

hwe/sammo/Command/Nation/che_이호경식.php

@@ -164,9 +164,7 @@ class che_이호경식 extends Command\NationCommand
             $nationGeneralLogger->flush();
         }
 
-        $josaYiCommand = JosaUtil::pick($commandName, '이');
+        $broadcastMessage = "<D><b>{$nationName}</b></>{$josaYiNation} 아국에 <M>{$commandName}</>{$josaUl} 발동하였습니다.";
-
-        $broadcastMessage = "아국에 <M>{$commandName}</>{$josaYiCommand} 발동되었습니다.";
 
         $destNationGeneralList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i', $destNationID);
         foreach ($destNationGeneralList as $destNationGeneralID) {
@@ -179,6 +177,7 @@ class che_이호경식 extends Command\NationCommand
         $destNationLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$generalName}</>{$josaYi} 아국에 <M>{$commandName}</>{$josaUl} 발동");
         $destNationLogger->flush();
 
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>에 <M>{$commandName}</>{$josaUl} 발동");
         $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <D><b>{$destNationName}</b></>에 <M>{$commandName}</>{$josaUl} 발동");
 
         $db->update('nation', [

hwe/sammo/Command/Nation/che_종전수락.php

@@ -179,10 +179,13 @@ class che_종전수락 extends Command\NationCommand
         $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYiGeneral} <D><b>{$destNationName}</b></>{$josaWa} <M>종전 합의</> 하였습니다.");
         $logger->pushGlobalHistoryLog("<Y><b>【종전】</b></><D><b>{$nationName}</b></>{$josaYiNation} <D><b>{$destNationName}</b></>{$josaWa} <M>종전 합의</> 하였습니다.");
 
+        $josaWa = JosaUtil::pick($destNationName, '와');
+        $logger->pushNationalHistoryLog("<D><b>{$destNationName}</b></>{$josaWa} 종전");
 
         $josaWa = JosaUtil::pick($nationName, '와');
         $destLogger->pushGeneralActionLog("<D><b>{$nationName}</b></>{$josaWa} 종전에 성공했습니다.", ActionLogger::PLAIN);
         $destLogger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>{$josaWa} 종전 성공");
+        $destLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>{$josaWa} 종전");
 
         $general->applyDB($db);
         $destLogger->flush();

hwe/sammo/Command/Nation/che_피장파장.php

@@ -228,6 +228,7 @@ class che_피장파장 extends Command\NationCommand
         $destNationLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$generalName}</>{$josaYi} 아국에 <G><b>{$cmd->getName()}</b></> <M>{$commandName}</>{$josaUl} 발동");
         $destNationLogger->flush();
 
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>에 <G><b>{$cmd->getName()}</b></> <M>{$commandName}</>{$josaUl} 발동");
         $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <D><b>{$destNationName}</b></>에 <G><b>{$cmd->getName()}</b></> <M>{$commandName}</>{$josaUl} 발동");
 
         $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');

hwe/sammo/Constraint/HasRouteWithEnemy.php

@@ -35,6 +35,12 @@ class HasRouteWithEnemy extends Constraint{
         $allowedNationList[] = $this->general['nation'];
         $allowedNationList[] = 0;
 
+        $destCityNation = $db->queryFirstField('SELECT nation FROM city WHERE city = %i', $this->destCity['city']);
+        if($destCityNation !== 0 && $destCityNation !== $this->general['nation'] && !in_array($destCityNation, $allowedNationList)){
+            $this->reason = "교전중인 국가가 아닙니다.";
+            return false;
+        }
+
         $distanceList = \sammo\searchDistanceListToDest($this->general['city'], $this->destCity['city'], $allowedNationList);
         if(!$distanceList){
             $this->reason = "경로에 도달할 방법이 없습니다.";

hwe/sammo/Event/Action/RaiseInvader.php

@@ -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;
     }
 

hwe/sammo/GameConstBase.php

@@ -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;
@@ -318,7 +318,6 @@ class GameConstBase
             'che_치안강화',
             'che_정착장려',
             'che_주민선정',
-            'che_물자조달',
         ],
         '군사' => [
             'che_징병',
@@ -349,6 +348,7 @@ class GameConstBase
         '국가' => [
             'che_증여',
             'che_헌납',
+            'che_물자조달',
             'che_하야',
             'che_거병',
             'che_건국',

hwe/sammo/General.php

@@ -365,14 +365,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 +806,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 +819,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;
     }

hwe/sammo/GeneralAI.php

@@ -82,8 +82,9 @@ class GeneralAI
     const d직전 = 3;
     const d전쟁 = 4;
 
-    protected function updateInstance(): void{
+    protected function updateInstance(): void
-        if(!$this->reqUpdateInstance){
+    {
+        if (!$this->reqUpdateInstance) {
             return;
         }
 
@@ -215,11 +216,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;
             }
@@ -2709,7 +2709,7 @@ class GeneralAI
         $city = $this->city;
         $nation = $this->nation;
 
-        if (($nation['rice'] < GameConst::$baserice) && $this->rng->nextBool(0.7)) {
+        if (($nation['rice'] < GameConst::$baserice) && $general->getNPCType() >= 2 && $this->rng->nextBool(0.7)) {
             return null;
         }
 
@@ -2992,7 +2992,7 @@ class GeneralAI
         }
 
         foreach ($this->frontCities as $frontCity) {
-            if(!$frontCity['supply']){
+            if (!$frontCity['supply']) {
                 continue;
             }
             $candidateCities[$frontCity['city']] = $frontCity['important'];
@@ -3120,6 +3120,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 +3357,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 +3443,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 +3485,7 @@ class GeneralAI
             }
             if ($nationCity['front']) {
                 $frontCities[$cityID] = $nationCity;
-            } else if($nationCity['supply']) {
+            } else if ($nationCity['supply']) {
                 $backupCities[$cityID] = $nationCity;
             }
 
@@ -3779,21 +3787,28 @@ class GeneralAI
 
         if ($npcType >= 2 && $general->getVar('officer_level') == 12 && !$this->nation['capital']) {
             //방랑군 건국
-            $result = $this->do건국();
+            $relYearMonth = Util::joinYearMonth($this->env['year'], $this->env['month']) - Util::joinYearMonth($this->env['init_year'], $this->env['init_month']);
-            if ($result !== null) {
+
-                $result->reason = 'do건국';
+            if ($relYearMonth > 1) {
-                return $result;
+                $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 ($relYearMonth > 1) {
-            if ($result !== null) {
+                $result = $this->do해산();
-                $result->reason = 'do해산';
+                if ($result !== null) {
-                return $result;
+                    $result->reason = 'do해산';
+                    return $result;
+                }
             }
         }
 
@@ -4035,7 +4050,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)) {

hwe/sammo/ResetHelper.php

@@ -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()) {

hwe/sammo/TurnExecutionHelper.php

@@ -216,6 +216,16 @@ class TurnExecutionHelper
         }
 
         $turntime = addTurn($general->getTurnTime(), $gameStor->turnterm);
+
+        $nextTurnTimeBase = $general->getAuxVar('nextTurnTimeBase');
+        if($nextTurnTimeBase !== null){
+            $turntime = cutTurn($turntime, $gameStor->turnterm);
+            $turntimeObj = new \DateTimeImmutable($turntime);
+            $turntimeObj = $turntimeObj->add(TimeUtil::secondsToDateInterval($nextTurnTimeBase));
+            $turntime = TimeUtil::format($turntimeObj, true);
+            $general->setAuxVar('nextTurnTimeBase', null);
+        }
+
         $general->setVar('turntime', $turntime);
     }
 

hwe/scenario/scenario_2141.json

@@ -0,0 +1,773 @@
+{
+    "title":"【가상모드14-b】 걸그룹대전(비급)",
+    "startYear": 180,
+    "life":1,
+    "fiction":1,
+    "nation":[
+    ],
+    "diplomacy":[
+    ],
+    "const": {
+        "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_백마": 2,
+                "che_명마_07_기주마": 2,
+                "che_명마_07_오환마": 2,
+                "che_명마_07_백상": 2,
+                "che_명마_08_양주마": 2,
+                "che_명마_08_흉노마": 2,
+                "che_명마_09_과하마": 2,
+                "che_명마_09_의남백마": 2,
+                "che_명마_10_대완마": 2,
+                "che_명마_10_옥추마": 2,
+                "che_명마_11_서량마": 2,
+                "che_명마_11_화종마": 2,
+                "che_명마_12_사륜거": 2,
+                "che_명마_12_옥란백용구": 2,
+                "che_명마_13_절영": 2,
+                "che_명마_13_적로": 2,
+                "che_명마_14_적란마": 2,
+                "che_명마_14_조황비전": 2,
+                "che_명마_15_한혈마": 2,
+                "che_명마_15_적토마": 2
+            },
+            "weapon": {
+                "che_무기_01_단도": 0,
+                "che_무기_02_단궁": 0,
+                "che_무기_03_단극": 0,
+                "che_무기_04_목검": 0,
+                "che_무기_05_죽창": 0,
+                "che_무기_06_소부": 0,
+                "che_무기_07_동추": 2,
+                "che_무기_07_철편": 2,
+                "che_무기_07_철쇄": 2,
+                "che_무기_07_맥궁": 2,
+                "che_무기_08_유성추": 2,
+                "che_무기_08_철질여골": 2,
+                "che_무기_09_쌍철극": 2,
+                "che_무기_09_동호비궁": 2,
+                "che_무기_10_삼첨도": 2,
+                "che_무기_10_대부": 2,
+                "che_무기_11_고정도": 2,
+                "che_무기_11_이광궁": 2,
+                "che_무기_12_철척사모": 2,
+                "che_무기_12_칠성검": 2,
+                "che_무기_13_사모": 2,
+                "che_무기_13_양유기궁": 2,
+                "che_무기_14_언월도": 2,
+                "che_무기_14_방천화극": 2,
+                "che_무기_15_청홍검": 2,
+                "che_무기_15_의천검": 2
+            },
+            "book": {
+                "che_서적_01_효경전": 0,
+                "che_서적_02_회남자": 0,
+                "che_서적_03_변도론": 0,
+                "che_서적_04_건상역주": 0,
+                "che_서적_05_여씨춘추": 0,
+                "che_서적_06_사민월령": 0,
+                "che_서적_07_위료자": 2,
+                "che_서적_07_사마법": 2,
+                "che_서적_07_한서": 2,
+                "che_서적_07_논어": 2,
+                "che_서적_08_전론": 2,
+                "che_서적_08_사기": 2,
+                "che_서적_09_장자": 2,
+                "che_서적_09_역경": 2,
+                "che_서적_10_시경": 2,
+                "che_서적_10_구국론": 2,
+                "che_서적_11_상군서": 2,
+                "che_서적_11_춘추전": 2,
+                "che_서적_12_산해경": 2,
+                "che_서적_12_맹덕신서": 2,
+                "che_서적_13_관자": 2,
+                "che_서적_13_병법24편": 2,
+                "che_서적_14_한비자": 2,
+                "che_서적_14_오자병법": 2,
+                "che_서적_15_노자": 2,
+                "che_서적_15_손자병법": 2
+            },
+            "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
+            }
+        }
+    },
+    "iconPath": "걸그룹",
+    "stat":{
+        "total": 310,
+        "min": 40,
+        "max": 140,
+        "npcTotal":210,
+        "npcMax":95,
+        "npcMin":40
+    },
+    "general":[
+        [0, "아이유", null, 0, null, 90, 56, 100, 0, 160, 250, "의협", "집중"],
+        [0, "걸스데이 민아", null, 0, null, 96, 58, 95, 0, 160, 250, "대의", "환술"],
+        [0, "손나은", null, 0, null, 92, 55, 92, 0, 160, 250, "안전", "귀병"],
+        [0, "윤아", null, 0, null, 94, 94, 59, 0, 160, 250, "출세", "위압"],
+        [0, "걸스데이 소진", null, 0, null, 86, 94, 60, 0, 160, 250, "할거", "무쌍"],
+        [0, "수지", null, 0, null, 100, 58, 91, 0, 160, 250, "정복", "신중"],
+        [0, "정예인", null, 0, null, 90, 90, 59, 0, 160, 250, "패권", "위압"],
+        [0, "혜리", null, 0, null, 90, 58, 90, 0, 160, 250, "유지", "환술"],
+        [0, "은하", null, 0, null, 91, 60, 90, 0, 160, 250, "안전", "환술"],
+        [0, "슈", null, 0, null, 92, 54, 80, 0, 160, 250, "패권", "신중"],
+        [0, "소원", null, 0, null, 90, 88, 55, 0, 160, 250, "왕좌", "필살"],
+        [0, "보아", null, 0, null, 95, 99, 96, 0, 160, 250, "왕좌", "위압"],
+        [0, "김세정", null, 0, null, 100, 70, 100, 0, 160, 250, "의협", "집중"],
+        [0, "권나라", null, 0, null, 98, 97, 65, 0, 160, 250, "대의", "무쌍"],
+        [0, "서지수", null, 0, null, 90, 89, 63, 0, 160, 250, "할거", "필살"],
+        [0, "양파", null, 0, null, 85, 54, 92, 0, 160, 250, "대의", "환술"],
+        [0, "앨리스", null, 0, null, 90, 90, 61, 0, 160, 250, "유지", "위압"],
+        [0, "장원영", null, 0, null, 97, 94, 53, 0, 160, 250, "출세", "무쌍"],
+        [0, "안유진", null, 0, null, 91, 92, 61, 0, 160, 250, "출세", "위압"],
+        [0, "조유리", null, 0, null, 91, 54, 93, 0, 160, 250, "정복", "집중"],
+        [0, "경리", null, 0, null, 90, 92, 54, 0, 160, 250, null, null],
+        [0, "유아", null, 0, null, 93, 58, 92, 0, 160, 250, "출세", "집중"],
+        [0, "이나경", null, 0, null, 94, 63, 91, 0, 160, 250, null, null],
+        [0, "효린", null, 0, null, 40, 51, 93, 0, 160, 250, null, null],
+        [0, "씨스타 보라", null, 0, null, 82, 81, 58, 0, 160, 250, null, null],
+        [0, "소유", null, 0, null, 70, 87, 61, 0, 160, 250, null, null],
+        [0, "다솜", null, 0, null, 82, 42, 63, 0, 160, 250, null, null],
+        [0, "지연", null, 0, null, 90, 61, 83, 0, 160, 250, null, null],
+        [0, "효민", null, 0, null, 83, 58, 77, 0, 160, 250, null, null],
+        [0, "은정", null, 0, null, 70, 50, 72, 0, 160, 250, null, null],
+        [0, "큐리", null, 0, null, 70, 51, 73, 0, 160, 250, null, null],
+        [0, "보람", null, 0, null, 72, 48, 68, 0, 160, 250, null, null],
+        [0, "티아라 소연", null, 0, null, 71, 50, 80, 0, 160, 250, null, null],
+        [0, "라임", null, 0, null, 81, 54, 86, 0, 160, 250, null, null],
+        [0, "유영", null, 0, null, 70, 43, 64, 0, 160, 250, null, null],
+        [0, "서영", null, 0, null, 65, 57, 82, 0, 160, 250, null, null],
+        [0, "헬로비너스 여름", null, 0, null, 63, 52, 79, 0, 160, 250, null, null],
+        [0, "남지현", null, 0, null, 80, 53, 74, 0, 160, 250, null, null],
+        [0, "허가윤", null, 0, null, 70, 52, 82, 0, 160, 250, null, null],
+        [0, "전지윤", null, 0, null, 69, 74, 53, 0, 160, 250, null, null],
+        [0, "김현아", null, 0, null, 92, 92, 72, 0, 160, 250, null, null],
+        [0, "권소현", null, 0, null, 75, 55, 76, 0, 160, 250, null, null],
+        [0, "이해리", null, 0, null, 61, 40, 96, 0, 160, 250, null, null],
+        [0, "강민경", null, 0, null, 88, 48, 89, 0, 160, 250, null, null],
+        [0, "비키", null, 0, null, 73, 64, 23, 0, 160, 250, null, null],
+        [0, "김진", null, 0, null, 51, 73, 46, 0, 160, 250, null, null],
+        [0, "이민경", null, 0, null, 56, 53, 70, 0, 160, 250, null, null],
+        [0, "한나", null, 0, null, 40, 43, 41, 0, 160, 250, null, null],
+        [0, "김한별", null, 0, null, 60, 37, 60, 0, 160, 250, null, null],
+        [0, "김한샘", null, 0, null, 31, 41, 40, 0, 160, 250, null, null],
+        [0, "블랙핑크 지수", null, 0, null, 90, 61, 90, 0, 160, 250, null, null],
+        [0, "블랙핑크 제니", null, 0, null, 92, 68, 91, 0, 160, 250, null, null],
+        [0, "로제", null, 0, null, 88, 60, 93, 0, 160, 250, null, null],
+        [0, "리사", null, 0, null, 89, 91, 63, 0, 160, 250, null, null],
+        [0, "소나무 수민", null, 0, null, 66, 42, 72, 0, 160, 250, null, null],
+        [0, "소나무 민재", null, 0, null, 60, 33, 80, 0, 160, 250, null, null],
+        [0, "디애나", null, 0, null, 68, 73, 41, 0, 160, 250, null, null],
+        [0, "나현", null, 0, null, 71, 79, 47, 0, 160, 250, null, null],
+        [0, "의진", null, 0, null, 76, 80, 51, 0, 160, 250, null, null],
+        [0, "하이디", null, 0, null, 71, 50, 80, 0, 160, 250, null, null],
+        [0, "뉴썬", null, 0, null, 60, 61, 39, 0, 160, 250, null, null],
+        [0, "유라", null, 0, null, 80, 41, 70, 0, 160, 250, null, null],
+        [0, "지민", null, 0, null, 18, 18, 18, 0, 160, 250, null, null],
+        [0, "AOA 유나", null, 0, null, 74, 44, 68, 0, 160, 250, null, null],
+        [0, "혜정", null, 0, null, 74, 47, 65, 0, 160, 250, null, null],
+        [0, "AOA 민아", null, 0, null, 75, 41, 60, 0, 160, 250, null, null],
+        [0, "설현", null, 0, null, 85, 79, 53, 0, 160, 250, null, null],
+        [0, "찬미", null, 0, null, 68, 42, 60, 0, 160, 250, null, null],
+        [0, "AOA 초아", null, 0, null, 87, 54, 88, 0, 160, 250, null, null],
+        [0, "솔빈", null, 0, null, 80, 56, 82, 0, 160, 250, null, null],
+        [0, "해인", null, 0, null, 67, 43, 60, 0, 160, 250, null, null],
+        [0, "라붐 유정", null, 0, null, 66, 51, 71, 0, 160, 250, null, null],
+        [0, "라붐 소연", null, 0, null, 80, 58, 70, 0, 160, 250, null, null],
+        [0, "지엔", null, 0, null, 61, 60, 42, 0, 160, 250, null, null],
+        [0, "율희", null, 0, null, 60, 54, 33, 0, 160, 250, null, null],
+        [0, "효정", null, 0, null, 81, 81, 56, 0, 160, 250, null, null],
+        [0, "오마이걸 미미", null, 0, null, 59, 83, 58, 0, 160, 250, null, null],
+        [0, "승희", null, 0, null, 73, 60, 84, 0, 160, 250, null, null],
+        [0, "지호", null, 0, null, 69, 67, 42, 0, 160, 250, null, null],
+        [0, "비니", null, 0, null, 89, 93, 51, 0, 160, 250, null, null],
+        [0, "아린", null, 0, null, 76, 81, 53, 0, 160, 250, null, null],
+        [0, "박초롱", null, 0, null, 75, 52, 31, 0, 160, 250, null, null],
+        [0, "윤보미", null, 0, null, 80, 61, 42, 0, 160, 250, null, null],
+        [0, "정은지", null, 0, null, 78, 52, 89, 0, 160, 250, null, null],
+        [0, "김남주", null, 0, null, 69, 51, 68, 0, 160, 250, null, null],
+        [0, "오하영", null, 0, null, 78, 50, 66, 0, 160, 250, null, null],
+        [0, "김재경", null, 0, null, 82, 71, 48, 0, 160, 250, null, null],
+        [0, "고나은", null, 0, null, 75, 62, 40, 0, 160, 250, null, null],
+        [0, "지숙", null, 0, null, 77, 47, 70, 0, 160, 250, null, null],
+        [0, "노을", null, 0, null, 73, 50, 33, 0, 160, 250, null, null],
+        [0, "오승아", null, 0, null, 78, 46, 66, 0, 160, 250, null, null],
+        [0, "정윤혜", null, 0, null, 75, 49, 60, 0, 160, 250, null, null],
+        [0, "조현영", null, 0, null, 79, 62, 43, 0, 160, 250, null, null],
+        [0, "나인뮤지스 혜미", null, 0, null, 72, 67, 40, 0, 160, 250, null, null],
+        [0, "나인뮤지스 소진", null, 0, null, 73, 64, 49, 0, 160, 250, null, null],
+        [0, "금조", null, 0, null, 70, 60, 34, 0, 160, 250, null, null],
+        [0, "손성아", null, 0, null, 69, 63, 40, 0, 160, 250, null, null],
+        [0, "박민하", null, 0, null, 97, 83, 43, 0, 160, 250, null, null],
+        [0, "웬디", null, 0, null, 84, 60, 95, 0, 160, 250, null, null],
+        [0, "아이린", null, 0, null, 90, 65, 40, 0, 160, 250, null, null],
+        [0, "슬기", null, 0, null, 93, 94, 63, 0, 160, 250, null, null],
+        [0, "조이", null, 0, null, 90, 84, 54, 0, 160, 250, null, null],
+        [0, "예리", null, 0, null, 86, 77, 57, 0, 160, 250, null, null],
+        [0, "솔라", null, 0, null, 83, 52, 90, 0, 160, 250, null, null],
+        [0, "문별", null, 0, null, 70, 53, 83, 0, 160, 250, null, null],
+        [0, "휘인", null, 0, null, 68, 51, 84, 0, 160, 250, null, null],
+        [0, "화사", null, 0, null, 51, 58, 83, 0, 160, 250, null, null],
+        [0, "나연", null, 0, null, 84, 53, 81, 0, 160, 250, null, null],
+        [0, "정연", null, 0, null, 83, 66, 48, 0, 160, 250, null, null],
+        [0, "모모", null, 0, null, 85, 91, 51, 0, 160, 250, null, null],
+        [0, "사나", null, 0, null, 94, 88, 54, 0, 160, 250, null, null],
+        [0, "지효", null, 0, null, 78, 53, 88, 0, 160, 250, null, null],
+        [0, "트와이스 미나", null, 0, null, 83, 96, 56, 0, 160, 250, null, null],
+        [0, "다현", null, 0, null, 82, 46, 78, 0, 160, 250, null, null],
+        [0, "채영", null, 0, null, 73, 79, 47, 0, 160, 250, null, null],
+        [0, "쯔위", null, 0, null, 99, 72, 41, 0, 160, 250, null, null],
+        [0, "제아", null, 0, null, 68, 47, 92, 0, 160, 250, null, null],
+        [0, "나르샤", null, 0, null, 63, 51, 84, 0, 160, 250, null, null],
+        [0, "미료", null, 0, null, 57, 47, 88, 0, 160, 250, null, null],
+        [0, "가인", null, 0, null, 80, 81, 80, 0, 160, 250, null, null],
+        [0, "하나", null, 0, null, 66, 62, 34, 0, 160, 250, null, null],
+        [0, "구구단 미미", null, 0, null, 69, 60, 33, 0, 160, 250, null, null],
+        [0, "김나영", null, 0, null, 90, 52, 88, 0, 160, 250, null, null],
+        [0, "해빈", null, 0, null, 70, 40, 86, 0, 160, 250, null, null],
+        [0, "소이", null, 0, null, 66, 63, 44, 0, 160, 250, null, null],
+        [0, "샐리", null, 0, null, 68, 66, 47, 0, 160, 250, null, null],
+        [0, "구구단 미나", null, 0, null, 83, 76, 43, 0, 160, 250, null, null],
+        [0, "구구단 혜연", null, 0, null, 63, 44, 66, 0, 160, 250, null, null],
+        [0, "최유정", null, 0, null, 70, 83, 47, 0, 160, 250, null, null],
+        [0, "김도연", null, 0, null, 81, 81, 48, 0, 160, 250, null, null],
+        [0, "지수연", null, 0, null, 64, 42, 74, 0, 160, 250, null, null],
+        [0, "엘리", null, 0, null, 64, 60, 43, 0, 160, 250, null, null],
+        [0, "세이", null, 0, null, 61, 61, 36, 0, 160, 250, null, null],
+        [0, "루아", null, 0, null, 53, 48, 64, 0, 160, 250, null, null],
+        [0, "리나", null, 0, null, 57, 40, 61, 0, 160, 250, null, null],
+        [0, "루시", null, 0, null, 83, 48, 64, 0, 160, 250, null, null],
+        [0, "이효리", null, 0, null, 94, 93, 63, 0, 160, 250, null, null],
+        [0, "성유리", null, 0, null, 92, 53, 23, 0, 160, 250, null, null],
+        [0, "이진", null, 0, null, 64, 54, 32, 0, 160, 250, null, null],
+        [0, "옥주현", null, 0, null, 62, 51, 96, 0, 160, 250, null, null],
+        [0, "유진", null, 0, null, 98, 53, 76, 0, 160, 250, null, null],
+        [0, "바다", null, 0, null, 58, 56, 98, 0, 160, 250, null, null],
+        [0, "설아", null, 0, null, 70, 41, 64, 0, 160, 250, null, null],
+        [0, "엑시", null, 0, null, 73, 81, 40, 0, 160, 250, null, null],
+        [0, "보나", null, 0, null, 76, 68, 40, 0, 160, 250, null, null],
+        [0, "성소", null, 0, null, 60, 34, 13, 0, 160, 250, null, null],
+        [0, "은서", null, 0, null, 68, 43, 60, 0, 160, 250, null, null],
+        [0, "다영", null, 0, null, 71, 60, 32, 0, 160, 250, null, null],
+        [0, "다원", null, 0, null, 65, 60, 30, 0, 160, 250, null, null],
+        [0, "우주소녀 수빈", null, 0, null, 66, 61, 31, 0, 160, 250, null, null],
+        [0, "선의", null, 0, null, 70, 62, 39, 0, 160, 250, null, null],
+        [0, "우주소녀 여름", null, 0, null, 58, 60, 40, 0, 160, 250, null, null],
+        [0, "미기", null, 0, null, 63, 63, 41, 0, 160, 250, null, null],
+        [0, "루다", null, 0, null, 81, 67, 44, 0, 160, 250, null, null],
+        [0, "연정", null, 0, null, 68, 42, 83, 0, 160, 250, null, null],
+        [0, "윤채경", null, 0, null, 80, 64, 40, 0, 160, 250, null, null],
+        [0, "에이프릴 김채원", null, 0, null, 67, 60, 43, 0, 160, 250, null, null],
+        [0, "양예나", null, 0, null, 70, 41, 68, 0, 160, 250, null, null],
+        [0, "레이첼", null, 0, null, 88, 92, 52, 0, 160, 250, null, null],
+        [0, "이진솔", null, 0, null, 69, 46, 70, 0, 160, 250, null, null],
+        [0, "박규리", null, 0, null, 80, 56, 83, 0, 160, 250, null, null],
+        [0, "한승연", null, 0, null, 77, 73, 49, 0, 160, 250, null, null],
+        [0, "허영지", null, 0, null, 70, 66, 46, 0, 160, 250, null, null],
+        [0, "니콜", null, 0, null, 69, 74, 43, 0, 160, 250, null, null],
+        [0, "강지영", null, 0, null, 63, 63, 32, 0, 160, 250, null, null],
+        [0, "레이나", null, 0, null, 76, 46, 84, 0, 160, 250, null, null],
+        [0, "나나", null, 0, null, 90, 82, 44, 0, 160, 250, null, null],
+        [0, "이영", null, 0, null, 69, 61, 47, 0, 160, 250, null, null],
+        [0, "리지", null, 0, null, 68, 62, 43, 0, 160, 250, null, null],
+        [0, "가은", null, 0, null, 60, 59, 33, 0, 160, 250, null, null],
+        [0, "가희", null, 0, null, 67, 98, 52, 0, 160, 250, null, null],
+        [0, "전효성", null, 0, null, 78, 77, 44, 0, 160, 250, null, null],
+        [0, "송지은", null, 0, null, 80, 48, 77, 0, 160, 250, null, null],
+        [0, "정하나", null, 0, null, 68, 53, 70, 0, 160, 250, null, null],
+        [0, "한선화", null, 0, null, 79, 52, 71, 0, 160, 250, null, null],
+        [0, "베이비소울", null, 0, null, 71, 50, 70, 0, 160, 250, null, null],
+        [0, "유지애", null, 0, null, 70, 52, 71, 0, 160, 250, null, null],
+        [0, "이미주", null, 0, null, 86, 77, 46, 0, 160, 250, null, null],
+        [0, "KEI", null, 0, null, 87, 50, 79, 0, 160, 250, null, null],
+        [0, "JIN", null, 0, null, 68, 53, 82, 0, 160, 250, null, null],
+        [0, "류수정", null, 0, null, 69, 52, 72, 0, 160, 250, null, null],
+        [0, "태연", null, 0, null, 87, 54, 94, 0, 160, 250, null, null],
+        [0, "써니", null, 0, null, 79, 58, 78, 0, 160, 250, null, null],
+        [0, "티파니", null, 0, null, 84, 56, 81, 0, 160, 250, null, null],
+        [0, "효연", null, 0, null, 40, 99, 42, 0, 160, 250, null, null],
+        [0, "유리", null, 0, null, 82, 84, 57, 0, 160, 250, null, null],
+        [0, "수영", null, 0, null, 69, 68, 73, 0, 160, 250, null, null],
+        [0, "서현", null, 0, null, 77, 54, 81, 0, 160, 250, null, null],
+        [0, "제시카", null, 0, null, 71, 47, 76, 0, 160, 250, null, null],
+        [0, "LE", null, 0, null, 63, 53, 80, 0, 160, 250, null, null],
+        [0, "정화", null, 0, null, 80, 71, 41, 0, 160, 250, null, null],
+        [0, "하니", null, 0, null, 87, 83, 59, 0, 160, 250, null, null],
+        [0, "솔지", null, 0, null, 76, 53, 93, 0, 160, 250, null, null],
+        [0, "혜린", null, 0, null, 86, 50, 86, 0, 160, 250, null, null],
+        [0, "유니스", null, 0, null, 75, 58, 73, 0, 160, 250, null, null],
+        [0, "기희현", null, 0, null, 86, 46, 70, 0, 160, 250, null, null],
+        [0, "다이아 제니", null, 0, null, 71, 66, 48, 0, 160, 250, null, null],
+        [0, "정채연", null, 0, null, 79, 63, 46, 0, 160, 250, null, null],
+        [0, "은진", null, 0, null, 66, 67, 43, 0, 160, 250, null, null],
+        [0, "예빈", null, 0, null, 68, 65, 47, 0, 160, 250, null, null],
+        [0, "은채", null, 0, null, 61, 48, 60, 0, 160, 250, null, null],
+        [0, "주은", null, 0, null, 70, 49, 65, 0, 160, 250, null, null],
+        [0, "솜이", null, 0, null, 70, 46, 61, 0, 160, 250, null, null],
+        [0, "예린", null, 0, null, 74, 83, 60, 0, 160, 250, null, null],
+        [0, "유주", null, 0, null, 65, 51, 85, 0, 160, 250, null, null],
+        [0, "신비", null, 0, null, 77, 80, 54, 0, 160, 250, null, null],
+        [0, "엄지", null, 0, null, 59, 69, 47, 0, 160, 250, null, null],
+        [0, "세리", null, 0, null, 74, 73, 50, 0, 160, 250, null, null],
+        [0, "아영", null, 0, null, 78, 76, 44, 0, 160, 250, null, null],
+        [0, "우희", null, 0, null, 77, 77, 43, 0, 160, 250, null, null],
+        [0, "달샤벳 수빈", null, 0, null, 79, 74, 47, 0, 160, 250, null, null],
+        [0, "효은", null, 0, null, 72, 71, 49, 0, 160, 250, null, null],
+        [0, "민희", null, 0, null, 69, 73, 46, 0, 160, 250, null, null],
+        [0, "소영", null, 0, null, 64, 70, 45, 0, 160, 250, null, null],
+        [0, "혜빈", null, 0, null, 62, 49, 66, 0, 160, 250, null, null],
+        [0, "연우", null, 0, null, 88, 81, 43, 0, 160, 250, null, null],
+        [0, "제인", null, 0, null, 72, 47, 61, 0, 160, 250, null, null],
+        [0, "모모랜드 태하", null, 0, null, 60, 64, 42, 0, 160, 250, null, null],
+        [0, "나윤", null, 0, null, 62, 61, 33, 0, 160, 250, null, null],
+        [0, "데이지", null, 0, null, 68, 63, 38, 0, 160, 250, null, null],
+        [0, "아인", null, 0, null, 72, 57, 39, 0, 160, 250, null, null],
+        [0, "주이", null, 0, null, 40, 80, 46, 0, 160, 250, null, null],
+        [0, "낸시", null, 0, null, 91, 84, 47, 0, 160, 250, null, null],
+        [0, "선예", null, 0, null, 83, 51, 82, 0, 160, 250, null, null],
+        [0, "선미", null, 0, null, 85, 86, 50, 0, 160, 250, null, null],
+        [0, "유빈", null, 0, null, 78, 86, 80, 0, 160, 250, null, null],
+        [0, "혜림", null, 0, null, 69, 63, 47, 0, 160, 250, null, null],
+        [0, "예은", null, 0, null, 60, 41, 70, 0, 160, 250, null, null],
+        [0, "빅토리아", null, 0, null, 89, 88, 60, 0, 160, 250, null, null],
+        [0, "크리스탈", null, 0, null, 93, 78, 51, 0, 160, 250, null, null],
+        [0, "엠버", null, 0, null, 65, 59, 74, 0, 160, 250, null, null],
+        [0, "루나", null, 0, null, 76, 52, 94, 0, 160, 250, null, null],
+        [0, "재이", null, 0, null, 80, 70, 50, 0, 160, 250, null, null],
+        [0, "린지", null, 0, null, 69, 48, 71, 0, 160, 250, null, null],
+        [0, "피에스타 예지", null, 0, null, 58, 43, 78, 0, 160, 250, null, null],
+        [0, "피에스타 혜미", null, 0, null, 66, 54, 39, 0, 160, 250, null, null],
+        [0, "차오루", null, 0, null, 78, 73, 47, 0, 160, 250, null, null],
+        [0, "민영", null, 0, null, 80, 62, 88, 0, 160, 250, null, null],
+        [0, "브레이브걸스 유정", null, 0, null, 87, 86, 57, 0, 160, 250, null, null],
+        [0, "브레이브걸스 은지", null, 0, null, 83, 86, 58, 0, 160, 250, null, null],
+        [0, "브레이브걸스 유나", null, 0, null, 84, 84, 56, 0, 160, 250, null, null],
+        [0, "하윤", null, 0, null, 71, 78, 49, 0, 160, 250, null, null],
+        [0, "베리굿 태하", null, 0, null, 78, 75, 48, 0, 160, 250, null, null],
+        [0, "조현", null, 0, null, 79, 78, 42, 0, 160, 250, null, null],
+        [0, "서율", null, 0, null, 68, 63, 32, 0, 160, 250, null, null],
+        [0, "다예", null, 0, null, 70, 62, 34, 0, 160, 250, null, null],
+        [0, "세형", null, 0, null, 72, 70, 39, 0, 160, 250, null, null],
+        [0, "고운", null, 0, null, 77, 71, 38, 0, 160, 250, null, null],
+        [0, "간미연", null, 0, null, 77, 46, 73, 0, 160, 250, null, null],
+        [0, "김이지", null, 0, null, 70, 73, 41, 0, 160, 250, null, null],
+        [0, "윤은혜", null, 0, null, 72, 71, 41, 0, 160, 250, null, null],
+        [0, "심은진", null, 0, null, 75, 78, 40, 0, 160, 250, null, null],
+        [0, "이희진", null, 0, null, 63, 44, 81, 0, 160, 250, null, null],
+        [0, "유지", null, 0, null, 72, 49, 73, 0, 160, 250, null, null],
+        [0, "다혜", null, 0, null, 70, 67, 43, 0, 160, 250, null, null],
+        [0, "베스티 혜연", null, 0, null, 64, 43, 70, 0, 160, 250, null, null],
+        [0, "해령", null, 0, null, 81, 40, 76, 0, 160, 250, null, null],
+        [0, "김보아", null, 0, null, 69, 43, 86, 0, 160, 250, null, null],
+        [0, "박시현", null, 0, null, 73, 42, 66, 0, 160, 250, null, null],
+        [0, "양지원", null, 0, null, 84, 40, 69, 0, 160, 250, null, null],
+        [0, "나래", null, 0, null, 69, 45, 79, 0, 160, 250, null, null],
+        [0, "김보형", null, 0, null, 67, 41, 83, 0, 160, 250, null, null],
+        [0, "주비", null, 0, null, 72, 43, 82, 0, 160, 250, null, null],
+        [0, "미성", null, 0, null, 78, 51, 84, 0, 160, 250, null, null],
+        [0, "코타", null, 0, null, 67, 53, 87, 0, 160, 250, null, null],
+        [0, "금비라", null, 0, null, 63, 45, 87, 0, 160, 250, null, null],
+        [0, "김연지", null, 0, null, 40, 44, 96, 0, 160, 250, null, null],
+        [0, "이보람", null, 0, null, 61, 46, 87, 0, 160, 250, null, null],
+        [0, "남규리", null, 0, null, 87, 45, 72, 0, 160, 250, null, null],
+        [0, "다나", null, 0, null, 70, 50, 76, 0, 160, 250, null, null],
+        [0, "린아", null, 0, null, 86, 78, 42, 0, 160, 250, null, null],
+        [0, "선데이", null, 0, null, 72, 77, 46, 0, 160, 250, null, null],
+        [0, "스테파니", null, 0, null, 76, 94, 42, 0, 160, 250, null, null],
+        [0, "박정아", null, 0, null, 70, 53, 88, 0, 160, 250, null, null],
+        [0, "하주연", null, 0, null, 52, 42, 43, 0, 160, 250, null, null],
+        [0, "박세미", null, 0, null, 60, 39, 57, 0, 160, 250, null, null],
+        [0, "김예원", null, 0, null, 51, 37, 28, 0, 160, 250, null, null],
+        [0, "서인영", null, 0, null, 63, 68, 38, 0, 160, 250, null, null],
+        [0, "차희", null, 0, null, 71, 49, 80, 0, 160, 250, null, null],
+        [0, "멜로디 유민", null, 0, null, 79, 45, 78, 0, 160, 250, null, null],
+        [0, "예인", null, 0, null, 78, 53, 78, 0, 160, 250, null, null],
+        [0, "여은", null, 0, null, 70, 47, 80, 0, 160, 250, null, null],
+        [0, "오승희", null, 0, null, 73, 50, 69, 0, 160, 250, null, null],
+        [0, "최유진", null, 0, null, 76, 43, 67, 0, 160, 250, null, null],
+        [0, "장승연", null, 0, null, 68, 72, 51, 0, 160, 250, null, null],
+        [0, "SORN", null, 0, null, 64, 73, 52, 0, 160, 250, null, null],
+        [0, "장예은", null, 0, null, 70, 76, 46, 0, 160, 250, null, null],
+        [0, "엘키", null, 0, null, 78, 71, 50, 0, 160, 250, null, null],
+        [0, "권은빈", null, 0, null, 76, 73, 48, 0, 160, 250, null, null],
+        [0, "프리스틴 나영", null, 0, null, 73, 75, 50, 0, 160, 250, null, null],
+        [0, "로아", null, 0, null, 68, 71, 41, 0, 160, 250, null, null],
+        [0, "유하", null, 0, null, 70, 68, 35, 0, 160, 250, null, null],
+        [0, "은우", null, 0, null, 72, 67, 43, 0, 160, 250, null, null],
+        [0, "레나", null, 0, null, 73, 46, 73, 0, 160, 250, null, null],
+        [0, "결경", null, 0, null, 78, 66, 39, 0, 160, 250, null, null],
+        [0, "예하나", null, 0, null, 63, 65, 45, 0, 160, 250, null, null],
+        [0, "성연", null, 0, null, 69, 71, 40, 0, 160, 250, null, null],
+        [0, "시연", null, 0, null, 66, 42, 66, 0, 160, 250, null, null],
+        [0, "카일라", null, 0, null, 60, 69, 40, 0, 160, 250, null, null],
+        [0, "지유", null, 0, null, 72, 63, 46, 0, 160, 250, null, null],
+        [0, "라니아 혜미", null, 0, null, 66, 63, 41, 0, 160, 250, null, null],
+        [0, "지은", null, 0, null, 61, 40, 56, 0, 160, 250, null, null],
+        [0, "라니아 유민", null, 0, null, 68, 43, 66, 0, 160, 250, null, null],
+        [0, "따보", null, 0, null, 58, 60, 37, 0, 160, 250, null, null],
+        [0, "제니", null, 0, null, 62, 41, 81, 0, 160, 250, null, null],
+        [0, "건지", null, 0, null, 72, 43, 84, 0, 160, 250, null, null],
+        [0, "서린", null, 0, null, 66, 40, 83, 0, 160, 250, null, null],
+        [0, "나리", null, 0, null, 84, 86, 58, 0, 160, 250, null, null],
+        [0, "지애", null, 0, null, 63, 81, 42, 0, 160, 250, null, null],
+        [0, "우주", null, 0, null, 67, 86, 49, 0, 160, 250, null, null],
+        [0, "와썹 수진", null, 0, null, 64, 80, 43, 0, 160, 250, null, null],
+        [0, "타히티 민재", null, 0, null, 62, 63, 46, 0, 160, 250, null, null],
+        [0, "타히티 미소", null, 0, null, 63, 60, 41, 0, 160, 250, null, null],
+        [0, "타히티 지수", null, 0, null, 61, 37, 67, 0, 160, 250, null, null],
+        [0, "아리", null, 0, null, 72, 69, 44, 0, 160, 250, null, null],
+        [0, "제리", null, 0, null, 66, 41, 68, 0, 160, 250, null, null],
+        [0, "아유미", null, 0, null, 80, 68, 48, 0, 160, 250, null, null],
+        [0, "혜승", null, 0, null, 68, 57, 31, 0, 160, 250, null, null],
+        [0, "하린", null, 0, null, 70, 30, 66, 0, 160, 250, null, null],
+        [0, "황정음", null, 0, null, 79, 45, 72, 0, 160, 250, null, null],
+        [0, "슈가 수진", null, 0, null, 83, 44, 63, 0, 160, 250, null, null],
+        [0, "산다라박", null, 0, null, 80, 66, 44, 0, 160, 250, null, null],
+        [0, "씨엘", null, 0, null, 40, 90, 82, 0, 160, 250, null, null],
+        [0, "박봄", null, 0, null, 55, 40, 73, 0, 160, 250, null, null],
+        [0, "공민지", null, 0, null, 40, 89, 61, 0, 160, 250, null, null],
+        [0, "지아", null, 0, null, 68, 83, 50, 0, 160, 250, null, null],
+        [0, "민", null, 0, null, 62, 82, 53, 0, 160, 250, null, null],
+        [0, "페이", null, 0, null, 74, 87, 64, 0, 160, 250, null, null],
+        [0, "앤씨아", null, 0, null, 74, 52, 70, 0, 160, 250, null, null],
+        [0, "윤하", null, 0, null, 83, 53, 89, 0, 160, 250, null, null],
+        [0, "아이비", null, 0, null, 77, 72, 77, 0, 160, 250, null, null],
+        [0, "코코", null, 0, null, 80, 50, 78, 0, 160, 250, null, null],
+        [0, "소리", null, 0, null, 78, 50, 78, 0, 160, 250, null, null],
+        [0, "벤", null, 0, null, 79, 43, 90, 0, 160, 250, null, null],
+        [0, "김청하", null, 0, null, 73, 94, 62, 0, 160, 250, null, null],
+        [0, "장나라", null, 0, null, 90, 52, 85, 0, 160, 250, null, null],
+        [0, "엘린", null, 0, null, 51, 31, 23, 0, 160, 250, null, null],
+        [0, "소율", null, 0, null, 70, 46, 64, 0, 160, 250, null, null],
+        [0, "금미", null, 0, null, 73, 63, 41, 0, 160, 250, null, null],
+        [0, "크레용팝 초아", null, 0, null, 72, 67, 45, 0, 160, 250, null, null],
+        [0, "웨이", null, 0, null, 70, 45, 60, 0, 160, 250, null, null],
+        [0, "쥬니엘", null, 0, null, 80, 46, 81, 0, 160, 250, null, null],
+        [0, "이민", null, 0, null, 64, 40, 83, 0, 160, 250, null, null],
+        [0, "크리스탈채", null, 0, null, 72, 41, 84, 0, 160, 250, null, null],
+        [0, "윤미래", null, 0, null, 57, 80, 102, 0, 160, 250, null, null],
+        [0, "애니", null, 0, null, 58, 92, 68, 0, 160, 250, null, null],
+        [0, "NS윤지", null, 0, null, 86, 88, 58, 0, 160, 250, null, null],
+        [0, "미연", null, 0, null, 89, 59, 88, 0, 160, 250, null, null],
+        [0, "민니", null, 0, null, 73, 49, 66, 0, 160, 250, null, null],
+        [0, "아이들 수진", null, 0, null, 60, 46, 21, 0, 160, 250, null, null],
+        [0, "전소연", null, 0, null, 68, 68, 96, 0, 160, 250, null, null],
+        [0, "우기", null, 0, null, 67, 70, 46, 0, 160, 250, null, null],
+        [0, "슈화", null, 0, null, 71, 49, 78, 0, 160, 250, null, null],
+        [0, "미야와키 사쿠라", null, 0, null, 88, 82, 44, 0, 160, 250, null, null],
+        [0, "최예나", null, 0, null, 76, 74, 58, 0, 160, 250, null, null],
+        [0, "야부키 나코", null, 0, null, 78, 53, 88, 0, 160, 250, null, null],
+        [0, "권은비", null, 0, null, 83, 77, 50, 0, 160, 250, null, null],
+        [0, "강혜원", null, 0, null, 81, 70, 48, 0, 160, 250, null, null],
+        [0, "혼다 히토미", null, 0, null, 77, 51, 80, 0, 160, 250, null, null],
+        [0, "아이즈원 김채원", null, 0, null, 72, 55, 73, 0, 160, 250, null, null],
+        [0, "김민주", null, 0, null, 84, 56, 74, 0, 160, 250, null, null],
+        [0, "이채연", null, 0, null, 69, 87, 55, 0, 160, 250, null, null],
+        [0, "전소미", null, 0, null, 83, 79, 50, 0, 160, 250, null, null],
+        [0, "희진", null, 0, null, 79, 66, 82, 0, 160, 250, null, null],
+        [0, "현진", null, 0, null, 81, 83, 58, 0, 160, 250, null, null],
+        [0, "하슬", null, 0, null, 71, 54, 84, 0, 160, 250, null, null],
+        [0, "여진", null, 0, null, 68, 79, 61, 0, 160, 250, null, null],
+        [0, "비비", null, 0, null, 74, 55, 70, 0, 160, 250, null, null],
+        [0, "김립", null, 0, null, 68, 81, 53, 0, 160, 250, null, null],
+        [0, "진솔", null, 0, null, 69, 54, 78, 0, 160, 250, null, null],
+        [0, "최리", null, 0, null, 68, 54, 71, 0, 160, 250, null, null],
+        [0, "이브", null, 0, null, 72, 77, 56, 0, 160, 250, null, null],
+        [0, "츄", null, 0, null, 84, 83, 57, 0, 160, 250, null, null],
+        [0, "고원", null, 0, null, 70, 77, 51, 0, 160, 250, null, null],
+        [0, "올리비아 혜", null, 0, null, 88, 57, 87, 0, 160, 250, null, null],
+        [0, "ITZY 예지", null, 0, null, 87, 88, 59, 0, 160, 250, null, null],
+        [0, "리아", null, 0, null, 88, 53, 87, 0, 160, 250, null, null],
+        [0, "류진", null, 0, null, 84, 89, 58, 0, 160, 250, null, null],
+        [0, "채령", null, 0, null, 79, 91, 60, 0, 160, 250, null, null],
+        [0, "ITZY 유나", null, 0, null, 86, 59, 88, 0, 160, 250, null, null],
+        [0, "카리나", null, 0, null, 97, 98, 63, 0, 160, 250, null, null],
+        [0, "윈터", null, 0, null, 96, 66, 94, 0, 160, 250, null, null],
+        [0, "지젤", null, 0, null, 88, 58, 86, 0, 160, 250, null, null],
+        [0, "닝닝", null, 0, null, 89, 62, 87, 0, 160, 250, null, null],
+        [0, "가을", null, 0, null, 83, 86, 58, 0, 160, 250, null, null],
+        [0, "레이", null, 0, null, 81, 52, 81, 0, 160, 250, null, null],
+        [0, "리즈", null, 0, null, 78, 53, 84, 0, 160, 250, null, null],
+        [0, "이서", null, 0, null, 80, 86, 51, 0, 160, 250, null, null],
+        [0, "연희", null, 0, null, 79, 54, 78, 0, 160, 250, null, null],
+        [0, "쥬리", null, 0, null, 81, 60, 77, 0, 160, 250, null, null],
+        [0, "수윤", null, 0, null, 75, 83, 61, 0, 160, 250, null, null],
+        [0, "윤경", null, 0, null, 78, 60, 80, 0, 160, 250, null, null],
+        [0, "소희", null, 0, null, 73, 52, 71, 0, 160, 250, null, null],
+        [0, "안소희", null, 0, null, 87, 63, 41, 0, 160, 250, null, null],
+        [0, "로켓펀치 다현", null, 0, null, 79, 51, 70, 0, 160, 250, null, null],
+        [0, "해윤", null, 0, null, 72, 83, 50, 0, 160, 250, null, null],
+        [0, "체리블렛 유주", null, 0, null, 76, 48, 70, 0, 160, 250, null, null],
+        [0, "레미", null, 0, null, 70, 78, 46, 0, 160, 250, null, null],
+        [0, "채린", null, 0, null, 76, 81, 48, 0, 160, 250, null, null],
+        [0, "메이", null, 0, null, 81, 77, 40, 0, 160, 250, null, null],
+        [0, "체리블렛 보라", null, 0, null, 78, 51, 86, 0, 160, 250, null, null],
+        [0, "지원", null, 0, null, 80, 50, 75, 0, 160, 250, null, null],
+        [0, "상아", null, 0, null, 72, 81, 46, 0, 160, 250, null, null],
+        [0, "초원", null, 0, null, 78, 53, 80, 0, 160, 250, null, null],
+        [0, "LIGHTSUM 나영", null, 0, null, 70, 55, 78, 0, 160, 250, null, null],
+        [0, "히나", null, 0, null, 78, 52, 73, 0, 160, 250, null, null],
+        [0, "주현", null, 0, null, 69, 82, 60, 0, 160, 250, null, null],
+        [0, "LIGHTSUM 유정", null, 0, null, 72, 51, 80, 0, 160, 250, null, null],
+        [0, "휘연", null, 0, null, 68, 68, 50, 0, 160, 250, null, null],
+        [0, "지안", null, 0, null, 65, 48, 65, 0, 160, 250, null, null],
+        [0, "서령", null, 0, null, 70, 50, 76, 0, 160, 250, null, null],
+        [0, "서경", null, 0, null, 70, 77, 48, 0, 160, 250, null, null],
+        [0, "미야", null, 0, null, 72, 52, 73, 0, 160, 250, null, null],
+        [0, "공원소녀 레나", null, 0, null, 68, 50, 77, 0, 160, 250, null, null],
+        [0, "앤", null, 0, null, 73, 48, 70, 0, 160, 250, null, null],
+        [0, "공원소녀 민주", null, 0, null, 72, 49, 66, 0, 160, 250, null, null],
+        [0, "소소", null, 0, null, 70, 76, 50, 0, 160, 250, null, null],
+        [0, "유아이", null, 0, null, 68, 60, 40, 0, 160, 250, null, null],
+        [0, "보니", null, 0, null, 73, 51, 72, 0, 160, 250, null, null],
+        [0, "라라", null, 0, null, 78, 48, 78, 0, 160, 250, null, null],
+        [0, "미소", null, 0, null, 74, 50, 61, 0, 160, 250, null, null],
+        [0, "드림노트 수민", null, 0, null, 77, 73, 49, 0, 160, 250, null, null],
+        [0, "은조", null, 0, null, 76, 72, 50, 0, 160, 250, null, null],
+        [0, "드림캐쳐 지유", null, 0, null, 76, 81, 58, 0, 160, 250, null, null],
+        [0, "수아", null, 0, null, 73, 80, 62, 0, 160, 250, null, null],
+        [0, "드림캐쳐 시연", null, 0, null, 68, 59, 80, 0, 160, 250, null, null],
+        [0, "유현", null, 0, null, 70, 71, 71, 0, 160, 250, null, null],
+        [0, "다미", null, 0, null, 71, 56, 77, 0, 160, 250, null, null],
+        [0, "한동", null, 0, null, 69, 48, 76, 0, 160, 250, null, null],
+        [0, "가현", null, 0, null, 70, 56, 61, 0, 160, 250, null, null],
+        [0, "릴리", null, 0, null, 77, 50, 83, 0, 160, 250, null, null],
+        [0, "해원", null, 0, null, 74, 49, 81, 0, 160, 250, null, null],
+        [0, "설윤", null, 0, null, 98, 65, 92, 0, 160, 250, null, null],
+        [0, "지니", null, 0, null, 94, 93, 57, 0, 160, 250, null, null],
+        [0, "배이", null, 0, null, 80, 77, 58, 0, 160, 250, null, null],
+        [0, "지우", null, 0, null, 82, 83, 55, 0, 160, 250, null, null],
+        [0, "규진", null, 0, null, 81, 84, 52, 0, 160, 250, null, null],
+        [0, "이새롬", null, 0, null, 73, 80, 51, 0, 160, 250, null, null],
+        [0, "송하영", null, 0, null, 68, 84, 70, 0, 160, 250, null, null],
+        [0, "장규리", null, 0, null, 78, 56, 78, 0, 160, 250, null, null],
+        [0, "박지원", null, 0, null, 72, 54, 77, 0, 160, 250, null, null],
+        [0, "노지선", null, 0, null, 72, 63, 52, 0, 160, 250, null, null],
+        [0, "이서연", null, 0, null, 70, 62, 59, 0, 160, 250, null, null],
+        [0, "이채영", null, 0, null, 77, 81, 60, 0, 160, 250, null, null],
+        [0, "백지헌", null, 0, null, 78, 47, 78, 0, 160, 250, null, null],
+        [0, "STAYC 수민", null, 0, null, 75, 53, 70, 0, 160, 250, null, null],
+        [0, "시은", null, 0, null, 73, 50, 77, 0, 160, 250, null, null],
+        [0, "아이사", null, 0, null, 76, 56, 78, 0, 160, 250, null, null],
+        [0, "세은", null, 0, null, 80, 53, 77, 0, 160, 250, null, null],
+        [0, "윤", null, 0, null, 77, 52, 63, 0, 160, 250, null, null],
+        [0, "STAYC 재이", null, 0, null, 74, 49, 69, 0, 160, 250, null, null],
+        [0, "네이처 소희", null, 0, null, 78, 56, 83, 0, 160, 250, null, null],
+        [0, "새봄", null, 0, null, 77, 55, 77, 0, 160, 250, null, null],
+        [0, "루", null, 0, null, 75, 53, 80, 0, 160, 250, null, null],
+        [0, "채빈", null, 0, null, 78, 54, 78, 0, 160, 250, null, null],
+        [0, "하루", null, 0, null, 75, 83, 58, 0, 160, 250, null, null],
+        [0, "유채", null, 0, null, 70, 43, 70, 0, 160, 250, null, null],
+        [0, "선샤인", null, 0, null, 71, 42, 76, 0, 160, 250, null, null],
+        [0, "오로라", null, 0, null, 78, 50, 73, 0, 160, 250, null, null],
+        [0, "로하", null, 0, null, 68, 82, 56, 0, 160, 250, null, null]
+    ],
+    "general_ex":[
+    ],
+    "cities":[
+
+    ],
+    "history":[
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>제작자: 세정.",
+        "<C>●</>180년 1월:<L><b>【가상모드13-b】</b>걸그룹대전(비급)</>",
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>최고의 걸그룹을 가린다! (2022. 4. 20.)"
+    ],
+    "initialEvents":[
+        [
+            true,
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "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", 1000,
+            ["and",
+                ["Date", ">=", 183, 1],
+                ["RemainNation", "==", 1]
+            ],
+            ["BlockScoutAction"],
+            ["DeleteEvent"]
+        ]
+
+    ]
+}

hwe/scenario/scenario_2704.json

@@ -0,0 +1,1082 @@
+{
+    "title": "【가상모드27-e】 아시아 명장전(비급+파죽지세)",
+    "startYear": 180,
+    "history": [
+        "<C>●</>180년 1월:<L><b>【가상모드27-e】</b>아시아 명장전!(비급+파죽지세)</>",
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>삼국지를 기반으로 아시아의 고대 명장들이 추가된 시나리오"
+    ],
+    "stat": {
+        "total": 310,
+        "min": 40,
+        "max": 140
+    },
+    "iconPath": ".",
+    "fiction": 1,
+    "nation":[],
+    "diplomacy":[],
+    "const": {
+        "scenarioEffect": "event_StrongAttacker",
+        "availableInstantAction": {
+            "instantRetreat": true
+        },
+        "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_백마": 2,
+                "che_명마_07_기주마": 2,
+                "che_명마_07_오환마": 2,
+                "che_명마_07_백상": 2,
+                "che_명마_08_양주마": 2,
+                "che_명마_08_흉노마": 2,
+                "che_명마_09_과하마": 2,
+                "che_명마_09_의남백마": 2,
+                "che_명마_10_대완마": 2,
+                "che_명마_10_옥추마": 2,
+                "che_명마_11_서량마": 2,
+                "che_명마_11_화종마": 2,
+                "che_명마_12_사륜거": 2,
+                "che_명마_12_옥란백용구": 2,
+                "che_명마_13_절영": 2,
+                "che_명마_13_적로": 2,
+                "che_명마_14_적란마": 2,
+                "che_명마_14_조황비전": 2,
+                "che_명마_15_한혈마": 2,
+                "che_명마_15_적토마": 2
+            },
+            "weapon": {
+                "che_무기_01_단도": 0,
+                "che_무기_02_단궁": 0,
+                "che_무기_03_단극": 0,
+                "che_무기_04_목검": 0,
+                "che_무기_05_죽창": 0,
+                "che_무기_06_소부": 0,
+                "che_무기_07_동추": 2,
+                "che_무기_07_철편": 2,
+                "che_무기_07_철쇄": 2,
+                "che_무기_07_맥궁": 2,
+                "che_무기_08_유성추": 2,
+                "che_무기_08_철질여골": 2,
+                "che_무기_09_쌍철극": 2,
+                "che_무기_09_동호비궁": 2,
+                "che_무기_10_삼첨도": 2,
+                "che_무기_10_대부": 2,
+                "che_무기_11_고정도": 2,
+                "che_무기_11_이광궁": 2,
+                "che_무기_12_철척사모": 2,
+                "che_무기_12_칠성검": 2,
+                "che_무기_13_사모": 2,
+                "che_무기_13_양유기궁": 2,
+                "che_무기_14_언월도": 2,
+                "che_무기_14_방천화극": 2,
+                "che_무기_15_청홍검": 2,
+                "che_무기_15_의천검": 2
+            },
+            "book": {
+                "che_서적_01_효경전": 0,
+                "che_서적_02_회남자": 0,
+                "che_서적_03_변도론": 0,
+                "che_서적_04_건상역주": 0,
+                "che_서적_05_여씨춘추": 0,
+                "che_서적_06_사민월령": 0,
+                "che_서적_07_위료자": 2,
+                "che_서적_07_사마법": 2,
+                "che_서적_07_한서": 2,
+                "che_서적_07_논어": 2,
+                "che_서적_08_전론": 2,
+                "che_서적_08_사기": 2,
+                "che_서적_09_장자": 2,
+                "che_서적_09_역경": 2,
+                "che_서적_10_시경": 2,
+                "che_서적_10_구국론": 2,
+                "che_서적_11_상군서": 2,
+                "che_서적_11_춘추전": 2,
+                "che_서적_12_산해경": 2,
+                "che_서적_12_맹덕신서": 2,
+                "che_서적_13_관자": 2,
+                "che_서적_13_병법24편": 2,
+                "che_서적_14_한비자": 2,
+                "che_서적_14_오자병법": 2,
+                "che_서적_15_노자": 2,
+                "che_서적_15_손자병법": 2
+            },
+            "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
+            }
+        }
+    },
+    "general":[
+        [0, "아회남", null, 0, null, 65, 74, 26, 0, 160, 300, null, null],
+        [0, "이적", null, 0, null, 40, 24, 84, 0, 160, 300, null, null],
+        [0, "윤상", null, 0, null, 51, 44, 62, 0, 160, 300, null, null],
+        [0, "윤묵", null, 0, null, 26, 15, 66, 0, 160, 300, null, null],
+        [0, "우금", null, 0, null, 85, 82, 75, 0, 160, 300, null, null],
+        [0, "위관", null, 0, null, 69, 46, 79, 0, 160, 300, null, null],
+        [0, "원윤", null, 0, null, 32, 14, 39, 0, 160, 300, null, null],
+        [0, "원희", null, 0, null, 66, 51, 63, 0, 160, 300, null, null],
+        [0, "염행", null, 0, null, 78, 90, 58, 0, 160, 300, null, null],
+        [0, "염유", null, 0, null, 71, 57, 71, 0, 160, 300, null, null],
+        [0, "원술", null, 0, null, 76, 65, 75, 0, 160, 300, null, null, "천한 것들관 상종을 하면 안돼"],
+        [0, "원상", null, 0, null, 63, 75, 42, 0, 160, 300, null, null],
+        [0, "원소", null, 0, null, 90, 69, 81, 0, 160, 300, null, null],
+        [0, "염상", null, 0, null, 40, 27, 71, 0, 160, 300, null, null],
+        [0, "원담", null, 0, null, 60, 78, 30, 0, 160, 300, null, null],
+        [0, "염포", null, 0, null, 40, 25, 82, 0, 160, 300, null, null],
+        [0, "왕위", null, 0, null, 60, 70, 62, 0, 160, 300, null, null],
+        [0, "왕윤", null, 0, null, 26, 6, 68, 0, 160, 300, null, null],
+        [0, "왕항", null, 0, null, 76, 60, 61, 0, 160, 300, null, null],
+        [0, "왕찬", null, 0, null, 15, 3, 79, 0, 160, 300, null, null],
+        [0, "왕수", null, 0, null, 54, 27, 77, 0, 160, 300, null, null],
+        [0, "왕숙", null, 0, null, 36, 22, 76, 0, 160, 300, null, null],
+        [0, "왕준", null, 0, null, 85, 73, 84, 0, 160, 300, null, null],
+        [0, "왕쌍", null, 0, null, 67, 88, 19, 0, 160, 300, null, null],
+        [0, "왕창", null, 0, null, 74, 64, 79, 0, 160, 300, null, null],
+        [0, "왕평", null, 0, null, 88, 81, 70, 0, 160, 300, null, null],
+        [0, "왕보", null, 0, null, 62, 41, 79, 0, 160, 300, null, null],
+        [0, "왕문", null, 0, null, 65, 64, 31, 0, 160, 300, null, null],
+        [0, "왕릉1", null, 0, null, 74, 64, 71, 0, 160, 300, null, null],
+        [0, "왕루", null, 0, null, 28, 30, 79, 0, 160, 300, null, null],
+        [0, "왕랑", null, 0, null, 47, 35, 79, 0, 160, 300, null, null],
+        [0, "온회", null, 0, null, 62, 36, 74, 0, 160, 300, null, null],
+        [0, "하안", null, 0, null, 15, 30, 72, 0, 160, 300, null, null],
+        [0, "괴월", null, 0, null, 50, 38, 85, 0, 160, 300, null, null],
+        [0, "괴량", null, 0, null, 68, 33, 88, 0, 160, 300, null, null],
+        [0, "가화", null, 0, null, 49, 65, 41, 0, 160, 300, null, null],
+        [0, "가규", null, 0, null, 78, 61, 84, 0, 160, 300, null, null],
+        [0, "하의", null, 0, null, 56, 69, 36, 0, 160, 300, null, null],
+        [0, "화흠", null, 0, null, 51, 33, 88, 0, 160, 300, null, null],
+        [0, "가후", null, 0, null, 81, 22, 98, 0, 160, 300, null, null, "이기기 위한 전략만 내드리겠습니다"],
+        [0, "곽가", null, 0, null, 78, 16, 99, 0, 160, 300, null, null, "조공을 위한 명이 조금만 더 남았다면..."],
+        [0, "악환", null, 0, null, 65, 80, 42, 0, 160, 300, null, null],
+        [0, "곽사", null, 0, null, 64, 76, 13, 0, 160, 300, null, null],
+        [0, "악취", null, 0, null, 53, 66, 61, 0, 160, 300, null, null],
+        [0, "곽준", null, 0, null, 73, 66, 73, 0, 160, 300, null, null],
+        [0, "학소", null, 0, null, 90, 71, 88, 0, 160, 300, null, null],
+        [0, "악진", null, 0, null, 80, 85, 56, 0, 160, 300, null, null],
+        [0, "곽도", null, 0, null, 62, 50, 82, 0, 160, 300, null, null],
+        [0, "학맹", null, 0, null, 62, 67, 42, 0, 160, 300, null, null],
+        [0, "곽유지", null, 0, null, 28, 9, 69, 0, 160, 300, null, null],
+        [0, "곽익", null, 0, null, 73, 69, 69, 0, 160, 300, null, null],
+        [0, "곽회", null, 0, null, 90, 77, 85, 0, 160, 300, null, null],
+        [0, "하후위", null, 0, null, 71, 73, 49, 0, 160, 300, null, null],
+        [0, "하후연", null, 0, null, 95, 92, 74, 0, 160, 300, null, null, "궁술로 날 당해낼 자가 있을까?"],
+        [0, "하후은", null, 0, null, 63, 72, 53, 0, 160, 300, null, null],
+        [0, "하후화", null, 0, null, 48, 51, 71, 0, 160, 300, null, null],
+        [0, "하후혜", null, 0, null, 50, 44, 76, 0, 160, 300, null, null],
+        [0, "하후현", null, 0, null, 54, 39, 76, 0, 160, 300, null, null],
+        [0, "하후상", null, 0, null, 79, 72, 75, 0, 160, 300, null, null],
+        [0, "하후덕", null, 0, null, 69, 73, 32, 0, 160, 300, null, null],
+        [0, "하후돈", null, 0, null, 91, 88, 68, 0, 160, 300, null, null],
+        [0, "하후패", null, 0, null, 79, 85, 77, 0, 160, 300, null, null],
+        [0, "하후무", null, 0, null, 20, 7, 4, 0, 160, 300, null, null],
+        [0, "가충", null, 0, null, 54, 31, 89, 0, 160, 300, null, null],
+        [0, "하진", null, 0, null, 68, 54, 75, 0, 160, 300, null, null],
+        [0, "화웅", null, 0, null, 78, 90, 55, 0, 160, 300, null, null],
+        [0, "한윤", null, 0, null, 26, 29, 65, 0, 160, 300, null, null],
+        [0, "관우", null, 0, null, 96, 99, 76, 0, 160, 300, null, null, "차가 식기 전에 적장의 목을 베어 오겠소!"],
+        [0, "환계", null, 0, null, 25, 26, 68, 0, 160, 300, null, null],
+        [0, "관해", null, 0, null, 70, 82, 10, 0, 160, 300, null, null],
+        [0, "관구검", null, 0, null, 84, 86, 62, 0, 160, 300, null, null],
+        [0, "한현", null, 0, null, 22, 33, 7, 0, 160, 300, null, null],
+        [0, "한호", null, 0, null, 73, 72, 84, 0, 160, 300, null, null],
+        [0, "관흥", null, 0, null, 76, 84, 67, 0, 160, 300, null, null],
+        [0, "관색", null, 0, null, 74, 83, 56, 0, 160, 300, null, null],
+        [0, "한수", null, 0, null, 78, 75, 79, 0, 160, 300, null, null],
+        [0, "한숭", null, 0, null, 25, 15, 71, 0, 160, 300, null, null],
+        [0, "관정", null, 0, null, 36, 52, 73, 0, 160, 300, null, null],
+        [0, "한섬", null, 0, null, 69, 66, 36, 0, 160, 300, null, null],
+        [0, "감택", null, 0, null, 51, 49, 83, 0, 160, 300, null, null],
+        [0, "한충", null, 0, null, 64, 67, 18, 0, 160, 300, null, null],
+        [0, "한당", null, 0, null, 76, 85, 61, 0, 160, 300, null, null],
+        [0, "한덕", null, 0, null, 63, 76, 25, 0, 160, 300, null, null],
+        [0, "감녕", null, 0, null, 92, 95, 76, 0, 160, 300, null, null],
+        [0, "한복", null, 0, null, 28, 3, 27, 0, 160, 300, null, null],
+        [0, "관평", null, 0, null, 78, 82, 72, 0, 160, 300, null, null],
+        [0, "간옹", null, 0, null, 20, 32, 75, 0, 160, 300, null, null],
+        [0, "안량", null, 0, null, 88, 96, 43, 0, 160, 300, null, null],
+        [0, "위연", null, 0, null, 91, 90, 75, 0, 160, 300, null, null],
+        [0, "국의", null, 0, null, 84, 78, 51, 0, 160, 300, null, null],
+        [0, "희지재", null, 0, null, 63, 35, 91, 0, 160, 300, null, null],
+        [0, "위속", null, 0, null, 67, 78, 31, 0, 160, 300, null, null],
+        [0, "위유", null, 0, null, 46, 29, 74, 0, 160, 300, null, null],
+        [0, "우금2", null, 0, null, 72, 79, 38, 0, 160, 300, null, null],
+        [0, "우보", null, 0, null, 38, 60, 21, 0, 160, 300, null, null],
+        [0, "강유", null, 0, null, 92, 80, 93, 0, 160, 300, null, null],
+        [0, "공지", null, 0, null, 43, 53, 62, 0, 160, 300, null, null],
+        [0, "교유", null, 0, null, 64, 69, 38, 0, 160, 300, null, null],
+        [0, "공도", null, 0, null, 59, 70, 23, 0, 160, 300, null, null],
+        [0, "허공", null, 0, null, 44, 66, 64, 0, 160, 300, null, null],
+        [0, "허정", null, 0, null, 23, 5, 68, 0, 160, 300, null, null],
+        [0, "허저", null, 0, null, 74, 97, 36, 0, 160, 300, null, null],
+        [0, "허유", null, 0, null, 36, 21, 80, 0, 160, 300, null, null],
+        [0, "기령", null, 0, null, 85, 84, 51, 0, 160, 300, null, null],
+        [0, "김의", null, 0, null, 32, 38, 65, 0, 160, 300, null, null],
+        [0, "김배삼결", null, 0, null, 64, 76, 19, 0, 160, 300, null, null],
+        [0, "김선", null, 0, null, 52, 68, 13, 0, 160, 300, null, null],
+        [0, "우번", null, 0, null, 46, 46, 87, 0, 160, 300, null, null],
+        [0, "형도영", null, 0, null, 69, 79, 41, 0, 160, 300, null, null],
+        [0, "엄안", null, 0, null, 82, 83, 72, 0, 160, 300, null, null],
+        [0, "엄망", null, 0, null, 68, 71, 40, 0, 160, 300, null, null],
+        [0, "엄준", null, 0, null, 41, 12, 71, 0, 160, 300, null, null],
+        [0, "엄정", null, 0, null, 50, 55, 39, 0, 160, 300, null, null],
+        [0, "엄백호", null, 0, null, 67, 70, 42, 0, 160, 300, null, null],
+        [0, "엄여", null, 0, null, 61, 78, 44, 0, 160, 300, null, null],
+        [0, "오의", null, 0, null, 79, 73, 70, 0, 160, 300, null, null],
+        [0, "황개", null, 0, null, 80, 86, 70, 0, 160, 300, null, null],
+        [0, "고간", null, 0, null, 74, 56, 48, 0, 160, 300, null, null],
+        [0, "황권", null, 0, null, 75, 59, 88, 0, 160, 300, null, null],
+        [0, "고유", null, 0, null, 57, 43, 72, 0, 160, 300, null, null],
+        [0, "고순", null, 0, null, 87, 89, 60, 0, 160, 300, null, null],
+        [0, "고상", null, 0, null, 68, 68, 53, 0, 160, 300, null, null],
+        [0, "고승", null, 0, null, 67, 73, 41, 0, 160, 300, null, null],
+        [0, "후성", null, 0, null, 74, 75, 68, 0, 160, 300, null, null],
+        [0, "후선", null, 0, null, 63, 66, 34, 0, 160, 300, null, null],
+        [0, "황조", null, 0, null, 81, 66, 62, 0, 160, 300, null, null],
+        [0, "공손월", null, 0, null, 74, 72, 47, 0, 160, 300, null, null],
+        [0, "공손연", null, 0, null, 65, 70, 60, 0, 160, 300, null, null],
+        [0, "공손공", null, 0, null, 39, 17, 69, 0, 160, 300, null, null],
+        [0, "공손강", null, 0, null, 72, 66, 65, 0, 160, 300, null, null],
+        [0, "공손찬", null, 0, null, 86, 82, 60, 0, 160, 300, null, null],
+        [0, "공손속", null, 0, null, 63, 68, 57, 0, 160, 300, null, null],
+        [0, "공손도", null, 0, null, 67, 71, 66, 0, 160, 300, null, null],
+        [0, "공손범", null, 0, null, 73, 69, 66, 0, 160, 300, null, null],
+        [0, "황충", null, 0, null, 88, 96, 70, 0, 160, 300, null, null],
+        [0, "고정", null, 0, null, 55, 63, 43, 0, 160, 300, null, null],
+        [0, "고패", null, 0, null, 66, 61, 69, 0, 160, 300, null, null],
+        [0, "황보숭", null, 0, null, 91, 61, 82, 0, 160, 300, null, null],
+        [0, "공융", null, 0, null, 30, 5, 73, 0, 160, 300, null, null],
+        [0, "고람", null, 0, null, 76, 82, 68, 0, 160, 300, null, null],
+        [0, "오경", null, 0, null, 69, 66, 52, 0, 160, 300, null, null],
+        [0, "호거아", null, 0, null, 70, 82, 41, 0, 160, 300, null, null],
+        [0, "호진", null, 0, null, 65, 74, 12, 0, 160, 300, null, null],
+        [0, "올돌골", null, 0, null, 79, 86, 11, 0, 160, 300, null, null],
+        [0, "호반", null, 0, null, 55, 55, 59, 0, 160, 300, null, null],
+        [0, "오반", null, 0, null, 74, 71, 59, 0, 160, 300, null, null],
+        [0, "고옹", null, 0, null, 52, 18, 81, 0, 160, 300, null, null],
+        [0, "오란", null, 0, null, 68, 80, 35, 0, 160, 300, null, null],
+        [0, "채화", null, 0, null, 39, 50, 1, 0, 160, 300, null, null],
+        [0, "채중", null, 0, null, 40, 54, 2, 0, 160, 300, null, null],
+        [0, "채모", null, 0, null, 70, 70, 77, 0, 160, 300, null, null],
+        [0, "착융", null, 0, null, 60, 69, 38, 0, 160, 300, null, null],
+        [0, "사마의", null, 0, null, 99, 63, 98, 0, 160, 300, null, null],
+        [0, "사마염", null, 0, null, 69, 59, 77, 0, 160, 300, null, null],
+        [0, "사마사", null, 0, null, 84, 64, 89, 0, 160, 300, null, null],
+        [0, "사마소", null, 0, null, 85, 57, 88, 0, 160, 300, null, null],
+        [0, "사마부", null, 0, null, 70, 37, 77, 0, 160, 300, null, null],
+        [0, "사마랑", null, 0, null, 20, 21, 72, 0, 160, 300, null, null],
+        [0, "사마가", null, 0, null, 66, 84, 25, 0, 160, 300, null, null],
+        [0, "주흔", null, 0, null, 65, 62, 73, 0, 160, 300, null, null],
+        [0, "주앙", null, 0, null, 74, 65, 65, 0, 160, 300, null, null],
+        [0, "주지", null, 0, null, 73, 85, 41, 0, 160, 300, null, null],
+        [0, "주창", null, 0, null, 68, 77, 42, 0, 160, 300, null, null],
+        [0, "주태", null, 0, null, 84, 90, 48, 0, 160, 300, null, null],
+        [0, "주방", null, 0, null, 52, 41, 80, 0, 160, 300, null, null],
+        [0, "주유", null, 0, null, 97, 71, 98, 0, 160, 300, null, null],
+        [0, "주환", null, 0, null, 87, 84, 77, 0, 160, 300, null, null],
+        [0, "주거", null, 0, null, 77, 57, 72, 0, 160, 300, null, null],
+        [0, "축융", null, 0, null, 72, 75, 35, 0, 160, 300, null, null],
+        [0, "주준", null, 0, null, 89, 65, 76, 0, 160, 300, null, null],
+        [0, "주연", null, 0, null, 86, 75, 74, 0, 160, 300, null, null],
+        [0, "주치", null, 0, null, 71, 56, 72, 0, 160, 300, null, null],
+        [0, "주포", null, 0, null, 68, 73, 34, 0, 160, 300, null, null],
+        [0, "주령", null, 0, null, 78, 73, 67, 0, 160, 300, null, null],
+        [0, "순욱", null, 0, null, 78, 38, 97, 0, 160, 300, null, null],
+        [0, "순우경", null, 0, null, 78, 66, 29, 0, 160, 300, null, null],
+        [0, "순심", null, 0, null, 45, 25, 78, 0, 160, 300, null, null],
+        [0, "순유", null, 0, null, 80, 35, 95, 0, 160, 300, null, null],
+        [0, "장완", null, 0, null, 78, 34, 89, 0, 160, 300, null, null],
+        [0, "종회", null, 0, null, 88, 62, 93, 0, 160, 300, null, null],
+        [0, "장간", null, 0, null, 19, 6, 66, 0, 160, 300, null, null],
+        [0, "장의거", null, 0, null, 71, 58, 59, 0, 160, 300, null, null],
+        [0, "장흠", null, 0, null, 78, 85, 54, 0, 160, 300, null, null],
+        [0, "장제3", null, 0, null, 62, 43, 85, 0, 160, 300, null, null],
+        [0, "초주", null, 0, null, 16, 3, 67, 0, 160, 300, null, null],
+        [0, "초촉", null, 0, null, 65, 76, 33, 0, 160, 300, null, null],
+        [0, "향총", null, 0, null, 76, 61, 77, 0, 160, 300, null, null],
+        [0, "종요", null, 0, null, 79, 24, 90, 0, 160, 300, null, null],
+        [0, "향랑", null, 0, null, 28, 18, 74, 0, 160, 300, null, null],
+        [0, "서영", null, 0, null, 92, 80, 62, 0, 160, 300, null, null],
+        [0, "제갈각", null, 0, null, 72, 47, 90, 0, 160, 300, null, null],
+        [0, "제갈근", null, 0, null, 75, 34, 85, 0, 160, 300, null, null],
+        [0, "제갈균", null, 0, null, 29, 25, 52, 0, 160, 300, null, null],
+        [0, "제갈탄", null, 0, null, 72, 72, 76, 0, 160, 300, null, null],
+        [0, "제갈량", null, 0, null, 98, 43, 100, 0, 160, 300, null, null],
+        [0, "서황", null, 0, null, 95, 94, 78, 0, 160, 300, null, null],
+        [0, "서서", null, 0, null, 90, 64, 94, 0, 160, 300, null, null],
+        [0, "서성", null, 0, null, 86, 81, 78, 0, 160, 300, null, null],
+        [0, "서막", null, 0, null, 55, 32, 68, 0, 160, 300, null, null],
+        [0, "신의", null, 0, null, 55, 59, 60, 0, 160, 300, null, null],
+        [0, "신탐", null, 0, null, 56, 62, 54, 0, 160, 300, null, null],
+        [0, "심배", null, 0, null, 80, 60, 84, 0, 160, 300, null, null],
+        [0, "신비", null, 0, null, 42, 24, 79, 0, 160, 300, null, null],
+        [0, "신평", null, 0, null, 69, 43, 77, 0, 160, 300, null, null],
+        [0, "진복", null, 0, null, 31, 7, 73, 0, 160, 300, null, null],
+        [0, "진랑", null, 0, null, 58, 70, 35, 0, 160, 300, null, null],
+        [0, "휴고", null, 0, null, 63, 71, 38, 0, 160, 300, null, null],
+        [0, "추단", null, 0, null, 61, 64, 34, 0, 160, 300, null, null],
+        [0, "성의", null, 0, null, 74, 72, 41, 0, 160, 300, null, null],
+        [0, "성공영", null, 0, null, 73, 71, 80, 0, 160, 300, null, null],
+        [0, "설종", null, 0, null, 34, 16, 73, 0, 160, 300, null, null],
+        [0, "단경1", null, 0, null, 71, 68, 43, 0, 160, 300, null, null],
+        [0, "전종", null, 0, null, 78, 72, 75, 0, 160, 300, null, null],
+        [0, "조예", null, 0, null, 72, 52, 82, 0, 160, 300, null, null],
+        [0, "조휴", null, 0, null, 84, 78, 62, 0, 160, 300, null, null],
+        [0, "송헌", null, 0, null, 68, 77, 38, 0, 160, 300, null, null],
+        [0, "조앙", null, 0, null, 78, 67, 69, 0, 160, 300, null, null],
+        [0, "조홍", null, 0, null, 80, 75, 55, 0, 160, 300, null, null],
+        [0, "조순", null, 0, null, 85, 83, 63, 0, 160, 300, null, null],
+        [0, "조창", null, 0, null, 86, 91, 59, 0, 160, 300, null, null],
+        [0, "조식", null, 0, null, 45, 22, 86, 0, 160, 300, null, null],
+        [0, "조진", null, 0, null, 88, 74, 70, 0, 160, 300, null, null],
+        [0, "조인", null, 0, null, 94, 90, 72, 0, 160, 300, null, null],
+        [0, "조성", null, 0, null, 54, 74, 38, 0, 160, 300, null, null],
+        [0, "조조", null, 0, null, 100, 72, 96, 0, 160, 300, null, null, "미망인이 더 매력적이란 말이야... 후후"],
+        [0, "조충", null, 0, null, 43, 21, 74, 0, 160, 300, null, null],
+        [0, "장패", null, 0, null, 78, 86, 53, 0, 160, 300, null, null],
+        [0, "조비", null, 0, null, 75, 71, 87, 0, 160, 300, null, null, "새로운 왕조를 열겠다..."],
+        [0, "조표", null, 0, null, 54, 69, 32, 0, 160, 300, null, null],
+        [0, "저수", null, 0, null, 86, 46, 95, 0, 160, 300, null, null],
+        [0, "소비", null, 0, null, 69, 63, 66, 0, 160, 300, null, null],
+        [0, "조무", null, 0, null, 70, 71, 66, 0, 160, 300, null, null],
+        [0, "손환", null, 0, null, 82, 73, 76, 0, 160, 300, null, null],
+        [0, "손견", null, 0, null, 94, 95, 73, 0, 160, 300, null, null],
+        [0, "손건", null, 0, null, 44, 33, 79, 0, 160, 300, null, null],
+        [0, "손권", null, 0, null, 86, 69, 83, 0, 160, 300, null, null],
+        [0, "손교", null, 0, null, 77, 72, 67, 0, 160, 300, null, null],
+        [0, "손책", null, 0, null, 93, 97, 74, 0, 160, 300, null, null],
+        [0, "손소", null, 0, null, 82, 79, 76, 0, 160, 300, null, null],
+        [0, "손정", null, 0, null, 66, 53, 73, 0, 160, 300, null, null],
+        [0, "손중", null, 0, null, 62, 71, 36, 0, 160, 300, null, null],
+        [0, "손등", null, 0, null, 62, 37, 79, 0, 160, 300, null, null],
+        [0, "손유", null, 0, null, 77, 70, 68, 0, 160, 300, null, null],
+        [0, "손익", null, 0, null, 67, 83, 27, 0, 160, 300, null, null],
+        [0, "손례", null, 0, null, 78, 81, 67, 0, 160, 300, null, null],
+        [0, "태사자", null, 0, null, 94, 94, 72, 0, 160, 300, null, null],
+        [0, "대래동주", null, 0, null, 51, 53, 54, 0, 160, 300, null, null],
+        [0, "대릉", null, 0, null, 70, 75, 39, 0, 160, 300, null, null],
+        [0, "타사대왕", null, 0, null, 62, 59, 70, 0, 160, 300, null, null],
+        [0, "담웅", null, 0, null, 58, 73, 14, 0, 160, 300, null, null],
+        [0, "장윤", null, 0, null, 72, 67, 42, 0, 160, 300, null, null],
+        [0, "조운", null, 0, null, 94, 96, 75, 0, 160, 300, null, null],
+        [0, "장위", null, 0, null, 74, 66, 45, 0, 160, 300, null, null],
+        [0, "장영", null, 0, null, 75, 74, 41, 0, 160, 300, null, null],
+        [0, "장연", null, 0, null, 76, 81, 57, 0, 160, 300, null, null],
+        [0, "장횡", null, 0, null, 59, 70, 23, 0, 160, 300, null, null],
+        [0, "장온", null, 0, null, 32, 10, 72, 0, 160, 300, null, null],
+        [0, "장개", null, 0, null, 34, 66, 8, 0, 160, 300, null, null],
+        [0, "장각", null, 0, null, 87, 35, 90, 0, 160, 300, null, null],
+        [0, "장기", null, 0, null, 74, 35, 76, 0, 160, 300, null, null],
+        [0, "장의", null, 0, null, 79, 72, 75, 0, 160, 300, null, null],
+        [0, "장훈", null, 0, null, 72, 68, 41, 0, 160, 300, null, null],
+        [0, "장굉", null, 0, null, 24, 22, 86, 0, 160, 300, null, null],
+        [0, "장합", null, 0, null, 92, 89, 76, 0, 160, 300, null, null],
+        [0, "조홍2", null, 0, null, 66, 72, 28, 0, 160, 300, null, null],
+        [0, "장제2", null, 0, null, 70, 66, 55, 0, 160, 300, null, null],
+        [0, "장수", null, 0, null, 80, 73, 64, 0, 160, 300, null, null],
+        [0, "장소", null, 0, null, 41, 13, 87, 0, 160, 300, null, null],
+        [0, "장송", null, 0, null, 40, 6, 85, 0, 160, 300, null, null],
+        [0, "장임", null, 0, null, 85, 84, 78, 0, 160, 300, null, null],
+        [0, "장제", null, 0, null, 67, 43, 80, 0, 160, 300, null, null],
+        [0, "장막", null, 0, null, 52, 53, 71, 0, 160, 300, null, null],
+        [0, "조범", null, 0, null, 28, 21, 32, 0, 160, 300, null, null],
+        [0, "장비", null, 0, null, 87, 98, 72, 0, 160, 300, null, null],
+        [0, "장포", null, 0, null, 78, 84, 48, 0, 160, 300, null, null],
+        [0, "장보", null, 0, null, 83, 71, 81, 0, 160, 300, null, null],
+        [0, "장만성", null, 0, null, 75, 81, 45, 0, 160, 300, null, null],
+        [0, "장양", null, 0, null, 72, 70, 66, 0, 160, 300, null, null],
+        [0, "장익", null, 0, null, 75, 74, 76, 0, 160, 300, null, null],
+        [0, "장료", null, 0, null, 96, 94, 78, 0, 160, 300, null, null],
+        [0, "장량", null, 0, null, 78, 80, 74, 0, 160, 300, null, null],
+        [0, "조루", null, 0, null, 70, 43, 68, 0, 160, 300, null, null],
+        [0, "장로", null, 0, null, 65, 42, 81, 0, 160, 300, null, null],
+        [0, "진횡", null, 0, null, 64, 63, 26, 0, 160, 300, null, null],
+        [0, "진응", null, 0, null, 62, 72, 45, 0, 160, 300, null, null],
+        [0, "진기", null, 0, null, 58, 65, 43, 0, 160, 300, null, null],
+        [0, "진궁", null, 0, null, 84, 55, 90, 0, 160, 300, null, null],
+        [0, "진교", null, 0, null, 61, 27, 77, 0, 160, 300, null, null],
+        [0, "진군", null, 0, null, 32, 14, 75, 0, 160, 300, null, null],
+        [0, "진규", null, 0, null, 30, 4, 82, 0, 160, 300, null, null],
+        [0, "진식", null, 0, null, 70, 71, 25, 0, 160, 300, null, null],
+        [0, "진진", null, 0, null, 46, 46, 69, 0, 160, 300, null, null],
+        [0, "진태", null, 0, null, 86, 77, 89, 0, 160, 300, null, null],
+        [0, "진등", null, 0, null, 79, 64, 81, 0, 160, 300, null, null],
+        [0, "진도", null, 0, null, 82, 78, 67, 0, 160, 300, null, null],
+        [0, "진무", null, 0, null, 76, 87, 43, 0, 160, 300, null, null],
+        [0, "진란", null, 0, null, 66, 69, 40, 0, 160, 300, null, null],
+        [0, "진림", null, 0, null, 25, 9, 75, 0, 160, 300, null, null],
+        [0, "정욱", null, 0, null, 76, 49, 94, 0, 160, 300, null, null],
+        [0, "정원지", null, 0, null, 69, 74, 17, 0, 160, 300, null, null],
+        [0, "정은", null, 0, null, 69, 73, 40, 0, 160, 300, null, null],
+        [0, "정원", null, 0, null, 70, 76, 35, 0, 160, 300, null, null],
+        [0, "정보", null, 0, null, 84, 79, 79, 0, 160, 300, null, null],
+        [0, "정봉", null, 0, null, 81, 92, 75, 0, 160, 300, null, null],
+        [0, "전위", null, 0, null, 79, 98, 42, 0, 160, 300, null, null],
+        [0, "전해", null, 0, null, 68, 65, 58, 0, 160, 300, null, null],
+        [0, "전주", null, 0, null, 66, 66, 73, 0, 160, 300, null, null],
+        [0, "전풍", null, 0, null, 82, 43, 96, 0, 160, 300, null, null],
+        [0, "전예", null, 0, null, 93, 85, 80, 0, 160, 300, null, null],
+        [0, "동윤", null, 0, null, 47, 28, 79, 0, 160, 300, null, null],
+        [0, "동화", null, 0, null, 57, 34, 75, 0, 160, 300, null, null],
+        [0, "등애", null, 0, null, 92, 80, 94, 0, 160, 300, null, null],
+        [0, "도겸", null, 0, null, 51, 27, 64, 0, 160, 300, null, null],
+        [0, "등현", null, 0, null, 61, 73, 45, 0, 160, 300, null, null],
+        [0, "등지", null, 0, null, 73, 52, 81, 0, 160, 300, null, null],
+        [0, "동습", null, 0, null, 72, 85, 50, 0, 160, 300, null, null],
+        [0, "동승", null, 0, null, 56, 53, 65, 0, 160, 300, null, null],
+        [0, "동소", null, 0, null, 34, 25, 80, 0, 160, 300, null, null],
+        [0, "동탁", null, 0, null, 91, 87, 72, 0, 160, 300, null, null],
+        [0, "동도나", null, 0, null, 68, 73, 31, 0, 160, 300, null, null],
+        [0, "동민", null, 0, null, 49, 60, 25, 0, 160, 300, null, null],
+        [0, "등무", null, 0, null, 61, 75, 29, 0, 160, 300, null, null],
+        [0, "두기", null, 0, null, 74, 43, 78, 0, 160, 300, null, null],
+        [0, "두예", null, 0, null, 96, 69, 95, 0, 160, 300, null, null],
+        [0, "배원소", null, 0, null, 49, 65, 25, 0, 160, 300, null, null],
+        [0, "마완", null, 0, null, 71, 74, 16, 0, 160, 300, null, null],
+        [0, "마휴", null, 0, null, 68, 73, 48, 0, 160, 300, null, null],
+        [0, "파재", null, 0, null, 74, 74, 55, 0, 160, 300, null, null],
+        [0, "마준", null, 0, null, 38, 52, 31, 0, 160, 300, null, null],
+        [0, "마속", null, 0, null, 61, 67, 84, 0, 160, 300, null, null],
+        [0, "마대", null, 0, null, 79, 85, 62, 0, 160, 300, null, null],
+        [0, "마충", null, 0, null, 78, 72, 68, 0, 160, 300, null, null],
+        [0, "마초", null, 0, null, 86, 97, 44, 0, 160, 300, null, null, "서량의 금마초 나가신다!"],
+        [0, "마철", null, 0, null, 70, 62, 58, 0, 160, 300, null, null],
+        [0, "마등", null, 0, null, 85, 80, 52, 0, 160, 300, null, null],
+        [0, "마량", null, 0, null, 53, 23, 85, 0, 160, 300, null, null],
+        [0, "반준", null, 0, null, 61, 46, 82, 0, 160, 300, null, null],
+        [0, "반장", null, 0, null, 76, 80, 69, 0, 160, 300, null, null],
+        [0, "번조", null, 0, null, 66, 73, 31, 0, 160, 300, null, null],
+        [0, "번능", null, 0, null, 69, 61, 36, 0, 160, 300, null, null],
+        [0, "반봉", null, 0, null, 56, 77, 4, 0, 160, 300, null, null],
+        [0, "비의", null, 0, null, 82, 56, 88, 0, 160, 300, null, null],
+        [0, "비연", null, 0, null, 60, 66, 21, 0, 160, 300, null, null],
+        [0, "비시", null, 0, null, 18, 28, 65, 0, 160, 300, null, null],
+        [0, "미축", null, 0, null, 33, 29, 78, 0, 160, 300, null, null],
+        [0, "미방", null, 0, null, 54, 61, 32, 0, 160, 300, null, null],
+        [0, "비요", null, 0, null, 70, 66, 73, 0, 160, 300, null, null],
+        [0, "무안국", null, 0, null, 70, 79, 34, 0, 160, 300, null, null],
+        [0, "풍습", null, 0, null, 72, 71, 39, 0, 160, 300, null, null],
+        [0, "부사인", null, 0, null, 46, 63, 37, 0, 160, 300, null, null],
+        [0, "부첨", null, 0, null, 73, 85, 76, 0, 160, 300, null, null],
+        [0, "부손", null, 0, null, 29, 13, 70, 0, 160, 300, null, null],
+        [0, "문앙", null, 0, null, 76, 96, 65, 0, 160, 300, null, null],
+        [0, "문흠", null, 0, null, 74, 79, 43, 0, 160, 300, null, null],
+        [0, "문추", null, 0, null, 87, 95, 49, 0, 160, 300, null, null],
+        [0, "문빙", null, 0, null, 88, 85, 69, 0, 160, 300, null, null],
+        [0, "변희", null, 0, null, 56, 70, 62, 0, 160, 300, null, null],
+        [0, "망아장", null, 0, null, 45, 79, 3, 0, 160, 300, null, null],
+        [0, "봉기", null, 0, null, 56, 48, 84, 0, 160, 300, null, null],
+        [0, "방희", null, 0, null, 60, 38, 69, 0, 160, 300, null, null],
+        [0, "법정", null, 0, null, 82, 47, 94, 0, 160, 300, null, null],
+        [0, "방통", null, 0, null, 79, 34, 97, 0, 160, 300, null, null],
+        [0, "방덕", null, 0, null, 89, 94, 70, 0, 160, 300, null, null],
+        [0, "포륭", null, 0, null, 58, 76, 49, 0, 160, 300, null, null],
+        [0, "목순", null, 0, null, 52, 77, 11, 0, 160, 300, null, null],
+        [0, "목록대왕", null, 0, null, 65, 71, 39, 0, 160, 300, null, null],
+        [0, "보즐", null, 0, null, 83, 51, 81, 0, 160, 300, null, null],
+        [0, "만총", null, 0, null, 88, 64, 87, 0, 160, 300, null, null],
+        [0, "모개", null, 0, null, 63, 39, 60, 0, 160, 300, null, null],
+        [0, "맹획", null, 0, null, 81, 88, 42, 0, 160, 300, null, null],
+        [0, "맹체", null, 0, null, 75, 73, 75, 0, 160, 300, null, null],
+        [0, "맹우", null, 0, null, 50, 68, 22, 0, 160, 300, null, null],
+        [0, "유섭", null, 0, null, 62, 79, 24, 0, 160, 300, null, null],
+        [0, "양부", null, 0, null, 62, 68, 68, 0, 160, 300, null, null],
+        [0, "옹개", null, 0, null, 73, 75, 57, 0, 160, 300, null, null],
+        [0, "양의", null, 0, null, 68, 40, 82, 0, 160, 300, null, null],
+        [0, "양호", null, 0, null, 94, 69, 92, 0, 160, 300, null, null],
+        [0, "양홍", null, 0, null, 33, 15, 77, 0, 160, 300, null, null],
+        [0, "양앙", null, 0, null, 68, 72, 38, 0, 160, 300, null, null],
+        [0, "양추", null, 0, null, 52, 65, 40, 0, 160, 300, null, null],
+        [0, "양수", null, 0, null, 46, 23, 83, 0, 160, 300, null, null],
+        [0, "양추2", null, 0, null, 67, 64, 60, 0, 160, 300, null, null],
+        [0, "양송", null, 0, null, 17, 5, 28, 0, 160, 300, null, null],
+        [0, "양임", null, 0, null, 70, 78, 56, 0, 160, 300, null, null],
+        [0, "양조", null, 0, null, 53, 61, 36, 0, 160, 300, null, null],
+        [0, "양백", null, 0, null, 44, 45, 19, 0, 160, 300, null, null],
+        [0, "양부2", null, 0, null, 67, 50, 83, 0, 160, 300, null, null],
+        [0, "양봉", null, 0, null, 66, 65, 31, 0, 160, 300, null, null],
+        [0, "양봉2", null, 0, null, 54, 62, 53, 0, 160, 300, null, null],
+        [0, "뇌동", null, 0, null, 69, 78, 51, 0, 160, 300, null, null],
+        [0, "뇌박", null, 0, null, 62, 70, 36, 0, 160, 300, null, null],
+        [0, "이이", null, 0, null, 63, 77, 19, 0, 160, 300, null, null],
+        [0, "이회", null, 0, null, 79, 65, 79, 0, 160, 300, null, null],
+        [0, "이각", null, 0, null, 69, 72, 24, 0, 160, 300, null, null],
+        [0, "육항", null, 0, null, 94, 68, 93, 0, 160, 300, null, null],
+        [0, "육적", null, 0, null, 20, 7, 72, 0, 160, 300, null, null],
+        [0, "육손", null, 0, null, 97, 71, 96, 0, 160, 300, null, null],
+        [0, "이엄", null, 0, null, 83, 84, 76, 0, 160, 300, null, null],
+        [0, "이유", null, 0, null, 61, 26, 93, 0, 160, 300, null, null],
+        [0, "이숙", null, 0, null, 46, 69, 61, 0, 160, 300, null, null],
+        [0, "이통", null, 0, null, 73, 81, 62, 0, 160, 300, null, null],
+        [0, "이전", null, 0, null, 78, 80, 79, 0, 160, 300, null, null],
+        [0, "이풍", null, 0, null, 69, 74, 50, 0, 160, 300, null, null],
+        [0, "유언", null, 0, null, 61, 38, 80, 0, 160, 300, null, null],
+        [0, "유괴", null, 0, null, 71, 73, 67, 0, 160, 300, null, null],
+        [0, "유기", null, 0, null, 52, 12, 63, 0, 160, 300, null, null],
+        [0, "유우", null, 0, null, 62, 33, 75, 0, 160, 300, null, null],
+        [0, "유훈", null, 0, null, 47, 63, 35, 0, 160, 300, null, null],
+        [0, "유현", null, 0, null, 54, 66, 51, 0, 160, 300, null, null],
+        [0, "유순", null, 0, null, 63, 46, 41, 0, 160, 300, null, null],
+        [0, "유장", null, 0, null, 31, 5, 34, 0, 160, 300, null, null],
+        [0, "유심", null, 0, null, 60, 62, 70, 0, 160, 300, null, null],
+        [0, "유선", null, 0, null, 3, 5, 9, 0, 160, 300, null, null],
+        [0, "유종", null, 0, null, 24, 22, 65, 0, 160, 300, null, null],
+        [0, "유도", null, 0, null, 25, 23, 26, 0, 160, 300, null, null],
+        [0, "유파", null, 0, null, 29, 22, 75, 0, 160, 300, null, null],
+        [0, "유반", null, 0, null, 69, 76, 47, 0, 160, 300, null, null],
+        [0, "유비", null, 0, null, 88, 78, 75, 0, 160, 300, null, null, "한왕실은 중산정왕의 후손인 내가 이어받겠다...!"],
+        [0, "유표", null, 0, null, 48, 31, 72, 0, 160, 300, null, null],
+        [0, "유복", null, 0, null, 64, 49, 74, 0, 160, 300, null, null],
+        [0, "유벽", null, 0, null, 70, 72, 47, 0, 160, 300, null, null],
+        [0, "유봉", null, 0, null, 75, 79, 44, 0, 160, 300, null, null],
+        [0, "유엽", null, 0, null, 56, 32, 92, 0, 160, 300, null, null],
+        [0, "유요", null, 0, null, 62, 67, 46, 0, 160, 300, null, null],
+        [0, "여위황", null, 0, null, 58, 63, 29, 0, 160, 300, null, null],
+        [0, "요화", null, 0, null, 73, 76, 69, 0, 160, 300, null, null],
+        [0, "양흥", null, 0, null, 61, 65, 19, 0, 160, 300, null, null],
+        [0, "양습", null, 0, null, 73, 40, 74, 0, 160, 300, null, null],
+        [0, "양서", null, 0, null, 56, 62, 66, 0, 160, 300, null, null],
+        [0, "능조", null, 0, null, 75, 81, 42, 0, 160, 300, null, null],
+        [0, "능통", null, 0, null, 83, 89, 60, 0, 160, 300, null, null],
+        [0, "여개", null, 0, null, 53, 30, 67, 0, 160, 300, null, null],
+        [0, "여건", null, 0, null, 57, 70, 62, 0, 160, 300, null, null],
+        [0, "여광", null, 0, null, 56, 70, 13, 0, 160, 300, null, null],
+        [0, "여상", null, 0, null, 54, 71, 12, 0, 160, 300, null, null],
+        [0, "여대", null, 0, null, 80, 71, 70, 0, 160, 300, null, null],
+        [0, "여범", null, 0, null, 73, 63, 75, 0, 160, 300, null, null],
+        [0, "여포", null, 0, null, 89, 100, 42, 0, 160, 300, null, null, "다 덤비거라! 하하하하"],
+        [0, "여몽", null, 0, null, 91, 81, 90, 0, 160, 300, null, null],
+        [0, "윤직", null, 0, null, 46, 42, 73, 0, 160, 300, null, null],
+        [0, "냉포", null, 0, null, 71, 82, 61, 0, 160, 300, null, null],
+        [0, "누규", null, 0, null, 52, 13, 87, 0, 160, 300, null, null],
+        [0, "노숙", null, 0, null, 89, 56, 93, 0, 160, 300, null, null],
+        [0, "노식", null, 0, null, 86, 63, 82, 0, 160, 300, null, null],
+        [0, "범강", null, 0, null, 49, 50, 36, 0, 160, 300, null, null],
+        [0, "장달", null, 0, null, 43, 56, 34, 0, 160, 300, null, null],
+        [0, "규람", null, 0, null, 55, 70, 58, 0, 160, 300, null, null],
+        [0, "대원", null, 0, null, 38, 32, 68, 0, 160, 300, null, null],
+        [0, "왕기", null, 0, null, 81, 72, 86, 0, 160, 300, null, null],
+        [0, "왕상", null, 0, null, 23, 19, 68, 0, 160, 300, null, null],
+        [0, "왕돈", null, 0, null, 60, 66, 46, 0, 160, 300, null, null],
+        [0, "악침", null, 0, null, 73, 75, 43, 0, 160, 300, null, null],
+        [0, "하제", null, 0, null, 83, 70, 82, 0, 160, 300, null, null],
+        [0, "환범", null, 0, null, 40, 11, 78, 0, 160, 300, null, null],
+        [0, "견초", null, 0, null, 72, 79, 73, 0, 160, 300, null, null],
+        [0, "고당륭", null, 0, null, 35, 24, 76, 0, 160, 300, null, null],
+        [0, "오찬", null, 0, null, 68, 41, 78, 0, 160, 300, null, null],
+        [0, "호질", null, 0, null, 73, 46, 74, 0, 160, 300, null, null],
+        [0, "오질", null, 0, null, 16, 29, 68, 0, 160, 300, null, null],
+        [0, "호준", null, 0, null, 79, 76, 62, 0, 160, 300, null, null],
+        [0, "고담", null, 0, null, 53, 23, 77, 0, 160, 300, null, null],
+        [0, "최림", null, 0, null, 32, 22, 66, 0, 160, 300, null, null],
+        [0, "사마망", null, 0, null, 78, 58, 83, 0, 160, 300, null, null],
+        [0, "주이", null, 0, null, 70, 73, 61, 0, 160, 300, null, null],
+        [0, "전단", null, 0, null, 67, 64, 39, 0, 160, 300, null, null],
+        [0, "조우", null, 0, null, 50, 43, 37, 0, 160, 300, null, null],
+        [0, "조상", null, 0, null, 39, 33, 30, 0, 160, 300, null, null],
+        [0, "조방", null, 0, null, 20, 14, 27, 0, 160, 300, null, null],
+        [0, "태사향", null, 0, null, 57, 66, 48, 0, 160, 300, null, null],
+        [0, "장휴", null, 0, null, 63, 27, 74, 0, 160, 300, null, null],
+        [0, "장호", null, 0, null, 75, 74, 51, 0, 160, 300, null, null],
+        [0, "조광", null, 0, null, 67, 71, 53, 0, 160, 300, null, null],
+        [0, "장집", null, 0, null, 76, 29, 80, 0, 160, 300, null, null],
+        [0, "장승", null, 0, null, 77, 70, 75, 0, 160, 300, null, null],
+        [0, "장소2", null, 0, null, 23, 56, 31, 0, 160, 300, null, null],
+        [0, "조통", null, 0, null, 68, 67, 61, 0, 160, 300, null, null],
+        [0, "진표", null, 0, null, 66, 42, 74, 0, 160, 300, null, null],
+        [0, "정무", null, 0, null, 56, 35, 75, 0, 160, 300, null, null],
+        [0, "정봉2", null, 0, null, 66, 66, 53, 0, 160, 300, null, null],
+        [0, "전만", null, 0, null, 51, 73, 39, 0, 160, 300, null, null],
+        [0, "마균", null, 0, null, 22, 17, 71, 0, 160, 300, null, null],
+        [0, "방회", null, 0, null, 69, 75, 49, 0, 160, 300, null, null],
+        [0, "낙통", null, 0, null, 76, 58, 75, 0, 160, 300, null, null],
+        [0, "육개", null, 0, null, 65, 61, 79, 0, 160, 300, null, null],
+        [0, "유찬", null, 0, null, 78, 81, 64, 0, 160, 300, null, null],
+        [0, "유소", null, 0, null, 68, 53, 74, 0, 160, 300, null, null],
+        [0, "요립", null, 0, null, 32, 15, 76, 0, 160, 300, null, null],
+        [0, "여거", null, 0, null, 78, 69, 71, 0, 160, 300, null, null],
+        [0, "제갈첨", null, 0, null, 70, 57, 76, 0, 160, 300, null, null],
+        [0, "손휴", null, 0, null, 57, 42, 78, 0, 160, 300, null, null],
+        [0, "극정", null, 0, null, 42, 23, 68, 0, 160, 300, null, null],
+        [0, "호분", null, 0, null, 71, 76, 50, 0, 160, 300, null, null],
+        [0, "손량", null, 0, null, 32, 26, 70, 0, 160, 300, null, null],
+        [0, "마막", null, 0, null, 34, 12, 44, 0, 160, 300, null, null],
+        [0, "손호", null, 0, null, 41, 73, 71, 0, 160, 300, null, null],
+        [0, "조모", null, 0, null, 54, 61, 59, 0, 160, 300, null, null],
+        [0, "조환", null, 0, null, 30, 28, 30, 0, 160, 300, null, null],
+        [0, "사마유", null, 0, null, 71, 68, 75, 0, 160, 300, null, null],
+        [0, "제갈상", null, 0, null, 64, 79, 62, 0, 160, 300, null, null],
+        [0, "손화", null, 0, null, 31, 39, 68, 0, 160, 300, null, null],
+        [0, "염우", null, 0, null, 52, 61, 51, 0, 160, 300, null, null],
+        [0, "왕경", null, 0, null, 67, 63, 71, 0, 160, 300, null, null],
+        [0, "왕혼", null, 0, null, 74, 71, 63, 0, 160, 300, null, null],
+        [0, "곽혁", null, 0, null, 33, 29, 70, 0, 160, 300, null, null],
+        [0, "가범", null, 0, null, 60, 62, 73, 0, 160, 300, null, null],
+        [0, "서질", null, 0, null, 68, 83, 24, 0, 160, 300, null, null],
+        [0, "손준", null, 0, null, 64, 70, 65, 0, 160, 300, null, null],
+        [0, "손침", null, 0, null, 58, 55, 65, 0, 160, 300, null, null],
+        [0, "우사", null, 0, null, 61, 34, 74, 0, 160, 300, null, null],
+        [0, "진건", null, 0, null, 72, 71, 65, 0, 160, 300, null, null],
+        [0, "동궐", null, 0, null, 65, 59, 76, 0, 160, 300, null, null],
+        [0, "당자", null, 0, null, 61, 71, 50, 0, 160, 300, null, null],
+        [0, "등충", null, 0, null, 76, 80, 69, 0, 160, 300, null, null],
+        [0, "황숭", null, 0, null, 67, 63, 72, 0, 160, 300, null, null],
+        [0, "화핵", null, 0, null, 20, 24, 71, 0, 160, 300, null, null],
+        [0, "허의", null, 0, null, 51, 74, 15, 0, 160, 300, null, null],
+        [0, "송겸", null, 0, null, 66, 78, 42, 0, 160, 300, null, null],
+        [0, "호제", null, 0, null, 57, 39, 68, 0, 160, 300, null, null],
+        [0, "나헌", null, 0, null, 86, 70, 82, 0, 160, 300, null, null],
+        [0, "노숙2", null, 0, null, 73, 53, 74, 0, 160, 300, null, null],
+        [0, "구성", null, 0, null, 63, 70, 38, 0, 160, 300, null, null],
+        [0, "어부라", null, 0, null, 72, 68, 21, 0, 160, 300, null, null],
+        [0, "아하소과", null, 0, null, 61, 76, 13, 0, 160, 300, null, null],
+        [0, "가비능", null, 0, null, 77, 69, 52, 0, 160, 300, null, null],
+        [0, "구력거", null, 0, null, 80, 68, 56, 0, 160, 300, null, null],
+        [0, "강단", null, 0, null, 65, 83, 48, 0, 160, 300, null, null],
+        [0, "황란", null, 0, null, 63, 75, 44, 0, 160, 300, null, null],
+        [0, "호주천", null, 0, null, 70, 71, 40, 0, 160, 300, null, null],
+        [0, "종리목", null, 0, null, 84, 72, 82, 0, 160, 300, null, null],
+        [0, "제갈교", null, 0, null, 62, 27, 75, 0, 160, 300, null, null],
+        [0, "답돈", null, 0, null, 84, 82, 61, 0, 160, 300, null, null],
+        [0, "반임", null, 0, null, 66, 79, 38, 0, 160, 300, null, null],
+        [0, "보도근", null, 0, null, 64, 73, 50, 0, 160, 300, null, null],
+        [0, "미당대왕", null, 0, null, 59, 69, 21, 0, 160, 300, null, null],
+        [0, "유표2", null, 0, null, 73, 74, 48, 0, 160, 300, null, null],
+        [0, "루반", null, 0, null, 65, 76, 39, 0, 160, 300, null, null],
+        [0, "손관", null, 0, null, 72, 78, 51, 0, 160, 300, null, null],
+        [0, "곽석", null, 0, null, 59, 71, 48, 0, 160, 300, null, null],
+        [0, "주조", null, 0, null, 63, 68, 26, 0, 160, 300, null, null],
+        [0, "장거", null, 0, null, 79, 75, 56, 0, 160, 300, null, null],
+        [0, "장순", null, 0, null, 73, 81, 60, 0, 160, 300, null, null],
+        [0, "철리길", null, 0, null, 77, 70, 52, 0, 160, 300, null, null],
+        [0, "주삭", null, 0, null, 54, 60, 50, 0, 160, 300, null, null],
+        [0, "황월영", null, 0, null, 46, 33, 78, 0, 160, 300, null, null],
+        [0, "채염", null, 0, null, 42, 26, 82, 0, 160, 300, null, null],
+        [0, "소교", null, 0, null, 23, 15, 78, 0, 160, 300, null, null],
+        [0, "신헌영", null, 0, null, 65, 35, 90, 0, 160, 300, null, null, "내가 사내로 태어났더라면..."],
+        [0, "손상향", null, 0, null, 72, 79, 55, 0, 160, 300, null, null],
+        [0, "대교", null, 0, null, 22, 30, 78, 0, 160, 300, null, null],
+        [0, "초선", null, 0, null, 12, 22, 71, 0, 160, 300, null, null],
+        [0, "교모", null, 0, null, 54, 45, 69, 0, 160, 300, null, null],
+        [0, "관구수", null, 0, null, 58, 62, 33, 0, 160, 300, null, null],
+        [0, "관구전", null, 0, null, 63, 60, 69, 0, 160, 300, null, null],
+        [0, "원유", null, 0, null, 56, 40, 73, 0, 160, 300, null, null],
+        [0, "왕광", null, 0, null, 65, 55, 61, 0, 160, 300, null, null],
+        [0, "신창", null, 0, null, 50, 26, 42, 0, 160, 300, null, null],
+        [0, "사마주", null, 0, null, 61, 52, 61, 0, 160, 300, null, null],
+        [0, "양제", null, 0, null, 67, 68, 71, 0, 160, 300, null, null],
+        [0, "성만", null, 0, null, 61, 68, 66, 0, 160, 300, null, null],
+        [0, "오연", null, 0, null, 66, 73, 42, 0, 160, 300, null, null],
+        [0, "맹충", null, 0, null, 47, 28, 72, 0, 160, 300, null, null],
+        [0, "잠혼", null, 0, null, 1, 1, 22, 0, 160, 300, null, null],
+        [0, "사정", null, 0, null, 64, 76, 34, 0, 160, 300, null, null],
+        [0, "심영", null, 0, null, 70, 77, 61, 0, 160, 300, null, null],
+        [0, "도준", null, 0, null, 65, 66, 46, 0, 160, 300, null, null],
+        [0, "만욱", null, 0, null, 21, 25, 71, 0, 160, 300, null, null],
+        [0, "오언", null, 0, null, 76, 81, 65, 0, 160, 300, null, null],
+        [0, "위막", null, 0, null, 57, 62, 59, 0, 160, 300, null, null],
+        [0, "시삭", null, 0, null, 38, 65, 47, 0, 160, 300, null, null],
+        [0, "전속", null, 0, null, 47, 60, 55, 0, 160, 300, null, null],
+        [0, "장화", null, 0, null, 36, 27, 78, 0, 160, 300, null, null],
+        [0, "오거", null, 0, null, 49, 61, 23, 0, 160, 300, null, null],
+        [0, "추정", null, 0, null, 70, 64, 66, 0, 160, 300, null, null],
+        [0, "장특", null, 0, null, 73, 54, 75, 0, 160, 300, null, null],
+        [0, "곽마", null, 0, null, 68, 71, 47, 0, 160, 300, null, null],
+        [0, "석포", null, 0, null, 69, 71, 56, 0, 160, 300, null, null],
+        [0, "견홍", null, 0, null, 70, 74, 66, 0, 160, 300, null, null],
+        [0, "한거자", null, 0, null, 51, 59, 51, 0, 160, 300, null, null],
+        [0, "휴원진", null, 0, null, 52, 68, 45, 0, 160, 300, null, null],
+        [0, "곽원", null, 0, null, 66, 73, 36, 0, 160, 300, null, null],
+        [0, "계옹", null, 0, null, 63, 52, 41, 0, 160, 300, null, null],
+        [0, "이부", null, 0, null, 31, 36, 74, 0, 160, 300, null, null],
+        [0, "왕업", null, 0, null, 33, 6, 35, 0, 160, 300, null, null],
+        [0, "좌혁", null, 0, null, 62, 66, 51, 0, 160, 300, null, null],
+        [0, "화타", null, 0, null, 57, 25, 73, 0, 160, 300, null, null, "아픈 사람들 모두 내게 오시오~"],
+        [0, "사마휘", null, 0, null, 55, 26, 82, 0, 160, 300, null, null, "좋지 좋아~"],
+        [0, "우길", null, 0, null, 23, 15, 90, 0, 160, 300, null, null, "길조로다"],
+        [0, "헌제", null, 0, null, 22, 18, 68, 0, 160, 300, null, null, "한왕실은 정녕 여기서 끝이란 말인가.."],
+        [0, "왕검", null, 0, null, 92, 51, 91, 0, 160, 300, null, null],
+        [0, "위만", null, 0, null, 93, 90, 62, 0, 160, 300, null, null],
+        [0, "부분노", null, 0, null, 97, 68, 96, 0, 160, 300, null, null],
+        [0, "무휼", null, 0, null, 98, 93, 72, 0, 160, 300, null, null],
+        [0, "태조대왕", null, 0, null, 92, 63, 91, 0, 160, 300, null, null],
+        [0, "명림답부", null, 0, null, 94, 68, 99, 0, 160, 300, null, null],
+        [0, "달가", null, 0, null, 91, 60, 96, 0, 160, 300, null, null],
+        [0, "고노자", null, 0, null, 93, 96, 62, 0, 160, 300, null, null],
+        [0, "미천왕", null, 0, null, 91, 60, 88, 0, 160, 300, null, null],
+        [0, "고무", null, 0, null, 90, 93, 63, 0, 160, 300, null, null],
+        [0, "광개토대왕", null, 0, null, 100, 99, 71, 0, 160, 300, null, null],
+        [0, "장수왕", null, 0, null, 97, 94, 63, 0, 160, 300, null, null],
+        [0, "을지문덕", null, 0, null, 99, 70, 98, 0, 160, 300, null, null],
+        [0, "고흘", null, 0, null, 88, 91, 63, 0, 160, 300, null, null],
+        [0, "온달", null, 0, null, 90, 92, 60, 0, 160, 300, null, null],
+        [0, "고건무", null, 0, null, 97, 91, 71, 0, 160, 300, null, null],
+        [0, "양만춘", null, 0, null, 98, 69, 91, 0, 160, 300, null, null],
+        [0, "연개소문", null, 0, null, 92, 66, 91, 0, 160, 300, null, null],
+        [0, "근초고왕", null, 0, null, 93, 93, 70, 0, 160, 300, null, null],
+        [0, "목라근자", null, 0, null, 89, 90, 68, 0, 160, 300, null, null],
+        [0, "근구수왕", null, 0, null, 90, 63, 89, 0, 160, 300, null, null],
+        [0, "사법명", null, 0, null, 91, 66, 92, 0, 160, 300, null, null],
+        [0, "찬수류", null, 0, null, 87, 60, 83, 0, 160, 300, null, null],
+        [0, "해례곤", null, 0, null, 86, 88, 59, 0, 160, 300, null, null],
+        [0, "목간나", null, 0, null, 85, 87, 61, 0, 160, 300, null, null],
+        [0, "윤충", null, 0, null, 90, 87, 59, 0, 160, 300, null, null],
+        [0, "의직", null, 0, null, 85, 61, 83, 0, 160, 300, null, null],
+        [0, "계백", null, 0, null, 93, 71, 94, 0, 160, 300, null, null],
+        [0, "귀실복신", null, 0, null, 83, 57, 82, 0, 160, 300, null, null],
+        [0, "흑치상지", null, 0, null, 90, 73, 92, 0, 160, 300, null, null],
+        [0, "석탈해", null, 0, null, 98, 71, 93, 0, 160, 300, null, null],
+        [0, "물계자", null, 0, null, 88, 94, 43, 0, 160, 300, null, null],
+        [0, "석우로", null, 0, null, 87, 91, 54, 0, 160, 300, null, null],
+        [0, "이사부", null, 0, null, 90, 72, 93, 0, 160, 300, null, null],
+        [0, "거칠부", null, 0, null, 92, 73, 90, 0, 160, 300, null, null],
+        [0, "진흥왕", null, 0, null, 91, 66, 91, 0, 160, 300, null, null],
+        [0, "사다함", null, 0, null, 86, 91, 66, 0, 160, 300, null, null],
+        [0, "김세종", null, 0, null, 88, 63, 87, 0, 160, 300, null, null],
+        [0, "김무력", null, 0, null, 90, 93, 63, 0, 160, 300, null, null],
+        [0, "알천", null, 0, null, 93, 96, 51, 0, 160, 300, null, null],
+        [0, "김유신", null, 0, null, 97, 70, 99, 0, 160, 300, null, null],
+        [0, "김흠돌", null, 0, null, 87, 90, 52, 0, 160, 300, null, null],
+        [0, "김품일", null, 0, null, 83, 56, 82, 0, 160, 300, null, null],
+        [0, "김천존", null, 0, null, 84, 60, 82, 0, 160, 300, null, null],
+        [0, "죽지", null, 0, null, 83, 86, 52, 0, 160, 300, null, null],
+        [0, "문무왕", null, 0, null, 92, 73, 96, 0, 160, 300, null, null],
+        [0, "시득", null, 0, null, 98, 67, 90, 0, 160, 300, null, null],
+        [0, "장보고", null, 0, null, 99, 72, 96, 0, 160, 300, null, null],
+        [0, "김웅원", null, 0, null, 92, 91, 66, 0, 160, 300, null, null],
+        [0, "대조영", null, 0, null, 96, 92, 63, 0, 160, 300, null, null],
+        [0, "대무예", null, 0, null, 90, 97, 59, 0, 160, 300, null, null],
+        [0, "장문휴", null, 0, null, 88, 89, 53, 0, 160, 300, null, null],
+        [0, "대인수", null, 0, null, 89, 60, 85, 0, 160, 300, null, null],
+        [0, "궁예", null, 0, null, 91, 90, 57, 0, 160, 300, null, null],
+        [0, "왕건", null, 0, null, 96, 68, 98, 0, 160, 300, null, null],
+        [0, "이흔암", null, 0, null, 83, 82, 49, 0, 160, 300, null, null],
+        [0, "견훤", null, 0, null, 91, 65, 90, 0, 160, 300, null, null],
+        [0, "상귀", null, 0, null, 87, 88, 55, 0, 160, 300, null, null],
+        [0, "상애", null, 0, null, 76, 69, 41, 0, 160, 300, null, null],
+        [0, "관흔", null, 0, null, 79, 52, 83, 0, 160, 300, null, null],
+        [0, "유금필", null, 0, null, 87, 94, 58, 0, 160, 300, null, null],
+        [0, "배현경", null, 0, null, 86, 48, 90, 0, 160, 300, null, null],
+        [0, "서희", null, 0, null, 71, 26, 99, 0, 160, 300, null, null],
+        [0, "양규", null, 0, null, 95, 66, 93, 0, 160, 300, null, null],
+        [0, "김숙흥", null, 0, null, 87, 90, 57, 0, 160, 300, null, null],
+        [0, "지채문", null, 0, null, 86, 63, 88, 0, 160, 300, null, null],
+        [0, "강감찬", null, 0, null, 94, 68, 96, 0, 160, 300, null, null],
+        [0, "강민첨", null, 0, null, 92, 93, 64, 0, 160, 300, null, null],
+        [0, "윤관", null, 0, null, 87, 58, 86, 0, 160, 300, null, null],
+        [0, "척준경", null, 0, null, 90, 108, 61, 0, 160, 300, null, null],
+        [0, "허재", null, 0, null, 73, 48, 81, 0, 160, 300, null, null],
+        [0, "김의원", null, 0, null, 80, 86, 51, 0, 160, 300, null, null],
+        [0, "김부식", null, 0, null, 51, 21, 92, 0, 160, 300, null, null],
+        [0, "두경승", null, 0, null, 88, 62, 86, 0, 160, 300, null, null],
+        [0, "김취려", null, 0, null, 90, 88, 58, 0, 160, 300, null, null],
+        [0, "박서", null, 0, null, 86, 52, 87, 0, 160, 300, null, null],
+        [0, "김경손", null, 0, null, 73, 92, 58, 0, 160, 300, null, null],
+        [0, "김윤후", null, 0, null, 82, 51, 83, 0, 160, 300, null, null],
+        [0, "김방경", null, 0, null, 93, 56, 87, 0, 160, 300, null, null],
+        [0, "정세운", null, 0, null, 86, 82, 62, 0, 160, 300, null, null],
+        [0, "최영", null, 0, null, 96, 92, 71, 0, 160, 300, null, null],
+        [0, "정지", null, 0, null, 88, 91, 66, 0, 160, 300, null, null],
+        [0, "최무선", null, 0, null, 87, 59, 93, 0, 160, 300, null, null],
+        [0, "이성계", null, 0, null, 96, 62, 92, 0, 160, 300, null, null],
+        [0, "김성우", null, 0, null, 87, 84, 53, 0, 160, 300, null, null],
+        [0, "김종서", null, 0, null, 93, 66, 92, 0, 160, 300, null, null],
+        [0, "남이", null, 0, null, 89, 90, 63, 0, 160, 300, null, null],
+        [0, "권율", null, 0, null, 94, 70, 93, 0, 160, 300, null, null],
+        [0, "황진", null, 0, null, 87, 96, 53, 0, 160, 300, null, null],
+        [0, "곽재우", null, 0, null, 92, 71, 92, 0, 160, 300, null, null],
+        [0, "김시민", null, 0, null, 93, 72, 96, 0, 160, 300, null, null],
+        [0, "이순신", null, 0, null, 103, 76, 101, 0, 160, 300, null, null, "나의 죽음을 적에게 알리지 마라"],
+        [0, "정문부", null, 0, null, 87, 56, 83, 0, 160, 300, null, null],
+        [0, "정충신", null, 0, null, 82, 51, 90, 0, 160, 300, null, null],
+        [0, "원균", null, 0, null, 1, 1, 1, 0, 160, 300, null, null],
+        [0, "관중", null, 0, null, 91, 45, 98, 0, 160, 300, null, null],
+        [0, "몽무", null, 0, null, 88, 96, 53, 0, 160, 300, null, null],
+        [0, "몽염", null, 0, null, 91, 83, 71, 0, 160, 300, null, null],
+        [0, "몽오", null, 0, null, 90, 86, 60, 0, 160, 300, null, null],
+        [0, "방난", null, 0, null, 91, 57, 93, 0, 160, 300, null, null],
+        [0, "백기", null, 0, null, 100, 63, 92, 0, 160, 300, null, null],
+        [0, "범려", null, 0, null, 78, 22, 96, 0, 160, 300, null, null],
+        [0, "사마양저", null, 0, null, 88, 51, 92, 0, 160, 300, null, null],
+        [0, "사마착", null, 0, null, 93, 91, 66, 0, 160, 300, null, null],
+        [0, "손빈", null, 0, null, 80, 16, 96, 0, 160, 300, null, null],
+        [0, "손무", null, 0, null, 98, 32, 100, 0, 160, 300, null, null],
+        [0, "신릉군", null, 0, null, 81, 39, 90, 0, 160, 300, null, null],
+        [0, "악양", null, 0, null, 83, 36, 96, 0, 160, 300, null, null],
+        [0, "악의", null, 0, null, 96, 70, 98, 0, 160, 300, null, null],
+        [0, "염파", null, 0, null, 98, 97, 80, 0, 160, 300, null, null],
+        [0, "오기", null, 0, null, 93, 39, 95, 0, 160, 300, null, null],
+        [0, "오운", null, 0, null, 88, 51, 90, 0, 160, 300, null, null],
+        [0, "왕분", null, 0, null, 89, 91, 68, 0, 160, 300, null, null],
+        [0, "왕전", null, 0, null, 95, 66, 93, 0, 160, 300, null, null],
+        [0, "왕흘", null, 0, null, 93, 92, 60, 0, 160, 300, null, null],
+        [0, "이목", null, 0, null, 96, 69, 98, 0, 160, 300, null, null],
+        [0, "이신", null, 0, null, 89, 90, 57, 0, 160, 300, null, null],
+        [0, "전단2", null, 0, null, 94, 59, 93, 0, 160, 300, null, null],
+        [0, "조사", null, 0, null, 91, 63, 91, 0, 160, 300, null, null],
+        [0, "진개", null, 0, null, 88, 87, 50, 0, 160, 300, null, null],
+        [0, "항연", null, 0, null, 90, 88, 60, 0, 160, 300, null, null],
+        [0, "한신", null, 0, null, 100, 74, 95, 0, 160, 300, null, null],
+        [0, "항적", null, 0, null, 99, 100, 65, 0, 160, 300, null, null],
+        [0, "장한", null, 0, null, 88, 66, 87, 0, 160, 300, null, null],
+        [0, "유방", null, 0, null, 90, 66, 85, 0, 160, 300, null, null],
+        [0, "조참", null, 0, null, 89, 53, 87, 0, 160, 300, null, null],
+        [0, "팽월", null, 0, null, 92, 93, 60, 0, 160, 300, null, null],
+        [0, "영포", null, 0, null, 93, 93, 58, 0, 160, 300, null, null],
+        [0, "종리말", null, 0, null, 90, 83, 66, 0, 160, 300, null, null],
+        [0, "주발", null, 0, null, 82, 50, 83, 0, 160, 300, null, null],
+        [0, "번쾌", null, 0, null, 87, 92, 63, 0, 160, 300, null, null],
+        [0, "역상", null, 0, null, 83, 52, 83, 0, 160, 300, null, null],
+        [0, "관영", null, 0, null, 86, 87, 60, 0, 160, 300, null, null],
+        [0, "부관", null, 0, null, 83, 58, 88, 0, 160, 300, null, null],
+        [0, "근흡", null, 0, null, 86, 90, 52, 0, 160, 300, null, null],
+        [0, "왕릉2", null, 0, null, 90, 87, 56, 0, 160, 300, null, null],
+        [0, "계포", null, 0, null, 83, 62, 90, 0, 160, 300, null, null],
+        [0, "용저", null, 0, null, 86, 92, 41, 0, 160, 300, null, null],
+        [0, "곽거병", null, 0, null, 93, 92, 53, 0, 160, 300, null, null],
+        [0, "마원", null, 0, null, 90, 52, 83, 0, 160, 300, null, null],
+        [0, "위청", null, 0, null, 92, 91, 52, 0, 160, 300, null, null],
+        [0, "주아부", null, 0, null, 86, 41, 92, 0, 160, 300, null, null],
+        [0, "곽자의", null, 0, null, 98, 97, 61, 0, 160, 300, null, null],
+        [0, "나오에 카네츠구", null, 0, null, 87, 42, 91, 0, 160, 300, null, null],
+        [0, "다케다 신겐", null, 0, null, 91, 50, 93, 0, 160, 300, null, null],
+        [0, "도요토미 히데요시", null, 0, null, 98, 70, 97, 0, 160, 300, null, null],
+        [0, "고니시 유키나가", null, 0, null, 96, 68, 94, 0, 160, 300, null, null],
+        [0, "가토 기요마사", null, 0, null, 92, 93, 66, 0, 160, 300, null, null],
+        [0, "도요토미 히데나가", null, 0, null, 94, 70, 92, 0, 160, 300, null, null],
+        [0, "도도 다카토라", null, 0, null, 90, 92, 62, 0, 160, 300, null, null],
+        [0, "도쿠가와 이에야스", null, 0, null, 92, 68, 91, 0, 160, 300, null, null],
+        [0, "모리 모토나리", null, 0, null, 88, 42, 96, 0, 160, 300, null, null],
+        [0, "우에스기 겐신", null, 0, null, 91, 96, 78, 0, 160, 300, null, null],
+        [0, "오다 노부나가", null, 0, null, 93, 73, 92, 0, 160, 300, null, null],
+        [0, "이마가와 요시모토", null, 0, null, 89, 91, 71, 0, 160, 300, null, null],
+        [0, "사나다 마사유키", null, 0, null, 93, 66, 90, 0, 160, 300, null, null],
+        [0, "사나다 노부시게", null, 0, null, 94, 92, 70, 0, 160, 300, null, null],
+        [0, "시마즈 이에히사", null, 0, null, 96, 94, 63, 0, 160, 300, null, null],
+        [0, "시마즈 요시히로", null, 0, null, 93, 88, 63, 0, 160, 300, null, null],
+        [0, "코바야카와타카카게", null, 0, null, 90, 61, 92, 0, 160, 300, null, null],
+        [0, "타치바나 도세츠", null, 0, null, 91, 89, 71, 0, 160, 300, null, null],
+        [0, "타치바나 무네시게", null, 0, null, 90, 69, 88, 0, 160, 300, null, null],
+        [0, "타카하시 쇼운", null, 0, null, 92, 91, 70, 0, 160, 300, null, null],
+        [0, "호조 우지야스", null, 0, null, 89, 58, 91, 0, 160, 300, null, null],
+        [0, "칭기즈 칸", null, 0, null, 100, 99, 63, 0, 160, 300, null, null],
+        [0, "오고타이 칸", null, 0, null, 98, 93, 64, 0, 160, 300, null, null],
+        [0, "자무카", null, 0, null, 97, 96, 60, 0, 160, 300, null, null],
+        [0, "수부타이", null, 0, null, 94, 71, 91, 0, 160, 300, null, null],
+        [0, "제베", null, 0, null, 93, 97, 68, 0, 160, 300, null, null]
+    ],
+    "general_ex":[
+
+    ],
+    "initialEvents": [
+        [
+            true,
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "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",
+            1000,
+            [
+                "and",
+                [
+                    "Date",
+                    ">=",
+                    183,
+                    1
+                ],
+                [
+                    "RemainNation",
+                    "==",
+                    1
+                ]
+            ],
+            [
+                "BlockScoutAction"
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ]
+    ]
+}

hwe/scenario/scenario_2800.json

@@ -0,0 +1,467 @@
+{
+    "title": "【가상모드28】 강서유서 소설 월드",
+    "startYear": 180,
+    "history": [
+        "<C>●</>180년 1월:<L><b>【가상모드28】</b>강서유서 소설 월드</>",
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>강서유서의 소설 캐릭터들이 날뛰는곳"
+    ],
+    "stat": {
+        "total": 210,
+        "min": 40,
+        "max": 90
+    },
+    "iconPath": ".",
+    "fiction": 1,
+    "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":[],
+    "general":[
+        [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":[
+
+    ],
+    "initialEvents": [
+        [
+            true,
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "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",
+            1000,
+            [
+                "and",
+                [
+                    "Date",
+                    ">=",
+                    183,
+                    1
+                ],
+                [
+                    "RemainNation",
+                    "==",
+                    1
+                ]
+            ],
+            [
+                "BlockScoutAction"
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ]
+    ]
+}

hwe/scenario/scenario_907.json

@@ -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"]
+        ]
+    ]
+}

hwe/templates/commandButton.php

@@ -1,27 +0,0 @@
-<?=$btnBegin??''?><a href='v_board.php' class='commandButton <?=$btnClass??""?> <?= $meLevel >= 1 ? '' : 'disabled' ?>'>회 의 실</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='v_board.php?isSecret=true' class='commandButton <?= $permission >= 2 ? '' : 'disabled' ?> <?=$btnClass??""?>'>기 밀 실</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='v_troop.php' class='commandButton <?= ($meLevel >= 1 && $nationLevel >= 1) ? '' : 'disabled' ?> <?=$btnClass??""?>'>부대 편성</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='t_diplomacy.php' class='commandButton <?= $showSecret ? '' : 'disabled' ?> <?=$btnClass??""?>'>외 교 부</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='b_myBossInfo.php' class='commandButton <?= $meLevel >= 1 ? '' : 'disabled' ?> <?=$btnClass??""?>'>인 사 부</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='v_nationStratFinan.php' class='commandButton <?= $showSecret ? '' : 'disabled' ?> <?=$btnClass??""?>'>내 무 부</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='v_chiefCenter.php' class='commandButton <?= $showSecret ? '' : 'disabled' ?> <?=$btnClass??""?>'>사 령 부</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='v_NPCControl.php' class='commandButton <?= $showSecret ? '' : 'disabled' ?> <?=$btnClass??""?>'>NPC 정책</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='b_genList.php' target='_blank' class='open-window commandButton <?=$btnClass??""?> <?= $showSecret ? '' : 'disabled' ?>'>암 행 부</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='b_tournament.php' target='_blank' class='open-window <?=$btnClassForTournament??""?>'>토 너 먼 트</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='b_myKingdomInfo.php' class='commandButton <?=$btnClass??""?> <?= $meLevel >= 1 ? '' : 'disabled' ?>'>세력 정보</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='b_myCityInfo.php' class='commandButton <?=$btnClass??""?> <?= ($meLevel >= 1 && $nationLevel >= 1) ? '' : 'disabled' ?>'>세력 도시</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='v_nationGeneral.php' class='commandButton <?=$btnClass??""?> <?= $meLevel >= 1 ? '' : 'disabled' ?>'>세력 장수</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='v_globalDiplomacy.php' class='commandButton <?=$btnClass??""?>'>중원 정보</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='b_currentCity.php' class='commandButton <?=$btnClass??""?>'>현재 도시</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='v_battleCenter.php' target='_blank' class='open-window commandButton <?=$btnClass??""?> <?= $showSecret ? '' : 'disabled' ?>'>감 찰 부</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='v_inheritPoint.php' class='commandButton <?=$btnClass??""?>'>유산 관리</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='b_myPage.php' class='commandButton <?=$btnClass??""?>'>내 정보&amp;설정</a><?=$btnEnd??''?>
-<?=$splitBtnBegin??''?>
-  <?=$splitMainBegin??''?><a href='v_auction.php' target='_blank' class='open-window commandButton <?=$btnClass??""?>'>경 매 장</a><?=$splitMainEnd??''?>
-  <?=$splitZoneSign??''?>
-  <?=$splitZoneBegin??''?>
-    <?=$splitSubBtnBegin??''?><a href='v_auction.php' target='_blank' class='open-window commandButton <?=$btnSplitClass??''?>'>금/쌀 경매장</a><?=$splitSubBtnEnd??''?>
-    <?=$splitSubBtnBegin??''?><a href='v_auction.php?type=unique' target='_blank' class='open-window commandButton <?=$btnSplitClass??''?>'>유니크 경매장</a><?=$splitSubBtnEnd??''?>
-  <?=$splitZoneEnd??''?>
-<?=$splitBtnEnd??''?>
-<?=$btnBegin??''?><a href='b_betting.php' target='_blank' class='open-window <?=$btnClassForBetting??""?>'>베 팅 장</a><?=$btnEnd??''?>

hwe/ts/PageInheritPoint.vue

@@ -107,11 +107,11 @@
         <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>
-            <BButton class="col-6" variant="primary" @click="buySimple('ResetTurnTime')"> 구입 </BButton>
+            <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"
+              >다다음턴부터 시간이 랜덤하게 바뀝니다. (필요 포인트가 피보나치식으로 증가합니다)<br /><span style="color: white"
                 >필요 포인트: {{ inheritActionCost.resetTurnTime }}</span
               ></small
             >
@@ -234,6 +234,8 @@ declare const staticValues: {
   };
   resetTurnTimeLevel: number;
   resetSpecialWarLevel: number;
+  ternTurm: number;
+  turnTime: string;
 
   availableSpecialWar: Record<
     string,
@@ -263,6 +265,7 @@ import type { inheritBuffType, InheritPointLogItem } from "./defs/API/InheritAct
 import * as JosaUtil from "@/util/JosaUtil";
 import { BButton } from "bootstrap-vue-next";
 import { unwrap } from "./util/unwrap";
+import { add as dateAdd } from 'date-fns';
 
 const inheritanceViewText: Record<InheritanceViewType, { title: string; info: string }> = {
   sum: {
@@ -446,9 +449,35 @@ async function buyInheritBuff(buffKey: inheritBuffType) {
   //TODO: 페이지 새로고침 필요없이 하도록
   location.reload();
 }
-async function buySimple(type: "ResetTurnTime" | "BuyRandomUnique" | "ResetSpecialWar") {
+
+async function tryResestTurnTime(){
+  const cost = inheritActionCost.resetTurnTime;
+
+  if (items.value.previous < cost) {
+    alert("유산 포인트가 부족합니다.");
+    return;
+  }
+
+  const msg = `${cost} 포인트로 턴을 초기화 하시겠습니까?\n다다음턴부터 무작위 시간으로 초기화 됩니다.`;
+  if (!confirm(msg)) {
+    return;
+  }
+
+  try {
+    await SammoAPI.InheritAction.ResetTurnTime();
+  } catch (e) {
+    console.error(e);
+    alert(`실패했습니다: ${e}`);
+    return;
+  }
+
+  alert("성공했습니다.");
+  //TODO: 페이지 새로고침 필요없이 하도록
+  location.reload();
+}
+
+async function buySimple(type: "BuyRandomUnique" | "ResetSpecialWar") {
   const costMap: Record<typeof type, number> = {
-    ResetTurnTime: inheritActionCost.resetTurnTime,
     ResetSpecialWar: inheritActionCost.resetSpecialWar,
     BuyRandomUnique: inheritActionCost.randomUnique,
   };
@@ -459,15 +488,16 @@ async function buySimple(type: "ResetTurnTime" | "BuyRandomUnique" | "ResetSpeci
     return;
   }
 
-  const messageMap: Record<typeof type, string> = {
-    ResetTurnTime: `${cost} 포인트로 턴을 초기화 하시겠습니까?`,
-    ResetSpecialWar: `${cost} 포인트로 전투 특기를 초기화 하시겠습니까?`,
-    BuyRandomUnique: `${cost} 포인트로 랜덤 유니크를 구입하시겠습니까?`,
-  };
   if (items.value.previous < cost) {
     alert("유산 포인트가 부족합니다.");
     return;
   }
+
+  const messageMap: Record<typeof type, string> = {
+    ResetSpecialWar: `${cost} 포인트로 전투 특기를 초기화 하시겠습니까?`,
+    BuyRandomUnique: `${cost} 포인트로 랜덤 유니크를 구입하시겠습니까?`,
+  };
+
   if (!confirm(messageMap[type])) {
     return;
   }

hwe/ts/PageJoin.vue

@@ -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">
+          <div class="row">
-            <label> <input v-model="inheritTurnTimeSet" type="checkbox" />턴 시간 고정 </label>
+            <div class="col col-6 a-right align-self-center">턴 시간 지정</div>
-          </div>
+            <div class="col col-6 align-self-center">
-          <div class="row turn_time_pad">
+              <select v-model.number="inheritTurnTimeZone" class="form-select form-inline" style="max-width: 24ch">
-            <div class="col col-lg-4 offset-lg-3 col-4 offset-3">
+                <option :value="undefined">사용안함</option>
-              <NumberInputWithInfo
+                <option v-for="(zone, idx) in turnTimeZoneList" :key="idx" :value="idx">
-                v-model="inheritTurnTimeMinute"
+                    {{ zone }}
-                :readonly="!inheritTurnTimeSet"
+                </option>
-                :min="0"
+              </select>
-                :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>
           </div>
         </div>
 
-        <div class="col col-lg-6 col-12 p-2">
+        <div class="col col-lg-6 col-sm-6 col-12 p-2 align-self-center">
-          <div class="a-center">추가 능력치 고정</div>
           <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) {
+const inheritTurnTimeZone = ref<number>();
-    args.value.inheritTurntime = undefined;
+const turnTimeZoneList: string[] = (()=>{
-    return;
+  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>

hwe/ts/components/AuctionUniqueItem.vue

@@ -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)) {

hwe/ts/defs/API/General.ts

@@ -6,7 +6,7 @@ export type JoinArgs = {
   pic: boolean;
   character: string;
   inheritSpecial?: string;
-  inheritTurntime?: number;
+  inheritTurntimeZone?: number;
   inheritCity?: number;
   inheritBonusStat?: [number, number, number];
 };

hwe/ts/extExpandCity.ts

@@ -551,7 +551,7 @@ $(function () {
             {
                 cityInfo.태수.$obj = $this.find('.officer-4-value');
                 cityInfo.군사.$obj = $this.find('.officer-3-value');
-                cityInfo.종사.$obj = $this.find('.officer-2-valuet');
+                cityInfo.종사.$obj = $this.find('.officer-2-value');
             }
 
             //기타

hwe/ts/processing/ProcessCity.vue

@@ -55,7 +55,7 @@
     </div>
     <div v-else-if="commandName == '허보'">
       선택된 도시에 허보를 발동합니다.<br />
-      전쟁중인 상대국 도시만 가능합니다.<br />
+      선포, 전쟁중인 상대국 도시만 가능합니다.<br />
       목록을 선택하거나 도시를 클릭하세요.<br />
     </div>
     <div v-else-if="commandName == '초토화'">

src/sammo/APIHelper.php

@@ -93,8 +93,8 @@ class APIHelper
                     'ip' => $ip,
                     'date' => $date,
                     'path' => $actionPath,
-                    'arg' => JSON::encode($filteredArgs),
+                    'arg' => Json::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    '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),
+                    'arg' => Json::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    '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),
+                    'arg' => Json::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    '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),
+                            'arg' => Json::encode($filteredArgs),
-                            'aux' => JSON::encode([
+                            '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),
+                        'arg' => Json::encode($filteredArgs),
-                        'aux' => JSON::encode([
+                        '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),
+                    'arg' => Json::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    '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),
+                'arg' => Json::encode($filteredArgs),
-                'aux' => JSON::encode([
+                '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),
+                'arg' => Json::encode($filteredArgs),
-                'aux' => JSON::encode([
+                '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),
+                'arg' => Json::encode($filteredArgs),
-                'aux' => JSON::encode([
+                '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),
+                'arg' => Json::encode($filteredArgs),
-                'aux' => JSON::encode([
+                'aux' => Json::encode([
                     'result' => false,
                     'state' => 'error_mixed',
                     'errMsg' => $errStr,