compare: trace nation betting user lifecycle

- storage에 의미없이 쌓이는 데이터 이관

.gitignore

@@ -29,6 +29,7 @@ d_pic/*.jpg
 d_pic/*.gif
 d_pic/*.png
 d_pic/*.webp
+d_pic/*.avif
 d_pic/uploaded_image
 
 /dist_js
@@ -69,3 +70,5 @@ gateway/js/*
 gateway/css/*
 
 *.db-journal
+
+d_log/cachegrind.*

.phan/config.php

@@ -15,9 +15,8 @@ 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.1',
-    "minimum_target_php_version" => '8.1',
-    'backward_compatibility_checks ' => true,
+    "target_php_version" => '8.2',
+    "minimum_target_php_version" => '8.2',
     'minimum_severity' => \Phan\Issue::SEVERITY_NORMAL,
 
     'file_list' => [
@@ -29,8 +28,6 @@ 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',

.vscode/settings.json

@@ -29,5 +29,5 @@
         "josa",
         "sammo"
     ],
-    "editor.tabSize": 2
+    "editor.tabSize": 4
 }

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2022 Hide_D, 62che
+Copyright (c) 2023 Hide_D, 62che
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -8,12 +8,11 @@
     ],
     "config": {
         "platform": {
-            "php": "8.2"
+            "php": "8.3"
         }
     },
     "require": {
-        "brandonwamboldt/utilphp": "^1.1",
-        "sergeytsalkov/meekrodb": "^2.3",
+        "sergeytsalkov/meekrodb": "^2.5",
         "league/plates": "^3.5",
         "vlucas/valitron": "^1.4",
         "php-extended/php-tail": "^5.0",
@@ -22,10 +21,10 @@
         "xemlock/htmlpurifier-html5": "^0.1.7",
         "catfan/medoo": "^2.1",
         "phan/phan": "^5.4",
-        "nette/caching": "^3.2",
+        "nette/caching": "^3.3",
         "illuminate/database": "^10.0",
         "illuminate/events": "^10.0",
-        "php-ds/php-ds": "^1.4",
+        "php-ds/php-ds": "^1.5",
         "hided62/ldto": "^1.0",
         "league/uri": "^6.8"
     },

composer.lock

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

f_config/config.php

@@ -99,7 +99,10 @@ 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 $text) {
+    $trace = array_map(function (string|array $text) {
+        if (is_array($text)) {
+            $text = Json::encode($text);
+        }
         return str_replace(ROOT, '{ROOT}', $text);
     }, $trace);
 

f_install/install.php

@@ -30,10 +30,10 @@ require(__DIR__ . '/../vendor/autoload.php');
 
 <body>
     <div class="container">
-        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 설치</h1>
-        <div class="row justify-content-md-center">
+        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 설치</h1>
+        <div class="row justify-content-lg-center">
 
-            <div class="col col-12 col-md-10 col-lg-7">
+            <div class="col col-12 col-lg-10 col-lg-7">
                 <div class="card" id="db_form_card" style="display:none">
                     <h3 class="card-header">
                         설치(DB 설정)

f_install/j_create_admin.php

@@ -56,7 +56,7 @@ $rootDB->insert('member', [
     'token_valid_until' => '2999-01-01 00:00:00',
     'pw' => $finalPassword,
     'salt' => $userSalt,
-    'grade' => 6,
+    'grade' => 7,
     'name' => $nickname,
     'reg_date' => $nowDate
 ]);

f_install/j_install_status.php

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

f_install/j_setup_db.php

@@ -150,20 +150,12 @@ if (!file_exists(ROOT . '/d_setting/.htaccess')) {
 $rootDB = new \MeekroDB($host, $username, $password, $dbName, $port, 'utf8mb4');
 $rootDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
 
-$rootDB->throw_exception_on_nonsql_error = false;
-$rootDB->nonsql_error_handler = function ($params) {
+$rootDB->addHook('run_failed', function ($args) {
     Json::die([
         'result' => false,
-        'reason' => 'DB 접속에 실패했습니다.'
+        'reason' => '에러.'. $args['error']
     ]);
-};
-
-$rootDB->error_handler = function ($params) {
-    Json::die([
-        'result' => false,
-        'reason' => 'SQL을 제대로 실행하지 못했습니다. DB상태를 확인해 주세요.'
-    ]);
-};
+});
 
 $mysqli_obj = $rootDB->get(); //로그인에 실패할 경우 자동으로 dbConnFail()이 실행됨.
 

f_install/sql/common_schema.sql

@@ -92,4 +92,14 @@ CREATE TABLE `login_token` (
 	INDEX `by_date` (`user_id`, `expire_date`)
 )
 COLLATE='utf8mb4_general_ci'
-ENGINE=Aria;
+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;

hwe/_admin1.php

@@ -6,7 +6,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if($session->userGrade < 5) {
+if($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 

hwe/_admin1_submit.php

@@ -6,7 +6,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     header('location:_admin1.php');
     die();
 }
@@ -74,28 +74,7 @@ switch ($btn) {
         case "120분턴": $turnterm = 120; break;
         default: throw new \Exception("알 수 없는 턴 기간");
         }
-        $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</>으로 변경됩니다."]);
+        ServerTool::changeServerTerm($turnterm);
         break;
 }
 

hwe/_admin2.php

@@ -7,7 +7,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 

hwe/_admin2_submit.php

@@ -15,7 +15,7 @@ $msg = Util::getPost('msg', 'string');
 //로그인 검사
 $session = Session::requireLogin()->loginGame()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     header('location:_admin2.php');
 }
 
@@ -33,18 +33,18 @@ $src = MessageTarget::buildQuick($session->generalID);
 $genObjList = [];
 $env = [];
 if ($genlist) {
-    $genObjList = General::createGeneralObjListFromDB($genlist);
+    $genObjList = General::createObjListFromDB($genlist);
     $env = $gameStor->cacheAll();
 }
 switch ($btn) {
     case "전체 접속허용":
-        $db->update('general', [
-            'con' => 0
+        $db->update('general_access_log', [
+            'refresh_score' => 0
         ], true);
         break;
     case "전체 접속제한":
-        $db->update('general', [
-            'con' => 1000
+        $db->update('general_access_log', [
+            'refresh_score' => 1000
         ], true);
         break;
     case "블럭 해제":
@@ -186,14 +186,14 @@ switch ($btn) {
         ], '`no` IN %li', $genlist);
         break;
     case "접속 허용":
-        $db->update('general', [
-            'con' => 0
-        ], '`no` IN %li', $genlist);
+        $db->update('general_access_log', [
+            'refresh_score' => 0
+        ], '`general_id` IN %li', $genlist);
         break;
     case "접속 제한":
-        $db->update('general', [
-            'con' => 1000
-        ], '`no` IN %li', $genlist);
+        $db->update('general_access_log', [
+            'refresh_score' => 1000
+        ], '`general_id` IN %li', $genlist);
         break;
     case "메세지 전달":
         $text = $msg ?? '';

hwe/_admin4.php

@@ -1,133 +0,0 @@
-<?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>

hwe/_admin4_submit.php

@@ -1,86 +0,0 @@
-<?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');

hwe/_admin5.php

@@ -20,7 +20,7 @@ if ($type2 < 0 || $type2 > 6) {
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 
@@ -66,8 +66,6 @@ $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>
@@ -105,8 +103,6 @@ $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>
@@ -147,8 +143,6 @@ 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,
@@ -193,12 +187,6 @@ 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;
@@ -240,8 +228,6 @@ 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>

hwe/_admin5_submit.php

@@ -12,7 +12,7 @@ $nation = Util::getPost('nation', 'int');
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     header('location:_admin5.php');
     die();
 }

hwe/_admin7.php

@@ -2,6 +2,8 @@
 
 namespace sammo;
 
+use sammo\Enums\GeneralQueryMode;
+
 include "lib.php";
 include "func.php";
 
@@ -29,13 +31,13 @@ $queryMap = [
 ];
 
 if ($reqQueryType === null || !key_exists($reqQueryType, $queryMap)) {
-    $reqQueryType = Util::array_first_key($queryMap);
+    $reqQueryType = array_key_first($queryMap);
 }
 
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 
@@ -74,7 +76,7 @@ if (!$gen) {
     $gen = $generalBasicList[0]['no'];
 }
 
-$generalObj = General::createGeneralObjFromDB($gen);
+$generalObj = General::createObjFromDB($gen, null, GeneralQueryMode::FullWithAccessLog);
 
 ?>
 <!DOCTYPE html>

hwe/_admin8.php

@@ -12,7 +12,7 @@ $type = 0;
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 

hwe/_admin_force_rehall.php

@@ -7,7 +7,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die('권한 부족');
 }
 
@@ -26,7 +26,7 @@ foreach ($db->queryFirstColumn(
 }
 
 $inheritPointManager = InheritancePointManager::getInstance();
-foreach(General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
+foreach(General::createObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
     $inheritPointManager->mergeTotalInheritancePoint($genObj);
     $inheritPointManager->applyInheritanceUser($genObj->getVar('owner'));
 }

hwe/a_genList.php

@@ -16,10 +16,13 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("장수일람", 2);
 
-$me = $db->queryFirstRow('SELECT con,turntime FROM general WHERE owner = %i', $userID);
+$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
+);
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
@@ -102,7 +105,7 @@ if ($gameStor->isunited) {
         6 => ['dedication', true],
         7 => ['officer_level', true],
         8 => ['killturn', false],
-        9 => ['connect', true],
+        9 => ['refresh_score_total', true],
         10 => ['experience', true],
         11 => ['personal', true],
         12 => ['special', true],
@@ -111,7 +114,12 @@ 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,connect from general 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,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' : ''
+    );
 
     echo "
 <table align=center width=1000 class='tb_layout bg0'>
@@ -163,7 +171,7 @@ if ($gameStor->isunited) {
             $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
         }
 
-        $general['connect'] = Util::round($general['connect'], -1);
+        $general['refresh_score_total'] = Util::round($general['refresh_score_total'], -1);
 
         $imageTemp = GetImageURL($general['imgsvr']);
         echo "
@@ -192,8 +200,8 @@ if ($gameStor->isunited) {
         <td align=center>$strength</td>
         <td align=center>$intel</td>
         <td align=center>{$general['killturn']}</td>
-        <td align=center>{$general['connect']}";
-        echo "<br>【" . getConnect($general['connect']) . "】</td>
+        <td align=center>" . $general['refresh_score_total'] ?? 0;
+        echo "<br>【" . getRefreshScoreText($general['refresh_score_total'] ?? 0) . "】</td>
     </tr>";
     }
     echo "

hwe/a_kingdomList.php

@@ -13,10 +13,13 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 $gameStor->cacheValues(['killturn', 'autorun_user', 'turnterm']);
 increaseRefresh("세력일람", 2);
 
-$me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
+$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
+);
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }

hwe/a_traffic.php

@@ -2,6 +2,8 @@
 
 namespace sammo;
 
+use sammo\Enums\GeneralAccessLogColumn;
+
 include "lib.php";
 include "func.php";
 
@@ -10,34 +12,19 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("갱신정보", 1);
 
-$admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxrefresh', 'maxonline']);
+$admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxrefresh', 'maxonline', 'recentTraffic']);
 
-$log = getRawFileLogRecent(__DIR__ . '/logs/' . UniqueConst::$serverID . '/_traffic.txt', 11, 100);
-
-$date = [];
-$year = [];
-$month = [];
-$refresh = [];
-$online = [];
+$recentTraffic = $admin['recentTraffic'] ?? [];
 
 $curonline = getOnlineNum();
-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();
+
+$recentTraffic[] = [
+    'year'    => $admin['year'],
+    'month'   => $admin['month'],
+    'refresh' => $admin['refresh'],
+    'online'  => $curonline,
+    'date' => TimeUtil::now()
+];
 
 if ($admin['maxrefresh'] == 0) {
     $admin['maxrefresh'] = 1;
@@ -111,13 +98,13 @@ if ($admin['maxonline'] < $curonline) {
                         </td>
                     </tr>
                     <?php
-                    $refresh[] = $admin['refresh'];
-                    foreach ($refresh as $i => $value) {
+                    foreach ($recentTraffic as $trafficItem) {
+                        $value = $trafficItem['refresh'];
                         $w = round($value / $admin['maxrefresh'] * 100, 1);
                         $color = getTrafficColor($w);
-                        $dt = substr($date[$i], 11, 5); ?>
+                        $dt = substr($trafficItem['date'], 11, 5); ?>
                         <tr height=30>
-                            <td width=100 align=center><?= $year[$i] ?>년 <?= $month[$i] ?>월</td>
+                            <td width=100 align=center><?= $trafficItem['year'] ?>년 <?= $trafficItem['month'] ?>월</td>
                             <td width=60 align=center class='bg2'><?= $dt ?></td>
                             <td width=2 align=center class='bg1'></td>
                             <td width=320>
@@ -152,13 +139,13 @@ if ($admin['maxonline'] < $curonline) {
                         </td>
                     </tr>
                     <?php
-                    $online[] = $curonline;
-                    foreach ($online as $i => $value) {
+                    foreach ($recentTraffic as $trafficItem) {
+                        $value = $trafficItem['online'];
                         $w = round($value / $admin['maxonline'] * 100, 1);
                         $color = getTrafficColor($w);
-                        $dt = substr($date[$i], 11, 5); ?>
+                        $dt = substr($trafficItem['date'], 11, 5); ?>
                         <tr height=30>
-                            <td width=100 align=center><?= $year[$i] ?>년 <?= $month[$i] ?>월</td>
+                            <td width=100 align=center><?= $trafficItem['year'] ?>년 <?= $trafficItem['month'] ?>월</td>
                             <td width=60 align=center class='bg2'><?= $dt ?></td>
                             <td width=2 align=center class='bg1'></td>
                             <td width=320>
@@ -193,19 +180,24 @@ if ($admin['maxonline'] < $curonline) {
             </td>
         </tr>
         <?php
-        $max_refresh = $db->queryFirstRow('SELECT sum(refresh) as refresh, sum(`connect`) as `connect` from general');
-        $max_refresh['name'] = '접속자 총합';
+        $totalRefresh = [
+            ...$db->queryFirstRow('SELECT sum(`refresh`) as `refresh`, sum(`refresh_score_total`) as `refresh_score_total` from general_access_log'),
+            'name' => '접속자 총합'
+        ];
 
-        $refresh_result = array_merge([$max_refresh], $db->query('SELECT `name`,refresh,`connect` FROM general ORDER BY refresh DESC LIMIT 5'));
+        $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'
+        );
 
-        foreach ($refresh_result as $i => $user) {
-            $w = round($user['refresh'] / max(1, $max_refresh['refresh']) * 100, 1);
+        foreach (array_merge([$totalRefresh], $top5Refresh) as $i => $user) {
+            $w = round($user['refresh'] / max(1, $totalRefresh['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['connect'] ?>(<?= $user['refresh'] ?>)</td>
+                <td width=98 align=center><?= $user['refresh_score_total'] ?>(<?= $user['refresh'] ?>)</td>
                 <td width=798>
                     <?php if ($w == 0) : ?>
                     <?php elseif ($w < 10) : ?>

hwe/b_betting.php

@@ -2,6 +2,8 @@
 
 namespace sammo;
 
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\RankColumn;
 
 include "lib.php";
@@ -21,12 +23,15 @@ $generalID = $session->generalID;
 
 
 
-$me = $db->queryFirstRow('SELECT no,tournament,con,turntime from general where owner=%i', $userID);
+$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
+);
 
 $admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'turnterm', 'develcost']);
 $turnTerm = $admin['turnterm'];
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
@@ -107,7 +112,7 @@ if ($str3) {
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
 
@@ -502,28 +507,28 @@ if ($str3) {
             $tournamentType = [
                 '전 력 전' => [
                     '종합',
-                    function (General $general) {
+                    function (GeneralLite $general) {
                         return $general->getVar('leadership') + $general->getVar('strength') + $general->getVar('intel');
                     },
                     'tt',
                 ],
                 '통 솔 전' => [
                     '통솔',
-                    function (General $general) {
+                    function (GeneralLite $general) {
                         return $general->getVar('leadership');
                     },
                     'tl',
                 ],
                 '일 기 토' => [
                     '무력',
-                    function (General $general) {
+                    function (GeneralLite $general) {
                         return $general->getVar('strength');
                     },
                     'ts',
                 ],
                 '설 전' => [
                     '지력',
-                    function (General $general) {
+                    function (GeneralLite $general) {
                         return $general->getVar('intel');
                     },
                     'ti',
@@ -560,12 +565,12 @@ if ($str3) {
                         $winColumn = RankColumn::from("{$rankColumn}w");
                         $drawColumn = RankColumn::from("{$rankColumn}d");
                         $loseColumn = RankColumn::from("{$rankColumn}l");
-                        $tournamentRankerList = General::createGeneralObjListFromDB(
+                        $tournamentRankerList = GeneralLite::createObjListFromDB(
                             $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'],
-                            0
+                            GeneralLiteQueryMode::Core
                         );
-                        usort($tournamentRankerList, function (General $lhs, General $rhs) use ($gameColumn, $winColumn, $drawColumn, $loseColumn) {
+                        usort($tournamentRankerList, function (GeneralLite $lhs, GeneralLite $rhs) use ($gameColumn, $winColumn, $drawColumn, $loseColumn) {
                             $result = - ($lhs->getRankVar($gameColumn) <=> $rhs->getRankVar($gameColumn));
                             if ($result !== 0) return $result;
                             $result = - (

hwe/b_currentCity.php

@@ -177,7 +177,7 @@ $templates = new \League\Plates\Engine('templates');
                                 $valid = 1;
                             }
 
-                            if ($userGrade >= 5) {
+                            if ($userGrade >= 6) {
                                 $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'], 2)[0];
+                            $dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'])[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 == 6) {
+                                if ($userGrade == 7) {
                                     $ourGeneral = true;
                                 }
 
@@ -327,8 +327,7 @@ $templates = new \League\Plates\Engine('templates');
 
                                 if ($ourGeneral && !$isNPC) {
                                     $turnText = [];
-                                    $generalObj = new General($general, null, null, null, null, null, false);
-                                    foreach ($generalTurnList[$generalObj->getID()] as $turnRawIdx => $turn) {
+                                    foreach ($generalTurnList[$general['no']] as $turnRawIdx => $turn) {
                                         $turnIdx = $turnRawIdx + 1;
                                         $turnText[] = "{$turnIdx} : $turn";
                                     }

hwe/b_genList.php

@@ -19,12 +19,15 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("암행부", 1);
 
-$me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);
+$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
+);
 
 $nationLevel = $db->queryFirstField('SELECT level FROM nation WHERE nation=%i', $me['nation']);
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
@@ -45,7 +48,7 @@ $templates = new \League\Plates\Engine('templates');
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
 

hwe/b_myGenInfo.php

@@ -97,7 +97,7 @@ if ($gameStor->isunited) {
         7 => ['gold', true],
         8 => ['rice', true],
         9 => ['crew', true],
-        10 => ['connect', true],
+        10 => ['refresh_score_total', true],
         11 => ['personal', true],
         12 => ['special', true],
         13 => ['special2', true],
@@ -105,7 +105,9 @@ 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,connect,gold,rice,crew,belong from general 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,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' : '');
 
     echo "
 <table align=center class='tb_layout bg0'>
@@ -173,8 +175,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['connect']}";
-        echo "<br>(" . getConnect($general['connect']) . ")</td>
+        <td align=center>". $general['refresh_score_total'] ?? 0;
+        echo "<br>(" . getRefreshScoreText($general['refresh_score_total'] ?? 0) . ")</td>
     </tr>";
     }
     echo "

hwe/b_myPage.php

@@ -2,6 +2,10 @@
 
 namespace sammo;
 
+use sammo\Enums\GeneralAccessLogColumn;
+use sammo\Enums\GeneralQueryMode;
+use sammo\Enums\TableName;
+
 include "lib.php";
 include "func.php";
 
@@ -20,7 +24,7 @@ $gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
 
 increaseRefresh("내정보", 1);
 
-$me = General::createGeneralObjFromDB($generalID);
+$me = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
 
 $myset = $me->getVar('myset');
 if ($myset > 0) {
@@ -29,7 +33,15 @@ if ($myset > 0) {
     $submit = 'hidden';
 }
 
-$targetTime = addTurn($me->getVar('lastrefresh'), $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
+$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);
 if ($gameStor->turntime <= $gameStor->opentime) {
     //서버 가오픈시 할 수 있는 행동
     if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
@@ -39,13 +51,19 @@ 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>
@@ -81,13 +99,13 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
             <div class="col">내 정 보<br><?= backButton() ?></div>
         </div>
         <div class="row gx-0">
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                 <div class="row">
                     <div class="col"><?php generalInfo($me); ?><?php generalInfo2($me); ?></div>
                 </div>
             </div>
 
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                 <div class="row mx-0 gx-0">
                     <div class="col" style='padding-left:2ch;'>
                         토너먼트 【
@@ -117,11 +135,22 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                             <?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) ?>[훈련 -3, 사기 -6]</option>
+                            <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>
                         </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>
@@ -139,6 +168,11 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                             <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>
@@ -167,7 +201,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                         <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>
@@ -178,7 +212,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                     </div>
                 </div>
             </div>
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                 <div class="row gx-0">
                     <div class="col bg1 text-center">
                         <h4 style='color:skyblue'>개인 기록</h4>
@@ -191,7 +225,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                     <button type="button" class="load_old_log btn btn-secondary" data-log_type="generalAction">이전 로그 불러오기</button>
                 </div>
             </div>
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                 <div class="row gx-0">
                     <div class="col bg1 text-center">
                         <h4 style='color:orange'>전투 기록</h4>
@@ -205,7 +239,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                 </div>
             </div>
 
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                 <div class="row gx-0">
                     <div class="col bg1 text-center">
                         <h4 style='color:skyblue'>장수 열전</h4>
@@ -215,7 +249,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                     <?= formatHistoryToHTML(getGeneralHistoryLogAll($generalID)) ?>
                 </div>
             </div>
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                 <div class="row gx-0">
                     <div class="col bg1 text-center">
                         <h4 style='color:orange'>전투 결과</h4>

hwe/b_tournament.php

@@ -14,14 +14,16 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("토너먼트", 1);
 TurnExecutionHelper::executeAllCommand();
 
-$me = $db->queryFirstRow('select no,tournament,con,turntime from general where owner=%i', $userID);
-$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
+);
+$generalID = $me['no'];
 $admin = $gameStor->getValues(['tournament', 'phase', 'turnterm', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
 $turnTerm = $admin['turnterm'];
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
@@ -100,7 +102,7 @@ $globalBetTotal = array_sum($globalBet);
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다! 제한량이 모자라다면 참여를 해보세요^^");
 } ?>
 
@@ -123,63 +125,7 @@ $globalBetTotal = array_sum($globalBet);
         </tr>
     </table>
     <table align=center class='tb_layout bg0'>
-        <?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) : ?>
+        <?php if ($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>

hwe/compare/battle_trace.php

@@ -0,0 +1,213 @@
+<?php
+
+declare(strict_types=1);
+
+namespace sammo;
+
+use Ds\Map;
+use sammo\Enums\RankColumn;
+
+if (PHP_SAPI !== 'cli') {
+    http_response_code(404);
+    exit;
+}
+
+chdir(dirname(__DIR__));
+require_once 'lib.php';
+require_once 'func.php';
+
+final class ComparisonTracingRNG implements RNG
+{
+    private int $sequence = 0;
+
+    /** @var array<int, array<string, mixed>> */
+    public array $calls = [];
+
+    public function __construct(private readonly RNG $inner)
+    {
+    }
+
+    public static function getMaxInt(): int
+    {
+        return LiteHashDRBG::getMaxInt();
+    }
+
+    public function nextBytes(int $bytes): string
+    {
+        $value = $this->inner->nextBytes($bytes);
+        $this->record('nextBytes', ['bytes' => $bytes], bin2hex($value));
+        return $value;
+    }
+
+    public function nextBits(int $bits): string
+    {
+        $value = $this->inner->nextBits($bits);
+        $this->record('nextBits', ['bits' => $bits], bin2hex($value));
+        return $value;
+    }
+
+    public function nextInt(?int $max = null): int
+    {
+        $value = $this->inner->nextInt($max);
+        $this->record('nextInt', ['maxInclusive' => $max], $value);
+        return $value;
+    }
+
+    public function nextFloat1(): float
+    {
+        $value = $this->inner->nextFloat1();
+        $this->record('nextFloat1', [], $value);
+        return $value;
+    }
+
+    private function record(string $operation, array $arguments, mixed $result): void
+    {
+        $this->calls[] = [
+            'seq' => $this->sequence++,
+            'operation' => $operation,
+            'arguments' => $arguments,
+            'result' => $result,
+        ];
+    }
+}
+
+function comparisonExtractRankVar(array $raw): Map
+{
+    $rankVars = new Map();
+    foreach ($raw as $rawKey => $rawValue) {
+        $key = RankColumn::tryFrom($rawKey);
+        if ($key !== null) {
+            $rankVars[$key] = $rawValue;
+        }
+    }
+    return $rankVars;
+}
+
+function comparisonBuildGeneral(
+    array $raw,
+    array $city,
+    array $nation,
+    int $year,
+    int $month,
+    bool $defender = false,
+): General {
+    $aux = [];
+    if (array_key_exists('inheritBuff', $raw)) {
+        $aux['inheritBuff'] = $raw['inheritBuff'];
+    }
+    $raw['aux'] = Json::encode($aux);
+    $raw['owner'] = 0;
+    return new General(
+        $raw,
+        comparisonExtractRankVar($raw),
+        null,
+        $city,
+        $nation,
+        $year,
+        $month,
+        $defender,
+    );
+}
+
+function comparisonRunBattle(array $fixture): array
+{
+    $seed = (string)($fixture['seed'] ?? 'battle-differential');
+    $year = (int)$fixture['year'];
+    $month = (int)$fixture['month'];
+    $startYear = (int)($fixture['startYear'] ?? 180);
+    $rawAttacker = $fixture['attackerGeneral'];
+    $rawAttackerCity = $fixture['attackerCity'];
+    $rawAttackerNation = $fixture['attackerNation'];
+    $rawDefenderCity = $fixture['defenderCity'];
+    $rawDefenderNation = $fixture['defenderNation'];
+
+    $tracingRng = new ComparisonTracingRNG(new LiteHashDRBG($seed));
+    $warRng = new RandUtil($tracingRng);
+    $attacker = new WarUnitGeneral(
+        $warRng,
+        comparisonBuildGeneral($rawAttacker, $rawAttackerCity, $rawAttackerNation, $year, $month),
+        $rawAttackerNation,
+        true,
+    );
+    $city = new WarUnitCity($warRng, $rawDefenderCity, $rawDefenderNation, $year, $month, $startYear);
+
+    $defenderList = [];
+    foreach ($fixture['defenderGenerals'] as $rawDefender) {
+        $defenderList[] = new WarUnitGeneral(
+            $warRng,
+            comparisonBuildGeneral($rawDefender, $rawDefenderCity, $rawDefenderNation, $year, $month, true),
+            $rawDefenderNation,
+            false,
+        );
+    }
+    if (count($defenderList) && extractBattleOrder($city, $attacker) > 0) {
+        $defenderList[] = $city;
+    }
+    usort(
+        $defenderList,
+        fn(WarUnit $lhs, WarUnit $rhs): int =>
+            -(extractBattleOrder($lhs, $attacker) <=> extractBattleOrder($rhs, $attacker)),
+    );
+
+    $iterDefender = new \ArrayIterator($defenderList);
+    $iterDefender->rewind();
+    $finishedDefenders = [];
+    $getNextDefender = function (?WarUnit $previous, bool $requestNext) use (
+        $iterDefender,
+        $attacker,
+        &$finishedDefenders,
+    ): ?WarUnit {
+        if ($previous !== null) {
+            $finishedDefenders[] = buildWarTraceUnitSnapshot($previous);
+        }
+        if (!$requestNext || !$iterDefender->valid()) {
+            return null;
+        }
+        $next = $iterDefender->current();
+        if (extractBattleOrder($next, $attacker) <= 0) {
+            return null;
+        }
+        $iterDefender->next();
+        return $next;
+    };
+
+    $events = [];
+    $conquered = processWar_NG(
+        $seed,
+        $attacker,
+        $getNextDefender,
+        $city,
+        static function (array $event) use (&$events): void {
+            $events[] = $event;
+        },
+    );
+
+    return [
+        'engine' => 'ref',
+        'seed' => $seed,
+        'conquered' => $conquered,
+        'attacker' => buildWarTraceUnitSnapshot($attacker),
+        'city' => buildWarTraceUnitSnapshot($city),
+        'finishedDefenders' => $finishedDefenders,
+        'events' => $events,
+        'rng' => $tracingRng->calls,
+    ];
+}
+
+$fixturePath = $argv[1] ?? null;
+if ($fixturePath === null || ($fixturePath !== '-' && !is_file($fixturePath))) {
+    fwrite(STDERR, "usage: php compare/battle_trace.php <fixture.json|->\n");
+    exit(2);
+}
+
+try {
+    $fixtureJson = $fixturePath === '-' ? stream_get_contents(STDIN) : file_get_contents($fixturePath);
+    $fixture = json_decode((string)$fixtureJson, true, flags: JSON_THROW_ON_ERROR);
+    echo json_encode(
+        comparisonRunBattle($fixture),
+        JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
+    ), PHP_EOL;
+} catch (\Throwable $throwable) {
+    fwrite(STDERR, $throwable::class . ': ' . $throwable->getMessage() . PHP_EOL);
+    exit(1);
+}

hwe/compare/fixtures/monthly_add_global_betray.json

@@ -0,0 +1,23 @@
+{
+    "action": "AddGlobalBetray",
+    "args": [2, 1],
+    "setup": {
+        "resetGenerals": true,
+        "deleteOtherGenerals": true,
+        "keepGeneralIds": [1, 2, 3],
+        "general": [
+            { "id": 1, "values": { "name": "배신0", "betray": 0 } },
+            { "id": 2, "values": { "name": "배신1", "betray": 1 } },
+            { "id": 3, "values": { "name": "배신2", "betray": 2 } }
+        ]
+    },
+    "environment": {
+        "year": 194,
+        "month": 1,
+        "startyear": 190
+    },
+    "observe": {
+        "generalIds": [1, 2, 3]
+    },
+    "compactOutput": true
+}

hwe/compare/fixtures/monthly_assign_general_speciality.json

@@ -0,0 +1,79 @@
+{
+    "action": "AssignGeneralSpeciality",
+    "setup": {
+        "resetGenerals": true,
+        "deleteOtherGenerals": true,
+        "keepGeneralIds": [1, 2, 3],
+        "general": [
+            {
+                "id": 1,
+                "values": {
+                    "name": "내정대상",
+                    "nation": 1,
+                    "age": 30,
+                    "leadership": 40,
+                    "strength": 45,
+                    "intel": 80,
+                    "special": "None",
+                    "specage": 30,
+                    "special2": "che_신산",
+                    "specage2": 99,
+                    "aux": {
+                        "prev_types_special": ["che_경작"]
+                    }
+                }
+            },
+            {
+                "id": 2,
+                "values": {
+                    "name": "전투대상",
+                    "nation": 1,
+                    "age": 30,
+                    "leadership": 80,
+                    "strength": 75,
+                    "intel": 40,
+                    "special": "che_인덕",
+                    "specage": 99,
+                    "special2": "None",
+                    "specage2": 30,
+                    "dex1": 200,
+                    "dex2": 10,
+                    "dex3": 10,
+                    "dex4": 10,
+                    "dex5": 10,
+                    "aux": {
+                        "prev_types_special2": ["che_돌격"]
+                    }
+                }
+            },
+            {
+                "id": 3,
+                "values": {
+                    "name": "계승대상",
+                    "nation": 2,
+                    "age": 30,
+                    "leadership": 50,
+                    "strength": 50,
+                    "intel": 50,
+                    "special": "che_경작",
+                    "specage": 99,
+                    "special2": "None",
+                    "specage2": 30,
+                    "aux": {
+                        "inheritSpecificSpecialWar": "che_의술",
+                        "marker": 3
+                    }
+                }
+            }
+        ]
+    },
+    "environment": {
+        "year": 200,
+        "month": 1,
+        "startyear": 190
+    },
+    "observe": {
+        "generalIds": [1, 2, 3]
+    },
+    "compactOutput": true
+}

hwe/compare/fixtures/monthly_auto_delete_invader.json

