fix: crewtype 미지정시 기본 병종

game: 정란, 벽력거 설명 추가
game: 성벽선제인 경우에만 성벽도 선제공격
2023-05-11 09:28:52 +09:00 · 2023-05-11 02:55:55 +09:00 · 2023-05-11 02:55:13 +09:00 · 2023-05-11 02:46:18 +09:00 · 2023-05-11 02:30:23 +09:00 · 2023-05-11 02:25:52 +09:00
458 changed files with 5295 additions and 20403 deletions
@@ -29,7 +29,6 @@ d_pic/*.jpg
 d_pic/*.gif
 d_pic/*.png
 d_pic/*.webp
-d_pic/*.avif
 d_pic/uploaded_image

 /dist_js
@@ -70,5 +69,3 @@ gateway/js/*
 gateway/css/*

 *.db-journal
-
-d_log/cachegrind.*
@@ -15,8 +15,9 @@ return [
    // Note that the **only** effect of choosing `'5.6'` is to infer
    // that functions removed in php 7.0 exist.
    // (See `backward_compatibility_checks` for additional options)
-    "target_php_version" => '8.2',
-    "minimum_target_php_version" => '8.2',
+    "target_php_version" => '8.1',
+    "minimum_target_php_version" => '8.1',
+    'backward_compatibility_checks ' => true,
    'minimum_severity' => \Phan\Issue::SEVERITY_NORMAL,

    'file_list' => [
@@ -28,6 +29,8 @@ return [
        'hwe/_admin1_submit.php',
        'hwe/_admin2.php',
        'hwe/_admin2_submit.php',
+        'hwe/_admin4.php',
+        'hwe/_admin4_submit.php',
        'hwe/_admin5.php',
        'hwe/_admin5_submit.php',
        'hwe/_admin7.php',
@@ -29,5 +29,5 @@
        "josa",
        "sammo"
    ],
-    "editor.tabSize": 4
+    "editor.tabSize": 2
 }
@@ -8,11 +8,12 @@
    ],
    "config": {
        "platform": {
-            "php": "8.3"
+            "php": "8.2"
        }
    },
    "require": {
-        "sergeytsalkov/meekrodb": "^2.5",
+        "brandonwamboldt/utilphp": "^1.1",
+        "sergeytsalkov/meekrodb": "^2.3",
        "league/plates": "^3.5",
        "vlucas/valitron": "^1.4",
        "php-extended/php-tail": "^5.0",
@@ -21,10 +22,10 @@
        "xemlock/htmlpurifier-html5": "^0.1.7",
        "catfan/medoo": "^2.1",
        "phan/phan": "^5.4",
-        "nette/caching": "^3.3",
+        "nette/caching": "^3.2",
        "illuminate/database": "^10.0",
        "illuminate/events": "^10.0",
-        "php-ds/php-ds": "^1.5",
+        "php-ds/php-ds": "^1.4",
        "hided62/ldto": "^1.0",
        "league/uri": "^6.8"
    },
@@ -4,29 +4,79 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "7edae9b6be35e66ffd0d180f5fac6679",
+    "content-hash": "e878a776667c3f0cbef0a48b3504d965",
    "packages": [
        {
-            "name": "brick/math",
-            "version": "0.12.1",
+            "name": "brandonwamboldt/utilphp",
+            "version": "1.1.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/brick/math.git",
-                "reference": "f510c0a40911935b77b86859eb5223d58d660df1"
+                "url": "https://github.com/brandonwamboldt/utilphp.git",
+                "reference": "36c32efc4f0679c05163464a550f45c8d83fe683"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1",
-                "reference": "f510c0a40911935b77b86859eb5223d58d660df1",
+                "url": "https://api.github.com/repos/brandonwamboldt/utilphp/zipball/36c32efc4f0679c05163464a550f45c8d83fe683",
+                "reference": "36c32efc4f0679c05163464a550f45c8d83fe683",
                "shasum": ""
            },
            "require": {
-                "php": "^8.1"
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "satooshi/php-coveralls": "dev-master"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "utilphp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brandon Wamboldt",
+                    "email": "brandon.wamboldt@gmail.com"
+                }
+            ],
+            "description": "util.php is a collection of useful functions and snippets that you need or could use every day, designed to avoid conflicts with existing projects",
+            "homepage": "https://github.com/brandonwamboldt/utilphp",
+            "keywords": [
+                "collection",
+                "helpers",
+                "php",
+                "utility"
+            ],
+            "support": {
+                "issues": "https://github.com/brandonwamboldt/utilphp/issues",
+                "source": "https://github.com/brandonwamboldt/utilphp/tree/master"
+            },
+            "time": "2015-02-02T17:56:14+00:00"
+        },
+        {
+            "name": "brick/math",
+            "version": "0.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/brick/math.git",
+                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/brick/math/zipball/0ad82ce168c82ba30d1c01ec86116ab52f589478",
+                "reference": "0ad82ce168c82ba30d1c01ec86116ab52f589478",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
            },
            "require-dev": {
                "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^10.1",
-                "vimeo/psalm": "5.16.0"
+                "phpunit/phpunit": "^9.0",
+                "vimeo/psalm": "5.0.0"
            },
            "type": "library",
            "autoload": {
@@ -46,17 +96,12 @@
                "arithmetic",
                "bigdecimal",
                "bignum",
-                "bignumber",
                "brick",
-                "decimal",
-                "integer",
-                "math",
-                "mathematics",
-                "rational"
+                "math"
            ],
            "support": {
                "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.12.1"
+                "source": "https://github.com/brick/math/tree/0.11.0"
            },
            "funding": [
                {
@@ -64,89 +109,20 @@
                    "type": "github"
                }
            ],
-            "time": "2023-11-29T23:19:16+00:00"
-        },
-        {
-            "name": "carbonphp/carbon-doctrine-types",
-            "version": "2.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
-                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
-                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.4 || ^8.0"
-            },
-            "conflict": {
-                "doctrine/dbal": "<3.7.0 || >=4.0.0"
-            },
-            "require-dev": {
-                "doctrine/dbal": "^3.7.0",
-                "nesbot/carbon": "^2.71.0 || ^3.0.0",
-                "phpunit/phpunit": "^10.3"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Carbon\\Doctrine\\": "src/Carbon/Doctrine/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "KyleKatarn",
-                    "email": "kylekatarnls@gmail.com"
-                }
-            ],
-            "description": "Types to use Carbon in Doctrine",
-            "keywords": [
-                "carbon",
-                "date",
-                "datetime",
-                "doctrine",
-                "time"
-            ],
-            "support": {
-                "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
-                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/kylekatarnls",
-                    "type": "github"
-                },
-                {
-                    "url": "https://opencollective.com/Carbon",
-                    "type": "open_collective"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-12-11T17:09:12+00:00"
+            "time": "2023-01-15T23:15:59+00:00"
        },
        {
            "name": "catfan/medoo",
-            "version": "v2.1.12",
+            "version": "v2.1.8",
            "source": {
                "type": "git",
                "url": "https://github.com/catfan/Medoo.git",
-                "reference": "d1ff4e0e873a3e032e3d8804031dd6be4e013b22"
+                "reference": "b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/catfan/Medoo/zipball/d1ff4e0e873a3e032e3d8804031dd6be4e013b22",
-                "reference": "d1ff4e0e873a3e032e3d8804031dd6be4e013b22",
+                "url": "https://api.github.com/repos/catfan/Medoo/zipball/b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4",
+                "reference": "b49a620cf1ad0d2e90ebd9f85b82aa11271df5f4",
                "shasum": ""
            },
            "require": {
@@ -209,20 +185,20 @@
                    "type": "open_collective"
                }
            ],
-            "time": "2024-02-03T11:28:59+00:00"
+            "time": "2023-01-20T09:30:24+00:00"
        },
        {
            "name": "composer/pcre",
-            "version": "3.1.3",
+            "version": "3.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/pcre.git",
-                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8"
+                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
-                "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
+                "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
                "shasum": ""
            },
            "require": {
@@ -264,7 +240,7 @@
            ],
            "support": {
                "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.1.3"
+                "source": "https://github.com/composer/pcre/tree/3.1.0"
            },
            "funding": [
                {
@@ -280,20 +256,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-03-19T10:26:25+00:00"
+            "time": "2022-11-17T09:50:14+00:00"
        },
        {
            "name": "composer/semver",
-            "version": "3.4.0",
+            "version": "3.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/semver.git",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
+                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
                "shasum": ""
            },
            "require": {
@@ -343,9 +319,9 @@
                "versioning"
            ],
            "support": {
-                "irc": "ircs://irc.libera.chat:6697/composer",
+                "irc": "irc://irc.freenode.org/composer",
                "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.0"
+                "source": "https://github.com/composer/semver/tree/3.3.2"
            },
            "funding": [
                {
@@ -361,20 +337,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-08-31T09:50:34+00:00"
+            "time": "2022-04-01T19:23:25+00:00"
        },
        {
            "name": "composer/xdebug-handler",
-            "version": "3.0.5",
+            "version": "3.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
-                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
                "shasum": ""
            },
            "require": {
@@ -385,7 +361,7 @@
            "require-dev": {
                "phpstan/phpstan": "^1.0",
                "phpstan/phpstan-strict-rules": "^1.1",
-                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
+                "symfony/phpunit-bridge": "^6.0"
            },
            "type": "library",
            "autoload": {
@@ -409,9 +385,9 @@
                "performance"
            ],
            "support": {
-                "irc": "ircs://irc.libera.chat:6697/composer",
+                "irc": "irc://irc.freenode.org/composer",
                "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
            },
            "funding": [
                {
@@ -427,79 +403,32 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-06T16:37:16+00:00"
-        },
-        {
-            "name": "doctrine/deprecations",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
-                "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^9",
-                "phpstan/phpstan": "1.4.10 || 1.10.15",
-                "phpstan/phpstan-phpunit": "^1.0",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psalm/plugin-phpunit": "0.18.4",
-                "psr/log": "^1 || ^2 || ^3",
-                "vimeo/psalm": "4.30.0 || 5.12.0"
-            },
-            "suggest": {
-                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
-            "homepage": "https://www.doctrine-project.org/",
-            "support": {
-                "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
-            },
-            "time": "2024-01-30T19:34:25+00:00"
+            "time": "2022-02-25T21:32:43+00:00"
        },
        {
            "name": "doctrine/inflector",
-            "version": "2.0.10",
+            "version": "2.0.6",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/inflector.git",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
+                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
-                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
+                "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024",
                "shasum": ""
            },
            "require": {
                "php": "^7.2 || ^8.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^11.0",
+                "doctrine/coding-standard": "^10",
                "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 || ^5.4"
+                "vimeo/psalm": "^4.25"
            },
            "type": "library",
            "autoload": {
@@ -549,7 +478,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.6"
            },
            "funding": [
                {
@@ -565,24 +494,24 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-02-18T20:23:39+00:00"
+            "time": "2022-10-20T09:10:12+00:00"
        },
        {
            "name": "ezyang/htmlpurifier",
-            "version": "v4.17.0",
+            "version": "v4.16.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c"
+                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c",
-                "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8",
+                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8",
                "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 || ~8.3.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"
            },
            "require-dev": {
                "cerdic/css-tidy": "^1.7 || ^2.0",
@@ -624,9 +553,9 @@
            ],
            "support": {
                "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0"
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0"
            },
-            "time": "2023-11-17T15:01:25+00:00"
+            "time": "2022-09-18T07:06:19+00:00"
        },
        {
            "name": "felixfbecker/advanced-json-rpc",
@@ -675,16 +604,16 @@
        },
        {
            "name": "hided62/ldto",
-            "version": "v1.0.1",
+            "version": "v1.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/hided62/ldto.git",
-                "reference": "7f0cc568e35120868fe1178e96265c4fa0624820"
+                "reference": "4c05401406f8afc1636a90763c13884f8fff0d14"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/hided62/ldto/zipball/7f0cc568e35120868fe1178e96265c4fa0624820",
-                "reference": "7f0cc568e35120868fe1178e96265c4fa0624820",
+                "url": "https://api.github.com/repos/hided62/ldto/zipball/4c05401406f8afc1636a90763c13884f8fff0d14",
+                "reference": "4c05401406f8afc1636a90763c13884f8fff0d14",
                "shasum": ""
            },
            "require": {
@@ -723,22 +652,22 @@
            ],
            "support": {
                "issues": "https://github.com/hided62/ldto/issues",
-                "source": "https://github.com/hided62/ldto/tree/v1.0.1"
+                "source": "https://github.com/hided62/ldto/tree/v1.0.0"
            },
-            "time": "2023-03-04T07:51:45+00:00"
+            "time": "2022-08-05T14:30:13+00:00"
        },
        {
            "name": "illuminate/bus",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/bus.git",
-                "reference": "33993b8f54e91b03fb5000e55693e146e7370763"
+                "reference": "139999f560611623c7da494faa3d8a92f8e22e68"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/bus/zipball/33993b8f54e91b03fb5000e55693e146e7370763",
-                "reference": "33993b8f54e91b03fb5000e55693e146e7370763",
+                "url": "https://api.github.com/repos/illuminate/bus/zipball/139999f560611623c7da494faa3d8a92f8e22e68",
+                "reference": "139999f560611623c7da494faa3d8a92f8e22e68",
                "shasum": ""
            },
            "require": {
@@ -778,20 +707,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-02-23T15:38:25+00:00"
+            "time": "2022-11-30T17:23:35+00:00"
        },
        {
            "name": "illuminate/collections",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/collections.git",
-                "reference": "f9589f1063a449111dcaa1d68285b507d9483a95"
+                "reference": "f48e6e52860edc9f261f414a85ed2b9b295a324c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/collections/zipball/f9589f1063a449111dcaa1d68285b507d9483a95",
-                "reference": "f9589f1063a449111dcaa1d68285b507d9483a95",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/f48e6e52860edc9f261f414a85ed2b9b295a324c",
+                "reference": "f48e6e52860edc9f261f414a85ed2b9b295a324c",
                "shasum": ""
            },
            "require": {
@@ -833,11 +762,11 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-03-20T20:09:13+00:00"
+            "time": "2023-02-22T14:38:35+00:00"
        },
        {
            "name": "illuminate/conditionable",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/conditionable.git",
@@ -883,16 +812,16 @@
        },
        {
            "name": "illuminate/container",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/container.git",
-                "reference": "ddc26273085fad3c471b2602ad820e0097ff7939"
+                "reference": "fed3ee8f7389ad431833935d9ed665bc02ac2cca"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/container/zipball/ddc26273085fad3c471b2602ad820e0097ff7939",
-                "reference": "ddc26273085fad3c471b2602ad820e0097ff7939",
+                "url": "https://api.github.com/repos/illuminate/container/zipball/fed3ee8f7389ad431833935d9ed665bc02ac2cca",
+                "reference": "fed3ee8f7389ad431833935d9ed665bc02ac2cca",
                "shasum": ""
            },
            "require": {
@@ -930,20 +859,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2023-06-18T09:12:03+00:00"
+            "time": "2023-01-25T18:11:51+00:00"
        },
        {
            "name": "illuminate/contracts",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/contracts.git",
-                "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac"
+                "reference": "84f1da424ab9596a422ce118abd05667b0069624"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac",
-                "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/84f1da424ab9596a422ce118abd05667b0069624",
+                "reference": "84f1da424ab9596a422ce118abd05667b0069624",
                "shasum": ""
            },
            "require": {
@@ -978,24 +907,24 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-01-15T18:52:32+00:00"
+            "time": "2023-02-14T15:00:37+00:00"
        },
        {
            "name": "illuminate/database",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/database.git",
-                "reference": "eb8edf206d3a6eea8894bc6e21f53469e27dd5c9"
+                "reference": "782940a3092e86c8d022d6d8d168b64fb97933a5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/database/zipball/eb8edf206d3a6eea8894bc6e21f53469e27dd5c9",
-                "reference": "eb8edf206d3a6eea8894bc6e21f53469e27dd5c9",
+                "url": "https://api.github.com/repos/illuminate/database/zipball/782940a3092e86c8d022d6d8d168b64fb97933a5",
+                "reference": "782940a3092e86c8d022d6d8d168b64fb97933a5",
                "shasum": ""
            },
            "require": {
-                "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
+                "brick/math": "^0.9.3|^0.10.2|^0.11",
                "ext-pdo": "*",
                "illuminate/collections": "^10.0",
                "illuminate/container": "^10.0",
@@ -1004,10 +933,6 @@
                "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.",
@@ -1051,20 +976,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-04-29T13:23:17+00:00"
+            "time": "2023-02-23T18:43:10+00:00"
        },
        {
            "name": "illuminate/events",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/events.git",
-                "reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb"
+                "reference": "c68138ea57360c19a145e5912fb474cfd1845366"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/events/zipball/a931bfa88edc6ac52c9abbfd7b769343d321d3eb",
-                "reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb",
+                "url": "https://api.github.com/repos/illuminate/events/zipball/c68138ea57360c19a145e5912fb474cfd1845366",
+                "reference": "c68138ea57360c19a145e5912fb474cfd1845366",
                "shasum": ""
            },
            "require": {
@@ -1106,20 +1031,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-03-04T14:41:04+00:00"
+            "time": "2023-02-16T15:35:09+00:00"
        },
        {
            "name": "illuminate/macroable",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/macroable.git",
-                "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27"
+                "reference": "7686fe9dba1e236e6f695a148b551264b9fd479e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/macroable/zipball/dff667a46ac37b634dcf68909d9d41e94dc97c27",
-                "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27",
+                "url": "https://api.github.com/repos/illuminate/macroable/zipball/7686fe9dba1e236e6f695a148b551264b9fd479e",
+                "reference": "7686fe9dba1e236e6f695a148b551264b9fd479e",
                "shasum": ""
            },
            "require": {
@@ -1152,20 +1077,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2023-06-05T12:46:42+00:00"
+            "time": "2023-01-30T23:18:36+00:00"
        },
        {
            "name": "illuminate/pipeline",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/pipeline.git",
-                "reference": "f802187e917a171332cc90f8c1a102939c57405d"
+                "reference": "549fc7f9b2e6fef0436ca0f68714e1a0e4de8aad"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/pipeline/zipball/f802187e917a171332cc90f8c1a102939c57405d",
-                "reference": "f802187e917a171332cc90f8c1a102939c57405d",
+                "url": "https://api.github.com/repos/illuminate/pipeline/zipball/549fc7f9b2e6fef0436ca0f68714e1a0e4de8aad",
+                "reference": "549fc7f9b2e6fef0436ca0f68714e1a0e4de8aad",
                "shasum": ""
            },
            "require": {
@@ -1200,20 +1125,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2023-12-19T14:47:26+00:00"
+            "time": "2022-06-10T06:51:19+00:00"
        },
        {
            "name": "illuminate/support",
-            "version": "v10.48.10",
+            "version": "v10.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/support.git",
-                "reference": "ee3a1aaed36d916654ce0ae09dfbd38644a4f582"
+                "reference": "0311d96fb673e9694e1df838abb12f4e4019cdc4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/ee3a1aaed36d916654ce0ae09dfbd38644a4f582",
-                "reference": "ee3a1aaed36d916654ce0ae09dfbd38644a4f582",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/0311d96fb673e9694e1df838abb12f4e4019cdc4",
+                "reference": "0311d96fb673e9694e1df838abb12f4e4019cdc4",
                "shasum": ""
            },
            "require": {
@@ -1225,7 +1150,7 @@
                "illuminate/conditionable": "^10.0",
                "illuminate/contracts": "^10.0",
                "illuminate/macroable": "^10.0",
-                "nesbot/carbon": "^2.67",
+                "nesbot/carbon": "^2.62.1",
                "php": "^8.1",
                "voku/portable-ascii": "^2.0"
            },
@@ -1271,7 +1196,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-04-07T17:47:33+00:00"
+            "time": "2023-02-23T07:42:03+00:00"
        },
        {
            "name": "league/plates",
@@ -1510,16 +1435,16 @@
        },
        {
            "name": "microsoft/tolerant-php-parser",
-            "version": "v0.1.2",
+            "version": "v0.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/microsoft/tolerant-php-parser.git",
-                "reference": "3eccfd273323aaf69513e2f1c888393f5947804b"
+                "reference": "6a965617cf484355048ac6d2d3de7b6ec93abb16"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/microsoft/tolerant-php-parser/zipball/3eccfd273323aaf69513e2f1c888393f5947804b",
-                "reference": "3eccfd273323aaf69513e2f1c888393f5947804b",
+                "url": "https://api.github.com/repos/microsoft/tolerant-php-parser/zipball/6a965617cf484355048ac6d2d3de7b6ec93abb16",
+                "reference": "6a965617cf484355048ac6d2d3de7b6ec93abb16",
                "shasum": ""
            },
            "require": {
@@ -1549,39 +1474,34 @@
            "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.2"
+                "source": "https://github.com/microsoft/tolerant-php-parser/tree/v0.1.1"
            },
-            "time": "2022-10-05T17:30:19+00:00"
+            "time": "2021-07-16T21:28:12+00:00"
        },
        {
            "name": "nesbot/carbon",
-            "version": "2.72.3",
+            "version": "2.66.0",
            "source": {
                "type": "git",
                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83"
+                "reference": "496712849902241f04902033b0441b269effe001"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/0c6fd108360c562f6e4fd1dedb8233b423e91c83",
-                "reference": "0c6fd108360c562f6e4fd1dedb8233b423e91c83",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/496712849902241f04902033b0441b269effe001",
+                "reference": "496712849902241f04902033b0441b269effe001",
                "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 || ^4.0",
-                "doctrine/orm": "^2.7 || ^3.0",
+                "doctrine/dbal": "^2.0 || ^3.1.4",
+                "doctrine/orm": "^2.7",
                "friendsofphp/php-cs-fixer": "^3.0",
                "kylekatarnls/multi-tester": "^2.0",
                "ondrejmirtes/better-reflection": "*",
@@ -1658,20 +1578,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-25T10:35:09+00:00"
+            "time": "2023-01-29T18:53:47+00:00"
        },
        {
            "name": "netresearch/jsonmapper",
-            "version": "v4.4.1",
+            "version": "v4.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0"
+                "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0",
-                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f",
+                "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f",
                "shasum": ""
            },
            "require": {
@@ -1682,7 +1602,7 @@
                "php": ">=7.1"
            },
            "require-dev": {
-                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0",
+                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
                "squizlabs/php_codesniffer": "~3.5"
            },
            "type": "library",
@@ -1707,33 +1627,31 @@
            "support": {
                "email": "cweiske@cweiske.de",
                "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1"
+                "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0"
            },
-            "time": "2024-01-31T06:18:54+00:00"
+            "time": "2022-12-08T20:46:14+00:00"
        },
        {
            "name": "nette/caching",
-            "version": "v3.3.0",
+            "version": "v3.2.2",
            "source": {
                "type": "git",
                "url": "https://github.com/nette/caching.git",
-                "reference": "3053707a892e100e81efb53dc8c294dca5e076d0"
+                "reference": "ceb814d7f0a2bb4eb5afbe908467801001187745"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/caching/zipball/3053707a892e100e81efb53dc8c294dca5e076d0",
-                "reference": "3053707a892e100e81efb53dc8c294dca5e076d0",
+                "url": "https://api.github.com/repos/nette/caching/zipball/ceb814d7f0a2bb4eb5afbe908467801001187745",
+                "reference": "ceb814d7f0a2bb4eb5afbe908467801001187745",
                "shasum": ""
            },
            "require": {
-                "nette/utils": "^4.0",
-                "php": "8.0 - 8.3"
-            },
-            "conflict": {
-                "latte/latte": ">=3.0.0 <3.0.12"
+                "nette/finder": "^2.4 || ^3.0",
+                "nette/utils": "^3.2 || ~4.0.0",
+                "php": ">=8.0 <8.3"
            },
            "require-dev": {
-                "latte/latte": "^2.11 || ^3.0.12",
+                "latte/latte": "^2.11 || ^3.0",
                "nette/di": "^3.1 || ^4.0",
                "nette/tester": "^2.4",
                "phpstan/phpstan": "^1.0",
@@ -1745,7 +1663,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.3-dev"
+                    "dev-master": "3.2-dev"
                }
            },
            "autoload": {
@@ -1780,26 +1698,79 @@
            ],
            "support": {
                "issues": "https://github.com/nette/caching/issues",
-                "source": "https://github.com/nette/caching/tree/v3.3.0"
+                "source": "https://github.com/nette/caching/tree/v3.2.2"
            },
-            "time": "2024-03-10T22:07:25+00:00"
+            "time": "2023-02-04T13:52:33+00:00"
        },
        {
-            "name": "nette/utils",
-            "version": "v4.0.4",
+            "name": "nette/finder",
+            "version": "v3.0.0",
            "source": {
                "type": "git",
-                "url": "https://github.com/nette/utils.git",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
+                "url": "https://github.com/nette/finder.git",
+                "reference": "027395c638637de95c8e9fad49a7c51249404ed2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
+                "url": "https://api.github.com/repos/nette/finder/zipball/027395c638637de95c8e9fad49a7c51249404ed2",
+                "reference": "027395c638637de95c8e9fad49a7c51249404ed2",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.0 <8.4"
+                "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",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/utils.git",
+                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/utils/zipball/cacdbf5a91a657ede665c541eda28941d4b09c1e",
+                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0 <8.3"
            },
            "conflict": {
                "nette/finder": "<3",
@@ -1807,7 +1778,7 @@
            },
            "require-dev": {
                "jetbrains/phpstorm-attributes": "dev-master",
-                "nette/tester": "^2.5",
+                "nette/tester": "^2.4",
                "phpstan/phpstan": "^1.0",
                "tracy/tracy": "^2.9"
            },
@@ -1817,7 +1788,8 @@
                "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": {
@@ -1866,22 +1838,22 @@
            ],
            "support": {
                "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.4"
+                "source": "https://github.com/nette/utils/tree/v4.0.0"
            },
-            "time": "2024-01-17T16:50:36+00:00"
+            "time": "2023-02-02T10:41:53+00:00"
        },
        {
            "name": "phan/phan",
-            "version": "5.4.3",
+            "version": "5.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/phan/phan.git",
-                "reference": "86a7acd99c1239b8867b49feca2398851212e7fe"
+                "reference": "fef40178a952bcfcc3f69b76989dd613c3d5c759"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phan/phan/zipball/86a7acd99c1239b8867b49feca2398851212e7fe",
-                "reference": "86a7acd99c1239b8867b49feca2398851212e7fe",
+                "url": "https://api.github.com/repos/phan/phan/zipball/fef40178a952bcfcc3f69b76989dd613c3d5c759",
+                "reference": "fef40178a952bcfcc3f69b76989dd613c3d5c759",
                "shasum": ""
            },
            "require": {
@@ -1891,11 +1863,11 @@
                "ext-json": "*",
                "ext-tokenizer": "*",
                "felixfbecker/advanced-json-rpc": "^3.0.4",
-                "microsoft/tolerant-php-parser": "0.1.2",
+                "microsoft/tolerant-php-parser": "0.1.1",
                "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|^7.0",
+                "symfony/console": "^3.2|^4.0|^5.0|^6.0",
                "symfony/polyfill-mbstring": "^1.11.0",
                "symfony/polyfill-php80": "^1.20.0",
                "tysonandre/var_representation_polyfill": "^0.0.2|^0.1.0"
@@ -1941,27 +1913,26 @@
            "keywords": [
                "analyzer",
                "php",
-                "static",
-                "static analysis"
+                "static"
            ],
            "support": {
                "issues": "https://github.com/phan/phan/issues",
-                "source": "https://github.com/phan/phan/tree/5.4.3"
+                "source": "https://github.com/phan/phan/tree/5.4.1"
            },
-            "time": "2023-12-26T17:57:35+00:00"
+            "time": "2022-08-26T00:49:07+00:00"
        },
        {
            "name": "php-ds/php-ds",
-            "version": "v1.5.0",
+            "version": "v1.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-ds/polyfill.git",
-                "reference": "7b2c5f1843466d50769a0682ce6fa9ddaaa99cb4"
+                "reference": "43d2df301a9e2017f67b8c11d94a5222f9c00fd1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-ds/polyfill/zipball/7b2c5f1843466d50769a0682ce6fa9ddaaa99cb4",
-                "reference": "7b2c5f1843466d50769a0682ce6fa9ddaaa99cb4",
+                "url": "https://api.github.com/repos/php-ds/polyfill/zipball/43d2df301a9e2017f67b8c11d94a5222f9c00fd1",
+                "reference": "43d2df301a9e2017f67b8c11d94a5222f9c00fd1",
                "shasum": ""
            },
            "require": {
@@ -1969,10 +1940,10 @@
                "php": ">=7.0"
            },
            "provide": {
-                "ext-ds": "1.5.0"
+                "ext-ds": "1.3.0"
            },
            "require-dev": {
-                "php-ds/tests": "^1.5"
+                "php-ds/tests": "^1.3"
            },
            "suggest": {
                "ext-ds": "to improve performance and reduce memory usage"
@@ -2001,22 +1972,22 @@
            ],
            "support": {
                "issues": "https://github.com/php-ds/polyfill/issues",
-                "source": "https://github.com/php-ds/polyfill/tree/v1.5.0"
+                "source": "https://github.com/php-ds/polyfill/tree/v1.4.1"
            },
-            "time": "2023-12-19T16:52:21+00:00"
+            "time": "2022-03-09T20:39:30+00:00"
        },
        {
            "name": "php-extended/php-system",
-            "version": "5.0.1",
+            "version": "5.0.0",
            "source": {
                "type": "git",
                "url": "git@gitlab.com:php-extended/php-system.git",
-                "reference": "a80365cc08f43e740f3d1b77505d3242d954555a"
+                "reference": "c269fbf3d358679b229b922b6c5be5dac9bbd1ab"
            },
            "dist": {
                "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-system/repository/archive.zip?sha=a80365cc08f43e740f3d1b77505d3242d954555a",
-                "reference": "a80365cc08f43e740f3d1b77505d3242d954555a",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-system/repository/archive.zip?sha=c269fbf3d358679b229b922b6c5be5dac9bbd1ab",
+                "reference": "c269fbf3d358679b229b922b6c5be5dac9bbd1ab",
                "shasum": ""
            },
            "require": {
@@ -2054,20 +2025,20 @@
                "issues": "https://gitlab.com/php-extended/php-system/issues",
                "source": "https://gitlab.com/php-extended/php-system"
            },
-            "time": "2023-06-26T19:35:14+00:00"
+            "time": "2022-12-12T07:20:57+00:00"
        },
        {
            "name": "php-extended/php-tail",
-            "version": "5.0.1",
+            "version": "5.0.0",
            "source": {
                "type": "git",
                "url": "git@gitlab.com:php-extended/php-tail.git",
-                "reference": "4a76745626d8e0359fee3bf87614e2478b3f80c5"
+                "reference": "d932ed124887b0e0691751a4bb197b759707e1d8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-tail/repository/archive.zip?sha=4a76745626d8e0359fee3bf87614e2478b3f80c5",
-                "reference": "4a76745626d8e0359fee3bf87614e2478b3f80c5",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fphp-tail/repository/archive.zip?sha=d932ed124887b0e0691751a4bb197b759707e1d8",
+                "reference": "d932ed124887b0e0691751a4bb197b759707e1d8",
                "shasum": ""
            },
            "require": {
@@ -2107,20 +2078,20 @@
                "issues": "https://gitlab.com/php-extended/php-tail/issues",
                "source": "https://gitlab.com/php-extended/php-tail"
            },
-            "time": "2023-06-26T19:35:24+00:00"
+            "time": "2022-12-18T11:15:32+00:00"
        },
        {
            "name": "php-extended/polyfill-php80-stringable",
-            "version": "1.2.12",
+            "version": "1.2.0",
            "source": {
                "type": "git",
-                "url": "https://gitlab.com/php-extended/polyfill-php80-stringable.git",
-                "reference": "ea728554a1d83c75ebb7eec69689fdb6c067b5e4"
+                "url": "git@gitlab.com:php-extended/polyfill-php80-stringable.git",
+                "reference": "a6199e7ea09ddafaae9c22d6bd297aa4704b6608"
            },
            "dist": {
                "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fpolyfill-php80-stringable/repository/archive.zip?sha=ea728554a1d83c75ebb7eec69689fdb6c067b5e4",
-                "reference": "ea728554a1d83c75ebb7eec69689fdb6c067b5e4",
+                "url": "https://gitlab.com/api/v4/projects/php-extended%2Fpolyfill-php80-stringable/repository/archive.zip?sha=a6199e7ea09ddafaae9c22d6bd297aa4704b6608",
+                "reference": "a6199e7ea09ddafaae9c22d6bd297aa4704b6608",
                "shasum": ""
            },
            "require": {
@@ -2155,7 +2126,7 @@
                "issues": "https://gitlab.com/php-extended/polyfill-php80-stringable/issues",
                "source": "https://gitlab.com/php-extended/polyfill-php80-stringable"
            },
-            "time": "2024-03-31T13:21:37+00:00"
+            "time": "2022-12-07T22:15:21+00:00"
        },
        {
            "name": "phpdocumentor/reflection-common",
@@ -2212,35 +2183,28 @@
        },
        {
            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.4.0",
+            "version": "5.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a"
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a",
-                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
                "shasum": ""
            },
            "require": {
-                "doctrine/deprecations": "^1.1",
                "ext-filter": "*",
-                "php": "^7.4 || ^8.0",
+                "php": "^7.2 || ^8.0",
                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.7",
-                "phpstan/phpdoc-parser": "^1.7",
+                "phpdocumentor/type-resolver": "^1.3",
                "webmozart/assert": "^1.9.1"
            },
            "require-dev": {
-                "mockery/mockery": "~1.3.5",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-mockery": "^1.1",
-                "phpstan/phpstan-webmozart-assert": "^1.2",
-                "phpunit/phpunit": "^9.5",
-                "vimeo/psalm": "^5.13"
+                "mockery/mockery": "~1.3.2",
+                "psalm/phar": "^4.8"
            },
            "type": "library",
            "extra": {
@@ -2264,39 +2228,36 @@
                },
                {
                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
+                    "email": "account@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.4.0"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
            },
-            "time": "2024-04-09T21:13:58+00:00"
+            "time": "2021-10-19T17:43:47+00:00"
        },
        {
            "name": "phpdocumentor/type-resolver",
-            "version": "1.8.2",
+            "version": "1.6.2",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c"
+                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c",
-                "reference": "153ae662783729388a584b4361f2545e4d841e3c",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
+                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
                "shasum": ""
            },
            "require": {
-                "doctrine/deprecations": "^1.0",
-                "php": "^7.3 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0",
-                "phpstan/phpdoc-parser": "^1.13"
+                "php": "^7.4 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.0"
            },
            "require-dev": {
                "ext-tokenizer": "*",
-                "phpbench/phpbench": "^1.2",
                "phpstan/extension-installer": "^1.1",
                "phpstan/phpstan": "^1.8",
                "phpstan/phpstan-phpunit": "^1.1",
@@ -2328,104 +2289,9 @@
            "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.8.2"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2"
            },
-            "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"
+            "time": "2022-10-14T12:47:21+00:00"
        },
        {
            "name": "psr/container",
@@ -2482,25 +2348,25 @@
        },
        {
            "name": "psr/http-message",
-            "version": "1.1",
+            "version": "1.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
                "shasum": ""
            },
            "require": {
-                "php": "^7.2 || ^8.0"
+                "php": ">=5.3.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.0.x-dev"
                }
            },
            "autoload": {
@@ -2529,9 +2395,9 @@
                "response"
            ],
            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/1.1"
+                "source": "https://github.com/php-fig/http-message/tree/master"
            },
-            "time": "2023-04-04T09:50:52+00:00"
+            "time": "2016-08-06T14:39:51+00:00"
        },
        {
            "name": "psr/log",
@@ -2702,16 +2568,16 @@
        },
        {
            "name": "sergeytsalkov/meekrodb",
-            "version": "v2.5.1",
+            "version": "v2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/SergeyTsalkov/meekrodb.git",
-                "reference": "08b683a274365983aaf033cf9c589dcbe5190028"
+                "reference": "e30c240d54bc81f58c58507a9ed768032eb494a5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/SergeyTsalkov/meekrodb/zipball/08b683a274365983aaf033cf9c589dcbe5190028",
-                "reference": "08b683a274365983aaf033cf9c589dcbe5190028",
+                "url": "https://api.github.com/repos/SergeyTsalkov/meekrodb/zipball/e30c240d54bc81f58c58507a9ed768032eb494a5",
+                "reference": "e30c240d54bc81f58c58507a9ed768032eb494a5",
                "shasum": ""
            },
            "require": {
@@ -2744,52 +2610,55 @@
            "support": {
                "email": "support@meekro.com",
                "issues": "https://github.com/SergeyTsalkov/meekrodb/issues",
-                "source": "https://github.com/SergeyTsalkov/meekrodb/tree/v2.5.1"
+                "source": "https://github.com/SergeyTsalkov/meekrodb/tree/v2.4"
            },
-            "time": "2023-10-10T00:28:49+00:00"
+            "time": "2021-06-29T04:31:23+00:00"
        },
        {
            "name": "symfony/console",
-            "version": "v7.0.7",
+            "version": "v6.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "c981e0e9380ce9f146416bde3150c79197ce9986"
+                "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c981e0e9380ce9f146416bde3150c79197ce9986",
-                "reference": "c981e0e9380ce9f146416bde3150c79197ce9986",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
+                "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.2",
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.1|^3",
                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^6.4|^7.0"
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/string": "^5.4|^6.0"
            },
            "conflict": {
-                "symfony/dependency-injection": "<6.4",
-                "symfony/dotenv": "<6.4",
-                "symfony/event-dispatcher": "<6.4",
-                "symfony/lock": "<6.4",
-                "symfony/process": "<6.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/dotenv": "<5.4",
+                "symfony/event-dispatcher": "<5.4",
+                "symfony/lock": "<5.4",
+                "symfony/process": "<5.4"
            },
            "provide": {
                "psr/log-implementation": "1.0|2.0|3.0"
            },
            "require-dev": {
                "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.4|^7.0",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/event-dispatcher": "^6.4|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/lock": "^6.4|^7.0",
-                "symfony/messenger": "^6.4|^7.0",
-                "symfony/process": "^6.4|^7.0",
-                "symfony/stopwatch": "^6.4|^7.0",
-                "symfony/var-dumper": "^6.4|^7.0"
+                "symfony/config": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/event-dispatcher": "^5.4|^6.0",
+                "symfony/lock": "^5.4|^6.0",
+                "symfony/process": "^5.4|^6.0",
+                "symfony/var-dumper": "^5.4|^6.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
            },
            "type": "library",
            "autoload": {
@@ -2818,12 +2687,12 @@
            "homepage": "https://symfony.com",
            "keywords": [
                "cli",
-                "command-line",
+                "command line",
                "console",
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.0.7"
+                "source": "https://github.com/symfony/console/tree/v6.2.7"
            },
            "funding": [
                {
@@ -2839,20 +2708,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:29:19+00:00"
+            "time": "2023-02-25T17:00:03+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
+                "reference": "0121954c80fd17c18cf050fe73360e63bb43d4fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0121954c80fd17c18cf050fe73360e63bb43d4fb",
+                "reference": "0121954c80fd17c18cf050fe73360e63bb43d4fb",
                "shasum": ""
            },
            "require": {
@@ -2861,7 +2730,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.3-dev"
                },
                "thanks": {
                    "name": "symfony/contracts",
@@ -2890,7 +2759,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.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1"
            },
            "funding": [
                {
@@ -2906,34 +2775,33 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2023-02-02T07:48:03+00:00"
        },
        {
            "name": "symfony/lock",
-            "version": "v6.4.7",
+            "version": "v6.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/lock.git",
-                "reference": "c6b3959c418a7c1115c060fab77927ca4bd2546a"
+                "reference": "febdeed9473e568ff34bf4350c04760f5357dfe2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/c6b3959c418a7c1115c060fab77927ca4bd2546a",
-                "reference": "c6b3959c418a7c1115c060fab77927ca4bd2546a",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/febdeed9473e568ff34bf4350c04760f5357dfe2",
+                "reference": "febdeed9473e568ff34bf4350c04760f5357dfe2",
                "shasum": ""
            },
            "require": {
                "php": ">=8.1",
-                "psr/log": "^1|^2|^3",
-                "symfony/deprecation-contracts": "^2.5|^3"
+                "psr/log": "^1|^2|^3"
            },
            "conflict": {
                "doctrine/dbal": "<2.13",
                "symfony/cache": "<6.2"
            },
            "require-dev": {
-                "doctrine/dbal": "^2.13|^3|^4",
-                "predis/predis": "^1.1|^2.0"
+                "doctrine/dbal": "^2.13|^3.0",
+                "predis/predis": "~1.0"
            },
            "type": "library",
            "autoload": {
@@ -2969,7 +2837,7 @@
                "semaphore"
            ],
            "support": {
-                "source": "https://github.com/symfony/lock/tree/v6.4.7"
+                "source": "https://github.com/symfony/lock/tree/v6.2.7"
            },
            "funding": [
                {
@@ -2985,20 +2853,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2023-02-24T10:42:00+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.29.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
                "shasum": ""
            },
            "require": {
@@ -3012,6 +2880,9 @@
            },
            "type": "library",
            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -3048,7 +2919,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
            },
            "funding": [
                {
@@ -3064,20 +2935,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.29.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
+                "reference": "511a08c03c1960e08a883f4cffcacd219b758354"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354",
+                "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
                "shasum": ""
            },
            "require": {
@@ -3088,6 +2959,9 @@
            },
            "type": "library",
            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -3126,7 +3000,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0"
            },
            "funding": [
                {
@@ -3142,20 +3016,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.29.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
+                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
                "shasum": ""
            },
            "require": {
@@ -3166,6 +3040,9 @@
            },
            "type": "library",
            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -3207,7 +3084,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
            },
            "funding": [
                {
@@ -3223,20 +3100,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.29.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
                "shasum": ""
            },
            "require": {
@@ -3250,6 +3127,9 @@
            },
            "type": "library",
            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -3287,7 +3167,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
            },
            "funding": [
                {
@@ -3303,20 +3183,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-php80",
-            "version": "v1.29.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
                "shasum": ""
            },
            "require": {
@@ -3324,6 +3204,9 @@
            },
            "type": "library",
            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -3367,7 +3250,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
            },
            "funding": [
                {
@@ -3383,34 +3266,36 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/service-contracts",
-            "version": "v3.5.0",
+            "version": "v3.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
+                "reference": "aee5f59db63978f7785290b94d2f12286b1b590a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/aee5f59db63978f7785290b94d2f12286b1b590a",
+                "reference": "aee5f59db63978f7785290b94d2f12286b1b590a",
                "shasum": ""
            },
            "require": {
                "php": ">=8.1",
-                "psr/container": "^1.1|^2.0",
-                "symfony/deprecation-contracts": "^2.5|^3"
+                "psr/container": "^2.0"
            },
            "conflict": {
                "ext-psr": "<1.1|>=2"
            },
+            "suggest": {
+                "symfony/service-implementation": ""
+            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.3-dev"
                },
                "thanks": {
                    "name": "symfony/contracts",
@@ -3450,7 +3335,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.2.1"
            },
            "funding": [
                {
@@ -3466,38 +3351,38 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2023-02-16T12:50:33+00:00"
        },
        {
            "name": "symfony/string",
-            "version": "v7.0.7",
+            "version": "v6.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63"
+                "reference": "67b8c1eec78296b85dc1c7d9743830160218993d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/e405b5424dc2528e02e31ba26b83a79fd4eb8f63",
-                "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63",
+                "url": "https://api.github.com/repos/symfony/string/zipball/67b8c1eec78296b85dc1c7d9743830160218993d",
+                "reference": "67b8c1eec78296b85dc1c7d9743830160218993d",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.2",
+                "php": ">=8.1",
                "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.5"
+                "symfony/translation-contracts": "<2.0"
            },
            "require-dev": {
-                "symfony/error-handler": "^6.4|^7.0",
-                "symfony/http-client": "^6.4|^7.0",
-                "symfony/intl": "^6.4|^7.0",
-                "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^6.4|^7.0"
+                "symfony/error-handler": "^5.4|^6.0",
+                "symfony/http-client": "^5.4|^6.0",
+                "symfony/intl": "^6.2",
+                "symfony/translation-contracts": "^2.0|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0"
            },
            "type": "library",
            "autoload": {
@@ -3536,7 +3421,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.0.7"
+                "source": "https://github.com/symfony/string/tree/v6.2.7"
            },
            "funding": [
                {
@@ -3552,35 +3437,32 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:29:19+00:00"
+            "time": "2023-02-24T10:42:00+00:00"
        },
        {
            "name": "symfony/translation",
-            "version": "v6.4.7",
+            "version": "v6.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "7495687c58bfd88b7883823747b0656d90679123"
+                "reference": "90db1c6138c90527917671cd9ffa9e8b359e3a73"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/7495687c58bfd88b7883823747b0656d90679123",
-                "reference": "7495687c58bfd88b7883823747b0656d90679123",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/90db1c6138c90527917671cd9ffa9e8b359e3a73",
+                "reference": "90db1c6138c90527917671cd9ffa9e8b359e3a73",
                "shasum": ""
            },
            "require": {
                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/translation-contracts": "^2.5|^3.0"
+                "symfony/translation-contracts": "^2.3|^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"
            },
@@ -3588,19 +3470,25 @@
                "symfony/translation-implementation": "2.3|3.0"
            },
            "require-dev": {
-                "nikic/php-parser": "^4.18|^5.0",
+                "nikic/php-parser": "^4.13",
                "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/finder": "^5.4|^6.0|^7.0",
-                "symfony/http-client-contracts": "^2.5|^3.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/intl": "^5.4|^6.0|^7.0",
+                "symfony/config": "^5.4|^6.0",
+                "symfony/console": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/finder": "^5.4|^6.0",
+                "symfony/http-client-contracts": "^1.1|^2.0|^3.0",
+                "symfony/http-kernel": "^5.4|^6.0",
+                "symfony/intl": "^5.4|^6.0",
                "symfony/polyfill-intl-icu": "^1.21",
-                "symfony/routing": "^5.4|^6.0|^7.0",
-                "symfony/service-contracts": "^2.5|^3",
-                "symfony/yaml": "^5.4|^6.0|^7.0"
+                "symfony/routing": "^5.4|^6.0",
+                "symfony/service-contracts": "^1.1.2|^2|^3",
+                "symfony/yaml": "^5.4|^6.0"
+            },
+            "suggest": {
+                "nikic/php-parser": "To use PhpAstExtractor",
+                "psr/log-implementation": "To use logging capability in translator",
+                "symfony/config": "",
+                "symfony/yaml": ""
            },
            "type": "library",
            "autoload": {
@@ -3631,7 +3519,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.4.7"
+                "source": "https://github.com/symfony/translation/tree/v6.2.7"
            },
            "funding": [
                {
@@ -3647,29 +3535,32 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:22:46+00:00"
+            "time": "2023-02-24T10:42:00+00:00"
        },
        {
            "name": "symfony/translation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a"
+                "reference": "1f40e77fbb12a16d841688f42fecefd8ceb43ed6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1f40e77fbb12a16d841688f42fecefd8ceb43ed6",
+                "reference": "1f40e77fbb12a16d841688f42fecefd8ceb43ed6",
                "shasum": ""
            },
            "require": {
                "php": ">=8.1"
            },
+            "suggest": {
+                "symfony/translation-implementation": ""
+            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.3-dev"
                },
                "thanks": {
                    "name": "symfony/contracts",
@@ -3709,7 +3600,7 @@
                "standards"
            ],
            "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.2.1"
            },
            "funding": [
                {
@@ -3725,7 +3616,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2023-02-16T12:50:33+00:00"
        },
        {
            "name": "tysonandre/var_representation_polyfill",
@@ -4039,16 +3930,16 @@
    "packages-dev": [
        {
            "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
                "shasum": ""
            },
            "require": {
@@ -4086,7 +3977,7 @@
            ],
            "support": {
                "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
            },
            "funding": [
                {
@@ -4094,31 +3985,29 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2022-03-03T13:19:32+00:00"
        },
        {
            "name": "nikic/php-parser",
-            "version": "v5.0.2",
+            "version": "v4.15.3",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
-                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
                "shasum": ""
            },
            "require": {
-                "ext-ctype": "*",
-                "ext-json": "*",
                "ext-tokenizer": "*",
-                "php": ">=7.4"
+                "php": ">=7.0"
            },
            "require-dev": {
                "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
            },
            "bin": [
                "bin/php-parse"
@@ -4126,7 +4015,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "4.9-dev"
                }
            },
            "autoload": {
@@ -4150,27 +4039,26 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
            },
-            "time": "2024-03-05T20:51:40+00:00"
+            "time": "2023-01-16T22:05:37+00:00"
        },
        {
            "name": "phar-io/manifest",
-            "version": "2.0.4",
+            "version": "2.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "54750ef60c58e43759730615a392c31c80e23176"
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
-                "reference": "54750ef60c58e43759730615a392c31c80e23176",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
+                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
                "shasum": ""
            },
            "require": {
                "ext-dom": "*",
-                "ext-libxml": "*",
                "ext-phar": "*",
                "ext-xmlwriter": "*",
                "phar-io/version": "^3.0.1",
@@ -4211,15 +4099,9 @@
            "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.4"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
            },
-            "funding": [
-                {
-                    "url": "https://github.com/theseer",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-03T12:33:53+00:00"
+            "time": "2021-07-20T11:28:43+00:00"
        },
        {
            "name": "phar-io/version",
@@ -4274,23 +4156,23 @@
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "10.1.14",
+            "version": "10.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
+                "reference": "b9c21a93dd8c8eed79879374884ee733259475cc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
-                "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b9c21a93dd8c8eed79879374884ee733259475cc",
+                "reference": "b9c21a93dd8c8eed79879374884ee733259475cc",
                "shasum": ""
            },
            "require": {
                "ext-dom": "*",
                "ext-libxml": "*",
                "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.15",
                "php": ">=8.1",
                "phpunit/php-file-iterator": "^4.0",
                "phpunit/php-text-template": "^3.0",
@@ -4302,16 +4184,16 @@
                "theseer/tokenizer": "^1.2.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^10.1"
+                "phpunit/phpunit": "^10.0"
            },
            "suggest": {
-                "ext-pcov": "PHP extension that provides line coverage",
-                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
+                "ext-pcov": "*",
+                "ext-xdebug": "*"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "10.1-dev"
+                    "dev-main": "10.0-dev"
                }
            },
            "autoload": {
@@ -4339,8 +4221,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.0.1"
            },
            "funding": [
                {
@@ -4348,20 +4229,20 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-12T15:33:41+00:00"
+            "time": "2023-02-25T05:35:03+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
-            "version": "4.1.0",
+            "version": "4.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
+                "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
-                "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
+                "reference": "fd9329ab3368f59fe1fe808a189c51086bd4b6bd",
                "shasum": ""
            },
            "require": {
@@ -4400,8 +4281,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.0.1"
            },
            "funding": [
                {
@@ -4409,7 +4289,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-08-31T06:24:48+00:00"
+            "time": "2023-02-10T16:53:14+00:00"
        },
        {
            "name": "phpunit/php-invoker",
@@ -4476,16 +4356,16 @@
        },
        {
            "name": "phpunit/php-text-template",
-            "version": "3.0.1",
+            "version": "3.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
+                "reference": "9f3d3709577a527025f55bcf0f7ab8052c8bb37d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
-                "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/9f3d3709577a527025f55bcf0f7ab8052c8bb37d",
+                "reference": "9f3d3709577a527025f55bcf0f7ab8052c8bb37d",
                "shasum": ""
            },
            "require": {
@@ -4523,8 +4403,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.0"
            },
            "funding": [
                {
@@ -4532,7 +4411,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-08-31T14:07:24+00:00"
+            "time": "2023-02-03T06:56:46+00:00"
        },
        {
            "name": "phpunit/php-timer",
@@ -4595,16 +4474,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "10.5.20",
+            "version": "10.0.13",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3"
+                "reference": "c37a88d7a905266eab6498817a1bf1170043313f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
-                "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c37a88d7a905266eab6498817a1bf1170043313f",
+                "reference": "c37a88d7a905266eab6498817a1bf1170043313f",
                "shasum": ""
            },
            "require": {
@@ -4618,7 +4497,7 @@
                "phar-io/manifest": "^2.0.3",
                "phar-io/version": "^3.0.2",
                "php": ">=8.1",
-                "phpunit/php-code-coverage": "^10.1.5",
+                "phpunit/php-code-coverage": "^10.0",
                "phpunit/php-file-iterator": "^4.0",
                "phpunit/php-invoker": "^4.0",
                "phpunit/php-text-template": "^3.0",
@@ -4628,15 +4507,15 @@
                "sebastian/comparator": "^5.0",
                "sebastian/diff": "^5.0",
                "sebastian/environment": "^6.0",
-                "sebastian/exporter": "^5.1",
-                "sebastian/global-state": "^6.0.1",
+                "sebastian/exporter": "^5.0",
+                "sebastian/global-state": "^6.0",
                "sebastian/object-enumerator": "^5.0",
                "sebastian/recursion-context": "^5.0",
                "sebastian/type": "^4.0",
                "sebastian/version": "^4.0"
            },
            "suggest": {
-                "ext-soap": "To be able to generate mocks based on WSDL files"
+                "ext-soap": "*"
            },
            "bin": [
                "phpunit"
@@ -4644,7 +4523,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "10.5-dev"
+                    "dev-main": "10.0-dev"
                }
            },
            "autoload": {
@@ -4675,8 +4554,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.0.13"
            },
            "funding": [
                {
@@ -4692,20 +4570,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-24T06:32:35+00:00"
+            "time": "2023-02-27T13:07:57+00:00"
        },
        {
            "name": "sebastian/cli-parser",
-            "version": "2.0.1",
+            "version": "2.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
+                "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
-                "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efdc130dbbbb8ef0b545a994fd811725c5282cae",
+                "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae",
                "shasum": ""
            },
            "require": {
@@ -4740,8 +4618,7 @@
            "homepage": "https://github.com/sebastianbergmann/cli-parser",
            "support": {
                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.0"
            },
            "funding": [
                {
@@ -4749,7 +4626,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-02T07:12:49+00:00"
+            "time": "2023-02-03T06:58:15+00:00"
        },
        {
            "name": "sebastian/code-unit",
@@ -4864,16 +4741,16 @@
        },
        {
            "name": "sebastian/comparator",
-            "version": "5.0.1",
+            "version": "5.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
+                "reference": "72f01e6586e0caf6af81297897bd112eb7e9627c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/72f01e6586e0caf6af81297897bd112eb7e9627c",
+                "reference": "72f01e6586e0caf6af81297897bd112eb7e9627c",
                "shasum": ""
            },
            "require": {
@@ -4884,7 +4761,7 @@
                "sebastian/exporter": "^5.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^10.3"
+                "phpunit/phpunit": "^10.0"
            },
            "type": "library",
            "extra": {
@@ -4928,8 +4805,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.0"
            },
            "funding": [
                {
@@ -4937,24 +4813,24 @@
                    "type": "github"
                }
            ],
-            "time": "2023-08-14T13:18:12+00:00"
+            "time": "2023-02-03T07:07:16+00:00"
        },
        {
            "name": "sebastian/complexity",
-            "version": "3.2.0",
+            "version": "3.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "68ff824baeae169ec9f2137158ee529584553799"
+                "reference": "e67d240970c9dc7ea7b2123a6d520e334dd61dc6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
-                "reference": "68ff824baeae169ec9f2137158ee529584553799",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/e67d240970c9dc7ea7b2123a6d520e334dd61dc6",
+                "reference": "e67d240970c9dc7ea7b2123a6d520e334dd61dc6",
                "shasum": ""
            },
            "require": {
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.10",
                "php": ">=8.1"
            },
            "require-dev": {
@@ -4963,7 +4839,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.2-dev"
+                    "dev-main": "3.0-dev"
                }
            },
            "autoload": {
@@ -4986,8 +4862,7 @@
            "homepage": "https://github.com/sebastianbergmann/complexity",
            "support": {
                "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/3.0.0"
            },
            "funding": [
                {
@@ -4995,20 +4870,20 @@
                    "type": "github"
                }
            ],
-            "time": "2023-12-21T08:37:17+00:00"
+            "time": "2023-02-03T06:59:47+00:00"
        },
        {
            "name": "sebastian/diff",
-            "version": "5.1.1",
+            "version": "5.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
+                "reference": "70dd1b20bc198da394ad542e988381b44e64e39f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
-                "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/70dd1b20bc198da394ad542e988381b44e64e39f",
+                "reference": "70dd1b20bc198da394ad542e988381b44e64e39f",
                "shasum": ""
            },
            "require": {
@@ -5016,12 +4891,12 @@
            },
            "require-dev": {
                "phpunit/phpunit": "^10.0",
-                "symfony/process": "^6.4"
+                "symfony/process": "^4.2 || ^5"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "5.1-dev"
+                    "dev-main": "5.0-dev"
                }
            },
            "autoload": {
@@ -5053,8 +4928,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
+                "source": "https://github.com/sebastianbergmann/diff/tree/5.0.0"
            },
            "funding": [
                {
@@ -5062,20 +4936,20 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-02T07:15:17+00:00"
+            "time": "2023-02-03T07:00:31+00:00"
        },
        {
            "name": "sebastian/environment",
-            "version": "6.1.0",
+            "version": "6.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
+                "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
-                "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/b6f3694c6386c7959915a0037652e0c40f6f69cc",
+                "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc",
                "shasum": ""
            },
            "require": {
@@ -5090,7 +4964,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "6.1-dev"
+                    "dev-main": "6.0-dev"
                }
            },
            "autoload": {
@@ -5117,8 +4991,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "security": "https://github.com/sebastianbergmann/environment/security/policy",
-                "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
+                "source": "https://github.com/sebastianbergmann/environment/tree/6.0.0"
            },
            "funding": [
                {
@@ -5126,20 +4999,20 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-23T08:47:14+00:00"
+            "time": "2023-02-03T07:03:04+00:00"
        },
        {
            "name": "sebastian/exporter",
-            "version": "5.1.2",
+            "version": "5.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "955288482d97c19a372d3f31006ab3f37da47adf"
+                "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
-                "reference": "955288482d97c19a372d3f31006ab3f37da47adf",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0",
+                "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0",
                "shasum": ""
            },
            "require": {
@@ -5153,7 +5026,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "5.1-dev"
+                    "dev-main": "5.0-dev"
                }
            },
            "autoload": {
@@ -5195,8 +5068,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/5.0.0"
            },
            "funding": [
                {
@@ -5204,20 +5076,20 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-02T07:17:12+00:00"
+            "time": "2023-02-03T07:06:49+00:00"
        },
        {
            "name": "sebastian/global-state",
-            "version": "6.0.2",
+            "version": "6.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
+                "reference": "aab257c712de87b90194febd52e4d184551c2d44"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
-                "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/aab257c712de87b90194febd52e4d184551c2d44",
+                "reference": "aab257c712de87b90194febd52e4d184551c2d44",
                "shasum": ""
            },
            "require": {
@@ -5251,14 +5123,13 @@
                }
            ],
            "description": "Snapshotting of global state",
-            "homepage": "https://www.github.com/sebastianbergmann/global-state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
            "keywords": [
                "global state"
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.0"
            },
            "funding": [
                {
@@ -5266,24 +5137,24 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-02T07:19:19+00:00"
+            "time": "2023-02-03T07:07:38+00:00"
        },
        {
            "name": "sebastian/lines-of-code",
-            "version": "2.0.2",
+            "version": "2.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
+                "reference": "17c4d940ecafb3d15d2cf916f4108f664e28b130"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
-                "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/17c4d940ecafb3d15d2cf916f4108f664e28b130",
+                "reference": "17c4d940ecafb3d15d2cf916f4108f664e28b130",
                "shasum": ""
            },
            "require": {
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.10",
                "php": ">=8.1"
            },
            "require-dev": {
@@ -5315,8 +5186,7 @@
            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
            "support": {
                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.0"
            },
            "funding": [
                {
@@ -5324,7 +5194,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-12-21T08:38:20+00:00"
+            "time": "2023-02-03T07:08:02+00:00"
        },
        {
            "name": "sebastian/object-enumerator",
@@ -5612,16 +5482,16 @@
        },
        {
            "name": "theseer/tokenizer",
-            "version": "1.2.3",
+            "version": "1.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
                "shasum": ""
            },
            "require": {
@@ -5650,7 +5520,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.3"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
            },
            "funding": [
                {
@@ -5658,7 +5528,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-03-03T12:36:25+00:00"
+            "time": "2021-07-28T10:34:58+00:00"
        }
    ],
    "aliases": [],
@@ -5669,7 +5539,7 @@
    "platform": [],
    "platform-dev": [],
    "platform-overrides": {
-        "php": "8.3"
+        "php": "8.2"
    },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }
@@ -99,10 +99,7 @@ function logError(string $err, string $errstr, string $errpath, array $trace)
    $err = str_replace(ROOT, '{ROOT}', $err);
    $errstr = str_replace(ROOT, '{ROOT}', $errstr);
    $errpath = str_replace(ROOT, '{ROOT}', $errpath);
-    $trace = array_map(function (string|array $text) {
-        if (is_array($text)) {
-            $text = Json::encode($text);
-        }
+    $trace = array_map(function (string $text) {
        return str_replace(ROOT, '{ROOT}', $text);
    }, $trace);

@@ -30,10 +30,10 @@ require(__DIR__ . '/../vendor/autoload.php');

 <body>
    <div class="container">
-        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 설치</h1>
-        <div class="row justify-content-lg-center">
+        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 설치</h1>
+        <div class="row justify-content-md-center">

-            <div class="col col-12 col-lg-10 col-lg-7">
+            <div class="col col-12 col-md-10 col-lg-7">
                <div class="card" id="db_form_card" style="display:none">
                    <h3 class="card-header">
                        설치(DB 설정)
@@ -56,7 +56,7 @@ $rootDB->insert('member', [
    'token_valid_until' => '2999-01-01 00:00:00',
    'pw' => $finalPassword,
    'salt' => $userSalt,
-    'grade' => 7,
+    'grade' => 6,
    'name' => $nickname,
    'reg_date' => $nowDate
 ]);
@@ -17,11 +17,18 @@ if (!class_exists('\\sammo\\RootDB')) {

 $rootDB = RootDB::db();

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

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

@@ -92,14 +92,4 @@ CREATE TABLE `login_token` (
 	INDEX `by_date` (`user_id`, `expire_date`)
 )
 COLLATE='utf8mb4_general_ci'
-ENGINE=Aria;
-
-CREATE TABLE `banned_member` (
-	`no` INT NOT NULL AUTO_INCREMENT,
-	`hashed_email` VARCHAR(128) NOT NULL COLLATE 'utf8mb4_general_ci' COMMENT 'SHA512(salt | email | salt )',
-	`info` TEXT NULL COLLATE 'utf8mb4_general_ci' COMMENT '부가정보',
-	PRIMARY KEY (`no`),
-	UNIQUE INDEX `email` (`hashed_email`(128))
-)
-COLLATE='utf8mb4_general_ci'
-ENGINE = Aria;
+ENGINE=Aria;
@@ -6,7 +6,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if($session->userGrade < 6) {
+if($session->userGrade < 5) {
    die(requireAdminPermissionHTML());
 }

@@ -6,7 +6,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if ($session->userGrade < 6) {
+if ($session->userGrade < 5) {
    header('location:_admin1.php');
    die();
 }
@@ -74,7 +74,28 @@ switch ($btn) {
        case "120분턴": $turnterm = 120; break;
        default: throw new \Exception("알 수 없는 턴 기간");
        }
-        ServerTool::changeServerTerm($turnterm);
+        $oldunit = $admin['turnterm'] * 60;
+        $unit = $turnterm * 60;
+
+        $unitDiff = $unit / $oldunit;
+
+        $servTurnTime = new \DateTimeImmutable($admin['turntime']);
+        foreach ($db->query('SELECT no,turntime FROM general') as $gen) {
+            $genTurnTime = new \DateTimeImmutable($gen['turntime']);
+            $timeDiff = TimeUtil::DateIntervalToSeconds($genTurnTime->diff($servTurnTime));
+            $timeDiff *= $unitDiff;
+            $newGenTurnTime = $servTurnTime->add(TimeUtil::secondsToDateInterval($timeDiff));
+
+            $db->update('general', [
+                'turntime'=>$newGenTurnTime->format('Y-m-d H:i:s.u')
+            ], 'no=%i', $gen['no']);
+        }
+        $turn = ($admin['year'] - $admin['startyear']) * 12 + $admin['month'] - 1;
+        $starttime = $servTurnTime->sub(TimeUtil::secondsToDateInterval($turn * $unit))->format('Y-m-d H:i:s');
+        $starttime = cutTurn($starttime, $turnterm, false);
+        $gameStor->turnterm = $turnterm;
+        $gameStor->starttime = $starttime;
+        pushGlobalHistoryLog(["<R>★</>턴시간이 <C>$btn</>으로 변경됩니다."]);
        break;
 }

@@ -7,7 +7,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if ($session->userGrade < 6) {
+if ($session->userGrade < 5) {
    die(requireAdminPermissionHTML());
 }

@@ -15,7 +15,7 @@ $msg = Util::getPost('msg', 'string');
 //로그인 검사
 $session = Session::requireLogin()->loginGame()->setReadOnly();

-if ($session->userGrade < 6) {
+if ($session->userGrade < 5) {
    header('location:_admin2.php');
 }

@@ -33,18 +33,18 @@ $src = MessageTarget::buildQuick($session->generalID);
 $genObjList = [];
 $env = [];
 if ($genlist) {
-    $genObjList = General::createObjListFromDB($genlist);
+    $genObjList = General::createGeneralObjListFromDB($genlist);
    $env = $gameStor->cacheAll();
 }
 switch ($btn) {
    case "전체 접속허용":
-        $db->update('general_access_log', [
-            'refresh_score' => 0
+        $db->update('general', [
+            'con' => 0
        ], true);
        break;
    case "전체 접속제한":
-        $db->update('general_access_log', [
-            'refresh_score' => 1000
+        $db->update('general', [
+            'con' => 1000
        ], true);
        break;
    case "블럭 해제":
@@ -186,14 +186,14 @@ switch ($btn) {
        ], '`no` IN %li', $genlist);
        break;
    case "접속 허용":
-        $db->update('general_access_log', [
-            'refresh_score' => 0
-        ], '`general_id` IN %li', $genlist);
+        $db->update('general', [
+            'con' => 0
+        ], '`no` IN %li', $genlist);
        break;
    case "접속 제한":
-        $db->update('general_access_log', [
-            'refresh_score' => 1000
-        ], '`general_id` IN %li', $genlist);
+        $db->update('general', [
+            'con' => 1000
+        ], '`no` IN %li', $genlist);
        break;
    case "메세지 전달":
        $text = $msg ?? '';
@@ -0,0 +1,133 @@
+<?php
+
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+
+if ($session->userGrade < 5) {
+    die(requireAdminPermissionHTML());
+}
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$conlimit = $gameStor->conlimit;
+
+$ipGroupList = Util::arrayGroupBy(
+    $db->query(
+        'SELECT name,ip,lastconnect,owner,block,substring_index(ip,".",3) as ip_c from general WHERE ip!="" and npc<2'
+    ),
+    'ip_c'
+);
+
+function colorBlockedName($general)
+{
+    if (!$general['blocked']) {
+        return $general['name'];
+    }
+    return "<span style='color:magenta;'>{$general['name']}</span>";
+}
+
+?>
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>멀티관리</title>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=1024" />
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+</head>
+
+<body>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td>멀 티 관 리<br><?= backButton() ?></td>
+        </tr>
+    </table>
+    <form name=form1 method=post action=_admin4_submit.php>
+        <table align=center width=1000 class='tb_layout bg0'>
+            <tr>
+                <td width=80 align=center rowspan=3>회원선택<br><br>
+                    <font color=cyan>NPC</font><br>
+                    <font color=skyblue>NPC유저</font><br>
+                    <font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b>
+                </td>
+                <td width=105 rowspan=3>
+                    <?php
+
+                    echo "
+            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>";
+
+                    foreach ($db->query('SELECT no,name,npc,block,con from general where ip!=\'\' order by npc,ip') as $general) {
+                        $style = "style=;";
+                        if ($general['block']         > 0) {
+                            $style .= "background-color:red;";
+                        }
+
+                        $npcColor = getNPCColor($general['npc']);
+                        if($npcColor !== null){
+                            $style .= "color:{$npcColor};";
+                        }
+
+                        echo "
+                <option value={$general['no']} $style>{$general['name']}</option>";
+                    }
+
+                    echo "
+            </select>";
+                    ?>
+                </td>
+                <td width=100 align=center>블럭</td>
+                <td width=504>
+                    <input type=submit name=btn value='블럭 해제'><input type=submit name=btn value='1단계 블럭'><input type=submit name=btn value='2단계 블럭'><input type=submit name=btn value='3단계 블럭'><input type=submit name=btn value='무한삭턴'><br>
+                    1단계:발언권, 2단계:턴블럭
+                </td>
+            </tr>
+            <tr>
+                <td align=center>강제 사망</td>
+                <td><input type=submit name=btn value='강제 사망'></td>
+            </tr>
+            <tr>
+                <td align=center>메세지 전달</td>
+                <td><input type=textarea size=60 maxlength=255 name=msg style=background-color:black;color:white;><input type=submit name=btn value='메세지 전달'></td>
+            </tr>
+        </table>
+        <table align=center width=1000 class='tb_layout bg0'>
+            <tr>
+                <td align=center width=100>장수명</td>
+                <td align=center width=180>최근로그인</td>
+                <td align=center width=129>IP</td>
+                <td align=center width=100>ID</td>
+            </tr>
+            <?php foreach ($ipGroupList as $ipGroupC => $users) : ?>
+                <tr>
+                    <td><?= join('<br>', array_map('\sammo\colorBlockedName', $users)) ?></td>
+                    <td><?= join('<br>', array_column($users, 'lastconnect')) ?></td>
+                    <td><?= join('<br>', array_column($users, 'ip')) ?></td>
+                    <td><?= join('<br>', array_column($users, 'owner')) ?></td>
+                </tr>
+            <?php endforeach; ?>
+        </table>
+        <?php
+        //NOTE: password의 md5 해시가 같은지 확인하는 방식으로는 앞으로 잡아낼 수 없다. 폐기
+        ?>
+    </form>
+    <table align=center width=1000 class='tb_layout bg0'>
+        <tr>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
+    </table>
+</body>
+
+</html>
@@ -0,0 +1,86 @@
+<?php
+
+namespace sammo;
+
+use sammo\Enums\MessageType;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+
+if ($session->userGrade < 5) {
+    header('location:_admin4.php');
+    die();
+}
+
+$btn = Util::getPost('btn');
+$genlist = Util::getPost('genlist', 'array_int');
+$msg = Util::getPost('msg', 'string', '메시지');
+
+$db = DB::db();
+
+//NOTE: 왜 기능이 admin2와 admin4가 같이 있는가?
+//NOTE: 왜 블럭 시 admin4에선 금쌀을 없애지 않는가?
+switch ($btn) {
+    case "블럭 해제":
+        DB::db()->query('update general set block=0 where no IN %li', $genlist);
+        break;
+    case "1단계 블럭":
+        $date = TimeUtil::now();
+        $db = DB::db();
+        $db->query('update general set block=1,killturn=24 where no IN %li', $genlist);
+        //FIXME: subquery로 하는게 더 빠를 듯.
+        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
+        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
+        break;
+    case "2단계 블럭":
+        $date = TimeUtil::now();
+        $db = DB::db();
+        $db->query('update general set block=2,killturn=24 where no IN %li', $genlist);
+        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
+        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
+        break;
+    case "3단계 블럭":
+        $date = TimeUtil::now();
+        $db = DB::db();
+        $db->query('update general set block=3,killturn=24 where no IN %li', $genlist);
+        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
+        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
+        break;
+    case "무한삭턴":
+        DB::db()->query('update general set killturn=8000 where no IN %li', $genlist);
+        break;
+    case "강제 사망":
+        $date = TimeUtil::now(true);
+        $db->update('general', [
+            'killturn' => 0,
+            'turntime' => $date,
+        ], '`no` IN %li', $genlist);
+        $db->update('general_turn', [
+            'action' => '휴식',
+            'arg' => '{}',
+            'brief' => '휴식'
+        ], 'general_id IN %li AND turn_idx = 0', $genlist);
+        break;
+    case "메세지 전달":
+        $date = TimeUtil::now();
+        $src = MessageTarget::buildQuick($session->generalID);
+        foreach($genlist as $generalID){
+            $msgObj = new Message(
+                MessageType::private,
+                $src,
+                MessageTarget::buildQuick($generalID),
+                $msg,
+                new \DateTime(),
+                new \DateTime('9999-12-31'),
+                []
+            );
+            if ($msgObj) {
+                $msgObj->send(true);
+            }
+        }
+        break;
+}
+
+header('location:_admin4.php');
@@ -20,7 +20,7 @@ if ($type2 < 0 || $type2 > 6) {
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if ($session->userGrade < 6) {
+if ($session->userGrade < 5) {
    die(requireAdminPermissionHTML());
 }

@@ -66,6 +66,8 @@ $sel2[$type2] = "selected";
                        <option <?= $sel[8] ?? '' ?> value=8>평무</option>
                        <option <?= $sel[9] ?? '' ?> value=9>평지</option>
                        <option <?= $sel[10] ?? '' ?> value=10>평Lv</option>
+                        <option <?= $sel[11] ?? '' ?> value=11>접속률</option>
+                        <option <?= $sel[12] ?? '' ?> value=12>단기접</option>
                        <option <?= $sel[13] ?? '' ?> value=13>보숙</option>
                        <option <?= $sel[14] ?? '' ?> value=14>궁숙</option>
                        <option <?= $sel[15] ?? '' ?> value=15>기숙</option>
@@ -103,6 +105,8 @@ $sel2[$type2] = "selected";
    <table align=center width=1600 class="tb_layout bg0">
        <tr class='bg1'>
            <td align=center>국명</td>
+            <td align=center>접률</td>
+            <td align=center>단접</td>
            <td align=center>국력</td>
            <td align=center>장수</td>
            <td align=center>속령</td>
@@ -143,6 +147,8 @@ SELECT
    A.gold,
    A.rice,
    COUNT(B.nation) AS gennum,
+    ROUND(AVG(B.connect), 1) AS connect,
+    ROUND(AVG(B.con), 1) AS con,
    ROUND(AVG(B.dex1)) AS dex1,
    ROUND(AVG(B.dex2)) AS dex2,
    ROUND(AVG(B.dex3)) AS dex3,
@@ -187,6 +193,12 @@ GROUP BY B.nation
            case 10:
                $query .= " order by avg(B.explevel) desc";
                break;
+            case 11:
+                $query .= " order by avg(B.connect) desc";
+                break;
+            case 12:
+                $query .= " order by avg(B.con) desc";
+                break;
            case 13:
                $query .= " order by avg(B.dex1) desc";
                break;
@@ -228,6 +240,8 @@ from city where nation=%i', $nation['nation']);
            echo "
    <tr>
        <td align=center style=background-color:{$nation['color']};color:" . newColor($nation['color']) . ";>{$nation['name']}</td>
+        <td align=center>&nbsp;{$nation['connect']}&nbsp;</td>
+        <td align=center>&nbsp;{$nation['con']}&nbsp;</td>
        <td align=center>&nbsp;{$nation['power']}&nbsp;</td>
        <td align=center>&nbsp;{$gen['cnt']}&nbsp;</td>
        <td align=center>&nbsp;{$city['cnt']}&nbsp;</td>
@@ -12,7 +12,7 @@ $nation = Util::getPost('nation', 'int');
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

-if ($session->userGrade < 6) {
+if ($session->userGrade < 5) {
    header('location:_admin5.php');
    die();
 }
@@ -2,8 +2,6 @@

 namespace sammo;

-use sammo\Enums\GeneralQueryMode;
-
 include "lib.php";
 include "func.php";

@@ -31,13 +29,13 @@ $queryMap = [
 ];

 if ($reqQueryType === null || !key_exists($reqQueryType, $queryMap)) {
-    $reqQueryType = array_key_first($queryMap);
+    $reqQueryType = Util::array_first_key($queryMap);
 }

 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if ($session->userGrade < 6) {
+if ($session->userGrade < 5) {
    die(requireAdminPermissionHTML());
 }

@@ -76,7 +74,7 @@ if (!$gen) {
    $gen = $generalBasicList[0]['no'];
 }

-$generalObj = General::createObjFromDB($gen, null, GeneralQueryMode::FullWithAccessLog);
+$generalObj = General::createGeneralObjFromDB($gen);

 ?>
 <!DOCTYPE html>
@@ -12,7 +12,7 @@ $type = 0;
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if ($session->userGrade < 6) {
+if ($session->userGrade < 5) {
    die(requireAdminPermissionHTML());
 }

@@ -7,7 +7,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

-if ($session->userGrade < 6) {
+if ($session->userGrade < 5) {
    die('권한 부족');
 }

@@ -26,7 +26,7 @@ foreach ($db->queryFirstColumn(
 }

 $inheritPointManager = InheritancePointManager::getInstance();
-foreach(General::createObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
+foreach(General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
    $inheritPointManager->mergeTotalInheritancePoint($genObj);
    $inheritPointManager->applyInheritanceUser($genObj->getVar('owner'));
 }
@@ -16,13 +16,10 @@ $gameStor = KVStorage::getStorage($db, 'game_env');

 increaseRefresh("장수일람", 2);

-$me = $db->queryFirstRow(
-    'SELECT refresh_score,turntime FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner = %i', $userID
-);
+$me = $db->queryFirstRow('SELECT con,turntime FROM general WHERE owner = %i', $userID);

-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }
@@ -105,7 +102,7 @@ if ($gameStor->isunited) {
        6 => ['dedication', true],
        7 => ['officer_level', true],
        8 => ['killturn', false],
-        9 => ['refresh_score_total', true],
+        9 => ['connect', true],
        10 => ['experience', true],
        11 => ['personal', true],
        12 => ['special', true],
@@ -114,12 +111,7 @@ if ($gameStor->isunited) {
        15 => ['npc', true],
    ][$type];

-    $generalList = $db->query(
-        'SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,refresh_score_total
-        FROM `general` LEFT JOIN `general_access_log` ON general.no = general_access_log.general_id order by %b %l',
-        $orderKey,
-        $orderDesc ? 'desc' : ''
-    );
+    $generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect from general order by %b %l', $orderKey, $orderDesc ? 'desc' : '');

    echo "
 <table align=center width=1000 class='tb_layout bg0'>
@@ -171,7 +163,7 @@ if ($gameStor->isunited) {
            $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
        }

-        $general['refresh_score_total'] = Util::round($general['refresh_score_total'], -1);
+        $general['connect'] = Util::round($general['connect'], -1);

        $imageTemp = GetImageURL($general['imgsvr']);
        echo "
@@ -200,8 +192,8 @@ if ($gameStor->isunited) {
        <td align=center>$strength</td>
        <td align=center>$intel</td>
        <td align=center>{$general['killturn']}</td>
-        <td align=center>" . $general['refresh_score_total'] ?? 0;
-        echo "<br>【" . getRefreshScoreText($general['refresh_score_total'] ?? 0) . "】</td>
+        <td align=center>{$general['connect']}";
+        echo "<br>【" . getConnect($general['connect']) . "】</td>
    </tr>";
    }
    echo "
@@ -13,13 +13,10 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 $gameStor->cacheValues(['killturn', 'autorun_user', 'turnterm']);
 increaseRefresh("세력일람", 2);

-$me = $db->queryFirstRow(
-    'SELECT refresh_score, turntime FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);

-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }
@@ -2,8 +2,6 @@

 namespace sammo;

-use sammo\Enums\GeneralAccessLogColumn;
-
 include "lib.php";
 include "func.php";

@@ -12,19 +10,34 @@ $gameStor = KVStorage::getStorage($db, 'game_env');

 increaseRefresh("갱신정보", 1);

-$admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxrefresh', 'maxonline', 'recentTraffic']);
+$admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxrefresh', 'maxonline']);

-$recentTraffic = $admin['recentTraffic'] ?? [];
+$log = getRawFileLogRecent(__DIR__ . '/logs/' . UniqueConst::$serverID . '/_traffic.txt', 11, 100);
+
+$date = [];
+$year = [];
+$month = [];
+$refresh = [];
+$online = [];

 $curonline = getOnlineNum();
-
-$recentTraffic[] = [
-    'year'    => $admin['year'],
-    'month'   => $admin['month'],
-    'refresh' => $admin['refresh'],
-    'online'  => $curonline,
-    'date' => TimeUtil::now()
-];
+foreach ($log as $i => $value) {
+    $parse = Json::decode($value);
+    if(is_array($parse) === false){
+        continue;
+    }
+    if(count($parse) < 5){
+        continue;
+    }
+    $date[$i]    = $parse[0];
+    $year[$i]    = $parse[1];
+    $month[$i]   = $parse[2];
+    $refresh[$i] = $parse[3];
+    $online[$i]  = $parse[4];
+}
+$year[] = $admin['year'];
+$month[] = $admin['month'];
+$date[] = TimeUtil::now();

 if ($admin['maxrefresh'] == 0) {
    $admin['maxrefresh'] = 1;
@@ -98,13 +111,13 @@ if ($admin['maxonline'] < $curonline) {
                        </td>
                    </tr>
                    <?php
-                    foreach ($recentTraffic as $trafficItem) {
-                        $value = $trafficItem['refresh'];
+                    $refresh[] = $admin['refresh'];
+                    foreach ($refresh as $i => $value) {
                        $w = round($value / $admin['maxrefresh'] * 100, 1);
                        $color = getTrafficColor($w);
-                        $dt = substr($trafficItem['date'], 11, 5); ?>
+                        $dt = substr($date[$i], 11, 5); ?>
                        <tr height=30>
-                            <td width=100 align=center><?= $trafficItem['year'] ?>년 <?= $trafficItem['month'] ?>월</td>
+                            <td width=100 align=center><?= $year[$i] ?>년 <?= $month[$i] ?>월</td>
                            <td width=60 align=center class='bg2'><?= $dt ?></td>
                            <td width=2 align=center class='bg1'></td>
                            <td width=320>
@@ -139,13 +152,13 @@ if ($admin['maxonline'] < $curonline) {
                        </td>
                    </tr>
                    <?php
-                    foreach ($recentTraffic as $trafficItem) {
-                        $value = $trafficItem['online'];
+                    $online[] = $curonline;
+                    foreach ($online as $i => $value) {
                        $w = round($value / $admin['maxonline'] * 100, 1);
                        $color = getTrafficColor($w);
-                        $dt = substr($trafficItem['date'], 11, 5); ?>
+                        $dt = substr($date[$i], 11, 5); ?>
                        <tr height=30>
-                            <td width=100 align=center><?= $trafficItem['year'] ?>년 <?= $trafficItem['month'] ?>월</td>
+                            <td width=100 align=center><?= $year[$i] ?>년 <?= $month[$i] ?>월</td>
                            <td width=60 align=center class='bg2'><?= $dt ?></td>
                            <td width=2 align=center class='bg1'></td>
                            <td width=320>
@@ -180,24 +193,19 @@ if ($admin['maxonline'] < $curonline) {
            </td>
        </tr>
        <?php
-        $totalRefresh = [
-            ...$db->queryFirstRow('SELECT sum(`refresh`) as `refresh`, sum(`refresh_score_total`) as `refresh_score_total` from general_access_log'),
-            'name' => '접속자 총합'
-        ];
+        $max_refresh = $db->queryFirstRow('SELECT sum(refresh) as refresh, sum(`connect`) as `connect` from general');
+        $max_refresh['name'] = '접속자 총합';

-        $top5Refresh = $db->query(
-            'SELECT `name`, `log`.`refresh`, `refresh_score_total` FROM `general_access_log` AS `log`
-            INNER JOIN `general` ON `log`.`general_id` = `general`.`no` ORDER BY `log`.`refresh` DESC LIMIT 5'
-        );
+        $refresh_result = array_merge([$max_refresh], $db->query('SELECT `name`,refresh,`connect` FROM general ORDER BY refresh DESC LIMIT 5'));

-        foreach (array_merge([$totalRefresh], $top5Refresh) as $i => $user) {
-            $w = round($user['refresh'] / max(1, $totalRefresh['refresh']) * 100, 1);
+        foreach ($refresh_result as $i => $user) {
+            $w = round($user['refresh'] / max(1, $max_refresh['refresh']) * 100, 1);
            $w2 = round(100 - $w, 1);
            $color = getTrafficColor($w);
        ?>
            <tr>
                <td width=98 align=center><?= $user['name'] ?></td>
-                <td width=98 align=center><?= $user['refresh_score_total'] ?>(<?= $user['refresh'] ?>)</td>
+                <td width=98 align=center><?= $user['connect'] ?>(<?= $user['refresh'] ?>)</td>
                <td width=798>
                    <?php if ($w == 0) : ?>
                    <?php elseif ($w < 10) : ?>
@@ -2,8 +2,6 @@

 namespace sammo;

-use sammo\Enums\GeneralLiteQueryMode;
-use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\RankColumn;

 include "lib.php";
@@ -23,15 +21,12 @@ $generalID = $session->generalID;



-$me = $db->queryFirstRow(
-    'SELECT no,tournament,refresh_score,turntime FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id where owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no,tournament,con,turntime from general where owner=%i', $userID);

 $admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'turnterm', 'develcost']);
 $turnTerm = $admin['turnterm'];
-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }
@@ -112,7 +107,7 @@ if ($str3) {
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($limitState == 1) {
+<?php if ($con == 1) {
    MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>

@@ -507,28 +502,28 @@ if ($str3) {
            $tournamentType = [
                '전 력 전' => [
                    '종합',
-                    function (GeneralLite $general) {
+                    function (General $general) {
                        return $general->getVar('leadership') + $general->getVar('strength') + $general->getVar('intel');
                    },
                    'tt',
                ],
                '통 솔 전' => [
                    '통솔',
-                    function (GeneralLite $general) {
+                    function (General $general) {
                        return $general->getVar('leadership');
                    },
                    'tl',
                ],
                '일 기 토' => [
                    '무력',
-                    function (GeneralLite $general) {
+                    function (General $general) {
                        return $general->getVar('strength');
                    },
                    'ts',
                ],
                '설 전' => [
                    '지력',
-                    function (GeneralLite $general) {
+                    function (General $general) {
                        return $general->getVar('intel');
                    },
                    'ti',
@@ -565,12 +560,12 @@ if ($str3) {
                        $winColumn = RankColumn::from("{$rankColumn}w");
                        $drawColumn = RankColumn::from("{$rankColumn}d");
                        $loseColumn = RankColumn::from("{$rankColumn}l");
-                        $tournamentRankerList = GeneralLite::createObjListFromDB(
+                        $tournamentRankerList = General::createGeneralObjListFromDB(
                            $db->queryFirstColumn('SELECT general_id FROM rank_data WHERE `type`= %s ORDER BY value DESC LIMIT 40', $gameColumn->value),
                            [$prizeColumn->value, $gameColumn->value, $winColumn->value, $drawColumn->value, $loseColumn->value, 'leadership', 'strength', 'intel', 'no', 'npc', 'name'],
-                            GeneralLiteQueryMode::Core
+                            0
                        );
-                        usort($tournamentRankerList, function (GeneralLite $lhs, GeneralLite $rhs) use ($gameColumn, $winColumn, $drawColumn, $loseColumn) {
+                        usort($tournamentRankerList, function (General $lhs, General $rhs) use ($gameColumn, $winColumn, $drawColumn, $loseColumn) {
                            $result = - ($lhs->getRankVar($gameColumn) <=> $rhs->getRankVar($gameColumn));
                            if ($result !== 0) return $result;
                            $result = - (
@@ -177,7 +177,7 @@ $templates = new \League\Plates\Engine('templates');
                                $valid = 1;
                            }

-                            if ($userGrade >= 6) {
+                            if ($userGrade >= 5) {
                                $valid = true;
                                $showDetailedInfo = true;
                            }
@@ -211,7 +211,7 @@ $templates = new \League\Plates\Engine('templates');
                                $city['trade'] = "- ";
                            }

-                            $dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'])[0];
+                            $dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'], 2)[0];
                            if ($showDetailedInfo) {
                                $generals = $db->query(
                                    'SELECT %l from general where city=%i order by turntime',
@@ -275,7 +275,7 @@ $templates = new \League\Plates\Engine('templates');
                                    $ourGeneral = false;
                                }

-                                if ($userGrade == 7) {
+                                if ($userGrade == 6) {
                                    $ourGeneral = true;
                                }

@@ -327,7 +327,8 @@ $templates = new \League\Plates\Engine('templates');

                                if ($ourGeneral && !$isNPC) {
                                    $turnText = [];
-                                    foreach ($generalTurnList[$general['no']] as $turnRawIdx => $turn) {
+                                    $generalObj = new General($general, null, null, null, null, null, false);
+                                    foreach ($generalTurnList[$generalObj->getID()] as $turnRawIdx => $turn) {
                                        $turnIdx = $turnRawIdx + 1;
                                        $turnText[] = "{$turnIdx} : $turn";
                                    }
@@ -19,15 +19,12 @@ $gameStor = KVStorage::getStorage($db, 'game_env');

 increaseRefresh("암행부", 1);

-$me = $db->queryFirstRow(
-    'SELECT no,nation,officer_level,refresh_score,turntime,belong,permission,penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);

 $nationLevel = $db->queryFirstField('SELECT level FROM nation WHERE nation=%i', $me['nation']);

-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }
@@ -48,7 +45,7 @@ $templates = new \League\Plates\Engine('templates');
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($limitState == 1) {
+<?php if ($con == 1) {
    MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>

@@ -97,7 +97,7 @@ if ($gameStor->isunited) {
        7 => ['gold', true],
        8 => ['rice', true],
        9 => ['crew', true],
-        10 => ['refresh_score_total', true],
+        10 => ['connect', true],
        11 => ['personal', true],
        12 => ['special', true],
        13 => ['special2', true],
@@ -105,9 +105,7 @@ if ($gameStor->isunited) {
        15 => ['npc', true],
    ][$type];

-    $generalList = $db->query(
-        'SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,refresh_score_total,gold,rice,crew,belong
-        FROM `general` LEFT JOIN `general_access_log` ON general.no = general_access_log.general_id where nation = %i order by %b %l', $me['nation'], $orderKey, $orderDesc ? 'desc' : '');
+    $generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect,gold,rice,crew,belong from general where nation = %i order by %b %l', $me['nation'], $orderKey, $orderDesc ? 'desc' : '');

    echo "
 <table align=center class='tb_layout bg0'>
@@ -175,8 +173,8 @@ if ($gameStor->isunited) {
        <td align=center>" . displayCharInfo($general['personal']) . "</td>
        <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>
        <td align=center>{$general['belong']}</td>
-        <td align=center>". $general['refresh_score_total'] ?? 0;
-        echo "<br>(" . getRefreshScoreText($general['refresh_score_total'] ?? 0) . ")</td>
+        <td align=center>{$general['connect']}";
+        echo "<br>(" . getConnect($general['connect']) . ")</td>
    </tr>";
    }
    echo "
@@ -2,10 +2,6 @@

 namespace sammo;

-use sammo\Enums\GeneralAccessLogColumn;
-use sammo\Enums\GeneralQueryMode;
-use sammo\Enums\TableName;
-
 include "lib.php";
 include "func.php";

@@ -24,7 +20,7 @@ $gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);

 increaseRefresh("내정보", 1);

-$me = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
+$me = General::createGeneralObjFromDB($generalID);

 $myset = $me->getVar('myset');
 if ($myset > 0) {
@@ -33,15 +29,7 @@ if ($myset > 0) {
    $submit = 'hidden';
 }

-$lastRefresh = $db->queryFirstField(
-    'SELECT %b FROM %b WHERE %b = %i',
-    GeneralAccessLogColumn::lastRefresh->value,
-    TableName::generalAccessLog->value,
-    GeneralAccessLogColumn::generalID->value,
-    $generalID
-);
-
-$targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
+$targetTime = addTurn($me->getVar('lastrefresh'), $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
 if ($gameStor->turntime <= $gameStor->opentime) {
    //서버 가오픈시 할 수 있는 행동
    if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
@@ -51,19 +39,13 @@ if ($gameStor->turntime <= $gameStor->opentime) {
        }
    }

-    if ($me->getNationID() == 0) {
+    if($me->getNationID() == 0){
        $showBuildNationCandidateBtn = true;
    }
 }

 $use_treatment = $me->getAuxVar('use_treatment') ?? 10;
 $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
-
-$changeDefence999Train = -3;
-$changeDefence999Atmos = -6;
-$changeDefence999Train = $me->onCalcDomestic('changeDefenceTrain', "train999", $changeDefence999Train);
-$changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $changeDefence999Atmos);
-
 ?>
 <!DOCTYPE html>
 <html>
@@ -99,13 +81,13 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
            <div class="col">내 정 보<br><?= backButton() ?></div>
        </div>
        <div class="row gx-0">
-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                <div class="row">
                    <div class="col"><?php generalInfo($me); ?><?php generalInfo2($me); ?></div>
                </div>
            </div>

-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                <div class="row mx-0 gx-0">
                    <div class="col" style='padding-left:2ch;'>
                        토너먼트 【
@@ -135,22 +117,11 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                            <?php foreach ([90, 80, 60, 40] as $targetDefenceTrain) : ?>
                                <option value='<?= $targetDefenceTrain ?>' <?= $me->getVar('defence_train') == $targetDefenceTrain ? "selected" : ""; ?>><?= formatDefenceTrain($targetDefenceTrain) ?>(훈사<?= $targetDefenceTrain ?>)</option>
                            <?php endforeach; ?>
-                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>
-                                <?php if ($changeDefence999Train != 0 || $changeDefence999Train != 0) :
-                                ?>[<?= $changeDefence999Train != 0 ? "훈련 {$changeDefence999Train}," : '' ?><?= $changeDefence999Atmos != 0 ? "사기 {$changeDefence999Atmos}" : ''
-                                                                                                ?>]<?php endif ?></option>
+                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>[훈련 -3, 사기 -6]</option>
                        </select>
                        】<br><br>
                        <input type=<?= $submit ?> id='set_my_setting' name=btn style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px; value=설정저장><br>
                        ∞<span style='color:orange'>설정저장은 이달중 <?= $myset ?>회 남았습니다.</span><br><br>
-
-                        <?php if ($me->getPenaltyList()->count()) : ?>
-                            징계 목록(저장 시 갱신)<br>
-                            <?php foreach ($me->getPenaltyList() as $penaltyKey => $penalty) : ?>
-                                <span style='color:red'><?= $penaltyKey->getHelptext() ?> : <?= $penalty ?></span><br>
-                            <?php endforeach; ?>
-                            <br />
-                        <?php endif; ?>
                        <?php if (!($gameStor->autorun_user['limit_minutes'] ?? false)) : ?>
                            휴 가 신 청<br>
                            <button type="button" id='vacation' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>휴가 신청</button><br><br>
@@ -168,11 +139,6 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                            <button type="button" id='buildNationCandidate' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>사전 거병</button><br><br>
                        <?php endif; ?>

-                        <?php if (GameConst::$availableInstantAction['instantRetreat'] ?? false) : ?>
-                            거리 3칸 이내 아국 도시로 즉시 이동<br>
-                            <button type="button" id='instantRetreat' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>접경 귀환</button><br><br>
-                        <?php endif; ?>
-
                        <?php if ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>
                            다른 장수 선택 (<?= substr($me->getAuxVar('next_change') ?? TimeUtil::now(), 0, 19) ?> 부터)<br>
                            <a href="select_general_from_pool.php" id='select_general_from_pool'><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>다른 장수 선택</button></a><br><br>
@@ -201,7 +167,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                        <div class="row mx-1">
                            <div class="btn-group" role="group">
                                <?php foreach ($me->getItems() as $itemKey => $item) : ?>
-                                    <button type="button" data-item-type='<?= $itemKey ?>' class="drop-item-btn btn btn-primary <?= $item->getName() == '-' ? 'disabled' : '' ?>"><?= $item->getName() ?></button>
+                                    <button type="button" data-item-type='<?=$itemKey?>' class="drop-item-btn btn btn-primary <?= $item->getName() == '-' ? 'disabled' : '' ?>"><?= $item->getName() ?></button>
                                <?php endforeach; ?>
                            </div>
                        </div>
@@ -212,7 +178,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                    </div>
                </div>
            </div>
-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                <div class="row gx-0">
                    <div class="col bg1 text-center">
                        <h4 style='color:skyblue'>개인 기록</h4>
@@ -225,7 +191,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                    <button type="button" class="load_old_log btn btn-secondary" data-log_type="generalAction">이전 로그 불러오기</button>
                </div>
            </div>
-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                <div class="row gx-0">
                    <div class="col bg1 text-center">
                        <h4 style='color:orange'>전투 기록</h4>
@@ -239,7 +205,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                </div>
            </div>

-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                <div class="row gx-0">
                    <div class="col bg1 text-center">
                        <h4 style='color:skyblue'>장수 열전</h4>
@@ -249,7 +215,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                    <?= formatHistoryToHTML(getGeneralHistoryLogAll($generalID)) ?>
                </div>
            </div>
-            <div class="col col-12 col-lg-6">
+            <div class="col col-12 col-md-6">
                <div class="row gx-0">
                    <div class="col bg1 text-center">
                        <h4 style='color:orange'>전투 결과</h4>
@@ -14,16 +14,14 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("토너먼트", 1);
 TurnExecutionHelper::executeAllCommand();

-$me = $db->queryFirstRow(
-    'SELECT no,tournament,refresh_score,turntime from `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id where owner=%i', $userID
-);
-$generalID = $me['no'];
+$me = $db->queryFirstRow('select no,tournament,con,turntime from general where owner=%i', $userID);
+$generalID = $session->generalID;
+
 $admin = $gameStor->getValues(['tournament', 'phase', 'turnterm', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
 $turnTerm = $admin['turnterm'];

-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }
@@ -102,7 +100,7 @@ $globalBetTotal = array_sum($globalBet);
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($limitState == 1) {
+<?php if ($con == 1) {
    MessageBox("접속제한이 얼마 남지 않았습니다! 제한량이 모자라다면 참여를 해보세요^^");
 } ?>

@@ -125,7 +123,63 @@ $globalBetTotal = array_sum($globalBet);
        </tr>
    </table>
    <table align=center class='tb_layout bg0'>
-        <?php if ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) : ?>
+        <?php if ($session->userGrade >= 5) : ?>
+            <form method=post action=c_tournament.php>
+                <tr>
+                    <td colspan=8><input type=textarea size=150 style=color:white;background-color:black; name=msg><input type=submit name=btn value='메시지'></td>
+                </tr>
+                <tr>
+                    <td colspan=8>
+                        <button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button>
+                        <?php if ($admin['tournament'] == 0) : ?>
+                            <select name=trig size=1 style=color:white;background-color:black;>
+                                <option style=color:white; value=0 <?= !$admin['tnmt_trig'] ? 'selected' : '' ?>>수동진행</option>
+                                <option style=color:white; value=1 <?= $admin['tnmt_trig'] ? 'selected' : '' ?>>자동진행</option>
+                            </select>
+                            <input type=submit name=btn value='자동개최설정'>
+                        <?php else : ?>
+                            <input type=submit name=btn value='중단' onclick='return confirm("진짜 중단하시겠습니까?")'>
+                        <?php endif; ?>
+
+
+                        <?php switch ($admin['tournament']) {
+                            case 1:
+                                echo "<input type=submit name=btn value='랜덤투입'>";
+                                echo "<input type=submit name=btn value='랜덤전부투입'>";
+                                break;
+                            case 2:
+                                echo "<input type=submit name=btn value='예선'><input type=submit name=btn value='예선전부'>";
+                                break;
+                            case 3:
+                                echo "<input type=submit name=btn value='추첨'><input type=submit name=btn value='추첨전부'>";
+                                break;
+                            case 4:
+                                echo "<input type=submit name=btn value='본선'><input type=submit name=btn value='본선전부'>";
+                                break;
+                            case 5:
+                                echo "<input type=submit name=btn value='배정'>";
+                                break;
+                            case 6:
+                                echo "<input type=submit name=btn value='베팅마감'>";
+                                break;
+                            case 7:
+                                echo "<input type=submit name=btn value='16강'>";
+                                break;
+                            case 8:
+                                echo "<input type=submit name=btn value='8강'>";
+                                break;
+                            case 9:
+                                echo "<input type=submit name=btn value='4강'>";
+                                break;
+                            case 10:
+                                echo "<input type=submit name=btn value='결승'>";
+                                break;
+                        } ?>
+
+                    </td>
+                </tr>
+            </form>
+        <?php elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) : ?>
            <form method=post action=c_tournament.php>
                <tr>
                    <td colspan=8><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button><button type="submit" class="btn btn-sammo-base2" onclick='return confirm("참가비 금<?= $admin['develcost'] ?>이 필요합니다. 참가하시겠습니까?")'>참가</button><input type='hidden' name='btn' value='참가'/></td>
@@ -1,6 +0,0 @@
-<?php
-namespace sammo;
-
-class ServerEnv extends ServerDefaultEnv {
-    //ServerEnv 기본값을 변경하고 싶다면 orig를 제거한 복사본을 만들고 수정
-}
@@ -5,11 +5,7 @@ namespace sammo;
 use DateTime;
 use Ds\Set;
 use sammo\Enums\AuctionType;
-use sammo\Enums\GeneralAccessLogColumn;
-use sammo\Enums\GeneralColumn;
-use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
-use sammo\Enums\PenaltyKey;
 use sammo\Enums\RankColumn;

 require_once 'process_war.php';
@@ -107,27 +103,28 @@ function GetImageURL($imgsvr, $filepath = '')
 }

 /**
- * @param null|int $refreshScore 장수의 벌점
+ * @param null|int $con 장수의 벌점
+ * @param null|int $conlimit 최대 벌점
 */
