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

@@ -291,40 +291,6 @@ function buildScenarioEffectClass(?string $type):iAction{
     return $obj;
 }
 
-function getBuffClass(?string $type){
-    if($type === null || $type === ''){
-        $type = 'None';
-    }
-
-    static $basePath = __NAMESPACE__.'\\ActionBuff\\';
-    $classPath = ($basePath.$type);
-
-    if(class_exists($classPath)){
-        return $classPath;
-    }
-
-    $classPath = ($basePath.'che_'.$type);
-    if(class_exists($classPath)){
-        return $classPath;
-    }
-
-    throw new \InvalidArgumentException("{$type}은 버프 클래스가 아님");
-}
-function buildBuffClass(?string $type):iAction{
-    static $cache = [];
-    if($type === null){
-        $type = 'None';
-    }
-    if(key_exists($type, $cache)){
-        return $cache[$type];
-    }
-    $class = getBuffClass($type);
-
-    $obj = new $class();
-    $cache[$type]= $obj;
-    return $obj;
-}
-
 function getGeneralSpecialDomesticClass(?string $type){
     if($type === null || $type === ''){
         $type = GameConst::$defaultSpecialDomestic;
@@ -450,27 +416,6 @@ function buildGeneralCommandClass(?string $type, General $generalObj, array $env
     return new $class($generalObj, $env, $arg);
 }
 
-function getUserActionCommandClass(?string $type){
-    if($type === null || $type === ''){
-        $type = '휴식';
-    }
-
-    static $basePath = __NAMESPACE__.'\\Command\\UserAction\\';
-    $classPath = ($basePath.$type);
-
-    if(class_exists($classPath)){
-        return $classPath;
-    }
-
-    throw new \InvalidArgumentException("{$type}은 올바른 개변 전략 커맨드가 아님");
-}
-
-function buildUserActionCommandClass(?string $type, General $generalObj, array $env, $arg = null):Command\UserActionCommand{
-    $class = getUserActionCommandClass($type);
-    return new $class($generalObj, $env, $arg);
-}
-
-
 function getNationCommandClass(?string $type){
     if($type === null || $type === ''){
         $type = '휴식';

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

@@ -222,10 +222,7 @@ function extractBattleOrder(WarUnit $defender, WarUnit $attacker)
     $totalStat = ($realStat + $fullStat) / 2;
 
     $totalCrew = $general->getVar('crew') / 1000000 * (($general->getVar('train') * $general->getVar('atmos')) ** 1.5);
-    $value = $totalStat + $totalCrew / 100;
+    return $totalStat + $totalCrew / 100;
-    $value = $general->onCalcStat($general, 'battleOrder', $value, ['attacker' => $attacker->getGeneral()]);
-    $value = $attacker->getGeneral()->onCalcOpposeStat($general, 'battleOrder', $value, ['attacker' => $attacker->getGeneral()]);
-    return $value;
 }
 
 function processWar_NG(

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/Command/GetReservedUserAction.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace sammo\API\Command;
-
-use sammo\Session;
-use DateTimeInterface;
-use sammo\Command\UserActionCommand;
-use sammo\DB;
-use sammo\Enums\APIRecoveryType;
-use sammo\Json;
-use sammo\KVStorage;
-use sammo\TimeUtil;
-use sammo\DTO\UserAction;
-
-use function sammo\cutTurn;
-
-class GetReservedUserAction extends \sammo\BaseAPI
-{
-    public function validateArgs(): ?string
-    {
-        return null;
-    }
-
-    public function getRequiredSessionMode(): int
-    {
-        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
-    }
-
-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
-    {
-        $db = DB::db();
-        $generalID = $session->generalID;
-
-        $userActionKey = UserActionCommand::USER_ACTION_KEY;
-
-        $rawUserActions = $db->queryFirstField('SELECT JSON_QUERY(`aux`, %s) FROM general WHERE no=%i', "$.{$userActionKey}", $generalID);
-        if($rawUserActions === null){
-            $rawUserActions = '{}';
-        }
-
-        $userActions = UserAction::fromArray(Json::decode($rawUserActions));
-
-        return [
-            'result' => true,
-            'userActions' => $userActions->toArray(),
-        ];
-    }
-}

hwe/sammo/API/Command/ReserveUserAction.php

@@ -1,91 +0,0 @@
-<?php
-
-namespace sammo\API\Command;
-
-use sammo\Session;
-use DateTimeInterface;
-use sammo\Command\UserActionCommand;
-use sammo\DB;
-use sammo\DTO\UserAction;
-use sammo\DTO\UserActionItem;
-use sammo\Enums\APIRecoveryType;
-use sammo\GameConst;
-use sammo\General;
-use sammo\Json;
-use sammo\KVStorage;
-use sammo\Util;
-use sammo\Validator;
-
-use function sammo\buildUserActionCommandClass;
-use function sammo\setGeneralCommand;
-
-class ReserveUserAction extends \sammo\BaseAPI
-{
-    public function validateArgs(): ?string
-    {
-        $v = new Validator($this->args);
-        $v->rule('required', [
-            'turnIdx',
-            'action'
-        ])
-            ->rule('int', 'turnIdx')
-            ->rule('max', 'turnIdx', GameConst::$maxTurn)
-            ->rule('min', 'turnIdx', 0)
-            ->rule('lengthMin', 'action', 1);
-        if (!$v->validate()) {
-            return $v->errorStr();
-        }
-        return null;
-    }
-
-    public function getRequiredSessionMode(): int
-    {
-        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
-    }
-
-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
-    {
-        $turnIdx = $this->args['turnIdx'];
-        $action = $this->args['action'];
-
-        $userActionKey = UserActionCommand::USER_ACTION_KEY;
-
-        if($turnIdx < 0 || $turnIdx >= GameConst::$maxTurn){
-            return '올바르지 않은 턴입니다.';
-        }
-
-        if(!in_array($action, Util::array_flatten(GameConst::$availableUserActionCommand))){
-            return '사용할 수 없는 커맨드입니다.';
-        }
-
-        $db = DB::db();
-        $generalID = $session->generalID;
-        $rawUserActions = $db->queryFirstField('SELECT JSON_QUERY(`aux`, %s) FROM general WHERE no=%i', "$.{$userActionKey}", $generalID);
-        if(!$rawUserActions){
-            $rawUserActions = '{}';
-        }
-
-        $tmp = Json::decode($rawUserActions);
-        $userActions = UserAction::fromArray($tmp);
-
-
-        $gameStor = KVStorage::getStorage($db, 'game_env');
-        $gameStor->cacheAll();
-        $general = General::createObjFromDB($generalID);
-
-        $item = buildUserActionCommandClass($action, $general, $gameStor->getAll());
-        $userActions->reserved[$turnIdx] = new UserActionItem(
-            $item->getRawClassName(),
-            $item->getBrief(),
-            null,
-        );
-
-        $db->update('general', [
-            'aux' => $db->sqleval('JSON_SET(`aux`, %s, JSON_EXTRACT(%s, "$"))', "$.{$userActionKey}", Json::encode($userActions->toArray())),
-        ], 'no=%i', $generalID);
-
-        return [
-            'result' => true,
-        ];
-    }
-}

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

@@ -5,14 +5,11 @@ namespace sammo\API\General;
 use DateTimeInterface;
 use MeekroDB;
 use sammo\CityConst;
-use sammo\Command\UserActionCommand;
 use sammo\DB;
-use sammo\DTO\UserAction;
 use sammo\DTO\VoteInfo;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\CityColumn;
 use sammo\Enums\GeneralAccessLogColumn;
-use sammo\Enums\GeneralAuxKey;
 use sammo\Enums\GeneralColumn;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\RankColumn;
@@ -30,7 +27,6 @@ use function sammo\buildNationCommandClass;
 use function sammo\checkLimit;
 use function sammo\getTournamentTermText;
 use function sammo\buildNationTypeClass;
-use function sammo\buildUserActionCommandClass;
 use function sammo\calcLeadershipBonus;
 use function sammo\checkSecretPermission;
 use function sammo\getBillByLevel;
@@ -105,8 +101,7 @@ class GetFrontInfo extends \sammo\BaseAPI
     return $history;
   }
 
-  private function generateRecentRecord(int $generalID)
+  private function generateRecentRecord(int $generalID){
-  {
     $db = DB::db();
 
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -252,7 +247,7 @@ class GetFrontInfo extends \sammo\BaseAPI
       $nationID
     );
 
-    if ($nationPopulation['cityCnt'] == 0) {
+    if($nationPopulation['cityCnt'] == 0){
       $nationPopulation = [
         'cityCnt' => 0,
         'now' => 0,
@@ -366,8 +361,6 @@ class GetFrontInfo extends \sammo\BaseAPI
 
   public function generateGeneralInfo(MeekroDB $db, General $general, array $rawNation): array
   {
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $admin = $gameStor->getAll(true);
 
     $permission = checkSecretPermission($general->getRaw());
 
@@ -450,21 +443,6 @@ class GetFrontInfo extends \sammo\BaseAPI
       'permission' => $permission,
     ];
 
-    $rawUserAction = $general->getAuxVar(UserActionCommand::USER_ACTION_KEY) ?? [];
-    $userAction = UserAction::fromArray($rawUserAction);
-    $impossibleUserAction = [];
-    $yearMonth = Util::joinYearMonth($admin['year'], $admin['month']);
-
-    if ($userAction->nextAvailableTurn) {
-      foreach ($userAction->nextAvailableTurn as $command => $nextAvailableTurn) {
-        if ($nextAvailableTurn > $yearMonth) {
-          $impossibleUserAction[] = [$command, $nextAvailableTurn - $yearMonth];
-        }
-      }
-    }
-
-    $result['impossibleUserAction'] = $impossibleUserAction;
-
     $nationID = $general->getNationID();
     $troopID = $general->getVar(GeneralColumn::troop);
     if (!$troopID) {
@@ -505,7 +483,6 @@ class GetFrontInfo extends \sammo\BaseAPI
       'name' => $troopName,
     ];
 
-
     return $result;
   }
 
@@ -599,7 +576,7 @@ class GetFrontInfo extends \sammo\BaseAPI
 
     if ($globalInfo['lastVote']) {
       $myLastVoteID = $db->queryFirstField('SELECT vote_id FROM vote WHERE general_id = %i ORDER BY vote_id DESC LIMIT 1', $generalID);
-      if ($myLastVoteID) {
+      if($myLastVoteID) {
         $auxInfo['myLastVote'] = $myLastVoteID;
       }
     }

hwe/sammo/API/General/GetUserActionCommandTable.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace sammo\API\General;
-
-use sammo\DB;
-use sammo\Enums\APIRecoveryType;
-use sammo\GameConst;
-use sammo\General;
-use sammo\Session;
-use sammo\KVStorage;
-use sammo\Util;
-
-use function sammo\buildUserActionCommandClass;
-
-class GetUserActionCommandTable extends \sammo\BaseAPI
-{
-    public function validateArgs(): ?string
-    {
-        return null;
-    }
-
-    public function getRequiredSessionMode(): int
-    {
-        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
-    }
-
-    public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
-    {
-        $generalID = $session->generalID;
-
-        $db = DB::db();
-        $gameStor = KVStorage::getStorage($db, 'game_env');
-        $gameStor->turnOnCache();
-        $env = $gameStor->getAll();
-
-
-        $general = General::createObjFromDB($generalID);
-
-        $commandTable = [];
-        foreach (GameConst::$availableUserActionCommand as $commandCategory => $commandList) {
-            $subList = [];
-            foreach ($commandList as $commandClassName) {
-                $commandObj = buildUserActionCommandClass($commandClassName, $general, $env);
-                if (!$commandObj->canDisplay()) {
-                    continue;
-                }
-                $subList[] = [
-                    'value' => Util::getClassNameFromObj($commandObj),
-                    'compensation' => $commandObj->getCompensationStyle(),
-                    'possible' => $commandObj->hasMinConditionMet(),
-                    'title' => $commandObj->getCommandDetailTitle(),
-                    'simpleName' => $commandObj->getName(),
-                    'reqArg' => $commandObj::$reqArg,
-                ];
-            }
-
-            $commandTable[] = [
-                'category' => $commandCategory,
-                'values' => $subList
-            ];
-        }
-
-        return [
-            'result' => true,
-            'commandTable' => $commandTable,
-        ];
-    }
-}

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/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

@@ -3,9 +3,7 @@
 namespace sammo\API\Nation;
 
 use ArrayObject;
-use sammo\Command\UserActionCommand;
 use sammo\DB;
-use sammo\DTO\UserAction;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\GeneralLiteQueryMode;
 use sammo\Enums\GeneralQueryMode;
@@ -119,9 +117,6 @@ class GeneralList extends \sammo\BaseAPI
         'reservedCommand' => 1,
 
         'autorun_limit' => 1,
-
-        'impossibleUserAction' => 1,
-        'reservedUserAction' => 1,
     ];
 
     public function validateArgs(): ?string
@@ -158,8 +153,7 @@ class GeneralList extends \sammo\BaseAPI
 
         $me = $db->queryFirstRow(
             'SELECT refresh_score, turntime, belong, nation, officer_level, permission, penalty FROM `general`
-            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i',
+            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $session->getUserID()
-            $session->getUserID()
         );
         $limitState = checkLimit($me['refresh_score']);
         if ($limitState >= 2) {
@@ -275,50 +269,6 @@ class GeneralList extends \sammo\BaseAPI
             'bill' => fn ($rawGeneral) => getBillByLevel($rawGeneral['dedlevel']),
             'reservedCommand' => fn ($rawGeneral) => $reservedCommand[$rawGeneral['no']] ?? null,
             'autorun_limit' => fn ($rawGeneral) => ($rawGeneral['aux'] ?? [])['autorun_limit'] ?? 0,
-            'impossibleUserAction' => function ($rawGeneral) use ($env) {
-                $rawUserAction = ($rawGeneral['aux'] ?? [])[UserActionCommand::USER_ACTION_KEY] ?? [];
-                $userAction = UserAction::fromArray($rawUserAction);
-                $impossibleUserAction = [];
-                $yearMonth = Util::joinYearMonth($env['year'], $env['month']);
-
-                if ($userAction->nextAvailableTurn) {
-                    foreach ($userAction->nextAvailableTurn as $command => $nextAvailableTurn) {
-                        if ($nextAvailableTurn > $yearMonth) {
-                            $impossibleUserAction[] = [$command, $nextAvailableTurn - $yearMonth];
-                        }
-                    }
-                }
-                return $impossibleUserAction;
-            },
-            'reservedUserAction' => function ($rawGeneral) use ($env) {
-                $rawUserAction = ($rawGeneral['aux'] ?? [])[UserActionCommand::USER_ACTION_KEY] ?? [];
-                $userAction = UserAction::fromArray($rawUserAction);
-                $reservedUserAction = [];
-
-                $emptyTurnObj = [
-                    'brief' => '휴식',
-                    'action' => '휴식',
-                    'arg' => [],
-                ];
-
-                for($i = 0; $i < 5; $i++){
-                    $reservedUserAction[] = $emptyTurnObj;
-                }
-
-                if ($userAction->reserved) {
-                    foreach ($userAction->reserved as $turnIdx => $reserved) {
-                        if($turnIdx >= 5){
-                            continue;
-                        }
-                        $reservedUserAction[$turnIdx] = [
-                            'brief' => $reserved->brief,
-                            'action' => $reserved->command,
-                            'arg' => [],
-                        ];
-                    }
-                }
-                return $reservedUserAction;
-            },
         ];
 
         foreach ($rankColumns as $rankKey) {
@@ -363,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/ActionBuff/g65_계략성공.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace sammo\ActionBuff;
-
-use sammo\General;
-use \sammo\iAction;
-
-class g65_계략성공 implements iAction
-{
-    use \sammo\DefaultAction;
-
-    function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
-    {
-        if($turnType == '계략'){
-            if($varType == 'success') return $value + 20;
-        }
-        return $value;
-    }
-}

hwe/sammo/ActionBuff/g65_내정성공.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace sammo\ActionBuff;
-
-use sammo\General;
-use \sammo\iAction;
-
-class g65_내정성공 implements iAction
-{
-    use \sammo\DefaultAction;
-
-    static protected $target = ['상업', '농업', '치안', '기술', '인구', '성벽', '수비', '민심'];
-
-    function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
-    {
-        if ($varType == 'success' && in_array($turnType, static::$target)) {
-            return $value + 1;
-        }
-        return $value;
-    }
-}

hwe/sammo/ActionBuff/g65_사기40.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace sammo\ActionBuff;
-
-use sammo\General;
-use \sammo\iAction;
-
-class g65_사기40 implements iAction
-{
-    use \sammo\DefaultAction;
-
-    function onCalcStat(General $general, string $statName, $value, $aux = null)
-    {
-        if ($statName == 'bonusAtmos') {
-            return $value + 40;
-        }
-        return $value;
-    }
-}

hwe/sammo/ActionBuff/g65_전투순위보정.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace sammo\ActionBuff;
-
-use sammo\GameUnitConst;
-use sammo\General;
-use \sammo\iAction;
-
-class g65_전투순위보정 implements iAction
-{
-    use \sammo\DefaultAction;
-
-    function onCalcStat(General $defender, string $statName, $value, $aux = null)
-    {
-        //방어자 입장에서 coef가 높다면 전투순위를 높인다.
-        if ($statName == 'battleOrder') {
-            if ($aux === null) throw new \RuntimeException('전투순위보정에 필요한 aux가 없습니다.');
-            /** @var General */
-            $attacker = $aux['attacker'];
-            $defenderCrewType = $defender->getCrewTypeObj();
-            $attackerCrewType = $attacker->getCrewTypeObj();
-
-            $attackerCoef = $attackerCrewType->getAttackCoef($defenderCrewType) * $defenderCrewType->getDefenceCoef($attackerCrewType);
-            $defenderCoef = $defenderCrewType->getAttackCoef($attackerCrewType) * $attackerCrewType->getDefenceCoef($defenderCrewType);
-
-            if ($attackerCoef < $defenderCoef) {
-                return $value * 4;
-            } else if ($attackerCoef > $defenderCoef) {
-                return $value / 2;
-            } else if ($attackerCrewType->armType == $defenderCrewType->armType) {
-                return $value * 2;
-            }
-        }
-        return $value;
-    }
-
-    function onCalcOpposeStat(General $defender, string $statName, $value, $aux = null)
-    {
-        //공격자 입장에서 coef가 높다면 전투순위를 높인다.
-        if ($statName == 'battleOrder') {
-            if ($aux === null) throw new \RuntimeException('전투순위보정에 필요한 aux가 없습니다.');
-            /** @var General */
-            $attacker = $aux['attacker'];
-            $defenderCrewType = $defender->getCrewTypeObj();
-            $attackerCrewType = $attacker->getCrewTypeObj();
-
-            $attackerCoef = $attackerCrewType->getAttackCoef($defenderCrewType) * $defenderCrewType->getDefenceCoef($attackerCrewType);
-            $defenderCoef = $defenderCrewType->getAttackCoef($attackerCrewType) * $attackerCrewType->getDefenceCoef($defenderCrewType);
-
-            if ($attackerCoef > $defenderCoef) {
-                return $value * 4;
-            } else if ($attackerCoef < $defenderCoef) {
-                return $value / 2;
-            } else if ($attackerCrewType->armType == $defenderCrewType->armType) {
-                return $value * 2;
-            }
-        }
-        return $value;
-    }
-}

hwe/sammo/ActionBuff/g65_징병비용무시.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace sammo\ActionBuff;
-
-use \sammo\iAction;
-
-class g65_징병비용무시 implements iAction
-{
-    use \sammo\DefaultAction;
-
-    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
-    {
-        if ($varType == 'cost' && in_array($turnType, ['징병', '모병'])) {
-            return 0;
-        }
-
-        return $value;
-    }
-}

hwe/sammo/ActionBuff/g65_징병인구무시.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace sammo\ActionBuff;
-
-use \sammo\iAction;
-
-class g65_징병인구무시 implements iAction
-{
-    use \sammo\DefaultAction;
-
-    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
-    {
-        if ($turnType == '징집인구' && $varType == 'score') {
-            return 0;
-        }
-
-        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{
@@ -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/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

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

@@ -95,8 +95,6 @@ class che_접경귀환 extends Command\GeneralCommand{
         $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>{$josaRo} 접경귀환했습니다.");
         $general->setVar('city', $destCityID);
 
-        $general->setRawCity(null);
-
         //TODO: InstantAction일때에만 설정하지 않는게 나은데..
         //$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
 

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

@@ -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/UserAction/g65_군량급매.php

@@ -1,61 +0,0 @@
-<?php
-namespace sammo\Command\UserAction;
-
-use \sammo\Command;
-use sammo\DB;
-use sammo\Util;
-
-class g65_군량급매 extends Command\UserActionCommand{
-    static protected $actionName = '군량급매';
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    public function getBrief(): string
-    {
-        return '군량 급매';
-    }
-
-    public function getCommandDetailTitle(): string
-    {
-        $postReqTurn = $this->getPostReqTurn();
-        return "금/쌀 동등화(재사용 대기 {$postReqTurn})";
-    }
-
-    protected function init(){
-        //아무것도 하지 않음
-        $this->fullConditionConstraints=[];
-
-    }
-
-    public function getPreReqTurn():int{
-        return 0;
-    }
-
-    public function getPostReqTurn():int{
-        return 60;
-    }
-
-    public function getCost():array{
-        return [0, 0];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        $general = $this->generalObj;
-
-        $date = $general->getTurnTime($general::TURNTIME_HM);
-
-        $gold = $general->getVar('gold');
-        $rice = $general->getVar('rice');
-
-        $avg = Util::toInt(($gold + $rice + 1) / 2);
-        $general->setVar('gold', $avg);
-        $general->setVar('rice', $avg);
-
-        $logger = $this->generalObj->getLogger();
-        $logger->pushGeneralActionLog("지나가는 상인과 금과 쌀을 거래합니다. <1>$date</>");
-        $general->applyDB(DB::db());
-        return true;
-    }
-}

hwe/sammo/Command/UserAction/g65_병사연회.php

@@ -1,52 +0,0 @@
-<?php
-namespace sammo\Command\UserAction;
-
-use sammo\ActionBuff\g65_사기40;
-use \sammo\Command;
-
-class g65_병사연회 extends Command\UserActionCommand{
-    static protected $actionName = '병사연회';
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    public function getBrief(): string
-    {
-        return '병사 연회';
-    }
-
-    public function getCommandDetailTitle(): string
-    {
-        $postReqTurn = $this->getPostReqTurn();
-        return "3턴 간 사기 +40(재사용 대기 {$postReqTurn})";
-    }
-
-    protected function init(){
-        //아무것도 하지 않음
-        $this->fullConditionConstraints=[];
-
-    }
-
-    public function getPreReqTurn():int{
-        return 0;
-    }
-
-    public function getPostReqTurn():int{
-        return 60;
-    }
-
-    public function getCost():array{
-        return [0, 0];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        $general = $this->generalObj;
-        $general->addInstantBuff(new g65_사기40(), 3);
-
-        $date = $general->getTurnTime($general::TURNTIME_HM);
-        $logger = $general->getLogger();
-        $logger->pushGeneralActionLog("병사에게 연회를 열어 3턴간 사기가 40 상승합니다. <1>$date</>");
-        return true;
-    }
-}

hwe/sammo/Command/UserAction/g65_병장기지원.php

@@ -1,62 +0,0 @@
-<?php
-namespace sammo\Command\UserAction;
-
-use sammo\ActionBuff\g65_징병비용무시;
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-
-class g65_병장기지원 extends Command\UserActionCommand{
-    static protected $actionName = '병장기지원';
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    public function getBrief(): string
-    {
-        return '병장기 지원';
-    }
-
-    public function getCommandDetailTitle(): string
-    {
-        $postReqTurn = $this->getPostReqTurn();
-        return "이번턴의 징병/모병 비용 무시(재사용 대기 {$postReqTurn})";
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation();
-
-        $this->fullConditionConstraints = [
-            ConstraintHelper::NotBeNeutral(),
-            ConstraintHelper::OccupiedCity()
-        ];
-    }
-
-    public function getPreReqTurn():int{
-        return 0;
-    }
-
-    public function getPostReqTurn():int{
-        return 60;
-    }
-
-    public function getCost():array{
-        return [0, 0];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if (!$this->hasFullConditionMet()) {
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-
-        $general = $this->generalObj;
-        $general->addInstantBuff(new g65_징병비용무시(), 1);
-
-        $date = $general->getTurnTime($general::TURNTIME_HM);
-
-        $logger = $general->getLogger();
-        $logger->pushGeneralActionLog("상인에게 병사들의 병장기를 지원받습니다. <1>$date</>");
-        return true;
-    }
-}

hwe/sammo/Command/UserAction/g65_약점간파.php

@@ -1,61 +0,0 @@
-<?php
-namespace sammo\Command\UserAction;
-
-use sammo\ActionBuff\g65_전투순위보정;
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-
-class g65_약점간파 extends Command\UserActionCommand{
-    static protected $actionName = '약점간파';
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    public function getBrief(): string
-    {
-        return '약점 간파';
-    }
-
-    public function getCommandDetailTitle(): string
-    {
-        $postReqTurn = $this->getPostReqTurn();
-        return "1턴동안 유리한 병종과 상대할 가능성 대폭 증가(재사용 대기 {$postReqTurn})";
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation();
-
-        $this->fullConditionConstraints = [
-            ConstraintHelper::NotBeNeutral()
-        ];
-    }
-
-    public function getPreReqTurn():int{
-        return 0;
-    }
-
-    public function getPostReqTurn():int{
-        return 60;
-    }
-
-    public function getCost():array{
-        return [0, 0];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if (!$this->hasFullConditionMet()) {
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-
-        $general = $this->generalObj;
-        $general->addInstantBuff(new g65_전투순위보정(), 1);
-
-        $date = $general->getTurnTime($general::TURNTIME_HM);
-
-        $logger = $general->getLogger();
-        $logger->pushGeneralActionLog("상대진영의 약점을 꿰뚫어 유리한 상대를 찾습니다. <1>$date</>");
-        return true;
-    }
-}

hwe/sammo/Command/UserAction/g65_의원소환.php

@@ -1,56 +0,0 @@
-<?php
-namespace sammo\Command\UserAction;
-
-use \sammo\Command;
-use sammo\DB;
-
-class g65_의원소환 extends Command\UserActionCommand{
-    static protected $actionName = '의원 소환';
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    public function getBrief(): string
-    {
-        return '의원 소환';
-    }
-
-    public function getCommandDetailTitle(): string
-    {
-        $postReqTurn = $this->getPostReqTurn();
-        return "부상 시 치료(재사용 대기 {$postReqTurn})";
-    }
-
-    protected function init(){
-        //아무것도 하지 않음
-        $this->fullConditionConstraints=[];
-
-    }
-
-    public function getPreReqTurn():int{
-        return 0;
-    }
-
-    public function getPostReqTurn():int{
-        return 60;
-    }
-
-    public function getCost():array{
-        return [0, 0];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        $general = $this->generalObj;
-        if($general->getVar('injury') == 0){
-            return false;
-        }
-        $general->setVar('injury', 0);
-        $date = $general->getTurnTime($general::TURNTIME_HM);
-
-        $logger = $this->generalObj->getLogger();
-        $logger->pushGeneralActionLog("의원을 불러 부상을 치료합니다. <1>$date</>");
-        $general->applyDB(DB::db());
-        return true;
-    }
-}

hwe/sammo/Command/UserAction/g65_입대독려.php

@@ -1,62 +0,0 @@
-<?php
-namespace sammo\Command\UserAction;
-
-use sammo\ActionBuff\g65_징병인구무시;
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-
-class g65_입대독려 extends Command\UserActionCommand{
-    static protected $actionName = '입대독려';
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    public function getBrief(): string
-    {
-        return '입대 독려';
-    }
-
-    public function getCommandDetailTitle(): string
-    {
-        $postReqTurn = $this->getPostReqTurn();
-        return "이번턴의 징병/모병 인구 무시(재사용 대기 {$postReqTurn})";
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation();
-
-        $this->fullConditionConstraints = [
-            ConstraintHelper::NotBeNeutral(),
-            ConstraintHelper::OccupiedCity()
-        ];
-    }
-
-    public function getPreReqTurn():int{
-        return 0;
-    }
-
-    public function getPostReqTurn():int{
-        return 60;
-    }
-
-    public function getCost():array{
-        return [0, 0];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if (!$this->hasFullConditionMet()) {
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-
-        $general = $this->generalObj;
-        $general->addInstantBuff(new g65_징병인구무시(), 1);
-
-        $date = $general->getTurnTime($general::TURNTIME_HM);
-
-        $logger = $general->getLogger();
-        $logger->pushGeneralActionLog("성 밖의 주민들에게 입대를 요청합니다. <1>$date</>");
-        return true;
-    }
-}

hwe/sammo/Command/UserAction/g65_접경귀환.php

@@ -1,112 +0,0 @@
-<?php
-
-namespace sammo\Command\UserAction;
-
-use sammo\CityConst;
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-use sammo\DB;
-use sammo\JosaUtil;
-
-use function sammo\searchDistance;
-
-class g65_접경귀환 extends Command\UserActionCommand
-{
-    static protected $actionName = '접경귀환';
-
-    protected function argTest(): bool
-    {
-        return true;
-    }
-
-    public function getBrief(): string
-    {
-        return '접경 귀환';
-    }
-
-    public function getCommandDetailTitle(): string
-    {
-        $postReqTurn = $this->getPostReqTurn();
-        return "적군 도시 소재 시 접경으로 귀환(재사용 대기 {$postReqTurn})";
-    }
-
-    protected function init()
-    {
-        $this->setCity();
-        $this->setNation();
-
-        $this->fullConditionConstraints = [
-            ConstraintHelper::NotBeNeutral(),
-            ConstraintHelper::NotWanderingNation(),
-            ConstraintHelper::NotOccupiedCity()
-        ];
-    }
-
-    public function getPreReqTurn(): int
-    {
-        return 0;
-    }
-
-    public function getPostReqTurn(): int
-    {
-        return 60;
-    }
-
-    public function getCost(): array
-    {
-        return [0, 0];
-    }
-
-    public function run(\Sammo\RandUtil $rng): bool
-    {
-        if (!$this->hasFullConditionMet()) {
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-
-        $db = DB::db();
-
-        $general = $this->generalObj;
-        $cityID = $general->getCityID();
-        $logger = $general->getLogger();
-
-        $distanceList = searchDistance($cityID, 3, true);
-
-        $occupiedCityList = new \Ds\Set($db->queryFirstColumn(
-            'SELECT city FROM city WHERE nation = %i AND city IN %li AND supply = 1',
-            $general->getNationID(),
-            array_merge(...$distanceList)
-        ));
-
-        $nearestCityList = [];
-        foreach ($distanceList as $cityList) {
-            foreach ($cityList as $cityID) {
-                if ($occupiedCityList->contains($cityID)) {
-                    $nearestCityList[] = $cityID;
-                }
-            }
-            if ($nearestCityList) {
-                break;
-            }
-        }
-
-        if (!$nearestCityList) {
-            $logger->pushGeneralActionLog("3칸 이내에 아국 도시가 없습니다.");
-            return false;
-        }
-
-        $destCityID = $rng->choice($nearestCityList);
-        $destCityName = CityConst::byID($destCityID)->name;
-
-        $date = $general->getTurnTime($general::TURNTIME_HM);
-
-        $josaRo = JosaUtil::pick($destCityName, '로');
-        $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>{$josaRo} 접경귀환했습니다. <1>$date</>");
-        $general->setVar('city', $destCityID);
-
-        $general->setRawCity(null);
-
-
-        $general->applyDB($db);
-        return true;
-    }
-}

hwe/sammo/Command/UserAction/g65_철야내정.php

@@ -1,62 +0,0 @@
-<?php
-namespace sammo\Command\UserAction;
-
-use sammo\ActionBuff\g65_내정성공;
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-
-class g65_철야내정 extends Command\UserActionCommand{
-    static protected $actionName = '철야내정';
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    public function getBrief(): string
-    {
-        return '철야 내정';
-    }
-
-    public function getCommandDetailTitle(): string
-    {
-        $postReqTurn = $this->getPostReqTurn();
-        return "2턴 간 내정 항상 성공(재사용 대기 {$postReqTurn})";
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation();
-
-        $this->fullConditionConstraints = [
-            ConstraintHelper::NotBeNeutral(),
-            ConstraintHelper::OccupiedCity()
-        ];
-    }
-
-    public function getPreReqTurn():int{
-        return 0;
-    }
-
-    public function getPostReqTurn():int{
-        return 60;
-    }
-
-    public function getCost():array{
-        return [0, 0];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if (!$this->hasFullConditionMet()) {
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-
-        $general = $this->generalObj;
-        $general->addInstantBuff(new g65_내정성공(), 2);
-
-        $date = $general->getTurnTime($general::TURNTIME_HM);
-
-        $logger = $general->getLogger();
-        $logger->pushGeneralActionLog("2턴 간 내정을 철저히 지휘합니다. <1>$date</>");
-        return true;
-    }
-}

hwe/sammo/Command/UserAction/g65_필중계략.php

@@ -1,66 +0,0 @@
-<?php
-namespace sammo\Command\UserAction;
-
-use sammo\ActionBuff\g65_계략성공;
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-
-class g65_필중계략 extends Command\UserActionCommand{
-    static protected $actionName = '신산귀모';
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    public function getBrief(): string
-    {
-        return '신산귀모';
-    }
-
-    public function getCommandDetailTitle(): string
-    {
-        $postReqTurn = $this->getPostReqTurn();
-        return "이번 턴의 계략 성공률 대폭 향상(재사용 대기 {$postReqTurn})";
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation();
-
-        $env = $this->env;
-        $relYear = $env['year'] - $env['startyear'];
-
-        $this->fullConditionConstraints = [
-            ConstraintHelper::NotBeNeutral(),
-            ConstraintHelper::OccupiedCity(),
-            ConstraintHelper::NotOpeningPart($relYear),
-        ];
-    }
-
-    public function getPreReqTurn():int{
-        return 0;
-    }
-
-    public function getPostReqTurn():int{
-        return 60;
-    }
-
-    public function getCost():array{
-        return [0, 0];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if (!$this->hasFullConditionMet()) {
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-
-        $general = $this->generalObj;
-        $general->addInstantBuff(new g65_계략성공(), 1);
-
-        $date = $general->getTurnTime($general::TURNTIME_HM);
-
-        $logger = $general->getLogger();
-        $logger->pushGeneralActionLog("이번 턴의 계략을 집중합니다. <1>$date</>");
-        return true;
-    }
-}

hwe/sammo/Command/UserAction/휴식.php

@@ -1,37 +0,0 @@
-<?php
-namespace sammo\Command\UserAction;
-
-use \sammo\Command;
-use \sammo\Util;
-use \sammo\JosaUtil;
-use sammo\LastTurn;
-
-class 휴식 extends Command\UserActionCommand{
-    static protected $actionName = '휴식';
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    protected function init(){
-        //아무것도 하지 않음
-        $this->fullConditionConstraints=[];
-
-    }
-
-    public function getPreReqTurn():int{
-        return 0;
-    }
-
-    public function getPostReqTurn():int{
-        return 0;
-    }
-
-    public function getCost():array{
-        return [0, 0];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        return true;
-    }
-}

hwe/sammo/Command/UserActionCommand.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace sammo\Command;
-
-use \sammo\Util;
-
-abstract class UserActionCommand extends BaseCommand
-{
-    const USER_ACTION_KEY = 'user_action';
-
-    public function getNextExecuteKey(): string
-    {
-        //NOTE: 일반 턴 체계와 다르므로 쓸 일은 없음
-        $turnKey = static::$actionName;
-        $userActionKey = static::USER_ACTION_KEY;
-        $generalID = $this->getGeneral()->getID();
-        $executeKey = "next_execute_{$generalID}_{$userActionKey}_{$turnKey}";
-        return $executeKey;
-    }
-
-    public function getNextAvailableTurn(): ?int
-    {
-        if ($this->isArgValid && !$this->getPostReqTurn()) {
-            return null;
-        }
-        $rawUserAction = $this->generalObj->getAuxVar(static::USER_ACTION_KEY);
-        if ($rawUserAction === null) {
-            return null;
-        }
-        $userAction = \sammo\DTO\UserAction::fromArray($rawUserAction);
-        $nextAvailableTurn = $userAction->nextAvailableTurn;
-        if ($nextAvailableTurn === null) {
-            return null;
-        }
-        $nextAvailableTurn = $nextAvailableTurn[static::$actionName] ?? null;
-        return $nextAvailableTurn;
-    }
-
-    public function setNextAvailable(?int $yearMonth = null)
-    {
-        if (!$this->getPostReqTurn()) {
-            return;
-        }
-        $rawUserAction = $this->generalObj->getAuxVar(static::USER_ACTION_KEY);
-        if ($rawUserAction === null) {
-            $rawUserAction = [];
-        }
-        $userAction = \sammo\DTO\UserAction::fromArray($rawUserAction);
-
-        if ($userAction->nextAvailableTurn === null) {
-            $userAction->nextAvailableTurn = [];
-        }
-
-        if ($yearMonth === null) {
-            $yearMonth = Util::joinYearMonth($this->env['year'], $this->env['month'])
-                + $this->getPostReqTurn() - $this->getPreReqTurn();
-        }
-        $userAction->nextAvailableTurn[static::$actionName] = $yearMonth;
-        $this->generalObj->setAuxVar(static::USER_ACTION_KEY, $userAction->toArray());
-    }
-};

hwe/sammo/DTO/InstantBuff.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace sammo\DTO;
-
-use LDTO\DTO;
-
-class InstantBuff extends DTO{
-  public function __construct(
-    public readonly string $buffName,
-    public readonly int $untilYearMonth,
-  ){
-  }
-}

hwe/sammo/DTO/UserAction.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace sammo\DTO;
-
-use LDTO\Attr\Convert;
-use LDTO\Converter\ArrayConverter;
-use LDTO\Converter\MapConverter;
-use LDTO\DTO;
-
-
-class UserAction extends \LDTO\DTO
-{
-    /**
-     * @param UserActionItem[] $active
-     * @param Array<int,UserActionItem> $reserved
-     * @param Array<string,int> $nextAvailableTurn
-     * */
-	public function __construct(
-
-		#[Convert(MapConverter::class, [UserActionItem::class])]
-		public ?array $reserved,
-        #[Convert(MapConverter::class, ['int'])]
-        public ?array $nextAvailableTurn,
-	) {
-	}
-}

hwe/sammo/DTO/UserActionItem.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace sammo\DTO;
-
-class UserActionItem extends \LDTO\DTO {
-    public function __construct(
-        public string $command,
-        public string $brief,
-        #[\LDTO\Attr\NullIsUndefined]
-        public ?int $untilYearMonth,
-    ) {
-    }
-}

hwe/sammo/Enums/GeneralAuxKey.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace sammo\Enums;
-
-enum GeneralAuxKey: string{
-    case instantBuffList = 'instantBuffList';
-}

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,14 +216,14 @@ 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;
     public static $inheritItemRandomPoint = 3000;
     public static $inheritBuffPoints = [0, 200, 600, 1200, 2000, 3000];
     public static $inheritSpecificSpecialPoint = 4000;
-    public static $inheritResetAttrPointBase = [1000, 1000, 2000, 3000]; //필요하면 늘려서 쓰기
+    public static $inheritResetAttrPointBase = [1000, 1000, 2000, 3000];//필요하면 늘려서 쓰기
 
     /** @var ?string */
     public static $scenarioEffect = null;
@@ -246,7 +246,7 @@ class GameConstBase
             '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_명마_12_사륜거' => 2, 'che_명마_12_옥란백용구'=> 2, 'che_명마_13_절영' => 2, 'che_명마_13_적로' => 2,
             'che_명마_14_적란마' => 2, 'che_명마_14_조황비전' => 2, 'che_명마_15_한혈마' => 2, 'che_명마_15_적토마' => 2,
         ],
         'weapon' => [
@@ -278,7 +278,7 @@ class GameConstBase
             'che_내정_납금박산로' => 1, 'che_전략_평만지장도' => 1, 'che_숙련_동작' => 1, 'che_명성_구석' => 1,
 
             'che_척사_오악진형도' => 1, 'che_격노_구정신단경' => 1, 'che_징병_낙주' => 1,
-            'che_저격_매화수전' => 1, 'che_저격_비도' => 1, 'che_위압_조목삭' => 1, 'che_공성_묵자' => 1,
+            'che_저격_매화수전' => 1, 'che_저격_비도'=>1, 'che_위압_조목삭' => 1, 'che_공성_묵자' => 1,
             'che_집중_전국책' => 1, 'che_환술_논어집해' => 1,
 
             'che_진압_박혁론' => 1, 'che_부적_태현청생부' => 1, 'che_저지_삼황내문' => 1,
@@ -318,7 +318,6 @@ class GameConstBase
             'che_치안강화',
             'che_정착장려',
             'che_주민선정',
-            'che_물자조달',
         ],
         '군사' => [
             'che_징병',
@@ -349,6 +348,7 @@ class GameConstBase
         '국가' => [
             'che_증여',
             'che_헌납',
+            'che_물자조달',
             'che_하야',
             'che_거병',
             'che_건국',
@@ -395,23 +395,6 @@ class GameConstBase
             'che_국호변경',
         ]
     ];
-
-    /** @var array 개인 전략 커맨드 */
-    public static $availableUserActionCommand = [
-        '개인 전략' => [
-            '휴식',
-            'g65_의원소환',
-            'g65_철야내정',
-            'g65_군량급매',
-            'g65_접경귀환',
-            'g65_필중계략',
-            'g65_병장기지원',
-            'g65_입대독려',
-            'g65_병사연회',
-            'g65_약점간파',
-        ]
-    ];
-
     public static $retirementYear = 80;
 
     public static $targetGeneralPool = 'RandomNameGeneral';

hwe/sammo/General.php

@@ -4,10 +4,7 @@ namespace sammo;
 
 use Ds\Map;
 use sammo\Command\GeneralCommand;
-use sammo\Command\UserActionCommand;
-use sammo\DTO\InstantBuff;
 use sammo\Enums\GeneralAccessLogColumn;
-use sammo\Enums\GeneralAuxKey;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
 use sammo\Enums\RankColumn;
@@ -48,9 +45,6 @@ class General extends GeneralBase implements iAction
     /** @var ?iAction */
     protected $scenarioEffect = null;
 
-    /** @var iAction[] */
-    protected $instantBuffList = [];
-
     /** @var ?GameUnitDetail */
     protected $crewType = null;
 
@@ -59,9 +53,6 @@ class General extends GeneralBase implements iAction
 
     protected $calcCache = [];
 
-    /** @var int */
-    protected $yearMonth;
-
     /**
      * @param array $raw DB row값.
      * @param null|Map<RankColumn,int|float> $rawRank
@@ -81,8 +72,6 @@ class General extends GeneralBase implements iAction
         $this->raw = $raw;
         $this->rawCity = $city;
 
-        $this->yearMonth = Util::joinYearMonth($year, $month);
-
         $this->resultTurn = new LastTurn();
         if (key_exists('last_turn', $this->raw)) {
             $this->lastTurn = LastTurn::fromJson($this->raw['last_turn']);
@@ -126,63 +115,6 @@ class General extends GeneralBase implements iAction
         if(GameConst::$scenarioEffect){
             $this->scenarioEffect = buildScenarioEffectClass(GameConst::$scenarioEffect);
         }
-
-        $this->refreshInstantBuff(Util::joinYearMonth($year, $month));
-    }
-
-    function refreshInstantBuff(){
-        $this->instantBuffList = [];
-        $rawBuffList = $this->getAuxVar(GeneralAuxKey::instantBuffList);
-        if($rawBuffList === null){
-            return;
-        }
-
-        foreach($rawBuffList as $rawBuff){
-            $buffItem = InstantBuff::fromArray($rawBuff);
-            $this->instantBuffList[] = buildBuffClass($buffItem->buffName);
-        }
-
-    }
-
-    //기한이 지난 버프를 삭제
-    function clearExpiredBuff()
-    {
-        $this->instantBuffList = [];
-        $rawBuffList = $this->getAuxVar(GeneralAuxKey::instantBuffList);
-        if($rawBuffList === null){
-            return;
-        }
-
-        $newRawBuffList = [];
-        $reqUpdate = false;
-
-        foreach($rawBuffList as $rawBuff){
-            $buffItem = InstantBuff::fromArray($rawBuff);
-            if($buffItem->untilYearMonth < $this->yearMonth){
-                $reqUpdate = true;
-                continue;
-            }
-
-            $newRawBuffList[] = $rawBuff;
-            $this->instantBuffList[] = buildBuffClass($buffItem->buffName);
-        }
-
-        if($reqUpdate){
-            $this->setAuxVar(GeneralAuxKey::instantBuffList, $newRawBuffList);
-        }
-    }
-
-    function addInstantBuff(iAction $buffObj, int $month){
-        $this->instantBuffList[] = $buffObj;
-
-        $untilYearMonth = $this->yearMonth + $month - 1;
-        $buffItem = new InstantBuff(Util::getClassName($buffObj::class), $untilYearMonth);
-        $rawBuffList = $this->getAuxVar(GeneralAuxKey::instantBuffList);
-        if($rawBuffList === null){
-            $rawBuffList = [];
-        }
-        $rawBuffList[] = $buffItem->toArray();
-        $this->setAuxVar(GeneralAuxKey::instantBuffList, $rawBuffList);
     }
 
     function setItem(string $itemKey = 'item', ?string $itemCode)
@@ -337,46 +269,6 @@ class General extends GeneralBase implements iAction
         return $result;
     }
 
-    function getReservedUserAction(array $env): ?UserActionCommand
-    {
-        $rawUserAction = $this->getAuxVar(UserActionCommand::USER_ACTION_KEY);
-        if(!$rawUserAction){
-            return null;
-        }
-        $userAction = \sammo\DTO\UserAction::fromArray($rawUserAction);
-        if(!$userAction->reserved){
-            return null;
-        }
-        $reservedAction = $userAction->reserved;
-        if(!key_exists(0, $reservedAction)){
-            return null;
-        }
-        $action = $reservedAction[0];
-        return buildUserActionCommandClass($action->command, $this, $env);
-    }
-
-    function pullUserAction(){
-        $rawUserAction = $this->getAuxVar(UserActionCommand::USER_ACTION_KEY);
-        if(!$rawUserAction){
-            return null;
-        }
-        $userAction = \sammo\DTO\UserAction::fromArray($rawUserAction);
-        if(!$userAction->reserved){
-            return null;
-        }
-        $reservedAction = $userAction->reserved;
-
-        $newReservedAction = [];
-        foreach($reservedAction as $idx => $action){
-            if($idx <= 0){
-                continue;
-            }
-            $newReservedAction[$idx - 1] = $action;
-        }
-        $userAction->reserved = $newReservedAction;
-        $this->setAuxVar(UserActionCommand::USER_ACTION_KEY, $userAction->toArray());
-    }
-
     function getReservedTurn(int $turnIdx, array $env): GeneralCommand
     {
         $db = DB::db();
@@ -473,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;
     }
 
@@ -877,7 +769,7 @@ class General extends GeneralBase implements iAction
             $this->crewType,
             $this->inheritBuffObj,
             $this->scenarioEffect
-        ], $this->itemObjs, $this->instantBuffList);
+        ], $this->itemObjs);
     }
 
     public function getPreTurnExecuteTriggerList(General $general): ?GeneralTriggerCaller

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

@@ -69,42 +69,6 @@ class TurnExecutionHelper
         return true;
     }
 
-    public function processUserAction(RandUtil $rng, Command\UserActionCommand $commandObj): LastTurn{
-        $general = $this->getGeneral();
-
-        while (true) {
-            if (!$commandObj->hasFullConditionMet()) {
-                $date = $general->getTurnTime($general::TURNTIME_HM);
-                $failString = $commandObj->getFailString();
-                $text = "{$failString} <1>{$date}</>";
-                $general->getLogger()->pushGeneralActionLog($text);
-                break;
-            }
-
-            if (!$commandObj->addTermStack()) {
-                $date = $general->getTurnTime($general::TURNTIME_HM);
-                $termString = $commandObj->getTermString();
-                $text = "{$termString} <1>{$date}</>";
-                $general->getLogger()->pushGeneralActionLog($text);
-                break;
-            }
-
-            $result = $commandObj->run($rng);
-            if ($result) {
-                $commandObj->setNextAvailable();
-                break;
-            }
-
-            $alt = $commandObj->getAlternativeCommand();
-            if ($alt === null) {
-                break;
-            }
-            $commandObj = $alt;
-        }
-
-        return $commandObj->getResultTurn();
-    }
-
     public function processNationCommand(RandUtil $rng, Command\NationCommand $commandObj): LastTurn
     {
         $general = $this->getGeneral();
@@ -313,8 +277,6 @@ class TurnExecutionHelper
 
             $general->increaseInheritancePoint(InheritanceKey::lived_month, 1);
 
-            $general->clearExpiredBuff();
-
             $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
                 UniqueConst::$hiddenSeed,
                 'preprocess',
@@ -361,12 +323,6 @@ class TurnExecutionHelper
                     $general->setRawCity(null);
                 }
 
-                $userActionObj = $general->getReservedUserAction($env);
-                if($userActionObj){
-                    $turnObj->processUserAction($rng, $userActionObj);
-                }
-
-
                 $generalCommandObj = $general->getReservedTurn(0, $env);
                 if (!($generalCommandObj instanceof Command\General\휴식)) {
                     $hasReservedTurn = true;
@@ -392,7 +348,6 @@ class TurnExecutionHelper
                 $turnObj->processCommand($rng, $generalCommandObj, $autorunMode);
             }
             pullNationCommand($general->getVar('nation'), $general->getVar('officer_level'));
-            $general->pullUserAction();
             pullGeneralCommand($general->getID());
 
             $currentTurn = $general->getTurnTime();

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

@@ -1,28 +1,71 @@
 {
-    "title":"【공백지】 개인전략",
+    "title":"【공백지】 이벤트 클래식",
     "startYear":180,
-    "map":{
+    "history": [
-        "mapName":"miniche"
+        "<C>●</>180년 1월:<L><b>【공백지】</b></>예전 지도에서 장비를 많이 가지고 즐겨보는 이벤트 깃수"
-    },
-    "history":[
-        "<C>●</>180년 1월:<L><b>【공백지】</b></>별도의 전략을 사용할 수 있는 이벤트 깃수"
     ],
     "const": {
         "joinRuinedNPCProp":0,
         "npcBanMessageProb":1,
-        "availableUserActionCommand":{
+        "uniqueTrialCoef": 2,
-            "개인 전략": [
+        "maxUniqueTrialProb": 0.5,
-                "휴식",
+        "defaultMaxGenius": 9999,
-                "g65_의원소환",
+        "defaultMaxGeneral": 700,
-                "g65_철야내정",
+        "allItems": {
-                "g65_군량급매",
+            "horse" : {
-                "g65_접경귀환",
+                "che_명마_01_노기" : 0, "che_명마_02_조랑" : 0, "che_명마_03_노새" : 0,
-                "g65_필중계략",
+                "che_명마_04_나귀" : 0, "che_명마_05_갈색마" : 0, "che_명마_06_흑색마" : 0,
-                "g65_병장기지원",
+
-                "g65_입대독려",
+                "che_명마_07_백마" : 8, "che_명마_07_기주마" : 8, "che_명마_07_오환마" : 8, "che_명마_07_백상" : 8,
-                "g65_병사연회",
+                "che_명마_08_양주마" : 8, "che_명마_08_흉노마" : 8, "che_명마_09_과하마" : 8, "che_명마_09_의남백마" : 8,
-                "g65_약점간파"
+                "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":[

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/PageUserAction.vue

@@ -1,133 +0,0 @@
-<template>
-    <BContainer id="container" ref="container" :toast="{ root: true }">
-        <TopBackBar :reloadable="true" title="개인 전략" @reload="refresh" />
-        <div v-if="asyncReady && gameConstStore && generalInfo && frontInfo && globalInfo && nationStaticInfo" id="pages"
-            class="bg0">
-            <div id="leftPanel">
-                <GeneralBasicCard :general="generalInfo" :nation="nationStaticInfo" :troopInfo="frontInfo.general.troopInfo"
-                    :turnTerm="globalInfo.turnterm" :lastExecuted="lastExecuted" />
-                <div class="bg1" style="margin-top: 10px;">
-                    대기 중인 전략
-                </div>
-                <div v-for="[command, turn] of frontInfo.general.impossibleUserAction" :key="command">
-                    <span>{{ command }}</span>: {{ turn.toLocaleString() }}턴 뒤
-                </div>
-            </div>
-            <div id="actionForm">
-                <ReservedCommandForUserAction ref="reservedCommandPanel" />
-            </div>
-        </div>
-    </BContainer>
-</template>
-<script lang="ts">
-declare const staticValues: {
-    serverName: string;
-    serverNick: string;
-    serverID: string;
-    mapName: string;
-    unitSet: string;
-};
-</script>
-<script setup lang="ts">
-import ReservedCommandForUserAction from './ReservedCommandForUserAction.vue';
-import { GameConstStore, getGameConstStore } from "./GameConstStore";
-import { useToast } from 'bootstrap-vue-next';
-import { unwrap } from './util/unwrap';
-import { onMounted, provide, ref, watch } from 'vue';
-import TopBackBar from './components/TopBackBar.vue';
-import { SammoAPI } from './SammoAPI';
-import { delay } from './util/delay';
-import GeneralBasicCard from './components/GeneralBasicCard.vue';
-import { GetFrontInfoResponse } from './defs/API/Global';
-import { NationStaticItem } from './defs';
-import { parseTime } from './util/parseTime';
-
-const { serverID } = staticValues;
-
-const toasts = unwrap(useToast());
-
-const lastExecuted = ref<Date>(parseTime("2022-08-15 00:00:00"));
-
-const asyncReady = ref(false);
-const gameConstStore = ref<GameConstStore>();
-provide("gameConstStore", gameConstStore);
-const storeP = getGameConstStore().then((store) => {
-    gameConstStore.value = store;
-});
-
-const frontInfo = ref<GetFrontInfoResponse>();
-const globalInfo = ref<GetFrontInfoResponse["global"]>({} as GetFrontInfoResponse["global"]);
-const generalInfo = ref<GetFrontInfoResponse["general"]>();
-const nationColorClass = ref('sam-color-000000');
-const nationStaticInfo = ref<NationStaticItem>();
-
-watch(nationStaticInfo, (newNation) => {
-    if (!newNation) {
-        nationColorClass.value = 'sam-color-000000';
-        return;
-    }
-    nationColorClass.value = `sam-color-${newNation.color.substring(1, 7)}`;
-});
-
-void Promise.all([storeP]).then(() => {
-    asyncReady.value = true;
-});
-
-const reservedCommandPanel = ref<InstanceType<typeof ReservedCommandForUserAction> | null>(null);
-
-async function refresh() {
-    const serverExecuteP = SammoAPI.Global.ExecuteEngine({ serverID }, true).then((response) => {
-        if (response.result) {
-            lastExecuted.value = parseTime(response.lastExecuted);
-        }
-        return response;
-    });
-    await Promise.race([delay(1000), serverExecuteP]);
-    reservedCommandPanel.value?.reloadCommandList();
-    reservedCommandPanel.value?.updateCommandTable();
-    const frontResponse = await SammoAPI.General.GetFrontInfo({
-        lastNationNoticeDate: "9999-12-31 23:59:59",
-        lastGeneralRecordID: 99999999,
-        lastWorldHistoryID: 99999999,
-    });
-
-    frontInfo.value = frontResponse;
-    generalInfo.value = frontResponse.general;
-
-    const rawNation = frontResponse.nation;
-    nationStaticInfo.value = {
-        nation: rawNation.id,
-        name: rawNation.name,
-        color: rawNation.color,
-        type: rawNation.type.raw,
-        level: rawNation.level,
-        capital: rawNation.capital,
-        gennum: rawNation.gennum,
-        power: rawNation.power
-    };
-}
-
-onMounted(() => {
-    void refresh();
-});
-
-</script>
-
-<style lang="scss" scoped>
-@import "@scss/common/break_500px.scss";
-
-//grid
-@include media-1000px {
-    #pages {
-        display: grid;
-        grid-template-columns: 1fr 1fr;
-    }
-}
-
-@include media-500px {
-    #pages {
-        display: grid;
-        grid-template-columns: 1fr;
-    }
-}
-</style>

hwe/ts/ReservedCommandForUserAction.vue

@@ -1,434 +0,0 @@
-<template>
-  <div class="commandPad">
-    <div class="col alert alert-dark m-0 p-1 center">
-      <h4 class="m-0">명령 목록</h4>
-    </div>
-    <div :style="{ position: 'relative' }">
-      <div class="bg-dark" :style="{
-        position: 'absolute',
-        top: `${basicModeRowHeight * currentQuickReserveTarget + 30}px`,
-        width: '100%',
-        zIndex: 9,
-      }">
-        <CommandSelectForm ref="commandQuickReserveForm" :activatedCategory="'개인 전략'" :commandList="commandList"
-          :hideClose="false" @onClose="chooseQuickReserveCommand($event)" />
-      </div>
-    </div>
-    <div :class="{
-      commandTable: true,
-    }">
-      <div :style="rowGridStyle">
-        <div v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)" :key="turnIdx" :turnIdx="turnIdx"
-          class="idx_pad center d-grid">
-          <div class="plain-center">
-            {{ turnIdx + 1 }}
-          </div>
-        </div>
-      </div>
-      <div :style="rowGridStyle">
-        <div v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)" :key="turnIdx" height="24"
-          class="month_pad center" :turnIdx="turnIdx" :style="{
-            'white-space': 'nowrap',
-            'font-size': `${Math.min(14, (75 / (`${turnObj.year ?? 1}`.length + 8)) * 1.8)}px`,
-            overflow: 'hidden',
-          }">
-          {{ turnObj.year ? `${turnObj.year}年` : "" }}
-          {{ turnObj.month ? `${turnObj.month}月` : "" }}
-        </div>
-      </div>
-      <div :style="rowGridStyle">
-        <div v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)" :key="turnIdx"
-          class="time_pad center" :style="{
-            backgroundColor: 'black',
-            whiteSpace: 'nowrap',
-            overflow: 'hidden',
-          }">
-          {{ turnObj.time }}
-        </div>
-      </div>
-      <div :style="rowGridStyle">
-        <div v-for="(turnObj, turnIdx) in reservedCommandList.slice(0, viewMaxTurn)" :key="turnIdx"
-          class="turn_pad center">
-          <span v-b-tooltip.hover="turnObj.tooltip" class="turn_text" :style="turnObj.style">
-            <!-- eslint-disable-next-line vue/no-v-html -->
-            <span v-html="turnObj.brief" />
-          </span>
-        </div>
-      </div>
-      <div :style="rowGridStyle">
-        <div v-for="(turnObj, turnIdx) in reservedUserActionList.slice(0, viewMaxTurn)" :key="turnIdx"
-          class="turn_pad center">
-          <span v-if="turnObj" class="turn_text">
-            <!-- eslint-disable-next-line vue/no-v-html -->
-            <span v-html="turnObj.brief" />
-          </span>
-          <span v-else class="turn_text">
-            <span>휴식</span>
-          </span>
-        </div>
-      </div>
-      <div :style="rowGridStyle">
-        <div v-for="(turnObj, turnIdx) in reservedUserActionList.slice(0, viewMaxTurn)" :key="turnIdx"
-          class="action_pad d-grid">
-          <BButton :variant="turnIdx % 2 == 0 ? 'secondary' : 'dark'" size="sm" class="simple_action_btn bi bi-pencil"
-            :disabled="!commandList.length" @click="toggleQuickReserveForm(turnIdx)" />
-        </div>
-      </div>
-    </div>
-    <div class="row gx-1">
-      <div class="col d-grid">
-      </div>
-      <div class="col alert alert-primary m-0 p-0"
-        style="text-align: center; display: flex; justify-content: center; align-items: center">
-        <SimpleClock :serverTime="serverNow" />
-      </div>
-      <div class="col d-grid">
-        <BButton @click="toggleViewMaxTurn">
-          {{ flippedMaxTurn == viewMaxTurn ? "펼치기" : "접기" }}
-        </BButton>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-declare const staticValues: {
-  maxTurn: number;
-  maxPushTurn: number;
-  serverNow: string;
-  serverNick: string;
-  mapName: string;
-  unitSet: string;
-};
-</script>
-
-<script lang="ts" setup>
-import addMinutes from "date-fns/esm/addMinutes";
-import { isString, range, trim } from "lodash-es";
-import queryString from "query-string";
-import { onMounted, ref, watch } from "vue";
-import { formatTime } from "@util/formatTime";
-import { joinYearMonth } from "@util/joinYearMonth";
-import { mb_strwidth } from "@util/mb_strwidth";
-import { parseTime } from "@util/parseTime";
-import { parseYearMonth } from "@util/parseYearMonth";
-import { SammoAPI } from "./SammoAPI";
-import type { CommandItem, CommandTableResponse } from "@/defs";
-import CommandSelectForm from "@/components/CommandSelectForm.vue";
-import { BButton, BButtonGroup, BDropdownItem, BDropdown, BDropdownText, BDropdownDivider, useToast } from "bootstrap-vue-next";
-import { StoredActionsHelper } from "./util/StoredActionsHelper";
-import type { TurnObj } from "@/defs";
-import type { Args } from "./processing/args";
-import { getEmptyTurn } from "./util/QueryActionHelper";
-import SimpleClock from "./components/SimpleClock.vue";
-import type { ReservedCommandResponse, ReservedUserActionResponse, UserActionItem } from "./defs/API/Command";
-import { unwrap } from "./util/unwrap";
-
-defineExpose({
-  updateCommandTable,
-  reloadCommandList,
-})
-
-const toasts = unwrap(useToast());
-
-const { maxTurn } = staticValues;
-
-const commandList = ref<CommandTableResponse['commandTable']>([]);
-
-const nullCommand: CommandItem = {
-  'value': '휴식',
-  'compensation': 0,
-  'simpleName': '휴식',
-  'possible': true,
-  'info': '휴식',
-  'title': '휴식',
-  'reqArg': false,
-}
-
-const selectedCommand = ref<CommandItem>(nullCommand);
-const invCommandMap = new Map<string, CommandItem>();
-
-async function updateCommandTable() {
-  try {
-    const response = await SammoAPI.General.GetUserActionCommandTable();
-    console.log(response);
-    commandList.value = response.commandTable;
-  }
-  catch (e) {
-    console.error(e);
-  }
-}
-
-watch(commandList, (commandList) => {
-  if (!commandList) {
-    return;
-  }
-
-  for (const commandCategories of commandList) {
-    if (!commandCategories.values) {
-      continue;
-    }
-    for (const commandObj of commandCategories.values) {
-      if (!commandObj.reqArg) {
-        continue;
-      }
-      console.warn(`명령 ${commandObj.value}에는 인자가 필요하나, 현재는 지원하지 않습니다.`);
-    }
-  }
-
-  invCommandMap.clear();
-  for (const category of commandList) {
-    for (const command of category.values) {
-      invCommandMap.set(command.value, command);
-    }
-  }
-
-  if (selectedCommand.value === nullCommand || !invCommandMap.has(selectedCommand.value.value)) {
-    selectedCommand.value = commandList[0].values[0];
-  }
-});
-
-onMounted(() => {
-  void updateCommandTable();
-});
-
-const reservedCommandList = ref(getEmptyTurn(maxTurn));
-const reservedUserActionList = ref<(UserActionItem | undefined)[]>([]);
-const flippedMaxTurn = 14;
-
-const basicModeRowHeight = 34.4;
-const viewMaxTurn = ref(flippedMaxTurn);
-const rowGridStyle = ref({
-  display: "grid",
-  gridTemplateRows: `repeat(${viewMaxTurn.value}, ${basicModeRowHeight}px)`,
-});
-
-watch([viewMaxTurn], ([maxTurn]) => {
-  rowGridStyle.value.gridTemplateRows = `repeat(${maxTurn}, ${basicModeRowHeight}px)`;
-});
-
-function toggleViewMaxTurn() {
-  if (viewMaxTurn.value == flippedMaxTurn) {
-    viewMaxTurn.value = maxTurn;
-  } else {
-    viewMaxTurn.value = flippedMaxTurn;
-  }
-}
-
-const serverNow = ref(new Date());
-
-async function reloadCommandList() {
-  let result: ReservedCommandResponse;
-  let userActions: ReservedUserActionResponse;
-  try {
-    [result, userActions] = await Promise.all([
-      SammoAPI.Command.GetReservedCommand(),
-      SammoAPI.Command.GetReservedUserAction(),
-    ]);
-
-  } catch (e) {
-    if (isString(e)) {
-      toasts.danger({
-        title: "에러",
-        body: e,
-      });
-    }
-    console.error(e);
-    return;
-  }
-
-  let yearMonth = joinYearMonth(result.year, result.month);
-
-  const turnTime = parseTime(result.turnTime);
-  let nextTurnTime = new Date(turnTime);
-
-  const autorunLimitYearMonth = result.autorun_limit ?? yearMonth - 1;
-  const [autorunLimitYear, autorunLimitMonth] = parseYearMonth(autorunLimitYearMonth);
-
-  reservedCommandList.value = [];
-  for (const obj of result.turn) {
-    const [year, month] = parseYearMonth(yearMonth);
-    let tooltip: string[] = [];
-    let style: Record<string, string> = {};
-
-    const brief = obj.brief;
-
-    if (yearMonth <= autorunLimitYearMonth) {
-      if (obj.brief == "휴식") {
-        obj.brief = "휴식<small>(자율 행동)</small>";
-      }
-      style.color = "#aaffff";
-
-      tooltip.push(`자율 행동 기간: ${autorunLimitYear}년 ${autorunLimitMonth}월까지`);
-    }
-
-    if (mb_strwidth(brief) > 22) {
-      tooltip.push(brief);
-    }
-
-    reservedCommandList.value.push({
-      ...obj,
-      year,
-      month,
-      time: formatTime(nextTurnTime, "HH:mm"),
-      tooltip: tooltip.length == 0 ? undefined : tooltip.join("\n"),
-      style,
-    });
-
-    yearMonth += 1;
-    nextTurnTime = addMinutes(nextTurnTime, result.turnTerm);
-  }
-
-  serverNow.value = parseTime(result.date);
-
-  const newReservedUserActionList: (UserActionItem | undefined)[] = [];
-  newReservedUserActionList.length = maxTurn;
-  for (const [idx, item] of Object.entries(userActions.userActions.reserved ?? {})) {
-    newReservedUserActionList[parseInt(idx)] = item;
-  }
-  reservedUserActionList.value = newReservedUserActionList;
-}
-
-async function reserveCommand() {
-  const turnIdx = currentQuickReserveTarget.value;
-
-  const commandName = selectedCommand.value.value;
-  if (turnIdx < 0) {
-    return;
-  }
-
-  try {
-    const result = await SammoAPI.Command.ReserveUserAction({
-      turnIdx,
-      action: commandName,
-    });
-  } catch (e) {
-    if (isString(e)) {
-      toasts.danger({
-        title: "에러",
-        body: e,
-      });
-    }
-    console.error(e);
-    return;
-  }
-  await reloadCommandList();
-}
-
-const commandQuickReserveForm = ref<InstanceType<typeof CommandSelectForm> | null>(null);
-
-const currentQuickReserveTarget = ref(-1);
-function chooseQuickReserveCommand(val?: string) {
-  if (!val) {
-    return;
-  }
-  selectedCommand.value = unwrap(invCommandMap.get(val));
-  void reserveCommand();
-}
-function toggleQuickReserveForm(turnIdx: number) {
-  if (turnIdx == currentQuickReserveTarget.value) {
-    commandQuickReserveForm.value?.toggle();
-    return;
-  }
-  currentQuickReserveTarget.value = turnIdx;
-  commandQuickReserveForm.value?.show();
-}
-
-onMounted(() => {
-  void reloadCommandList();
-});
-</script>
-<style lang="scss">
-@use "sass:color";
-
-@import "@scss/common/break_500px.scss";
-@import "@scss/common/variables.scss";
-@import "@scss/common/bootswatch_custom_variables.scss";
-@import "@scss/game_bg.scss";
-
-.commandPad {
-  background-color: $gray-900;
-  position: relative;
-}
-
-.commandTable {
-  width: 100%;
-  display: grid;
-  grid-template-columns:
-    minmax(20px, 0.6fr) minmax(75px, 2.0fr) minmax(40px, 0.9fr) 4.0fr 3.2fr minmax(28px, 0.8fr);
-  //30, 70, 37.65, 160
-}
-
-@include media-1000px {
-  .commandPad {
-    margin-left: 10px;
-
-    .turn_pad {
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-
-    .multiselect__content-wrapper {
-      margin-left: calc(-100% / 7 * 2);
-      width: calc(100% / 7 * 12);
-    }
-
-    .multiselect__single {
-      display: inline-block;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      overflow: hidden;
-    }
-  }
-}
-
-@include media-500px {
-  .dropdown-item {
-    padding: 8px;
-  }
-
-  .commandPad {
-    margin-top: 10px;
-    margin-bottom: 10px;
-
-    .btn {
-      transition: none !important;
-    }
-  }
-
-  .month_pad,
-  .time_pad,
-  .turn_pad {
-    padding: 6px;
-  }
-}
-
-.plain-center {
-  background-color: black;
-}
-
-.plain-center,
-.month_pad,
-.time_pad,
-.turn_pad {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.turn_pad {
-  white-space: nowrap;
-  background-color: $nbase2color;
-}
-
-.turn_pad:nth-child(2n) {
-  background-color: color.adjust($nbase2color, $lightness: -5%);
-}
-
-.turn_pad .turn_text {
-  display: inline-block;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-</style>

hwe/ts/SammoAPI.ts

@@ -15,7 +15,7 @@ import {
 export type { ValidResponse, InvalidResponse };
 import { APIPathGen, NumVar, StrVar } from "./util/APIPathGen.js";
 import type { BettingDetailResponse, BettingListResponse } from "./defs/API/Betting";
-import type { ReserveBulkCommandResponse, ReserveCommandResponse, ReservedCommandResponse, ReservedUserActionResponse } from "./defs/API/Command";
+import type { ReserveBulkCommandResponse, ReserveCommandResponse, ReservedCommandResponse } from "./defs/API/Command";
 import type { ChiefResponse } from "./defs/API/NationCommand";
 import type { inheritBuffType, InheritLogResponse } from "./defs/API/InheritAction";
 import type { SetBlockWarResponse, GeneralListResponse as NationGeneralListResponse, NationInfoResponse } from "./defs/API/Nation";
@@ -109,7 +109,6 @@ const apiRealPath = {
       },
       ReserveCommandResponse
     >,
-    GetReservedUserAction: GET as APICallT<undefined, ReservedUserActionResponse>,
     ReserveBulkCommand: PUT as APICallT<
       {
         turnList: number[];
@@ -118,10 +117,6 @@ const apiRealPath = {
       }[],
       ReserveBulkCommandResponse
     >,
-    ReserveUserAction: PUT as APICallT<{
-      turnIdx: number;
-      action: string;
-    }>
   },
   General: {
     Join: POST as APICallT<JoinArgs>,
@@ -139,7 +134,6 @@ const apiRealPath = {
     InstantRetreat: POST as APICallT<undefined>,
     BuildNationCandidate: POST as APICallT<undefined>,
     GetCommandTable: GET as APICallT<undefined, CommandTableResponse>,
-    GetUserActionCommandTable: GET as APICallT<undefined, CommandTableResponse>,
     GetFrontInfo: GET as APICallT<{
       lastNationNoticeDate?: string,
       lastGeneralRecordID?: number,

hwe/ts/build_exports.json

@@ -38,7 +38,6 @@
         "v_globalDiplomacy": "v_globalDiplomacy",
         "v_troop": "v_troop.ts",
         "v_vote": "v_vote.ts",
-        "v_front": "v_front.ts",
+        "v_front": "v_front.ts"
-        "v_userAction": "v_userAction.ts"
     }
 }

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