@@ -0,0 +1,54 @@
+{
+  "action": "AutoDeleteInvader",
+  "compactOutput": true,
+  "args": [1],
+  "setup": {
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1],
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1],
+    "resetDiplomacy": true,
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "ⓞ남만족",
+          "capital": 69,
+          "gennum": 1,
+          "tech": 100,
+          "level": 2,
+          "type": "che_병가"
+        }
+      }
+    ],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "name": "ⓞ남만대왕",
+          "nation": 1,
+          "city": 69,
+          "officer_level": 12,
+          "npc": 9
+        }
+      }
+    ],
+    "event": [
+      {
+        "id": 990001,
+        "action": [["AutoDeleteInvader", 1]]
+      }
+    ]
+  },
+  "environment": {
+    "year": 200,
+    "month": 1,
+    "startyear": 190,
+    "currentEventID": 990001
+  },
+  "observe": {
+    "generalIds": [1]
+  }
+}

hwe/compare/fixtures/monthly_block_scout.json

@@ -0,0 +1,24 @@
+{
+    "action": "BlockScoutAction",
+    "args": [true],
+    "setup": {
+        "resetNations": true,
+        "deleteOtherNations": true,
+        "keepNationIds": [1, 2],
+        "nation": [
+            { "id": 1, "values": { "name": "위", "level": 2, "scout": 0 } },
+            { "id": 2, "values": { "name": "촉", "level": 2, "scout": 0 } }
+        ],
+        "gameEnvironment": {
+            "block_change_scout": false
+        }
+    },
+    "environment": {
+        "year": 200,
+        "month": 1,
+        "startyear": 190
+    },
+    "observe": {
+        "nationIds": [1, 2]
+    }
+}

hwe/compare/fixtures/monthly_boundary_core_catalog.json

@@ -0,0 +1,226 @@
+{
+  "action": "MonthlyBoundary",
+  "compactOutput": true,
+  "environment": {
+    "year": 190,
+    "month": 12,
+    "startyear": 190,
+    "turnterm": 10,
+    "starttime": "2026-07-25 00:00:00",
+    "turntime": "2026-07-25 02:00:00"
+  },
+  "setup": {
+    "syncEnvironment": true,
+    "world": {
+      "hiddenSeed": "monthly-boundary-core-catalog"
+    },
+    "gameEnvironment": {
+      "isunited": 1,
+      "refreshLimit": 3,
+      "block_change_scout": false
+    },
+    "resetCities": true,
+    "deleteOtherCities": true,
+    "keepCityIds": [1, 2],
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "name": "경계도시",
+          "level": 1,
+          "nation": 1,
+          "pop": 10000,
+          "pop_max": 20000,
+          "agri": 1000,
+          "agri_max": 2000,
+          "comm": 1000,
+          "comm_max": 2000,
+          "secu": 1000,
+          "secu_max": 2000,
+          "trust": 50,
+          "trade": 100,
+          "def": 1000,
+          "def_max": 2000,
+          "wall": 1000,
+          "wall_max": 2000,
+          "officer_set": 1,
+          "state": 31,
+          "term": 1,
+          "supply": 1,
+          "front": 2,
+          "conflict": {},
+          "dead": 0
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "중립도시",
+          "level": 8,
+          "nation": 0,
+          "pop": 12000,
+          "pop_max": 22000,
+          "agri": 1200,
+          "agri_max": 2200,
+          "comm": 1200,
+          "comm_max": 2200,
+          "secu": 1200,
+          "secu_max": 2200,
+          "trust": 55,
+          "trade": 100,
+          "def": 1200,
+          "def_max": 2200,
+          "wall": 1200,
+          "wall_max": 2200,
+          "officer_set": 1,
+          "state": 0,
+          "term": 0,
+          "supply": 0,
+          "front": 0,
+          "conflict": {},
+          "dead": 0
+        }
+      }
+    ],
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1, 2],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "name": "경계군주",
+          "nation": 1,
+          "city": 1,
+          "officer_level": 12,
+          "npc": 0,
+          "age": 30,
+          "belong": 3,
+          "makelimit": 2,
+          "gold": 1000,
+          "rice": 1000,
+          "crew": 100,
+          "train": 80,
+          "atmos": 70,
+          "leadership": 50,
+          "strength": 50,
+          "intel": 50,
+          "experience": 0,
+          "dedication": 0,
+          "dex1": 0,
+          "dex2": 0,
+          "dex3": 0,
+          "dex4": 0,
+          "dex5": 0,
+          "personal": "None",
+          "special": "None",
+          "specage": 0,
+          "special2": "None",
+          "specage2": 0,
+          "betray": 0,
+          "bornyear": 160,
+          "deadyear": 250
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "경계재야",
+          "nation": 0,
+          "city": 2,
+          "officer_level": 0,
+          "npc": 0,
+          "age": 25,
+          "belong": 4,
+          "makelimit": 0,
+          "gold": 500,
+          "rice": 500,
+          "crew": 50,
+          "train": 60,
+          "atmos": 50,
+          "leadership": 40,
+          "strength": 40,
+          "intel": 40,
+          "experience": 0,
+          "dedication": 0,
+          "dex1": 0,
+          "dex2": 0,
+          "dex3": 0,
+          "dex4": 0,
+          "dex5": 0,
+          "personal": "None",
+          "special": "None",
+          "specage": 0,
+          "special2": "None",
+          "specage2": 0,
+          "betray": 0,
+          "bornyear": 165,
+          "deadyear": 250
+        }
+      }
+    ],
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "경계국",
+          "color": "#123456",
+          "capital": 1,
+          "gennum": 1,
+          "gold": 10000,
+          "rice": 20000,
+          "tech": 100,
+          "power": 10,
+          "level": 2,
+          "type": "che_유가",
+          "bill": 100,
+          "rate": 20,
+          "rate_tmp": 10,
+          "scout": 1,
+          "chief_set": 1,
+          "strategic_cmd_limit": 2,
+          "surlimit": 1,
+          "spy": "{}"
+        }
+      }
+    ],
+    "resetDiplomacy": true,
+    "resetEvents": true,
+    "event": [
+      {
+        "id": 991001,
+        "target": "PRE_MONTH",
+        "priority": 1000,
+        "condition": true,
+        "action": [
+          ["NoticeToHistoryLog", "aggregate-pre", 6]
+        ]
+      },
+      {
+        "id": 991002,
+        "target": "MONTH",
+        "priority": 1000,
+        "condition": true,
+        "action": [
+          ["ProcessIncome", "gold"],
+          ["NewYear"],
+          ["ResetOfficerLock"],
+          ["RandomizeCityTradeRate"],
+          ["ChangeCity", "all", {"pop": "+10", "trust": 60}],
+          ["NoticeToHistoryLog", "aggregate-month", 6],
+          ["DeleteEvent"]
+        ]
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1, 2],
+    "nationIds": [1],
+    "cityIds": [1, 2],
+    "eventIds": [991001, 991002],
+    "accessGeneralIds": [1, 2]
+  }
+}

hwe/compare/fixtures/monthly_core_new_year.json

@@ -0,0 +1,34 @@
+{
+  "action": "NewYear",
+  "environment": {
+    "year": 191,
+    "month": 1,
+    "startyear": 190
+  },
+  "setup": {
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1, 2],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 1,
+          "age": 30,
+          "belong": 3
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "nation": 0,
+          "age": 30,
+          "belong": 4
+        }
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1, 2]
+  }
+}

hwe/compare/fixtures/monthly_core_notice.json

@@ -0,0 +1,11 @@
+{
+  "action": "NoticeToHistoryLog",
+  "args": ["<S>새해 알림</>", 6],
+  "environment": {
+    "year": 191,
+    "month": 1,
+    "startyear": 190
+  },
+  "setup": {},
+  "observe": {}
+}

hwe/compare/fixtures/monthly_core_process_income_gold_in_july.json

@@ -0,0 +1,75 @@
+{
+  "action": "ProcessIncome",
+  "args": ["gold"],
+  "environment": {
+    "year": 190,
+    "month": 7,
+    "startyear": 190
+  },
+  "setup": {
+    "resetCities": true,
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1],
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 1,
+          "city": 1,
+          "officer_level": 5,
+          "npc": 0,
+          "gold": 1000,
+          "rice": 1000,
+          "dedication": 100
+        }
+      }
+    ],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑국",
+          "capital": 1,
+          "gold": 10000,
+          "rice": 20000,
+          "level": 1,
+          "rate_tmp": 20
+        }
+      }
+    ],
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑성",
+          "nation": 1,
+          "level": 4,
+          "supply": 1,
+          "pop": 10000,
+          "pop_max": 20000,
+          "agri": 1000,
+          "agri_max": 2000,
+          "comm": 1000,
+          "comm_max": 2000,
+          "secu": 1000,
+          "secu_max": 2000,
+          "trust": 80,
+          "def": 500,
+          "def_max": 1000,
+          "wall": 500,
+          "wall_max": 1000
+        }
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1],
+    "nationIds": [1],
+    "cityIds": [1],
+    "nationEnvironmentKeys": ["prev_income_gold", "prev_income_rice"]
+  }
+}

hwe/compare/fixtures/monthly_core_reset_officer_lock.json

@@ -0,0 +1,33 @@
+{
+  "action": "ResetOfficerLock",
+  "environment": {
+    "year": 191,
+    "month": 1,
+    "startyear": 190
+  },
+  "setup": {
+    "resetCities": true,
+    "resetNations": true,
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 1,
+          "officer_set": 1
+        }
+      }
+    ],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "chief_set": 1
+        }
+      }
+    ]
+  },
+  "observe": {
+    "cityIds": [1],
+    "nationIds": [1]
+  }
+}

hwe/compare/fixtures/monthly_create_admin_npc.json

@@ -0,0 +1,9 @@
+{
+  "action": "CreateAdminNPC",
+  "environment": {
+    "year": 193,
+    "month": 12,
+    "startyear": 190
+  },
+  "observe": {}
+}

hwe/compare/fixtures/monthly_create_many_npc.json

@@ -0,0 +1,15 @@
+{
+  "action": "CreateManyNPC",
+  "args": [2, 0],
+  "environment": {
+    "year": 193,
+    "month": 5,
+    "startyear": 190,
+    "turnterm": 10,
+    "turntime": "0193-05-01 00:00:00"
+  },
+  "setup": {
+    "resetGenerals": true
+  },
+  "observe": {}
+}

hwe/compare/fixtures/monthly_finish_nation_betting.json

@@ -0,0 +1,69 @@
+{
+    "action": "FinishNationBetting",
+    "args": [1],
+    "setup": {
+        "clearBetting": true,
+        "resetNations": true,
+        "deleteOtherNations": true,
+        "keepNationIds": [1, 2],
+        "nation": [
+            { "id": 1, "values": { "name": "위", "gennum": 1, "power": 100, "level": 2 } },
+            { "id": 2, "values": { "name": "촉", "gennum": 1, "power": 300, "level": 0 } }
+        ],
+        "resetGenerals": true,
+        "deleteOtherGenerals": true,
+        "keepGeneralIds": [1, 2],
+        "general": [
+            { "id": 1, "values": { "name": "장수1", "nation": 1, "owner": 1, "npc": 0 } },
+            { "id": 2, "values": { "name": "장수2", "nation": 2, "owner": 2, "npc": 0 } }
+        ],
+        "bettingInfo": [
+            {
+                "id": 1,
+                "type": "bettingNation",
+                "name": "천통국 예상",
+                "finished": false,
+                "selectCnt": 1,
+                "isExclusive": null,
+                "reqInheritancePoint": true,
+                "openYearMonth": 2400,
+                "closeYearMonth": 2424,
+                "candidates": [
+                    {
+                        "title": "위",
+                        "info": "국력: 100<br>장수 수: 1<br>도시 수: 1",
+                        "isHtml": true,
+                        "aux": { "nation": 1 }
+                    },
+                    {
+                        "title": "촉",
+                        "info": "국력: 300<br>장수 수: 1<br>도시 수: 1",
+                        "isHtml": true,
+                        "aux": { "nation": 2 }
+                    }
+                ],
+                "winner": null
+            }
+        ],
+        "bet": [
+            { "betting_id": 1, "general_id": 0, "user_id": null, "betting_type": "[-1]", "amount": 100 },
+            { "betting_id": 1, "general_id": 1, "user_id": 1, "betting_type": "[0]", "amount": 100 },
+            { "betting_id": 1, "general_id": 2, "user_id": 2, "betting_type": "[1]", "amount": 100 }
+        ],
+        "inheritancePrevious": {
+            "1": 900,
+            "2": 900
+        },
+        "syncEnvironment": true
+    },
+    "environment": {
+        "year": 202,
+        "month": 1,
+        "startyear": 190
+    },
+    "observe": {
+        "generalIds": [1, 2],
+        "nationIds": [1, 2],
+        "ownerIds": [1, 2]
+    }
+}

hwe/compare/fixtures/monthly_invader_ending.json

@@ -0,0 +1,40 @@
+{
+  "action": "InvaderEnding",
+  "compactOutput": true,
+  "setup": {
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1],
+    "setAllCitiesNation": 1,
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "기준국",
+          "capital": 1,
+          "gennum": 1,
+          "tech": 100,
+          "level": 2,
+          "type": "che_유가"
+        }
+      }
+    ],
+    "gameEnvironment": {
+      "isunited": 1,
+      "refreshLimit": 3
+    },
+    "event": [
+      {
+        "id": 990002,
+        "action": [["InvaderEnding"]]
+      }
+    ]
+  },
+  "environment": {
+    "year": 200,
+    "month": 1,
+    "startyear": 190,
+    "currentEventID": 990002
+  },
+  "observe": {}
+}

hwe/compare/fixtures/monthly_invader_lifecycle.json

@@ -0,0 +1,108 @@
+{
+  "action": "InvaderLifecycle",
+  "args": [10, 150, 100, 20],
+  "setup": {
+    "resetCities": true,
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1],
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1],
+    "resetDiplomacy": true,
+    "resetEvents": true,
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "name": "기준도시",
+          "level": 3,
+          "nation": 1,
+          "pop": 1000,
+          "pop_max": 10000,
+          "agri": 2000,
+          "agri_max": 20000,
+          "comm": 3000,
+          "comm_max": 30000,
+          "secu": 4000,
+          "secu_max": 40000,
+          "def": 5000,
+          "def_max": 50000,
+          "wall": 6000,
+          "wall_max": 60000
+        }
+      },
+      {
+        "id": 48,
+        "values": {
+          "name": "남만",
+          "level": 4,
+          "nation": 0,
+          "pop": 1000,
+          "pop_max": 10000,
+          "agri": 2000,
+          "agri_max": 20000,
+          "comm": 3000,
+          "comm_max": 30000,
+          "secu": 4000,
+          "secu_max": 40000,
+          "def": 5000,
+          "def_max": 50000,
+          "wall": 6000,
+          "wall_max": 60000
+        }
+      }
+    ],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "기준국",
+          "capital": 1,
+          "gennum": 1,
+          "tech": 100,
+          "level": 2,
+          "type": "che_유가"
+        }
+      }
+    ],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "name": "군주",
+          "nation": 1,
+          "city": 1,
+          "officer_level": 12,
+          "npc": 0,
+          "leadership": 50,
+          "strength": 50,
+          "intel": 50,
+          "experience": 1000,
+          "dedication": 1000,
+          "dex1": 10,
+          "dex2": 20,
+          "dex3": 30,
+          "dex4": 40,
+          "dex5": 50,
+          "turntime": "0200-01-01 00:05:00"
+        }
+      }
+    ],
+    "gameEnvironment": {
+      "isunited": 0,
+      "refreshLimit": 3
+    },
+    "syncEnvironment": true
+  },
+  "environment": {
+    "year": 200,
+    "month": 1,
+    "startyear": 190,
+    "turnterm": 10,
+    "turntime": "0200-01-01 00:00:00",
+    "show_img_level": 3,
+    "fiction": [0]
+  },
+  "observe": {}
+}

hwe/compare/fixtures/monthly_lost_unique_item.json

@@ -0,0 +1,42 @@
+{
+  "action": "LostUniqueItem",
+  "args": [0.2],
+  "environment": {
+    "year": 210,
+    "month": 1,
+    "startyear": 180
+  },
+  "setup": {
+    "syncEnvironment": true,
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1, 2],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑",
+          "npc": 0,
+          "horse": "che_명마_12_옥란백용구",
+          "weapon": "che_무기_15_의천검",
+          "book": "che_서적_01_효경전",
+          "item": "che_저지_삼황내문"
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "을",
+          "npc": 1,
+          "horse": "che_명마_12_사륜거",
+          "weapon": "che_무기_01_단도",
+          "book": "None",
+          "item": "che_부적_태현청생부"
+        }
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1, 2]
+  }
+}

hwe/compare/fixtures/monthly_merge_inherit_point_rank.json

@@ -0,0 +1,74 @@
+{
+  "action": "MergeInheritPointRank",
+  "environment": {
+    "year": 210,
+    "month": 1,
+    "startyear": 180
+  },
+  "setup": {
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1],
+    "clearInheritanceOwnerIds": [100],
+    "gameEnvironment": {
+      "isunited": 0
+    },
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑",
+          "nation": 1,
+          "owner": 100,
+          "npc": 0,
+          "belong": 3,
+          "dex1": 1000,
+          "dex2": 0,
+          "dex3": 0,
+          "dex4": 0,
+          "dex5": 0
+        }
+      }
+    ],
+    "inheritancePoints": [
+      {"ownerId": 100, "key": "previous", "value": 999},
+      {"ownerId": 100, "key": "lived_month", "value": 2},
+      {"ownerId": 100, "key": "max_domestic_critical", "value": 4},
+      {"ownerId": 100, "key": "active_action", "value": 15},
+      {"ownerId": 100, "key": "unifier", "value": 6},
+      {"ownerId": 100, "key": "tournament", "value": 7}
+    ],
+    "rankData": [
+      {"generalId": 1, "type": "warnum", "value": 2},
+      {"generalId": 1, "type": "firenum", "value": 1},
+      {"generalId": 1, "type": "betwin", "value": 2},
+      {"generalId": 1, "type": "betgold", "value": 4000},
+      {"generalId": 1, "type": "betwingold", "value": 2000},
+      {"generalId": 1, "type": "inherit_earned_dyn", "value": 999},
+      {"generalId": 1, "type": "inherit_earned_act", "value": 11},
+      {"generalId": 1, "type": "inherit_earned", "value": 999},
+      {"generalId": 1, "type": "inherit_spent_dyn", "value": 9},
+      {"generalId": 1, "type": "inherit_spent", "value": 999}
+    ]
+  },
+  "observe": {
+    "generalIds": [1],
+    "ownerIds": [100],
+    "inheritanceKeys": [
+      "previous",
+      "lived_month",
+      "max_domestic_critical",
+      "active_action",
+      "unifier",
+      "tournament"
+    ],
+    "rankGeneralIds": [1],
+    "rankTypes": [
+      "inherit_earned",
+      "inherit_earned_act",
+      "inherit_earned_dyn",
+      "inherit_spent",
+      "inherit_spent_dyn"
+    ]
+  }
+}

hwe/compare/fixtures/monthly_nation_betting_lifecycle.json

@@ -0,0 +1,75 @@
+{
+  "action": "NationBettingLifecycle",
+  "args": [1, 100],
+  "bettorGeneralIds": [1, 2],
+  "bettorOwnerIds": [1, 2],
+  "setup": {
+    "clearBetting": true,
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1, 2],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "위",
+          "color": "#111111",
+          "capital": 1,
+          "gennum": 1,
+          "gold": 1000,
+          "rice": 2000,
+          "tech": 100,
+          "power": 100,
+          "level": 2,
+          "type": "che_유가"
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "촉",
+          "color": "#222222",
+          "capital": 2,
+          "gennum": 1,
+          "gold": 3000,
+          "rice": 4000,
+          "tech": 200,
+          "power": 300,
+          "level": 2,
+          "type": "che_병가"
+        }
+      }
+    ],
+    "resetCities": true,
+    "deleteOtherCities": true,
+    "keepCityIds": [1, 2],
+    "city": [
+      { "id": 1, "values": { "name": "허창", "nation": 1, "level": 3 } },
+      { "id": 2, "values": { "name": "성도", "nation": 2, "level": 3 } }
+    ],
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1, 2],
+    "general": [
+      { "id": 1, "values": { "name": "장수1", "nation": 1, "city": 1, "owner": 1, "npc": 0 } },
+      { "id": 2, "values": { "name": "장수2", "nation": 2, "city": 2, "owner": 2, "npc": 0 } }
+    ],
+    "inheritancePrevious": {
+      "1": 1000,
+      "2": 1000
+    },
+    "rankData": [
+      { "generalId": 1, "type": "inherit_spent_dyn", "value": 0 },
+      { "generalId": 1, "type": "inherit_earned_act", "value": 0 },
+      { "generalId": 2, "type": "inherit_spent_dyn", "value": 0 },
+      { "generalId": 2, "type": "inherit_earned_act", "value": 0 }
+    ],
+    "syncEnvironment": true
+  },
+  "environment": {
+    "year": 200,
+    "month": 1,
+    "startyear": 190
+  },
+  "observe": {}
+}

hwe/compare/fixtures/monthly_npc_nation_lifecycle.json

@@ -0,0 +1,77 @@
+{
+  "action": "NpcNationLifecycle",
+  "setup": {
+    "resetCities": true,
+    "resetGenerals": true,
+    "resetNations": true,
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "name": "점유도시",
+          "level": 5,
+          "nation": 1,
+          "pop": 10001,
+          "pop_max": 50001,
+          "agri": 1001,
+          "agri_max": 5001,
+          "comm": 2001,
+          "comm_max": 6001,
+          "secu": 3001,
+          "secu_max": 7001,
+          "def": 4001,
+          "def_max": 8001,
+          "wall": 5001,
+          "wall_max": 9001
+        }
+      },
+      {
+        "id": 48,
+        "values": {
+          "name": "건국도시",
+          "level": 5,
+          "nation": 0,
+          "pop": 10048,
+          "pop_max": 50048,
+          "agri": 1048,
+          "agri_max": 5048,
+          "comm": 2048,
+          "comm_max": 6048,
+          "secu": 3048,
+          "secu_max": 7048,
+          "def": 4048,
+          "def_max": 8048,
+          "wall": 5048,
+          "wall_max": 9048
+        }
+      }
+    ],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "기준국",
+          "capital": 1,
+          "gennum": 0,
+          "tech": 120,
+          "level": 2,
+          "type": "che_유가"
+        }
+      }
+    ],
+    "gameEnvironment": {
+      "lastNPCTroopLeaderID": 40
+    },
+    "syncEnvironment": true
+  },
+  "environment": {
+    "year": 200,
+    "month": 1,
+    "startyear": 190,
+    "turnterm": 10,
+    "turntime": "0200-01-01 00:00:00",
+    "show_img_level": 3,
+    "fiction": [0]
+  },
+  "observe": {}
+}

hwe/compare/fixtures/monthly_open_nation_betting.json

@@ -0,0 +1,65 @@
+{
+    "action": "OpenNationBetting",
+    "args": [1, 500],
+    "setup": {
+        "clearBetting": true,
+        "resetNations": true,
+        "deleteOtherNations": true,
+        "keepNationIds": [1, 2],
+        "nation": [
+            {
+                "id": 1,
+                "values": {
+                    "name": "위",
+                    "color": "#111111",
+                    "capital": 1,
+                    "gennum": 1,
+                    "gold": 1000,
+                    "rice": 2000,
+                    "tech": 100,
+                    "power": 100,
+                    "level": 2,
+                    "type": "che_유가"
+                }
+            },
+            {
+                "id": 2,
+                "values": {
+                    "name": "촉",
+                    "color": "#222222",
+                    "capital": 2,
+                    "gennum": 1,
+                    "gold": 3000,
+                    "rice": 4000,
+                    "tech": 200,
+                    "power": 300,
+                    "level": 2,
+                    "type": "che_병가"
+                }
+            }
+        ],
+        "resetCities": true,
+        "city": [
+            { "id": 1, "values": { "nation": 1, "level": 3 } },
+            { "id": 2, "values": { "nation": 2, "level": 3 } }
+        ],
+        "resetGenerals": true,
+        "deleteOtherGenerals": true,
+        "keepGeneralIds": [1, 2],
+        "general": [
+            { "id": 1, "values": { "name": "장수1", "nation": 1, "city": 1, "owner": 1, "npc": 0 } },
+            { "id": 2, "values": { "name": "장수2", "nation": 2, "city": 2, "owner": 2, "npc": 0 } }
+        ],
+        "syncEnvironment": true
+    },
+    "environment": {
+        "year": 200,
+        "month": 1,
+        "startyear": 190
+    },
+    "observe": {
+        "generalIds": [1, 2],
+        "cityIds": [1, 2],
+        "nationIds": [1, 2]
+    }
+}

hwe/compare/fixtures/monthly_post_diplomacy.json

@@ -0,0 +1,178 @@
+{
+  "action": "PostUpdateMonthly",
+  "environment": {
+    "year": 193,
+    "month": 2,
+    "startyear": 193,
+    "seedYear": 193,
+    "seedMonth": 1
+  },
+  "setup": {
+    "world": {
+      "hiddenSeed": "monthly-post-diplomacy-fixture"
+    },
+    "syncEnvironment": true,
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1, 2, 3, 4],
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1, 2, 3, 4],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑장",
+          "nation": 1,
+          "npc": 2,
+          "crew": 0,
+          "gold": 0,
+          "rice": 0,
+          "leadership": 10,
+          "strength": 10,
+          "intel": 10,
+          "experience": 0,
+          "dedication": 0
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "을장",
+          "nation": 2,
+          "npc": 2,
+          "crew": 0,
+          "gold": 0,
+          "rice": 0,
+          "leadership": 10,
+          "strength": 10,
+          "intel": 10,
+          "experience": 0,
+          "dedication": 0
+        }
+      },
+      {
+        "id": 3,
+        "values": {
+          "name": "병장",
+          "nation": 3,
+          "npc": 2,
+          "crew": 0,
+          "gold": 0,
+          "rice": 0,
+          "leadership": 10,
+          "strength": 10,
+          "intel": 10,
+          "experience": 0,
+          "dedication": 0
+        }
+      },
+      {
+        "id": 4,
+        "values": {
+          "name": "정장",
+          "nation": 4,
+          "npc": 2,
+          "crew": 0,
+          "gold": 0,
+          "rice": 0,
+          "leadership": 10,
+          "strength": 10,
+          "intel": 10,
+          "experience": 0,
+          "dedication": 0
+        }
+      }
+    ],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑국",
+          "gennum": 2,
+          "level": 1
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "을국",
+          "gennum": 1,
+          "level": 1
+        }
+      },
+      {
+        "id": 3,
+        "values": {
+          "name": "병국",
+          "gennum": 1,
+          "level": 1
+        }
+      },
+      {
+        "id": 4,
+        "values": {
+          "name": "정국",
+          "gennum": 1,
+          "level": 1
+        }
+      }
+    ],
+    "resetDiplomacy": true,
+    "diplomacy": [
+      {
+        "fromNationId": 1,
+        "toNationId": 2,
+        "state": 1,
+        "term": 1,
+        "dead": 777
+      },
+      {
+        "fromNationId": 2,
+        "toNationId": 1,
+        "state": 1,
+        "term": 1,
+        "dead": 888
+      },
+      {
+        "fromNationId": 1,
+        "toNationId": 3,
+        "state": 0,
+        "term": 5,
+        "dead": 250
+      },
+      {
+        "fromNationId": 3,
+        "toNationId": 1,
+        "state": 0,
+        "term": 5,
+        "dead": 50
+      },
+      {
+        "fromNationId": 3,
+        "toNationId": 4,
+        "state": 0,
+        "term": 1,
+        "dead": 0
+      },
+      {
+        "fromNationId": 4,
+        "toNationId": 3,
+        "state": 0,
+        "term": 1,
+        "dead": 0
+      },
+      {
+        "fromNationId": 2,
+        "toNationId": 4,
+        "state": 7,
+        "term": 1,
+        "dead": 999
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1, 2, 3, 4],
+    "nationIds": [1, 2, 3, 4]
+  }
+}

hwe/compare/fixtures/monthly_post_nation_stats.json

@@ -0,0 +1,162 @@
+{
+  "action": "PostUpdateMonthly",
+  "environment": {
+    "year": 193,
+    "month": 2,
+    "startyear": 193,
+    "seedYear": 193,
+    "seedMonth": 1
+  },
+  "setup": {
+    "world": {
+      "hiddenSeed": "monthly-post-nation-stats-fixture"
+    },
+    "syncEnvironment": true,
+    "resetCities": true,
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1, 2],
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1, 2],
+    "resetDiplomacy": true,
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 1,
+          "npc": 0,
+          "gold": 1000,
+          "rice": 2000,
+          "crew": 100,
+          "leadership": 50,
+          "strength": 40,
+          "intel": 30,
+          "experience": 100,
+          "dedication": 200,
+          "dex1": 1000,
+          "dex2": 0,
+          "dex3": 0,
+          "dex4": 0,
+          "dex5": 0
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "nation": 2,
+          "npc": 2,
+          "gold": 3000,
+          "rice": 4000,
+          "crew": 200,
+          "leadership": 60,
+          "strength": 50,
+          "intel": 40,
+          "experience": 300,
+          "dedication": 400,
+          "dex1": 2000,
+          "dex2": 1000,
+          "dex3": 0,
+          "dex4": 0,
+          "dex5": 0
+        }
+      }
+    ],
+    "rankData": [
+      {"generalId": 1, "type": "killcrew_person", "value": 100},
+      {"generalId": 1, "type": "deathcrew_person", "value": 0},
+      {"generalId": 2, "type": "killcrew_person", "value": 0},
+      {"generalId": 2, "type": "deathcrew_person", "value": 100}
+    ],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑국",
+          "gold": 10000,
+          "rice": 20000,
+          "tech": 100,
+          "level": 2,
+          "gennum": 9,
+          "power": 7
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "을국",
+          "gold": 2000,
+          "rice": 3000,
+          "tech": 50,
+          "level": 1,
+          "gennum": 8,
+          "power": 8
+        }
+      }
+    ],
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑성",
+          "nation": 1,
+          "level": 4,
+          "supply": 1,
+          "pop": 1000,
+          "pop_max": 2000,
+          "agri": 100,
+          "agri_max": 200,
+          "comm": 100,
+          "comm_max": 200,
+          "secu": 100,
+          "secu_max": 200,
+          "def": 100,
+          "def_max": 200,
+          "wall": 100,
+          "wall_max": 200
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "을성",
+          "nation": 2,
+          "level": 4,
+          "supply": 1,
+          "pop": 2000,
+          "pop_max": 4000,
+          "agri": 200,
+          "agri_max": 400,
+          "comm": 200,
+          "comm_max": 400,
+          "secu": 200,
+          "secu_max": 400,
+          "def": 200,
+          "def_max": 400,
+          "wall": 200,
+          "wall_max": 400
+        }
+      }
+    ],
+    "nationEnvironment": [
+      {
+        "nationId": 1,
+        "key": "max_power",
+        "value": {
+          "maxPower": 999,
+          "maxCrew": 50,
+          "maxCities": ["옛도시", "옛도시2"]
+        }
+      },
+      {"nationId": 1, "key": "available_war_setting_cnt", "value": 1}
+    ]
+  },
+  "observe": {
+    "generalIds": [1, 2],
+    "nationIds": [1, 2],
+    "cityIds": [1, 2],
+    "rankGeneralIds": [1, 2],
+    "rankTypes": ["killcrew_person", "deathcrew_person"],
+    "nationEnvironmentKeys": ["max_power", "available_war_setting_cnt"]
+  }
+}

hwe/compare/fixtures/monthly_post_tail_order.json