-function checkLimit($refreshScore = null)
+function checkLimit($con = null)
 {
    $session = Session::getInstance();
-    if ($session->userGrade >= 6) {
+    if ($session->userGrade >= 4) {
        return 0;
    }

    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');

-    if ($refreshScore === null) {
-        $refreshScore = $db->queryFirstField('SELECT refresh_score FROM general_access_log WHERE `general_id`=%i', Session::getGeneralID());
+    if ($con === null) {
+        $con = $db->queryFirstField('SELECT con FROM general WHERE `owner`=%i', Session::getUserID());
    }
-    $refreshLimit = $gameStor->refreshLimit;
+    $conlimit = $gameStor->conlimit;

-    if ($refreshScore > $refreshLimit) {
+    if ($con > $conlimit) {
        return 2;
        //접속제한 90%이면 경고문구
-    } elseif ($refreshScore > $refreshLimit * 0.9) {
+    } elseif ($con > $conlimit * 0.9) {
        return 1;
    } else {
        return 0;
@@ -150,7 +147,7 @@ function getRandGenName(RandUtil $rng)



-function cityInfo(GeneralLite $generalObj)
+function cityInfo(General $generalObj)
 {
    $db = DB::db();

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


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

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


    if ($me['officer_level'] == 12) {
        $secretMin = 4;
-    } else if ($permission == 'ambassador') {
+    } else if ($me['permission'] == 'ambassador') {
        $secretMin = 4;
-    } else if ($permission == 'auditor') {
+    } else if ($me['permission'] == 'auditor') {
        $secretMin = 3;
    } else if ($me['officer_level'] >= 5) {
        $secretMin = 2;
@@ -645,7 +642,7 @@ function generalInfo(General $generalObj)
        $age = "<font color=red>{$age} 세</font>";
    }

-    $refreshScoreTotal = round($generalObj->getAccessLogVar(GeneralAccessLogColumn::refreshScoreTotal) ?? 0, -1);
+    $connectCnt = round($generalObj->getVar('connect'), -1);
    $specialDomestic = $generalObj->getVar('special') === GameConst::$defaultSpecialDomestic
        ? "{$generalObj->getVar('specage')}세"
        : "<font color=limegreen>" . displayiActionObjInfo($generalObj->getSpecialDomestic()) . "</font>";
@@ -754,7 +751,7 @@ function generalInfo(General $generalObj)
        <td style='text-align:center;' class='bg1'><b>부대</b></td>
        <td style='text-align:center;' colspan=3>{$troopInfo}</td>
        <td style='text-align:center;' class='bg1'><b>벌점</b></td>
-        <td style='text-align:center;' colspan=5>" . getRefreshScoreText($refreshScoreTotal) . " {$refreshScoreTotal}({$generalObj->getAccessLogVar(GeneralAccessLogColumn::refreshScore)})</td>
+        <td style='text-align:center;' colspan=5>" . getConnect($connectCnt) . " {$connectCnt}({$generalObj->getVar('con')})</td>
    </tr>
 </table>";
 }
@@ -1001,69 +998,52 @@ function increaseRefresh($type = "", $cnt = 1)
    $generalID = $session->generalID;
    $userGrade = $session->userGrade;

-    $dateObj = new \DateTimeImmutable();
-    $date = TimeUtil::format($dateObj, false);
+    $date = TimeUtil::now();

    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $isunited = $gameStor->isunited;
    $opentime = $gameStor->opentime;

-    if ($userGrade >= 6) {
+    if($userGrade == 6){
        return;
    }
-    if ($isunited == 2) {
+    if($isunited == 2){
        return;
    }
-    if (!$generalID) {
+    if(!$generalID){
        return;
    }
-    if ($opentime > $date) {
+    if($opentime > $date){
        return;
    }

    $gameStor->refresh = $gameStor->refresh + $cnt; //TODO: +로 증가하는 값은 별도로 분리

-    $db->insertUpdate('general_access_log', [
-        GeneralAccessLogColumn::generalID->value => $generalID,
-        GeneralAccessLogColumn::userID->value => $userID,
-        GeneralAccessLogColumn::lastRefresh->value => $date,
-        GeneralAccessLogColumn::refreshTotal->value => $cnt,
-        GeneralAccessLogColumn::refresh->value => $cnt,
-        GeneralAccessLogColumn::refreshScore->value => $cnt,
-        GeneralAccessLogColumn::refreshScoreTotal->value => $cnt,
-    ], [
-        GeneralAccessLogColumn::lastRefresh->value => $date,
-        GeneralAccessLogColumn::refreshTotal->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refreshTotal->value, $cnt),
-        GeneralAccessLogColumn::refresh->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refresh->value, $cnt),
-        GeneralAccessLogColumn::refreshScore->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refreshScore->value, $cnt),
-        GeneralAccessLogColumn::refreshScoreTotal->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refreshScoreTotal->value, $cnt),
-    ]);
+    $db->update('general', [
+        'lastrefresh' => $date,
+        'con' => $db->sqleval('con + %i', $cnt),
+        'connect' => $db->sqleval('connect + %i', $cnt),
+        'refcnt' => $db->sqleval('refcnt + %i', $cnt),
+        'refresh' => $db->sqleval('refresh + %i', $cnt)
+    ], 'owner=%i', $userID);

-    $serverPath = __DIR__;
-
-    $serverID = UniqueConst::$serverID;
-    $logPath = "{$serverPath}/logs/{$serverID}/api_log.db";
-
-    $logDB = FileDB::db($logPath, $serverPath . '/../f_install/sql/api_log.sql');
-
-    $ip = $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'] ?? 'local';
-    $date = date('Y-m-d H:i:s');
-
-    $logDB->insert('api_log', [
-        'user_id' => $session->userID,
-        'ip' => $ip,
-        'date' => $date,
-        'path' => "refresh",
-        'arg' => Json::encode([
-            'type' => $type,
-        ]),
-        'aux' => Json::encode([
-            'generalID' => $generalID,
-            'generalName' => $session->generalName,
-            'userName' => $session->userName,
-        ]),
-    ]);
+    $date = date('Y_m_d H:i:s');
+    $date2 = substr($date, 0, 10);
+    $online = getOnlineNum();
+    file_put_contents(
+        __DIR__ . "/logs/" . UniqueConst::$serverID . "/_{$date2}_refresh.txt",
+        sprintf(
+            "%s, %s, %s, %s, %s, %d\n",
+            $date,
+            $session->userName,
+            $session->generalName,
+            $session->ip,
+            $type,
+            $online
+        ),
+        FILE_APPEND
+    );
 }

 function updateTraffic()
@@ -1071,9 +1051,12 @@ function updateTraffic()
    $online = getOnlineNum();
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxonline', 'maxrefresh', 'recentTraffic']);
+    $admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxonline', 'maxrefresh']);
    /** @var array{year:int,month:int,refresh:int,maxonline:int,maxrefresh:int} $admin */

+    //최다갱신자
+    $user = $db->queryFirstRow('select name,refresh from general order by refresh desc limit 1');
+
    if ($admin['maxrefresh'] < $admin['refresh']) {
        $admin['maxrefresh'] = $admin['refresh'];
    }
@@ -1084,20 +1067,22 @@ function updateTraffic()
    $gameStor->maxrefresh = $admin['maxrefresh'];
    $gameStor->maxonline = $admin['maxonline'];

-    $recentTraffic = $admin['recentTraffic'] ?? [];
-    if(count($recentTraffic) >= 5){
-        array_shift($recentTraffic);
-    }
-    $recentTraffic[] = [
-        'year'=>$admin['year'],
-        'month' => $admin['month'],
-        'refresh' => $admin['refresh'],
-        'online' => $online,
-        'date' => TimeUtil::now(),
-    ];
-    $gameStor->recentTraffic = $recentTraffic;
+    $db->update('general', ['refresh' => 0], true);

-    $db->update('general_access_log', ['refresh' => 0], true);
+    $date = TimeUtil::now();
+    //일시|년|월|총갱신|접속자|최다갱신자
+    file_put_contents(
+        __DIR__ . "/logs/" . UniqueConst::$serverID . "/_traffic.txt",
+        Json::encode([
+            $date,
+            $admin['year'],
+            $admin['month'],
+            $admin['refresh'],
+            $online,
+            $user['name'] . "(" . $user['refresh'] . ")"
+        ]) . "\n",
+        FILE_APPEND
+    );
 }

 function CheckOverhead()
@@ -1105,13 +1090,13 @@ function CheckOverhead()
    //서버정보
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    [$turnterm, $refreshLimit] = $gameStor->getValuesAsArray(['turnterm', 'refreshLimit']);
+    list($turnterm, $conlimit) = $gameStor->getValuesAsArray(['turnterm', 'conlimit']);

-    $nextRefreshLimit = Util::round(pow($turnterm, 0.6) * 3) * GameConst::$refreshLimitCoef;
+    $con = Util::round(pow($turnterm, 0.6) * 3) * 10;


-    if ($nextRefreshLimit != $refreshLimit) {
-        $gameStor->refreshLimit = $nextRefreshLimit;
+    if ($con != $conlimit) {
+        $gameStor->conlimit = $con;
    }
 }

@@ -1215,16 +1200,7 @@ function updateOnline()

    //동접수
    $startTurn = cutTurn($gameStor->turntime, $gameStor->turnterm, false);
-    $onlineUser = $db->query(
-        'SELECT %b, %b, %b FROM `general_access_log` as `log` INNER JOIN `general` ON `log`.%b = `general`.%b WHERE %b >= %s',
-        GeneralColumn::no->value,
-        GeneralColumn::name->value,
-        GeneralColumn::nation->value,
-        GeneralAccessLogColumn::generalID->value,
-        GeneralColumn::no->value,
-        GeneralAccessLogColumn::lastRefresh->value,
-        $startTurn
-    );
+    $onlineUser = $db->query('SELECT no,name,nation FROM general WHERE lastrefresh >= %s AND npc < 2', $startTurn);
    $onlineNum = count($onlineUser);
    $onlineNationUsers = Util::arrayGroupBy($onlineUser, 'nation');

@@ -1338,7 +1314,7 @@ function CheckHall($no)
        ["betrate", 'calc'],
    ];

-    $generalObj = General::createObjFromDB($no);
+    $generalObj = General::createGeneralObjFromDB($no, null, 2);

    $ttw = $generalObj->getRankVar(RankColumn::ttw);
    $ttd = $generalObj->getRankVar(RankColumn::ttd);
@@ -1669,6 +1645,8 @@ function tryUniqueItemLottery(RandUtil $rng, General $general, string $acquireTy
        $prob = 1 / ($genCount * $itemTypeCnt * 0.7 / 3); // 투표율 70%, 설문조사 한번에 2~3개 등장
    } else if ($acquireType == '랜덤 임관') {
        $prob = 1 / ($genCount * $itemTypeCnt / 10 / 2); // 랜임시 2개(10%) 등장(200명중 20명 랜임시도?)
+    } else if ($acquireType == '건국') {
+        $prob = 1 / ($genCount * $itemTypeCnt / 10 / 4); // 건국시 4개(20%) 등장(200명시 20국 정도 됨)
    }

    $prob *= GameConst::$uniqueTrialCoef;
@@ -1682,9 +1660,6 @@ function tryUniqueItemLottery(RandUtil $rng, General $general, string $acquireTy
        //포인트로 랜덤 유니크 획득
        $prob = 1;
    }
-    else if ($acquireType == '건국') {
-        $prob = 1; // 건국시 100%
-    }

    foreach (Util::range($maxCnt) as $_idx) {
        if ($rng->nextBool($prob)) {
@@ -1729,13 +1704,14 @@ function deleteNation(General $lord, bool $applyDB): array
    $logger->pushGlobalHistoryLog("<R><b>【멸망】</b></><D><b>{$nationName}</b></>{$josaUn} <R>멸망</>했습니다.");


-    $nationGeneralList = General::createObjListFromDB(
+    $nationGeneralList = General::createGeneralObjListFromDB(
        $db->queryFirstColumn(
            'SELECT `no` FROM general WHERE nation=%i AND no != %i',
            $nationID,
            $lordID
        ),
        ['npc', 'owner', 'gold', 'rice', 'experience', 'explevel', 'dedication', 'dedlevel', 'belong', 'aux'],
+        1
    );
    $nationGeneralList[$lordID] = $lord;

@@ -1752,7 +1728,7 @@ function deleteNation(General $lord, bool $applyDB): array

    // 전 장수 재야로
    foreach ($nationGeneralList as $general) {
-        if ($general->getNPCType() < 2) {
+        if($general->getNPCType() < 2){
            $general->setAuxVar(
                InheritanceKey::max_belong->value,
                max(
@@ -3,7 +3,6 @@ namespace sammo;

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

 function getGeneralTurnBrief(General $generalObj, array $turnList) {
    $result = [];
@@ -214,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);
 }
@@ -234,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);
 }
@@ -351,7 +350,7 @@ function setGeneralCommand(int $generalID, array $rawTurnList, string $command,
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $env = $gameStor->getAll();
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);

    try{
        $commandObj = buildGeneralCommandClass($command, $general, $env, $arg);
@@ -426,7 +425,7 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $env = $gameStor->getAll();
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);

    if($general->getVar('officer_level') < 5){
        return [
@@ -435,13 +434,6 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
        ];
    }

-    if($general->hasPenalty(PenaltyKey::NoChiefTurnInput)){
-        return [
-            'result'=>false,
-            'reason'=>'수뇌 턴 입력 불가능'
-        ];
-    }
-
    try{
        $commandObj = buildNationCommandClass($command, $general, $env, $general->getLastTurn(), $arg);
    }
@@ -481,13 +473,6 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
    }

    _setNationCommand($commandObj, $turnList);
-
-    if($general->getNPCType() < 2){
-        //유저장인 경우에는 턴 리필
-        $general->updateVarWithLimit('killturn', $env['killturn'], $general->getVar('killturn'));
-        $general->applyDB($db);
-    }
-    
    return [
        'result'=>true,
        'brief'=>$commandObj->getBrief(),
@@ -133,19 +133,19 @@ function getNationType(?string $type) {
 }


-function getRefreshScoreText($score) {
-    if($score < 50)        $scoreName = '안함';
-    elseif($score <   100) $scoreName = '무관심';
-    elseif($score <   200) $scoreName = '가끔';
-    elseif($score <   400) $scoreName = '보통';
-    elseif($score <   800) $scoreName = '자주';
-    elseif($score <  1600) $scoreName = '열심';
-    elseif($score <  3200) $scoreName = '중독';
-    elseif($score <  6400) $scoreName = '폐인';
-    elseif($score < 12800) $scoreName = '경고';
-    else $scoreName = '헐...';
+function getConnect($con) {
+    if($con < 50)        $conname = '안함';
+    elseif($con <   100) $conname = '무관심';
+    elseif($con <   200) $conname = '가끔';
+    elseif($con <   400) $conname = '보통';
+    elseif($con <   800) $conname = '자주';
+    elseif($con <  1600) $conname = '열심';
+    elseif($con <  3200) $conname = '중독';
+    elseif($con <  6400) $conname = '폐인';
+    elseif($con < 12800) $conname = '경고';
+    else $conname = '헐...';

-    return $scoreName;
+    return $conname;
 }

 function getNationType2(?string $type) {
@@ -256,41 +256,6 @@ function buildItemClass(?string $type):BaseItem{
    return $obj;
 }

-function getScenarioEffectClass(?string $type){
-    if($type === null || $type === ''){
-        $type = 'None';
-    }
-
-    static $basePath = __NAMESPACE__.'\\ActionScenarioEffect\\';
-    $classPath = ($basePath.$type);
-
-    if(class_exists($classPath)){
-        return $classPath;
-    }
-
-    $classPath = ($basePath.'che_'.$type);
-    if(class_exists($classPath)){
-        return $classPath;
-    }
-
-    throw new \InvalidArgumentException("{$type}은 시나리오 효과 클래스가 아님");
-}
-
-function buildScenarioEffectClass(?string $type):iAction{
-    static $cache = [];
-    if($type === null){
-        $type = 'None';
-    }
-    if(key_exists($type, $cache)){
-        return $cache[$type];
-    }
-    $class = getScenarioEffectClass($type);
-
-    $obj = new $class();
-    $cache[$type]= $obj;
-    return $obj;
-}
-
 function getGeneralSpecialDomesticClass(?string $type){
    if($type === null || $type === ''){
        $type = GameConst::$defaultSpecialDomestic;
@@ -457,29 +422,6 @@ function buildWarUnitTriggerClass(?string $type, WarUnit $unit, ?array $args = n
    return $class->newInstanceArgs(array_merge([$unit], $args));
 }

-function getStaticEventClass(string $type){
-    static $basePath = __NAMESPACE__.'\\StaticEvent\\';
-    $classPath = ($basePath.$type);
-
-    if(class_exists($classPath)){
-        return $classPath;
-    }
-
-    throw new \InvalidArgumentException("{$type}은 StaticEvent가 아님");
-}
-
-function buildStaticEventClass(?string $type):BaseStaticEvent{
-    static $cache = [];
-    if(key_exists($type, $cache)){
-        return $cache[$type];
-    }
-
-    $class = getStaticEventClass($type);
-    $obj = new $class();
-    $cache[$type] = $obj;
-    return $obj;
-}
-
 function getGeneralPoolClass(string $type){
    static $basePath = __NAMESPACE__.'\\GeneralPool\\';
    $classPath = ($basePath.$type);
@@ -686,7 +628,7 @@ function TechLimit($startYear, $year, $tech) : bool {
    $relYear = $year - $startYear;

    $relMaxTech = Util::valueFit(
-        floor($relYear / GameConst::$techLevelIncYear) + GameConst::$initialAllowedTechLevel,
+        floor($relYear / 5) + 1,
        1,
        GameConst::$maxTechLevel
    );
@@ -202,10 +202,8 @@ function preUpdateMonthly()
    $admin = $gameStor->getValues(['startyear', 'year', 'month']);

    //접률감소, 건국제한-1
-    $db->update('general_access_log', [
-        'refresh_score_total' => $db->sqleval('floor(refresh_score_total*0.99)'),
-    ], true);
    $db->update('general', [
+        'connect' => $db->sqleval('floor(connect*0.99)'),
        'makelimit' => $db->sqleval('greatest(0, makelimit - 1)'),
    ], true);
    //전략제한-1, 외교제한-1, 세율동기화
@@ -303,6 +301,7 @@ function postUpdateMonthly(RandUtil $rng)
                WHERE g.nation = A.nation)
        +(select round(sum(dex1+dex2+dex3+dex4+dex5)/1000) from general where nation=A.nation)
        +(select round(sum(experience+dedication)/100) from general where nation=A.nation)
+        +(select round(avg(connect)) from general where nation=A.nation)
    )/10)
    as power,
    (select sum(crew) from general where nation=A.nation) as totalCrew
@@ -372,7 +371,7 @@ function postUpdateMonthly(RandUtil $rng)
            continue;
        }

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

-        $globalLogger->pushGlobalHistoryLog("<R><b>【종전】</b></><D><b>$name1</b></>{$josaWa} <D><b>$name2</b></>{$josaYi} <S>종전</>합니다.");
+        $globalLogger->pushGlobalHistoryLog("<R><b>【휴전】</b></><D><b>$name1</b></>{$josaWa} <D><b>$name2</b></>{$josaYi} <S>휴전</>합니다.");
        $db->update('diplomacy', [
            'state' => 2,
            'term' => 0,
@@ -451,7 +450,7 @@ function checkWander(RandUtil $rng)

    $wanderers = $db->queryFirstColumn('SELECT general.`no` FROM general LEFT JOIN nation ON general.nation = nation.nation WHERE nation.`level` = 0 AND general.`officer_level` = 12');

-    foreach (General::createObjListFromDB($wanderers) as $wanderer) {
+    foreach (General::createGeneralObjListFromDB($wanderers) as $wanderer) {
        $wanderCmd = buildGeneralCommandClass('che_해산', $wanderer, $admin);
        if ($wanderCmd->hasFullConditionMet()) {
            $logger = $wanderer->getLogger();
@@ -559,7 +558,7 @@ function checkStatistic()

    $nationHist = '';
    foreach (GameConst::$availableNationType as $nationType) {
-        if (!($nationHists[$nationType] ?? null)) {
+        if (!Util::array_get($nationHists[$nationType])) {
            $nationHists[$nationType] = '-';
        }
        $nationHist .= getNationType($nationType) . "({$nationHists[$nationType]}), ";
@@ -698,7 +697,7 @@ function checkEmperior()
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');

-    $admin = $gameStor->getValues(['year', 'month', 'isunited', 'refreshLimit']);
+    $admin = $gameStor->getValues(['year', 'month', 'isunited', 'conlimit']);
    if ($admin['isunited'] != 0) {
        return;
    }
@@ -743,7 +742,7 @@ function checkEmperior()
    }

    $inheritPointManager = InheritancePointManager::getInstance();
-    $allUserGenerals = General::createObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2'));
+    $allUserGenerals = General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2'));
    foreach ($allUserGenerals as $genObj) {
        if ($genObj->getNationID() == $nationID) {
            if ($genObj->getVar('officer_level') > 4) {
@@ -760,7 +759,7 @@ function checkEmperior()
    }

    $gameStor->isunited = 2;
-    $gameStor->refreshLimit = $gameStor->refreshLimit * 100;
+    $gameStor->conlimit = $gameStor->conlimit * 100;

    foreach ($db->queryFirstColumn('SELECT no FROM general WHERE npc<2 AND age>=%i', GameConst::$minPushHallAge) as $hallGeneralNo) {
        CheckHall($hallGeneralNo);
@@ -772,7 +771,7 @@ function checkEmperior()

    $chiefs = Util::convertArrayToDict(
        $db->query(
-            'SELECT no,npc,name,picture,belong,officer_level FROM general WHERE nation=%i AND officer_level >= 5',
+            'SELECT no,name,picture,belong,officer_level FROM general WHERE nation=%i AND officer_level >= 5',
            $nationID
        ),
        'officer_level'
@@ -899,7 +898,7 @@ function checkEmperior()
        'tiger' => $tigerstr,
        'eagle' => $eaglestr,
        'gen' => $gen,
-        'history' => Json::encode($nationHistory),
+        'history' => JSON::encode($nationHistory),
        'aux' => $statGeneral['aux']
    ]);

@@ -909,34 +908,6 @@ function checkEmperior()

    //연감 월결산
    LogHistory();
-
-    $availableInvaderGame = false;
-    foreach(CityConst::all() as $city){
-        if($city->level == 4){
-            $availableInvaderGame = true;
-            break;
-        }
-    }
-    if($availableInvaderGame){
-        $invaderMsgCnt = 2;
-        foreach(range(12, 5, -1) as $chiefLevel){
-            if(!key_exists($chiefLevel, $chiefs)){
-                continue;
-            }
-            $targetChief = $chiefs[$chiefLevel];
-            if($targetChief['npc'] >= 2){
-                continue;
-            }
-            $invaderMsgs = RaiseInvaderMessage::buildRaiseInvaderMessage($targetChief['no']);
-            foreach($invaderMsgs as $invaderMsg){
-                $invaderMsg->send();
-            }
-            $invaderMsgCnt--;
-            if($invaderMsgCnt <= 0){
-                break;
-            }
-        }
-    }
 }

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

-function genGenericUniqueRNG(int $year, int $month, int $generalID, ?string $reason = null): RandUtil
+function genGenericUniqueRNG(int $year, int $month, int $generalID): 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',
@@ -973,7 +933,7 @@ function genGenericUniqueRNG(int $year, int $month, int $generalID, ?string $rea
    )));
 }

-function genGenericUniqueRNGFromGeneral(General $general, string $reason): RandUtil
+function genGenericUniqueRNGFromGeneral(General $general): RandUtil
 {
    $logger = $general->getLogger();
    if (!$logger) {
@@ -982,5 +942,5 @@ function genGenericUniqueRNGFromGeneral(General $general, string $reason): RandU
    $year = $logger->getYear();
    $month = $logger->getMonth();
    $generalID = $general->getID();
-    return genGenericUniqueRNG($year, $month, $generalID, $reason);
+    return genGenericUniqueRNG($year, $month, $generalID);
 }
@@ -138,7 +138,7 @@ function JSCitiesBasedOnDistance(int $cityNo, int $maxDistance = 1): array{
    $distanceList = searchDistance($cityNo, $maxDistance, true);
    $result = [];
    for ($dist = 1; $dist <= $maxDistance; $dist++) {
-        $result[$dist] = $distanceList[$dist] ?? [];
+        $result[$dist] = Util::array_get($distanceList[$dist], []);
    }
    return $result;
 }
@@ -152,7 +152,7 @@ function printCitiesBasedOnDistance(int $cityNo, int $maxDistance = 1): string
    for ($dist = 1; $dist <= $maxDistance; $dist++) {
        $cityList = array_map(function ($cityID) {
            return CityConst::byID($cityID)->name;
-        }, $distanceList[$dist] ?? []);
+        }, Util::array_get($distanceList[$dist], []));

        $cityStr = join(', ', $cityList);

@@ -148,6 +148,63 @@ function allButton(bool $seizeNPCMode, array $opts = [])
    ], $opts));
 }

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

    if (!$isGood) {
-        [$queryColumns,,] = General::mergeQueryColumn();
-        $generalListByCity = Util::arrayGroupBy(
-            $db->query(
-                'SELECT %l FROM general WHERE city IN %li',
-                Util::formatListOfBackticks($queryColumns),
-                Util::squeezeFromArray($targetCityList, 'city')
-            ),
-            'city');
+        $generalListByCity = Util::arrayGroupBy($db->query('SELECT no, name, nation, city, officer_level, injury, leadership, strength, intel, horse, weapon, book, item, crew, crewtype, atmos, train, special, special2 FROM general WHERE city IN %li', Util::squeezeFromArray($targetCityList, 'city')), 'city');
        //NOTE: 쿼리 1번이지만 복잡하기 vs 쿼리 여러번이지만 조금 더 깔끔하기
        foreach ($targetCityList as $city) {
            $affectRatio = Util::valueFit($city['secu'] / $city['secu_max'] / 0.8, 0, 1);
@@ -390,7 +383,7 @@ function disaster(RandUtil $rng) {

            $generalList = array_map(
                function($rawGeneral) use ($city, $year, $month){
-                    return new General($rawGeneral, null, null, $city, null, $year, $month, false);
+                    return new General($rawGeneral, null, $city, null, $year, $month, false);
                },
                $generalListByCity[$city['city']]??[]
            );
@@ -882,7 +882,7 @@ function setGift($tnmt_type, $tnmt, $phase)
        //포상 장수 이름, 금액
        $resultHelper[$generalID]['reward'] += $cost;
        $resultHelper[$generalID]['msg'] = "<span class='ev_highlight'>4강 진출</span>";
-        General::createObjFromDB($generalID)->increaseInheritancePoint(InheritanceKey::tournament, 10);
+        General::createGeneralObjFromDB($generalID)->increaseInheritancePoint(InheritanceKey::tournament, 10);
    }
    //결승자 명성 돈
    $cost = $admin['develcost'] * 6;
@@ -946,7 +946,7 @@ function setGift($tnmt_type, $tnmt, $phase)
    $winnerLogger->pushGlobalHistoryLog("<B><b>【대회】</b></><C>{$tp}</> 대회에서 <Y>{$winner['name']}</>{$josaYiWinner} <C>우승</>, <Y>{$runnerUp['name']}</>{$josaYiRunnerUp} <C>준우승</>을 차지하여 천하에 이름을 떨칩니다!", ActionLogger::EVENT_YEAR_MONTH);
    $winnerLogger->pushGlobalHistoryLog("<B><b>【대회】</b></><C>{$tp}</> 대회의 <S>우승자</>에게는 <C>{$winnerRewardText}</>, <S>준우승자</>에겐 <C>{$runnerUpRewardText}</>의 <S>상금</>과 약간의 <S>명성</>이 주어집니다!", ActionLogger::EVENT_YEAR_MONTH);

-    $generalObjList = General::createObjListFromDB(array_keys($resultHelper));
+    $generalObjList = General::createGeneralObjListFromDB(array_keys($resultHelper));

    foreach ($resultHelper as $generalID => $general) {
        $rewardText = number_format($general['reward']);
@@ -1153,25 +1153,21 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type)
        ];

        //막판 분노
-        $factor1 = 1.0;
-        $factor2 = 1.0;
        $ratio = rand() % 300;
        if ($e1 / 5 > $energy1 && $damage1 > $damage2 && $gen1[$tp] >= $ratio) {
-            $factor2 = Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $damage2 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
            $critical1 = 1;
            $str = Util::choiceRandom($crticialSkillMap[$tnmt_type]);
            $log[] = "<S>●</> <Y>{$gen1['name']}</>의 분노의 <M>{$str}</> 공격!";
        }
        $ratio = rand() % 300;
        if ($e2 / 5 > $energy2 && $damage2 > $damage1 && $gen2[$tp] >= $ratio) {
-            $factor1 = Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $damage1 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
            $critical2 = 1;
+
            $str = Util::choiceRandom($crticialSkillMap[$tnmt_type]);
            $log[] = "<S>●</> <Y>{$gen2['name']}</>의 분노의 <M>{$str}</> 공격!";
        }
-        $damage1 *= $factor1;
-        $damage2 *= $factor2;
-        
        //1합 승부
        if ($phase == 1) {

@@ -39,8 +39,8 @@ if ($session->userGrade < 5 && !$allowReset) {

 <body>
    <div class="container">
-        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 리셋</h1>
-        <div class="row justify-content-lg-center">
+        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 리셋</h1>
+        <div class="row justify-content-md-center">

            <div class="col col-lg-8">
                <div class="card" id="game_form_card">
@@ -7,10 +7,10 @@ include "func.php";

 $session = Session::requireLogin();

-if ($session->userGrade < 6) {
+if ($session->userGrade < 5) {
    die('관리자 아님');
 }
-if ($session->userGrade == 6) {
+if ($session->userGrade == 5) {
    die('DB 리셋 권한을 가지고 있지 않습니다.');
 }

@@ -32,8 +32,8 @@ if ($session->userGrade == 6) {

 <body>
    <div class="container" style="min-width:720px;">
-        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 리셋</h1>
-        <div class="row justify-content-lg-center">
+        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 리셋</h1>
+        <div class="row justify-content-md-center">

            <div class="col col-lg-8">
                <div class="card" id="db_form_card">
@@ -17,13 +17,10 @@ $text = Util::getPost('text');

 increaseRefresh("회의실", 1);

-$me = $db->queryFirstRow(
-    'SELECT no, nation, name, officer_level, permission, refresh_score, turntime, belong, penalty, `picture`,`imgsvr` FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no, nation, name, officer_level, permission, con, turntime, belong, penalty, `picture`,`imgsvr` FROM general WHERE owner=%i', $userID);

-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -53,7 +50,7 @@ if($permission < 0){
        'result'=>false,
        'reason'=>'국가에 소속되어있지 않습니다.'
    ]);
-
+    
 }
 else if ($isSecretBoard && $permission < 2) {
    Json::die([
@@ -16,13 +16,10 @@ $text = Util::getPost('text');

 increaseRefresh("회의실", 1);

-$me = $db->queryFirstRow(
-    'SELECT no, nation, name, officer_level, permission, refresh_score, turntime, belong, penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no, nation, name, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);

-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -61,7 +58,7 @@ if($permission < 0){
        'result'=>false,
        'reason'=>'국가에 소속되어있지 않습니다.'
    ]);
-
+    
 }
 else if ($isSecretBoard && $permission < 2) {
    Json::die([
@@ -16,14 +16,11 @@ $isSecretBoard = Util::getPost('isSecret', 'bool', false);

 increaseRefresh("회의실", 1);

-$me = $db->queryFirstRow(
-    'SELECT no, nation, officer_level, permission, refresh_score, turntime, belong, penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);


-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -36,7 +33,7 @@ if($permission < 0){
        'result'=>false,
        'reason'=>'국가에 소속되어있지 않습니다.'
    ]);
-
+    
 }
 else if ($isSecretBoard && $permission < 2) {
    Json::die([
@@ -75,3 +72,4 @@ Json::die([
    'articles'=>$articles,
    'reason'=>'success'
 ]);
+
@@ -17,13 +17,10 @@ $letterNo = Util::getPost('letterNo', 'int');

 increaseRefresh("외교부", 1);

-$me = $db->queryFirstRow(
-    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);

-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -16,14 +16,11 @@ $isSecretBoard = Util::getPost('isSecret', 'bool', false);

 increaseRefresh("외교부", 1);

-$me = $db->queryFirstRow(
-    'SELECT no, nation, officer_level, permission, refresh_score, turntime, belong, penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);


-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -36,7 +33,7 @@ if($permission < 0){
        'result'=>false,
        'reason'=>'국가에 소속되어있지 않습니다.'
    ]);
-
+    
 }

 $letters = [];
@@ -86,3 +83,4 @@ Json::die([
    'myNationID'=>$me['nation'],
    'reason'=>'success'
 ]);
+
@@ -22,13 +22,10 @@ $reason = Util::getPost('reason', 'string', '');

 increaseRefresh("외교부", 1);

-$me = $db->queryFirstRow(
-    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);

-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -17,13 +17,10 @@ $letterNo = Util::getPost('letterNo', 'int');

 increaseRefresh("외교부", 1);

-$me = $db->queryFirstRow(
-    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);

-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -24,13 +24,10 @@ if($prevNo < 1){
    $prevNo = null;
 }

-$me = $db->queryFirstRow(
-    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);

-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -33,15 +33,12 @@ if($generalID <= 0 || $reqTo <= 0){

 $db = DB::db();

-$me = $db->queryFirstRow(
-    'SELECT no,nation,officer_level,refresh_score,turntime,belong,permission,penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);
 $nationID = $me['nation'];


-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
+$con = checkLimit($me['con']);
+if ($con >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -64,7 +61,7 @@ if($generalID !== $targetID){
            'reason'=>'권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.'
        ]);
    }
-
+    
    if($testGeneralNationID !== $nationID){
        Json::die([
            'result'=>false,
@@ -18,7 +18,7 @@ else{
    $availableNextCall = $session->availableNextCallGetCityList??'2000-01-01 00:00:00';
    $now = new \DateTimeImmutable();

-    if($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 6){
+    if($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 5){
        Json::die([
            'result'=>false,
            'reason'=>"도시 목록은 10초에 한번 갱신 가능합니다.\n다음 시간 : ".$availableNextCall
@@ -199,25 +199,17 @@ if($reserve_open){
    ]);
 }

-try{
-    Json::die(ResetHelper::buildScenario(
-        $turnterm,
-        $sync,
-        $scenario,
-        $fiction,
-        $extend,
-        $block_general_create,
-        $npcmode,
-        $show_img_level,
-        !!$tournament_trig,
-        $join_mode,
-        TimeUtil::now(),
-        $autorun_user
-    ));
-}
-catch(\Exception $e){
-    Json::die([
-        'result'=>false,
-        'reason'=>$e->getMessage()
-    ]);
-}
+Json::die(ResetHelper::buildScenario(
+    $turnterm,
+    $sync,
+    $scenario,
+    $fiction,
+    $extend,
+    $block_general_create,
+    $npcmode,
+    $show_img_level,
+    !!$tournament_trig,
+    $join_mode,
+    TimeUtil::now(),
+    $autorun_user
+));
@@ -53,17 +53,22 @@ if($fullReset){
    }
 }

-$db = new \MeekroDB($host,$username,$password,$dbName,$port,'utf8mb4');
-$db->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
-
-$db->addHook('run_failed', function(){
+function dbConnFail($params){
    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__);

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

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

-//최소한의 테이블 처리를 위해 수동으로 초기화하도록 하자
-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;
-        }
-    }
-}
+ResetHelper::clearDB();

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

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

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

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

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

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

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

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

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

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

-if ($destGeneralID == 0) {
+if($destGeneralID==0){
    $general = new DummyGeneral(true);
    $general->setVar('nation', $nationID);
-} else {
-    $general = General::createObjFromDB($destGeneralID);
+}
+else{
+    $general = General::createGeneralObjFromDB($destGeneralID, [
+        'name', 'leadership', 'strength', 'intel', 'gold','rice',
+        'troop','officer_level','npc','picture','imgsvr',
+        'permission','penalty','belong', 'crewtype',
+        'experience', 'dedication', 'betray', 'dedlevel', 'explevel', 'makelimit', 'aux',
+    ], 1);

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

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

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

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

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

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

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

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

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

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

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

    return null;
 }

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

    $db = DB::db();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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



-if ($action == "임명") {
-    if (2 <= $officerLevel && $officerLevel <= 4) {
-        if (!$destCityID) {
+if($action == "임명") {
+    if(2 <= $officerLevel && $officerLevel <= 4){
+        if(!$destCityID){
            Json::die([
-                'result' => false,
-                'reason' => '도시가 지정되지 않았습니다.'
+                'result'=>false,
+                'reason'=>'도시가 지정되지 않았습니다.'
            ]);
        }
        $result = do도시임명($general, $destCityID, $officerLevel);
-        if ($result !== null) {
+        if($result !== null){
            Json::die([
-                'result' => false,
-                'reason' => $result
+                'result'=>false,
+                'reason'=>$result
            ]);
        }
-        //수뇌의 삭턴 리필
-        $db->update('general', [
-            'killturn' => $db->sqleval('GREATEST(%b, %i)', 'killturn', $gameStor->getValue('killturn')),
-        ], 'no=%i', $me['no']);
        Json::die([
-            'result' => true,
-            'reason' => 'success'
+            'result'=>true,
+            'reason'=>'success'
        ]);
    }

-    if (5 <= $officerLevel && $officerLevel < 12) {
+    if(5 <= $officerLevel && $officerLevel < 12){
        $result = do수뇌임명($general, $officerLevel);
-        if ($result !== null) {
+        if($result !== null){
            Json::die([
-                'result' => false,
-                'reason' => $result
+                'result'=>false,
+                'reason'=>$result
            ]);
        }
-        //수뇌의 삭턴 리필
-        $db->update('general', [
-            'killturn' => $db->sqleval('GREATEST(%b, %i)', 'killturn', $gameStor->getValue('killturn')),
-        ], 'no=%i', $me['no']);
        Json::die([
-            'result' => true,
-            'reason' => 'success'
+            'result'=>true,
+            'reason'=>'success'
        ]);
    }

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

-if ($action == "추방") {
+if($action == "추방") {
    $result = do추방($general, $myOfficerLevel);
-    if ($result !== null) {
+    if($result !== null){
        Json::die([
-            'result' => false,
-            'reason' => $result
+            'result'=>false,
+            'reason'=>$result
        ]);
    }
-    //수뇌의 삭턴 리필
-    $db->update('general', [
-        'killturn' => $db->sqleval('GREATEST(%b, %i)', 'killturn', $gameStor->getValue('killturn')),
-    ], 'no=%i', $me['no']);
    Json::die([
-        'result' => true,
-        'reason' => 'success'
+        'result'=>true,
+        'reason'=>'success'
    ]);
 }

 Json::die([
-    'result' => false,
-    'reason' => '올바르지 않은 명령입니다.'
-]);
+    'result'=>false,
+    'reason'=>'올바르지 않은 명령입니다.'
+]);
@@ -8,7 +8,7 @@ include('func.php');

 $session = Session::requireLogin([])->setReadOnly();

-if(Session::getInstance()->userGrade < 6){
+if(Session::getInstance()->userGrade < 5){
    Json::die([
        'reason'=>'권한이 부족합니다.'
    ]);
@@ -1,8 +1,6 @@
 <?php
 namespace sammo;

-use sammo\Enums\GeneralAccessLogColumn;
-
 include "lib.php";
 include "func.php";

@@ -27,25 +25,14 @@ $rootDB = RootDB::db();
 $oNow = new \DateTimeImmutable();
 $now = $oNow->format('Y-m-d H:i:s');

-$member = $rootDB->queryFirstRow('SELECT `name`, `penalty` FROM member WHERE `NO`=%i', $userID);
-if(!$member){
+$userNick = RootDB::db()->queryFirstField('SELECT `NAME` FROM member WHERE `NO`=%i',$userID);
+if(!$userNick){
    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([
@@ -97,14 +84,8 @@ $db->update('general', [
    'defence_train'=>80,
    'permission'=>'normal',
    'owner'=>$userID,
-    'aux'=>Json::encode($genAux),
-    'penalty'=>Json::encode($penalty),
+    'aux'=>Json::encode($genAux)
 ], 'owner <= 0 AND npc = 2 AND no = %i', $pick);
-$db->insertIgnore('general_access_log', [
-    GeneralAccessLogColumn::generalID->value => $pick,
-    GeneralAccessLogColumn::userID->value => $userID,
-    GeneralAccessLogColumn::lastRefresh->value => $now,
-]);

 if(!$db->affectedRows()){
    Json::die([
@@ -1,5 +1,4 @@
 <?php
-
 namespace sammo;

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

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

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

 $db = DB::db();
-$me = General::createObjFromDB($generalID);
+$me = General::createGeneralObjFromDB($generalID);


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

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

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

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

 Json::die([
-    'result' => true,
-    'reason' => 'success'
-]);
+    'result'=>true,
+    'reason'=>'success'
+]);
@@ -39,10 +39,7 @@ if (!$data || !is_array($data)) {

 $db = DB::db();

-$me = $db->queryFirstRow(
-    'SELECT no, name, npc, nation, city, officer_level, refresh_score, turntime, belong, permission, penalty FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-);
+$me = $db->queryFirstRow('SELECT no, name, npc, nation, city, officer_level, con, turntime, belong, permission, penalty FROM general WHERE owner=%i', $userID);


 $nationID = $me['nation'];
@@ -270,7 +270,7 @@ if (key_exists('inheritBuff', $rawAttacker)) {
 }
 $rawAttacker['aux'] = Json::encode($rawAttacker['aux']);
 $rawAttacker['owner'] = 0;
-$attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), null, $rawAttackerCity, $rawAttackerNation, $year, $month);
+$attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month);
 $attacker = new WarUnitGeneral(
    $tmpRNG,
    $attackerGeneral,
@@ -308,7 +308,7 @@ foreach ($rawDefenderList as $idx => $rawDefenderGeneral) {
    $rawDefenderGeneral['aux'] = Json::encode($rawDefenderGeneral['aux']);
    $rawDefenderGeneral['owner'] = 0;

-    $defenderGeneral = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), null, $rawDefenderCity, $rawAttackerNation, $year, $month, true);
+    $defenderGeneral = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), $rawDefenderCity, $rawAttackerNation, $year, $month, true);

    $defenderList[] = new WarUnitGeneral(
        $tmpRNG,
@@ -382,7 +382,7 @@ function simulateBattle(

    $warRng = new RandUtil(new LiteHashDRBG($warSeed));

-    $attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), null, $rawAttackerCity, $rawAttackerNation, $year, $month);
+    $attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month);
    $attacker = new WarUnitGeneral(
        $warRng,
        $attackerGeneral,
@@ -395,7 +395,7 @@ function simulateBattle(
    $defenderList = [];

    foreach ($rawDefenderList as $rawDefenderGeneral) {
-        $defenderGeneral = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), null, $rawDefenderCity, $rawAttackerNation, $year, $month, true);
+        $defenderGeneral = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), $rawDefenderCity, $rawAttackerNation, $year, $month, true);

        $defenderList[] = new WarUnitGeneral(
            $warRng,
@@ -66,7 +66,7 @@ if(!$ownerInfo){
 $info = Json::decode($info);


-$generalObj = General::createObjFromDB($generalID);
+$generalObj = General::createGeneralObjFromDB($generalID);
 $oldGeneralName = $generalObj->getName();
 $db->update('select_pool', [
    'general_id'=>-$generalID,
@@ -51,9 +51,8 @@ function MessageBox($str)

 function LogText($prefix, $variable)
 {
-    return;
-    //$text = sprintf('%s : %s'."\r\n", $prefix, TVarDumper::dump($variable));
-    //file_put_contents(ROOT.'/d_log/'.UniqueConst::$serverName.'_dbg_logs.txt', $text, FILE_APPEND);
+    $text = sprintf('%s : %s'."\r\n", $prefix, TVarDumper::dump($variable));
+    file_put_contents(ROOT.'/d_log/'.UniqueConst::$serverName.'_dbg_logs.txt', $text, FILE_APPEND);
 }

 function prepareDir(string $dirPath, bool $forceCreate=true):bool{
@@ -0,0 +1,453 @@
+<?php
+
+namespace sammo;
+
+use sammo\DTO\VoteInfo;
+
+include "lib.php";
+include "func.php";
+
+$session = Session::requireLogin()->loginGame()->setReadOnly();
+$userID = Session::getUserID();
+
+increaseRefresh("메인", 1);
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+if (!$userID) {
+    header('Location:..');
+    die();
+}
+
+//턴 실행.
+TurnExecutionHelper::executeAllCommand();
+
+if (!$session->isGameLoggedIn()) {
+    header('Location:..');
+    die();
+}
+
+$me = $db->queryFirstRow(
+    'SELECT no,con,turntime,newmsg,newvote,`officer_level` from general where owner = %i',
+    $userID
+);
+
+//그새 사망이면
+if ($me === null) {
+    $session->logoutGame();
+    header('Location: ../');
+    die();
+}
+
+$gameStor->cacheAll(true);
+
+if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
+    $db->update('general', [
+        'newmsg' => 0,
+        'newvote' => 0
+    ], 'owner=%i', $userID);
+}
+
+$plock = boolval($db->queryFirstField('SELECT plock FROM plock WHERE `type`="GAME" LIMIT 1'));
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    printLimitMsg($me['turntime']);
+    exit();
+}
+
+$generalObj = General::createGeneralObjFromDB($me['no']);
+$generalObj->setRawCity($db->queryFirstRow('SELECT * FROM city WHERE city = %i', $generalObj->getCityID()));
+$scenario = $gameStor->scenario_text;
+
+$nationID = $generalObj->getNationID();
+if ($nationID) {
+    $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
+    $nationStor->cacheAll();
+}
+
+if ($gameStor->extended_general == 0) {
+    $extend = "표준";
+} else {
+    $extend = "확장";
+}
+if ($gameStor->fiction == 0) {
+    $fiction = "사실";
+} else {
+    $fiction = "가상";
+}
+if ($gameStor->npcmode == 0) {
+    $npcmode = "불가능";
+} else if ($gameStor->npcmode == 1) {
+    $npcmode = "가능";
+} else {
+    $npcmode = "선택 생성";
+}
+$color = "cyan";
+$serverName = UniqueConst::$serverName;
+$serverCnt = $gameStor->server_cnt;
+
+$auctionCount = $db->queryFirstField('SELECT count(*) FROM ng_auction WHERE finished = 0');
+$isTournamentActive = $gameStor->tournament > 0;
+$isTournamentApplicationOpen = $gameStor->tournament == 1;
+$isBettingActive = $gameStor->tournament == 6;
+
+$myNationStatic = getNationStaticInfo($generalObj->getNationID());
+$nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
+
+$autorunUser = ($gameStor->autorun_user) ?? [];
+$otherTextInfo = [];
+
+if ($gameStor->join_mode == 'onlyRandom') {
+    $otherTextInfo[] = '랜덤 임관 전용';
+}
+if ($autorunUser['limit_minutes'] ?? false) {
+    $otherTextInfo[] = getAutorunInfo($autorunUser);
+}
+
+if (!$otherTextInfo) {
+    $otherTextInfo = '표준';
+} else {
+    $otherTextInfo = join(', ', $otherTextInfo);
+}
+
+$lastVoteID = $gameStor->lastVote;
+$lastVote = null;
+if ($lastVoteID) {
+    $voteStor = KVStorage::getStorage($db, 'vote');
+    $lastVote = VoteInfo::fromArray($voteStor->getValue("vote_{$lastVoteID}"));
+    if ($lastVote->endDate && $lastVote->endDate < TimeUtil::now()) {
+        $lastVote = null;
+    }
+}
+?>
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title><?= $serverName ?>: 메인</title>
+    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=500" />
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printJS('d_shared/base_map.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('vue', 'v_main', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printCSS('css/map.css') ?>
+    <?= WebUtil::printStaticValues([
+        //deprecated, staticValues를 이용할 것
+        'serverName' => $serverName,
+        'serverCnt' => $serverCnt,
+        'serverNick' => DB::prefix(),
+        'serverID' => UniqueConst::$serverID,
+        'maxTurn' => GameConst::$maxTurn,
+        'maxPushTurn' => 12,
+        'serverNow' => TimeUtil::now(false),
+        'lastExecuted' => $gameStor->turntime,
+        'isLocked' => $plock,
+        'isTournamentActive' => $isTournamentActive,
+        'isBettingActive' => $isBettingActive,
+        'staticValues' => [
+            'serverName' => $serverName,
+            'serverCnt' => $serverCnt,
+            'serverNick' => DB::prefix(),
+            'serverID' => UniqueConst::$serverID,
+            'maxTurn' => GameConst::$maxTurn,
+            'maxPushTurn' => 12,
+            'serverNow' => TimeUtil::now(false),
+            'lastExecuted' => $gameStor->turntime,
+            'isLocked' => $plock,
+            'isTournamentActive' => $isTournamentActive,
+            'isBettingActive' => $isBettingActive,
+            'mapName' => GameConst::$mapName,
+            'unitSet' => GameConst::$unitSet,
+        ]
+    ]) ?>
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
+</head>
+
+<body class="img_back sam-color-<?= $nationColorType ?>">
+    <div id="container" class="bg0">
+        <div class="row toolbars gx-0">
+            <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></button></div>
+        </div>
+        <div class="tb_layout row gx-0">
+            <div id="server_title" class="row py-2 center">
+                <h3>삼국지 모의전투 HiDCHe <?= $serverName . $serverCnt ?>기 <span class="avoid-wrap">(<font color=cyan><?= $scenario ?></font>)</span></h3>
+            </div>
+
+            <div class="row center gx-0">
+                <div class="s-border-t col py-2 col-8 col-md-4" style="color:<?= $color ?>;">
+                    <?= $scenario ?>
+                </div>
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                    NPC 수, 상성 : <?= $extend ?>,<?= $fiction ?>
+                </div>
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                    NPC선택 : <?= $npcmode ?>
+                </div>
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                    토너먼트 : <?= getTournamentTermText($gameStor->turnterm) ?>
+                </div>
+                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                    기타 설정: <?= $otherTextInfo ?>
+                </div>
+
+                <div class="s-border-t col py-2 col-8 col-md-4"><?= info(2) ?></div>
+                <div class="s-border-t col py-2 col-4 col-md-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
+                <div class="s-border-t col py-2 col-4 col-md-2">턴당 갱신횟수 : <?= $gameStor->conlimit ?>회</div>
+                <div class="s-border-t col py-2 col-8 col-md-4"><?= info(3) ?></div>
+                <div class="s-border-t py-2 col col-6 col-md-4">
+                    <?php if ($isTournamentActive) : ?>
+                        ↑<span style='color:cyan'><?= (['전력전', '통솔전', '일기토', '설전',])[$gameStor->tnmt_type] ?? '' ?> <?= getTournament($gameStor->tournament) ?> <?= getTournamentTime() ?></span>↑
+                    <?php else : ?>
+                        <span style='color:magenta'>현재 토너먼트 경기 없음</span>
+                    <?php endif; ?>
+                </div>
+                <div class="s-border-t py-2 col col-6 col-md-2">
+                    <div style="display:inline-block;"><?= $plock ? ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
+                </div>
+                <div class="s-border-t py-2 col col-6 col-md-2">
+                    <?php if ($auctionCount > 0) : ?>
+                        <span style='color:cyan'><?= $auctionCount ?>건</span> 거래 진행중
+                    <?php else : ?>
+                        <span style='color:magenta'>진행중 거래 없음</span>
+                    <?php endif; ?>
+                </div>
+                <div class="s-border-t py-2 col col-6 col-md-4 vote-cell">
+                    <?php
+                    ?>
+                    <?php if ($lastVote === null) : ?>
+                        <span style='color:magenta'>진행중 설문 없음</span>
+                    <?php else : ?>
+                        <span style='color:cyan'>설문 진행중</span> : <span><?= $lastVote->title ?></span>
+                    <?php endif; ?>
+                </div>
+            </div>
+            <div class="row gx-0">
+                <div class="col s-border-t px-2 py-2">접속중인 국가: <?= $gameStor->online_nation ?></div>
+            </div>
+            <div class="row gx-0">
+                <div class="col s-border-t px-2 py-2">운영자 메세지 : <span style='color:yellow;'><?= $gameStor->msg ?></span></div>
+            </div>
+            <div class="row gx-0">
+                <div class="col s-border-t py-2" id="nation-msg-position">
+                    <div class="px-2">【 국가방침 】</div>
+                    <div id='nation-msg-box'>
+                        <div id='nation-msg'><?= nationMsg($generalObj) ?></div>
+                    </div>
+                </div>
+            </div>
+            <div class="row gx-0">
+                <div class="col s-border-t px-2 py-2">
+                    【 접속자 】<?= onlinegen($generalObj) ?>
+                </div>
+            </div>
+            <?php if ($session->userGrade >= 5) : ?>
+                <div class="row">
+                    <div class="col">
+                        <a href='_admin1.php' target='_blank'><button type='button'>게임관리</button></a>
+                        <a href='_admin2.php' target='_blank'><button type='button'>회원관리</button></a>
+                        <a href='_admin4.php' target='_blank'><button type='button'>멀티관리</button></a>
+                        <a href='_admin5.php' target='_blank'><button type='button'>일제정보</button></a>
+                        <a href='_admin7.php' target='_blank'><button type='button'>로그정보</button></a>
+                        <a href='_admin8.php' target='_blank'><button type='button'>외교정보</button></a>
+                        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
+                    </div>
+                </div>
+            <?php elseif ($session->userGrade == 4) : ?>
+                <div class="row">
+                    <div class="col">
+                        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
+                    </div>
+                </div>
+            <?php endif; ?>
+            <div id="map_view" class="gx-0">
+                <div id="mapZone" class="view-item"><?= getMapHtml() ?></div>
+                <div class="view-item" id="reservedCommandZone">
+                    <div id="reservedCommandList"></div>
+                    <div id="actionMiniPlate" class="gx-0 row">
+                        <div class="col">
+                            <div class="gx-1 row">
+                                <div class="col-8 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
+                                <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div id="cityInfo" class="view-item" style="border:none;text-align:center;"><?= cityInfo($generalObj) ?></div>
+                <div id="nation-position"><?php myNationInfo($generalObj); ?></div>
+                <div id="general-position"><?php generalInfo($generalObj); ?></div>
+                <div id="generalCommandButton" class="row gx-0">
+                    <div class="buttonPlate bg2">
+                        <?= commandButton([
+                            'splitBtnBegin' => '<div class="btn-group">',
+                            'splitBtnEnd' => '</div>',
+                            'splitZoneSign' => '<button type="button" class="btn btn-sammo-nation dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"><span class="visually-hidden">Toggle Dropdown</span></button>',
+                            'splitZoneBegin' => '<ul class="dropdown-menu dropdown-menu-end">',
+                            'splitZoneEnd' => '</ul>',
+                            'splitSubBtnBegin' => '<li>',
+                            'splitSubBtnEnd' => '</li>',
+                            'btnClass' => 'btn btn-sammo-nation',
+                            'btnSplitClass' => 'dropdown-item',
+                            'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
+                            'isBettingActive' => $isBettingActive
+                        ])
+                        ?></div>
+                </div>
+            </div>
+        </div>
+        <div id="actionMiniPlateSub" class="gx-0 row">
+            <div class="col">
+                <div class="gx-1 row">
+                    <div class="col-3 d-grid"><button type='button' class="btn btn-dark" onclick="scrollHardTo('reservedCommandList')">명령으로</button></div>
+                    <div class="col-5 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
+                    <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
+                </div>
+            </div>
+        </div>
+        <div class="row gx-0">
+            <div class="col-md-6" id="general_public_record-position">
+                <div class="bg1 center s-border-tb"><b>장수 동향</b></div>
+                <div id="general_public_record" style="text-align:left;"><?= formatHistoryToHTML(getGlobalActionLogRecent(15)) ?></div>
+            </div>
+            <div class="col-md-6" id="general_log-position">
+                <div class="bg1 center s-border-tb"><b>개인 기록</b></div>
+                <div id="general_log" style="text-align:left;"><?= formatHistoryToHTML(getGeneralActionLogRecent($me['no'], 15)) ?></div>
+            </div>
+            <div class="col-12" id="world_history-position">
+                <div class="bg1 center s-border-tb"><b>중원 정세</b></div>
+                <div id="world_history" colspan=2 style="text-align:left;"><?= formatHistoryToHTML(getGlobalHistoryLogRecent(15)) ?></div>
+            </div>
+        </div>
+        <div class="row toolbars gx-0">
+            <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></div>
+
+            <div id="message_board" class="row gx-0">
+                <div class="message_input_form bg0 gx-0 row">
+                    <div id="mailbox_list-col" class="col-6 col-md-2 d-grid">
+                        <select id="mailbox_list" size="1" class="form-control bg-dark text-white">
+                        </select>
+                    </div>
+                    <div id="msg_input-col" class="col-12 col-md-8 d-grid">
+                        <input type="text" id="msg_input" maxlength="99" class="form-control">
+                    </div>
+                    <div id="msg_submit-col" class="col-6 col-md-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
+                </div>
+                <div class="col-md-6 board_side bg0"><a id="public_talk_position"></a>
+                    <div class="board_header bg0">전체 메시지(최고99자)</div>
+                    <section class="public_message">
+                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="public">이전 메시지 불러오기</button></div>
+                    </section>
+                </div>
+                <div class="col-md-6 board_side bg0"><a id="national_talk_position"></a>
+                    <div class="board_header bg0">국가 메시지(최고99자)</div>
+                    <section class="national_message">
+                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="national">이전 메시지 불러오기</button></div>
+                    </section>
+                </div>
+                <div class="col-md-6 board_side bg0"><a id="private_talk_position"></a>
+                    <div class="board_header bg0">개인 메시지(최고99자)</div>
+                    <section class="private_message">
+                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="private">이전 메시지 불러오기</button></div>
+                    </section>
+                </div>
+                <div class="col-md-6 board_side bg0"><a id="diplomacy_talk_position"></a>
+                    <div class="board_header bg0">외교 메시지(최고99자)</div>
+                    <section class="diplomacy_message">
+                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="diplomacy">이전 메시지 불러오기</button></div>
+                    </section>
+                </div>
+            </div>
+            <div class="row toolbars gx-0">
+                <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></div><?= banner() ?>
+            </div>
+        </div>
+        <?php
+        if ($con == 1) {
+            MessageBox("접속제한이 얼마 남지 않았습니다!");
+        }
+        if ($me['newmsg'] == 1) {
+            MessageBox("새로운 서신이 도착했습니다!");
+        }
+        if ($me['newvote'] == 1) {
+            $develcost = $gameStor->develcost * 5;
+            MessageBox("설문조사에 참여하시면 금{$develcost}과 유니크템을 드립니다! (우측 상단 설문조사 메뉴)");
+        }
+        ?>
+    </div>
+    <nav class="navbar navbar-expand fixed-bottom navbar-dark bg-dark d-sm-block d-md-none p-0" id="navbar500">
+        <div class="container-fluid px-0">
+            <div class="collapse navbar-collapse">
+                <ul class="navbar-nav me-auto mx-auto">
+                    <li class="nav-item dropup">
+                        <div class="dropdown-toggle text-white btn btn-sammo-base2" id="navbarGlobal" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            외부 메뉴
+                        </div>
+                        <ul class="dropdown-menu dropdown-menu-start" aria-labelledby="navbarGlobal" id="navbarGlobalItems">
+                            <?= allButton($gameStor->npcmode == 1, ['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item']) ?>
+                        </ul>
+                    </li>
+                    <li class="nav-item dropup">
+                        <div class="dropdown-toggle btn btn-sammo-nation" id="navbarNation" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            국가 메뉴
+                        </div>
+                        <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
+                            <?= commandButton([
+                                'btnBegin' => '<li>',
+                                'btnEnd' => '</li>',
+                                'splitMainBegin' => '<div class="d-none">',
+                                'splitMainEnd' => '</div>',
+                                'splitSubBtnBegin' => '<li>',
+                                'splitSubBtnEnd' => '</li>',
+                                'btnClass' => 'dropdown-item',
+                                'btnSplitClass' => 'dropdown-item',
+                                'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
+                                'isBettingActive' => $isBettingActive
+                            ]) ?>
+                        </ul>
+                    </li>
+                    <li class="nav-item dropup">
+                        <div class="dropdown-toggle text-white btn btn-dark" id="navbarQuick" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                            빠른 이동
+                        </div>
+                        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown" id="navbarQuickItems">
+                            <li><a class="dropdown-item disabled">국가 정보</a></button></li>
+                            <hr class="dropdown-divider">
+                            </hr>
+                            <li><button type="button" onclick="scrollHardTo('nation-msg-position')" class="dropdown-item">방침</button></li>
+                            <li><button type="button" onclick="scrollHardTo('reservedCommandList')" class="dropdown-item">명령</button></li>
+                            <li><button type="button" onclick="scrollHardTo('nation-position')" class="dropdown-item">국가</button></li>
+                            <li><button type="button" onclick="scrollHardTo('general-position')" class="dropdown-item">장수</button></li>
+                            <li><button type="button" onclick="scrollHardTo('cityInfo')" class="dropdown-item">도시</button></li>
+                            <li><a class="dropdown-item disabled">동향 정보</a></button></li>
+                            <hr class="dropdown-divider">
+                            </hr>
+                            <li><button type="button" onclick="scrollHardTo('mapZone')" class="dropdown-item">지도</button></li>
+                            <li><button type="button" onclick="scrollHardTo('general_public_record-position')" class="dropdown-item">동향</button></li>
+                            <li><button type="button" onclick="scrollHardTo('general_log-position')" class="dropdown-item">개인</button></li>
+                            <li><button type="button" onclick="scrollHardTo('world_history-position')" class="dropdown-item">정세</button></li>
+                            <li><span>&nbsp;</span></li>
+                            <li><a class="dropdown-item disabled">메시지</a></button></li>
+                            <hr class="dropdown-divider">
+                            </hr>
+                            <li><button type="button" onclick="scrollHardTo('public_talk_position')" class="dropdown-item">전체</button></li>
+                            <li><button type="button" onclick="scrollHardTo('national_talk_position')" class="dropdown-item">국가</button></li>
+                            <li><button type="button" onclick="scrollHardTo('private_talk_position')" class="dropdown-item">개인</button></li>
+                            <li><button type="button" onclick="scrollHardTo('diplomacy_talk_position')" class="dropdown-item">외교</button></li>
+                            <li><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></li>
+                        </ul>
+                    </li>
+                    <li class="nav-item">
+                        <a class="refreshPage btn btn-sammo-base2 text-white" role="button">갱신</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+</body>
+
+</html>
@@ -8,12 +8,4 @@ $session = Session::getInstance()->setReadOnly();

 $db = DB::db();

-$updated = false;
-$locked = false;
-$lastExecuted = TurnExecutionHelper::executeAllCommand($updated, $locked);
-Json::die([
-    'result' => true,
-    'updated' => $updated,
-    'locked' => $locked,
-    'lastExecuted' => $lastExecuted,
-]);
+TurnExecutionHelper::executeAllCommand();
@@ -3,7 +3,6 @@
 namespace sammo;

 use sammo\Enums\EventTarget;
-use sammo\Enums\GeneralQueryMode;

 function processWar(string $warSeed, General $attackerGeneral, array $rawAttackerNation, array $rawDefenderCity)
 {
@@ -37,13 +36,13 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke

    $city = new WarUnitCity($rng, $rawDefenderCity, $rawDefenderNation, $year, $month, $startYear);

-    $defenderCityGeneralIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0', $city->getVar('nation'), $city->getVar('city'));
-    $defenderCityGeneralList = General::createObjListFromDB($defenderCityGeneralIDList, null);
+    $defenderIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0 and crew > 0 and rice>(crew/100) and train>=defence_train and atmos>=defence_train', $city->getVar('nation'), $city->getVar('city'));
+    $defenderGeneralList = General::createGeneralObjListFromDB($defenderIDList, null, 2);

    /** @var WarUnit[] */
    $defenderList = [];
-    foreach($defenderCityGeneralList as $defenderGeneral){
-        $defenderGeneral->setRawCity($rawDefenderCity);
+    foreach($defenderGeneralList as $defenderGeneral){
+
        $defenderCandidate = new WarUnitGeneral($rng, $defenderGeneral, $rawDefenderNation, false);
        if(extractBattleOrder($defenderCandidate, $attacker) <= 0){
            continue;
@@ -186,7 +185,7 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
        'year' => $year,
        'month' => $month,
        'join_mode' => $joinMode,
-    ], $attacker->getGeneral(), $city->getRaw(), $defenderCityGeneralList);
+    ], $attacker->getGeneral(), $city->getRaw());
 }

 function extractBattleOrder(WarUnit $defender, WarUnit $attacker)
@@ -481,18 +480,17 @@ function processWar_NG(
    $attacker->finishBattle();
    $defender->finishBattle();

-    if($city->getDead() || $defender instanceof WarUnitCity){
-        if($city !== $defender){
-            $city->setOppose($attacker);
-            $city->setSiege();
-            $city->finishBattle();
-        }
+    if($city->getDead()){
+        $city->setSiege();
+        $city->finishBattle();
+    }

-        $newConflict = $city->addConflict();
+    if ($defender instanceof WarUnitCity) {
+        $newConflict = $defender->addConflict();
        if ($newConflict) {
            $nationName = $attacker->getNationVar('name');
            $josaYi = JosaUtil::pick($nationName, '이');
-            $logger->pushGlobalHistoryLog("<M><b>【분쟁】</b></><D><b>{$nationName}</b></>{$josaYi} <G><b>{$city->getName()}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다.");
+            $logger->pushGlobalHistoryLog("<M><b>【분쟁】</b></><D><b>{$nationName}</b></>{$josaYi} <G><b>{$defender->getName()}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다.");
        }
    }

@@ -526,12 +524,11 @@ function DeleteConflict($nation)
 function getConquerNation($city): int
 {
    $conflict = Json::decode($city['conflict']);
-    return array_key_first($conflict);
+    return Util::array_first_key($conflict);
 }

-function ConquerCity(array $admin, General $general, array $city, array $defenderCityGeneralList)
+function ConquerCity(array $admin, General $general, array $city)
 {
-    /** @var General[] $defenderCityGeneralList */
    $db = DB::db();

    $year = $admin['year'];
@@ -586,21 +583,6 @@ function ConquerCity(array $admin, General $general, array $city, array $defende
    if(TurnExecutionHelper::runEventHandler($db, $gameStor, EventTarget::OccupyCity)){
        $gameStor->cacheAll();
    }
-    $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
-        UniqueConst::$hiddenSeed,
-        'ConquerCity',
-        $year,
-        $month,
-        $attackerNationID,
-        $attackerID,
-        $cityID
-    )));
-    foreach($defenderCityGeneralList as $defenderCityGeneral){
-        $defenderCityGeneral->onArbitraryAction($defenderCityGeneral, $rng, 'ConquerCity', null, [
-            'attacker' => $general
-        ]);
-        $defenderCityGeneral->applyDB($db);
-    }


    // 국가 멸망시
@@ -612,10 +594,10 @@ function ConquerCity(array $admin, General $general, array $city, array $defende

        $lord = new General($db->queryFirstRow(
            'SELECT %l FROM general WHERE nation = %i AND officer_level = %i LIMIT 1',
-            Util::formatListOfBackticks(General::mergeQueryColumn()[0]),
+            Util::formatListOfBackticks(General::mergeQueryColumn(['npc', 'gold', 'rice', 'experience', 'explevel', 'belong', 'dedication', 'dedlevel', 'aux'], 1)[0]),
            $defenderNationID,
            12
-        ), null, null, $city, $loseNation, $year, $month);
+        ), null, $city, $loseNation, $year, $month, false);

        $josaUl = JosaUtil::pick($defenderNationName, '을');
        $attackerLogger->pushNationalHistoryLog("<D><b>{$defenderNationName}</b></>{$josaUl} 정복");
@@ -712,23 +694,19 @@ function ConquerCity(array $admin, General $general, array $city, array $defende
            $minCity = findNextCapital($cityID, $defenderNationID);

            $minCityName = CityConst::byID($minCity)->name;
-            $josaRo = JosaUtil::pick($minCityName, '로');

            $josaYi = JosaUtil::pick($defenderNationName, '이');
-            $attackerLogger->pushGlobalHistoryLog("<M><b>【긴급천도】</b></><D><b>{$defenderNationName}</b></>{$josaYi} 수도가 함락되어 <G><b>$minCityName</b></>{$josaRo} 긴급천도하였습니다.");
+            $attackerLogger->pushGlobalHistoryLog("<M><b>【긴급천도】</b></><D><b>{$defenderNationName}</b></>{$josaYi} 수도가 함락되어 <G><b>$minCityName</b></>으로 긴급천도하였습니다.");

-            $moveLog = "수도가 함락되어 <G><b>$minCityName</b></>{$josaRo} <M>긴급천도</>합니다.";
-            foreach ($db->queryAllLists(
-                'SELECT no, officer_level FROM general WHERE nation=%i',
+            $moveLog = "수도가 함락되어 <G><b>$minCityName</b></>으로 <M>긴급천도</>합니다.";
+            //아국 수뇌부에게 로그 전달
+            foreach ($db->queryFirstColumn(
+                'SELECT no FROM general WHERE nation=%i AND officer_level>=5',
                $defenderNationID
-            ) as [$defenderGeneralID, $defenderGeneralChiefLevel]) {
-                $defenderLogger = new ActionLogger($defenderGeneralID, $defenderNationID, $year, $month);
-                $defenderLogger->pushGeneralActionLog($moveLog, ActionLogger::PLAIN);
-                if($defenderGeneralChiefLevel >= 5){
-                    $defenderLogger->pushGeneralActionLog("수뇌는 <G><b>{$minCityName}</b></>{$josaRo} 집합되었습니다.");
-                }
-
-                $defenderLogger->flush();
+            ) as $defenderChiefID) {
+                $chiefLogger = new ActionLogger($defenderChiefID, $defenderNationID, $year, $month);
+                $chiefLogger->pushGeneralActionLog($moveLog, ActionLogger::PLAIN);
+                $chiefLogger->flush();
            }

            //천도
@@ -785,8 +763,8 @@ function ConquerCity(array $admin, General $general, array $city, array $defende
        'officer_set' => 0,
    ];
    if ($city['level'] > 3) {
-        $query['def'] = GameConst::$defaultCityWall;
-        $query['wall'] = GameConst::$defaultCityWall;
+        $query['def'] = 1000;
+        $query['wall'] = 1000;
    } else {
        $query['def'] = $db->sqleval('def_max/2');
        $query['wall'] = $db->sqleval('wall_max/2');
@@ -39,7 +39,7 @@ class BidBuyRiceAuction extends \sammo\BaseAPI
    $amount = $this->args['amount'];

    $generalID = $session->generalID;
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);
    $auction = new AuctionBuyRice($auctionID, $general);
    $result = $auction->bid($amount, true);

@@ -38,7 +38,7 @@ class BidSellRiceAuction extends \sammo\BaseAPI
    $amount = $this->args['amount'];

    $generalID = $session->generalID;
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);
    $auction = new AuctionSellRice($auctionID, $general);
    $result = $auction->bid($amount, true);

@@ -41,7 +41,7 @@ class BidUniqueAuction extends \sammo\BaseAPI
    $tryExtendCloseDate = $this->args['extendCloseDate'] ?? false;

    $generalID = $session->generalID;
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);
    $auction = new AuctionUniqueItem($auctionID, $general);
    $result = $auction->bid($amount, $tryExtendCloseDate);

@@ -10,7 +10,6 @@ use sammo\DTO\AuctionBidItem;
 use sammo\DTO\AuctionInfo;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\AuctionType;
-use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
 use sammo\InheritancePointManager;
 use sammo\TimeUtil;
@@ -77,7 +76,7 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI
    $inheritMgr = InheritancePointManager::getInstance();
    //preveious라서 column을 최대한 비울 수 있다.
    $remainPoint = $inheritMgr->getInheritancePoint(
-      General::createObjFromDB($generalID),
+      General::createGeneralObjFromDB($generalID, ['owner'], 0),
      InheritanceKey::previous
    );

@@ -66,7 +66,7 @@ class OpenBuyRiceAuction extends \sammo\BaseAPI
    $finishBidAmount = $this->args['finishBidAmount'];
    $generalID = $session->generalID;

-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);

    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -66,7 +66,7 @@ class OpenSellRiceAuction extends \sammo\BaseAPI
    $finishBidAmount = $this->args['finishBidAmount'];
    $generalID = $session->generalID;

-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);

    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -57,7 +57,7 @@ class OpenUniqueAuction extends \sammo\BaseAPI
    $generalID = $session->generalID;

    $itemObj = buildItemClass($itemID);
-    $general = General::createObjFromDB($generalID);
+    $general = General::createGeneralObjFromDB($generalID);

    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -42,12 +42,9 @@ class GetBettingList extends \sammo\BaseAPI
        $bettingStor = KVStorage::getStorage($db, 'betting');
        $userID = $session->userID;

-        $me = $db->queryFirstRow(
-            'SELECT no,nation,officer_level,refresh_score,turntime,belong,penalty,permission FROM `general`
-            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-        );
-        $limitState = checkLimit($me['refresh_score']);
-        if ($limitState >= 2) {
+        $me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,penalty,permission FROM general WHERE owner=%i', $userID);
+        $con = checkLimit($me['con']);
+        if ($con >= 2) {
            return "접속 제한중입니다.";
        }

@@ -6,7 +6,6 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
-use sammo\GameConst;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
@@ -33,18 +32,8 @@ 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,
@@ -52,19 +41,6 @@ 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']);

@@ -39,7 +39,7 @@ class BuildNationCandidate extends \sammo\BaseAPI
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $gameStor->cacheValues(['opentime', 'turntime']);

-    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc FROM general WHERE owner=%i', $userID);
+    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc,lastrefresh FROM general WHERE owner=%i', $userID);

    if (!$general) {
      return '장수가 없습니다';
@@ -59,7 +59,7 @@ class BuildNationCandidate extends \sammo\BaseAPI

    $env = $gameStor->getAll();

-    $generalObj = General::createObjFromDB($general['no']);
+    $generalObj = General::createGeneralObjFromDB($general['no']);

    $validCmd = false;
    foreach(GameConst::$availableGeneralCommand as $cmdList){
@@ -90,9 +90,6 @@ class BuildNationCandidate extends \sammo\BaseAPI
      return '거병을 실패했습니다.';
    }

-    $generalObj->setVar('killturn', $env['killturn']);
-    $generalObj->applyDB($db);
-
    return null;
  }
 }
@@ -5,7 +5,6 @@ namespace sammo\API\General;
 use sammo\DB;
 use sammo\DummyGeneral;
 use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralAccessLogColumn;
 use sammo\GameConst;
 use sammo\Session;
 use sammo\General;
@@ -38,13 +37,7 @@ class DieOnPrestart extends \sammo\BaseAPI
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);

-    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc FROM general WHERE owner=%i AND npc = 0', $userID);
-    $lastRefresh = $db->queryFirstField(
-      'SELECT %b FROM general_access_log WHERE %b = %i',
-      GeneralAccessLogColumn::lastRefresh->value,
-      GeneralAccessLogColumn::generalID->value,
-      $general['no']
-    );
+    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc,lastrefresh FROM general WHERE owner=%i AND npc = 0', $userID);

    if (!$general) {
      return '장수가 없습니다';
@@ -62,13 +55,13 @@ class DieOnPrestart extends \sammo\BaseAPI
    }

    //서버 가오픈시 할 수 있는 행동
-    $targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
+    $targetTime = addTurn($general['lastrefresh'], $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
    if ($targetTime > TimeUtil::now()) {
      $targetTimeShort = substr($targetTime, 0, 19);
      return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
    }

-    $generalObj = General::createObjFromDB($general['no']);
+    $generalObj = General::createGeneralObjFromDB($general['no']);
    if ($generalObj instanceof DummyGeneral) {
      trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
    }
@@ -37,7 +37,7 @@ class DropItem extends \sammo\BaseAPI
  public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    $generalID = $session->generalID;
-    $me = General::createObjFromDB($generalID);
+    $me = General::createGeneralObjFromDB($generalID);

    $itemType = $this->args['itemType'];
    $item = $me->getItem($itemType);
@@ -21,7 +21,7 @@ class GetCommandTable extends \sammo\BaseAPI{
    public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
    {
        $generalID = $session->generalID;
-        $me = General::createObjFromDB($generalID);
+        $me = General::createGeneralObjFromDB($generalID);
        $commandTable = getCommandTable($me);

        return [
@@ -9,9 +9,7 @@ use sammo\DB;
 use sammo\DTO\VoteInfo;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\CityColumn;
-use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\GeneralColumn;
-use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\RankColumn;
 use sammo\GameConst;
 use sammo\General;
@@ -175,7 +173,7 @@ class GetFrontInfo extends \sammo\BaseAPI
      'online_nation', 'online_user_cnt',
      'year', 'month', 'startyear',
      'maxgeneral',
-      'refreshLimit',
+      'conlimit',
      'server_cnt',
    ]);

@@ -385,8 +383,7 @@ class GetFrontInfo extends \sammo\BaseAPI
      'specialWar' => $general->getVar(GeneralColumn::special2), // GameObjClassKey;
      'personal' => $general->getVar(GeneralColumn::personal), // GameObjClassKey;
      'belong' => $general->getVar(GeneralColumn::belong), // number;
-
-      'refreshScoreTotal' => $general->getAccessLogVar(GeneralAccessLogColumn::refreshScoreTotal, 0), // number;
+      'connect' => $general->getVar(GeneralColumn::connect), // number;

      'officerLevel' => $general->getVar(GeneralColumn::officer_level), // number;
      'officerLevelText' => getOfficerLevelText($general->getVar(GeneralColumn::officer_level), $rawNation['level']), // string;
@@ -403,7 +400,7 @@ class GetFrontInfo extends \sammo\BaseAPI
      'troop' => $general->getVar(GeneralColumn::troop), // number;
      //P0 End

-      'refreshScore' => $general->getAccessLogVar(GeneralAccessLogColumn::refreshScore, 0), // number;
+      'con' => $general->getVar(GeneralColumn::con), // number;
      'specage' => $general->getVar(GeneralColumn::specage), // number;
      'specage2' => $general->getVar(GeneralColumn::specage2), // number;
      'leadership_exp' => $general->getVar(GeneralColumn::leadership_exp), // number;
@@ -534,12 +531,12 @@ class GetFrontInfo extends \sammo\BaseAPI
  {
    $generalID = $session->generalID;
    //NOTE: 이 경우 staticNation 정보를 조회한다.
-    $general = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
+    $general = General::createGeneralObjFromDB($generalID);
    $nationID = $general->getNationID();
    $cityID = $general->getCityID();

-    $limitState = checkLimit($general->getAccessLogVar(GeneralAccessLogColumn::refreshScore, 0));
-    if ($limitState >= 2) {
+    $con = checkLimit($general->getVar('con'));
+    if ($con >= 2) {
      return [
        'result' => false,
        'reason' => '접속 제한중입니다.',
@@ -1,81 +0,0 @@
-<?php
-
-namespace sammo\API\General;
-
-use sammo\DB;
-use sammo\DummyGeneral;
-use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralAccessLogColumn;
-use sammo\GameConst;
-use sammo\Session;
-use sammo\General;
-use sammo\JosaUtil;
-use sammo\KVStorage;
-use sammo\LiteHashDRBG;
-use sammo\RandUtil;
-use sammo\TimeUtil;
-use sammo\UniqueConst;
-use sammo\Util;
-
-use function sammo\addTurn;
-use function sammo\buildGeneralCommandClass;
-use function sammo\increaseRefresh;
-
-class InstantRetreat extends \sammo\BaseAPI
-{
-  public function validateArgs(): ?string
-  {
-    return null;
-  }
-
-  public function getRequiredSessionMode(): int
-  {
-    return static::REQ_GAME_LOGIN;
-  }
-
-  public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
-  {
-
-    if(!(GameConst::$availableInstantAction['instantRetreat'] ?? false)){
-        return '접경귀환을 사용할 수 없는 시나리오입니다.';
-    }
-
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $gameStor->cacheAll();
-
-    $general = General::createObjFromDB($session->generalID);
-
-    if (!$general) {
-      return '장수가 없습니다';
-    }
-
-    increaseRefresh("접경귀환", 1);
-
-    $commandObj = buildGeneralCommandClass('che_접경귀환', $general, $gameStor->getAll(true));
-    $logger = $general->getLogger();
-
-    if (!$commandObj->hasFullConditionMet()) {
-        $logger->pushGeneralActionLog($commandObj->getFailString());
-        $reason = $commandObj->getFailString();
-        return $reason;
-    }
-
-    $result = $commandObj->run(new RandUtil(
-        new LiteHashDRBG(Util::simpleSerialize(
-            UniqueConst::$hiddenSeed,
-            'InstantRetreat',
-            $general->getID(),
-            $gameStor->year,
-            $gameStor->month,
-            $general->getCityID(),
-        ))
-    ));
-
-    if (!$result) {
-        return '가까운 아국 도시가 없습니다.';
-    }
-
-    return null;
-  }
-}
@@ -8,7 +8,6 @@ use sammo\Auction;
 use sammo\CityConst;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\RankColumn;
 use sammo\GameConst;
 use sammo\GameUnitConst;
@@ -54,7 +53,7 @@ class Join extends \sammo\BaseAPI
                'leadership',
                'strength',
                'intel',
-                'inheritTurntimeZone',
+                'inheritTurntime',
            ])
            ->rule('boolean', [
                'pic'
@@ -72,8 +71,7 @@ class Join extends \sammo\BaseAPI
            ], GameConst::$defaultStatMax)
            ->rule('in', 'character', array_merge(GameConst::$availablePersonality, ['Random']))
            ->rule('in', 'inheritSpecial', GameConst::$availableSpecialWar)
-            ->rule('min', 'inheritTurntimeZone', 0)
-            ->rule('max', 'inheritTurntimeZone', 59)
+            ->rule('min', 'inheritTurntime', 0)
            ->rule('in', 'inheritCity', array_keys(CityConst::all()))
            ->rule('integerArray', 'inheritBonusStat');

@@ -99,7 +97,7 @@ class Join extends \sammo\BaseAPI
        }

        $gameID = UniqueConst::$serverID;
-        $alreadyJoined = $db->queryFirstField('SELECT COUNT(*) FROM `inheritance_result` WHERE `server_id` = %s AND `owner` = %i', $gameID, $userID);
+        $alreadyJoined = $db->queryFirstField('SELECT count(*) FROM `storage` WHERE `namespace` = %s AND `key` LIKE %s', 'inheritance_result', "{$gameID}_{$userID}_%");
        if ($alreadyJoined) {
            //이미 받았음
            return 0;
@@ -140,28 +138,22 @@ class Join extends \sammo\BaseAPI
        $intel = $this->args['intel'];

        $inheritSpecial = $this->args['inheritSpecial'] ?? null;
-        $inheritTurntimeZone = $this->args['inheritTurntimeZone'] ?? null;
+        $inheritTurntime = $this->args['inheritTurntime'] ?? 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, `penalty` FROM member WHERE no=%i', $userID);
+        $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr 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']);
@@ -239,7 +231,7 @@ class Join extends \sammo\BaseAPI
        if ($inheritSpecial !== null) {
            $inheritRequiredPoint += GameConst::$inheritBornSpecialPoint;
        }
-        if ($inheritTurntimeZone !== null) {
+        if ($inheritTurntime !== null) {
            $inheritRequiredPoint += GameConst::$inheritBornTurntimePoint;
        }

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

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

            $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,6 +414,8 @@ class Join extends \sammo\BaseAPI
            'officer_level' => 0,
            'turntime' => $turntime,
            'killturn' => 6,
+            'lastconnect' => $now,
+            'lastrefresh' => $now,
            'crewtype' => GameUnitConst::DEFAULT_CREWTYPE,
            'makelimit' => 0,
            'betray' => $betray,
@@ -433,15 +425,9 @@ class Join extends \sammo\BaseAPI
            'specage' => $specage,
            'special' => $special,
            'specage2' => $specage2,
-            'special2' => $special2,
-            'penalty' => Json::encode($penalty),
+            'special2' => $special2
        ]);
        $generalID = $db->insertId();
-        $db->insert('general_access_log', [
-            GeneralAccessLogColumn::generalID->value => $generalID,
-            GeneralAccessLogColumn::userID->value => $userID,
-            GeneralAccessLogColumn::lastRefresh->value => $now,
-        ]);

        if($blockCustomGeneralName){
            //XXX: 클래스가 이게 맞나?
@@ -42,19 +42,16 @@ class GeneralList extends \sammo\BaseAPI
        $userID = $session->userID;
        if ($session->isGameLoggedIn()) {
            increaseRefresh("장수일람", 2);
-            $me = $db->queryFirstRow(
-                'SELECT refresh_score, turntime FROM `general`
-                LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
-            );
-            $limitState = checkLimit($me['refresh_score']);
-            if ($limitState >= 2) {
+            $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
+            $con = checkLimit($me['con']);
+            if ($con >= 2) {
                return '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.';
            }
        } else {
            $availableNextCall = $session->availableNextCallGetGeneralList ?? '2000-01-01 00:00:00';
            $now = new \DateTimeImmutable();

-            if ($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 6) {
+            if ($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 5) {
                return "장수 리스트는 10초에 한번 갱신 가능합니다.\n다음 시간 : " . $availableNextCall;
            }

@@ -65,8 +62,7 @@ class GeneralList extends \sammo\BaseAPI
        $session->setReadOnly();


-        $rawGeneralList = $db->queryAllLists(
-            'SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,owner_name as ownerName,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,refresh_score_total from `general` LEFT JOIN `general_access_log` ON general.no = general_access_log.general_id');
+        $rawGeneralList = $db->queryAllLists('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,owner_name as ownerName,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect from general');

        $ownerNameList = [];
        if ($gameStor->isunited) {
@@ -77,7 +73,7 @@ class GeneralList extends \sammo\BaseAPI

        $generalList = [];
        foreach ($rawGeneralList as $rawGeneral) {
-            [$owner, $no, $picture, $imgsvr, $npc, $age, $nation, $special, $special2, $personal, $name, $ownerName, $injury, $leadership, $strength, $intel, $experience, $dedication, $officerLevel, $killturn, $refreshScoreTotal] = $rawGeneral;
+            [$owner, $no, $picture, $imgsvr, $npc, $age, $nation, $special, $special2, $personal, $name, $ownerName, $injury, $leadership, $strength, $intel, $experience, $dedication, $officerLevel, $killturn, $connectCnt] = $rawGeneral;

            if (key_exists($owner, $ownerNameList)) {
                $ownerName = $ownerNameList[$owner];
@@ -108,7 +104,7 @@ class GeneralList extends \sammo\BaseAPI
                getDed($dedication),
                getOfficerLevelText($officerLevel, $nationArr['level']),
                $killturn,
-                $refreshScoreTotal ?: 0,
+                $connectCnt
            ];
        }

@@ -133,8 +129,6 @@ class GeneralList extends \sammo\BaseAPI
            'honorText',
            'dedLevelText',
            'officerLevelText',
-            'killturn',
-            'refreshScoreTotal',
        ];

        $result = [
@@ -55,11 +55,7 @@ class GetCachedMap extends \sammo\BaseAPI
      return 'cache 불가';
    }

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

    $now = TimeUtil::nowDateTimeImmutable();
@@ -288,10 +288,6 @@ 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);

@@ -148,16 +148,13 @@ class GetHistory extends \sammo\BaseAPI
      }
      increaseRefresh("연감", 1);

-      $me = $db->queryFirstRow(
-        'SELECT refresh_score, turntime FROM `general`
-        LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner = %i', $session->userID
-      );
+      $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner = %i', $session->userID);
      if (!$me) {
        return '장수가 사망했습니다.';
      }

-      $limitState = checkLimit($me['refresh_score']);
-      if ($limitState >= 2) {
+      $con = checkLimit($me['con']);
+      if ($con >= 2) {
        return templateLimitMsg($me['turntime']);
      }
    }
@@ -49,7 +49,7 @@ class BuyHiddenBuff extends \sammo\BaseAPI
        $type = $this->args['type'];
        $level = $this->args['level'];

-        $general = General::createObjFromDB($generalID);
+        $general = General::createGeneralObjFromDB($generalID);
        if ($userID != $general->getVar('owner')) {
            return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
        }
@@ -31,7 +31,7 @@ class BuyRandomUnique extends \sammo\BaseAPI
        $userID = $session->userID;
        $generalID = $session->generalID;

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

-        $general = General::createObjFromDB($generalID);
+        $general = General::createGeneralObjFromDB($generalID);
        if ($userID != $general->getVar('owner')) {
            return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
        }
@@ -1,183 +0,0 @@
-<?php
-
-namespace sammo\API\InheritAction;
-
-use sammo\Session;
-use DateTimeInterface;
-use sammo\DB;
-use sammo\Enums\APIRecoveryType;
-use sammo\Enums\RankColumn;
-use sammo\GameConst;
-use sammo\General;
-use sammo\KVStorage;
-use sammo\LiteHashDRBG;
-use sammo\RandUtil;
-use sammo\UniqueConst;
-use sammo\UserLogger;
-use sammo\Util;
-use sammo\Validator;
-
-class ResetStat extends \sammo\BaseAPI
-{
-    public function validateArgs(): ?string
-    {
-        $v = new Validator($this->args);
-        $v->rule('required', [
-            'leadership',
-            'strength',
-            'intel',
-        ])
-            ->rule('int', [
-                'leadership',
-                'strength',
-                'intel',
-            ])
-            ->rule('min', [
-                'leadership',
-                'strength',
-                'intel'
-            ], GameConst::$defaultStatMin)
-            ->rule('max', [
-                'leadership',
-                'strength',
-                'intel'
-            ], GameConst::$defaultStatMax)
-            ->rule('integerArray', 'inheritBonusStat');
-
-        if (!$v->validate()) {
-            return $v->errorStr();
-        }
-        return null;
-    }
-
-    public function getRequiredSessionMode(): int
-    {
-        //General.aux 쓰므로 lock;
-        return static::REQ_GAME_LOGIN;
-    }
-
-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
-    {
-        $userID = $session->userID;
-        $generalID = $session->generalID;
-
-
-        $leadership = $this->args['leadership'];
-        $strength = $this->args['strength'];
-        $intel = $this->args['intel'];
-        $inheritBonusStat = $this->args['inheritBonusStat'] ?? null;
-
-        if ($leadership + $strength + $intel != GameConst::$defaultStatTotal) {
-            return "능력치 총합이 " . GameConst::$defaultStatTotal . "이 아닙니다. 다시 입력해주세요!";
-        }
-
-        if ($inheritBonusStat) {
-            if (count($inheritBonusStat) != 3) {
-                return "보너스 능력치가 잘못 지정되었습니다. 다시 입력해주세요!";
-            }
-            foreach ($inheritBonusStat as $stat) {
-                if ($stat < 0) {
-                    return "보너스 능력치가 음수입니다. 다시 입력해주세요!";
-                }
-            }
-            $sum = array_sum($inheritBonusStat);
-            if ($sum == 0) {
-                $inheritBonusStat = null;
-            } else if ($sum < 3 || $sum > 5) {
-                return "보너스 능력치 합이 잘못 지정되었습니다. 다시 입력해주세요!";
-            }
-        }
-
-        $general = General::createObjFromDB($generalID);
-        if ($userID != $general->getVar('owner')) {
-            return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
-        }
-        $userLogger = new UserLogger($userID);
-
-        if($general->getNPCType() != 0){
-            return 'NPC는 능력치 초기화를 할 수 없습니다.';
-        }
-
-
-        $db = DB::db();
-        $gameStor = KVStorage::getStorage($db, 'game_env');
-        $gameStor->cacheValues([
-            'isunited',
-            'season',
-        ]);
-        if ($gameStor->isunited) {
-            return '이미 천하가 통일되었습니다.';
-        }
-        $userStor = KVStorage::getStorage($db, "user_{$userID}");
-
-        $lastUserStatReset = $userStor->getValue('last_stat_reset') ?? [];
-        $gameSeason = $gameStor->getValue('season');
-
-        if (array_search($gameSeason, $lastUserStatReset) !== false) {
-            return '이번 시즌에 이미 능력치를 초기화하셨습니다.';
-        }
-
-
-        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
-        $previousPoint = ($inheritStor->getValue('previous') ?? [0, 0])[0];
-        $reqAmount = 0;
-        if ($inheritBonusStat !== null) {
-            $reqAmount += GameConst::$inheritBornStatPoint;
-        }
-
-        if ($previousPoint < $reqAmount) {
-            return '충분한 유산 포인트를 가지고 있지 않습니다.';
-        }
-
-        $userLogger->push("통솔 {$leadership}, 무력 {$strength}, 지력 {$intel} 스탯 재설정", "inheritPoint");
-
-        if ($inheritBonusStat) {
-            $pleadership = $inheritBonusStat[0] ?? 0;
-            $pstrength = $inheritBonusStat[1] ?? 0;
-            $pintel = $inheritBonusStat[2] ?? 0;
-            $userLogger->push("{$reqAmount}로 통솔 {$pleadership}, 무력 {$pstrength}, 지력 {$pintel} 보너스 능력치 적용", "inheritPoint");
-        } else {
-            $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
-                UniqueConst::$hiddenSeed,
-                'ResetStat',
-                $userID,
-            )));
-            $pleadership = 0;
-            $pstrength = 0;
-            $pintel = 0;
-            foreach (Util::range($rng->nextRangeInt(3, 5)) as $statIdx) {
-                switch ($rng->choiceUsingWeight([$leadership, $strength, $intel])) {
-                    case 0:
-                        $pleadership++;
-                        break;
-                    case 1:
-                        $pstrength++;
-                        break;
-                    case 2:
-                        $pintel++;
-                        break;
-                }
-            }
-            $userLogger->push("통솔 {$pleadership}, 무력 {$pstrength}, 지력 {$pintel} 보너스 능력치 적용", "inheritPoint");
-        }
-
-        $leadership += $pleadership;
-        $strength += $pstrength;
-        $intel += $pintel;
-
-        $lastUserStatReset[] = $gameSeason;
-
-
-        $general->setVar('leadership', $leadership);
-        $general->setVar('strength', $strength);
-        $general->setVar('intel', $intel);
-
-        $userLogger->flush();
-
-        $inheritStor->setValue('previous', [$previousPoint - $reqAmount, null]);
-        $userStor->setValue('last_stat_reset', $lastUserStatReset);
-        $general->increaseRankVar(RankColumn::inherit_point_spent_dynamic, $reqAmount);
-        $general->applyDB($db);
-        return null;
-    }
-}
@@ -36,7 +36,7 @@ class ResetTurnTime extends \sammo\BaseAPI
        $userID = $session->userID;
        $generalID = $session->generalID;

-        $general = General::createObjFromDB($generalID);
+        $general = General::createGeneralObjFromDB($generalID);
        if ($userID != $general->getVar('owner')) {
            return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
        }
@@ -52,7 +52,7 @@ class ResetTurnTime extends \sammo\BaseAPI

        $db = DB::db();
        $gameStor = KVStorage::getStorage($db, 'game_env');
-        if ($gameStor->isunited) {
+        if($gameStor->isunited){
            return '이미 천하가 통일되었습니다.';
        }
        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
@@ -62,25 +62,36 @@ class ResetTurnTime extends \sammo\BaseAPI
        }

        $gameStor = KVStorage::getStorage($db, 'game_env');
-        $turnTerm = $gameStor->getValue('turnterm');
+        [$turnTerm, $serverTurnTime] = $gameStor->getValuesAsArray(['turnterm', 'turntime']);

        $currTurnTime = new DateTimeImmutable($general->getTurnTime());
+        $serverTurnTimeObj = new DateTimeImmutable($serverTurnTime);

        $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
            UniqueConst::$hiddenSeed,
            'ResetTurnTime',
            $userID,
-            $general->getAuxVar('nextTurnTimeBase') ?? $general->getTurnTime()
+            $general->getTurnTime()
        )));

-        $afterTurn = $rng->nextFloat1() * $turnTerm * 60;
+        $afterTurn = $rng->nextRange($turnTerm * -60 / 2, $turnTerm * 60 / 2);

        $userLogger = new UserLogger($userID);
-        $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾸어 다다음 턴부터 %02d:%02d 적용", intdiv(Util::toInt($afterTurn), 60), $afterTurn % 60), "inheritPoint");
+        if($afterTurn >= 0){
+            $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 뒤로 밀림", intdiv(Util::toInt($afterTurn), 60), $afterTurn%60), "inheritPoint");
+        }
+        else{
+            $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 앞으로 당김", intdiv(Util::toInt(-$afterTurn), 60), (-$afterTurn)%60), "inheritPoint");
+        }
        $userLogger->flush();

+        $turnTime = $currTurnTime->add(TimeUtil::secondsToDateInterval($afterTurn));
+        if ($turnTime <= $serverTurnTimeObj && $serverTurnTimeObj <= $currTurnTime) {
+            $turnTime = $turnTime->add(TimeUtil::secondsToDateInterval($turnTerm * 60));
+        }
+
+        $general->setVar('turntime', TimeUtil::format($turnTime, true));
        $general->setAuxVar('inheritResetTurnTime', $nextLevel);
-        $general->setAuxVar('nextTurnTimeBase', $afterTurn);
        $inheritStor->setValue('previous', [$previousPoint - $reqPoint, null]);
        $general->increaseRankVar(RankColumn::inherit_point_spent_dynamic, $reqPoint);
        $general->applyDB($db);
@@ -44,7 +44,7 @@ class SetNextSpecialWar extends \sammo\BaseAPI

        $type = $this->args['type'];

-        $general = General::createObjFromDB($generalID);
+        $general = General::createGeneralObjFromDB($generalID);
        if ($userID != $general->getVar('owner')) {
            return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
        }
@@ -75,7 +75,7 @@ class GetOldMessage extends \sammo\BaseAPI


    $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
+    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);

    if ($me === null) {
      return '장수가 사망했습니다.';
@@ -73,7 +73,7 @@ class GetRecentMessage extends \sammo\BaseAPI


    $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
+    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);

    if ($me === null) {
      return '장수가 사망했습니다.';
@@ -7,12 +7,9 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\MessageType;
-use sammo\Enums\PenaltyKey;
-use sammo\Json;
 use sammo\Message;
 use sammo\MessageTarget;
 use sammo\Validator;
-use sammo\Util;

 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
@@ -111,7 +108,7 @@ class SendMessage extends \sammo\BaseAPI
    $unlimited = new \DateTime('9999-12-31');

    $db = DB::db();
-    $destUser = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`picture`,`imgsvr`,permission,penalty FROM general WHERE `no`=%i', $destGeneralID);
+    $destUser = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,permission,penalty FROM general WHERE `no`=%i', $destGeneralID);

    if (!$destUser) {
      return '존재하지 않는 유저입니다.';
@@ -163,20 +160,15 @@ class SendMessage extends \sammo\BaseAPI
    }

    $db = DB::db();
-    $me = $db->queryFirstRow(
-      'SELECT `no`,`name`,`nation`,`officer_level`,`refresh_score`,`picture`,`imgsvr`,penalty,permission,belong FROM `general`
-      LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE `owner`=%i', $userID
-    );
+    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission,belong FROM general WHERE `owner`=%i', $userID);

    if (!$me) {
      $session->logoutGame();
      return '장수가 없습니다.';
    }

-    $penalty = Json::decode($me['penalty'] ?? '{}');
-
-    $limitState = checkLimit($me['refresh_score']);
-    if ($limitState >= 2) {
+    $con = checkLimit($me['con']);
+    if ($con >= 2) {
      return '접속 제한입니다.';
    }

@@ -192,9 +184,6 @@ class SendMessage extends \sammo\BaseAPI

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

@@ -50,7 +50,7 @@ class UploadImage extends \sammo\BaseAPI
        }

        $extension = ltrim($contentType, 'image/');
-        $validExtensions = ['png', 'jpeg', 'jpg', 'gif', 'webp', 'avif'];
+        $validExtensions = ['png', 'jpeg', 'jpg', 'gif', 'webp'];
        if (!in_array(strtolower($extension), $validExtensions)) {
            return '지원하지 않는 이미지 파일입니다: ' . $contentType;
        }
@@ -5,10 +5,7 @@ namespace sammo\API\Nation;
 use ArrayObject;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
-use sammo\Enums\GeneralLiteQueryMode;
-use sammo\Enums\GeneralQueryMode;
 use sammo\General;
-use sammo\GeneralLite;
 use sammo\Session;
 use sammo\Util;

@@ -47,10 +44,12 @@ class GeneralList extends \sammo\BaseAPI
        'special2' => 0,
        'personal' => 0,
        'belong' => 0,
+        'connect' => 0,

        'troop' => 0,
        'city' => 0,

+        'con' => 1,
        'specage' => 0,
        'specage2' => 0,
        'leadership_exp' => 1,
@@ -84,11 +83,6 @@ class GeneralList extends \sammo\BaseAPI

        'owner_name' => 9, //안씀.

-
-        //accessLog
-        'refresh_score_total' => 0,
-        'refresh_score' => 1,
-
        //RANK
        'warnum' => 1,
        'killnum' => 1,
@@ -101,8 +95,6 @@ class GeneralList extends \sammo\BaseAPI
    static $columnRemap = [
        'special' => 'specialDomestic',
        'special2' => 'specialWar',
-        'refresh_score_total' => 'refreshScoreTotal',
-        'refresh_score' => 'refreshScore',
        'aux' => null,
    ];

@@ -151,12 +143,9 @@ class GeneralList extends \sammo\BaseAPI
        $gameStor = \sammo\KVStorage::getStorage($db, 'game_env');
        $env = $gameStor->getValues(['year', 'month', 'turntime', 'turnterm', 'autorun_user', 'killturn']);

-        $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', $session->getUserID()
-        );
-        $limitState = checkLimit($me['refresh_score']);
-        if ($limitState >= 2) {
+        $me = $db->queryFirstRow('SELECT con, turntime, belong, nation, officer_level, permission, penalty FROM general WHERE owner=%i', $session->getUserID());
+        $con = checkLimit($me['con']);
+        if ($con >= 2) {
            return '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.';
        }

@@ -167,18 +156,9 @@ class GeneralList extends \sammo\BaseAPI



-        [$queryColumns, $rankColumns, $accessLogColumns] = GeneralLite::mergeQueryColumn(array_keys(static::$viewColumns), GeneralLiteQueryMode::Lite);
+        [$queryColumns, $rankColumns] = General::mergeQueryColumn(array_keys(static::$viewColumns), 1);

-        $rawGeneralList = Util::convertArrayToDict(
-            $db->query(
-                'SELECT %l, %l from `general` LEFT JOIN general_access_log
-                ON `general`.`no` = general_access_log.general_id WHERE nation = %i ORDER BY turntime ASC',
-                Util::formatListOfBackticks($queryColumns),
-                Util::formatListOfBackticks($accessLogColumns),
-                $nationID
-            ),
-            'no'
-        );
+        $rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE nation = %i ORDER BY turntime ASC', Util::formatListOfBackticks($queryColumns), $nationID), 'no');

        /** @var ArrayObject[] */
        $troops = [];
@@ -199,19 +179,19 @@ class GeneralList extends \sammo\BaseAPI
        if ($this->permission >= 1 || count($troops)) {
            $reservedCommandTargetGeneralIDList = [];

-            if ($this->permission >= 1) {
+            if($this->permission >= 1){
                foreach ($rawGeneralList as $rawGeneral) {
                    if ($rawGeneral['npc'] < 2) {
                        $reservedCommandTargetGeneralIDList[$rawGeneral['no']] = $rawGeneral['no'];
                    }
                }
            }
-            foreach ($troops as $troop) {
+            foreach($troops as $troop){
                $reservedCommandTargetGeneralIDList[$troop['id']] = $troop['id'];
            }


-            if ($reservedCommandTargetGeneralIDList) {
+            if($reservedCommandTargetGeneralIDList){
                $rawTurnList = $db->query(
                    'SELECT general_id, turn_idx, action, arg, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id asc, turn_idx asc',
                    array_values($reservedCommandTargetGeneralIDList)
@@ -298,11 +278,11 @@ class GeneralList extends \sammo\BaseAPI
            $resultColumns[$column] = $column;
        }

-        foreach ($troops as $troop) {
+        foreach ($troops as $troop){
            $troopLeaderID = $troop['id'];
-            $troop['reservedCommand'] = array_map(function ($turnObj) {
+            $troop['reservedCommand'] = array_map(function($turnObj){
                $brief = $turnObj['brief'];
-                if ($brief == '집합') {
+                if($brief == '집합'){
                    return $brief;
                }
                return '-';
@@ -313,7 +293,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 = [];
@@ -109,12 +109,10 @@ class GetGeneralLog extends \sammo\BaseAPI
        $reqTo = $this->args['reqTo'] ?? null;

        $db = DB::db();
-        $me = $db->queryFirstRow(
-            'SELECT no,nation,officer_level,refresh_score,turntime,belong,permission,penalty FROM `general`
-            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID);
+        $me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);

-        $limitState = checkLimit($me['refresh_score']);
-        if ($limitState >= 2) {
+        $con = checkLimit($me['con']);
+        if ($con >= 2) {
            return '접속 제한입니다.';
        }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hide_D	a0b24d0b23	fix: crewtype 미지정시 기본 병종	2023-05-11 09:28:52 +09:00
Hide_D	41285be62d	game: 정란, 벽력거 설명 추가	2023-05-11 02:55:55 +09:00
Hide_D	b0b9904b7d	game: 성벽선제인 경우에만 성벽도 선제공격	2023-05-11 02:55:13 +09:00
Hide_D	03f19ae608	game: 성벽이 선제공격	2023-05-11 02:46:18 +09:00
Hide_D	b9e77dadd3	fix: 시뮬레이션 결과에서 warning 제거	2023-05-11 02:30:23 +09:00
Hide_D	e57e387353	fix: 디버그 메시지 제거	2023-05-11 02:25:52 +09:00
Hide_D	4cd273b89f	fix: 성벽선제 동작 개시	2023-05-11 02:15:27 +09:00
Hide_D	fd6405ea97	fix: 성벽 선제가 호출조차 되지 않는 버그 수정	2023-05-11 01:58:16 +09:00
Hide_D	265a5ebf5c	fix: 디버그 코드 제거	2023-05-11 01:46:14 +09:00
Hide_D	5859b78ad5	fix: 도시 관련 전투 제어	2023-05-11 01:39:50 +09:00
Hide_D	5229cbe09e	fix: 누락분 수정	2023-05-11 01:08:10 +09:00
Hide_D	8f5d9194f8	feat: CrewType에 iAction 개념을 넣고 처리할 수 있도록 - GameUnitDetail에 iAction 리스트 추가	2023-05-11 00:50:58 +09:00