@@ -0,0 +1,128 @@
+{
+  "action": "PostUpdateMonthly",
+  "environment": {
+    "year": 193,
+    "month": 2,
+    "startyear": 193,
+    "seedYear": 193,
+    "seedMonth": 1
+  },
+  "setup": {
+    "world": {
+      "hiddenSeed": "monthly-post-tail-2"
+    },
+    "syncEnvironment": true,
+    "clearNeutralAuctions": true,
+    "resetCities": true,
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1, 2],
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1, 2],
+    "resetDiplomacy": true,
+    "gameEnvironment": {
+      "tournament": 0,
+      "tnmt_trig": true,
+      "tnmt_pattern": [0, 1, 2, 3],
+      "prev_winner": null
+    },
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑장",
+          "nation": 1,
+          "city": 1,
+          "officer_level": 12,
+          "npc": 0,
+          "gold": 5000,
+          "rice": 7000,
+          "crew": 100,
+          "leadership": 50,
+          "strength": 40,
+          "intel": 30,
+          "experience": 100,
+          "dedication": 200
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "을장",
+          "nation": 2,
+          "city": 2,
+          "officer_level": 12,
+          "npc": 0,
+          "gold": 6000,
+          "rice": 8000,
+          "crew": 200,
+          "leadership": 60,
+          "strength": 50,
+          "intel": 40,
+          "experience": 300,
+          "dedication": 400
+        }
+      }
+    ],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑국",
+          "capital": 1,
+          "gold": 10000,
+          "rice": 20000,
+          "tech": 100,
+          "level": 2,
+          "gennum": 1,
+          "power": 7
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "을국",
+          "capital": 2,
+          "gold": 2000,
+          "rice": 3000,
+          "tech": 50,
+          "level": 1,
+          "gennum": 1,
+          "power": 8
+        }
+      }
+    ],
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑성",
+          "nation": 1,
+          "level": 4,
+          "supply": 1,
+          "front": 3,
+          "pop": 1000,
+          "pop_max": 2000
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "을성",
+          "nation": 2,
+          "level": 4,
+          "supply": 1,
+          "front": 3,
+          "pop": 2000,
+          "pop_max": 4000
+        }
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1, 2],
+    "nationIds": [1, 2],
+    "cityIds": [1, 2]
+  }
+}

hwe/compare/fixtures/monthly_post_wander.json

@@ -0,0 +1,143 @@
+{
+  "action": "PostUpdateMonthly",
+  "environment": {
+    "year": 195,
+    "month": 2,
+    "startyear": 193,
+    "seedYear": 195,
+    "seedMonth": 1
+  },
+  "setup": {
+    "world": {
+      "hiddenSeed": "monthly-post-wander-fixture"
+    },
+    "syncEnvironment": true,
+    "resetCities": true,
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "name": "방랑성",
+          "nation": 4,
+          "level": 4,
+          "front": 1
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "존속성",
+          "nation": 1,
+          "level": 4,
+          "front": 1
+        }
+      }
+    ],
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1, 2, 3],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "name": "방랑주",
+          "nation": 4,
+          "city": 1,
+          "officer_level": 12,
+          "npc": 2,
+          "gold": 2000,
+          "rice": 3000,
+          "crew": 100,
+          "makelimit": 0,
+          "belong": 7,
+          "leadership": 50,
+          "strength": 40,
+          "intel": 30,
+          "experience": 100,
+          "dedication": 200
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "방랑객",
+          "nation": 4,
+          "city": 1,
+          "officer_level": 1,
+          "npc": 0,
+          "gold": 1500,
+          "rice": 4000,
+          "crew": 200,
+          "makelimit": 0,
+          "belong": 5,
+          "leadership": 60,
+          "strength": 50,
+          "intel": 40,
+          "experience": 300,
+          "dedication": 400
+        }
+      },
+      {
+        "id": 3,
+        "values": {
+          "name": "존속장",
+          "nation": 1,
+          "city": 2,
+          "officer_level": 12,
+          "npc": 2,
+          "gold": 500,
+          "rice": 500,
+          "crew": 50,
+          "leadership": 50,
+          "strength": 50,
+          "intel": 50,
+          "experience": 0,
+          "dedication": 0
+        }
+      }
+    ],
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1, 4],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "존속국",
+          "gennum": 1,
+          "level": 1
+        }
+      },
+      {
+        "id": 4,
+        "values": {
+          "name": "방랑국",
+          "gennum": 2,
+          "level": 0
+        }
+      }
+    ],
+    "resetDiplomacy": true,
+    "diplomacy": [
+      {
+        "fromNationId": 1,
+        "toNationId": 4,
+        "state": 2,
+        "term": 0,
+        "dead": 0
+      },
+      {
+        "fromNationId": 4,
+        "toNationId": 1,
+        "state": 2,
+        "term": 0,
+        "dead": 0
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1, 2, 3],
+    "nationIds": [1, 4],
+    "cityIds": [1, 2]
+  }
+}

hwe/compare/fixtures/monthly_pre_update.json

@@ -0,0 +1,49 @@
+{
+  "action": "PreUpdateMonthly",
+  "environment": {
+    "year": 200,
+    "month": 12,
+    "startyear": 190
+  },
+  "setup": {
+    "syncEnvironment": true,
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1, 2],
+    "general": [
+      {"id": 1, "values": {"makelimit": 2}},
+      {"id": 2, "values": {"makelimit": 0}}
+    ],
+    "generalAccessLog": [
+      {"generalId": 1, "refreshScoreTotal": 101},
+      {"generalId": 2, "refreshScoreTotal": 1}
+    ],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "rate": 35,
+          "rate_tmp": 10,
+          "strategic_cmd_limit": 2,
+          "surlimit": 1,
+          "spy": "{\"1\":1,\"2\":2}"
+        }
+      }
+    ],
+    "city": [
+      {"id": 1, "values": {"state": 31, "term": 1, "conflict": {"1": 10}}},
+      {"id": 2, "values": {"state": 32, "term": 2, "conflict": {"1": 20}}},
+      {"id": 3, "values": {"state": 33, "term": 0, "conflict": {"1": 30}}},
+      {"id": 4, "values": {"state": 34, "term": 3, "conflict": {"1": 40}}},
+      {"id": 5, "values": {"state": 41, "term": 1, "conflict": {"1": 50}}},
+      {"id": 6, "values": {"state": 42, "term": 2, "conflict": {"1": 60}}},
+      {"id": 7, "values": {"state": 43, "term": 3, "conflict": {"1": 70}}}
+    ]
+  },
+  "observe": {
+    "generalIds": [1, 2],
+    "nationIds": [1],
+    "cityIds": [1, 2, 3, 4, 5, 6, 7],
+    "accessGeneralIds": [1, 2]
+  }
+}

hwe/compare/fixtures/monthly_process_income_staged_rate.json

@@ -0,0 +1,76 @@
+{
+  "action": "ProcessIncome",
+  "args": ["gold"],
+  "environment": {
+    "year": 190,
+    "month": 7,
+    "startyear": 190
+  },
+  "setup": {
+    "resetCities": true,
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1],
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 1,
+          "city": 1,
+          "officer_level": 5,
+          "npc": 0,
+          "gold": 1000,
+          "rice": 1000,
+          "dedication": 100
+        }
+      }
+    ],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑국",
+          "capital": 1,
+          "gold": 10000,
+          "rice": 20000,
+          "level": 1,
+          "rate": 35,
+          "rate_tmp": 10
+        }
+      }
+    ],
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "name": "갑성",
+          "nation": 1,
+          "level": 4,
+          "supply": 1,
+          "pop": 10000,
+          "pop_max": 20000,
+          "agri": 1000,
+          "agri_max": 2000,
+          "comm": 1000,
+          "comm_max": 2000,
+          "secu": 1000,
+          "secu_max": 2000,
+          "trust": 80,
+          "def": 500,
+          "def_max": 1000,
+          "wall": 500,
+          "wall_max": 1000
+        }
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1],
+    "nationIds": [1],
+    "cityIds": [1],
+    "nationEnvironmentKeys": ["prev_income_gold", "prev_income_rice"]
+  }
+}

hwe/compare/fixtures/monthly_process_semi_annual.json

@@ -0,0 +1,106 @@
+{
+  "action": "ProcessSemiAnnual",
+  "resource": "gold",
+  "environment": {
+    "year": 193,
+    "month": 1,
+    "startyear": 190
+  },
+  "setup": {
+    "resetCities": true,
+    "resetGenerals": true,
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "반기검증국",
+          "gold": 100001,
+          "rice": 7777,
+          "rate_tmp": 20,
+          "type": "che_도가"
+        }
+      }
+    ],
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 1,
+          "supply": 1,
+          "pop": 10000,
+          "pop_max": 50000,
+          "agri": 1001,
+          "agri_max": 5000,
+          "comm": 1001,
+          "comm_max": 5000,
+          "secu": 1001,
+          "secu_max": 2000,
+          "trust": 55,
+          "def": 1001,
+          "def_max": 5000,
+          "wall": 1001,
+          "wall_max": 5000,
+          "dead": 123
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "nation": 1,
+          "supply": 0,
+          "pop": 10000,
+          "pop_max": 50000,
+          "agri": 1001,
+          "agri_max": 5000,
+          "comm": 1001,
+          "comm_max": 5000,
+          "secu": 1001,
+          "secu_max": 2000,
+          "trust": 55,
+          "def": 1001,
+          "def_max": 5000,
+          "wall": 1001,
+          "wall_max": 5000,
+          "dead": 123
+        }
+      },
+      {
+        "id": 3,
+        "values": {
+          "nation": 0,
+          "supply": 1,
+          "pop": 10000,
+          "pop_max": 50000,
+          "agri": 1001,
+          "agri_max": 5000,
+          "comm": 1001,
+          "comm_max": 5000,
+          "secu": 1001,
+          "secu_max": 2000,
+          "trust": 55,
+          "def": 1001,
+          "def_max": 5000,
+          "wall": 1001,
+          "wall_max": 5000,
+          "dead": 123
+        }
+      }
+    ],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 1,
+          "city": 1,
+          "gold": 10001,
+          "rice": 8888
+        }
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1],
+    "cityIds": [1, 2, 3],
+    "nationIds": [1]
+  }
+}

hwe/compare/fixtures/monthly_process_semi_annual_staged_rate.json

@@ -0,0 +1,65 @@
+{
+  "action": "ProcessSemiAnnual",
+  "resource": "gold",
+  "environment": {
+    "year": 193,
+    "month": 1,
+    "startyear": 190
+  },
+  "setup": {
+    "resetCities": true,
+    "resetGenerals": true,
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "반기검증국",
+          "gold": 100001,
+          "rice": 7777,
+          "rate": 50,
+          "rate_tmp": 20,
+          "type": "che_중립"
+        }
+      }
+    ],
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 1,
+          "supply": 1,
+          "pop": 10000,
+          "pop_max": 50000,
+          "agri": 1001,
+          "agri_max": 5000,
+          "comm": 1001,
+          "comm_max": 5000,
+          "secu": 1001,
+          "secu_max": 2000,
+          "trust": 55,
+          "def": 1001,
+          "def_max": 5000,
+          "wall": 1001,
+          "wall_max": 5000,
+          "dead": 123
+        }
+      }
+    ],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 1,
+          "city": 1,
+          "gold": 10001,
+          "rice": 8888
+        }
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1],
+    "cityIds": [1],
+    "nationIds": [1]
+  }
+}

hwe/compare/fixtures/monthly_process_war_income.json

@@ -0,0 +1,96 @@
+{
+  "action": "ProcessWarIncome",
+  "environment": {
+    "year": 193,
+    "month": 1,
+    "startyear": 190
+  },
+  "setup": {
+    "resetCities": true,
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "전쟁수입국",
+          "gold": 1000,
+          "level": 1,
+          "type": "che_중립"
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "name": "비활성국",
+          "gold": 2000,
+          "level": 0,
+          "type": "che_중립"
+        }
+      },
+      {
+        "id": 3,
+        "values": {
+          "name": "법가국",
+          "gold": 3000,
+          "level": 1,
+          "type": "che_법가"
+        }
+      }
+    ],
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 1,
+          "supply": 1,
+          "pop": 1000,
+          "pop_max": 2000,
+          "dead": 101
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "nation": 1,
+          "supply": 0,
+          "pop": 1000,
+          "pop_max": 2000,
+          "dead": 999
+        }
+      },
+      {
+        "id": 3,
+        "values": {
+          "nation": 2,
+          "supply": 1,
+          "pop": 1000,
+          "pop_max": 2000,
+          "dead": 1000
+        }
+      },
+      {
+        "id": 4,
+        "values": {
+          "nation": 3,
+          "supply": 1,
+          "pop": 1000,
+          "pop_max": 2000,
+          "dead": 105
+        }
+      },
+      {
+        "id": 5,
+        "values": {
+          "nation": 0,
+          "supply": 1,
+          "pop": 999,
+          "pop_max": 1000,
+          "dead": 10
+        }
+      }
+    ]
+  },
+  "observe": {
+    "cityIds": [1, 2, 3, 4, 5],
+    "nationIds": [1, 2, 3]
+  }
+}

hwe/compare/fixtures/monthly_raise_invader.json

@@ -0,0 +1,105 @@
+{
+  "action": "RaiseInvader",
+  "compactOutput": true,
+  "args": [10, 150, 100, 20],
+  "setup": {
+    "resetCities": true,
+    "resetGenerals": true,
+    "deleteOtherGenerals": true,
+    "keepGeneralIds": [1],
+    "resetNations": true,
+    "deleteOtherNations": true,
+    "keepNationIds": [1],
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "level": 3,
+          "nation": 1,
+          "pop": 1000,
+          "pop_max": 10000,
+          "agri": 2000,
+          "agri_max": 20000,
+          "comm": 3000,
+          "comm_max": 30000,
+          "secu": 4000,
+          "secu_max": 40000,
+          "def": 5000,
+          "def_max": 50000,
+          "wall": 6000,
+          "wall_max": 60000
+        }
+      },
+      {
+        "id": 48,
+        "values": {
+          "level": 4,
+          "nation": 0,
+          "pop": 1000,
+          "pop_max": 10000,
+          "agri": 2000,
+          "agri_max": 20000,
+          "comm": 3000,
+          "comm_max": 30000,
+          "secu": 4000,
+          "secu_max": 40000,
+          "def": 5000,
+          "def_max": 50000,
+          "wall": 6000,
+          "wall_max": 60000
+        }
+      }
+    ],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "기준국",
+          "capital": 1,
+          "gennum": 1,
+          "tech": 100,
+          "level": 2,
+          "type": "che_유가"
+        }
+      }
+    ],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "name": "군주",
+          "nation": 1,
+          "city": 1,
+          "officer_level": 12,
+          "npc": 0,
+          "leadership": 50,
+          "strength": 50,
+          "intel": 50,
+          "experience": 1000,
+          "dedication": 1000,
+          "dex1": 10,
+          "dex2": 20,
+          "dex3": 30,
+          "dex4": 40,
+          "dex5": 50,
+          "turntime": "0200-01-01 00:05:00"
+        }
+      }
+    ],
+    "syncEnvironment": true
+  },
+  "environment": {
+    "year": 200,
+    "month": 1,
+    "startyear": 190,
+    "turnterm": 10,
+    "turntime": "0200-01-01 00:00:00",
+    "show_img_level": 3,
+    "fiction": [0]
+  },
+  "observe": {
+    "generalIds": [1],
+    "cityIds": [1, 48],
+    "nationIds": [1]
+  }
+}

hwe/compare/fixtures/monthly_raise_npc_nation.json

@@ -0,0 +1,77 @@
+{
+  "action": "RaiseNPCNation",
+  "setup": {
+    "resetCities": true,
+    "resetGenerals": true,
+    "resetNations": true,
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "name": "점유도시",
+          "level": 5,
+          "nation": 1,
+          "pop": 10001,
+          "pop_max": 50001,
+          "agri": 1001,
+          "agri_max": 5001,
+          "comm": 2001,
+          "comm_max": 6001,
+          "secu": 3001,
+          "secu_max": 7001,
+          "def": 4001,
+          "def_max": 8001,
+          "wall": 5001,
+          "wall_max": 9001
+        }
+      },
+      {
+        "id": 48,
+        "values": {
+          "name": "건국도시",
+          "level": 5,
+          "nation": 0,
+          "pop": 10048,
+          "pop_max": 50048,
+          "agri": 1048,
+          "agri_max": 5048,
+          "comm": 2048,
+          "comm_max": 6048,
+          "secu": 3048,
+          "secu_max": 7048,
+          "def": 4048,
+          "def_max": 8048,
+          "wall": 5048,
+          "wall_max": 9048
+        }
+      }
+    ],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "기준국",
+          "capital": 1,
+          "gennum": 1,
+          "tech": 120,
+          "level": 2,
+          "type": "che_유가"
+        }
+      }
+    ],
+    "syncEnvironment": true
+  },
+  "environment": {
+    "year": 200,
+    "month": 1,
+    "startyear": 190,
+    "turnterm": 10,
+    "turntime": "0200-01-01 00:00:00",
+    "show_img_level": 3,
+    "fiction": [0]
+  },
+  "observe": {
+    "cityIds": [1, 48],
+    "nationIds": [1]
+  }
+}

hwe/compare/fixtures/monthly_reg_neutral_npc.json

@@ -0,0 +1,35 @@
+{
+  "action": "RegNeutralNPC",
+  "args": [
+    0,
+    "등록재야",
+    null,
+    0,
+    33,
+    45,
+    55,
+    65,
+    180,
+    245,
+    null,
+    "무쌍",
+    ""
+  ],
+  "setup": {
+    "syncEnvironment": true
+  },
+  "environment": {
+    "year": 200,
+    "month": 1,
+    "startyear": 190,
+    "turnterm": 10,
+    "turntime": "0200-01-01 00:00:00",
+    "show_img_level": 3,
+    "fiction": [0]
+  },
+  "observe": {
+    "generalIds": [],
+    "cityIds": [33],
+    "nationIds": [1]
+  }
+}

hwe/compare/fixtures/monthly_reg_npc.json

@@ -0,0 +1,36 @@
+{
+  "action": "RegNPC",
+  "args": [
+    0,
+    "등록장수",
+    null,
+    0,
+    33,
+    60,
+    50,
+    40,
+    7,
+    186,
+    240,
+    null,
+    "인덕",
+    "등록 대사"
+  ],
+  "setup": {
+    "syncEnvironment": true
+  },
+  "environment": {
+    "year": 200,
+    "month": 1,
+    "startyear": 190,
+    "turnterm": 10,
+    "turntime": "0200-01-01 00:00:00",
+    "show_img_level": 3,
+    "fiction": [0]
+  },
+  "observe": {
+    "generalIds": [],
+    "cityIds": [33],
+    "nationIds": [1]
+  }
+}

hwe/compare/fixtures/monthly_unblock_scout.json

@@ -0,0 +1,24 @@
+{
+    "action": "UnblockScoutAction",
+    "args": [false],
+    "setup": {
+        "resetNations": true,
+        "deleteOtherNations": true,
+        "keepNationIds": [1, 2],
+        "nation": [
+            { "id": 1, "values": { "name": "위", "level": 2, "scout": 1 } },
+            { "id": 2, "values": { "name": "촉", "level": 2, "scout": 1 } }
+        ],
+        "gameEnvironment": {
+            "block_change_scout": true
+        }
+    },
+    "environment": {
+        "year": 200,
+        "month": 1,
+        "startyear": 190
+    },
+    "observe": {
+        "nationIds": [1, 2]
+    }
+}

hwe/compare/fixtures/monthly_update_city_supply.json

@@ -0,0 +1,140 @@
+{
+  "action": "UpdateCitySupply",
+  "environment": {
+    "year": 193,
+    "month": 1,
+    "startyear": 190
+  },
+  "setup": {
+    "nation": [
+      {
+        "id": 99,
+        "values": {
+          "name": "보급검증국",
+          "color": "#777777",
+          "capital": 1,
+          "level": 1,
+          "type": "che_중립"
+        }
+      },
+      {
+        "id": 98,
+        "values": {
+          "name": "불일치수도국",
+          "color": "#888888",
+          "capital": 2,
+          "level": 1,
+          "type": "che_중립"
+        }
+      }
+    ],
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 99,
+          "supply": 0,
+          "front": 2,
+          "pop": 1001,
+          "agri": 501,
+          "comm": 499,
+          "secu": 99,
+          "trust": 50,
+          "def": 101,
+          "wall": 50,
+          "officer_set": 7,
+          "term": 2,
+          "conflict": {"98": 3}
+        }
+      },
+      {
+        "id": 9,
+        "values": {
+          "nation": 99,
+          "supply": 0,
+          "front": 2,
+          "pop": 1001,
+          "agri": 501,
+          "comm": 499,
+          "secu": 99,
+          "trust": 50,
+          "def": 101,
+          "wall": 50,
+          "officer_set": 7,
+          "term": 2,
+          "conflict": {"98": 3}
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "nation": 99,
+          "supply": 1,
+          "front": 2,
+          "pop": 1001,
+          "agri": 501,
+          "comm": 499,
+          "secu": 99,
+          "trust": 33,
+          "def": 101,
+          "wall": 50,
+          "officer_set": 7,
+          "term": 2,
+          "conflict": {"98": 3}
+        }
+      },
+      {
+        "id": 3,
+        "values": {
+          "nation": 0,
+          "supply": 0,
+          "front": 0,
+          "trust": 50
+        }
+      }
+    ],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 99,
+          "city": 2,
+          "officer_level": 4,
+          "officer_city": 2,
+          "crew": 101,
+          "train": 51,
+          "atmos": 99
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "nation": 99,
+          "city": 1,
+          "officer_level": 4,
+          "officer_city": 2,
+          "crew": 101,
+          "train": 51,
+          "atmos": 99
+        }
+      },
+      {
+        "id": 3,
+        "values": {
+          "nation": 98,
+          "city": 2,
+          "officer_level": 3,
+          "officer_city": 1,
+          "crew": 101,
+          "train": 51,
+          "atmos": 99
+        }
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1, 2, 3],
+    "cityIds": [1, 2, 3, 9],
+    "nationIds": [98, 99]
+  }
+}

hwe/compare/fixtures/monthly_update_nation_level.json

@@ -0,0 +1,85 @@
+{
+  "action": "UpdateNationLevel",
+  "environment": {
+    "year": 193,
+    "month": 2,
+    "startyear": 190,
+    "killturn": 1000,
+    "turnterm": 10
+  },
+  "setup": {
+    "resetCities": true,
+    "resetGenerals": true,
+    "resetUniqueOccupancy": true,
+    "syncEnvironment": true,
+    "clearNationTurnIds": [1],
+    "clearInheritanceOwnerIds": [990061],
+    "nation": [
+      {
+        "id": 1,
+        "values": {
+          "name": "작위검증국",
+          "color": "#777777",
+          "capital": 1,
+          "gold": 10000,
+          "rice": 20000,
+          "level": 0,
+          "type": "che_중립",
+          "aux": {}
+        }
+      }
+    ],
+    "city": [
+      {
+        "id": 1,
+        "values": {
+          "nation": 1,
+          "level": 4
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "nation": 1,
+          "level": 4
+        }
+      }
+    ],
+    "general": [
+      {
+        "id": 1,
+        "values": {
+          "name": "조조",
+          "nation": 1,
+          "city": 1,
+          "officer_level": 12,
+          "owner": 990061,
+          "npc": 0,
+          "killturn": 1000,
+          "belong": 10,
+          "horse": "None",
+          "weapon": "None",
+          "book": "None",
+          "item": "None",
+          "aux": {}
+        }
+      },
+      {
+        "id": 2,
+        "values": {
+          "nation": 0,
+          "city": 2,
+          "officer_level": 1,
+          "npc": 0,
+          "killturn": 0
+        }
+      }
+    ]
+  },
+  "observe": {
+    "generalIds": [1],
+    "cityIds": [1, 2],
+    "nationIds": [1],
+    "ownerIds": [990061]
+  }
+}

hwe/compare/item_catalog.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace sammo;
+
+if (PHP_SAPI !== 'cli') {
+    http_response_code(404);
+    exit;
+}
+
+chdir(dirname(__DIR__));
+require_once 'lib.php';
+require_once 'func.php';
+
+$input = stream_get_contents(STDIN);
+$keys = Json::decode($input);
+if (!is_array($keys)) {
+    fwrite(STDERR, "Expected a JSON array of item keys.\n");
+    exit(2);
+}
+
+$result = [];
+foreach ($keys as $key) {
+    if (!is_string($key)) {
+        continue;
+    }
+    $item = buildItemClass($key);
+    $result[$key] = [
+        'rawName' => $item->getRawName(),
+        'name' => $item->getName(),
+        'info' => $item->getInfo(),
+        'cost' => $item->getCost(),
+        'buyable' => $item->isBuyable(),
+        'consumable' => $item->isConsumable(),
+        'reqSecu' => $item->getReqSecu(),
+    ];
+}
+
+echo Json::encode($result);

hwe/compare/monthly_event_trace.php

@@ -0,0 +1,1579 @@
+<?php
+
+declare(strict_types=1);
+
+namespace sammo;
+
+if (PHP_SAPI !== 'cli' || getenv('TURN_DIFFERENTIAL_ENABLED') !== '1') {
+    http_response_code(404);
+    exit;
+}
+
+chdir(dirname(__DIR__));
+$_SERVER['REMOTE_ADDR'] ??= '127.0.0.1';
+error_reporting(E_ALL & ~E_DEPRECATED);
+require_once 'lib.php';
+require_once 'func.php';
+require_once __DIR__ . '/turn_state_snapshot.php';
+
+/** @param array<string, mixed> $values */
+function comparisonMonthlyPatch(string $table, int $id, array $values): void
+{
+    $definitions = [
+        'city' => [
+            'idColumn' => 'city',
+            'allowed' => [
+                'name', 'level', 'nation', 'supply', 'front', 'pop', 'pop_max',
+                'agri', 'agri_max', 'comm', 'comm_max', 'secu', 'secu_max',
+                'trust', 'trade', 'def', 'def_max', 'wall', 'wall_max',
+                'officer_set', 'state', 'region', 'term', 'conflict', 'dead',
+            ],
+        ],
+        'nation' => [
+            'idColumn' => 'nation',
+            'allowed' => [
+                'name', 'color', 'capital', 'gennum', 'gold', 'rice', 'tech',
+                'power', 'level', 'type', 'bill', 'rate_tmp', 'scout', 'chief_set', 'aux',
+                'rate', 'strategic_cmd_limit', 'surlimit', 'spy',
+            ],
+        ],
+        'general' => [
+            'idColumn' => 'no',
+            'allowed' => [
+                'name', 'nation', 'city', 'officer_level', 'officer_city',
+                'crew', 'train', 'atmos', 'owner', 'npc', 'killturn', 'belong',
+                'gold', 'rice', 'horse', 'weapon', 'book', 'item', 'aux',
+                'leadership', 'strength', 'intel', 'experience', 'dedication',
+                'injury',
+                'dex1', 'dex2', 'dex3', 'dex4', 'dex5', 'personal', 'special',
+                'specage', 'special2', 'specage2', 'betray', 'age',
+                'bornyear', 'deadyear', 'turntime', 'makelimit',
+            ],
+        ],
+    ];
+    $definition = $definitions[$table] ?? null;
+    if ($definition === null) {
+        throw new \InvalidArgumentException("unsupported setup table: {$table}");
+    }
+    $patch = [];
+    foreach ($values as $key => $value) {
+        if (!is_string($key) || !in_array($key, $definition['allowed'], true)) {
+            throw new \InvalidArgumentException("unsupported {$table} setup field");
+        }
+        if (in_array($key, ['conflict', 'aux'], true) && is_array($value)) {
+            $value = json_encode($value, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
+        }
+        $patch[$key] = $value;
+    }
+    if ($table === 'nation') {
+        $patch += [
+            'nation' => $id,
+            'name' => "fixture-nation-{$id}",
+            'color' => '#777777',
+            'capital' => 0,
+            'gold' => 0,
+            'rice' => 0,
+            'level' => 1,
+            'type' => 'che_중립',
+            'aux' => '{}',
+        ];
+        DB::db()->insertUpdate('nation', $patch, $patch);
+    } elseif ($patch !== []) {
+        DB::db()->update($table, $patch, "`{$definition['idColumn']}` = %i", $id);
+    }
+}
+
+/** @param array<string, mixed> $observe */
+function comparisonMonthlyDetails(array $observe, int $worldHistoryAfterId): array
+{
+    $db = DB::db();
+    $generals = array_map(
+        static fn(array $row): array => comparisonPickRow(
+            $row,
+            [
+                'id' => 'no',
+                'nationId' => 'nation',
+                'cityId' => 'city',
+                'officerLevel' => 'officer_level',
+                'officerCityId' => 'officer_city',
+                'crew' => 'crew',
+                'train' => 'train',
+                'atmos' => 'atmos',
+                'gold' => 'gold',
+                'rice' => 'rice',
+                'injury' => 'injury',
+                'leadership' => 'leadership',
+                'strength' => 'strength',
+                'intelligence' => 'intel',
+                'age' => 'age',
+                'specialDomestic' => 'special',
+                'specAge' => 'specage',
+                'specialWar' => 'special2',
+                'specAge2' => 'specage2',
+                'betray' => 'betray',
+                'makeLimit' => 'makelimit',
+                'horse' => 'horse',
+                'weapon' => 'weapon',
+                'book' => 'book',
+                'item' => 'item',
+                'dex1' => 'dex1',
+                'dex2' => 'dex2',
+                'dex3' => 'dex3',
+                'dex4' => 'dex4',
+                'dex5' => 'dex5',
+                'aux' => 'aux',
+            ],
+            ['aux'],
+        ),
+        comparisonRowsById('general', 'no', comparisonIntegerList($observe['generalIds'] ?? [], 'generalIds')),
+    );
+    $cities = array_map(
+        static fn(array $row): array => comparisonPickRow(
+            $row,
+            [
+                'id' => 'city',
+                'nationId' => 'nation',
+                'state' => 'state',
+                'supplyState' => 'supply',
+                'frontState' => 'front',
+                'officerSet' => 'officer_set',
+                'term' => 'term',
+                'dead' => 'dead',
+                'population' => 'pop',
+                'populationMax' => 'pop_max',
+                'agriculture' => 'agri',
+                'agricultureMax' => 'agri_max',
+                'commerce' => 'comm',
+                'commerceMax' => 'comm_max',
+                'security' => 'secu',
+                'securityMax' => 'secu_max',
+                'trust' => 'trust',
+                'trade' => 'trade',
+                'defence' => 'def',
+                'defenceMax' => 'def_max',
+                'wall' => 'wall',
+                'wallMax' => 'wall_max',
+                'conflict' => 'conflict',
+            ],
+            ['conflict'],
+        ),
+        comparisonRowsById('city', 'city', comparisonIntegerList($observe['cityIds'] ?? [], 'cityIds')),
+    );
+    $nations = array_map(
+        static fn(array $row): array => comparisonPickRow(
+            $row,
+            [
+                'id' => 'nation',
+                'gold' => 'gold',
+                'rice' => 'rice',
+                'rate' => 'rate_tmp',
+                'baseRate' => 'rate',
+                'power' => 'power',
+                'generalCount' => 'gennum',
+                'tech' => 'tech',
+                'typeCode' => 'type',
+                'scout' => 'scout',
+                'strategicCommandLimit' => 'strategic_cmd_limit',
+                'surrenderLimit' => 'surlimit',
+                'spy' => 'spy',
+                'chiefSet' => 'chief_set',
+            ],
+            ['spy'],
+        ),
+        comparisonRowsById('nation', 'nation', comparisonIntegerList($observe['nationIds'] ?? [], 'nationIds')),
+    );
+    $worldHistory = array_map(
+        static fn(array $row): array => comparisonPickRow(
+            $row,
+            [
+                'id' => 'id',
+                'nationId' => 'nation_id',
+                'year' => 'year',
+                'month' => 'month',
+                'text' => 'text',
+            ],
+        ),
+        $db->query(
+            'SELECT id, nation_id, year, month, text FROM world_history WHERE id > %i ORDER BY id',
+            $worldHistoryAfterId,
+        ),
+    );
+    $inheritanceKeys = $observe['inheritanceKeys'] ?? ['unifier'];
+    if (!is_array($inheritanceKeys) || array_filter($inheritanceKeys, static fn($key): bool => !is_string($key))) {
+        throw new \InvalidArgumentException('inheritanceKeys must be an array of strings');
+    }
+    $inheritancePoints = [];
+    foreach (comparisonIntegerList($observe['ownerIds'] ?? [], 'ownerIds') as $ownerId) {
+        $entry = ['ownerId' => $ownerId];
+        foreach ($inheritanceKeys as $key) {
+            $value = $db->queryFirstField(
+                'SELECT value FROM storage WHERE namespace = %s AND `key` = %s',
+                "inheritance_{$ownerId}",
+                $key,
+            );
+            $entry[$key] = $value === null ? 0 : (comparisonJsonValue($value)[0] ?? 0);
+        }
+        $inheritancePoints[] = $entry;
+    }
+    $rankGeneralIds = comparisonIntegerList($observe['rankGeneralIds'] ?? [], 'rankGeneralIds');
+    $rankTypes = $observe['rankTypes'] ?? [];
+    if (!is_array($rankTypes) || array_filter($rankTypes, static fn($type): bool => !is_string($type))) {
+        throw new \InvalidArgumentException('rankTypes must be an array of strings');
+    }
+    $rankData = (!$rankGeneralIds || !$rankTypes)
+        ? []
+        : iterator_to_array($db->query(
+            'SELECT general_id AS generalId, nation_id AS nationId, `type`, `value` FROM rank_data WHERE general_id IN %li AND `type` IN %ls ORDER BY general_id, `type`',
+            $rankGeneralIds,
+            $rankTypes,
+        ));
+    $generalAccessLogs = [];
+    $accessGeneralIds = comparisonIntegerList($observe['accessGeneralIds'] ?? [], 'accessGeneralIds');
+    if ($accessGeneralIds) {
+        $generalAccessLogs = iterator_to_array($db->query(
+            'SELECT general_id AS generalId, refresh_score_total AS refreshScoreTotal FROM general_access_log WHERE general_id IN %li ORDER BY general_id',
+            $accessGeneralIds,
+        ));
+    }
+    $nationEnvironment = [];
+    $nationEnvironmentKeys = $observe['nationEnvironmentKeys'] ?? [];
+    if (
+        !is_array($nationEnvironmentKeys)
+        || array_filter($nationEnvironmentKeys, static fn($key): bool => !is_string($key))
+    ) {
+        throw new \InvalidArgumentException('nationEnvironmentKeys must be an array of strings');
+    }
+    foreach (comparisonIntegerList($observe['nationIds'] ?? [], 'nationIds') as $nationId) {
+        $entry = ['nationId' => $nationId];
+        $storage = KVStorage::getStorage($db, $nationId, 'nation_env');
+        foreach ($nationEnvironmentKeys as $key) {
+            $entry[$key] = $storage->getValue($key);
+        }
+        $nationEnvironment[] = $entry;
+    }
+    return [
+        'generals' => $generals,
+        'cities' => $cities,
+        'nations' => $nations,
+        'worldHistory' => $worldHistory,
+        'inheritancePoints' => $inheritancePoints,
+        'rankData' => $rankData,
+        'generalAccessLogs' => $generalAccessLogs,
+        'nationEnvironment' => $nationEnvironment,
+    ];
+}
+
+/**
+ * Exercise the dynamically-created invader events against one evolving database.
+ *
+ * @param array<string, mixed> $request
+ * @param array<string, mixed> $environment
+ * @return array<string, mixed>
+ */
+function comparisonInvaderLifecycleTrace(
+    array $request,
+    array $environment,
+    int $generalIdBeforeAction,
+    int $nationIdBeforeAction,
+    int $eventIdBeforeAction,
+    int $worldHistoryIdBeforeAction,
+): array {
+    $db = DB::db();
+    $args = $request['args'] ?? [];
+    if (!is_array($args) || count($args) > 4) {
+        throw new \InvalidArgumentException('InvaderLifecycle args must have at most four entries');
+    }
+    $year = $environment['year'];
+    $month = $environment['month'];
+    $startYear = $environment['startyear'];
+    $raiseEnvironment = [
+        'year' => $year,
+        'month' => $month,
+        'startyear' => $startYear,
+        'turnterm' => $environment['turnterm'],
+        'turntime' => $environment['turntime'],
+        'show_img_level' => $environment['show_img_level'] ?? 3,
+        'stored_icons' => $environment['stored_icons'] ?? [],
+        'icon_path' => $environment['icon_path'] ?? '.',
+        'fiction' => $environment['fiction'] ?? [0],
+    ];
+
+    (new \sammo\Event\Action\RaiseInvader(...$args))->run($raiseEnvironment);
+
+    $invaderNationIds = array_map(
+        'intval',
+        $db->queryFirstColumn('SELECT nation FROM nation WHERE nation > %i ORDER BY nation', $nationIdBeforeAction),
+    );
+    $existingNationId = (int)$db->queryFirstField(
+        'SELECT nation FROM nation WHERE nation <= %i ORDER BY nation LIMIT 1',
+        $nationIdBeforeAction,
+    );
+    $rulerIds = array_map(
+        'intval',
+        $db->queryFirstColumn(
+            'SELECT no FROM general WHERE nation IN %li AND officer_level = 12 ORDER BY nation',
+            $invaderNationIds,
+        ),
+    );
+    if ($invaderNationIds === [] || $existingNationId <= 0 || count($rulerIds) !== count($invaderNationIds)) {
+        throw new \RuntimeException('InvaderLifecycle failed to create the expected entities');
+    }
+
+    $autoDeleteEvents = [];
+    $endingEventId = 0;
+    foreach ($db->query('SELECT id, action FROM event WHERE id > %i ORDER BY id', $eventIdBeforeAction) as $row) {
+        $action = comparisonJsonValue($row['action']);
+        $actionName = $action[0][0] ?? null;
+        if ($actionName === 'AutoDeleteInvader') {
+            $autoDeleteEvents[] = [
+                'eventId' => (int)$row['id'],
+                'nationId' => (int)($action[0][1] ?? 0),
+            ];
+        } elseif ($actionName === 'InvaderEnding') {
+            $endingEventId = (int)$row['id'];
+        }
+    }
+    if (count($autoDeleteEvents) !== count($invaderNationIds) || $endingEventId <= 0) {
+        throw new \RuntimeException('InvaderLifecycle failed to create follow-up events');
+    }
+
+    $diplomacyRows = iterator_to_array($db->query(
+        'SELECT me, you, state, term FROM diplomacy WHERE (me IN %li AND you = %i) OR (me = %i AND you IN %li) ORDER BY me, you',
+        $invaderNationIds,
+        $existingNationId,
+        $existingNationId,
+        $invaderNationIds,
+    ));
+    $diplomacyStates = array_values(array_unique(array_map(
+        static fn(array $row): string => "{$row['state']}:{$row['term']}",
+        $diplomacyRows,
+    )));
+    sort($diplomacyStates);
+    $generalCounts = array_map(
+        static fn(int $nationId): int => (int)DB::db()->queryFirstField(
+            'SELECT count(*) FROM general WHERE nation = %i',
+            $nationId,
+        ),
+        $invaderNationIds,
+    );
+    $diplomacyCounts = array_map(
+        static fn(int $nationId): int => (int)DB::db()->queryFirstField(
+            'SELECT count(*) FROM diplomacy WHERE (me = %i AND you = %i) OR (me = %i AND you = %i)',
+            $nationId,
+            $existingNationId,
+            $existingNationId,
+            $nationId,
+        ),
+        $invaderNationIds,
+    );
+    $gameStorage = KVStorage::getStorage($db, 'game_env');
+    $afterRaise = [
+        'createdNationCount' => count($invaderNationIds),
+        'createdGeneralCount' => (int)$db->queryFirstField(
+            'SELECT count(*) FROM general WHERE no > %i',
+            $generalIdBeforeAction,
+        ),
+        'followUpEventCount' => (int)$db->queryFirstField(
+            'SELECT count(*) FROM event WHERE id > %i',
+            $eventIdBeforeAction,
+        ),
+        'generalCountsPerNation' => array_values(array_unique($generalCounts)),
+        'diplomacyCountsPerNation' => array_values(array_unique($diplomacyCounts)),
+        'diplomacyStates' => $diplomacyStates,
+        'isunited' => (int)$gameStorage->isunited,
+        'blockChangeScout' => (bool)$gameStorage->block_change_scout,
+    ];
+
+    $warResults = [];
+    foreach ($autoDeleteEvents as $autoDeleteEvent) {
+        $warResult = (new \sammo\Event\Action\AutoDeleteInvader($autoDeleteEvent['nationId']))->run([
+            'year' => $year,
+            'month' => $month + 1,
+            'startyear' => $startYear,
+            'currentEventID' => $autoDeleteEvent['eventId'],
+        ]);
+        $warResults[] = $warResult[1] ?? null;
+    }
+    $atWar = [
+        'results' => array_values(array_unique($warResults)),
+        'autoDeleteEventCount' => (int)$db->queryFirstField(
+            'SELECT count(*) FROM event WHERE id IN %li',
+            array_column($autoDeleteEvents, 'eventId'),
+        ),
+    ];
+
+    $db->update(
+        'diplomacy',
+        ['state' => 2, 'term' => 0],
+        'me IN %li OR you IN %li',
+        $invaderNationIds,
+        $invaderNationIds,
+    );
+    $peaceResults = [];
+    foreach ($autoDeleteEvents as $autoDeleteEvent) {
+        $peaceResult = (new \sammo\Event\Action\AutoDeleteInvader($autoDeleteEvent['nationId']))->run([
+            'year' => $year,
+            'month' => $month + 2,
+            'startyear' => $startYear,
+            'currentEventID' => $autoDeleteEvent['eventId'],
+        ]);
+        $peaceResults[] = $peaceResult[1] ?? null;
+    }
+    $atPeace = [
+        'results' => array_values(array_unique($peaceResults)),
+        'autoDeleteEventCount' => (int)$db->queryFirstField(
+            'SELECT count(*) FROM event WHERE id IN %li',
+            array_column($autoDeleteEvents, 'eventId'),
+        ),
+        'rulerWanderTurnCount' => (int)$db->queryFirstField(
+            'SELECT count(*) FROM general_turn WHERE general_id IN %li AND action = %s',
+            $rulerIds,
+            'che_방랑',
+        ),
+        'endingEventPresent' => (bool)$db->queryFirstField(
+            'SELECT count(*) FROM event WHERE id = %i',
+            $endingEventId,
+        ),
+    ];
+
+    $invaderGeneralIds = array_map('intval', $db->queryFirstColumn(
+        'SELECT no FROM general WHERE nation IN %li',
+        $invaderNationIds,
+    ));
+    if ($invaderGeneralIds !== []) {
+        $db->delete('general_turn', 'general_id IN %li', $invaderGeneralIds);
+        $db->delete('rank_data', 'general_id IN %li', $invaderGeneralIds);
+        $db->delete('troop', 'nation IN %li', $invaderNationIds);
+        $db->delete('general', 'no IN %li', $invaderGeneralIds);
+    }
+    $db->delete('nation_turn', 'nation_id IN %li', $invaderNationIds);
+    $db->delete('diplomacy', 'me IN %li OR you IN %li', $invaderNationIds, $invaderNationIds);
+    $db->delete('nation', 'nation IN %li', $invaderNationIds);
+    $db->update('city', ['nation' => $existingNationId], true);
+
+    $endingResult = (new \sammo\Event\Action\InvaderEnding())->run([
+        'year' => $year,
+        'month' => $month + 3,
+        'startyear' => $startYear,
+        'currentEventID' => $endingEventId,
+    ]);
+    $gameStorage->resetCache();
+    $afterUserWin = [
+        'result' => $endingResult[1] ?? null,
+        'endingEventPresent' => (bool)$db->queryFirstField(
+            'SELECT count(*) FROM event WHERE id = %i',
+            $endingEventId,
+        ),
+        'isunited' => (int)$gameStorage->isunited,
+        'refreshLimit' => (int)$gameStorage->refreshLimit,
+        'logs' => array_values($db->queryFirstColumn(
+            'SELECT text FROM world_history WHERE id > %i AND nation_id = 0 AND year = %i AND month = %i ORDER BY id',
+            $worldHistoryIdBeforeAction,
+            $year,
+            $month + 3,
+        )),
+    ];
+
+    return [
+        'schemaVersion' => 1,
+        'engine' => 'ref',
+        'action' => 'InvaderLifecycle',
+        'phases' => [
+            'afterRaise' => $afterRaise,
+            'atWar' => $atWar,
+            'atPeace' => $atPeace,
+            'afterUserWin' => $afterUserWin,
+        ],
+    ];
+}
+
+/**
+ * Exercise NPC nation creation and the same-month troop leader follow-up.
+ *
+ * @param array<string, mixed> $environment
+ * @return array<string, mixed>
+ */
+function comparisonNpcNationLifecycleTrace(
+    array $environment,
+    int $generalIdBeforeAction,
+    int $nationIdBeforeAction,
+    int $worldHistoryIdBeforeAction,
+): array {
+    $db = DB::db();
+    $actionEnvironment = [
+        'year' => $environment['year'],
+        'month' => $environment['month'],
+        'startyear' => $environment['startyear'],
+        'turnterm' => $environment['turnterm'],
+        'turntime' => $environment['turntime'],
+        'show_img_level' => $environment['show_img_level'] ?? 3,
+        'stored_icons' => $environment['stored_icons'] ?? [],
+        'icon_path' => $environment['icon_path'] ?? '.',
+        'fiction' => $environment['fiction'] ?? [0],
+    ];
+    $gameStorage = KVStorage::getStorage($db, 'game_env');
+    $leaderCounterBefore = (int)($gameStorage->lastNPCTroopLeaderID ?? 0);
+
+    (new \sammo\Event\Action\RaiseNPCNation())->run($actionEnvironment);
+    $createdNationIds = array_map(
+        'intval',
+        $db->queryFirstColumn('SELECT nation FROM nation WHERE nation > %i ORDER BY nation', $nationIdBeforeAction),
+    );
+    if ($createdNationIds === []) {
+        throw new \RuntimeException('NpcNationLifecycle failed to create a nation');
+    }
+    $createdNationGeneralCounts = array_map(
+        static fn(int $nationId): int => (int)DB::db()->queryFirstField(
+            'SELECT count(*) FROM general WHERE nation = %i',
+            $nationId,
+        ),
+        $createdNationIds,
+    );
+    $afterRaise = [
+        'createdNationCount' => count($createdNationIds),
+        'createdGeneralCount' => (int)$db->queryFirstField(
+            'SELECT count(*) FROM general WHERE no > %i',
+            $generalIdBeforeAction,
+        ),
+        'generalCountsPerCreatedNation' => array_values(array_unique($createdNationGeneralCounts)),
+        'historyLogs' => array_values($db->queryFirstColumn(
+            'SELECT text FROM world_history WHERE id > %i AND nation_id = 0 ORDER BY id',
+            $worldHistoryIdBeforeAction,
+        )),
+    ];
+
+    (new \sammo\Event\Action\ProvideNPCTroopLeader())->run($actionEnvironment);
+    $leaderIds = array_map(
+        'intval',
+        $db->queryFirstColumn('SELECT no FROM general WHERE no > %i AND npc = 5 ORDER BY no', $generalIdBeforeAction),
+    );
+    if ($leaderIds === []) {
+        throw new \RuntimeException('NpcNationLifecycle failed to create troop leaders');
+    }
+    $leaderNationCounts = array_map(
+        static fn(int $nationId): int => (int)DB::db()->queryFirstField(
+            'SELECT count(*) FROM general WHERE nation = %i AND npc = 5',
+            $nationId,
+        ),
+        array_map(
+            'intval',
+            $db->queryFirstColumn('SELECT nation FROM nation WHERE level > 0 ORDER BY nation'),
+        ),
+    );
+    $gatherTurnCounts = array_map(
+        static fn(int $generalId): int => (int)DB::db()->queryFirstField(
+            'SELECT count(*) FROM general_turn WHERE general_id = %i AND action = %s',
+            $generalId,
+            'che_집합',
+        ),
+        $leaderIds,
+    );
+    $gameStorage->resetCache();
+    $afterProvide = [
+        'createdLeaderCount' => count($leaderIds),
+        'leaderCountsPerActiveNation' => array_values(array_unique($leaderNationCounts)),
+        'troopCount' => (int)$db->queryFirstField(
+            'SELECT count(*) FROM troop WHERE troop_leader IN %li',
+            $leaderIds,
+        ),
+        'gatherTurnCounts' => array_values(array_unique($gatherTurnCounts)),
+        'leaderCounterDelta' => (int)$gameStorage->lastNPCTroopLeaderID - $leaderCounterBefore,
+    ];
+
+    return [
+        'schemaVersion' => 1,
+        'engine' => 'ref',
+        'action' => 'NpcNationLifecycle',
+        'phases' => [
+            'afterRaise' => $afterRaise,
+            'afterProvide' => $afterProvide,
+        ],
+    ];
+}
+
+/**
+ * Exercise nation betting from monthly open through real user bets and settlement.
+ *
+ * @param array<string, mixed> $request
+ * @param array<string, mixed> $environment
+ * @return array<string, mixed>
+ */
+function comparisonNationBettingLifecycleTrace(
+    array $request,
+    array $environment,
+    int $eventIdBeforeAction,
+    int $worldHistoryIdBeforeAction,
+): array {
+    $db = DB::db();
+    $args = $request['args'] ?? [];
+    if (!is_array($args) || count($args) > 2) {
+        throw new \InvalidArgumentException('NationBettingLifecycle args must have at most two entries');
+    }
+    $bettorGeneralIds = comparisonIntegerList(
+        $request['bettorGeneralIds'] ?? [],
+        'bettorGeneralIds',
+    );
+    $bettorOwnerIds = comparisonIntegerList(
+        $request['bettorOwnerIds'] ?? [],
+        'bettorOwnerIds',
+    );
+    if (count($bettorGeneralIds) !== 2 || count($bettorOwnerIds) !== 2) {
+        throw new \InvalidArgumentException(
+            'NationBettingLifecycle requires exactly two bettorGeneralIds and bettorOwnerIds',
+        );
+    }
+
+    $year = $environment['year'];
+    $month = $environment['month'];
+    $startYear = $environment['startyear'];
+    (new \sammo\Event\Action\OpenNationBetting(...$args))->run([
+        'year' => $year,
+        'month' => $month,
+        'startyear' => $startYear,
+    ]);
+
+    $gameStorage = KVStorage::getStorage($db, 'game_env');
+    $gameStorage->resetCache();
+    $bettingId = (int)$gameStorage->last_betting_id;
+    $betting = new Betting($bettingId);
+    $bettingInfo = $betting->getInfo();
+    $candidateNationIds = array_map(
+        static fn(\sammo\DTO\SelectItem $candidate): int => (int)($candidate->aux['nation'] ?? 0),
+        $bettingInfo->candidates,
+    );
+    if (count($candidateNationIds) !== 2) {
+        throw new \RuntimeException('NationBettingLifecycle requires exactly two candidates');
+    }
+
+    $finishEventCount = (int)$db->queryFirstField(
+        'SELECT count(*) FROM event WHERE id > %i AND action LIKE %s',
+        $eventIdBeforeAction,
+        "%FinishNationBetting%{$bettingId}%",
+    );
+    $afterOpen = [
+        'bettingId' => $bettingId,
+        'candidateNationIds' => $candidateNationIds,
+        'systemBonus' => (int)($db->queryFirstField(
+            'SELECT amount FROM ng_betting WHERE betting_id = %i AND general_id = 0',
+            $bettingId,
+        ) ?? 0),
+        'finishEventCount' => $finishEventCount,
+        'historyLogs' => array_values($db->queryFirstColumn(
+            'SELECT text FROM world_history WHERE id > %i AND nation_id = 0 ORDER BY id',
+            $worldHistoryIdBeforeAction,
+        )),
+    ];
+
+    $betting->bet($bettorGeneralIds[0], $bettorOwnerIds[0], [1], 100);
+    $betting->bet($bettorGeneralIds[1], $bettorOwnerIds[1], [0], 100);
+    $afterBets = [
+        'bets' => array_map(
+            static fn(array $row): array => [
+                'generalId' => (int)$row['general_id'],
+                'ownerId' => $row['user_id'] === null ? null : (int)$row['user_id'],
+                'selectionKey' => $row['betting_type'],
+                'amount' => (int)$row['amount'],
+            ],
+            iterator_to_array($db->query(
+                'SELECT general_id, user_id, betting_type, amount FROM ng_betting WHERE betting_id = %i ORDER BY general_id',
+                $bettingId,
+            )),
+        ),
+        'inheritancePrevious' => array_map(
+            static function (int $ownerId): int {
+                $value = KVStorage::getStorage(DB::db(), "inheritance_{$ownerId}")->getValue('previous');
+                return is_array($value) ? (int)($value[0] ?? 0) : 0;
+            },
+            $bettorOwnerIds,
+        ),
+        'spentRank' => array_map(
+            static fn(int $generalId): int => (int)(DB::db()->queryFirstField(
+                'SELECT value FROM rank_data WHERE general_id = %i AND type = %s',
+                $generalId,
+                \sammo\Enums\RankColumn::inherit_point_spent_dynamic->value,
+            ) ?? 0),
+            $bettorGeneralIds,
+        ),
+    ];
+
+    $db->update('nation', ['level' => 0], 'nation = %i', $candidateNationIds[1]);
+    $finishResult = (new \sammo\Event\Action\FinishNationBetting($bettingId))->run([
+        'year' => $year,
+        'month' => $month + 1,
+        'startyear' => $startYear,
+    ]);
+    $settledInfo = (new Betting($bettingId))->getInfo();
+    $afterFinish = [
+        'result' => $finishResult[1] ?? null,
+        'finished' => $settledInfo->finished,
+        'winner' => $settledInfo->winner,
+        'inheritancePrevious' => array_map(
+            static function (int $ownerId): int {
+                $value = KVStorage::getStorage(DB::db(), "inheritance_{$ownerId}")->getValue('previous');
+                return is_array($value) ? (int)($value[0] ?? 0) : 0;
+            },
+            $bettorOwnerIds,
+        ),
+        'earnedRank' => array_map(
+            static fn(int $generalId): int => (int)(DB::db()->queryFirstField(
+                'SELECT value FROM rank_data WHERE general_id = %i AND type = %s',
+                $generalId,
+                \sammo\Enums\RankColumn::inherit_point_earned_by_action->value,
+            ) ?? 0),
+            $bettorGeneralIds,
+        ),
+        'historyLogs' => array_values($db->queryFirstColumn(
+            'SELECT text FROM world_history WHERE id > %i AND nation_id = 0 ORDER BY id',
+            $worldHistoryIdBeforeAction,
+        )),
+    ];
+
+    return [
+        'schemaVersion' => 1,
+        'engine' => 'ref',
+        'action' => 'NationBettingLifecycle',
+        'phases' => [
+            'afterOpen' => $afterOpen,
+            'afterBets' => $afterBets,
+            'afterFinish' => $afterFinish,
+        ],
+    ];
+}
+
+function comparisonMonthlyEventTraceMain(): void
+{
+    try {
+        $input = stream_get_contents(STDIN);
+        $request = json_decode($input === '' ? '{}' : $input, true, flags: JSON_THROW_ON_ERROR);
+        if (!is_array($request)) {
+            throw new \InvalidArgumentException('request must be an object');
+        }
+        $actionName = $request['action'] ?? null;
+        $supportedActions = [
+            'UpdateCitySupply',
+            'UpdateNationLevel',
+            'RaiseDisaster',
+            'ProcessSemiAnnual',
+            'ProcessWarIncome',
+            'CreateAdminNPC',
+            'CreateManyNPC',
+            'RegNPC',
+            'RegNeutralNPC',
+            'RaiseNPCNation',
+            'NpcNationLifecycle',
+            'RaiseInvader',
+            'InvaderLifecycle',
+            'AutoDeleteInvader',
+            'InvaderEnding',
+            'ChangeCity',
+            'ProvideNPCTroopLeader',
+            'NationBettingLifecycle',
+            'OpenNationBetting',
+            'FinishNationBetting',
+            'BlockScoutAction',
+            'UnblockScoutAction',
+            'AssignGeneralSpeciality',
+            'AddGlobalBetray',
+            'LostUniqueItem',
+            'MergeInheritPointRank',
+            'ProcessIncome',
+            'NoticeToHistoryLog',
+            'NewYear',
+            'ResetOfficerLock',
+            'PreUpdateMonthly',
+            'PostUpdateMonthly',
+            'MonthlyBoundary',
+        ];
+        if (!in_array($actionName, $supportedActions, true)) {
+            throw new \InvalidArgumentException('unsupported monthly action');
+        }
+        $setup = $request['setup'] ?? [];
+        if (!is_array($setup)) {
+            throw new \InvalidArgumentException('setup must be an object');
+        }
+        foreach (['city', 'nation', 'general'] as $table) {
+            $rows = $setup[$table] ?? [];
+            if (!is_array($rows)) {
+                throw new \InvalidArgumentException("setup.{$table} must be an array");
+            }
+            foreach ($rows as $row) {
+                if (!is_array($row) || !is_int($row['id'] ?? null) || !is_array($row['values'] ?? null)) {
+                    throw new \InvalidArgumentException("invalid setup.{$table} row");
+                }
+                comparisonMonthlyPatch($table, $row['id'], $row['values']);
+            }
+        }
+        if (($setup['resetCities'] ?? false) === true) {
+            DB::db()->query('UPDATE city SET nation = 0, level = 1');
+            foreach ($setup['city'] ?? [] as $row) {
+                comparisonMonthlyPatch('city', $row['id'], $row['values']);
+            }
+        }
+        if (($setup['deleteOtherCities'] ?? false) === true) {
+            $keepCityIds = comparisonIntegerList($setup['keepCityIds'] ?? [], 'keepCityIds');
+            if ($keepCityIds === []) {
+                throw new \InvalidArgumentException('deleteOtherCities requires keepCityIds');
+            }
+            DB::db()->query('DELETE FROM city WHERE city NOT IN %li', $keepCityIds);
+        }
+        if (($setup['resetGenerals'] ?? false) === true) {
+            DB::db()->query(
+                'UPDATE general SET nation = 0, officer_level = 1, npc = 2, killturn = 0, horse = %s, weapon = %s, book = %s, item = %s',
+                'None',
+                'None',
+                'None',
+                'None',
+            );
+            foreach ($setup['general'] ?? [] as $row) {
+                comparisonMonthlyPatch('general', $row['id'], $row['values']);
+            }
+        }
+        if (($setup['deleteOtherGenerals'] ?? false) === true) {
+            $keepGeneralIds = comparisonIntegerList($setup['keepGeneralIds'] ?? [], 'keepGeneralIds');
+            if (!$keepGeneralIds) {
+                throw new \InvalidArgumentException('deleteOtherGenerals requires keepGeneralIds');
+            }
+            DB::db()->query('DELETE FROM general_turn WHERE general_id NOT IN %li', $keepGeneralIds);
+            DB::db()->query('DELETE FROM rank_data WHERE general_id NOT IN %li', $keepGeneralIds);
+            DB::db()->query('DELETE FROM general WHERE no NOT IN %li', $keepGeneralIds);
+        }
+        if (($setup['resetNations'] ?? false) === true) {
+            DB::db()->query('UPDATE nation SET level = 0, gennum = 0, tech = 0');
+            foreach ($setup['nation'] ?? [] as $row) {
+                comparisonMonthlyPatch('nation', $row['id'], $row['values']);
+            }
+        }
+        if (($setup['deleteOtherNations'] ?? false) === true) {
+            $keepNationIds = comparisonIntegerList($setup['keepNationIds'] ?? [], 'keepNationIds');
+            if (!$keepNationIds) {
+                throw new \InvalidArgumentException('deleteOtherNations requires keepNationIds');
+            }
+            DB::db()->query(
+                'DELETE FROM diplomacy WHERE me NOT IN %li OR you NOT IN %li',
+                $keepNationIds,
+                $keepNationIds,
+            );
+            DB::db()->query('DELETE FROM nation_turn WHERE nation_id NOT IN %li', $keepNationIds);
+            DB::db()->query('DELETE FROM nation WHERE nation NOT IN %li', $keepNationIds);
+        }
+        if (($setup['resetUniqueOccupancy'] ?? false) === true) {
+            DB::db()->delete('ng_auction', '`type` = %s AND finished = 0', 'uniqueItem');
+            DB::db()->query('DELETE FROM storage WHERE namespace LIKE %s', 'ut\\_%');
+        }
+        if (($setup['clearNeutralAuctions'] ?? false) === true) {
+            DB::db()->delete(
+                'ng_auction',
+                '`type` IN %ls AND host_general_id = 0',
+                ['buyRice', 'sellRice'],
+            );
+        }
+        foreach (comparisonIntegerList($setup['clearNationTurnIds'] ?? [], 'clearNationTurnIds') as $nationId) {
+            DB::db()->delete('nation_turn', 'nation_id = %i', $nationId);
+        }
+        foreach (comparisonIntegerList($setup['clearInheritanceOwnerIds'] ?? [], 'clearInheritanceOwnerIds') as $ownerId) {
+            DB::db()->delete('storage', 'namespace = %s', "inheritance_{$ownerId}");
+        }
+        if (($setup['clearBetting'] ?? false) === true) {
+            DB::db()->query('DELETE FROM ng_betting');
+            DB::db()->query('DELETE FROM storage WHERE namespace = %s', 'betting');
+            $gameStorage = KVStorage::getStorage(DB::db(), 'game_env');
+            $gameStorage->setValue('last_betting_id', 0);
+        }
+        foreach ($setup['bettingInfo'] ?? [] as $rawBettingInfo) {
+            if (!is_array($rawBettingInfo) || !is_int($rawBettingInfo['id'] ?? null)) {
+                throw new \InvalidArgumentException('invalid setup.bettingInfo row');
+            }
+            KVStorage::getStorage(DB::db(), 'betting')->setValue(
+                "id_{$rawBettingInfo['id']}",
+                $rawBettingInfo,
+            );
+        }
+        foreach ($setup['bet'] ?? [] as $row) {
+            if (
+                !is_array($row)
+                || !is_int($row['betting_id'] ?? null)
+                || !is_int($row['general_id'] ?? null)
+                || !is_string($row['betting_type'] ?? null)
+                || !is_int($row['amount'] ?? null)
+            ) {
+                throw new \InvalidArgumentException('invalid setup.bet row');
+            }
+            DB::db()->insert('ng_betting', [
+                'betting_id' => $row['betting_id'],
+                'general_id' => $row['general_id'],
+                'user_id' => $row['user_id'] ?? null,
+                'betting_type' => $row['betting_type'],
+                'amount' => $row['amount'],
+            ]);
+        }
+        foreach ($setup['inheritancePrevious'] ?? [] as $ownerId => $value) {
+            if (!is_numeric($ownerId) || !is_int($value)) {
+                throw new \InvalidArgumentException('invalid setup.inheritancePrevious entry');
+            }
+            KVStorage::getStorage(DB::db(), "inheritance_{$ownerId}")->setValue('previous', [$value, null]);
+        }
+        foreach ($setup['inheritancePoints'] ?? [] as $row) {
+            if (
+                !is_array($row)
+                || !is_int($row['ownerId'] ?? null)
+                || !is_string($row['key'] ?? null)
+                || !is_numeric($row['value'] ?? null)
+            ) {
+                throw new \InvalidArgumentException('invalid setup.inheritancePoints row');
+            }
+            KVStorage::getStorage(DB::db(), "inheritance_{$row['ownerId']}")->setValue(
+                $row['key'],
+                [$row['value'], null],
+            );
+        }
+        foreach ($setup['rankData'] ?? [] as $row) {
+            if (
+                !is_array($row)
+                || !is_int($row['generalId'] ?? null)
+                || !is_string($row['type'] ?? null)
+                || !is_int($row['value'] ?? null)
+            ) {
+                throw new \InvalidArgumentException('invalid setup.rankData row');
+            }
+            $nationId = (int)(DB::db()->queryFirstField(
+                'SELECT nation FROM general WHERE no = %i',
+                $row['generalId'],
+            ) ?? 0);
+            DB::db()->insertUpdate('rank_data', [
+                'general_id' => $row['generalId'],
+                'nation_id' => $nationId,
+                'type' => $row['type'],
+                'value' => $row['value'],
+            ], [
+                'nation_id' => $nationId,
+                'value' => $row['value'],
+            ]);
+        }
+        foreach ($setup['generalAccessLog'] ?? [] as $row) {
+            if (
+                !is_array($row)
+                || !is_int($row['generalId'] ?? null)
+                || !is_int($row['refreshScoreTotal'] ?? null)
+            ) {
+                throw new \InvalidArgumentException('invalid setup.generalAccessLog row');
+            }
+            DB::db()->insertUpdate('general_access_log', [
+                'general_id' => $row['generalId'],
+                'refresh_score_total' => $row['refreshScoreTotal'],
+            ], [
+                'refresh_score_total' => $row['refreshScoreTotal'],
+            ]);
+        }
+        foreach ($setup['nationEnvironment'] ?? [] as $row) {
+            if (
+                !is_array($row)
+                || !is_int($row['nationId'] ?? null)
+                || !is_string($row['key'] ?? null)
+                || !array_key_exists('value', $row)
+            ) {
+                throw new \InvalidArgumentException('invalid setup.nationEnvironment row');
+            }
+            KVStorage::getStorage(DB::db(), $row['nationId'], 'nation_env')->setValue(
+                $row['key'],
+                $row['value'],
+            );
+        }
+        if (($setup['resetDiplomacy'] ?? false) === true) {
+            DB::db()->query('DELETE FROM diplomacy');
+        }
+        foreach ($setup['diplomacy'] ?? [] as $row) {
+            if (
+                !is_array($row)
+                || !is_int($row['fromNationId'] ?? null)
+                || !is_int($row['toNationId'] ?? null)
+                || !is_int($row['state'] ?? null)
+                || !is_int($row['term'] ?? null)
+            ) {
+                throw new \InvalidArgumentException('invalid setup.diplomacy row');
+            }
+            $diplomacyPatch = [
+                'me' => $row['fromNationId'],
+                'you' => $row['toNationId'],
+                'state' => $row['state'],
+                'term' => $row['term'],
+                'dead' => $row['dead'] ?? 0,
+            ];
+            DB::db()->insertUpdate('diplomacy', $diplomacyPatch, $diplomacyPatch);
+        }
+        if (($setup['resetEvents'] ?? false) === true) {
+            DB::db()->query('DELETE FROM event');
+        }
+        foreach ($setup['event'] ?? [] as $row) {
+            if (!is_array($row) || !is_int($row['id'] ?? null) || !is_array($row['action'] ?? null)) {
+                throw new \InvalidArgumentException('invalid setup.event row');
+            }
+            $eventPatch = [
+                'id' => $row['id'],
+                'target' => $row['target'] ?? 'month',
+                'priority' => $row['priority'] ?? 1000,
+                'condition' => Json::encode($row['condition'] ?? true),
+                'action' => Json::encode($row['action']),
+            ];
+            DB::db()->insertUpdate('event', $eventPatch, $eventPatch);
+        }
+        $gameEnvironmentPatch = $setup['gameEnvironment'] ?? [];
+        if (!is_array($gameEnvironmentPatch)) {
+            throw new \InvalidArgumentException('setup.gameEnvironment must be an object');
+        }
+        $gameStorage = KVStorage::getStorage(DB::db(), 'game_env');
+        $worldPatch = $setup['world'] ?? [];
+        if (!is_array($worldPatch)) {
+            throw new \InvalidArgumentException('setup.world must be an object');
+        }
+        if (array_key_exists('hiddenSeed', $worldPatch)) {
+            if (!is_string($worldPatch['hiddenSeed']) || $worldPatch['hiddenSeed'] === '') {
+                throw new \InvalidArgumentException('setup.world.hiddenSeed must be a non-empty string');
+            }
+            UniqueConst::$hiddenSeed = $worldPatch['hiddenSeed'];
+        }
+        foreach ([
+            'isunited',
+            'refreshLimit',
+            'block_change_scout',
+            'lastNPCTroopLeaderID',
+            'tournament',
+            'tnmt_trig',
+            'tnmt_pattern',
+            'prev_winner',
+        ] as $key) {
+            if (array_key_exists($key, $gameEnvironmentPatch)) {
+                $gameStorage->setValue($key, $gameEnvironmentPatch[$key]);
+            }
+        }
+        if (($setup['setAllCitiesNation'] ?? null) !== null) {
+            if (!is_int($setup['setAllCitiesNation'])) {
+                throw new \InvalidArgumentException('setup.setAllCitiesNation must be an integer');
+            }
+            DB::db()->update('city', ['nation' => $setup['setAllCitiesNation']], true);
+        }
+
+        $db = DB::db();
+        $generalIdBeforeAction =
+            (int)($db->queryFirstField('SELECT COALESCE(MAX(no), 0) FROM general') ?? 0);
+        $nationIdBeforeAction =
+            (int)($db->queryFirstField('SELECT COALESCE(MAX(nation), 0) FROM nation') ?? 0);
+        $eventIdBeforeAction =
+            (int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM event') ?? 0);
+        $auctionIdBeforeAction =
+            (int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM ng_auction') ?? 0);
+        $snapshotRequest = ['observe' => $request['observe'] ?? []];
+        $snapshotRequest['observe']['logAfterId'] =
+            (int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM general_record') ?? 0);
+        $worldHistoryAfterId =
+            (int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM world_history') ?? 0);
+        $before = comparisonTurnStateSnapshot($snapshotRequest);
+        $beforeDetails = comparisonMonthlyDetails($snapshotRequest['observe'], $worldHistoryAfterId);
+
+        $environment = $request['environment'] ?? [];
+        if (!is_array($environment)) {
+            throw new \InvalidArgumentException('environment must be an object');
+        }
+        $year = $environment['year'] ?? null;
+        $month = $environment['month'] ?? null;
+        $startYear = $environment['startyear'] ?? null;
+        if (!is_int($year) || !is_int($month) || !is_int($startYear)) {
+            throw new \InvalidArgumentException('environment year, month, and startyear must be integers');
+        }
+        if (($setup['syncEnvironment'] ?? false) === true) {
+            $gameStorage = KVStorage::getStorage(DB::db(), 'game_env');
+            $environmentValues = [
+                'year' => $year,
+                'month' => $month,
+                'startyear' => $startYear,
+                'killturn' => $environment['killturn'] ?? $gameStorage->killturn,
+                'turnterm' => $environment['turnterm'] ?? $gameStorage->turnterm,
+            ];
+            if (isset($environment['starttime'])) {
+                if (!is_string($environment['starttime']) || $environment['starttime'] === '') {
+                    throw new \InvalidArgumentException('environment.starttime must be a non-empty string');
+                }
+                $environmentValues['starttime'] = $environment['starttime'];
+            }
+            foreach ($environmentValues as $key => $value) {
+                $gameStorage->setValue($key, $value);
+            }
+            if ($actionName === 'MonthlyBoundary') {
+                $before = comparisonTurnStateSnapshot($snapshotRequest);
+                $beforeDetails = comparisonMonthlyDetails($snapshotRequest['observe'], $worldHistoryAfterId);
+            }
+        }
+
+        if ($actionName === 'InvaderLifecycle') {
+            foreach (['turnterm', 'turntime'] as $requiredEnvironmentKey) {
+                if (!array_key_exists($requiredEnvironmentKey, $environment)) {
+                    throw new \InvalidArgumentException(
+                        "InvaderLifecycle requires environment.{$requiredEnvironmentKey}",
+                    );
+                }
+            }
+            echo json_encode(
+                comparisonInvaderLifecycleTrace(
+                    $request,
+                    $environment,
+                    $generalIdBeforeAction,
+                    $nationIdBeforeAction,
+                    $eventIdBeforeAction,
+                    $worldHistoryAfterId,
+                ),
+                JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
+            ), PHP_EOL;
+            return;
+        }
+        if ($actionName === 'NpcNationLifecycle') {
+            foreach (['turnterm', 'turntime'] as $requiredEnvironmentKey) {
+                if (!array_key_exists($requiredEnvironmentKey, $environment)) {
+                    throw new \InvalidArgumentException(
+                        "NpcNationLifecycle requires environment.{$requiredEnvironmentKey}",
+                    );
+                }
+            }
+            echo json_encode(
+                comparisonNpcNationLifecycleTrace(
+                    $environment,
+                    $generalIdBeforeAction,
+                    $nationIdBeforeAction,
+                    $worldHistoryAfterId,
+                ),
+                JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
+            ), PHP_EOL;
+            return;
+        }
+        if ($actionName === 'NationBettingLifecycle') {
+            echo json_encode(
+                comparisonNationBettingLifecycleTrace(
+                    $request,
+                    $environment,
+                    $eventIdBeforeAction,
+                    $worldHistoryAfterId,
+                ),
+                JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
+            ), PHP_EOL;
+            return;
+        }
+
+        $actionClass = "\\sammo\\Event\\Action\\{$actionName}";
+        if (in_array($actionName, ['PreUpdateMonthly', 'PostUpdateMonthly', 'MonthlyBoundary'], true)) {
+            $action = null;
+        } elseif ($actionName === 'ProcessSemiAnnual') {
+            $resource = $request['resource'] ?? null;
+            if (!is_string($resource)) {
+                throw new \InvalidArgumentException('ProcessSemiAnnual requires resource');
+            }
+            $action = new $actionClass($resource);
+        } elseif (in_array($actionName, ['CreateManyNPC', 'RegNPC', 'RegNeutralNPC', 'RaiseInvader', 'AutoDeleteInvader', 'ChangeCity', 'OpenNationBetting', 'FinishNationBetting', 'BlockScoutAction', 'UnblockScoutAction', 'AddGlobalBetray', 'LostUniqueItem', 'ProcessIncome', 'NoticeToHistoryLog'], true)) {
+            $args = $request['args'] ?? [];
+            if (!is_array($args)) {
+                throw new \InvalidArgumentException("{$actionName} args must be an array");
+            }
+            if ($actionName === 'CreateManyNPC' && count($args) > 2) {
+                throw new \InvalidArgumentException('CreateManyNPC args must have at most two entries');
+            }
+            if ($actionName === 'RaiseInvader' && count($args) > 4) {
+                throw new \InvalidArgumentException('RaiseInvader args must have at most four entries');
+            }
+            if ($actionName === 'ChangeCity' && count($args) !== 2) {
+                throw new \InvalidArgumentException('ChangeCity args must have exactly two entries');
+            }
+            if ($actionName === 'OpenNationBetting' && count($args) > 2) {
+                throw new \InvalidArgumentException('OpenNationBetting args must have at most two entries');
+            }
+            if ($actionName === 'FinishNationBetting' && count($args) !== 1) {
+                throw new \InvalidArgumentException('FinishNationBetting args must have exactly one entry');
+            }
+            if (in_array($actionName, ['BlockScoutAction', 'UnblockScoutAction'], true) && count($args) > 1) {
+                throw new \InvalidArgumentException("{$actionName} args must have at most one entry");
+            }
+            if ($actionName === 'AddGlobalBetray' && count($args) > 2) {
+                throw new \InvalidArgumentException('AddGlobalBetray args must have at most two entries');
+            }
+            if ($actionName === 'LostUniqueItem' && count($args) > 1) {
+                throw new \InvalidArgumentException('LostUniqueItem args must have at most one entry');
+            }
+            if ($actionName === 'ProcessIncome' && count($args) !== 1) {
+                throw new \InvalidArgumentException('ProcessIncome args must have exactly one entry');
+            }
+            if ($actionName === 'NoticeToHistoryLog' && (count($args) < 1 || count($args) > 2)) {
+                throw new \InvalidArgumentException('NoticeToHistoryLog args must have one or two entries');
+            }
+            $action = new $actionClass(...$args);
+        } else {
+            $action = new $actionClass();
+        }
+        $actionEnvironment = [
+            'year' => $year,
+            'month' => $month,
+            'startyear' => $startYear,
+        ];
+        if (isset($environment['currentEventID'])) {
+            if (!is_int($environment['currentEventID'])) {
+                throw new \InvalidArgumentException('currentEventID must be an integer');
+            }
+            $actionEnvironment['currentEventID'] = $environment['currentEventID'];
+        }
+        if ($actionName === 'UpdateNationLevel') {
+            $killturn = $environment['killturn'] ?? null;
+            $turnterm = $environment['turnterm'] ?? null;
+            if (!is_int($killturn) || !is_int($turnterm) || $turnterm <= 0) {
+                throw new \InvalidArgumentException('UpdateNationLevel requires integer killturn and positive turnterm');
+            }
+            $actionEnvironment['killturn'] = $killturn;
+            $actionEnvironment['turnterm'] = $turnterm;
+        }
+        if (in_array($actionName, ['CreateManyNPC', 'RegNPC', 'RegNeutralNPC', 'RaiseNPCNation', 'RaiseInvader', 'ProvideNPCTroopLeader'], true)) {
+            $turnterm = $environment['turnterm'] ?? null;
+            $turntime = $environment['turntime'] ?? null;
+            $showImgLevel = $environment['show_img_level'] ?? 3;
+            $fiction = $environment['fiction'] ?? [0];
+            if (
+                !is_int($turnterm)
+                || $turnterm <= 0
+                || !is_string($turntime)
+                || !is_int($showImgLevel)
+                || !is_array($fiction)
+            ) {
+                throw new \InvalidArgumentException(
+                    "{$actionName} requires positive turnterm, string turntime, integer show_img_level, and array fiction",
+                );
+            }
+            $actionEnvironment += [
+                'turnterm' => $turnterm,
+                'turntime' => $turntime,
+                'show_img_level' => $showImgLevel,
+                'stored_icons' => $environment['stored_icons'] ?? [],
+                'icon_path' => $environment['icon_path'] ?? '.',
+                'fiction' => $fiction,
+            ];
+        }
+        if ($actionName === 'PreUpdateMonthly') {
+            if (!preUpdateMonthly()) {
+                throw new \RuntimeException('preUpdateMonthly failed');
+            }
+        } elseif ($actionName === 'PostUpdateMonthly') {
+            $seedYear = $environment['seedYear'] ?? null;
+            $seedMonth = $environment['seedMonth'] ?? null;
+            if (!is_int($seedYear) || !is_int($seedMonth)) {
+                throw new \InvalidArgumentException('PostUpdateMonthly requires seedYear and seedMonth');
+            }
+            postUpdateMonthly(new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+                UniqueConst::$hiddenSeed,
+                'monthly',
+                $seedYear,
+                $seedMonth,
+            ))));
+        } elseif ($actionName === 'MonthlyBoundary') {
+            $turntime = $environment['turntime'] ?? null;
+            if (!is_string($turntime) || $turntime === '') {
+                throw new \InvalidArgumentException('MonthlyBoundary requires turntime');
+            }
+            $gameStorage = KVStorage::getStorage($db, 'game_env');
+            $seedYear = (int)$gameStorage->year;
+            $seedMonth = (int)$gameStorage->month;
+            TurnExecutionHelper::runEventHandler($db, $gameStorage, Enums\EventTarget::PreMonth);
+            if (!preUpdateMonthly()) {
+                throw new \RuntimeException('preUpdateMonthly failed');
+            }
+            turnDate($turntime);
+            $gameStorage->resetCache();
+            if ((int)$gameStorage->month === 1) {
+                checkStatistic();
+            }
+            TurnExecutionHelper::runEventHandler($db, $gameStorage, Enums\EventTarget::Month);
+            postUpdateMonthly(new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+                UniqueConst::$hiddenSeed,
+                'monthly',
+                $seedYear,
+                $seedMonth,
+            ))));
+        } else {
+            $action->run($actionEnvironment);
+        }
+        unset($action);
+        gc_collect_cycles();
+
+        $after = comparisonTurnStateSnapshot($snapshotRequest);
+        $afterDetails = comparisonMonthlyDetails($snapshotRequest['observe'], $worldHistoryAfterId);
+        $createdGenerals = [];
+        if (in_array($actionName, ['CreateManyNPC', 'RegNPC', 'RegNeutralNPC', 'RaiseNPCNation', 'RaiseInvader', 'ProvideNPCTroopLeader'], true)) {
+            foreach ($db->query('SELECT * FROM general WHERE no > %i ORDER BY no', $generalIdBeforeAction) as $row) {
+                $generalId = (int)$row['no'];
+                $turnRows = $db->query(
+                    'SELECT turn_idx, action, arg FROM general_turn WHERE general_id = %i ORDER BY turn_idx',
+                    $generalId,
+                );
+                $createdGenerals[] = comparisonPickRow(
+                    $row,
+                    [
+                        'id' => 'no',
+                        'name' => 'name',
+                        'nationId' => 'nation',
+                        'cityId' => 'city',
+                        'leadership' => 'leadership',
+                        'strength' => 'strength',
+                        'intelligence' => 'intel',
+                        'experience' => 'experience',
+                        'dedication' => 'dedication',
+                        'officerLevel' => 'officer_level',
+                        'gold' => 'gold',
+                        'rice' => 'rice',
+                        'crew' => 'crew',
+                        'crewTypeId' => 'crewtype',
+                        'train' => 'train',
+                        'atmos' => 'atmos',
+                        'turnTime' => 'turntime',
+                        'killturn' => 'killturn',
+                        'age' => 'age',
+                        'npcState' => 'npc',
+                        'npcOriginalState' => 'npc_org',
+                        'affinity' => 'affinity',
+                        'personality' => 'personal',
+                        'specialDomestic' => 'special',
+                        'specialWar' => 'special2',
+                        'specAge' => 'specage',
+                        'specAge2' => 'specage2',
+                        'bornYear' => 'bornyear',
+                        'deadYear' => 'deadyear',
+                        'picture' => 'picture',
+                        'dex1' => 'dex1',
+                        'dex2' => 'dex2',
+                        'dex3' => 'dex3',
+                        'dex4' => 'dex4',
+                        'dex5' => 'dex5',
+                    ],
+                ) + [
+                    'turnCount' => count($turnRows),
+                    'turnActions' => array_values(array_unique(array_column($turnRows, 'action'))),
+                    'rankCount' => (int)$db->queryFirstField(
+                        'SELECT count(*) FROM rank_data WHERE general_id = %i',
+                        $generalId,
+                    ),
+                    'nonZeroRankCount' => (int)$db->queryFirstField(
+                        'SELECT count(*) FROM rank_data WHERE general_id = %i AND value != 0',
+                        $generalId,
+                    ),
+                    'troop' => $db->queryFirstRow(
+                        'SELECT troop_leader AS id, nation AS nationId, name FROM troop WHERE troop_leader = %i',
+                        $generalId,
+                    ) ?: null,
+                ];
+            }
+        }
+        $createdNations = [];
+        if (in_array($actionName, ['RaiseNPCNation', 'RaiseInvader'], true)) {
+            foreach ($db->query('SELECT * FROM nation WHERE nation > %i ORDER BY nation', $nationIdBeforeAction) as $row) {
+                $nationId = (int)$row['nation'];
+                $createdNations[] = comparisonPickRow(
+                    $row,
+                    [
+                        'id' => 'nation',
+                        'name' => 'name',
+                        'color' => 'color',
+                        'capitalCityId' => 'capital',
+                        'generalCount' => 'gennum',
+                        'gold' => 'gold',
+                        'rice' => 'rice',
+                        'tech' => 'tech',
+                        'level' => 'level',
+                        'typeCode' => 'type',
+                        'bill' => 'bill',
+                        'rate' => 'rate',
+                        'scout' => 'scout',
+                        'war' => 'war',
+                        'strategicCommandLimit' => 'strategic_cmd_limit',
+                        'surrenderLimit' => 'surlimit',
+                        'aux' => 'aux',
+                    ],
+                    ['aux'],
+                ) + [
+                    'nationTurnCount' => (int)$db->queryFirstField(
+                        'SELECT count(*) FROM nation_turn WHERE nation_id = %i',
+                        $nationId,
+                    ),
+                    'diplomacyCount' => (int)$db->queryFirstField(
+                        'SELECT count(*) FROM diplomacy WHERE me = %i OR you = %i',
+                        $nationId,
+                        $nationId,
+                    ),
+                ];
+            }
+        }
+        $response = [
+            'schemaVersion' => 1,
+            'engine' => 'ref',
+            'action' => $actionName,
+            'before' => $before,
+            'beforeDetails' => $beforeDetails,
+            'after' => $after,
+            'afterDetails' => $afterDetails,
+        ];
+        if (in_array($actionName, ['CreateManyNPC', 'RegNPC', 'RegNeutralNPC'], true)) {
+            $response['createdGenerals'] = $createdGenerals;
+        }
+        if (in_array($actionName, ['RaiseNPCNation', 'RaiseInvader'], true)) {
+            $response['createdGenerals'] = $createdGenerals;
+            $response['createdNations'] = $createdNations;
+        }
+        if ($actionName === 'ProvideNPCTroopLeader') {
+            $response['createdGenerals'] = $createdGenerals;
+            $response['gameEnvironment'] = KVStorage::getStorage(DB::db(), 'game_env')->getValues([
+                'lastNPCTroopLeaderID',
+            ]);
+        }
+        if ($actionName === 'PreUpdateMonthly') {
+            $response['gameEnvironment'] = KVStorage::getStorage(DB::db(), 'game_env')->getValues([
+                'develcost',
+            ]);
+        }
+        if ($actionName === 'PostUpdateMonthly') {
+            $response['gameEnvironment'] = KVStorage::getStorage(DB::db(), 'game_env')->getValues([
+                'tournament',
+                'tnmt_trig',
+                'tnmt_pattern',
+                'tnmt_type',
+                'tnmt_auto',
+                'phase',
+            ]);
+            $response['createdNeutralAuctions'] = array_map(
+                static fn(array $row): array => [
+                    'id' => (int)$row['id'],
+                    'type' => $row['type'],
+                    'target' => $row['target'],
+                    'detail' => Json::decode($row['detail']),
+                ],
+                iterator_to_array(
+                    $db->query(
+                        'SELECT id, `type`, target, detail FROM ng_auction WHERE id > %i AND host_general_id = 0 ORDER BY id',
+                        $auctionIdBeforeAction,
+                    ),
+                ),
+            );
+        }
+        if (in_array($actionName, ['OpenNationBetting', 'FinishNationBetting'], true)) {
+            $bettingStorage = KVStorage::getStorage(DB::db(), 'betting');
+            $response['betting'] = $bettingStorage->getAll();
+            $response['bets'] = iterator_to_array(
+                $db->query(
+                    'SELECT betting_id AS bettingId, general_id AS generalId, user_id AS userId, betting_type AS selectionKey, amount FROM ng_betting ORDER BY id',
+                ),
+            );
+            $response['createdEvents'] = array_map(
+                static fn(array $row): array => comparisonPickRow(
+                    $row,
+                    [
+                        'id' => 'id',
+                        'targetCode' => 'target',
+                        'priority' => 'priority',
+                        'condition' => 'condition',
+                        'action' => 'action',
+                    ],
+                    ['condition', 'action'],
+                ),
+                iterator_to_array(
+                    $db->query(
+                        'SELECT id, target, priority, `condition`, action FROM event WHERE id > %i ORDER BY id',
+                        $eventIdBeforeAction,
+                    ),
+                ),
+            );
+            $response['gameEnvironment'] = KVStorage::getStorage(DB::db(), 'game_env')->getValues([
+                'last_betting_id',
+            ]);
+            $response['inheritancePrevious'] = [];
+            foreach (comparisonIntegerList($request['observe']['ownerIds'] ?? [], 'ownerIds') as $ownerId) {
+                $value = KVStorage::getStorage(DB::db(), "inheritance_{$ownerId}")->getValue('previous');
+                $response['inheritancePrevious'][(string)$ownerId] = is_array($value) ? ($value[0] ?? 0) : 0;
+            }
+        }
+        if (in_array($actionName, ['BlockScoutAction', 'UnblockScoutAction'], true)) {
+            $response['gameEnvironment'] = KVStorage::getStorage(DB::db(), 'game_env')->getValues([
+                'block_change_scout',
+            ]);
+        }
+        if ($actionName === 'RaiseInvader') {
+            $response['createdEvents'] = array_map(
+                static fn(array $row): array => comparisonPickRow(
+                    $row,
+                    [
+                        'id' => 'id',
+                        'targetCode' => 'target',
+                        'priority' => 'priority',
+                        'condition' => 'condition',
+                        'action' => 'action',
+                    ],
+                    ['condition', 'action'],
+                ),
+                iterator_to_array(
+                    $db->query(
+                        'SELECT id, target, priority, `condition`, action FROM event WHERE id > %i ORDER BY id',
+                        $eventIdBeforeAction,
+                    ),
+                ),
+            );
+            $response['createdDiplomacy'] = iterator_to_array(
+                $db->query(
+                    'SELECT me AS fromNationId, you AS toNationId, state, term FROM diplomacy WHERE me > %i OR you > %i ORDER BY me, you',
+                    $nationIdBeforeAction,
+                    $nationIdBeforeAction,
+                ),
+            );
+            $gameStorage = KVStorage::getStorage(DB::db(), 'game_env');
+            $response['gameEnvironment'] = $gameStorage->getValues([
+                'isunited',
+                'turnterm',
+                'block_change_scout',
+                'refreshLimit',
+            ]);
+        }
+        if (in_array($actionName, ['AutoDeleteInvader', 'InvaderEnding'], true)) {
+            $gameStorage = KVStorage::getStorage(DB::db(), 'game_env');
+            $response['gameEnvironment'] = $gameStorage->getValues([
+                'isunited',
+                'turnterm',
+                'block_change_scout',
+                'refreshLimit',
+            ]);
+        }
+        if (($request['compactOutput'] ?? false) === true) {
+            $observedGeneralTurns = [];
+            foreach (comparisonIntegerList($request['observe']['generalIds'] ?? [], 'generalIds') as $generalId) {
+                $observedGeneralTurns[(string)$generalId] = iterator_to_array(
+                    $db->query(
+                        'SELECT turn_idx AS turnIndex, action, arg FROM general_turn WHERE general_id = %i ORDER BY turn_idx',
+                        $generalId,
+                    ),
+                );
+            }
+            $response = [
+                'schemaVersion' => 1,
+                'engine' => 'ref',
+                'action' => $actionName,
+                'afterDetails' => $afterDetails,
+                'createdGeneralCount' => count($createdGenerals),
+                'firstCreatedGenerals' => array_slice($createdGenerals, 0, 3),
+                'createdNations' => $response['createdNations'] ?? [],
+                'createdEvents' => $response['createdEvents'] ?? [],
+                'createdDiplomacy' => $response['createdDiplomacy'] ?? [],
+                'gameEnvironment' => $response['gameEnvironment'] ?? [],
+                'logs' => $after['logs'],
+                'observedGeneralTurns' => $observedGeneralTurns,
+                'remainingEventIds' => array_map(
+                    'intval',
+                    $db->queryFirstColumn('SELECT id FROM event ORDER BY id'),
+                ),
+            ];
+        }
+        echo json_encode(
+            $response,
+            JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
+        ), PHP_EOL;
+    } catch (\Throwable $throwable) {
+        fwrite(STDERR, $throwable::class . ': ' . $throwable->getMessage() . PHP_EOL);
+        exit(1);
+    }
+}
+
+comparisonMonthlyEventTraceMain();

hwe/compare/trait_catalog.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace sammo;
+
+if (PHP_SAPI !== 'cli') {
+    http_response_code(404);
+    exit;
+}
+
+chdir(dirname(__DIR__));
+require_once 'lib.php';
+require_once 'func.php';
+
+$groups = [
+    'nation' => ['ActionNationType', 'ActionNationType'],
+    'domestic' => ['ActionSpecialDomestic', 'ActionSpecialDomestic'],
+    'war' => ['ActionSpecialWar', 'ActionSpecialWar'],
+    'personality' => ['ActionPersonality', 'ActionPersonality'],
+];
+
+$result = [];
+foreach ($groups as $kind => [$directory, $namespace]) {
+    foreach (glob(__DIR__ . "/../sammo/{$directory}/*.php") ?: [] as $path) {
+        $key = basename($path, '.php');
+        if ($key === 'None' || str_starts_with($key, 'che_event_') || $key === 'che_거상') {
+            continue;
+        }
+        $className = "\\sammo\\{$namespace}\\{$key}";
+        $trait = new $className();
+        $result[$kind][$key] = [
+            'name' => $trait->getName(),
+            'info' => $trait->getInfo(),
+        ];
+    }
+    ksort($result[$kind]);
+}
+
+echo Json::encode($result);

hwe/compare/turn_command_trace.php

@@ -0,0 +1,789 @@
+<?php
+
+declare(strict_types=1);
+
+namespace sammo;
+
+use sammo\Enums\RankColumn;
+
+if (PHP_SAPI !== 'cli') {
+    http_response_code(404);
+    exit;
+}
+
+chdir(dirname(__DIR__));
+$_SERVER['REMOTE_ADDR'] ??= '127.0.0.1';
+error_reporting(E_ALL & ~E_DEPRECATED);
+require_once 'lib.php';
+require_once 'func.php';
+require_once __DIR__ . '/turn_state_snapshot.php';
+
+final class TurnComparisonTracingRNG implements RNG
+{
+    private int $sequence = 0;
+
+    /** @var list<array<string, mixed>> */
+    public array $calls = [];
+
+    public function __construct(private readonly RNG $inner)
+    {
+    }
+
+    public static function getMaxInt(): int
+    {
+        return LiteHashDRBG::getMaxInt();
+    }
+
+    public function nextBytes(int $bytes): string
+    {
+        $value = $this->inner->nextBytes($bytes);
+        $this->record('nextBytes', ['bytes' => $bytes], bin2hex($value));
+        return $value;
+    }
+
+    public function nextBits(int $bits): string
+    {
+        $value = $this->inner->nextBits($bits);
+        $this->record('nextBits', ['bits' => $bits], bin2hex($value));
+        return $value;
+    }
+
+    public function nextInt(?int $max = null): int
+    {
+        $value = $this->inner->nextInt($max);
+        $this->record('nextInt', ['maxInclusive' => $max], $value);
+        return $value;
+    }
+
+    public function nextFloat1(): float
+    {
+        $value = $this->inner->nextFloat1();
+        $this->record('nextFloat1', [], $value);
+        return $value;
+    }
+
+    private function record(string $operation, array $arguments, mixed $result): void
+    {
+        $this->calls[] = [
+            'seq' => $this->sequence++,
+            'operation' => $operation,
+            'arguments' => $arguments === [] ? (object)[] : $arguments,
+            'result' => $result,
+        ];
+    }
+}
+
+/** @return array<string, mixed> */
+function comparisonMappedPatch(array $row, array $mapping): array
+{
+    $patch = [];
+    foreach ($mapping as $canonical => $legacy) {
+        if (array_key_exists($canonical, $row)) {
+            $patch[$legacy] = $row[$canonical];
+        }
+    }
+    return $patch;
+}
+
+function comparisonApplyTurnFixtureSetup(mixed $setup): void
+{
+    if ($setup === null) {
+        return;
+    }
+    if (!is_array($setup)) {
+        throw new \InvalidArgumentException('setup must be an object');
+    }
+    $db = DB::db();
+    $world = $setup['world'] ?? null;
+    if ($world !== null) {
+        if (!is_array($world)) {
+            throw new \InvalidArgumentException('setup.world must be an object');
+        }
+        $game = KVStorage::getStorage($db, 'game_env');
+        foreach (['year', 'month', 'startyear', 'init_year', 'init_month'] as $key) {
+            $fixtureKey = match ($key) {
+                'startyear' => 'startYear',
+                'init_year' => 'initYear',
+                'init_month' => 'initMonth',
+                default => $key,
+            };
+            if (!array_key_exists($fixtureKey, $world)) {
+                continue;
+            }
+            $value = $world[$fixtureKey];
+            if (
+                !is_int($value)
+                || $value < 1
+                || (in_array($key, ['month', 'init_month'], true) && $value > 12)
+            ) {
+                throw new \InvalidArgumentException("setup.world.{$fixtureKey} is invalid");
+            }
+            $game->setValue($key, $value);
+        }
+        $game->resetCache();
+        if (array_key_exists('hiddenSeed', $world)) {
+            $hiddenSeed = $world['hiddenSeed'];
+            if (!is_string($hiddenSeed) || $hiddenSeed === '' || strlen($hiddenSeed) > 256) {
+                throw new \InvalidArgumentException('setup.world.hiddenSeed is invalid');
+            }
+            UniqueConst::$hiddenSeed = $hiddenSeed;
+        }
+        if (array_key_exists('staticEventHandlers', $world)) {
+            $handlersByEvent = $world['staticEventHandlers'];
+            if (!is_array($handlersByEvent)) {
+                throw new \InvalidArgumentException('setup.world.staticEventHandlers must be an object');
+            }
+            foreach ($handlersByEvent as $eventType => $handlers) {
+                if (!is_string($eventType) || $eventType === '' || !is_array($handlers)) {
+                    throw new \InvalidArgumentException('setup.world.staticEventHandlers is invalid');
+                }
+                foreach ($handlers as $handler) {
+                    if (!is_string($handler) || $handler === '') {
+                        throw new \InvalidArgumentException('setup.world.staticEventHandlers is invalid');
+                    }
+                }
+            }
+            GameConst::$staticEventHandlers = $handlersByEvent;
+        }
+    }
+
+    foreach (['nations', 'cities', 'generals', 'troops', 'diplomacy'] as $collection) {
+        if (isset($setup[$collection]) && !is_array($setup[$collection])) {
+            throw new \InvalidArgumentException("setup.{$collection} must be an array");
+        }
+    }
+    $generalCooldowns = comparisonGeneralCooldownSelectors(
+        $setup['generalCooldowns'] ?? [],
+        'setup.generalCooldowns',
+    );
+    if ($generalCooldowns !== []) {
+        $nextExecuteStorage = KVStorage::getStorage($db, 'next_execute');
+        foreach ($setup['generalCooldowns'] as $entry) {
+            $nextAvailableTurn = $entry['nextAvailableTurn'] ?? null;
+            if (!is_int($nextAvailableTurn) || $nextAvailableTurn < 0) {
+                throw new \InvalidArgumentException(
+                    'setup.generalCooldowns entries require a non-negative nextAvailableTurn',
+                );
+            }
+            $key = "next_execute_{$entry['generalId']}_{$entry['actionName']}";
+            $nextExecuteStorage->setValue($key, $nextAvailableTurn);
+        }
+        $nextExecuteStorage->resetCache();
+    }
+    if (isset($setup['randomFoundingCandidateCityIds'])) {
+        $candidateCityIds = comparisonIntegerList(
+            $setup['randomFoundingCandidateCityIds'],
+            'randomFoundingCandidateCityIds',
+        );
+        $db->update('city', ['level' => 4], '1 = 1');
+        if ($candidateCityIds !== []) {
+            $db->update('city', ['level' => 5], 'city IN %li', $candidateCityIds);
+        }
+    }
+
+    if (($setup['isolateWorld'] ?? false) === true) {
+        $generalIds = array_values(array_map(
+            static fn(array $row): int => (int)$row['id'],
+            $setup['generals'] ?? [],
+        ));
+        $nationIds = array_values(array_map(
+            static fn(array $row): int => (int)$row['id'],
+            $setup['nations'] ?? [],
+        ));
+        if ($generalIds === [] || $nationIds === []) {
+            throw new \InvalidArgumentException('isolateWorld requires generals and nations');
+        }
+        $generalTemplate = $db->queryFirstRow(
+            'SELECT * FROM general WHERE no IN %li ORDER BY no LIMIT 1',
+            $generalIds,
+        );
+        if ($generalTemplate === null) {
+            throw new \InvalidArgumentException('isolateWorld requires at least one existing fixture general');
+        }
+        $generalTemplateId = (int)$generalTemplate['no'];
+        $rankDataTemplate = $db->query(
+            'SELECT `type`, `value` FROM rank_data WHERE general_id = %i',
+            $generalTemplateId,
+        );
+        $db->delete('general_turn', 'general_id NOT IN %li', $generalIds);
+        $db->delete('rank_data', 'general_id NOT IN %li', $generalIds);
+        $db->delete('nation_turn', 'nation_id NOT IN %li', $nationIds);
+        $db->delete('troop', '1 = 1');
+        $db->delete('diplomacy', '1 = 1');
+        $db->delete('general', 'no NOT IN %li', $generalIds);
+        foreach ($generalIds as $generalId) {
+            if ($db->queryFirstField('SELECT no FROM general WHERE no = %i', $generalId) !== null) {
+                continue;
+            }
+            $newGeneral = $generalTemplate;
+            $newGeneral['no'] = $generalId;
+            $newGeneral['owner'] = 0;
+            $newGeneral['name'] = "fixture-general-{$generalId}";
+            $db->insert('general', $newGeneral);
+        }
+        foreach ($generalIds as $generalId) {
+            foreach ($rankDataTemplate as $rankRow) {
+                $rankData = [
+                    'general_id' => $generalId,
+                    'type' => $rankRow['type'],
+                    'value' => $rankRow['value'],
+                ];
+                $db->insertUpdate('rank_data', $rankData, $rankData);
+            }
+        }
+        $db->delete('nation', 'nation NOT IN %li', $nationIds);
+        $db->update('city', [
+            'nation' => 0,
+            'supply' => 0,
+            'front' => 0,
+            'state' => 0,
+            'term' => 0,
+            'conflict' => '{}',
+            'officer_set' => 0,
+        ], '1 = 1');
+    }
+
+    foreach ($setup['nations'] ?? [] as $row) {
+        if (!is_array($row) || !is_int($row['id'] ?? null) || $row['id'] < 1) {
+            throw new \InvalidArgumentException('setup.nations requires positive integer ids');
+        }
+        $data = comparisonMappedPatch($row, [
+            'id' => 'nation',
+            'name' => 'name',
+            'color' => 'color',
+            'capitalCityId' => 'capital',
+            'gold' => 'gold',
+            'rice' => 'rice',
+            'tech' => 'tech',
+            'level' => 'level',
+            'typeCode' => 'type',
+            'war' => 'war',
+            'diplomacyLimit' => 'surlimit',
+            'generalCount' => 'gennum',
+            'power' => 'power',
+            'capitalRevision' => 'capset',
+            'strategicCommandLimit' => 'strategic_cmd_limit',
+        ]);
+        if (isset($row['meta'])) {
+            $data['aux'] = Json::encode($row['meta']);
+        }
+        $data += [
+            'name' => "fixture-nation-{$row['id']}",
+            'color' => '#777777',
+            'capital' => 0,
+            'gold' => 0,
+            'rice' => 0,
+            'level' => 1,
+            'type' => 'che_중립',
+            'aux' => '{}',
+        ];
+        $db->insertUpdate('nation', $data, $data);
+        $nationStor = KVStorage::getStorage($db, $row['id'], 'nation_env');
+        if (($setup['isolateWorld'] ?? false) === true) {
+            $nationStor->deleteValue('recv_assist');
+            $nationStor->deleteValue('resp_assist');
+        }
+        if (array_key_exists('nationEnv', $row)) {
+            if (!is_array($row['nationEnv'])) {
+                throw new \InvalidArgumentException('setup.nations.nationEnv must be an object');
+            }
+            foreach ($row['nationEnv'] as $key => $value) {
+                if (!is_string($key) || $key === '') {
+                    throw new \InvalidArgumentException('setup.nations.nationEnv keys must be non-empty strings');
+                }
+                $nationStor->setValue($key, $value);
+            }
+            $nationStor->resetCache();
+        }
+        if (array_key_exists('turnLastByOfficerLevel', $row)) {
+            $turnLastByOfficerLevel = $row['turnLastByOfficerLevel'];
+            if (!is_array($turnLastByOfficerLevel)) {
+                throw new \InvalidArgumentException('setup.nations.turnLastByOfficerLevel must be an object');
+            }
+            foreach ($turnLastByOfficerLevel as $officerLevel => $lastTurn) {
+                $officerLevel = filter_var($officerLevel, FILTER_VALIDATE_INT);
+                if (
+                    $officerLevel === false
+                    || $officerLevel < 5
+                    || $officerLevel > 12
+                    || !is_array($lastTurn)
+                ) {
+                    throw new \InvalidArgumentException(
+                        'setup.nations.turnLastByOfficerLevel requires officer levels 5 through 12'
+                    );
+                }
+                $nationStor->setValue("turn_last_{$officerLevel}", $lastTurn);
+            }
+            $nationStor->resetCache();
+        }
+    }
+    if (($setup['isolateWorld'] ?? false) === true && ($setup['nations'] ?? []) !== []) {
+        $maxNationId = max(array_map(
+            static fn(array $row): int => (int)$row['id'],
+            $setup['nations'],
+        ));
+        $db->query('ALTER TABLE nation AUTO_INCREMENT = %i', $maxNationId + 1);
+    }
+
+    foreach ($setup['cities'] ?? [] as $row) {
+        if (!is_array($row) || !is_int($row['id'] ?? null) || $row['id'] < 1) {
+            throw new \InvalidArgumentException('setup.cities requires positive integer ids');
+        }
+        $patch = comparisonMappedPatch($row, [
+            'nationId' => 'nation',
+            'level' => 'level',
+            'population' => 'pop',
+            'populationMax' => 'pop_max',
+            'agriculture' => 'agri',
+            'agricultureMax' => 'agri_max',
+            'commerce' => 'comm',
+            'commerceMax' => 'comm_max',
+            'security' => 'secu',
+            'securityMax' => 'secu_max',
+            'supplyState' => 'supply',
+            'frontState' => 'front',
+            'defence' => 'def',
+            'defenceMax' => 'def_max',
+            'wall' => 'wall',
+            'wallMax' => 'wall_max',
+            'state' => 'state',
+            'term' => 'term',
+            'trust' => 'trust',
+            'trade' => 'trade',
+            'officerSet' => 'officer_set',
+        ]);
+        if (array_key_exists('conflictEntries', $row)) {
+            if (!is_array($row['conflictEntries'])) {
+                throw new \InvalidArgumentException('setup.cities.conflictEntries must be an array');
+            }
+            $orderedConflict = [];
+            foreach ($row['conflictEntries'] as $entry) {
+                if (
+                    !is_array($entry)
+                    || count($entry) !== 2
+                    || !is_int($entry[0] ?? null)
+                    || $entry[0] < 1
+                    || !is_numeric($entry[1] ?? null)
+                ) {
+                    throw new \InvalidArgumentException(
+                        'setup.cities.conflictEntries requires [positive nation id, numeric value] pairs'
+                    );
+                }
+                $orderedConflict[$entry[0]] = $entry[1];
+            }
+            $patch['conflict'] = Json::encode($orderedConflict);
+        } elseif (array_key_exists('conflict', $row)) {
+            if (!is_array($row['conflict'])) {
+                throw new \InvalidArgumentException('setup.cities.conflict must be an object');
+            }
+            $patch['conflict'] = Json::encode($row['conflict']);
+        }
+        if ($patch !== []) {
+            $db->update('city', $patch, 'city = %i', $row['id']);
+        }
+    }
+
+    foreach ($setup['generals'] ?? [] as $row) {
+        if (!is_array($row) || !is_int($row['id'] ?? null) || $row['id'] < 1) {
+            throw new \InvalidArgumentException('setup.generals requires positive integer ids');
+        }
+        $patch = comparisonMappedPatch($row, [
+            'name' => 'name',
+            'nationId' => 'nation',
+            'cityId' => 'city',
+            'troopId' => 'troop',
+            'leadership' => 'leadership',
+            'strength' => 'strength',
+            'intelligence' => 'intel',
+            'leadershipExp' => 'leadership_exp',
+            'strengthExp' => 'strength_exp',
+            'intelExp' => 'intel_exp',
+            'experience' => 'experience',
+            'dedication' => 'dedication',
+            'expLevel' => 'explevel',
+            'officerLevel' => 'officer_level',
+            'officerCityId' => 'officer_city',
+            'belong' => 'belong',
+            'permission' => 'permission',
+            'betray' => 'betray',
+            'makeLimit' => 'makelimit',
+            'injury' => 'injury',
+            'age' => 'age',
+            'gold' => 'gold',
+            'rice' => 'rice',
+            'crew' => 'crew',
+            'crewTypeId' => 'crewtype',
+            'train' => 'train',
+            'atmos' => 'atmos',
+            'dex1' => 'dex1',
+            'dex2' => 'dex2',
+            'dex3' => 'dex3',
+            'dex4' => 'dex4',
+            'dex5' => 'dex5',
+            'specAge' => 'specage',
+            'specAge2' => 'specage2',
+            'killTurn' => 'killturn',
+            'npcState' => 'npc',
+            'blockState' => 'block',
+            'specialDomestic' => 'special',
+            'specialWar' => 'special2',
+            'personality' => 'personal',
+            'itemHorse' => 'horse',
+            'itemWeapon' => 'weapon',
+            'itemBook' => 'book',
+            'itemExtra' => 'item',
+        ]);
+        if (isset($row['meta'])) {
+            $patch['aux'] = Json::encode($row['meta']);
+        }
+        if (array_key_exists('penalty', $row)) {
+            if (!is_array($row['penalty'])) {
+                throw new \InvalidArgumentException('setup.generals.penalty must be an object');
+            }
+            $patch['penalty'] = Json::encode($row['penalty']);
+        }
+        if (isset($row['lastTurn']) && is_array($row['lastTurn'])) {
+            $patch['last_turn'] = Json::encode($row['lastTurn']);
+        }
+        if ($patch !== []) {
+            $db->update('general', $patch, 'no = %i', $row['id']);
+        }
+        if (array_key_exists('nationId', $row)) {
+            $db->update('rank_data', [
+                'nation_id' => $row['nationId'],
+            ], 'general_id = %i', $row['id']);
+        }
+    }
+    foreach ($setup['rankData'] ?? [] as $row) {
+        if (
+            !is_array($row)
+            || !is_int($row['generalId'] ?? null)
+            || !is_string($row['type'] ?? null)
+            || RankColumn::tryFrom($row['type']) === null
+            || !is_int($row['value'] ?? null)
+        ) {
+            throw new \InvalidArgumentException('invalid setup.rankData row');
+        }
+        $nationId = (int)($db->queryFirstField(
+            'SELECT nation FROM general WHERE no = %i',
+            $row['generalId'],
+        ) ?? 0);
+        $db->insertUpdate('rank_data', [
+            'general_id' => $row['generalId'],
+            'nation_id' => $nationId,
+            'type' => $row['type'],
+            'value' => $row['value'],
+        ], [
+            'nation_id' => $nationId,
+            'value' => $row['value'],
+        ]);
+    }
+    if (($setup['isolateWorld'] ?? false) === true && ($setup['generals'] ?? []) !== []) {
+        $maxGeneralId = max(array_map(
+            static fn(array $row): int => (int)$row['id'],
+            $setup['generals'],
+        ));
+        $db->query('ALTER TABLE general AUTO_INCREMENT = %i', $maxGeneralId + 1);
+    }
+
+    foreach ($setup['troops'] ?? [] as $row) {
+        if (
+            !is_array($row)
+            || !is_int($row['id'] ?? null)
+            || !is_int($row['nationId'] ?? null)
+            || !is_string($row['name'] ?? null)
+            || $row['id'] < 1
+            || $row['nationId'] < 1
+            || $row['name'] === ''
+        ) {
+            throw new \InvalidArgumentException('setup.troops requires positive id/nationId and non-empty name');
+        }
+        $data = [
+            'troop_leader' => $row['id'],
+            'nation' => $row['nationId'],
+            'name' => $row['name'],
+        ];
+        $db->insertUpdate('troop', $data, $data);
+    }
+
+    foreach ($setup['diplomacy'] ?? [] as $row) {
+        if (
+            !is_array($row) ||
+            !is_int($row['fromNationId'] ?? null) ||
+            !is_int($row['toNationId'] ?? null) ||
+            $row['fromNationId'] < 1 ||
+            $row['toNationId'] < 1
+        ) {
+            throw new \InvalidArgumentException('setup.diplomacy requires positive integer nation ids');
+        }
+        $data = comparisonMappedPatch($row, [
+            'fromNationId' => 'me',
+            'toNationId' => 'you',
+            'state' => 'state',
+            'term' => 'term',
+            'dead' => 'dead',
+        ]);
+        $data += ['state' => 3, 'term' => 0, 'dead' => 0];
+        $db->insertUpdate('diplomacy', $data, $data);
+    }
+}
+
+function comparisonRunTurnCommand(array $request): array
+{
+    if (getenv('TURN_DIFFERENTIAL_ENABLED') !== '1') {
+        throw new \RuntimeException('TURN_DIFFERENTIAL_ENABLED=1 is required');
+    }
+    $kind = $request['kind'] ?? null;
+    if (!in_array($kind, ['general', 'nation', 'instantNation', 'troopJoinStaticEvent'], true)) {
+        throw new \InvalidArgumentException(
+            'kind must be general, nation, instantNation, or troopJoinStaticEvent',
+        );
+    }
+    $actorGeneralId = $request['actorGeneralId'] ?? null;
+    $action = $request['action'] ?? null;
+    $args = $request['args'] ?? null;
+    $includeLifecycle = $request['includeLifecycle'] ?? false;
+    if (!is_int($actorGeneralId) || $actorGeneralId < 1) {
+        throw new \InvalidArgumentException('actorGeneralId must be a positive integer');
+    }
+    if (!is_string($action) || $action === '') {
+        throw new \InvalidArgumentException('action must be a non-empty string');
+    }
+    if (!is_bool($includeLifecycle)) {
+        throw new \InvalidArgumentException('includeLifecycle must be a boolean');
+    }
+    if ($includeLifecycle && $kind !== 'general') {
+        throw new \InvalidArgumentException('includeLifecycle currently supports general commands only');
+    }
+
+    comparisonApplyTurnFixtureSetup($request['setup'] ?? null);
+    if ($includeLifecycle) {
+        DB::db()->insertUpdate('general_turn', [
+            'general_id' => $actorGeneralId,
+            'turn_idx' => 0,
+            'action' => $action,
+            'arg' => Json::encode($args),
+            'brief' => $action,
+        ], [
+            'action' => $action,
+            'arg' => Json::encode($args),
+            'brief' => $action,
+        ]);
+    }
+    $snapshotRequest = ['observe' => $request['observe'] ?? []];
+    $before = comparisonTurnStateSnapshot($snapshotRequest);
+    $db = DB::db();
+    $gameStorage = KVStorage::getStorage($db, 'game_env');
+    $gameStorage->resetCache();
+    $environment = $gameStorage->getAll();
+    if ($kind === 'troopJoinStaticEvent') {
+        if ($action !== \sammo\API\Troop\JoinTroop::class) {
+            throw new \InvalidArgumentException('troopJoinStaticEvent requires the JoinTroop API action');
+        }
+        $troopId = is_array($args) ? ($args['troopID'] ?? null) : null;
+        if (!is_int($troopId) || $troopId < 1) {
+            throw new \InvalidArgumentException('troopJoinStaticEvent requires a positive integer troopID');
+        }
+        $general = GeneralLite::createObjFromDB(
+            $actorGeneralId,
+            ['troop'],
+            Enums\GeneralLiteQueryMode::Lite,
+        );
+        if ($general === null) {
+            throw new \RuntimeException('장수 정보를 불러올 수 없습니다.');
+        }
+        if ($general->getVar('troop') != 0) {
+            throw new \RuntimeException('이미 부대에 소속되어 있습니다.');
+        }
+        $nationId = $general->getNationID();
+        if ($nationId == 0) {
+            throw new \RuntimeException('국가에 소속되어 있지 않습니다.');
+        }
+        $troopExists = $db->queryFirstField(
+            'SELECT `troop_leader` FROM `troop` WHERE `troop_leader` = %i AND `nation` = %i',
+            $troopId,
+            $nationId,
+        );
+        if (!$troopExists) {
+            throw new \RuntimeException('부대가 올바르지 않습니다.');
+        }
+
+        GameConst::$staticEventHandlers = [
+            \sammo\API\Troop\JoinTroop::class => ['event_부대탑승즉시이동'],
+        ];
+        $general->setVar('troop', $troopId);
+        StaticEventHandler::handleEvent($general, null, \sammo\API\Troop\JoinTroop::class, [], $args);
+        $general->applyDB($db);
+        $after = comparisonTurnStateSnapshot($snapshotRequest);
+
+        return [
+            'schemaVersion' => 1,
+            'engine' => 'ref',
+            'execution' => [
+                'kind' => $kind,
+                'actorGeneralId' => $actorGeneralId,
+                'action' => $action,
+                'args' => $args,
+                'seedDomain' => 'none',
+                'outcome' => ['completed' => true],
+            ],
+            'before' => $before,
+            'after' => $after,
+            'rng' => [],
+        ];
+    }
+    $general = General::createObjFromDB($actorGeneralId);
+    if ($kind === 'instantNation') {
+        $command = buildNationCommandClass($action, $general, $environment, new LastTurn(), $args);
+        if (!$command->hasFullConditionMet()) {
+            throw new \RuntimeException($command->getFailString());
+        }
+        $completed = $command->run(NoRNG::rngInstance());
+        $command->setNextAvailable();
+        $general->getLogger()->flush();
+        $after = comparisonTurnStateSnapshot($snapshotRequest);
+
+        return [
+            'schemaVersion' => 1,
+            'engine' => 'ref',
+            'execution' => [
+                'kind' => $kind,
+                'actorGeneralId' => $actorGeneralId,
+                'action' => $action,
+                'args' => $args,
+                'seedDomain' => 'none',
+                'outcome' => [
+                    'lastTurn' => (object)[],
+                    'commandName' => $command->getName(),
+                    'completed' => $completed,
+                ],
+            ],
+            'before' => $before,
+            'after' => $after,
+            'rng' => [],
+        ];
+    }
+    $turn = new TurnExecutionHelper($general);
+    $general->increaseInheritancePoint(Enums\InheritanceKey::lived_month, 1);
+    $preprocessRng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+        UniqueConst::$hiddenSeed,
+        'preprocess',
+        (int)$environment['year'],
+        (int)$environment['month'],
+        $actorGeneralId,
+    )));
+    $turn->preprocessCommand($preprocessRng, $environment);
+    $seedDomain = $kind === 'general' ? 'generalCommand' : 'nationCommand';
+    $seed = Util::simpleSerialize(
+        UniqueConst::$hiddenSeed,
+        $seedDomain,
+        (int)$environment['year'],
+        (int)$environment['month'],
+        $actorGeneralId,
+        $action,
+    );
+    $tracingRng = new TurnComparisonTracingRNG(new LiteHashDRBG($seed));
+    $rng = new RandUtil($tracingRng);
+    if ($kind === 'general' && $action === 'che_견문') {
+        \sammo\TextDecoration\SightseeingMessage::setComparisonRng($rng);
+    }
+
+    if ($kind === 'general') {
+        $previousLastTurn = $general->getLastTurn();
+        $previousLastTurnRaw = $previousLastTurn->toRaw();
+        $command = buildGeneralCommandClass($action, $general, $environment, $args);
+        $commandFullConditionMet = $command->hasFullConditionMet();
+        $resultTurn = $turn->processCommand($rng, $command, false);
+    } else {
+        $nationStor = KVStorage::getStorage($db, $general->getNationID(), 'nation_env');
+        $lastNationTurnKey = "turn_last_{$general->getVar('officer_level')}";
+        $previousLastTurn = LastTurn::fromRaw($nationStor->getValue($lastNationTurnKey));
+        $previousLastTurnRaw = $previousLastTurn->toRaw();
+        $command = buildNationCommandClass($action, $general, $environment, $previousLastTurn, $args);
+        $commandFullConditionMet = $command->hasFullConditionMet();
+        $resultTurn = $turn->processNationCommand($rng, $command);
+        $nationStor->setValue($lastNationTurnKey, $resultTurn->toRaw());
+    }
+
+    if ($includeLifecycle) {
+        pullGeneralCommand($general->getID());
+        $general->increaseVarWithLimit(
+            'myset',
+            GameConst::$incDefSettingChange,
+            null,
+            GameConst::$maxDefSettingChange,
+        );
+        $turn->updateTurnTime();
+    }
+    $general->getLogger()->flush();
+    $turn->applyDB();
+    unset($turn);
+    $after = comparisonTurnStateSnapshot($snapshotRequest);
+    $resultTurnRaw = $resultTurn->toRaw();
+    $resultTerm = (int)($resultTurnRaw['term'] ?? 0);
+    $preReqTurn = $command->getPreReqTurn();
+    $acceptScoutCompleted = (
+        $action === 'che_등용수락'
+        && is_array($args)
+        && is_int($args['destNationID'] ?? null)
+        && $general->getNationID() === $args['destNationID']
+    );
+    $foundNationCompleted = (
+        in_array($action, ['che_건국', 'cr_건국', 'che_무작위건국'], true)
+        && is_array($args)
+        && is_string($args['nationName'] ?? null)
+        && DB::db()->queryFirstField(
+            'SELECT name FROM nation WHERE nation = %i',
+            $general->getNationID(),
+        ) === $args['nationName']
+    );
+    $completedByState = (
+        $action === 'che_접경귀환'
+        && $tracingRng->calls !== []
+    ) || $acceptScoutCompleted || $foundNationCompleted || (($resultTurnRaw['command'] ?? null) === $command->getName()
+        && (
+            ($preReqTurn === 0 && $resultTerm === 0)
+            || (
+                $preReqTurn > 0
+                && ($previousLastTurnRaw['command'] ?? null) === $command->getName()
+                && ($previousLastTurnRaw['arg'] ?? null) === $command->getArg()
+                && (int)($previousLastTurnRaw['term'] ?? 0) === $preReqTurn
+            )
+        ));
+    $completed = $commandFullConditionMet && $completedByState;
+
+    return [
+        'schemaVersion' => 1,
+        'engine' => 'ref',
+        'execution' => [
+            'kind' => $kind,
+            'actorGeneralId' => $actorGeneralId,
+            'action' => $action,
+            'args' => $args,
+            'seedDomain' => $seedDomain,
+            'outcome' => [
+                'lastTurn' => $resultTurnRaw,
+                'commandName' => $command->getName(),
+                'completed' => $completed,
+            ],
+        ],
+        'before' => $before,
+        'after' => $after,
+        'rng' => $tracingRng->calls,
+    ];
+}
+
+try {
+    $input = stream_get_contents(STDIN);
+    $request = json_decode($input === '' ? '{}' : $input, true, flags: JSON_THROW_ON_ERROR);
+    if (!is_array($request)) {
+        throw new \InvalidArgumentException('request must be an object');
+    }
+    echo json_encode(
+        comparisonRunTurnCommand($request),
+        JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
+    ), PHP_EOL;
+} catch (\Throwable $throwable) {
+    fwrite(STDERR, $throwable::class . ': ' . $throwable->getMessage() . PHP_EOL);
+    exit(1);
+}

hwe/compare/turn_state_snapshot.php

@@ -0,0 +1,643 @@
+<?php
+
+declare(strict_types=1);
+
+namespace sammo;
+
+use sammo\Enums\RankColumn;
+
+if (PHP_SAPI !== 'cli') {
+    http_response_code(404);
+    exit;
+}
+
+chdir(dirname(__DIR__));
+require_once 'lib.php';
+require_once 'func.php';
+
+/** @return list<int> */
+function comparisonIntegerList(mixed $value, string $label): array
+{
+    if ($value === null) {
+        return [];
+    }
+    if (!is_array($value)) {
+        throw new \InvalidArgumentException("{$label} must be an array");
+    }
+    $result = [];
+    foreach ($value as $entry) {
+        if (!is_int($entry) || $entry < 0) {
+            throw new \InvalidArgumentException("{$label} entries must be non-negative integers");
+        }
+        $result[$entry] = $entry;
+    }
+    ksort($result, SORT_NUMERIC);
+    return array_values($result);
+}
+
+function comparisonJsonValue(mixed $value): mixed
+{
+    if (!is_string($value) || $value === '') {
+        return $value;
+    }
+    try {
+        return json_decode($value, true, flags: JSON_THROW_ON_ERROR);
+    } catch (\JsonException) {
+        return $value;
+    }
+}
+
+function comparisonOptionalCode(mixed $value): ?string
+{
+    if (!is_string($value) || $value === '' || $value === 'None') {
+        return null;
+    }
+    return $value;
+}
+
+/** @return list<array{generalId: int, actionName: string}> */
+function comparisonGeneralCooldownSelectors(mixed $value, string $label): array
+{
+    if ($value === null) {
+        return [];
+    }
+    if (!is_array($value)) {
+        throw new \InvalidArgumentException("{$label} must be an array");
+    }
+    $result = [];
+    foreach ($value as $entry) {
+        if (!is_array($entry)) {
+            throw new \InvalidArgumentException("{$label} entries must be objects");
+        }
+        $generalId = $entry['generalId'] ?? null;
+        $actionName = $entry['actionName'] ?? null;
+        if (!is_int($generalId) || $generalId < 1 || !is_string($actionName) || $actionName === '') {
+            throw new \InvalidArgumentException(
+                "{$label} entries require a positive generalId and non-empty actionName",
+            );
+        }
+        $result["{$generalId}:{$actionName}"] = [
+            'generalId' => $generalId,
+            'actionName' => $actionName,
+        ];
+    }
+    ksort($result, SORT_STRING);
+    return array_values($result);
+}
+
+/** @return list<array{nationId: int, actionName: string}> */
+function comparisonNationCooldownSelectors(mixed $value, string $label): array
+{
+    if ($value === null) {
+        return [];
+    }
+    if (!is_array($value)) {
+        throw new \InvalidArgumentException("{$label} must be an array");
+    }
+    $result = [];
+    foreach ($value as $entry) {
+        if (!is_array($entry)) {
+            throw new \InvalidArgumentException("{$label} entries must be objects");
+        }
+        $nationId = $entry['nationId'] ?? null;
+        $actionName = $entry['actionName'] ?? null;
+        if (!is_int($nationId) || $nationId < 1 || !is_string($actionName) || $actionName === '') {
+            throw new \InvalidArgumentException(
+                "{$label} entries require a positive nationId and non-empty actionName",
+            );
+        }
+        $result["{$nationId}:{$actionName}"] = [
+            'nationId' => $nationId,
+            'actionName' => $actionName,
+        ];
+    }
+    ksort($result, SORT_STRING);
+    return array_values($result);
+}
+
+/** @return list<array{fromNationId: int, toNationId: int}> */
+function comparisonDiplomacyPairSelectors(mixed $value, string $label): array
+{
+    if ($value === null) {
+        return [];
+    }
+    if (!is_array($value)) {
+        throw new \InvalidArgumentException("{$label} must be an array");
+    }
+    $result = [];
+    foreach ($value as $entry) {
+        if (!is_array($entry)) {
+            throw new \InvalidArgumentException("{$label} entries must be objects");
+        }
+        $fromNationId = $entry['fromNationId'] ?? null;
+        $toNationId = $entry['toNationId'] ?? null;
+        if (!is_int($fromNationId) || $fromNationId < 1 || !is_int($toNationId) || $toNationId < 1) {
+            throw new \InvalidArgumentException(
+                "{$label} entries require positive fromNationId and toNationId",
+            );
+        }
+        $result["{$fromNationId}:{$toNationId}"] = [
+            'fromNationId' => $fromNationId,
+            'toNationId' => $toNationId,
+        ];
+    }
+    ksort($result, SORT_STRING);
+    return array_values($result);
+}
+
+/** @param array<string, mixed> $row */
+function comparisonPickRow(array $row, array $mapping, array $jsonKeys = []): array
+{
+    $result = [];
+    foreach ($mapping as $canonical => $legacy) {
+        if (!array_key_exists($legacy, $row)) {
+            continue;
+        }
+        $value = $row[$legacy];
+        if (in_array($legacy, $jsonKeys, true)) {
+            $value = comparisonJsonValue($value);
+        }
+        $result[$canonical] = $value;
+    }
+    return $result;
+}
+
+/** @param list<int> $ids */
+function comparisonRowsById(string $table, string $idColumn, array $ids): array
+{
+    $db = DB::db();
+    $rows = [];
+    foreach ($ids as $id) {
+        $row = $db->queryFirstRow(
+            "SELECT * FROM `{$table}` WHERE `{$idColumn}` = %i",
+            $id,
+        );
+        if ($row !== null) {
+            $rows[] = $row;
+        }
+    }
+    return $rows;
+}
+
+function comparisonTurnStateSnapshot(array $request): array
+{
+    $observe = $request['observe'] ?? [];
+    if (!is_array($observe)) {
+        throw new \InvalidArgumentException('observe must be an object');
+    }
+    $generalIds = comparisonIntegerList($observe['generalIds'] ?? [], 'generalIds');
+    $cityIds = comparisonIntegerList($observe['cityIds'] ?? [], 'cityIds');
+    $nationIds = comparisonIntegerList($observe['nationIds'] ?? [], 'nationIds');
+    $logAfterId = $observe['logAfterId'] ?? 0;
+    $messageAfterId = $observe['messageAfterId'] ?? 0;
+    $includeNationHistoryLogs = $observe['includeNationHistoryLogs'] ?? false;
+    $includeGlobalHistoryLogs = $observe['includeGlobalHistoryLogs'] ?? false;
+    $generalCooldownSelectors = comparisonGeneralCooldownSelectors(
+        $observe['generalCooldowns'] ?? [],
+        'generalCooldowns',
+    );
+    $nationCooldownSelectors = comparisonNationCooldownSelectors(
+        $observe['nationCooldowns'] ?? [],
+        'nationCooldowns',
+    );
+    $diplomacyPairSelectors = comparisonDiplomacyPairSelectors(
+        $observe['diplomacyPairs'] ?? [],
+        'diplomacyPairs',
+    );
+    if (
+        !is_int($logAfterId)
+        || $logAfterId < 0
+        || !is_int($messageAfterId)
+        || $messageAfterId < 0
+    ) {
+        throw new \InvalidArgumentException('logAfterId and messageAfterId must be non-negative integers');
+    }
+    if (!is_bool($includeNationHistoryLogs)) {
+        throw new \InvalidArgumentException('includeNationHistoryLogs must be a boolean');
+    }
+    if (!is_bool($includeGlobalHistoryLogs)) {
+        throw new \InvalidArgumentException('includeGlobalHistoryLogs must be a boolean');
+    }
+
+    $db = DB::db();
+    $game = KVStorage::getStorage($db, 'game_env');
+    $game->resetCache();
+    $worldValues = $game->getValues([
+        'year',
+        'month',
+        'turnterm',
+        'turntime',
+        'isunited',
+        'scenario',
+        'init_year',
+        'init_month',
+        'develcost',
+        'killturn',
+    ]);
+    $nextExecuteStorage = KVStorage::getStorage($db, 'next_execute');
+    $nextExecuteStorage->resetCache();
+    $generalCooldowns = array_map(
+        static function (array $selector) use ($nextExecuteStorage): array {
+            $key = "next_execute_{$selector['generalId']}_{$selector['actionName']}";
+            $value = $nextExecuteStorage->getValue($key);
+            return [
+                ...$selector,
+                'nextAvailableTurn' => is_int($value) ? $value : null,
+            ];
+        },
+        $generalCooldownSelectors,
+    );
+    $nationCooldowns = array_map(
+        static function (array $selector) use ($db): array {
+            $nationStorage = KVStorage::getStorage($db, $selector['nationId'], 'nation_env');
+            $nationStorage->resetCache();
+            $value = $nationStorage->getValue("next_execute_{$selector['actionName']}");
+            return [
+                ...$selector,
+                'nextAvailableTurn' => is_int($value) ? $value : null,
+            ];
+        },
+        $nationCooldownSelectors,
+    );
+
+    $generals = array_map(
+        static function (array $row): array {
+            $result = comparisonPickRow(
+                $row,
+            [
+                'id' => 'no',
+                'name' => 'name',
+                'nationId' => 'nation',
+                'cityId' => 'city',
+                'troopId' => 'troop',
+                'leadership' => 'leadership',
+                'strength' => 'strength',
+                'intelligence' => 'intel',
+                'experience' => 'experience',
+                'dedication' => 'dedication',
+                'expLevel' => 'explevel',
+                'officerLevel' => 'officer_level',
+                'officerCityId' => 'officer_city',
+                'belong' => 'belong',
+                'permission' => 'permission',
+                'betray' => 'betray',
+                'makeLimit' => 'makelimit',
+                'injury' => 'injury',
+                'gold' => 'gold',
+                'rice' => 'rice',
+                'crew' => 'crew',
+                'crewTypeId' => 'crewtype',
+                'train' => 'train',
+                'atmos' => 'atmos',
+                'age' => 'age',
+                'npcState' => 'npc',
+                'turnTime' => 'turntime',
+                'recentWarTime' => 'recent_war',
+                'lastTurn' => 'last_turn',
+                'meta' => 'aux',
+                'penalty' => 'penalty',
+                'leadershipExp' => 'leadership_exp',
+                'strengthExp' => 'strength_exp',
+                'intelExp' => 'intel_exp',
+                'dex1' => 'dex1',
+                'dex2' => 'dex2',
+                'dex3' => 'dex3',
+                'dex4' => 'dex4',
+                'dex5' => 'dex5',
+                'specAge' => 'specage',
+                'specAge2' => 'specage2',
+                'killTurn' => 'killturn',
+                'mySet' => 'myset',
+                'specialDomestic' => 'special',
+                'specialWar' => 'special2',
+                'personality' => 'personal',
+                'itemHorse' => 'horse',
+                'itemWeapon' => 'weapon',
+                'itemBook' => 'book',
+                'itemExtra' => 'item',
+            ],
+            ['last_turn', 'aux', 'penalty'],
+            );
+            foreach ([
+                'specialDomestic',
+                'specialWar',
+                'personality',
+                'itemHorse',
+                'itemWeapon',
+                'itemBook',
+                'itemExtra',
+            ] as $key) {
+                $result[$key] = comparisonOptionalCode($result[$key] ?? null);
+            }
+            $result['maxBelong'] = (int)($result['meta']['max_belong'] ?? 0);
+            $ownerId = (int)($row['owner'] ?? 0);
+            $activeActionPoints = 0;
+            if ($ownerId > 0) {
+                $inheritanceStorage = KVStorage::getStorage(DB::db(), "inheritance_{$ownerId}");
+                $inheritanceStorage->resetCache();
+                $stored = $inheritanceStorage->getValue('active_action');
+                if (is_array($stored) && (is_int($stored[0] ?? null) || is_float($stored[0] ?? null))) {
+                    $activeActionPoints = $stored[0];
+                }
+            }
+            $result['hasOwner'] = $ownerId > 0;
+            $result['inheritActiveActionPoints'] = $activeActionPoints;
+            return $result;
+        },
+        comparisonRowsById('general', 'no', $generalIds),
+    );
+    $rankTypes = array_map(
+        static fn(RankColumn $column): string => $column->value,
+        RankColumn::cases(),
+    );
+    $rankData = $generalIds === []
+        ? []
+        : iterator_to_array($db->query(
+            'SELECT general_id AS generalId, nation_id AS nationId, `type`, `value`'
+            . ' FROM rank_data WHERE general_id IN %li AND `type` IN %ls'
+            . ' ORDER BY general_id, `type`',
+            $generalIds,
+            $rankTypes,
+        ));
+
+    $cities = array_map(
+        static fn(array $row): array => comparisonPickRow(
+            $row,
+            [
+                'id' => 'city',
+                'name' => 'name',
+                'nationId' => 'nation',
+                'level' => 'level',
+                'population' => 'pop',
+                'populationMax' => 'pop_max',
+                'agriculture' => 'agri',
+                'agricultureMax' => 'agri_max',
+                'commerce' => 'comm',
+                'commerceMax' => 'comm_max',
+                'security' => 'secu',
+                'securityMax' => 'secu_max',
+                'supplyState' => 'supply',
+                'frontState' => 'front',
+                'defence' => 'def',
+                'defenceMax' => 'def_max',
+                'wall' => 'wall',
+                'wallMax' => 'wall_max',
+                'state' => 'state',
+                'term' => 'term',
+                'trust' => 'trust',
+                'trade' => 'trade',
+                'conflict' => 'conflict',
+                'officerSet' => 'officer_set',
+            ],
+            ['conflict'],
+        ),
+        comparisonRowsById('city', 'city', $cityIds),
+    );
+
+    $nations = array_map(
+        static function (array $row) use ($db): array {
+            $projected = comparisonPickRow(
+                $row,
+                [
+                    'id' => 'nation',
+                    'name' => 'name',
+                    'color' => 'color',
+                    'capitalCityId' => 'capital',
+                    'gold' => 'gold',
+                    'rice' => 'rice',
+                    'tech' => 'tech',
+                    'level' => 'level',
+                    'typeCode' => 'type',
+                    'generalCount' => 'gennum',
+                    'power' => 'power',
+                    'war' => 'war',
+                    'diplomacyLimit' => 'surlimit',
+                    'capitalRevision' => 'capset',
+                    'strategicCommandLimit' => 'strategic_cmd_limit',
+                    'meta' => 'aux',
+                ],
+                ['aux'],
+            );
+            $nationStor = KVStorage::getStorage($db, (int)$row['nation'], 'nation_env');
+            $receivedAssist = $nationStor->getValue('recv_assist');
+            if (is_array($receivedAssist) && $receivedAssist !== []) {
+                $projected['meta']['recv_assist'] = $receivedAssist;
+            }
+            $respondedAssist = $nationStor->getValue('resp_assist');
+            if (is_array($respondedAssist) && $respondedAssist !== []) {
+                $projected['meta']['resp_assist'] = $respondedAssist;
+            }
+            return $projected;
+        },
+        comparisonRowsById('nation', 'nation', $nationIds),
+    );
+
+    $diplomacyPairs = [];
+    foreach ($nationIds as $fromNationId) {
+        foreach ($nationIds as $toNationId) {
+            if ($fromNationId === $toNationId) {
+                continue;
+            }
+            $diplomacyPairs["{$fromNationId}:{$toNationId}"] = [
+                'fromNationId' => $fromNationId,
+                'toNationId' => $toNationId,
+            ];
+        }
+    }
+    foreach ($diplomacyPairSelectors as $pair) {
+        $diplomacyPairs["{$pair['fromNationId']}:{$pair['toNationId']}"] = $pair;
+    }
+    ksort($diplomacyPairs, SORT_STRING);
+
+    $diplomacy = [];
+    foreach ($diplomacyPairs as $pair) {
+        $row = $db->queryFirstRow(
+            'SELECT me, you, state, term, dead FROM diplomacy WHERE me = %i AND you = %i',
+            $pair['fromNationId'],
+            $pair['toNationId'],
+        );
+        if ($row !== null) {
+            $diplomacy[] = comparisonPickRow($row, [
+                'fromNationId' => 'me',
+                'toNationId' => 'you',
+                'state' => 'state',
+                'term' => 'term',
+                'dead' => 'dead',
+            ]);
+        }
+    }
+
+    $generalTurns = [];
+    foreach ($generalIds as $generalId) {
+        foreach ($db->query(
+            'SELECT general_id, turn_idx, action, arg FROM general_turn WHERE general_id = %i ORDER BY turn_idx',
+            $generalId,
+        ) as $row) {
+            $generalTurns[] = comparisonPickRow(
+                $row,
+                ['generalId' => 'general_id', 'turnIndex' => 'turn_idx', 'action' => 'action', 'args' => 'arg'],
+                ['arg'],
+            );
+        }
+    }
+
+    $nationTurns = [];
+    foreach ($nationIds as $nationId) {
+        foreach ($db->query(
+            'SELECT nation_id, officer_level, turn_idx, action, arg FROM nation_turn WHERE nation_id = %i ORDER BY officer_level, turn_idx',
+            $nationId,
+        ) as $row) {
+            $nationTurns[] = comparisonPickRow(
+                $row,
+                [
+                    'nationId' => 'nation_id',
+                    'officerLevel' => 'officer_level',
+                    'turnIndex' => 'turn_idx',
+                    'action' => 'action',
+                    'args' => 'arg',
+                ],
+                ['arg'],
+            );
+        }
+    }
+
+    $logs = [];
+    if ($generalIds !== []) {
+        foreach ($db->query(
+            'SELECT id, general_id, log_type, year, month, text FROM general_record WHERE id > %i ORDER BY id',
+            $logAfterId,
+        ) as $row) {
+            if ((int)$row['general_id'] !== 0 && !in_array((int)$row['general_id'], $generalIds, true)) {
+                continue;
+            }
+            $generalId = (int)$row['general_id'];
+            $category = (string)$row['log_type'];
+            if ($category === 'battle') {
+                $category = 'battle_detail';
+            } elseif ($generalId === 0) {
+                $category = 'summary';
+            }
+            $logs[] = comparisonPickRow($row, [
+                'id' => 'id',
+                'generalId' => 'general_id',
+                'year' => 'year',
+                'month' => 'month',
+                'text' => 'text',
+            ]) + [
+                'scope' => $generalId === 0 ? 'system' : 'general',
+                'category' => $category,
+                'nationId' => null,
+            ];
+        }
+    }
+    if ($includeNationHistoryLogs && $nationIds !== []) {
+        foreach ($db->query(
+            'SELECT id, nation_id, year, month, text FROM world_history WHERE nation_id IN %li ORDER BY id',
+            $nationIds,
+        ) as $row) {
+            $logs[] = comparisonPickRow($row, [
+                'id' => 'id',
+                'nationId' => 'nation_id',
+                'year' => 'year',
+                'month' => 'month',
+                'text' => 'text',
+            ]) + [
+                'scope' => 'nation',
+                'category' => 'history',
+                'generalId' => null,
+            ];
+        }
+    }
+    if ($includeGlobalHistoryLogs) {
+        foreach ($db->query(
+            'SELECT id, nation_id, year, month, text FROM world_history WHERE nation_id = 0 ORDER BY id',
+        ) as $row) {
+            $logs[] = comparisonPickRow($row, [
+                'id' => 'id',
+                'nationId' => 'nation_id',
+                'year' => 'year',
+                'month' => 'month',
+                'text' => 'text',
+            ]) + [
+                'scope' => 'system',
+                'category' => 'history',
+                'generalId' => null,
+            ];
+        }
+    }
+
+    $messages = array_map(
+        static fn(array $row): array => comparisonPickRow(
+            $row,
+            [
+                'id' => 'id',
+                'mailbox' => 'mailbox',
+                'type' => 'type',
+                'sourceId' => 'src',
+                'destinationId' => 'dest',
+                'createdAt' => 'time',
+                'payload' => 'message',
+            ],
+            ['message'],
+        ),
+        $db->query(
+            'SELECT id, mailbox, type, src, dest, time, message FROM message WHERE id > %i ORDER BY id',
+            $messageAfterId,
+        ),
+    );
+
+    return [
+        'schemaVersion' => 1,
+        'engine' => 'ref',
+        'world' => [
+            'year' => (int)$worldValues['year'],
+            'month' => (int)$worldValues['month'],
+            'tickMinutes' => (int)$worldValues['turnterm'],
+            'turnTime' => (string)$worldValues['turntime'],
+            'isUnited' => (int)$worldValues['isunited'],
+            'scenarioId' => (int)$worldValues['scenario'],
+            'initYear' => (int)$worldValues['init_year'],
+            'initMonth' => (int)$worldValues['init_month'],
+            'develCost' => (int)$worldValues['develcost'],
+            'killTurn' => (int)$worldValues['killturn'],
+            'generalCooldowns' => $generalCooldowns,
+            'nationCooldowns' => $nationCooldowns,
+        ],
+        'generals' => $generals,
+        'rankData' => $rankData,
+        'cities' => $cities,
+        'nations' => $nations,
+        'diplomacy' => $diplomacy,
+        'generalTurns' => $generalTurns,
+        'nationTurns' => $nationTurns,
+        'logs' => $logs,
+        'messages' => $messages,
+        'watermarks' => [
+            'logId' => (int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM general_record') ?? 0),
+            'historyLogId' => (int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM world_history') ?? 0),
+            'messageId' => (int)($db->queryFirstField('SELECT COALESCE(MAX(id), 0) FROM message') ?? 0),
+        ],
+    ];
+}
+
+function comparisonTurnStateSnapshotMain(): void
+{
+    try {
+        $input = stream_get_contents(STDIN);
+        $request = json_decode($input === '' ? '{}' : $input, true, flags: JSON_THROW_ON_ERROR);
+        if (!is_array($request)) {
+            throw new \InvalidArgumentException('request must be an object');
+        }
+        echo json_encode(
+            comparisonTurnStateSnapshot($request),
+            JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRESERVE_ZERO_FRACTION,
+        ), PHP_EOL;
+    } catch (\Throwable $throwable) {
+        fwrite(STDERR, $throwable::class . ': ' . $throwable->getMessage() . PHP_EOL);
+        exit(1);
+    }
+}
+
+if (realpath((string)($_SERVER['SCRIPT_FILENAME'] ?? '')) === __FILE__) {
+    comparisonTurnStateSnapshotMain();
+}

hwe/d_setting/ServerEnv.orig.php

@@ -0,0 +1,6 @@
+<?php
+namespace sammo;
+
+class ServerEnv extends ServerDefaultEnv {
+    //ServerEnv 기본값을 변경하고 싶다면 orig를 제거한 복사본을 만들고 수정
+}

hwe/func.php

@@ -5,7 +5,11 @@ 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';
@@ -103,28 +107,27 @@ function GetImageURL($imgsvr, $filepath = '')
 }
 
 /**
- * @param null|int $con 장수의 벌점
- * @param null|int $conlimit 최대 벌점
+ * @param null|int $refreshScore 장수의 벌점
  */
-function checkLimit($con = null)
+function checkLimit($refreshScore = null)
 {
     $session = Session::getInstance();
-    if ($session->userGrade >= 4) {
+    if ($session->userGrade >= 6) {
         return 0;
     }
 
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    if ($con === null) {
-        $con = $db->queryFirstField('SELECT con FROM general WHERE `owner`=%i', Session::getUserID());
+    if ($refreshScore === null) {
+        $refreshScore = $db->queryFirstField('SELECT refresh_score FROM general_access_log WHERE `general_id`=%i', Session::getGeneralID());
     }
-    $conlimit = $gameStor->conlimit;
+    $refreshLimit = $gameStor->refreshLimit;
 
-    if ($con > $conlimit) {
+    if ($refreshScore > $refreshLimit) {
         return 2;
         //접속제한 90%이면 경고문구
-    } elseif ($con > $conlimit * 0.9) {
+    } elseif ($refreshScore > $refreshLimit * 0.9) {
         return 1;
     } else {
         return 0;
@@ -147,7 +150,7 @@ function getRandGenName(RandUtil $rng)
 
 
 
-function cityInfo(General $generalObj)
+function cityInfo(GeneralLite $generalObj)
 {
     $db = DB::db();
 
@@ -374,11 +377,11 @@ function myNationInfo(General $generalObj)
 function checkSecretMaxPermission($penalty)
 {
     $secretMax = 4;
-    if ($penalty['noTopSecret'] ?? false) {
+    if ($penalty[PenaltyKey::NoTopSecret->value] ?? false) {
         $secretMax = 1;
-    } else if ($penalty['noChief'] ?? false) {
+    } else if ($penalty[PenaltyKey::NoChief->value] ?? false) {
         $secretMax = 1;
-    } else if ($penalty['noAmbassador'] ?? false) {
+    } else if ($penalty[PenaltyKey::NoAmbassador->value] ?? false) {
         $secretMax = 2;
     }
     return $secretMax;
@@ -401,19 +404,19 @@ function checkSecretPermission(array $me, $checkSecretLimit = true)
     }
 
 
-    if ($penalty['noSecret'] ?? false) {
+    if ($penalty[PenaltyKey::NoChief->value] ?? false) {
         return 0;
     }
 
     $secretMin = 0;
-    $secretMax = checkSecretMaxPermission($me, $penalty);
+    $secretMax = checkSecretMaxPermission($penalty);
 
 
     if ($me['officer_level'] == 12) {
         $secretMin = 4;
-    } else if ($me['permission'] == 'ambassador') {
+    } else if ($permission == 'ambassador') {
         $secretMin = 4;
-    } else if ($me['permission'] == 'auditor') {
+    } else if ($permission == 'auditor') {
         $secretMin = 3;
     } else if ($me['officer_level'] >= 5) {
         $secretMin = 2;
@@ -642,7 +645,7 @@ function generalInfo(General $generalObj)
         $age = "<font color=red>{$age} 세</font>";
     }
 
-    $connectCnt = round($generalObj->getVar('connect'), -1);
+    $refreshScoreTotal = round($generalObj->getAccessLogVar(GeneralAccessLogColumn::refreshScoreTotal) ?? 0, -1);
     $specialDomestic = $generalObj->getVar('special') === GameConst::$defaultSpecialDomestic
         ? "{$generalObj->getVar('specage')}세"
         : "<font color=limegreen>" . displayiActionObjInfo($generalObj->getSpecialDomestic()) . "</font>";
@@ -751,7 +754,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>" . getConnect($connectCnt) . " {$connectCnt}({$generalObj->getVar('con')})</td>
+        <td style='text-align:center;' colspan=5>" . getRefreshScoreText($refreshScoreTotal) . " {$refreshScoreTotal}({$generalObj->getAccessLogVar(GeneralAccessLogColumn::refreshScore)})</td>
     </tr>
 </table>";
 }
@@ -998,52 +1001,69 @@ function increaseRefresh($type = "", $cnt = 1)
     $generalID = $session->generalID;
     $userGrade = $session->userGrade;
 
-    $date = TimeUtil::now();
+    $dateObj = new \DateTimeImmutable();
+    $date = TimeUtil::format($dateObj, false);
 
     $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->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);
+    $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),
+    ]);
 
-    $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
-    );
+    $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,
+        ]),
+    ]);
 }
 
 function updateTraffic()
@@ -1051,12 +1071,9 @@ function updateTraffic()
     $online = getOnlineNum();
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxonline', 'maxrefresh']);
+    $admin = $gameStor->getValues(['year', 'month', 'refresh', 'maxonline', 'maxrefresh', 'recentTraffic']);
     /** @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'];
     }
@@ -1067,22 +1084,20 @@ function updateTraffic()
     $gameStor->maxrefresh = $admin['maxrefresh'];
     $gameStor->maxonline = $admin['maxonline'];
 
-    $db->update('general', ['refresh' => 0], true);
+    $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;
 
-    $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
-    );
+    $db->update('general_access_log', ['refresh' => 0], true);
 }
 
 function CheckOverhead()
@@ -1090,13 +1105,13 @@ function CheckOverhead()
     //서버정보
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    list($turnterm, $conlimit) = $gameStor->getValuesAsArray(['turnterm', 'conlimit']);
+    [$turnterm, $refreshLimit] = $gameStor->getValuesAsArray(['turnterm', 'refreshLimit']);
 
-    $con = Util::round(pow($turnterm, 0.6) * 3) * 10;
+    $nextRefreshLimit = Util::round(pow($turnterm, 0.6) * 3) * GameConst::$refreshLimitCoef;
 
 
-    if ($con != $conlimit) {
-        $gameStor->conlimit = $con;
+    if ($nextRefreshLimit != $refreshLimit) {
+        $gameStor->refreshLimit = $nextRefreshLimit;
     }
 }
 
@@ -1200,7 +1215,16 @@ function updateOnline()
 
     //동접수
     $startTurn = cutTurn($gameStor->turntime, $gameStor->turnterm, false);
-    $onlineUser = $db->query('SELECT no,name,nation FROM general WHERE lastrefresh >= %s AND npc < 2', $startTurn);
+    $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
+    );
     $onlineNum = count($onlineUser);
     $onlineNationUsers = Util::arrayGroupBy($onlineUser, 'nation');
 
@@ -1314,7 +1338,7 @@ function CheckHall($no)
         ["betrate", 'calc'],
     ];
 
-    $generalObj = General::createGeneralObjFromDB($no, null, 2);
+    $generalObj = General::createObjFromDB($no);
 
     $ttw = $generalObj->getRankVar(RankColumn::ttw);
     $ttd = $generalObj->getRankVar(RankColumn::ttd);
@@ -1645,8 +1669,6 @@ 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;
@@ -1660,6 +1682,9 @@ 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)) {
@@ -1704,14 +1729,13 @@ function deleteNation(General $lord, bool $applyDB): array
     $logger->pushGlobalHistoryLog("<R><b>【멸망】</b></><D><b>{$nationName}</b></>{$josaUn} <R>멸망</>했습니다.");
 
 
-    $nationGeneralList = General::createGeneralObjListFromDB(
+    $nationGeneralList = General::createObjListFromDB(
         $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;
 
@@ -1728,7 +1752,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(

hwe/func_command.php

@@ -3,6 +3,7 @@ namespace sammo;
 
 use sammo\Command\GeneralCommand;
 use sammo\Command\NationCommand;
+use sammo\Enums\PenaltyKey;
 
 function getGeneralTurnBrief(General $generalObj, array $turnList) {
     $result = [];
@@ -213,7 +214,7 @@ function _setGeneralCommand(GeneralCommand $command, array $turnList):void {
 
     $db->update('general_turn', [
         'action'=>$commandName,
-        'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
+        'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
         'brief'=>$brief
     ], 'general_id = %i AND turn_idx IN %li', $generalID, $turnList);
 }
@@ -233,7 +234,7 @@ function _setNationCommand(NationCommand $command, array $turnList):void  {
 
     $db->update('nation_turn', [
         'action'=>$commandName,
-        'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
+        'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
         'brief'=>$brief
     ], 'nation_id = %i AND officer_level = %i AND turn_idx IN %li', $nationID, $officerLevel, $turnList);
 }
@@ -350,7 +351,7 @@ function setGeneralCommand(int $generalID, array $rawTurnList, string $command,
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $env = $gameStor->getAll();
-    $general = General::createGeneralObjFromDB($generalID);
+    $general = General::createObjFromDB($generalID);
 
     try{
         $commandObj = buildGeneralCommandClass($command, $general, $env, $arg);
@@ -425,7 +426,7 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $env = $gameStor->getAll();
-    $general = General::createGeneralObjFromDB($generalID);
+    $general = General::createObjFromDB($generalID);
 
     if($general->getVar('officer_level') < 5){
         return [
@@ -434,6 +435,13 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
         ];
     }
 
+    if($general->hasPenalty(PenaltyKey::NoChiefTurnInput)){
+        return [
+            'result'=>false,
+            'reason'=>'수뇌 턴 입력 불가능'
+        ];
+    }
+
     try{
         $commandObj = buildNationCommandClass($command, $general, $env, $general->getLastTurn(), $arg);
     }
@@ -473,6 +481,13 @@ 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(),

hwe/func_converter.php

@@ -133,19 +133,19 @@ function getNationType(?string $type) {
 }
 
 
-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 = '헐...';
+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 = '헐...';
 
-    return $conname;
+    return $scoreName;
 }
 
 function getNationType2(?string $type) {
@@ -256,6 +256,41 @@ 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;
@@ -326,6 +361,41 @@ function buildGeneralSpecialWarClass(?string $type):BaseSpecial{
     return $obj;
 }
 
+function getActionCrewTypeClass(?string $type){
+    if($type === null || $type === ''){
+        $type = 'None';
+    }
+
+    static $basePath = __NAMESPACE__.'\\ActionCrewType\\';
+    $classPath = ($basePath.$type);
+
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    $classPath = ($basePath.'che_'.$type);
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    throw new \InvalidArgumentException("{$type}은 올바른 병종 효과가 아님");
+}
+
+function buildActionCrewTypeClass(?string $type):iAction{
+    static $cache = [];
+    if($type === null){
+        $type = 'None';
+    }
+    if(key_exists($type, $cache)){
+        return $cache[$type];
+    }
+    $class = getActionCrewTypeClass($type);
+
+    $obj = new $class();
+    $cache[$type]= $obj;
+    return $obj;
+}
+
 function getGeneralCommandClass(?string $type){
     if($type === null || $type === ''){
         $type = '휴식';
@@ -387,6 +457,29 @@ 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);
@@ -542,6 +635,8 @@ function getExpLevel($experience) {
         $level = Util::toInt(sqrt($experience/10));
     }
 
+    $level = Util::clamp($level, 0, GameConst::$maxLevel);
+
     return $level;
 }
 
@@ -591,7 +686,7 @@ function TechLimit($startYear, $year, $tech) : bool {
     $relYear = $year - $startYear;
 
     $relMaxTech = Util::valueFit(
-        floor($relYear / 5) + 1,
+        floor($relYear / GameConst::$techLevelIncYear) + GameConst::$initialAllowedTechLevel,
         1,
         GameConst::$maxTechLevel
     );

hwe/func_gamerule.php

@@ -202,8 +202,10 @@ 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, 세율동기화
@@ -301,7 +303,6 @@ 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
@@ -371,7 +372,7 @@ function postUpdateMonthly(RandUtil $rng)
             continue;
         }
 
-        //양측 기간 모두 0이 되는 상황이면 휴전
+        //양측 기간 모두 0이 되는 상황이면 종전
         $nation1 = getNationStaticInfo($me);
         $name1 = $nation1['name'];
         $nation2 = getNationStaticInfo($you);
@@ -380,7 +381,7 @@ function postUpdateMonthly(RandUtil $rng)
         $josaWa = JosaUtil::pick($name1, '와');
         $josaYi = JosaUtil::pick($name2, '이');
 
-        $globalLogger->pushGlobalHistoryLog("<R><b>【휴전】</b></><D><b>$name1</b></>{$josaWa} <D><b>$name2</b></>{$josaYi} <S>휴전</>합니다.");
+        $globalLogger->pushGlobalHistoryLog("<R><b>【종전】</b></><D><b>$name1</b></>{$josaWa} <D><b>$name2</b></>{$josaYi} <S>종전</>합니다.");
         $db->update('diplomacy', [
             'state' => 2,
             'term' => 0,
@@ -423,8 +424,6 @@ function postUpdateMonthly(RandUtil $rng)
     if ($admin['year'] >= $admin['startyear'] + 2) {
         checkWander($rng);
     }
-    // 작위 업데이트
-    updateNationState();
     updateGeneralNumber();
     refreshNationStaticInfo();
     // 천통여부 검사
@@ -452,7 +451,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::createGeneralObjListFromDB($wanderers) as $wanderer) {
+    foreach (General::createObjListFromDB($wanderers) as $wanderer) {
         $wanderCmd = buildGeneralCommandClass('che_해산', $wanderer, $admin);
         if ($wanderCmd->hasFullConditionMet()) {
             $logger = $wanderer->getLogger();
@@ -467,209 +466,6 @@ function checkWander(RandUtil $rng)
     }
 }
 
-function updateNationState()
-{
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-
-    $admin = $gameStor->getValues(['killturn', 'year', 'month', 'fiction', 'startyear', 'show_img_level', 'turnterm', 'turntime']);
-    $year = $admin['year'];
-    $month = $admin['month'];
-    $startYear = $admin['startyear'];
-
-
-    $nationCityCounts = [];
-    foreach($db->queryAllLists('SELECT nation, count(*) FROM city WHERE LEVEL>=4 GROUP BY nation') as [$nationID, $cityCnt]){
-        $nationCityCounts[$nationID] = $cityCnt;
-    }
-
-
-    $nationLevelByCityCnt = [
-        0, //방랑군
-        1, //호족
-        2, //군벌
-        5, //주자사
-        8, //주목
-        11, //공
-        16, //왕
-        21, //황제
-    ];
-
-    foreach ($db->query('SELECT nation,name,level,tech,aux FROM nation') as $nation) {
-        //TODO: level이 진관수이소중대특 체계를 벗어날 수 있음
-        $nationID = $nation['nation'];
-        $cityCnt = $nationCityCounts[$nationID] ?? 0;
-
-        /** @var int */
-        $nationlevel = 0;
-        foreach($nationLevelByCityCnt as $cmpNationLevel => $cmpCityCnt){
-            if($cityCnt < $cmpCityCnt){
-                break;
-            }
-            $nationlevel = $cmpNationLevel;
-        }
-
-        if ($nationlevel > $nation['level']) {
-            $levelDiff = $nationlevel - $nation['level'];
-            $oldLevel = $nation['level'];
-            $nation['level'] = $nationlevel;
-
-            $updateVals = [
-                'level' => $nationlevel,
-                'gold' => $db->sqleval('gold + %i', $nationlevel * 1000),
-                'rice' => $db->sqleval('rice + %i', $nationlevel * 1000),
-            ];
-
-            $nationName = $nation['name'];
-            $lordName = $db->queryFirstField('SELECT name FROM general WHERE nation = %i AND officer_level = 12', $nationID);
-
-            $oldNationLevelText = getNationLevel($oldLevel);
-            $nationLevelText = getNationLevel($nationlevel);
-
-            $logger = new ActionLogger(0, $nationID, $year, $month, false);
-            $josaYi = JosaUtil::pick($lordName, '이');
-
-            switch ($nationlevel) {
-                case 7: //황제
-                    $josaRo = JosaUtil::pick($nationLevelText, '로');
-                    $logger->pushGlobalHistoryLog("<Y><b>【작위】</b></><D><b>{$nationName}</b></> {$oldNationLevelText} <Y>{$lordName}</>{$josaYi} <C>{$nationLevelText}</>{$josaRo} 옹립되었습니다.");
-                    $logger->pushNationalHistoryLog("<D><b>{$nationName}</b></> {$oldNationLevelText} <Y>{$lordName}</>{$josaYi} <C>{$nationLevelText}</>{$josaRo} 옹립");
-                    $auxVal = Json::decode($nation['aux']);
-                    $auxVal['can_국기변경'] = 1;
-                    $auxVal['can_국호변경'] = 1;
-                    $updateVals['aux'] = Json::encode($auxVal);
-                    break;
-                case 6: //왕
-                    $josaRo = JosaUtil::pick($nationLevelText, '로');
-                    $logger->pushGlobalHistoryLog("<Y><b>【작위】</b></><D><b>{$nationName}</b></>의 <Y>{$lordName}</>{$josaYi} <C>$nationLevelText</>{$josaRo} 책봉되었습니다.");
-                    $logger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$lordName}</>{$josaYi} <C>$nationLevelText</>{$josaRo} 책봉");
-                    break;
-                case 5: //공
-                case 4: //주목
-                case 3: //주자사
-                    $josaRo = JosaUtil::pick($nationLevelText, '로');
-                    $logger->pushGlobalHistoryLog("<Y><b>【작위】</b></><D><b>{$nationName}</b></>의 <Y>{$lordName}</>{$josaYi} <C>$nationLevelText</>{$josaRo} 임명되었습니다.");
-                    $logger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$lordName}</>{$josaYi} <C>$nationLevelText</>{$josaRo} 임명됨");
-                    break;
-                case 2: //군벌
-                    $josaRa = JosaUtil::pick($nationName, '라');
-                    $josaRo = JosaUtil::pick($nationLevelText, '로');
-                    $logger->pushGlobalHistoryLog("<Y><b>【작위】</b></><Y>{$lordName}</>{$josaYi} 독립하여 <D><b>{$nationName}</b></>{$josaRa}는 <C>$nationLevelText</>{$josaRo} 나섰습니다.");
-                    $logger->pushNationalHistoryLog("<Y>{$lordName}</>{$josaYi} 독립하여 <D><b>{$nationName}</b></>{$josaRa}는 <C>$nationLevelText</>{$josaRo} 나서다");
-                    break;
-            }
-
-            $db->update('nation', $updateVals, 'nation=%i', $nation['nation']);
-            $logger->flush();
-
-            $turnRows = [];
-            foreach (Util::range(getNationChiefLevel($nation['level']), 12) as $chiefLevel) {
-                foreach (Util::range(GameConst::$maxChiefTurn) as $turnIdx) {
-                    $turnRows[] = [
-                        'nation_id' => $nation['nation'],
-                        'officer_level' => $chiefLevel,
-                        'turn_idx' => $turnIdx,
-                        'action' => '휴식',
-                        'arg' => null,
-                        'brief' => '휴식'
-                    ];
-                }
-            }
-            $db->insertIgnore('nation_turn', $turnRows);
-
-            if ($levelDiff) {
-                //유니크 아이템 하나 돌리자
-                $targetKillTurn = $admin['killturn'];
-                $targetKillTurn -= 24 * 60 / $admin['turnterm'];
-                $nationGenIDList = $db->queryFirstColumn(
-                    'SELECT no FROM general WHERE nation = %i AND killturn >= %i AND npc < 2',
-                    $nation['nation'],
-                    $targetKillTurn
-                );
-                $nationGenList = General::createGeneralObjListFromDB($nationGenIDList, ['belong', 'npc', 'aux'], 2);
-                $chiefID = null;
-
-                $uniqueLotteryWeightList = [];
-
-                $relYear = $year - $startYear;
-                $maxTrialCountByYear = 1;
-                foreach (GameConst::$maxUniqueItemLimit as $tmpVals) {
-                    [$targetYear, $targetTrialCnt] = $tmpVals;
-                    if ($relYear < $targetYear) {
-                        break;
-                    }
-                    $maxTrialCountByYear = $targetTrialCnt;
-                }
-                foreach ($nationGenList as $nationGen) {
-                    if ($nationGen->getVar('officer_level') == 12) {
-                        $chiefID = $nationGen->getID();
-                    }
-                    $trialCnt = min($maxTrialCountByYear, count(GameConst::$allItems));
-
-                    foreach ($nationGen->getItems() as $item) {
-                        if (!$item->isBuyable()) {
-                            $trialCnt -= 1;
-                        }
-                    }
-
-                    if ($trialCnt <= 0) {
-                        continue;
-                    }
-
-                    $score = $nationGen->getVar('belong') + 10;
-
-                    if ($nationGen->getVar('officer_level') == 12) {
-                        $score += 60;
-                    } else if ($nationGen->getVar('officer_level') == 11) {
-                        $score += 30;
-                    } else if ($nationGen->getVar('officer_level') > 4) {
-                        $score += 15;
-                    }
-
-                    $score *= 2 ** $trialCnt;
-
-                    $uniqueLotteryWeightList[$nationGen->getID()] = [$nationGen, $score];
-                }
-
-                $nationLevelUpRNG = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
-                    UniqueConst::$hiddenSeed,
-                    'nationLevelUp',
-                    $year,
-                    $month,
-                    $nationID
-                )));
-
-                foreach (Util::range($levelDiff) as $idx) {
-                    if (!$uniqueLotteryWeightList) {
-                        break;
-                    }
-
-                    /** @var General */
-                    $winnerObj = $nationLevelUpRNG->choiceUsingWeightPair($uniqueLotteryWeightList);
-                    unset($uniqueLotteryWeightList[$winnerObj->getID()]);
-
-                    $givenUniqueRNG = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
-                        UniqueConst::$hiddenSeed,
-                        'givenUnique',
-                        $year,
-                        $month,
-                        $nationID,
-                        $winnerObj->getID(),
-                    )));
-                    giveRandomUniqueItem($givenUniqueRNG, $winnerObj, '작위보상');
-                    $winnerObj->applyDB($db);
-                }
-
-                if ($chiefID) {
-                    $chiefObj = General::createGeneralObjFromDB($chiefID, ['belong', 'npc', 'aux'], 2);
-                    $chiefObj->increaseInheritancePoint(InheritanceKey::unifier, 250 * $levelDiff);
-                    $chiefObj->applyDB($db);
-                }
-            }
-        }
-    }
-}
-
 function checkStatistic()
 {
     $db = DB::db();
@@ -763,7 +559,7 @@ function checkStatistic()
 
     $nationHist = '';
     foreach (GameConst::$availableNationType as $nationType) {
-        if (!Util::array_get($nationHists[$nationType])) {
+        if (!($nationHists[$nationType] ?? null)) {
             $nationHists[$nationType] = '-';
         }
         $nationHist .= getNationType($nationType) . "({$nationHists[$nationType]}), ";
@@ -902,7 +698,7 @@ function checkEmperior()
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    $admin = $gameStor->getValues(['year', 'month', 'isunited', 'conlimit']);
+    $admin = $gameStor->getValues(['year', 'month', 'isunited', 'refreshLimit']);
     if ($admin['isunited'] != 0) {
         return;
     }
@@ -947,7 +743,7 @@ function checkEmperior()
     }
 
     $inheritPointManager = InheritancePointManager::getInstance();
-    $allUserGenerals = General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2'));
+    $allUserGenerals = General::createObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2'));
     foreach ($allUserGenerals as $genObj) {
         if ($genObj->getNationID() == $nationID) {
             if ($genObj->getVar('officer_level') > 4) {
@@ -964,7 +760,7 @@ function checkEmperior()
     }
 
     $gameStor->isunited = 2;
-    $gameStor->conlimit = $gameStor->conlimit * 100;
+    $gameStor->refreshLimit = $gameStor->refreshLimit * 100;
 
     foreach ($db->queryFirstColumn('SELECT no FROM general WHERE npc<2 AND age>=%i', GameConst::$minPushHallAge) as $hallGeneralNo) {
         CheckHall($hallGeneralNo);
@@ -976,7 +772,7 @@ function checkEmperior()
 
     $chiefs = Util::convertArrayToDict(
         $db->query(
-            'SELECT no,name,picture,belong,officer_level FROM general WHERE nation=%i AND officer_level >= 5',
+            'SELECT no,npc,name,picture,belong,officer_level FROM general WHERE nation=%i AND officer_level >= 5',
             $nationID
         ),
         'officer_level'
@@ -1103,7 +899,7 @@ function checkEmperior()
         'tiger' => $tigerstr,
         'eagle' => $eaglestr,
         'gen' => $gen,
-        'history' => JSON::encode($nationHistory),
+        'history' => Json::encode($nationHistory),
         'aux' => $statGeneral['aux']
     ]);
 
@@ -1113,6 +909,34 @@ 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)
@@ -1127,8 +951,19 @@ function updateMaxDomesticCritical(General $general, $score)
     }
 }
 
-function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil
+function genGenericUniqueRNG(int $year, int $month, int $generalID, ?string $reason = null): RandUtil
 {
+    if($reason){
+        return new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+            UniqueConst::$hiddenSeed,
+            'unique',
+            $year,
+            $month,
+            $generalID,
+            $reason
+        )));
+    }
+
     return new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
         UniqueConst::$hiddenSeed,
         'unique',
@@ -1138,7 +973,7 @@ function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil
     )));
 }
 
-function genGenericUniqueRNGFromGeneral(General $general): RandUtil
+function genGenericUniqueRNGFromGeneral(General $general, string $reason): RandUtil
 {
     $logger = $general->getLogger();
     if (!$logger) {
@@ -1147,5 +982,5 @@ function genGenericUniqueRNGFromGeneral(General $general): RandUtil
     $year = $logger->getYear();
     $month = $logger->getMonth();
     $generalID = $general->getID();
-    return genGenericUniqueRNG($year, $month, $generalID);
+    return genGenericUniqueRNG($year, $month, $generalID, $reason);
 }

hwe/func_legacy.php

@@ -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] = Util::array_get($distanceList[$dist], []);
+        $result[$dist] = $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;
-        }, Util::array_get($distanceList[$dist], []));
+        }, $distanceList[$dist] ?? []);
 
         $cityStr = join(', ', $cityList);
 

hwe/func_template.php

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

hwe/func_time_event.php

@@ -364,7 +364,14 @@ function disaster(RandUtil $rng) {
     $logger->flush();
 
     if (!$isGood) {
-        $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');
+        [$queryColumns,,] = General::mergeQueryColumn();
+        $generalListByCity = Util::arrayGroupBy(
+            $db->query(
+                'SELECT %l FROM general WHERE city IN %li',
+                Util::formatListOfBackticks($queryColumns),
+                Util::squeezeFromArray($targetCityList, 'city')
+            ),
+            'city');
         //NOTE: 쿼리 1번이지만 복잡하기 vs 쿼리 여러번이지만 조금 더 깔끔하기
         foreach ($targetCityList as $city) {
             $affectRatio = Util::valueFit($city['secu'] / $city['secu_max'] / 0.8, 0, 1);
@@ -383,7 +390,7 @@ function disaster(RandUtil $rng) {
 
             $generalList = array_map(
                 function($rawGeneral) use ($city, $year, $month){
-                    return new General($rawGeneral, null, $city, null, $year, $month, false);
+                    return new General($rawGeneral, null, null, $city, null, $year, $month, false);
                 },
                 $generalListByCity[$city['city']]??[]
             );

hwe/func_tournament.php

@@ -882,7 +882,7 @@ function setGift($tnmt_type, $tnmt, $phase)
         //포상 장수 이름, 금액
         $resultHelper[$generalID]['reward'] += $cost;
         $resultHelper[$generalID]['msg'] = "<span class='ev_highlight'>4강 진출</span>";
-        General::createGeneralObjFromDB($generalID)->increaseInheritancePoint(InheritanceKey::tournament, 10);
+        General::createObjFromDB($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::createGeneralObjListFromDB(array_keys($resultHelper));
+    $generalObjList = General::createObjListFromDB(array_keys($resultHelper));
 
     foreach ($resultHelper as $generalID => $general) {
         $rewardText = number_format($general['reward']);
@@ -1153,21 +1153,25 @@ 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) {
-            $damage2 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $factor2 = 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) {
-            $damage1 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $factor1 = 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) {
 

hwe/install.php

@@ -39,8 +39,8 @@ if ($session->userGrade < 5 && !$allowReset) {
 
 <body>
     <div class="container">
-        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 리셋</h1>
-        <div class="row justify-content-md-center">
+        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 리셋</h1>
+        <div class="row justify-content-lg-center">
 
             <div class="col col-lg-8">
                 <div class="card" id="game_form_card">

hwe/install_db.php

@@ -7,10 +7,10 @@ include "func.php";
 
 $session = Session::requireLogin();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die('관리자 아님');
 }
-if ($session->userGrade == 5) {
+if ($session->userGrade == 6) {
     die('DB 리셋 권한을 가지고 있지 않습니다.');
 }
 
@@ -32,8 +32,8 @@ if ($session->userGrade == 5) {
 
 <body>
     <div class="container" style="min-width:720px;">
-        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 리셋</h1>
-        <div class="row justify-content-md-center">
+        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 리셋</h1>
+        <div class="row justify-content-lg-center">
 
             <div class="col col-lg-8">
                 <div class="card" id="db_form_card">

hwe/j_board_article_add.php

@@ -17,10 +17,13 @@ $text = Util::getPost('text');
 
 increaseRefresh("회의실", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, name, officer_level, permission, con, turntime, belong, penalty, `picture`,`imgsvr` FROM general WHERE owner=%i', $userID);
+$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
+);
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'
@@ -50,7 +53,7 @@ if($permission < 0){
         'result'=>false,
         'reason'=>'국가에 소속되어있지 않습니다.'
     ]);
-    
+
 }
 else if ($isSecretBoard && $permission < 2) {
     Json::die([

hwe/j_board_comment_add.php

@@ -16,10 +16,13 @@ $text = Util::getPost('text');
 
 increaseRefresh("회의실", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, name, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$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
+);
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'
@@ -58,7 +61,7 @@ if($permission < 0){
         'result'=>false,
         'reason'=>'국가에 소속되어있지 않습니다.'
     ]);
-    
+
 }
 else if ($isSecretBoard && $permission < 2) {
     Json::die([

hwe/j_board_get_articles.php

@@ -16,11 +16,14 @@ $isSecretBoard = Util::getPost('isSecret', 'bool', false);
 
 increaseRefresh("회의실", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$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
+);
 
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'
@@ -33,7 +36,7 @@ if($permission < 0){
         'result'=>false,
         'reason'=>'국가에 소속되어있지 않습니다.'
     ]);
-    
+
 }
 else if ($isSecretBoard && $permission < 2) {
     Json::die([
@@ -72,4 +75,3 @@ Json::die([
     'articles'=>$articles,
     'reason'=>'success'
 ]);
-

hwe/j_diplomacy_destroy_letter.php

@@ -17,10 +17,13 @@ $letterNo = Util::getPost('letterNo', 'int');
 
 increaseRefresh("외교부", 1);
 
-$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+$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
+);
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'

hwe/j_diplomacy_get_letter.php

@@ -16,11 +16,14 @@ $isSecretBoard = Util::getPost('isSecret', 'bool', false);
 
 increaseRefresh("외교부", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$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
+);
 
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'
@@ -33,7 +36,7 @@ if($permission < 0){
         'result'=>false,
         'reason'=>'국가에 소속되어있지 않습니다.'
     ]);
-    
+
 }
 
 $letters = [];
@@ -83,4 +86,3 @@ Json::die([
     'myNationID'=>$me['nation'],
     'reason'=>'success'
 ]);
-

hwe/j_diplomacy_respond_letter.php

@@ -22,10 +22,13 @@ $reason = Util::getPost('reason', 'string', '');
 
 increaseRefresh("외교부", 1);
 
-$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+$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
+);
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'

hwe/j_diplomacy_rollback_letter.php

@@ -17,10 +17,13 @@ $letterNo = Util::getPost('letterNo', 'int');
 
 increaseRefresh("외교부", 1);
 
-$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+$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
+);
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'

hwe/j_diplomacy_send_letter.php

@@ -24,10 +24,13 @@ if($prevNo < 1){
     $prevNo = null;
 }
 
-$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+$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
+);
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'

hwe/j_general_log_old.php

@@ -33,12 +33,15 @@ if($generalID <= 0 || $reqTo <= 0){
 
 $db = DB::db();
 
-$me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);
+$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
+);
 $nationID = $me['nation'];
 
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     Json::die([
         'result'=>false,
         'reason'=>'접속 제한입니다.'
@@ -61,7 +64,7 @@ if($generalID !== $targetID){
             'reason'=>'권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.'
         ]);
     }
-    
+
     if($testGeneralNationID !== $nationID){
         Json::die([
             'result'=>false,

hwe/j_get_city_list.php

@@ -18,7 +18,7 @@ else{
     $availableNextCall = $session->availableNextCallGetCityList??'2000-01-01 00:00:00';
     $now = new \DateTimeImmutable();
 
-    if($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 5){
+    if($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 6){
         Json::die([
             'result'=>false,
             'reason'=>"도시 목록은 10초에 한번 갱신 가능합니다.\n다음 시간 : ".$availableNextCall

hwe/j_install.php

@@ -199,17 +199,25 @@ if($reserve_open){
     ]);
 }
 
-Json::die(ResetHelper::buildScenario(
-    $turnterm,
-    $sync,
-    $scenario,
-    $fiction,
-    $extend,
-    $block_general_create,
-    $npcmode,
-    $show_img_level,
-    !!$tournament_trig,
-    $join_mode,
-    TimeUtil::now(),
-    $autorun_user
-));
+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()
+    ]);
+}

hwe/j_install_db.php

@@ -53,22 +53,17 @@ if($fullReset){
     }
 }
 
-function dbConnFail($params){
+$db = new \MeekroDB($host,$username,$password,$dbName,$port,'utf8mb4');
+$db->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
+
+$db->addHook('run_failed', function(){
     Json::die([
         'result'=>false,
         'reason'=>'DB 접속에 실패했습니다.'
     ]);
-}
+});
 
-
-$db = new \MeekroDB($host,$username,$password,$dbName,$port,'utf8mb4');
-$db->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
-
-$db->throw_exception_on_nonsql_error = false;
-$db->nonsql_error_handler = 'dbConnFail';
-
-
-$mysqli_obj = $db->get(); //로그인에 실패할 경우 자동으로 dbConnFail()이 실행됨.
+$mysqli_obj = $db->get();
 
 $prefix = basename(__DIR__);
 
@@ -84,8 +79,6 @@ $result = Util::generateFileUsingSimpleTemplate(
     ], true
 );
 
-
-
 if($result !== true){
     Json::die([
         'result'=>false,
@@ -93,7 +86,29 @@ if($result !== true){
     ]);
 }
 
-ResetHelper::clearDB();
+//최소한의 테이블 처리를 위해 수동으로 초기화하도록 하자
+if($mysqli_obj->multi_query(file_get_contents(__DIR__.'/sql/reset.sql'))){
+    while(true){
+        if (!$mysqli_obj->more_results()) {
+            break;
+        }
+        if(!$mysqli_obj->next_result()){
+            break;
+        }
+    }
+
+}
+
+if($mysqli_obj->multi_query(file_get_contents(__DIR__.'/sql/schema.sql'))){
+    while(true){
+        if (!$mysqli_obj->more_results()) {
+            break;
+        }
+        if(!$mysqli_obj->next_result()){
+            break;
+        }
+    }
+}
 
 ServConfig::getServerList()[$prefix]->closeServer();
 

hwe/j_map_recent.php

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

hwe/j_myBossInfo.php

@@ -1,7 +1,12 @@
 <?php
+
 namespace sammo;
 
+use sammo\Enums\GeneralColumn;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\MessageType;
+use sammo\Enums\PenaltyKey;
 
 include "lib.php";
 include "func.php";
@@ -19,97 +24,99 @@ $userID = Session::getUserID();
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$gameStor->cacheValues(['startyear','year','month','scenario']);
+$gameStor->cacheValues(['startyear', 'year', 'month', 'scenario', 'killturn']);
 
-$me = $db->queryFirstRow('SELECT no,nation,officer_level from general where owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no,npc,nation,officer_level,penalty from general where owner=%i', $userID);
 $myOfficerLevel = $me['officer_level'];
 $nationID = $me['nation'];
+$myPenalty = Json::decode($me['penalty'] ?? '{}');
 
 //수뇌가 아니면 아무것도 할 수 없음
-if($myOfficerLevel < 5){
+if ($myOfficerLevel < 5) {
     Json::die([
-        'result'=>false,
-        'reason'=>'수뇌가 아닙니다.'
+        'result' => false,
+        'reason' => '수뇌가 아닙니다.'
     ]);
 }
 
-if($action === '추방' && $destGeneralID==0){
+if ($action === '추방' && $destGeneralID == 0) {
     Json::die([
-        'result'=>false,
-        'reason'=>'장수가 지정되지 않았습니다.'
+        'result' => false,
+        'reason' => '장수가 지정되지 않았습니다.'
     ]);
 }
 
-if($destGeneralID==0){
+if ($destGeneralID == 0) {
     $general = new DummyGeneral(true);
     $general->setVar('nation', $nationID);
-}
-else{
-    $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);
+} else {
+    $general = General::createObjFromDB($destGeneralID);
 
-    if($general instanceof DummyGeneral){
+    if ($general instanceof DummyGeneral) {
         Json::die([
-            'result'=>false,
-            'reason'=>'올바르지 않은 장수입니다.'
+            'result' => false,
+            'reason' => '올바르지 않은 장수입니다.'
         ]);
     }
 
-    if($nationID != $general->getNationID()){
+    if ($nationID != $general->getNationID()) {
         Json::die([
-            'result'=>false,
-            'reason'=>'아국 장수가 아닙니다'
+            'result' => false,
+            'reason' => '아국 장수가 아닙니다'
         ]);
     }
 }
 
-if($officerLevel == 12){
+if ($officerLevel == 12) {
     Json::die([
-        'result'=>false,
-        'reason'=>'군주를 대상으로 할 수 없습니다.'
+        'result' => false,
+        'reason' => '군주를 대상으로 할 수 없습니다.'
     ]);
 }
 
-function do수뇌임명(General $general, int $targetOfficerLevel):?string{
+function do수뇌임명(General $general, int $targetOfficerLevel): ?string
+{
+    global $myPenalty;
+
+    if ($myPenalty[PenaltyKey::NoChiefChange->value] ?? false) {
+        return '수뇌를 임명할 수 없는 상태입니다.';
+    }
+
     $generalID = $general->getID();
     $nationID = $general->getNationID();
 
+    if($general->hasPenalty(PenaltyKey::NoChief)){
+        return '수뇌가 될 수 없는 상태입니다.';
+    }
+
     $db = DB::db();
 
-    [$chiefSet, $nationLevel] = $db->queryFirstList('SELECT chief_set,level FROM nation WHERE nation = %i',$nationID);
+    [$chiefSet, $nationLevel] = $db->queryFirstList('SELECT chief_set,level FROM nation WHERE nation = %i', $nationID);
 
-	// 임명가능 레벨
+    // 임명가능 레벨
     $lv = getNationChiefLevel($nationLevel);
 
-    if($targetOfficerLevel < $lv){
+    if ($targetOfficerLevel < $lv) {
         return '임명불가능한 관직입니다.';
     }
 
-    if(isOfficerSet($chiefSet, $targetOfficerLevel)){
+    if (isOfficerSet($chiefSet, $targetOfficerLevel)) {
         return '지금은 임명할 수 없습니다.';
     }
 
     //기존 장수 일반으로
     $db->update('general', [
-        'officer_level'=>1,
-        'officer_city'=>0,
+        'officer_level' => 1,
+        'officer_city' => 0,
     ], 'nation=%i AND officer_level=%i AND no!=%i', $nationID, $targetOfficerLevel, $generalID);
 
-    if($targetOfficerLevel === 11){
-
-    }
-    else if($targetOfficerLevel % 2 == 0){
-        if($general->getVar('strength') < GameConst::$chiefStatMin){
+    if ($targetOfficerLevel === 11) {
+    } else if ($targetOfficerLevel % 2 == 0) {
+        if ($general->getVar('strength') < GameConst::$chiefStatMin) {
             return '무력이 부족합니다.';
         }
-
-    }
-    else{
-        if($general->getVar('intel') < GameConst::$chiefStatMin){
+    } else {
+        if ($general->getVar('intel') < GameConst::$chiefStatMin) {
             return '지력이 부족합니다.';
         }
     }
@@ -118,52 +125,59 @@ function do수뇌임명(General $general, int $targetOfficerLevel):?string{
     $general->setVar('officer_level', $targetOfficerLevel);
     $general->setVar('officer_city', 0);
     $db->update('nation', [
-        'chief_set'=> $db->sqleval('chief_set | %i', doOfficerSet(0, $targetOfficerLevel)),
+        'chief_set' => $db->sqleval('chief_set | %i', doOfficerSet(0, $targetOfficerLevel)),
     ], 'nation=%i', $nationID);
     $general->applyDB($db);
 
     return null;
 }
 
-function do도시임명(General $general, int $cityID, int $targetOfficerLevel):?string{
+function do도시임명(General $general, int $cityID, int $targetOfficerLevel): ?string
+{
+    global $myPenalty;
+
     $nationID = $general->getNationID();
 
     $db = DB::db();
 
-    if(CityConst::byID($cityID) === null){
+    if (CityConst::byID($cityID) === null) {
         return '올바르지 않은 도시입니다';
     }
 
+    if ($general->getVar(GeneralColumn::officer_level) >= 4 && ($myPenalty[PenaltyKey::NoChiefChange->value] ?? false)) {
+        return '수뇌인 장수를 변경할 수 없는 상태입니다.';
+    }
+
     $officerSet = $db->queryFirstField('SELECT officer_set FROM city WHERE nation=%i AND city=%i', $nationID, $cityID);
-    if($officerSet === null){
+    if ($officerSet === null) {
         return '아국 도시가 아닙니다';
     }
 
-    if(isOfficerSet($officerSet, $targetOfficerLevel)){
+    if (isOfficerSet($officerSet, $targetOfficerLevel)) {
         return '이미 다른 장수가 임명되어있습니다';
     }
 
     //기존 장수 일반으로
     $db->update('general', [
-        'officer_level'=>1,
-        'officer_city'=>0,
+        'officer_level' => 1,
+        'officer_city' => 0,
     ], 'officer_level=%i AND officer_city=%i AND no!=%i', $targetOfficerLevel, $cityID, $general->getID());
 
-    if($general instanceof DummyGeneral){
+    if ($general instanceof DummyGeneral) {
         return null;
     }
 
-    if($targetOfficerLevel === 4 && $general->getVar('strength') < GameConst::$chiefStatMin){
+    if ($targetOfficerLevel === 4 && $general->getVar('strength') < GameConst::$chiefStatMin) {
         return '무력이 부족합니다.';
     }
 
-    if($targetOfficerLevel === 3 && $general->getVar('intel') < GameConst::$chiefStatMin){
+    if ($targetOfficerLevel === 3 && $general->getVar('intel') < GameConst::$chiefStatMin) {
         return '지력이 부족합니다.';
     }
 
     //신임 장수
     $db->update('city', [
-        'officer_set'=>$db->sqleval('officer_set | %i', doOfficerSet(0, $targetOfficerLevel)),
+        'officer_set' => $db->sqleval('officer_set | %i', doOfficerSet(0, $targetOfficerLevel)),
     ], 'city=%i AND nation=%i', $cityID, $nationID);
     $general->setVar('officer_level', $targetOfficerLevel);
     $general->setVar('officer_city', $cityID);
@@ -172,22 +186,25 @@ function do도시임명(General $general, int $cityID, int $targetOfficerLevel):
     return null;
 }
 
-function do추방(General $general, int $myOfficerLevel):?string{
+function do추방(General $general, int $myOfficerLevel): ?string
+{
     $generalID = $general->getID();
     $generalName = $general->getVar('name');
     $nationID = $general->getNationID();
 
-
+    if ($myPenalty[PenaltyKey::NoBanGeneral->value] ?? false) {
+        return '추방할 수 없는 상태입니다.';
+    }
 
     //추방할사람이 외교권자이면 불가
     $permission = checkSecretPermission($general->getRaw());
-    if($permission == 4){
+    if ($permission == 4) {
         return '외교권자는 추방할 수 없습니다.';
     }
 
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $env = $gameStor->getValues(['startyear','year','month','scenario']);
+    $env = $gameStor->getValues(['startyear', 'year', 'month', 'scenario']);
 
     $nation = $db->queryFirstRow('SELECT name,chief_set,color FROM nation WHERE nation=%i', $nationID);
     $nationName = $nation['name'];
@@ -195,17 +212,17 @@ function do추방(General $general, int $myOfficerLevel):?string{
     $logger = $general->getLogger();
 
     //이미 지정했다면 무시
-    if(isOfficerSet($nation['chief_set'], $myOfficerLevel) || ($myOfficerLevel == 0 && $myOfficerLevel == 12)) {
+    if (isOfficerSet($nation['chief_set'], $myOfficerLevel) || ($myOfficerLevel == 0 && $myOfficerLevel == 12)) {
         return '이미 추방 권한을 사용했습니다.';
     }
     $gold = 0;
     $rice = 0;
     // 금쌀1000이상은 남김
-    if($general->getVar('gold') > GameConst::$defaultGold) {
+    if ($general->getVar('gold') > GameConst::$defaultGold) {
         $gold = $general->getVar('gold') - GameConst::$defaultGold;
         $general->setVar('gold', GameConst::$defaultGold);
     }
-    if($general->getVar('rice') > GameConst::$defaultRice) {
+    if ($general->getVar('rice') > GameConst::$defaultRice) {
         $rice = $general->getVar('rice') - GameConst::$defaultRice;
         $general->setVar('rice', GameConst::$defaultRice);
     }
@@ -223,27 +240,26 @@ function do추방(General $general, int $myOfficerLevel):?string{
     $logger->pushGeneralActionLog("<D><b>{$nationName}</b></>에서 <R>추방</>당했습니다.", ActionLogger::PLAIN);
 
     // 명성/공헌 N*10%감소
-    if($env['year'] <= $env['startyear'] && $general->getNPCType() < 2){
+    if ($env['year'] <= $env['startyear'] && $general->getNPCType() < 2) {
         $general->setVar('makelimit', $oldMakeLimit);
-    }
-    else{
+    } else {
         $betrayCnt = $general->getVar('betray');
-        $general->addExperience(-$general->getVar('experience')*0.15*$betrayCnt);
-        $general->addDedication(-$general->getVar('dedication')*0.15*$betrayCnt);
+        $general->addExperience(-$general->getVar('experience') * 0.15 * $betrayCnt);
+        $general->addDedication(-$general->getVar('dedication') * 0.15 * $betrayCnt);
         $general->increaseVarWithLimit('betray', 1, null, GameConst::$maxBetrayCnt);
     }
 
     //부대장일 경우
-    if($general->getVar('troop') == $generalID){
+    if ($general->getVar('troop') == $generalID) {
         // 모두 탈퇴
         $db->update('general', [
-            'troop'=>0,
+            'troop' => 0,
         ], 'troop = %i', $generalID);
         $db->delete('troop', 'troop_leader=%i', $generalID);
     }
     $general->setVar('troop', 0);
 
-    if($general->getNPCType() >= 2){
+    if ($general->getNPCType() >= 2) {
         $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
             UniqueConst::$hiddenSeed,
             'BanNPC',
@@ -282,24 +298,24 @@ function do추방(General $general, int $myOfficerLevel):?string{
         }
     }
 
-    if($env['year'] < $env['startyear']+3) {
+    if ($env['year'] < $env['startyear'] + 3) {
         //초반엔 군주 부상 증가(엔장 임관지양)
         $db->update('general', [
-            'injury'=>$db->sqleval('least(injury + 1, %i)', 80),
+            'injury' => $db->sqleval('least(injury + 1, %i)', 80),
         ], 'nation=%i AND officer_level=12', $nationID);
 
         $db->update('nation', [
-            'gennum'=>$db->sqleval('gennum - %i', $general->getNPCType()!=5?1:0),
-            'gold'=>$db->sqleval('gold + %i', $gold),
-            'rice'=>$db->sqleval('rice + %i', $rice),
+            'gennum' => $db->sqleval('gennum - %i', $general->getNPCType() != 5 ? 1 : 0),
+            'gold' => $db->sqleval('gold + %i', $gold),
+            'rice' => $db->sqleval('rice + %i', $rice),
         ], 'nation = %i', $nationID);
     } else {
         //이번분기는 추방불가(초반 제외)
         $db->update('nation', [
-            'chief_set'=>$db->sqleval('chief_set | %i', doOfficerSet(0, $myOfficerLevel)),
-            'gennum'=>$db->sqleval('gennum - %i', $general->getNPCType()!=5?1:0),
-            'gold'=>$db->sqleval('gold + %i', $gold),
-            'rice'=>$db->sqleval('rice + %i', $rice),
+            'chief_set' => $db->sqleval('chief_set | %i', doOfficerSet(0, $myOfficerLevel)),
+            'gennum' => $db->sqleval('gennum - %i', $general->getNPCType() != 5 ? 1 : 0),
+            'gold' => $db->sqleval('gold + %i', $gold),
+            'rice' => $db->sqleval('rice + %i', $rice),
         ], 'nation = %i', $nationID);
     }
 
@@ -311,62 +327,74 @@ 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' => '올바르지 않은 명령입니다.'
+]);

hwe/j_raise_event.php

@@ -8,7 +8,7 @@ include('func.php');
 
 $session = Session::requireLogin([])->setReadOnly();
 
-if(Session::getInstance()->userGrade < 5){
+if(Session::getInstance()->userGrade < 6){
     Json::die([
         'reason'=>'권한이 부족합니다.'
     ]);