compare: trace nation betting user lifecycle

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

.babelrc

@@ -1,15 +0,0 @@
-{
-    "presets": [
-        [
-            "@babel/preset-env",
-            {
-                "useBuiltIns": "usage",
-                "corejs": 3,
-                "modules": false
-            }
-        ]
-    ],
-    "plugins": [
-        "lodash"
-    ]
-}

.gitignore

@@ -10,8 +10,10 @@
 *.log
 
 logs/*.txt
+api_log.db
 d_log/*.txt
 d_log/*.zip
+d_log/*.db
 sess_*
 */logs/*.txt
 */logs/*/*.txt
@@ -27,8 +29,10 @@ d_pic/*.jpg
 d_pic/*.gif
 d_pic/*.png
 d_pic/*.webp
+d_pic/*.avif
 d_pic/uploaded_image
 
+/dist_js
 */dist_misc/*
 */dist_js/*
 */dist_css/*
@@ -64,3 +68,7 @@ ingame/js/*
 ingame/css/*
 gateway/js/*
 gateway/css/*
+
+*.db-journal
+
+d_log/cachegrind.*

.phan/config.php

@@ -15,8 +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.0',
-    'backward_compatibility_checks ' => true,
+    "target_php_version" => '8.2',
+    "minimum_target_php_version" => '8.2',
     'minimum_severity' => \Phan\Issue::SEVERITY_NORMAL,
 
     'file_list' => [
@@ -28,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',
@@ -39,21 +37,15 @@ return [
         'hwe/a_emperior.php',
         'hwe/a_genList.php',
         'hwe/a_hallOfFame.php',
-        'hwe/a_history.php',
         'hwe/a_kingdomList.php',
         'hwe/a_npcList.php',
         'hwe/api.php',
-        'hwe/a_status.php',
         'hwe/a_traffic.php',
-        'hwe/a_vote.php',
         'hwe/battle_simulator.php',
-        'hwe/b_auction.php',
-        'hwe/b_battleCenter.php',
         'hwe/b_betting.php',
         'hwe/v_chiefCenter.php',
         'hwe/b_currentCity.php',
         'hwe/v_nationStratFinan.php',
-        'hwe/b_diplomacy.php',
         'hwe/b_genList.php',
         'hwe/b_myBossInfo.php',
         'hwe/b_myCityInfo.php',
@@ -62,10 +54,7 @@ return [
         'hwe/b_myPage.php',
         'hwe/v_processing.php',
         'hwe/b_tournament.php',
-        'hwe/b_troop.php',
-        'hwe/c_auction.php',
         'hwe/c_tournament.php',
-        'hwe/c_vote.php',
         'hwe/func_auction.php',
         'hwe/func_command.php',
         'hwe/func_converter.php',
@@ -86,11 +75,9 @@ return [
         'hwe/j_adjust_icon.php',
         'hwe/j_autoreset.php',
         'hwe/j_basic_info.php',
-        'hwe/j_betting.php',
         'hwe/j_board_article_add.php',
         'hwe/j_board_comment_add.php',
         'hwe/j_board_get_articles.php',
-        'hwe/j_die_immediately.php',
         'hwe/j_diplomacy_destroy_letter.php',
         'hwe/j_diplomacy_get_letter.php',
         'hwe/j_diplomacy_respond_letter.php',
@@ -101,22 +88,13 @@ return [
         'hwe/j_general_set_permission.php',
         'hwe/j_get_basic_general_list.php',
         'hwe/j_get_city_list.php',
-        'hwe/j_get_reserved_command.php',
         'hwe/j_get_select_npc_token.php',
         'hwe/j_get_select_pool.php',
-        'hwe/j_image_upload.php',
         'hwe/j_install_db.php',
         'hwe/j_install.php',
         'hwe/j_load_scenarios.php',
-        'hwe/j_map_history.php',
         'hwe/j_map.php',
         'hwe/j_map_recent.php',
-        'hwe/j_msg_contact_list.php',
-        'hwe/j_msg_decide_opt.php',
-        'hwe/j_msg_delete.php',
-        'hwe/j_msg_get_old.php',
-        'hwe/j_msg_get_recent.php',
-        'hwe/j_msg_submit.php',
         'hwe/j_myBossInfo.php',
         'hwe/j_raise_event.php',
         'hwe/j_select_npc.php',
@@ -125,13 +103,11 @@ return [
         'hwe/j_set_my_setting.php',
         'hwe/j_set_npc_control.php',
         'hwe/j_simulate_battle.php',
-        'hwe/j_troop.php',
         'hwe/j_update_picked_general.php',
         'hwe/j_vacation.php',
         'hwe/lib.php',
         'hwe/process_war.php',
         'hwe/proc.php',
-        'hwe/readme.php',
         'hwe/recent_map.php',
         'hwe/select_general_from_pool.php',
         'hwe/select_npc.php',

.vscode/settings.json

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

403.html

@@ -2,6 +2,7 @@
 <html>
     <head>
         <meta charset="utf-8">
+        <meta name="color-scheme" content="dark">
         <title>닫혀 있습니다.</title>
         <script>
             setTimeout(function(){

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,29 +8,25 @@
     ],
     "config": {
         "platform": {
-            "php": "8.0"
+            "php": "8.3"
         }
     },
     "require": {
-        "brandonwamboldt/utilphp": "^1.1",
-        "sergeytsalkov/meekrodb": "^2.3",
-        "league/plates": "^3.3",
-        "guzzlehttp/guzzle": "^6.3",
-        "monolog/monolog": "^1.23",
-        "firephp/firephp-core": "^0.4.0",
+        "sergeytsalkov/meekrodb": "^2.5",
+        "league/plates": "^3.5",
         "vlucas/valitron": "^1.4",
-        "php-extended/php-tail": "^2.1",
-        "pguardiario/phpuri": "^1.0",
-        "symfony/lock": "^4.1",
+        "php-extended/php-tail": "^5.0",
+        "symfony/lock": "^6.2",
         "ezyang/htmlpurifier": "^4.10",
         "xemlock/htmlpurifier-html5": "^0.1.7",
-        "catfan/medoo": "^1.5",
-        "phan/phan": "*",
-        "erusev/parsedown-extra": "^0.8.1",
-        "nette/caching": "^3.0",
-        "illuminate/database": "^8.61",
-        "illuminate/events": "^8.61",
-        "spatie/data-transfer-object": "^3.7"
+        "catfan/medoo": "^2.1",
+        "phan/phan": "^5.4",
+        "nette/caching": "^3.3",
+        "illuminate/database": "^10.0",
+        "illuminate/events": "^10.0",
+        "php-ds/php-ds": "^1.5",
+        "hided62/ldto": "^1.0",
+        "league/uri": "^6.8"
     },
     "autoload": {
         "psr-4": {
@@ -51,6 +47,6 @@
         ]
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.0"
     }
 }

css/config.css

@@ -81,23 +81,34 @@ a.just_link {
 
 button.with_skin {
     padding: 0 4px;
-    background-color: black;
+    background-color: #191919;
     color: white;
     font-size: 14px;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
 }
 
 button.with_skin:disabled {
-    background-color: #333333;
+    background-color: #333;
 }
 
 input.with_skin {
-    background-color: black;
+    background-color: #191919;
     color: white;
     font-size: 14px;
 }
 
+input.with_skin[type=button], input.with_skin[type=submit]{
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
+}
+
 input.with_skin:disabled {
-    background-color: #333333;
+    background-color: #333;
 }
 
 .font0 {

css/entrance.css

@@ -36,16 +36,21 @@ body {
     height: 130px;
 }
 
-#user_info button {
+#user_info .btn {
     width: 200px;
-    height: 50px;
     margin: 10px 50px;
+    padding: 10px;
 }
 
 .center_ordered_items {
     text-align: center;
 }
 
+.server-action{
+    padding-top: 16px;
+    padding-bottom: 16px;
+}
+
 .Entrance_ServerList {
     width: 800px;
     height: 64px;

f_config/config.php

@@ -49,7 +49,7 @@ function getFriendlyErrorType($type)
     return "{$type}";
 }
 
-function getExceptionTraceAsString($exception)
+function getExceptionTraceAsString(\Throwable $exception)
 {
     //https://gist.github.com/abtris/1437966
     $rtn = "";
@@ -96,8 +96,13 @@ function logError(string $err, string $errstr, string $errpath, array $trace)
     $fdb = FileDB::db(ROOT . '/d_log/err_log.sqlite3', ROOT . '/f_install/sql/err_log.sql');
     $date = date("Ymd_His");
 
+    $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);
 
@@ -117,7 +122,7 @@ function logError(string $err, string $errstr, string $errpath, array $trace)
     ]);
 }
 
-function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, int $errline, array $errcontext=null)
+function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, int $errline)
 {
     if (!(error_reporting() & $errno)) {
         // This error code is not included in error_reporting, so let it fall
@@ -133,11 +138,12 @@ function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, in
         $errfile . ':' . $errline,
         getExceptionTraceAsString($e)
     );
+    return true;
 }
 set_error_handler("\\sammo\\logErrorByCustomHandler");
 
 
-function logExceptionByCustomHandler(\Throwable $e)
+function logExceptionByCustomHandler(\Throwable $e, bool $withDie = true)
 {
 
     logError(
@@ -147,32 +153,48 @@ function logExceptionByCustomHandler(\Throwable $e)
         getExceptionTraceAsString($e)
     );
 
-    echo $e->getTraceAsString();
-    throw $e;
+    if($withDie){
+        echo $e->getTraceAsString();
+
+        throw $e;
+    }
 }
 set_exception_handler('\\sammo\\logExceptionByCustomHandler');
 
-function getAPIExecutorClass($path){
+function checkForFatal()
+{
+    $error = error_get_last();
+    if($error === null){
+        return;
+    }
+    if (($error["type"]??0) == E_ERROR) {
+        logErrorByCustomHandler($error["type"], $error["message"], $error["file"], $error["line"]);
+    }
+}
 
-    static $basePath = __NAMESPACE__.'\\API\\';
-    if(is_string($path)){
-    }
-    else if(is_array($path)){
+register_shutdown_function("\\sammo\\checkForFatal");
+
+function getAPIExecutorClass($path)
+{
+
+    static $basePath = __NAMESPACE__ . '\\API\\';
+    if (is_string($path)) {
+    } else if (is_array($path)) {
         $path = join('\\', $path);
-    }
-    else{
+    } else {
         throw new \InvalidArgumentException("{$path}는 올바른 API 지시자가 아님");
     }
 
-    $classPath = str_replace('/', '\\', $basePath.$path);
+    $classPath = str_replace('/', '\\', $basePath . $path);
 
-    if(class_exists($classPath)){
+    if (class_exists($classPath)) {
         return $classPath;
     }
     throw new \InvalidArgumentException("{$path}는 올바른 API 경로가 아님");
 }
 
-function buildAPIExecutorClass($type, string $rootPath, array $args):\sammo\BaseAPI{
+function buildAPIExecutorClass($type, string $rootPath, array $args): \sammo\BaseAPI
+{
     $class = getAPIExecutorClass($type);
     return new $class($rootPath, $args);
-}
+}

f_install/install.php

@@ -10,6 +10,7 @@ require(__DIR__ . '/../vendor/autoload.php');
 
 <head>
     <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>설치</title>
@@ -29,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

@@ -90,19 +90,19 @@ if (
 
     //기본 파일 생성
     if (!file_exists(AppConf::getUserIconPathFS())) {
-        mkdir(AppConf::getUserIconPathFS());
+        mkdir(AppConf::getUserIconPathFS(), 0775);
     }
 
     if (!file_exists(ROOT . '/d_log')) {
-        mkdir(ROOT . '/d_log');
+        mkdir(ROOT . '/d_log', 0775);
     }
 
     if (!file_exists(ROOT . '/d_setting')) {
-        mkdir(ROOT . '/d_setting');
+        mkdir(ROOT . '/d_setting', 0775);
     }
 
     if (!file_exists(ROOT . '/d_shared')) {
-        mkdir(ROOT . '/d_shared');
+        mkdir(ROOT . '/d_shared', 0775);
     }
 }
 
@@ -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/api_log.sql

@@ -0,0 +1,17 @@
+CREATE TABLE IF NOT EXISTS "api_log" (
+	"id"	INTEGER NOT NULL,
+	"user_id"	INTEGER NOT NULL,
+	"ip"	TEXT NOT NULL,
+	"date"	TEXT NOT NULL,
+	"path"	TEXT NOT NULL,
+	"arg"	TEXT,
+	"aux"	TEXT,
+	PRIMARY KEY("id" AUTOINCREMENT)
+);
+CREATE INDEX IF NOT EXISTS "by_date" ON "api_log" (
+	"date"	DESC
+);
+CREATE INDEX IF NOT EXISTS "by_user" ON "api_log" (
+	"user_id"	ASC,
+	"date"	DESC
+);

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;

f_install/templates/RootDB.orig.php

@@ -61,11 +61,6 @@ class RootDB
         if (self::$uDB === null) {
             self::$uDB = new \MeekroDB(self::$host, self::$user, self::$password, self::$dbName, self::$port, self::$encoding);
             self::$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
-
-            self::$uDB->error_handler = function () {
-            };
-            self::$uDB->throw_exception_on_error = true;
-            self::$uDB->throw_exception_on_nonsql_error = true;
         }
         return self::$uDB;
     }

f_install/templates/common.orig.css

@@ -165,3 +165,61 @@
     background: url('_tK_gameImagePath_/map/pokemon_v1/back_pal8.png') no-repeat;
     background-size: 700px 500px;
 }
+
+/*CR 지도*/
+.map_theme_cr .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/cr/bg-fs8.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_cr.map_detail .city_base .city_bg {
+    background-image: none !important;
+    width: 39.5px !important;
+    height: 39.5px !important;
+    left: 1px !important;
+    top: -4px !important;
+    opacity: 0.5;
+}
+
+.map_theme_cr.map_detail.small_width_map .city_base .city_bg {
+    background-image: none !important;
+    width: 28.5px !important;
+    height: 28.5px !important;
+    left: 6px !important;
+    top: 4px !important;
+    opacity: 0.5;
+}
+
+.map_theme_cr.map_detail .city_bg.bFF0000 { background-color: #FF0000; }
+.map_theme_cr.map_detail .city_bg.b800000 { background-color: #800000; }
+.map_theme_cr.map_detail .city_bg.bA0522D { background-color: #A0522D; }
+.map_theme_cr.map_detail .city_bg.bFF6347 { background-color: #FF6347; }
+.map_theme_cr.map_detail .city_bg.bFFA500 { background-color: #FFA500; }
+.map_theme_cr.map_detail .city_bg.bFFDAB9 { background-color: #FFDAB9; }
+.map_theme_cr.map_detail .city_bg.bFFD700 { background-color: #FFD700; }
+.map_theme_cr.map_detail .city_bg.bFFFF00 { background-color: #FFFF00; }
+.map_theme_cr.map_detail .city_bg.b7CFC00 { background-color: #7CFC00; }
+.map_theme_cr.map_detail .city_bg.b00FF00 { background-color: #00FF00; }
+.map_theme_cr.map_detail .city_bg.b808000 { background-color: #808000; }
+.map_theme_cr.map_detail .city_bg.b008000 { background-color: #008000; }
+.map_theme_cr.map_detail .city_bg.b2E8B57 { background-color: #2E8B57; }
+.map_theme_cr.map_detail .city_bg.b008080 { background-color: #008080; }
+.map_theme_cr.map_detail .city_bg.b20B2AA { background-color: #20B2AA; }
+.map_theme_cr.map_detail .city_bg.b6495ED { background-color: #6495ED; }
+.map_theme_cr.map_detail .city_bg.b7FFFD4 { background-color: #7FFFD4; }
+.map_theme_cr.map_detail .city_bg.bAFEEEE { background-color: #AFEEEE; }
+.map_theme_cr.map_detail .city_bg.b87CEEB { background-color: #87CEEB; }
+.map_theme_cr.map_detail .city_bg.b00FFFF { background-color: #00FFFF; }
+.map_theme_cr.map_detail .city_bg.b00BFFF { background-color: #00BFFF; }
+.map_theme_cr.map_detail .city_bg.b0000FF { background-color: #0000FF; }
+.map_theme_cr.map_detail .city_bg.b000080 { background-color: #000080; }
+.map_theme_cr.map_detail .city_bg.b483D8B { background-color: #483D8B; }
+.map_theme_cr.map_detail .city_bg.b7B68EE { background-color: #7B68EE; }
+.map_theme_cr.map_detail .city_bg.bBA55D3 { background-color: #BA55D3; }
+.map_theme_cr.map_detail .city_bg.b800080 { background-color: #800080; }
+.map_theme_cr.map_detail .city_bg.bFF00FF { background-color: #FF00FF; }
+.map_theme_cr.map_detail .city_bg.bFFC0CB { background-color: #FFC0CB; }
+.map_theme_cr.map_detail .city_bg.bF5F5DC { background-color: #F5F5DC; }
+.map_theme_cr.map_detail .city_bg.bE0FFFF { background-color: #E0FFFF; }
+.map_theme_cr.map_detail .city_bg.bFFFFFF { background-color: #FFFFFF; }
+.map_theme_cr.map_detail .city_bg.bA9A9A9 { background-color: #A9A9A9; }

hwe/_119.php

@@ -14,13 +14,14 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 [$turntime, $tnmt_time] = $gameStor->getValuesAsArray(['turntime','tnmt_time']);
 
-$plock = $db->queryFirstField('SELECT plock FROM plock');
+$plock = $db->queryFirstField('SELECT plock FROM plock WHERE `type` ="GAME"');
 ?>
 <!DOCTYPE html>
 <html>
 <head>
 <title>삼국지 모의전투 HiDCHe</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')?>

hwe/_119_b.php

@@ -50,9 +50,9 @@ switch ($btn) {
         $db->update('general', [
             'turntime' => $db->sqleval('DATE_SUB(turntime, INTERVAL %i MINUTE)', $minute)
         ], true);
-        $db->update('auction', [
-            'expire' => $db->sqleval('DATE_SUB(expire, INTERVAL %i MINUTE)', $minute)
-        ], true);
+        $db->update('ng_auction', [
+            'close_date' => $db->sqleval('DATE_SUB(close_date, INTERVAL %i MINUTE)', $minute)
+        ], 'finished = 0');
         if ($locked) {
             unlock();
         }
@@ -78,9 +78,9 @@ switch ($btn) {
         $db->update('general', [
             'turntime' => $db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
         ], true);
-        $db->update('auction', [
-            'expire' => $db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute)
-        ], true);
+        $db->update('ng_auction', [
+            'close_date' => $db->sqleval('DATE_ADD(close_date, INTERVAL %i MINUTE)', $minute)
+        ], 'finished = 0');
         if ($locked) {
             unlock();
         }

hwe/_admin1.php

@@ -6,7 +6,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if($session->userGrade < 5) {
+if($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 
@@ -19,6 +19,7 @@ $admin = getAdmin();
 <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')?>
@@ -40,8 +41,6 @@ $admin = getAdmin();
     <tr>
         <td width=110 align=right>시작시간변경</td>
         <td width=285><input type=text size=20 maxlength=20 style=color:white;background-color:black;text-align:right; name=starttime value='<?=substr($admin['starttime'], 0, 19)?>'><input type=submit name=btn value=변경1></td>
-        <td width=110 align=right>현재도시훈사</td>
-        <td width=285><?=$admin['city_rate']?></td>
     </tr>
     <tr>
         <td width=110 align=right>최대 장수</td>

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();
 }
@@ -72,29 +72,9 @@ switch ($btn) {
         case  "30분턴": $turnterm = 30; break;
         case  "60분턴": $turnterm = 60; break;
         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());
 }
 
@@ -20,6 +20,7 @@ $db = DB::db();
 <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') ?>
@@ -48,54 +49,25 @@ $db = DB::db();
                     <font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b>
                 </td>
                 <td width=105 rowspan=12>
-                    <?php
+                    <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>
+                        <?php
+                        $generalList = $db->query('SELECT `no`, `name`, npc, `block` FROM general ORDER BY npc, binary(`name`)');
 
-                    echo "
-            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>";
-                    $generalList = $db->query('SELECT `no`, `name`, npc, `block` FROM general ORDER BY npc, binary(`name`)');
-
-                    foreach ($generalList 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>
-            <select name=weapon size=1 style='color:white;background-color:black;font-size:14px'>";
-                    foreach (GameConst::$allItems as $itemCategories) {
-                        foreach ($itemCategories as $item => $cnt) {
-                            if ($cnt == 0) {
-                                continue;
+                        foreach ($generalList as $general) {
+                            $style = "style=;";
+                            if ($general['block']         > 0) {
+                                $style .= "background-color:red;";
                             }
-                            $itemObj = buildItemClass($item);
-                            if ($itemObj->isBuyable()) {
-                                continue;
+
+                            $npcColor = getNPCColor($general['npc']);
+                            if ($npcColor !== null) {
+                                $style .= "color:{$npcColor};";
                             }
+
+                            echo "<option value={$general['no']} $style>{$general['name']}</option>";
                         }
-                    }
-                    for ($i = 0; $i < 27; $i++) {
-                        echo "
-                <option value={$i}>{$i}</option>";
-                    }
-                    ?>
+                        ?>
                     </select>
-                    <input type=submit name=btn value='무기지급'>
-                    <input type=submit name=btn value='책지급'>
-                    <input type=submit name=btn value='말지급'>
-                    <input type=submit name=btn value='도구지급'>
                 </td>
             </tr>
             <tr>
@@ -109,10 +81,6 @@ $db = DB::db();
                 <td align=center>강제 사망</td>
                 <td><input type=submit name=btn value='강제 사망'></td>
             </tr>
-            <tr>
-                <td align=center>이벤트</td>
-                <td><input type=submit name=btn value='특기 부여'><input type=submit name=btn value='공헌치1000'><input type=submit name=btn value='경험치1000'></td>
-            </tr>
             <tr>
                 <td align=center>이벤트2</td>
                 <td><input type=submit name=btn value='보숙10000'><input type=submit name=btn value='궁숙10000'><input type=submit name=btn value='기숙10000'><input type=submit name=btn value='귀숙10000'><input type=submit name=btn value='차숙10000'></td>
@@ -121,10 +89,6 @@ $db = DB::db();
                 <td align=center>접속제한</td>
                 <td><input type=submit name=btn value='접속 허용'><input type=submit name=btn value='접속 제한'></td>
             </tr>
-            <tr>
-                <td align=center>턴 시각 설정</td>
-                <td><input type=submit name=btn value='00턴'><input type=submit name=btn value='랜덤턴'></td>
-            </tr>
             <tr>
                 <td align=center>명령 설정</td>
                 <td><input type=submit name=btn value='하야입력'><input type=submit name=btn value='방랑해산'></td>

hwe/_admin2_submit.php

@@ -2,6 +2,8 @@
 
 namespace sammo;
 
+use sammo\Enums\MessageType;
+
 include "lib.php";
 include "func.php";
 
@@ -13,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');
 }
 
@@ -31,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 "블럭 해제":
@@ -107,33 +109,11 @@ switch ($btn) {
             'arg' => '{}',
             'brief' => '휴식',
         ], 'general_id IN %li AND turn_idx = 0', $genlist);
-        break;
-    case "특기 부여":
-        [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
-        $text = "특기 부여!";
-
-        foreach ($db->query("SELECT `no`,leadership,strength,intel,dex1,dex2,dex3,dex4,dex5 FROM general WHERE `no` IN %li", $genlist) as $general) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($general['no']), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
-            $msg->send(true);
-
-            $specialWar = SpecialityHelper::pickSpecialWar($general);
-            $db->update('general', [
-                'specage2' => $db->sqleval('age'),
-                'special2' => $specialWar
-            ], 'no=%i', $general['no']);
-            $specialWarName = buildGeneralSpecialWarClass($specialWar)->getName();
-            $josaUl = JosaUtil::pick($specialWarName, '을');
-            $logger = new ActionLogger($general['no'], 0, $year, $month);
-            $logger->pushGeneralHistoryLog("특기 【<b><C>{$specialWarName}</></b>】{$josaUl} 습득");
-            $logger->pushGeneralActionLog("특기 【<b><L>{$specialWarName}</></b>】{$josaUl} 익혔습니다!",ActionLogger::PLAIN);
-            $logger->flush();
-        }
-
         break;
     case "경험치1000":
         $text = $btn . " 지급!";
         foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general', [
@@ -144,7 +124,7 @@ switch ($btn) {
     case "공헌치1000":
         $text = $btn . " 지급!";
         foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general', [
@@ -155,7 +135,7 @@ switch ($btn) {
     case "보숙10000":
         $text = "보병숙련도+10000 지급!";
         foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general', [
@@ -165,7 +145,7 @@ switch ($btn) {
     case "궁숙10000":
         $text = "궁병숙련도+10000 지급!";
         foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general', [
@@ -176,7 +156,7 @@ switch ($btn) {
         $src = MessageTarget::buildQuick($session->generalID);
         $text = "기병숙련도+10000 지급!";
         foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general', [
@@ -187,7 +167,7 @@ switch ($btn) {
         $src = MessageTarget::buildQuick($session->generalID);
         $text = "귀병숙련도+10000 지급!";
         foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general', [
@@ -198,7 +178,7 @@ switch ($btn) {
         $src = MessageTarget::buildQuick($session->generalID);
         $text = "차병숙련도+10000 지급!";
         foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general', [
@@ -206,111 +186,22 @@ 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 ?? '';
         foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg = new Message(MessageType::private, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         break;
-    case "무기지급":
-
-        if ($item == 'None') {
-            $text = "무기 회수!";
-        } else {
-            $text = getItemName($item) . " 지급!";
-        }
-
-        foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if ($item === 'None') {
-            $db->update('general', [
-                'weapon' => 'None'
-            ], '`no` IN %li', $genlist);
-        } else {
-            $db->update('general', [
-                'weapon' => $item
-            ], '`no` IN %li', $genlist, $item);
-        }
-        break;
-    case "책지급":
-        if ($item == 'None') {
-            $text = "책 회수!";
-        } else {
-            $text = getItemName($item) . " 지급!";
-        }
-
-        foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if ($item == 'None') {
-            $db->update('general', [
-                'book' => 'None'
-            ], '`no` IN %li', $genlist);
-        } else {
-            $db->update('general', [
-                'book' => $item
-            ], '`no` IN %li', $genlist);
-        }
-        break;
-    case "말지급":
-        if ($item == 'None') {
-            $text = "말 회수!";
-        } else {
-            $text = getItemName($item) . " 지급!";
-        }
-
-        foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if ($item == 'None') {
-            $db->update('general', [
-                'horse' => 'None'
-            ], '`no` IN %li', $genlist);
-        } else {
-            $db->update('general', [
-                'horse' => $item
-            ], '`no` IN %li', $genlist);
-        }
-        break;
-    case "도구지급":
-        if ($item == 'None') {
-            $text = "특수도구 회수!";
-        } else {
-            $text = getItemName($item) . " 지급!";
-        }
-
-        foreach ($genlist as $generalID) {
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
-            $msg->send(true);
-        }
-
-        if ($item == 'None') {
-            $db->update('general', [
-                'item' => 'None'
-            ], '`no` IN %li', $genlist);
-        } else {
-            $db->update('general', [
-                'item' => $item
-            ], '`no` IN %li AND item < %i', $genlist, $item);
-        }
-        break;
     case "하야입력":
         $db->update('general_turn', [
             'action' => 'che_하야',
@@ -330,26 +221,6 @@ switch ($btn) {
             'brief' => '해산',
         ], 'general_id IN %li AND turn_idx = 1', $genlist);
         break;
-    case "00턴":
-        $turnterm = $gameStor->turnterm;
-
-        foreach ($genlist as $generalID) {
-            $turntime = getRandTurn($turnterm);
-            $cutTurn = cutTurn($turntime, $turnterm);
-            $db->update('general', [
-                'turntime' => $cutTurn
-            ], '`no` IN %li', $genlist);
-        }
-        break;
-    case "랜덤턴":
-        $turnterm = $gameStor->turnterm;
-        foreach ($genlist as $generalID) {
-            $turntime = getRandTurn($turnterm);
-            $db->update('general', [
-                'turntime' => $turntime
-            ], '`no` IN %li', $genlist);
-        }
-        break;
 }
 
 header('location:_admin2.php');

hwe/_admin4.php

@@ -1,132 +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 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,84 +0,0 @@
-<?php
-
-namespace sammo;
-
-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(
-                Message::MSGTYPE_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

@@ -5,7 +5,9 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 
+/** @var int */
 $type = Util::getPost('type', 'int', 0);
+/** @var int */
 $type2 = Util::getPost('type2', 'int', 0);
 
 if ($type < 0 || $type > 17) {
@@ -18,7 +20,7 @@ if ($type2 < 0 || $type2 > 6) {
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 
@@ -36,6 +38,7 @@ $sel2[$type2] = "selected";
 <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') ?>
@@ -63,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>
@@ -102,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>
@@ -144,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,
@@ -190,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;
@@ -237,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>
@@ -83,6 +85,7 @@ $generalObj = General::createGeneralObjFromDB($gen);
 <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') ?>

hwe/_admin8.php

@@ -12,7 +12,7 @@ $type = 0;
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 
@@ -30,6 +30,7 @@ $sel[$type] = "selected";
 <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') ?>
@@ -95,6 +96,8 @@ $sel[$type] = "selected";
                 case 7:
                     $state = "<font color=green>불가침</font>";
                     break;
+                default:
+                    throw new \Exception("알 수 없는 외교 상태: {$dip['state']}");
             }
 
             $date = TimeUtil::now();

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('권한 부족');
 }
 
@@ -25,8 +25,8 @@ foreach ($db->queryFirstColumn(
     CheckHall($generalNo);
 }
 
-foreach(General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
-    $genObj->mergeTotalInheritancePoint(true);
-    applyInheritanceUser($genObj->getVar('owner'));
-    $genObj->clearInheritancePoint();
+$inheritPointManager = InheritancePointManager::getInstance();
+foreach(General::createObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
+    $inheritPointManager->mergeTotalInheritancePoint($genObj);
+    $inheritPointManager->applyInheritanceUser($genObj->getVar('owner'));
 }

hwe/a_bestGeneral.php

@@ -2,6 +2,10 @@
 
 namespace sammo;
 
+use Ds\Set;
+use sammo\Enums\RankColumn;
+use sammo\Enums\AuctionType;
+
 include "lib.php";
 include "func.php";
 
@@ -17,39 +21,36 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("명장일람", 1);
 $templates = new \League\Plates\Engine(__DIR__ . '/templates');
 
+
 ?>
 <!DOCTYPE html>
 <html>
 
 <head>
     <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1136" />
+    <meta name="viewport" content="width=500" />
     <title><?= UniqueConst::$serverName ?>: 명장일람</title>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printCSS('css/hallOfFame.css') ?>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printDist('ts', 'common') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
+    <?= WebUtil::printDist('ts', ['common', 'bestGeneral']) ?>
 </head>
 
 <body>
-    <table align=center width=1100 class='tb_layout bg0'>
-        <tr>
-            <td>명 장 일 람<br><?= closeButton() ?></td>
-        </tr>
-    </table>
-    <table align=center width=1100 class='tb_layout bg0'>
-        <form name=form1 action=a_bestGeneral.php method=post>
-            <tr>
-                <td align=center>
-                    <input type=submit name=btn value='유저 보기'>
+    <div id="container" class="bg0">
+        <div class="row gx-0">
+            <div class="col">명 장 일 람<br><?= closeButton() ?></div>
+        </div>
+        <div class="row gx-0">
+            <div class="col center">
+                <form name=form1 action=a_bestGeneral.php method=get><input type=submit name=btn value='유저 보기'>
                     <input type=submit name=btn value='NPC 보기'>
-                </td>
-            </tr>
-        </form>
-    </table>
-    <div style="margin:auto;width:1100px;">
+                </form>
+            </div>
+        </div>
         <?php
 
         $ownerNameList = [];
@@ -209,6 +210,32 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');
                 }
                 return $v;
             }],
+            ["유 산 소 모 량", "int", function ($v) use ($gameStor) {
+                $v['value'] = $v[RankColumn::inherit_point_spent->value];
+                if ($gameStor->isunited) {
+                    return $v;
+                }
+                $v['nationName'] = '???';
+                $v['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
+                $v['name'] = '???';
+                $v['ownerName'] = null;
+                $v['bgColor'] = GameConst::$basecolor4;
+                $v['fgColor'] = newColor($v['bgColor']);
+                return $v;
+            }],
+            ["유 산 획 득 량", "int", function ($v) use ($gameStor) {
+                $v['value'] = $v[RankColumn::inherit_point_earned->value];
+                if ($gameStor->isunited) {
+                    return $v;
+                }
+                $v['nationName'] = '???';
+                $v['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
+                $v['name'] = '???';
+                $v['ownerName'] = null;
+                $v['bgColor'] = GameConst::$basecolor4;
+                $v['fgColor'] = newColor($v['bgColor']);
+                return $v;
+            }],
         ];
 
         $generals = [];
@@ -274,10 +301,6 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');
                 'generals' => array_slice($typeGenerals, 0, min(10, $validCnt))
             ]);
         }
-        ?>
-    </div>
-    <div style="margin:auto;width:1100px;margin-top:5px;">
-        <?php
         //유니크 아이템 소유자
         $itemTypes = [
             'horse' => '명 마',
@@ -308,6 +331,32 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');
             }
         }
 
+
+        $dummyAuctionGeneral = [
+            'nation' => 0,
+            'no' => 0,
+            'ownerName' => '',
+            'pictureFullPath' => GetImageURL(0) . "/default.jpg",
+            'name' => '경매중',
+            'bgColor' => '#00582c',
+            'fgColor' => 'white',
+            'nationName' => '-',
+        ];
+
+        foreach ($db->queryFirstColumn(
+            'SELECT `target` FROM ng_auction WHERE `finished` = 0 AND `type` = %s',
+            AuctionType::UniqueItem->value
+        ) as $itemClassName) {
+            if(key_exists($itemClassName, $itemOwners)) {
+                $itemOwners[$itemClassName][] = $dummyAuctionGeneral;
+            }
+            else{
+                $itemOwners[$itemClassName] = [$dummyAuctionGeneral];
+            }
+        }
+
+
+
         foreach (GameConst::$allItems as $itemType => $itemList) {
             $itemNameType = $itemTypes[$itemType];
             $itemList = array_reverse($itemList, true);
@@ -369,15 +418,13 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');
             ]);
         }
         ?>
+        <div class="row gx-0">
+            <div class="col"><?= closeButton() ?></div>
+        </div>
+        <div class="row bg0 gx-0">
+            <div class="col bg0"><?= banner() ?></div>
+        </div>
     </div>
-    <table align=center width=1100 class='tb_layout bg0'>
-        <tr>
-            <td><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td><?= banner() ?> </td>
-        </tr>
-    </table>
 </body>
 
 </html>

hwe/a_emperior.php

@@ -14,12 +14,14 @@ increaseRefresh("왕조일람", 1);
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 왕조일람</title>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', 'common') ?>
 
 </head>
@@ -55,7 +57,7 @@ increaseRefresh("왕조일람", 1);
             <tr>
                 <td style="background-color:#333333;" align=center colspan=8>
                     <font size=5>현재 (<?= $year ?>年 <?= $month ?>月)</font>
-                    <a href="a_history.php"><button type='button'>역사 보기</button></a>
+                    <a href="v_history.php"><button type='button'>역사 보기</button></a>
                 </td>
             </tr>
         </table>
@@ -75,7 +77,7 @@ increaseRefresh("왕조일람", 1);
                     <a href="a_emperior_detail.php?select=<?= $emperior['no'] ?>"><button type='button'>자세히</button></a>
 
                     <?php if ($emperior['server_id']) : ?>
-                        <a href="a_history.php?serverID=<?= $emperior['server_id'] ?>"><button type='button'>역사 보기</button></a>
+                        <a href="v_history.php?serverID=<?= $emperior['server_id'] ?>"><button type='button'>역사 보기</button></a>
                     <?php endif ?>
                 </td>
             </tr>

hwe/a_emperior_detail.php

@@ -24,10 +24,12 @@ $serverID = $emperior['server_id'] ?? ($emperior['serverID'] ?? null);
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 왕조일람</title>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', 'common', true) ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 
@@ -173,8 +175,9 @@ $serverID = $emperior['server_id'] ?? ($emperior['serverID'] ?? null);
             if (!$nation['nation'] ?? null) {
                 continue;
             }
-            $nation += Json::decode($nation['data']);
+            $nation = array_merge(Json::decode($nation['data']), $nation);
 
+            /** @var array $nation */
             $nation['typeName'] = getNationType($nation['type']);
             $nation['levelName'] = getNationLevel($nation['level']);
             /** @var int[]|null $nationGenerals */
@@ -200,7 +203,7 @@ $serverID = $emperior['server_id'] ?? ($emperior['serverID'] ?? null);
             }
 
             if (key_exists('aux', $nation) && !is_array($nation['aux'])) {
-                $nation += Json::decode($nation['aux']);
+                $nation = array_merge(Json::decode($nation['aux']), $nation);
             }
 
             echo $templates->render('oldNation', $nation);

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();
 }
@@ -41,12 +44,14 @@ if ($gameStor->isunited) {
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 장수일람</title>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', 'common') ?>
 
 </head>
@@ -100,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],
@@ -109,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'>
@@ -161,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 "
@@ -190,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_hallOfFame.php

@@ -43,23 +43,24 @@ if ($scenarioIdx && key_exists($scenarioIdx, $scenarioList[$seasonIdx] ?? [])) {
 
 <head>
     <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1136" />
+    <meta name="viewport" content="width=500" />
     <title><?= UniqueConst::$serverName ?>: 명예의 전당</title>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printCSS('css/hallOfFame.css') ?>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common', 'hallOfFame']) ?>
 </head>
 
 <body>
-    <table align=center width=1100 class='tb_layout bg0'>
-        <tr>
-            <td>명 예 의 전 당<br><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td>
+    <div id="container" class="bg0">
+        <div class="row gx-0">
+            <div class="col">명 예 의 전 당<br><?= closeButton() ?></div>
+        </div>
+        <div class="row gx-0">
+            <div class="col center">
                 시나리오 검색 : <select id="by_scenario" name="by_scenario">
                     <?php foreach ($scenarioList as $iterSeasonIdx => $subScenarioList) : ?>
                         <option data-season="<?= $iterSeasonIdx ?>" value="" <?= ($iterSeasonIdx == $seasonIdx && $scenarioIdx === null) ? "selected='selected'" : '' ?>>* 시즌 : <?= $iterSeasonIdx ?> 종합 *</option>
@@ -69,10 +70,8 @@ if ($scenarioIdx && key_exists($scenarioIdx, $scenarioList[$seasonIdx] ?? [])) {
                     <?php endforeach; ?>
                     ?>
                 </select>
-            </td>
-        </tr>
-    </table>
-    <div style="margin:auto;width:1100px;">
+            </div>
+        </div>
         <?php
         $types = [
             'experience' => ['명 성', 'int'],
@@ -113,7 +112,8 @@ if ($scenarioIdx && key_exists($scenarioIdx, $scenarioList[$seasonIdx] ?? [])) {
 
             $hallResult = array_map(function ($general) use ($typeValue, $ownerNameList) {
                 $aux = Json::decode($general['aux']);
-                $general += $aux;
+                /** @var array $general */
+                $general = array_merge($aux, $general);
 
                 if (key_exists($general['owner'], $ownerNameList)) {
                     $general['ownerName'] = $ownerNameList[$general['owner']];
@@ -121,10 +121,11 @@ if ($scenarioIdx && key_exists($scenarioIdx, $scenarioList[$seasonIdx] ?? [])) {
 
                 if (!key_exists('bgColor', $general)) {
                     if (!key_exists('color', $general)) {
-                        $general['bgColor'] = GameConst::$basecolor4;
+                        $color = GameConst::$basecolor4;
                     } else {
-                        $general['bgColor'] = $general['color'];
+                        $color = $general['color'];
                     }
+                    $general['bgColor'] = $color;
                 }
 
                 if (!key_exists('fgColor', $general)) {
@@ -156,15 +157,13 @@ if ($scenarioIdx && key_exists($scenarioIdx, $scenarioList[$seasonIdx] ?? [])) {
             ]);
         }
         ?>
+        <div class="row gx-0">
+            <div class="col"><?= closeButton() ?></div>
+        </div>
+        <div class="row bg0 gx-0">
+            <div class="col bg0"><?= banner() ?></div>
+        </div>
     </div>
-    <table align=center width=1100 class='tb_layout bg0'>
-        <tr>
-            <td><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td><?= banner() ?> </td>
-        </tr>
-    </table>
 </body>
 
 </html>

hwe/a_history.php

@@ -1,231 +0,0 @@
-<?php
-
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-$btn = Util::getReq('btn');
-$yearMonth = Util::getReq('yearmonth', 'int');
-$serverID = Util::getReq('serverID', 'string', null);
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-if (!$serverID) {
-    $serverID = UniqueConst::$serverID;
-}
-
-if ($serverID === UniqueConst::$serverID) {
-    increaseRefresh("연감", 1);
-}
-
-$admin = $gameStor->getValues(['startyear', 'year', 'month']);
-
-$me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner = %i', $userID);
-
-$con = checkLimit($me['con']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-
-
-[$s_year, $s_month] = $db->queryFirstList('SELECT year, month FROM ng_history WHERE server_id = %s ORDER BY year ASC, month ASC LIMIT 1', $serverID);
-$s = Util::joinYearMonth($s_year, $s_month);
-
-if ($s_year === null) {
-    echo '인자 에러';
-    exit();
-}
-
-[$e_year, $e_month] = $db->queryFirstList('SELECT year, month FROM ng_history WHERE server_id = %s ORDER BY year DESC, month DESC LIMIT 1', $serverID);
-$e = Util::joinYearMonth($e_year, $e_month);
-
-if ($serverID !== UniqueConst::$serverID) {
-    $mapName = $db->queryFirstField('SELECT map FROM ng_games WHERE server_id=%s', $serverID) ?: 'che';
-} else {
-    $mapName = GameConst::$mapName;
-}
-
-//FIXME: $yearmonth가 올바르지 않을 경우에 처리가 필요.
-if ($serverID !== UniqueConst::$serverID && !$yearMonth) {
-    $yearMonth = $s;
-} else if (!$yearMonth) {
-    $yearMonth = Util::joinYearMonth($admin['year'], $admin['month']);
-} else {
-    if ($btn == "◀◀ 이전달") {
-        $yearMonth -= 1;
-    } elseif ($btn == "다음달 ▶▶") {
-        $yearMonth += 1;
-    }
-}
-
-$isCurrent = false;
-if ($yearMonth < $s) {
-    $yearMonth = $s;
-}
-if ($yearMonth > $e) {
-    $isCurrent = true;
-    $yearMonth = $e + 1;
-}
-
-[$year, $month] = Util::parseYearMonth($yearMonth);
-
-function getHistory($serverID, $year, $month):array{
-    $db = DB::db();
-    $history = $db->queryFirstRow('SELECT * FROM ng_history WHERE server_id = %s AND year = %i AND month = %i', $serverID, $year, $month);
-    $history['global_history'] = Json::decode($history['global_history']);
-    $history['global_action'] = Json::decode($history['global_action']);
-    $history['nations'] = Json::decode($history['nations']);
-    return $history;
-}
-
-
-if($isCurrent){
-    $history = getCurrentHistory();
-}
-else{
-    $history = getHistory($serverID, $year, $month);
-}
-
-$nations = $history['nations'];
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1024" />
-    <title><?= UniqueConst::$serverName ?>: 연감</title>
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS("js/map/theme_{$mapName}.js") ?>
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printCSS('css/map.css') ?>
-    <?= WebUtil::printCSS('css/history.css') ?>
-    <?= WebUtil::printStaticValues([
-        'staticValues' => [
-            'startYear' => $s_year,
-            'startMonth' => $s_month,
-            'lastYear' => $e_year,
-            'lastMonth' => $e_month,
-            'selectYear' => $year,
-            'selectMonth' => $month,
-            'nations' => $nations ? $history['nations'] : [],
-            'serverNick' => DB::prefix(),
-            'serverID' => UniqueConst::$serverID,
-        ]
-    ])?>
-    <?= WebUtil::printDist('ts', ['common', 'history']) ?>
-
-</head>
-
-<body>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td>연 감<br><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td>
-                <form name=form1 method=post>
-                    연월 선택 :
-                    <input type=submit name=btn value="◀◀ 이전달">
-                    <select id='yearmonth' name=yearmonth size=1>
-                        <option selected='selected'><?= $year ?>년 <?= $month ?>월</option>
-                        <option><?= $e_year ?>년 12월 (현재)</option>
-                    </select>
-                    <input type=submit name=btn value='조회하기'>
-                    <input type=submit name=btn value="다음달 ▶▶">
-                </form>
-            </td>
-        </tr>
-    </table>
-    <table align=center width=1000 height=520 class='tb_layout bg0'>
-        <thead>
-            <tr>
-                <th colspan=5 align=center class='bg1'>중 원 지 도</th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr height=520>
-                <td width=698>
-                    <?= getMapHtml($mapName) ?>
-                </td>
-                <td id='nation_list_frame'>
-                    <table id='nation_list'>
-                        <thead>
-                            <tr>
-                                <th width=130>국명</th>
-                                <th width=70>국력</th>
-                                <th width=45>장수</th>
-                                <th width=45>속령</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <?php foreach ($nations as $nation) : ?>
-                                <tr>
-                                    <td><span style='color:<?= newColor($nation['color']) ?>;background-color:<?= $nation['color'] ?>'><?= $nation['name'] ?></td>
-                                    <td style='text-align:right'><?= number_format($nation['power']) ?></td>
-                                    <td style='text-align:right'><?= number_format($nation['gennum']) ?></td>
-                                    <td style='text-align:right'><?= number_format(count($nation['cities'] ?? [])) ?></td>
-                                </tr>
-                            <?php endforeach; ?>
-                        </tbody>
-                        <tfoot></tfoot>
-                    </table>
-                </td>
-            </tr>
-            <tr>
-                <th colspan=5 align=center class='bg1'>중 원 정 세</th>
-            </tr>
-            <tr>
-                <td colspan=5 valign=top>
-                    <?= formatHistoryToHTML($history['global_history']) ?>
-                </td>
-            </tr>
-            <tr>
-                <th colspan=5 align=center class='bg1'>장 수 동 향</th>
-            </tr>
-            <tr>
-                <td colspan=5 valign=top>
-                    <?= formatHistoryToHTML($history['global_action']) ?>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td><?= banner() ?> </td>
-        </tr>
-    </table>
-    <script>
-        <?php if($isCurrent): ?>
-        reloadWorldMap({
-            showMe: false,
-            neutralView: true,
-            useCachedMap: true,
-        });
-        <?php else: ?>
-        reloadWorldMap({
-            targetJson: 'j_map_history.php?year=<?= $year ?>&month=<?= $month ?>&serverID=<?= $serverID ?>',
-            showMe: false,
-            neutralView: true,
-            useCachedMap: false,
-            year: <?= $year ?>,
-            month: <?= $month ?>,
-        });
-        <?php endif; ?>
-
-    </script>
-</body>
-
-</html>

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();
 }
@@ -26,12 +29,14 @@ if ($con >= 2) {
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 세력일람</title>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common', 'extKingdoms']) ?>
     <?= WebUtil::printStaticValues($gameStor->getValues(['killturn', 'autorun_user', 'turnterm'])) ?>
 </head>

hwe/a_npcList.php

@@ -24,12 +24,14 @@ $sel[$type] = "selected";
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 빙의일람</title>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 

hwe/a_traffic.php

@@ -2,36 +2,29 @@
 
 namespace sammo;
 
+use sammo\Enums\GeneralAccessLogColumn;
+
 include "lib.php";
 include "func.php";
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 
-increaseRefresh("갱신정보", 2);
+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);
-    $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;
@@ -52,6 +45,7 @@ if ($admin['maxonline'] < $curonline) {
 <head>
     <title><?= UniqueConst::$serverName ?>: 트래픽정보</title>
     <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1024" />
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
@@ -83,6 +77,7 @@ if ($admin['maxonline'] < $curonline) {
         }
     </style>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 
@@ -103,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>
@@ -144,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>
@@ -185,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/a_vote.php

@@ -1,434 +0,0 @@
-<?php
-
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-increaseRefresh("설문조사", 1);
-
-$isVoteAdmin = in_array('vote', $session->acl[DB::prefix()] ?? []);
-$isVoteAdmin = $isVoteAdmin || $session->userGrade >= 5;
-
-$me = $db->queryFirstRow('SELECT no,vote from general where owner=%i', $userID);
-
-$admin = $gameStor->getValues(['develcost', 'voteopen', 'vote_title', 'vote', 'votecomment']);
-$vote_title = $admin['vote_title'] ?? '-';
-$vote = $admin['vote'] ?: ['-'];
-
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title><?= UniqueConst::$serverName ?>: 설문조사</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1024" />
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <style>
-        .little_bar {
-            float: left;
-            position: relative;
-            height: 17px;
-            line-height: 17px;
-            text-align: center;
-        }
-    </style>
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printDist('ts', ['common']) ?>
-    <script type="text/javascript">
-        function captureKey(e) {
-            if (e.keyCode == 13 && e.srcElement.type == 'text') {
-                form1.btn.value = '댓글';
-                form1.btn.click();
-                return false;
-            }
-        }
-    </script>
-
-</head>
-
-<body>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td>설 문 조 사<br><?= closeButton() ?></td>
-        </tr>
-    </table>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <form name=form1 action=c_vote.php method=post>
-            <tr>
-                <td colspan=3 align=center class='bg2'>
-                    <font size=5>설 문 조 사 (<?= $admin['develcost'] * 5 ?>금과 추첨으로 유니크템 증정!)</font>
-                </td>
-            </tr>
-            <?php
-
-            if ($isVoteAdmin) {
-                echo "
-    <tr>
-        <td width=48  align=center><input type=submit name=btn value='알림'></td>
-        <td width=98  align=center><input type=submit name=btn value='수정'></td>
-        <td width=848 align=left><input type=text name=title style=width:848px;></td>
-    </tr>
-    ";
-            }
-
-            $vote_title = Tag2Code($vote_title);
-            echo "
-    <tr>
-        <td colspan=2 width=148 align=center class='bg1'>제 목</td>
-        <td width=848 align=left>&nbsp;{$vote_title}</td>
-    </tr>
-";
-
-            $voteCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote>0 AND npc<2');
-            $allCount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc<2');
-
-            $percentage = round($voteCount / $allCount * 100, 1);
-
-            $voteTypeCount = count($vote);
-            for ($i = 1; $i < $voteTypeCount; $i++) {
-                echo "
-    <tr>
-        <td width=48 align=center style=color:" . getNewColor($i) . "; bgcolor=" . getVoteColor($i) . ">{$i}.</td>
-        <td width=98 align=center>
-    ";
-                if ($me['vote'] == 0 && $me['no'] > 0) {
-                    echo "
-            <input type=radio name=sel value={$i}>
-        ";
-                } elseif ($admin['voteopen'] >= 1 || $isVoteAdmin) {
-                    $vCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote=%i', $i);
-
-                    $per = @round($vCount / $voteCount * 100, 1);
-                    echo "{$vCount} 표 ({$per}%)";
-                } else {
-                    echo "추후공개";
-                }
-                $vote[$i] = Tag2Code($vote[$i]);
-                echo "
-        </td>
-        <td align=left>&nbsp;{$vote[$i]}</td>
-    </tr>
-    ";
-            }
-
-            echo "
-    <tr>
-";
-            if ($me['vote'] == 0 && $me['no'] > 0) {
-                echo "
-        <td align=center>투표</td>
-        <td align=center><input type=submit name=btn value='투표'></td>
-    ";
-            } else {
-                echo "
-        <td colspan=2 align=center>결산</td>
-    ";
-            }
-            echo "
-        <td align=left>&nbsp;투표율 : {$voteCount} / {$allCount} ({$percentage} %)</td>
-    </tr>
-";
-
-            if ($isVoteAdmin) {
-                echo "
-    <tr>
-        <td align=center><input type=submit name=btn value='리셋'></td>
-        <td align=center><input type=submit name=btn value='추가'></td>
-        <td align=left><input type=text name=str style=width:848px;></td>
-    </tr>
-    ";
-            }
-
-            if ($admin['votecomment']) {
-                $comment = $admin['votecomment'];
-                $commentCount = count($comment);
-            } else {
-                $commentCount = 0;
-            }
-            echo "
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr>
-        <td colspan=4 align=center class='bg1'>댓 글</td>
-    </tr>
-";
-            for ($i = 0; $i < $commentCount; $i++) {
-                $cmt = $comment[$i];
-                $cmt[2] = Tag2Code($cmt[2]);
-                $j = $i + 1;
-                echo "
-    <tr>
-        <td width=28  align=center>{$j}.</td>
-        <td width=130  align=center>{$cmt[0]}</td>
-        <td width=130  align=center>{$cmt[1]}</td>
-        <td width=712 align=left>&nbsp;{$cmt[2]}</td>
-    </tr>
-    ";
-            }
-            if ($me['no'] > 0) {
-                echo "
-    <tr>
-        <td width=158 colspan=2 align=center>-</td>
-        <td width=130  align=center><input type=submit name=btn value='댓글'></td>
-        <td align=left><input type=text name=comment maxlength=60 style=width:700px; onkeydown='return captureKey(event)'></td>
-    </tr>
-    ";
-            }
-            ?>
-    </table>
-    <br>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td colspan=3 align=center class='bg2'>
-                <font size=5>
-                    전 체 통 계
-                    <?php
-                    if ($isVoteAdmin) {
-                        echo "
-        <input type=submit name=btn value='숨김'>
-        <input type=submit name=btn value='전체통계만'>
-        <input type=submit name=btn value='전부'>";
-                    }
-                    echo "
-    </font></td></tr>";
-
-                    if ($admin['voteopen'] >= 1 || $isVoteAdmin) {
-                        echo "
-    <tr>
-        <td width=130  align=center>전 체</td>
-        <td width=128 align=center>{$voteCount} / {$allCount} ({$percentage} %)</td>
-        <td width=742>
-    ";
-
-                        $memCount = max(1, $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2'));
-
-                        $totalVote = [];
-                        $nationVoteCount = [];
-                        $nationVote = [];
-
-                        foreach ($db->query("SELECT nation, vote, count(`no`) as cnt FROM general WHERE npc<2 GROUP BY nation, vote") as $row) {
-                            $nation = $row['nation'];
-                            $ownVote = $row['vote'];
-                            $cnt = $row['cnt'];
-
-                            if (!isset($totalVote[$ownVote])) {
-                                $totalVote[$ownVote] = 0;
-                            }
-
-                            if (!isset($nationVoteCount[$nation])) {
-                                $nationVoteCount[$nation] = 0;
-                                $nationVote[$nation] = [];
-                            }
-
-                            if (!isset($nationVote[$nation][$ownVote])) {
-                                $nationVote[$nation][$ownVote] = 0;
-                            }
-
-                            $totalVote[$ownVote] += $cnt;
-                            $nationVoteCount[$nation] += $cnt;
-                            $nationVote[$nation][$ownVote] += $cnt;
-                        }
-
-                        $totalPer = 0;
-                        for ($i = 0; $i < $voteTypeCount; $i++) {
-                            $per = round(($totalVote[$i] ?? 0) * 100 / $memCount, 1);
-                            if ($i == $voteTypeCount - 1) {
-                                $per = 100 - $totalPer;
-                            } else {
-                                $totalPer += $per;
-                            }
-
-
-                            //        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-                    ?>
-                            <?php if ($per == 0) : ?>
-                            <?php elseif ($per < 10) : ?>
-                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'></div>
-                            <?php else : ?>
-                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'><?= $totalVote[$i] ?></div>
-                            <?php endif; ?>
-                        <?php
-                        }
-
-                        echo "
-        </td>
-    </tr>
-    ";
-                    }
-
-                    if ($admin['voteopen'] >= 2 || $isVoteAdmin) {
-                        $memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=0 AND npc <2');
-                        if ($memCount == 0) {
-                            $memCount = 1;
-                        }
-
-                        if (!isset($nationVoteCount[0])) {
-                            $nationVoteCount[0] = 0;
-                        }
-                        $percentage = round($nationVoteCount[0] / $memCount * 100, 1);
-
-                        echo "
-    <tr>
-        <td align=center bgcolor=black>재 야</td>
-        <td align=center>{$nationVoteCount[0]} / {$memCount} ({$percentage} %)</td>
-        <td>
-    ";
-
-                        $totalPer = 0;
-                        for ($i = 0; $i < $voteTypeCount; $i++) {
-                            $per = round(Util::array_get($nationVote[0][$i], 0) / $memCount * 100, 1);
-                            if ($i == $voteTypeCount - 1) {
-                                $per = 100 - $totalPer;
-                            } else {
-                                $totalPer += $per;
-                            }
-                            //        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-                        ?>
-                            <?php if ($per == 0) : ?>
-                            <?php elseif ($per < 10) : ?>
-                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'></div>
-                            <?php else : ?>
-                                <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($i) ?>;background-color:<?= getVoteColor($i) ?>;'><?= $nationVote[0][$i] ?></div>
-                            <?php endif; ?>
-                            <?php
-                        }
-
-                        echo "
-        </td>
-    </tr>
-    ";
-
-                        foreach ($db->query('SELECT nation,color,name,gennum from nation order by gennum desc') as $i => $nation) {
-                            $memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc<2', $nation['nation']);
-
-
-
-                            $voteCount = $nationVoteCount[$nation['nation']] ?? 0;
-                            if ($memCount == 0) {
-                                $percentage = 100;
-                            } else {
-                                $percentage = round($voteCount / $memCount * 100, 1);
-                            }
-
-
-                            echo "
-    <tr>
-        <td align=center style=color:" . newColor($nation['color']) . "; bgcolor={$nation['color']}>{$nation['name']}</td>
-        <td align=center>{$voteCount} / {$memCount} ({$percentage} %)</td>
-        <td align=center>
-        ";
-
-                            $totalPer = 0;
-                            for ($k = 0; $k < $voteTypeCount; $k++) {
-                                if ($memCount == 0) {
-                                    $per = 0;
-                                    continue;
-                                }
-
-                                $per = round(($nationVote[$nation['nation']][$k] ?? 0) / $memCount * 100, 1);
-
-                                if ($i == $voteTypeCount - 1) {
-                                    $per = 100 - $totalPer;
-                                } else {
-                                    $totalPer += $per;
-                                }
-
-                                //            if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-                            ?>
-                                <?php if ($per == 0) : ?>
-                                <?php elseif ($per < 10) : ?>
-                                    <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($k) ?>;background-color:<?= getVoteColor($k) ?>;'></div>
-                                <?php else : ?>
-                                    <div class='little_bar' style='width:<?= $per ?>%;color:<?= getNewColor($k) ?>;background-color:<?= getVoteColor($k) ?>;'><?= $nationVote[$nation['nation']][$k] ?? 0 ?></div>
-                                <?php endif; ?>
-                    <?php
-                            }
-
-                            echo "
-        </td>
-    </tr>
-        ";
-                        }
-                    }
-                    ?>
-                    </form>
-    </table>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td><?= banner() ?> </td>
-        </tr>
-    </table>
-</body>
-
-</html>
-
-<?php
-function getVoteColor($type)
-{
-    if ($type > 0) {
-        $type = (($type - 1) % 7) + 1;
-    }
-
-    switch ($type) {
-        default:
-        case 0:
-            $color = "black";
-            break;
-        case 1:
-            $color = "red";
-            break;
-        case 2:
-            $color = "orange";
-            break;
-        case 3:
-            $color = "yellow";
-            break;
-        case 4:
-            $color = "green";
-            break;
-        case 5:
-            $color = "blue";
-            break;
-        case 6:
-            $color = "navy";
-            break;
-        case 7:
-            $color = "purple";
-            break;
-    }
-
-    return $color;
-}
-
-function getNewColor($type)
-{
-    if ($type > 0) {
-        $type = (($type - 1) % 7) + 1;
-    }
-
-    switch ($type) {
-        case 2:
-            $color = "black";
-            break;
-        case 3:
-            $color = "black";
-            break;
-        default:
-            $color = "white";
-            break;
-    }
-
-    return $color;
-}

hwe/b_auction.php

@@ -1,306 +0,0 @@
-<?php
-
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$msg = Util::getReq('msg');
-$msg2 = Util::getReq('msg2');
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-increaseRefresh("거래장", 2);
-
-$me = $db->queryFirstRow('SELECT no,special,con,turntime from general where owner=%i', $userID);
-
-$con = checkLimit($me['con']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-$tradeCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no1=%i', $me['no']);
-$bidCount = $db->queryFirstField('SELECT count(no) FROM auction where no2=%i', $me['no']);
-
-$btCount = $tradeCount + $bidCount;
-
-if ($session->userGrade >= 5 || $btCount < 1) {
-    $btn = "submit";
-} else {
-    $btn = "hidden";
-}
-
-if ($msg == "") {
-    $msg = "-";
-}
-if ($msg2 == "") {
-    $msg2 = "-";
-}
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title><?= UniqueConst::$serverName ?>: 거래장</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1024" />
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printDist('ts', ['common']) ?>
-</head>
-
-<body>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td>거 래 장<br><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td align=center class='bg2'>
-                <font color=orange size=6><b>거 래 장</b></font><input type=button value='갱신' onclick="location.replace('b_auction.php')">
-            </td>
-        </tr>
-    </table>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <form method=post action=c_auction.php>
-            <tr>
-                <td colspan=11 align=center bgcolor=orange>
-                    <font size=5>팝 니 다</font>
-                </td>
-            </tr>
-            <tr align=center class='bg1'>
-                <td width=68>거래번호</td>
-                <td width=48>선택</td>
-                <td width=98>판매자</td>
-                <td width=118>물품</td>
-                <td width=88>수량</td>
-                <td width=88>시작판매가</td>
-                <td width=88>현재판매가</td>
-                <td width=88>즉시판매가</td>
-                <td width=48>단가</td>
-                <td width=98>구매 예정자</td>
-                <td width=148>거래종료</td>
-            </tr>
-            <?php
-            $chk = 0;
-            foreach ($db->query('SELECT * from auction where type=0 order by expire') as $auction) {
-                $radio = "";
-                $alert = "";
-                $alert2 = "";
-                if ($auction['no1'] == $me['no']) {
-                    $radio = " disabled";
-                } elseif ($auction['no2'] > 0 && $auction['amount'] * 2 <= $auction['value']) {
-                    $radio = " disabled";
-                    $alert = "<font color=red>";
-                    $alert2 = "</font>";
-                } elseif ($auction['no2'] > 0 && $auction['topv'] <= $auction['value']) {
-                    $radio = " disabled";
-                    $alert = "<font color=red>";
-                    $alert2 = "</font>";
-                } elseif ($chk == 0) {
-                    $radio = " checked";
-                    $chk = 1;
-                }
-                $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
-                $pv = substr((string)$pv, 0, 4);
-
-                echo "
-    <tr align=center>
-        <td>{$auction['no']}</td>
-        <td><input type=radio name=sel value={$auction['no']}{$radio}></td>
-        <td>{$auction['name1']}</td>
-        <td>쌀</td>
-        <td>{$auction['amount']}</td>
-        <td>금 {$auction['cost']}</td>
-        <td>{$alert}금 {$auction['value']}{$alert2}</td>
-        <td>{$alert}금 {$auction['topv']}{$alert2}</td>
-        <td>{$alert}{$pv}{$alert2}</td>
-        <td>{$alert}{$auction['name2']}{$alert2}</td>
-        <td>{$auction['expire']}</td>
-    </tr>
-    ";
-            }
-            ?>
-            <tr height=25>
-                <td align=center class='bg1'>등록결과</td>
-                <td colspan=10><?= ConvertLog($msg) ?></td>
-            </tr>
-            <tr>
-                <td align=center class='bg1'>입찰등록</td>
-                <td colspan=10>
-                    　지불할 금액: <input type=text style=color:white;background-color:black; size=6 maxlength=6 name=value>
-                    <input type=<?= $btn ?> name=btn value='구매시도' onclick='return confirm("정말 입찰하시겠습니까?");'>
-                </td>
-            </tr>
-            <tr>
-                <td align=center class='bg1'>거래등록</td>
-                <td colspan=10>
-                    　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
-                    　물품: 쌀
-                    　판매량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
-                    　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=500>
-                    　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=2000>
-                    <input type=<?= $btn ?> name=btn value='판매' onclick='return confirm("정말 판매하시겠습니까?");'>
-                </td>
-            </tr>
-            <tr>
-                <td colspan=11>
-                    ㆍ<font color=cyan>Hint</font>) 거래자가 판매(물품 판매, 금 수령), 입찰자가 구매(물품 구입, 금 지불).<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 높을수록 판매자 유리.<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 낮을수록 입찰자 유리.<br>
-                </td>
-            </tr>
-        </form>
-    </table>
-    <br>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <form method=post action=c_auction.php>
-            <tr>
-                <td colspan=11 align=center bgcolor=skyblue>
-                    <font size=5>삽 니 다</font>
-                </td>
-            </tr>
-            <tr align=center class='bg1'>
-                <td width=68>거래번호</td>
-                <td width=48>선택</td>
-                <td width=98>구매자</td>
-                <td width=118>물품</td>
-                <td width=88>수량</td>
-                <td width=88>시작구매가</td>
-                <td width=88>현재구매가</td>
-                <td width=88>즉시구매가</td>
-                <td width=48>단가</td>
-                <td width=98>판매 예정자</td>
-                <td width=148>거래종료</td>
-            </tr>
-            <?php
-            $chk = 0;
-            foreach ($db->query('SELECT * from auction where type=1 order by expire') as $auction) {
-                $radio = "";
-                $alert = "";
-                $alert2 = "";
-                if ($auction['no1'] == $me['no']) {
-                    $radio = " disabled";
-                } elseif ($auction['no2'] > 0 && $auction['amount'] >= $auction['value'] * 2) {
-                    $radio = " disabled";
-                    $alert = "<font color=red>";
-                    $alert2 = "</font>";
-                } elseif ($auction['no2'] > 0 && $auction['topv'] >= $auction['value']) {
-                    $radio = " disabled";
-                    $alert = "<font color=red>";
-                    $alert2 = "</font>";
-                } elseif ($chk == 0) {
-                    $radio = " checked";
-                    $chk = 1;
-                }
-                $pv = round($auction['value'] * 100 / $auction['amount']) / 100 + 0.001;
-                $pv = substr((string)$pv, 0, 4);
-                echo "
-    <tr align=center>
-        <td>{$auction['no']}</td>
-        <td><input type=radio name=sel value={$auction['no']}{$radio}></td>
-        <td>{$auction['name1']}</td>
-        <td>쌀</td>
-        <td>{$auction['amount']}</td>
-        <td>금 {$auction['cost']}</td>
-        <td>{$alert}금 {$auction['value']}{$alert2}</td>
-        <td>{$alert}금 {$auction['topv']}{$alert2}</td>
-        <td>{$alert}{$pv}{$alert2}</td>
-        <td>{$alert}{$auction['name2']}{$alert2}</td>
-        <td>{$auction['expire']}</td>
-    </tr>
-    ";
-            }
-            ?>
-            <tr height=25>
-                <td align=center class='bg1'>등록결과</td>
-                <td colspan=10><?= ConvertLog($msg2) ?></td>
-            </tr>
-            <tr>
-                <td align=center class='bg1'>입찰등록</td>
-                <td colspan=10>
-                    　수령할 금액: <input type=text style=color:white;background-color:black; size=6 maxlength=6 name=value>
-                    <input type=<?= $btn ?> name=btn value='판매시도' onclick='return confirm("정말 입찰하시겠습니까?");'>
-                </td>
-            </tr>
-            <tr>
-                <td align=center class='bg1'>거래등록</td>
-                <td colspan=10>
-                    　종료: <input type=text style=color:white;background-color:black; size=2 maxlength=2 name=term value=12>턴 후
-                    　물품: 쌀
-                    　구입량: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=amount value=1000>
-                    　시작가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=cost value=2000>
-                    　즉구가: <input type=text style=color:white;background-color:black; size=5 maxlength=5 name=topv value=500>
-                    <input type=<?= $btn ?> name=btn value='구매' onclick='return confirm("정말 구매하시겠습니까?");'>
-                </td>
-            </tr>
-            <tr>
-                <td colspan=11>
-                    ㆍ<font color=cyan>Hint</font>) 거래자가 구매(물품 구매, 금 지불), 입찰자가 판매(물품 판매, 금 수령).<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 낮을수록 구매자 유리.<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 1.00보다 높을수록 입찰자 유리.<br>
-                </td>
-            </tr>
-        </form>
-    </table>
-    <br>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td align=center class='bg2'>
-                <font size=5>최 근 기 록</font>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <?= getAuctionLogRecent(20) ?>
-            </td>
-        </tr>
-        <tr>
-            <td align=center class='bg2'>
-                <font size=5>도 움 말</font>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <font color=white size=2>
-                    ㆍ판매거래는 거래자가 판매할 물품을 거래하면, 구입을 희망하는 사람이 현재가보다 높게 입찰하여 구입하는 방식입니다.<br>
-                    ㆍ<font color=cyan>Hint</font>) 쌀이 귀한 경우는 입찰자가 많아서 자연스레 단가가 오르게 됩니다. (해당 물품을 사려는 가격이 오름)<br>
-                    ㆍ<font color=cyan>Hint</font>) 쌀이 흔한 경우는 초기 가격을 낮게 책정해야 판매가 가능할 겁니다.<br>
-                    ㆍ구매거래는 거래자가 구입할 물품을 거래하면, 판매를 희망하는 사람이 현재가보다 낮게 입찰하여 판매하는 방식입니다.<br>
-                    ㆍ<font color=cyan>Hint</font>) 쌀이 흔한 경우는 입찰자가 많아서 자연스레 단가가 내리게 됩니다. (해당 물품을 팔려는 가격이 내림)<br>
-                    ㆍ<font color=cyan>Hint</font>) 쌀이 귀한 경우는 초기 가격을 높게 책정해야 구입이 가능할 겁니다.<br>
-                    ㆍ마감임박때 입찰하는 경우 입찰후 1턴 후로 종료시간이 연장됩니다.<br>
-                    ㆍ즉시구매가로 입찰하는 경우 입찰후 1턴 후로 종료시간이 결정됩니다.<br>
-                    ㆍ악용 방지를 위해 50% ~ 200%의 가격에서 거래시작이 가능합니다.<br>
-                    ㆍ악용 방지를 위해 즉시판매가는 110% 이상, 즉시구매가는 90% 이하의 시세로 가능합니다.<br>
-                    ㆍ악용 방지를 위해 즉시판매가는 시작판매가의 110% 이상, 즉시구매가는 시작구매가의 90% 이하로 가능합니다.<br>
-                    ㆍ1인당 도합 1건의 거래와 입찰이 가능합니다.<br>
-                    ㆍ기본금쌀 1000은 거래에 사용되지 못합니다.<br>
-                    ㆍ유찰될 때는 거래 과실자에게 거래금의 1%가 벌금으로 부과됩니다.<br>
-                    ㆍ<font color=magenta>10단위로 거래가 가능합니다. 1자리는 반올림 처리 됩니다.</font><br>
-                    ㆍ<font color=red>★ 최고가 거래 ★</font> 혹은 <font color=red>★ 최저가 거래 ★</font> 는 암거래 및 악용의 가능성이니 감시 부탁드립니다.<br>
-                    ㆍ거래와 입찰은 취소가 불가능하니 주의하세요!<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가는 금/쌀로 쌀1을 거래하기 위한 금의 양입니다.<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 높으면(>1.00) 쌀이 비싸므로 판매가 이득입니다.<br>
-                    ㆍ<font color=cyan>Hint</font>) 단가가 낮으면(<1.00) 금이 비싸므로 구매가 이득입니다.<br>
-                        ㆍ즐거운 거래!
-                </font>
-            </td>
-        </tr>
-        <tr>
-            <td><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td><?= banner() ?> </td>
-        </tr>
-    </table>
-</body>
-
-</html>

hwe/b_battleCenter.php

@@ -1,217 +0,0 @@
-<?php
-
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$v = new Validator($_POST + $_GET);
-$v->rule('required', 'gen')
-    ->rule('integer', 'gen');
-
-$btn = Util::getReq('btn');
-$gen = Util::getReq('gen', 'int', 0);
-$reqQueryType = Util::getReq('query_type', 'string', null);
-
-// $queryTypeText, $reqArgType(0=>None, 1=>AdditionalColumn, 2=>rankVal, 3=>aux), $comp
-$queryMap = [
-    'turntime' => ['최근턴', 0, function ($lhs, $rhs) {
-        return - ($lhs['turntime'] <=> $rhs['turntime']);
-    }],
-    'recent_war' => ['최근전투', 1, function ($lhs, $rhs) {
-        return - ($lhs['recent_war'] <=> $rhs['recent_war']);
-    }],
-    'name' => ['장수명', 0, function ($lhs, $rhs) {
-        if ($lhs['npc'] !== $rhs['npc']) {
-            return $lhs['npc'] <=> $rhs['npc'];
-        }
-        return $lhs['name'] <=> $rhs['name'];
-    }],
-    'warnum' => ['전투수', 2, function ($lhs, $rhs) {
-        return - ($lhs['warnum'] <=> $rhs['warnum']);
-    }]
-];
-
-if ($reqQueryType === null || !key_exists($reqQueryType, $queryMap)) {
-    $reqQueryType = Util::array_first_key($queryMap);
-}
-
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-increaseRefresh("감찰부", 2);
-//전투 추진을 위해 갱신
-TurnExecutionHelper::executeAllCommand();
-$gameStor->resetCache();
-
-$testGeneralNationID = $db->queryFirstField('SELECT nation FROM general WHERE no = %i', $gen);
-
-$me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);
-$nationID = $me['nation'];
-
-$con = checkLimit($me['con']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-$permission = checkSecretPermission($me);
-if ($permission < 0) {
-    echo '국가에 소속되어있지 않습니다.';
-    die();
-} else if ($permission < 1) {
-    echo "권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.";
-    die();
-}
-
-//잘못된 접근
-if ($testGeneralNationID != $nationID) {
-    $gen = 0;
-}
-
-if ($btn == '정렬하기') {
-    $gen = 0;
-}
-
-
-[$queryTypeText, $reqArgType, $comp] = $queryMap[$reqQueryType];
-if ($reqArgType === 0) {
-    $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level FROM general WHERE nation = %i', $nationID);
-} else if ($reqArgType === 1) {
-    $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, %b FROM general WHERE nation = %i', $reqQueryType, $nationID);
-} else if ($reqArgType === 2) {
-    $generalBasicList = $db->query(
-        'SELECT no, name, npc, turntime, officer_level, value as %b
-        FROM general LEFT JOIN rank_data
-        ON general.no = rank_data.general_id
-        WHERE rank_data.type = %s AND general.nation = %i',
-        $reqQueryType,
-        $reqQueryType,
-        $nationID
-    );
-} else if ($reqArgType === 3) {
-    $generalBasicList = array_map(function ($arr) {
-        $arr['aux'] = Json::decode($arr['aux']);
-        return $arr;
-    }, $db->query('SELECT no, name, npc, turntime, officer_level, aux FROM general WHERE nation = %i', $nationID));
-} else {
-    throw new \sammo\MustNotBeReachedException();
-}
-
-
-usort($generalBasicList, $comp);
-
-if (!$gen) {
-    $gen = $generalBasicList[0]['no'];
-}
-$showGeneral = General::createGeneralObjFromDB($gen);
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title><?= UniqueConst::$serverName ?>: 감찰부</title>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1024" />
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printDist('ts', ['common']) ?>
-
-</head>
-
-<body>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td>감 찰 부<br><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td>
-                <form name=form1 method=get>
-                    정렬순서 :
-                    <select name='query_type' size=1>
-                        <?php foreach ($queryMap as $queryType => [$queryTypeText,]) : ?>
-                            <option <?= $queryType == $reqQueryType ? 'selected' : '' ?> value='<?= $queryType ?>'><?= $queryTypeText ?></option>
-                        <?php endforeach; ?>
-                    </select>
-                    <input type=submit name=btn value='정렬하기'>
-                    대상장수 :
-                    <select name=gen size=1>
-                        <?php foreach ($generalBasicList as $general) : ?>
-                            <option <?= $gen == $general['no'] ? 'selected' : '' ?> value='<?= $general['no'] ?>'><?= $general['officer_level'] > 4 ? "*{$general['name']}*" : $general['name'] ?> (<?= substr($general['turntime'], 14, 5) ?>)</option>
-                        <?php endforeach; ?>
-                    </select>
-                    <input type=submit name=btn value='조회하기'>
-                </form>
-            </td>
-        </tr>
-    </table>
-    <table width=1000 align=center class='tb_layout bg0'>
-        <tr>
-            <td width=50% align=center class='bg1'>
-                <font color=skyblue size=3>장 수 정 보</font>
-            </td>
-            <td width=50% align=center class='bg1'>
-                <font color=orange size=3>장 수 열 전</font>
-            </td>
-        </tr>
-        <tr>
-            <td valign=top>
-                <?php generalInfo($showGeneral);
-                generalInfo2($showGeneral); ?>
-            </td>
-            <td valign=top>
-                <?= formatHistoryToHTML(getGeneralHistoryLogAll($gen)) ?>
-            </td>
-        </tr>
-        <tr>
-            <td align=center class='bg1'>
-                <font color=orange size=3>전투 기록</font>
-            </td>
-            <td align=center class='bg1'>
-                <font color=orange size=3>전투 결과</font>
-            </td>
-        </tr>
-        <tr>
-            <td valign=top>
-                <?= formatHistoryToHTML(getBattleDetailLogRecent($gen, 24)) ?>
-            </td>
-            <td valign=top>
-                <?= formatHistoryToHTML(getBattleResultRecent($gen, 24)) ?>
-            </td>
-        </tr>
-        <?php if ($showGeneral->getNPCType() > 1 || $permission >= 2) : ?>
-            <tr>
-                <td align=center class='bg1'>
-                    <font color=orange size=3>개인 기록</font>
-                </td>
-                <td align=center class='bg1'>
-                    <font color=orange size=3>&nbsp;</font>
-                </td>
-            </tr>
-            <tr>
-                <td valign=top>
-                    <?= formatHistoryToHTML(getGeneralActionLogRecent($gen, 24)) ?>
-                </td>
-                <td valign=top>
-                </td>
-            </tr>
-        <?php endif; ?>
-    </table>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td><?= closeButton() ?></td>
-        </tr>
-        <tr>
-            <td><?= banner() ?> </td>
-        </tr>
-    </table>
-</body>
-
-</html>

hwe/b_betting.php

@@ -2,6 +2,10 @@
 
 namespace sammo;
 
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\Enums\GeneralQueryMode;
+use sammo\Enums\RankColumn;
+
 include "lib.php";
 include "func.php";
 //로그인 검사
@@ -16,60 +20,91 @@ TurnExecutionHelper::executeAllCommand();
 
 $generalID = $session->generalID;
 
-//NOTE: general_id만 빼기 귀찮음.
-$myBet = $db->queryFirstList('SELECT * FROM betting WHERE general_id = %i', $generalID);
-$myBet = array_splice($myBet, -16);
-$globalBet = $db->queryFirstList('SELECT * FROM betting WHERE general_id = 0');
-$globalBet = array_splice($globalBet, -16);
 
-$me = $db->queryFirstRow('SELECT no,tournament,con,turntime from general where owner=%i', $userID);
 
-$myBetTotal = array_sum($myBet);
-$globalBetTotal = array_sum($globalBet);
 
-$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'develcost']);
+$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
+);
 
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'turnterm', 'develcost']);
+$turnTerm = $admin['turnterm'];
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
 
 switch ($admin['tnmt_type']) {
-    default:
-        throw new \RuntimeException('Invalid tnmt_type');
     case convertTournamentType('전력전'):
-        $tnmt_type = "<font color=cyan>전력전</font>";
+        $tnmt_type = "전력전";
+        $color = "cyan";
         $tp = "total";
         $tp2 = "종합";
         $tp3 = "total";
         break;
     case convertTournamentType('통솔전'):
-        $tnmt_type = "<font color=cyan>통솔전</font>";
+        $tnmt_type = "통솔전";
+        $color = "cyan";
         $tp = "leadership";
         $tp2 = "통솔";
         $tp3 = "leadership";
         break;
     case convertTournamentType('일기토'):
-        $tnmt_type = "<font color=cyan>일기토</font>";
+        $tnmt_type = "일기토";
+        $color = "cyan";
         $tp = "strength";
         $tp2 = "무력";
         $tp3 = "strength";
         break;
     case convertTournamentType('설전'):
-        $tnmt_type = "<font color=cyan>설전</font>";
+        $tnmt_type = "설전";
+        $color = "cyan";
         $tp = "intel";
         $tp2 = "지력";
         $tp3 = "intel";
         break;
+    default:
+        throw new \RuntimeException('Invalid tnmt_type');
 }
 
+$bettingID = $gameStor->last_tournament_betting_id ?? 0;
+$myBet = [];
+$globalBet = [];
+
+if ($bettingID != 0) {
+    $betting = $bettingID != 0 ? new Betting($bettingID) : null;
+    $info = $betting->getInfo();
+
+    foreach ($db->queryAllLists(
+        'SELECT general_id, user_id, amount, betting_type FROM ng_betting WHERE betting_id = %i',
+        $bettingID
+    ) as [$betGeneralID, $userID, $amount, $bettingTypeKey]) {
+        $bettingKey = Json::decode($bettingTypeKey)[0];
+        if ($betGeneralID == $generalID) {
+            $myBet[$bettingKey] = $amount;
+        }
+
+        if (key_exists($bettingKey, $globalBet)) {
+            $globalBet[$bettingKey] += $amount;
+        } else {
+            $globalBet[$bettingKey] = $amount;
+        }
+    }
+} else {
+    $info = getDummyBettingInfo($tnmt_type);
+}
+
+$myBetTotal = array_sum($myBet);
+$globalBetTotal = array_sum($globalBet);
+
 $str1 = getTournament($admin['tournament']);
 $str2 = getTournamentTime();
 if ($str2) {
     $str2 = ', ' . $str2;
 }
-$str3 = getTournamentTermText();
+$str3 = getTournamentTermText($turnTerm);
 if ($str3) {
     $str3 = ', ' . $str3;
 }
@@ -77,19 +112,26 @@ if ($str3) {
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 베팅장</title>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common', 'betting']) ?>
+    <?= WebUtil::printStaticValues([
+        'staticValues'=>[
+            'bettingID'=> $bettingID
+        ]
+    ])?>
 </head>
 
 <body>
@@ -100,11 +142,11 @@ if ($str3) {
     </table>
     <table align=center width=1120 class='tb_layout bg0'>
         <tr>
-            <td colspan=16><input type=button value='갱신' onclick='location.reload()'></td>
+            <td colspan=16><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button></td>
         </tr>
         <tr>
             <td colspan=16 align=center>
-                <font color=white size=6><?= $tnmt_type ?> (<?= $str1 . $str2 . $str3 ?>)</font>
+                <font color=white size=6><span style="color:<?= $color ?>"><?= $tnmt_type ?></span> (<?= $str1 . $str2 . $str3 ?>)</font>
             </td>
         </tr>
         <tr>
@@ -265,7 +307,6 @@ if ($str3) {
             for ($i = 0; $i < 8; $i++) {
                 echo "<td colspan=2>{$gen[$i]}</td>";
             }
-
             echo "
     </tr>
     <tr align=center>";
@@ -293,7 +334,11 @@ if ($str3) {
                     $line[$i] = "<font color=white>";
                 }
                 $gen[$i] = $general['name'];
-                $stat[$i] = $general[$tp];
+                if (array_key_exists($tp, $general)) {
+                    $stat[$i] = $general[$tp];
+                } else {
+                    $stat[$i] = "-";
+                }
             }
             for ($i = 0; $i < 8; $i++) {
                 $cent[$i] = $cent[$i] . "┻" . "</font>";
@@ -302,17 +347,17 @@ if ($str3) {
                 echo "<td colspan=2>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
             }
             ?>
-    </tr>
-      <tr align=center>
-        <?php for ($i = 0; $i < 16; $i++) { ?>
-            <td width=70><?=$gen[$i]?></td>
-        <?php } ?>
-      </tr>
-      <tr align=center>
-        <?php for ($i = 0; $i < 16; $i++) { ?>
-            <td width=70 style="font-size: 14px"><?=$stat[$i]?></td>
-        <?php } ?>
-      </tr>
+        </tr>
+        <tr align=center>
+            <?php for ($i = 0; $i < 16; $i++) { ?>
+                <td width=70><?= $gen[$i] ?></td>
+            <?php } ?>
+        </tr>
+        <tr align=center>
+            <?php for ($i = 0; $i < 16; $i++) { ?>
+                <td width=70 style="font-size: 14px"><?= $stat[$i] ?></td>
+            <?php } ?>
+        </tr>
     </table>
     <table align=center width=1120 style="table-layout: fixed" class='tb_layout bg0'>
         <tr align=center>
@@ -320,29 +365,29 @@ if ($str3) {
         </tr>
         <?php
 
-          $bet = [];
-          $gold = [];
+        $bet = [];
+        $gold = [];
+        $keyMap = [];
+        foreach ($info->candidates as $key => $candidate) {
+            $keyMap[$candidate->aux['idx']] = $key;
+        }
 
-          for ($i = 0; $i < 16; $i++) {
-              if ($globalBet[$i] == 0) {
-                  $bet[$i] = "∞";
-              } else {
-                  $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
-              }
-          }
-
-          for ($i = 0; $i < 16; $i++) {
-              if (!is_numeric($bet[$i])) {
-                  $gold[$i] = 0;
-              } else {
-                  $gold[$i] = Util::round($myBet[$i] * $bet[$i]);
-              }
-          }
+        foreach ($globalBet as $key => $amount) {
+            if ($amount == 0) {
+                $bet[$key] = "∞";
+                $gold[$key] = 0;
+            } else {
+                $rewardRatio = round($globalBetTotal / $amount, 2);
+                $bet[$key]  = $rewardRatio;
+                $gold[$key] = $rewardRatio * ($myBet[$key] ?? 0);
+            }
+        }
         echo "
     <tr align=center>";
 
-        for ($i = 0; $i < 16; $i++) {
-            echo "<td width=70><font color=skyblue>{$bet[$i]}</font></td>";
+        foreach (range(0, 15) as  $i) {
+            $amount = $bet[$keyMap[$i] ?? -1] ?? 0;
+            echo "<td width=70><font color=skyblue>{$amount}</font></td>";
         }
         ?>
         </tr>
@@ -366,8 +411,9 @@ if ($str3) {
         </tr>
         <tr align=center>
             <?php
-            for ($i = 0; $i < 16; $i++) {
-                echo "<td><font color=orange>{$myBet[$i]}</font></td>";
+            foreach (range(0, 15) as  $i) {
+                $amount = $myBet[$keyMap[$i] ?? -1] ?? 0;
+                echo "<td><font color=orange>{$amount}</font></td>";
             }
             ?>
         </tr>
@@ -391,8 +437,9 @@ if ($str3) {
         </tr>
         <tr align=center>
             <?php
-            for ($i = 0; $i < 16; $i++) {
-                echo "<td><font color=cyan>{$gold[$i]}</font></td>";
+            foreach (range(0, 15) as  $i) {
+                $amount = $gold[$keyMap[$i] ?? -1] ?? 0;
+                echo "<td><font color=cyan>{$amount}</font></td>";
             }
 
             echo "
@@ -401,12 +448,13 @@ if ($str3) {
 
             if ($admin['tournament'] == 6) {
                 echo "
-    <tr align=center>";
+    <tr align=center style='height:2.5em;'>";
 
-                for ($i = 0; $i < 16; $i++) {
+                foreach (range(0, 15) as  $i) {
+                    $key = $keyMap[$i] ?? -1;
                     echo "
         <td>
-            <select size=1 id='target_{$i}' style=color:white;background-color:black;>
+            <select size=1 id='target_{$key}' style='color:white;background-color:black;padding:0.2rem 0.1rem;'>
                 <option style=color:white; value=10>금10</option>
                 <option style=color:white; value=20>금20</option>
                 <option style=color:white; value=50>금50</option>
@@ -420,11 +468,12 @@ if ($str3) {
 
                 echo "
     </tr>
-    <tr align=center>";
+    <tr align=center style='height:2.2em;'>";
 
-                for ($i = 0; $i < 16; $i++) {
+                foreach (range(0, 15) as  $i) {
+                    $key = $keyMap[$i] ?? -1;
                     echo "
-        <td><input type=button class='submitBtn' data-target='{$i}' value=베팅! style=width:100%;color:white;background-color:black;></td>";
+        <td><input type=button class='submitBtn' data-target='{$key}' value=베팅! style='width:100%;color:white;padding:0.2rem 0.1rem;background-color:black;'></td>";
                 }
 
                 echo "</tr>";
@@ -458,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',
@@ -511,17 +560,17 @@ if ($str3) {
                             <td align=center>勝</td>
                         </tr>
                         <?php
-                        $prizeColumn = "{$rankColumn}p";
-                        $gameColumn = "{$rankColumn}g";
-                        $winColumn = "{$rankColumn}w";
-                        $drawColumn = "{$rankColumn}d";
-                        $loseColumn = "{$rankColumn}l";
-                        $tournamentRankerList = General::createGeneralObjListFromDB(
-                            $db->queryFirstColumn('SELECT general_id FROM rank_data WHERE `type`= %s ORDER BY value DESC LIMIT 40', $gameColumn),
-                            [$prizeColumn, $gameColumn, $winColumn, $drawColumn, $loseColumn, 'leadership', 'strength', 'intel', 'no', 'npc', 'name'],
-                            0
+                        $prizeColumn = RankColumn::from("{$rankColumn}p");
+                        $gameColumn = RankColumn::from("{$rankColumn}g");
+                        $winColumn = RankColumn::from("{$rankColumn}w");
+                        $drawColumn = RankColumn::from("{$rankColumn}d");
+                        $loseColumn = RankColumn::from("{$rankColumn}l");
+                        $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'],
+                            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

@@ -13,9 +13,11 @@ $userID = Session::getUserID();
 $userGrade = Session::getUserGrade();
 
 $db = DB::db();
-
+$gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("현재도시", 1);
 
+$lastExecute = substr($gameStor->turntime, 5, 14);
+
 $me = $db->queryFirstRow('SELECT no,nation,officer_level,city from general where owner=%i', $userID);
 $myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation']) ?? [
     'nation' => 0,
@@ -32,6 +34,7 @@ $templates = new \League\Plates\Engine('templates');
 <head>
     <title><?= UniqueConst::$serverName ?>: 도시정보</title>
     <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1024" />
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
@@ -53,6 +56,7 @@ $templates = new \League\Plates\Engine('templates');
             font-size: x-small;
         }
     </style>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common', 'currentCity']) ?>
 </head>
 
@@ -173,7 +177,7 @@ $templates = new \League\Plates\Engine('templates');
                                 $valid = 1;
                             }
 
-                            if ($userGrade >= 5) {
+                            if ($userGrade >= 6) {
                                 $valid = true;
                                 $showDetailedInfo = true;
                             }
@@ -207,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',
@@ -271,7 +275,7 @@ $templates = new \League\Plates\Engine('templates');
                                     $ourGeneral = false;
                                 }
 
-                                if ($userGrade == 6) {
+                                if ($userGrade == 7) {
                                     $ourGeneral = true;
                                 }
 
@@ -323,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";
                                     }
@@ -446,7 +449,7 @@ $templates = new \League\Plates\Engine('templates');
                             <table align=center width=1000 class='tb_layout bg2'>
                                 <tr>
                                     <td colspan=11 align=center style='color:<?= newColor($cityNation['color']) ?>; background:<?= $cityNation['color'] ?>'>【 <?= CityConst::$regionMap[$city['region']] ?> | <?= CityConst::$levelMap[$city['level']] ?> 】 <?= $city['name'] ?></td>
-                                    <td style='color:<?= newColor($cityNation['color']) ?>; background:<?= $cityNation['color'] ?>' class='center'><?= date('m-d H:i:s') ?></td>
+                                    <td style='color:<?= newColor($cityNation['color']) ?>; background:<?= $cityNation['color'] ?>' class='center'><?= $lastExecute ?></td>
                                 </tr>
                                 <tr>
                                     <td align=center width=48 class=bg1>주민</td>

hwe/b_diplomacy.php

@@ -1,236 +0,0 @@
-<?php
-
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-increaseRefresh("중원정보", 1);
-
-$me = $db->queryFirstRow('SELECT no,nation FROM general WHERE owner=%i', $userID);
-$myNationID = $me['nation'];
-
-$nations = array_filter(getAllNationStaticInfo(), function (array $nation) {
-    return $nation['level'];
-});
-uasort($nations, function (array $lhs, array $rhs) {
-    return - ($lhs['power'] <=> $rhs['power']);
-});
-$nationCnt = count($nations);
-
-foreach ($db->queryAllLists('SELECT nation, count(city) FROM city WHERE nation != 0 GROUP BY nation') as [$nationID, $cityCnt]) {
-    $nations[$nationID]['city_cnt'] = $cityCnt;
-}
-
-$realConflict = [];
-foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE conflict!=%s', '{}') as [
-    $cityID,
-    $cityName,
-    $rawConflict
-]) {
-    $rawConflict = Json::decode($rawConflict);
-    if (count($rawConflict) < 2) {
-        continue;
-    }
-
-    $sum = array_sum($rawConflict);
-
-
-    $conflict = [];
-    foreach ($rawConflict as $nationID => $killnum) {
-        $conflict[$nationID] = [
-            'killnum' => $killnum,
-            'percent' => round(100 * $killnum / $sum, 1),
-            'name' => $nations[$nationID]['name'],
-            'color' => $nations[$nationID]['color']
-        ];
-    }
-
-    $realConflict[] = [$cityID, $cityName, $conflict];
-};
-
-$diplomacyList = [];
-foreach ($db->queryAllLists('SELECT me, you, state FROM diplomacy') as [$me, $you, $state]) {
-    if (!key_exists($me, $diplomacyList)) {
-        $diplomacyList[$me] = [];
-    }
-
-    $diplomacyList[$me][$you] = $state;
-}
-
-$cellWidth = intdiv(888, max(1, $nationCnt));
-
-
-$defaultStateChar = '?';
-$sameNationStateChar = '＼';
-$infomativeStateCharMap = [
-    0 => '<span style="color:red;">★</span>',
-    1 => '<span style="color:magenta;">▲</span>',
-    2 => 'ㆍ',
-    7 => '<span style="color:green;">@</span>'
-];
-$neutralStateCharMap = [
-    0 => '<span style="color:red;">★</span>',
-    1 => '<span style="color:magenta;">▲</span>'
-];
-
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1024" />
-    <title><?= UniqueConst::$serverName ?>: 중원 정보</title>
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('d_shared/base_map.js') ?>
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printCSS('css/map.css') ?>
-    <?= WebUtil::printCSS('css/history.css') ?>
-    <?= WebUtil::printStaticValues([
-        'staticValues' => [
-            'serverNick' => DB::prefix(),
-            'serverID' => UniqueConst::$serverID,
-            'unitSet' => GameConst::$unitSet,
-            'mapName' => GameConst::$mapName,
-        ],
-    ]) ?>
-    <?= WebUtil::printDist('ts', ['common', 'map']) ?>
-</head>
-
-<body>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td>중 원 정 보<br><?= backButton() ?></td>
-        </tr>
-    </table>
-    <br>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td colspan=<?= $nationCnt + 1 ?> align=center bgcolor=blue>외 교 현 황</td>
-        </tr>
-        <tr>
-            <td align=center width=130 style=background-color:<?= GameConst::$basecolor2 ?>;>&nbsp;</td>
-            <?php foreach ($nations as $nation) : ?>
-                <td align=center width=<?= $cellWidth ?> style='background-color:<?= $nation['color'] ?>;color:<?= newColor($nation['color']) ?>'><?= $nation['name'] ?></td>
-            <?php endforeach; ?>
-        </tr>
-        <?php foreach ($nations as $me => $meNation) : ?>
-            <tr style='text-align:center;'>
-                <td align=center style='background-color:<?= $meNation['color'] ?>;color:<?= newColor($meNation['color']) ?>'><?= $meNation['name'] ?></td>
-                <?php foreach (array_keys($nations) as $you) : ?>
-                    <td <?= ($me == $myNationID || $you == $myNationID) ? 'style="background-color:' . GameConst::$basecolor3 . '"' : '' ?>><?php
-                                                                                                                            if ($me == $you) {
-                                                                                                                                echo $sameNationStateChar;
-                                                                                                                            } else if ($me == $myNationID || $you == $myNationID || $session->userGrade >= 5) {
-                                                                                                                                echo $infomativeStateCharMap[$diplomacyList[$me][$you]] ?? $defaultStateChar;
-                                                                                                                            } else {
-                                                                                                                                echo $neutralStateCharMap[$diplomacyList[$me][$you]] ?? $defaultStateChar;
-                                                                                                                            }
-                                                                                                                            ?></td>
-                <?php endforeach; ?>
-            </tr>
-        <?php endforeach; ?>
-        <tr>
-            <td colspan=<?= $nationCnt + 1 ?> align=center>불가침 : <font color=limegreen>@</font>, 통상 : ㆍ, 선포 : <font color=magenta>▲</font>, 교전 : <font color=red>★</font>
-            </td>
-        </tr>
-    </table>
-
-    <?php if ($realConflict) : ?>
-
-        <br>
-        <table align='center' width=1000 class='tb_layout bg0'>
-            <tr>
-                <td colspan=2 align=center bgcolor=magenta>분 쟁 현 황</td>
-            </tr>
-            <?php foreach ($realConflict as list($cityID, $cityName, $conflict)) : ?>
-                <tr>
-                    <td align=center width=48><?= $cityName ?></td>
-                    <td style='width:948px;position:relative;'>
-                        <table class='tb_layout bg0' style='width:100%;'>
-                            <?php foreach ($conflict as $item) : ?>
-                                <tr>
-                                    <td width=130 align=right style='color:<?= newColor($item['color']) ?>;background-color:<?= $item['color'] ?>;'><?= $item['name'] ?>&nbsp;</td>
-                                    <td width=48 align=right><?= (float)$item['percent'] ?> %&nbsp;</td>
-                                    <td width=*>
-                                        <div style='display:inline-block;width:<?= $item['percent'] ?>%;background-color:<?= $item['color'] ?>;'>&nbsp;</div>
-                                    </td>
-                                </tr>
-                            <?php endforeach; ?>
-                        </table>
-
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-            <tr>
-                <td colspan=2 height=5 class='bg1'></td>
-            </tr>
-        </table>
-
-    <?php endif; ?>
-
-    <br>
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td colspan=5 align=center bgcolor=green>
-                <font size=3>중 원 지 도</font>
-            </td>
-        </tr>
-        <tr>
-            <td width=698 height=420>
-                <?= getMapHtml() ?>
-            </td>
-            <td id='nation_list_frame'>
-                <table id='nation_list'>
-                    <thead>
-                        <tr>
-                            <th width=130>국명</th>
-                            <th width=70>국력</th>
-                            <th width=45>장수</th>
-                            <th width=45>속령</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <?php foreach ($nations as $nation) : ?>
-                            <tr>
-                                <td><span style='color:<?= newColor($nation['color']) ?>;background-color:<?= $nation['color'] ?>'><?= $nation['name'] ?></td>
-                                <td style='text-align:right'><?= number_format($nation['power']) ?></td>
-                                <td style='text-align:right'><?= number_format($nation['gennum']) ?></td>
-                                <td style='text-align:right'><?= number_format($nation['city_cnt']) ?></td>
-                            </tr>
-                        <?php endforeach; ?>
-                    </tbody>
-                    <tfoot></tfoot>
-                </table>
-            </td>
-        </tr>
-    </table>
-    <br>
-
-    <table align=center width=1000 class='tb_layout bg0'>
-        <tr>
-            <td><?= backButton() ?></td>
-        </tr>
-        <tr>
-            <td><?= banner() ?></td>
-        </tr>
-    </table>
-    <script>
-        reloadWorldMap({
-            neutralView: true,
-            showMe: true,
-            useCachedMap: true
-        });
-    </script>
-</body>
-
-</html>

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,18 +48,20 @@ $templates = new \League\Plates\Engine('templates');
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 암행부</title>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 

hwe/b_myBossInfo.php

@@ -25,12 +25,24 @@ if ($meLevel == 0) {
 
 $nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nation where nation=%i', $nationID); //국가정보
 
+if ($meLevel >= 5) {
+    $candidateStrength = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and strength>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
+    $candidateIntel = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and intel>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
+    $candidateAny = $db->query('SELECT no,name,officer_level,city,npc,leadership,strength,intel,killturn from general where nation=%i and officer_level!=12  order by npc,binary(name)', $nationID); //추방 때문에 조금 더 김
+} else {
+    $candidateStrength = [];
+    $candidateIntel = [];
+    $candidateAny = [];
+}
+
+
 ?>
 <!DOCTYPE html>
 <html>
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 인사부</title>
@@ -43,6 +55,7 @@ $nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nati
         var chiefStatMin = <?= GameConst::$chiefStatMin ?>;
         var myLevel = <?= $meLevel ?>;
     </script>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common', 'bossInfo']) ?>
 
     <?php
@@ -180,61 +193,21 @@ $nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nati
             <td colspan=5><?= $eaglestr ?></td>
         </tr>
     </table>
+
     <table align=center width=1000 class='tb_layout bg0'>
         <tr>
-            <td colspan=6 height=5></td>
+            <td colspan=4 height=5></td>
         </tr>
         <tr>
-            <td colspan=2 align=center bgcolor=red>추 방</td>
+            <td colspan=4 align=center bgcolor=blue>수 뇌 부 임 명</td>
         </tr>
         <tr>
-            <td width=498 align=right class='bg1'>대상 장수</td>
-            <td width=498>
+            <?php $officerLevelText = getOfficerLevelText(11, $nation['level']); ?>
+            <td width=98 align=right class='bg1'><?= getOfficerLevelText(12, $nation['level']) ?></td>
+            <td width=398><?= $level[12]['name'] ?> 【<?= CityConst::byID($level[12]['city'])->name ?>】</td>
+            <td width=98 align=right class='bg1'><?= $officerLevelText ?></td>
+            <td width=398>
                 <?php
-
-                if ($meLevel >= 5) {
-                    $candidateStrength = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and strength>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
-                    $candidateIntel = $db->query('SELECT no,name,officer_level,city,npc from general where nation=%i and officer_level!=12 and intel>=%i order by npc,binary(name)', $nationID, GameConst::$chiefStatMin);
-                    $candidateAny = $db->query('SELECT no,name,officer_level,city,npc,leadership,strength,intel,killturn from general where nation=%i and officer_level!=12  order by npc,binary(name)', $nationID); //추방 때문에 조금 더 김
-                } else {
-                    $candidateStrength = [];
-                    $candidateIntel = [];
-                    $candidateAny = [];
-                }
-
-
-                if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $meLevel)) {
-                    echo "
-            <select id='genlist_kick' size=1 style=color:white;background-color:black;>";
-
-                    foreach ($candidateAny as $general) {
-                        if ($general['no'] === $me['no']) {
-                            continue;
-                        }
-                        echo "
-                <option data-officer_level='{$general['officer_level']}' data-name='{$general['name']}' value={$general['no']}>{$general['name']} <small>({$general['leadership']}/{$general['strength']}/{$general['intel']}, {$general['killturn']}턴)</small></option>";
-                    }
-
-                    echo "
-            </select>
-            <input type=$btn id='btn_kick' value=추방>";
-                }
-
-                $officerLevelText = getOfficerLevelText(11, $nation['level']);
-                echo "
-        </td>
-    </tr>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td colspan=4 height=5></td></tr>
-    <tr><td colspan=4 align=center bgcolor=blue>수 뇌 부 임 명</td></tr>
-    <tr>
-        <td width=98  align=right class='bg1'>" . getOfficerLevelText(12, $nation['level']) . "</td>
-        <td width=398>{$level[12]['name']} 【" . CityConst::byID($level[12]['city'])->name . "】</td>
-        <td width=98  align=right class='bg1'>{$officerLevelText}</td>
-        <td width=398>
-";
-
                 if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], 11)) {
                     echo "
             <select id='genlist_11' size=1 maxlength=15 style=color:white;background-color:black;>
@@ -553,6 +526,34 @@ $nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nati
                         <td colspan=5>※ <font color=orange>노란색</font>은 변경 불가능, 하얀색은 변경 가능 관직입니다.</td>
                     </tr>
                 </table>
+                <table align=center width=1000 class='tb_layout bg0'>
+                    <tr>
+                        <td colspan=6 height=5></td>
+                    </tr>
+                    <tr>
+                        <td colspan=2 align=center bgcolor=red>추 방</td>
+                    </tr>
+                    <tr>
+                        <td width=498 align=right class='bg1'>대상 장수</td>
+                        <td width=498>
+                            <?php
+                            if ($meLevel >= 5 && !isOfficerSet($nation['chief_set'], $meLevel)) : ?>
+
+                                <select id='genlist_kick' size=1 style=color:white;background-color:black;>";
+
+                                    <?php foreach ($candidateAny as $general) : ?>
+                                        <?php if ($general['no'] === $me['no']) {
+                                            continue;
+                                        }
+                                        ?>
+                                        <option data-officer_level='<?= $general['officer_level'] ?>' data-name='<?= $general['name'] ?>' value='<?= $general['no'] ?>'><?= $general['name'] ?> <small>(<?= $general['leadership'] ?>/<?= $general['strength'] ?>/<?= $general['intel'] ?>, <?= $general['killturn'] ?>턴)</small></option>
+                                    <?php endforeach; ?>
+                                </select>
+                                <input type=<?= $btn ?> id='btn_kick' value=추방>
+                            <?php endif; ?>
+                        </td>
+                    </tr>
+                </table>
                 <br>
                 <table align=center width=1000 class='tb_layout bg0'>
                     <tr>

hwe/b_myCityInfo.php

@@ -33,12 +33,14 @@ $sel = [$type => "selected"];
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 세력도시</title>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common', 'extExpandCity']) ?>
 </head>
 

hwe/b_myGenInfo.php

@@ -42,12 +42,14 @@ if ($gameStor->isunited) {
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 세력장수</title>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 
@@ -95,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],
@@ -103,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'>
@@ -171,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_myKingdomInfo.php

@@ -25,12 +25,14 @@ if ($nationID == 0) {
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 세력정보</title>
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 

hwe/b_myPage.php

@@ -2,11 +2,16 @@
 
 namespace sammo;
 
+use sammo\Enums\GeneralAccessLogColumn;
+use sammo\Enums\GeneralQueryMode;
+use sammo\Enums\TableName;
+
 include "lib.php";
 include "func.php";
 
-$showDieImmediatelyBtn = false;
-$availableDieImmediately = false;
+$showDieOnPrestartBtn = false;
+$showBuildNationCandidateBtn = false;
+$availableDieOnPrestart = false;
 
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
@@ -19,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) {
@@ -28,34 +33,63 @@ if ($myset > 0) {
     $submit = 'hidden';
 }
 
-$targetTime = addTurn($me->getVar('lastrefresh'), $gameStor->turnterm, 2);
+$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) {
-        $showDieImmediatelyBtn = true;
+    if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
+        $showDieOnPrestartBtn = true;
         if ($targetTime <= TimeUtil::now()) {
-            $availableDieImmediately = true;
+            $availableDieOnPrestart = true;
         }
     }
+
+    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>
 
 <head>
     <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=500" />
     <title><?= UniqueConst::$serverName ?>: 내정보</title>
-    <script>
-        var availableDieImmediately = <?= $availableDieImmediately ? 'true' : 'false' ?>;
-    </script>
+    <?= WebUtil::printStaticValues([
+        'availableDieOnPrestart' => $availableDieOnPrestart,
+        'staticValues' => [
+            'items' => Util::mapWithKey(fn (string $key, BaseItem $item) => [
+                'name' => $item->getName(),
+                'rawName' => $item->getRawName(),
+                'className' => $item->getRawClassName(),
+                'cost' => $item->getCost(),
+                'isBuyable' => $item->isBuyable(),
+            ], $me->getItems())
+        ]
+    ]) ?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['myPage']) ?>
 </head>
 
@@ -65,15 +99,15 @@ $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="row">
-                    <div class="col" style='padding-left:4ch;'>
+            <div class="col col-12 col-lg-6">
+                <div class="row mx-0 gx-0">
+                    <div class="col" style='padding-left:2ch;'>
                         토너먼트 【
                         <input type=radio class='tnmt' name=tnmt value=0 <?= $me->getVar('tnmt') == 0 ? "checked" : ""; ?>>수동참여
                         <input type=radio class='tnmt' name=tnmt value=1 <?= $me->getVar('tnmt') == 1 ? "checked" : ""; ?>>자동참여
@@ -94,18 +128,29 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                                 <option value=0 <?= (!$use_auto_nation_turn) ? "selected" : ""; ?>>허용 안함</option>
                             </select>】<br>
                             ∞<span style='color:orange'>수뇌가 되었을 때 휴식 턴이어도 적당한 턴을 알아서 넣는 것을 허용합니다.</span><br><br>
-                        <?php else: ?>
-                            <input type="hidden" id='use_auto_nation_turn' name='use_auto_nation_turn' value="1"/>
+                        <?php else : ?>
+                            <input type="hidden" id='use_auto_nation_turn' name='use_auto_nation_turn' value="1" />
                         <?php endif; ?>
                         수비 【<select id='defence_train' name='defence_train'>
                             <?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]</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>
@@ -113,9 +158,19 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                         <!--빙의 해제용 삭턴 조절<br>
             <a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>빙의 해체 요청</button></a>-->
 
-                        <?php if ($showDieImmediatelyBtn) : ?>
+                        <?php if ($showDieOnPrestartBtn) : ?>
                             가오픈 기간 내 장수 삭제 (<?= substr($targetTime, 0, 19) ?> 부터)<br>
-                            <a href="c_die_immediately.php" id='die_immediately'><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>장수 삭제</button></a><br><br>
+                            <button type="button" id='dieOnPrestart' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>장수 삭제</button><br><br>
+                        <?php endif; ?>
+
+                        <?php if ($showBuildNationCandidateBtn) : ?>
+                            서버 개시 이전 거병(2턴부터 건국 가능)<br>
+                            <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) : ?>
@@ -138,6 +193,18 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                                 </div>
                             </div>
                         </div>
+
+                        <div class="row">
+                            <div class="col">아이템 파기</div>
+
+                        </div>
+                        <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>
+                                <?php endforeach; ?>
+                            </div>
+                        </div>
                         <br>
 
                         개인용 CSS<br>
@@ -145,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>
@@ -158,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>
@@ -172,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>
@@ -182,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,58 +14,106 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("토너먼트", 1);
 TurnExecutionHelper::executeAllCommand();
 
-$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
+);
+$generalID = $me['no'];
+$admin = $gameStor->getValues(['tournament', 'phase', 'turnterm', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
+$turnTerm = $admin['turnterm'];
 
-$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
-
-$con = checkLimit($me['con']);
-if ($con >= 2) {
+$limitState = checkLimit($me['refresh_score']);
+if ($limitState >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
 
 switch ($admin['tnmt_type']) {
-    default:
-        throw new \RuntimeException('invalid tnmt_type');
-    case 0:
-        $tnmt_type = "<font color=cyan>전력전</font>";
+    case convertTournamentType('전력전'):
+        $tnmt_type = "전력전";
+        $color = 'cyan';
         $tp = "total";
         $tp2 = "종합";
         $tp3 = "total";
         break;
-    case 1:
-        $tnmt_type = "<font color=cyan>통솔전</font>";
+    case convertTournamentType('통솔전'):
+        $tnmt_type = "통솔전";
+        $color = 'cyan';
         $tp = "leadership";
         $tp2 = "통솔";
         $tp3 = "leadership";
         break;
-    case 2:
-        $tnmt_type = "<font color=cyan>일기토</font>";
+    case convertTournamentType('일기토'):
+        $tnmt_type = "일기토";
+        $color = 'cyan';
         $tp = "strength";
         $tp2 = "무력";
         $tp3 = "strength";
         break;
-    case 3:
-        $tnmt_type = "<font color=cyan>설전</font>";
+    case convertTournamentType('설전'):
+        $tnmt_type = "설전";
+        $color = 'cyan';
         $tp = "intel";
         $tp2 = "지력";
         $tp3 = "intel";
         break;
+    default:
+        throw new \RuntimeException('invalid tnmt_type');
 }
 
+
+$bettingID = $gameStor->last_tournament_betting_id ?? 0;
+if ($bettingID != 0) {
+    $betting = $bettingID != 0 ? new Betting($bettingID) : null;
+    $info = $betting->getInfo();
+} else {
+    $info = getDummyBettingInfo($tnmt_type);
+}
+
+$myBet = [];
+$globalBet = [];
+
+if ($bettingID != 0) {
+    $betting = $bettingID != 0 ? new Betting($bettingID) : null;
+    $info = $betting->getInfo();
+
+    foreach ($db->queryAllLists(
+        'SELECT general_id, user_id, amount, betting_type FROM ng_betting WHERE betting_id = %i',
+        $bettingID
+    ) as [$betGeneralID, $userID, $amount, $bettingTypeKey]) {
+        $bettingKey = Json::decode($bettingTypeKey)[0];
+        if ($betGeneralID == $generalID) {
+            $myBet[$bettingKey] = $amount;
+        }
+
+        if (key_exists($bettingKey, $globalBet)) {
+            $globalBet[$bettingKey] += $amount;
+        } else {
+            $globalBet[$bettingKey] = $amount;
+        }
+    }
+} else {
+    $info = getDummyBettingInfo($tnmt_type);
+}
+
+$myBetTotal = array_sum($myBet);
+$globalBetTotal = array_sum($globalBet);
+
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다! 제한량이 모자라다면 참여를 해보세요^^");
 } ?>
 
 <head>
     <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" />
     <title><?= UniqueConst::$serverName ?>: 토너먼트</title>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= 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>
@@ -77,128 +125,24 @@ switch ($admin['tnmt_type']) {
         </tr>
     </table>
     <table align=center class='tb_layout bg0'>
-        <?php
-        if ($session->userGrade >= 5) {
-            $sel = [];
-            echo "
-<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>
-        <input type=button value='갱신' onclick='location.reload()'>";
-
-            switch ($admin['tnmt_trig']) {
-                case 0:
-                    $sel[0] = "selected";
-                    break;
-                case 1:
-                    $sel[1] = "selected";
-                    break;
-                case 2:
-                    $sel[2] = "selected";
-                    break;
-                case 3:
-                    $sel[3] = "selected";
-                    break;
-                case 4:
-                    $sel[4] = "selected";
-                    break;
-                case 5:
-                    $sel[5] = "selected";
-                    break;
-                case 6:
-                    $sel[6] = "selected";
-                    break;
-                case 7:
-                    $sel[7] = "selected";
-                    break;
-            }
-
-            if ($admin['tournament'] == 0) {
-        ?>
-                <select name=auto size=1 style=color:white;background-color:black;>
-                    <option style=color:white; value=0>수동진행</option>
-                    <option style=color:white; value=1>12분 05일</option>
-                    <option style=color:white; value=2>07분 10시</option>
-                    <option style=color:white; value=3>03분 04시</option>
-                    <option style=color:white; value=4>01분 82분</option>
-                    <option style=color:white; value=5>30초 41분</option>
-                    <option style=color:white; value=6>15초 21분</option>
-                    <option style=color:white; value=7>05초 07분</option>
-                </select>
-                <select name=type size=1 style=color:white;background-color:black;>
-                    <option style=color:white; value=0>전력전</option>
-                    <option style=color:white; value=1>통솔전</option>
-                    <option style=color:white; value=2>일기토</option>
-                    <option style=color:white; value=3>설전</option>
-                </select>
-                <input type=submit name=btn value='개최'>
-                <select name=trig size=1 style=color:white;background-color:black;>
-                    <option style=color:white; value=0 <?= $sel[0] ?? '' ?>>수동진행</option>
-                    <option style=color:white; value=1 <?= $sel[1] ?? '' ?>>12분 05일</option>
-                    <option style=color:white; value=2 <?= $sel[2] ?? '' ?>>07분 10시</option>
-                    <option style=color:white; value=3 <?= $sel[3] ?? '' ?>>03분 04시</option>
-                    <option style=color:white; value=4 <?= $sel[4] ?? '' ?>>01분 82분</option>
-                    <option style=color:white; value=5 <?= $sel[5] ?? '' ?>>30초 41분</option>
-                    <option style=color:white; value=6 <?= $sel[6] ?? '' ?>>15초 21분</option>
-                    <option style=color:white; value=7 <?= $sel[7] ?? '' ?>>05초 07분</option>
-                </select>
-                <input type=submit name=btn value='자동개최설정'>
-                <input type=submit name=btn value='포상'>
-                <input type=submit name=btn value='회수'>
-        <?php
-            } else {
-                echo "<input type=submit name=btn value='중단' onclick='return confirm(\"진짜 중단하시겠습니까?\")'>";
-            }
-
-            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;
-            }
-
-            echo "
-    </td></tr>
-</form>";
-        } elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) {
-            echo "<form method=post action=c_tournament.php><tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'><input type=submit name=btn value='참가' onclick='return confirm(\"참가비 금{$admin['develcost']}이 필요합니다. 참가하시겠습니까?\")'></td></tr></form>";
-        } else {
-            echo "<tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'></td></tr>";
-        }
+        <?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>
+                </tr>
+            </form>
+        <?php else : ?>
+            <tr>
+                <td colspan=8><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button></td>
+            </tr>
+        <?php endif;
 
         $str1 = getTournament($admin['tournament']);
         $str2 = getTournamentTime();
         if ($str2) {
             $str2 = ', ' . $str2;
         }
-        $str3 = getTournamentTermText();
+        $str3 = getTournamentTermText($turnTerm);
         if ($str3) {
             $str3 = ', ' . $str3;
         }
@@ -209,7 +153,7 @@ switch ($admin['tnmt_type']) {
         </tr>
         <tr>
             <td colspan=8 align=center>
-                <font color=white size=6><?= $tnmt_type ?> (<?= $str1 . $str2 . $str3 ?>)</font>
+                <font color=white size=6><span style="color:<?= $color ?>"><?= $tnmt_type ?></span> (<?= $str1 . $str2 . $str3 ?>)</font>
             </td>
         </tr>
         <tr>
@@ -418,24 +362,31 @@ switch ($admin['tnmt_type']) {
 
         echo "
                 </tr>";
-        $globalBet = $db->queryFirstList('SELECT * FROM betting WHERE general_id = 0') ?? [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,];
-        $globalBet = array_splice($globalBet, -16);
-        $globalBetTotal = array_sum($globalBet);
         $admin = $gameStor->getValues(['tournament', 'phase']);
         $bet = [];
-        for ($i = 0; $i < 16; $i++) {
-            if ($globalBet[$i] == 0) {
-                $bet[$i] = '∞';
-                continue;
+        $gold = [];
+        $keyMap = [];
+        foreach ($info->candidates as $key => $candidate) {
+            $keyMap[$candidate->aux['idx']] = $key;
+        }
+
+        foreach ($globalBet as $key => $amount) {
+            if ($amount == 0) {
+                $bet[$key] = "∞";
+                $gold[$key] = 0;
+            } else {
+                $rewardRatio = round($globalBetTotal / $amount, 2);
+                $bet[$key]  = $rewardRatio;
+                $gold[$key] = $rewardRatio * ($myBet[$key] ?? 0);
             }
-            $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
         }
 
         echo "
                 <tr align=center>";
 
-        for ($i = 0; $i < 16; $i++) {
-            echo "<td><font color=skyblue>{$bet[$i]}</font></td>";
+        foreach (range(0, 15) as  $i) {
+            $amount = $bet[$keyMap[$i] ?? -1] ?? 0;
+            echo "<td><font color=skyblue>{$amount}</font></td>";
         }
 
         echo "
@@ -469,7 +420,7 @@ switch ($admin['tnmt_type']) {
                 printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
             }
             foreach (Util::range(count($generalList), 4) as $idx) {
-                printRow($idx, '', '', '', '', '', '', '', '', '', '');
+                printRow($idx, 0, '', '', '', '', '', '', '', '', '');
             }
             echo "
             </table>
@@ -496,7 +447,7 @@ switch ($admin['tnmt_type']) {
                 printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
             }
             foreach (Util::range(count($generalList), 8) as $idx) {
-                printRow($idx, '', '', '', '', '', '', '', '', '', '');
+                printRow($idx, 0, '', '', '', '', '', '', '', '', '');
             }
             echo "
             </table>

hwe/b_troop.php

@@ -1,230 +0,0 @@
-<?php
-
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-
-increaseRefresh("부대편성", 1);
-
-$me = $db->queryFirstRow('SELECT no,nation,troop FROM general WHERE owner=%i', $userID);
-
-$troops = [];
-foreach ($db->query('SELECT troop_leader,name FROM troop WHERE nation = %i', $me['nation']) as $rawTroop) {
-    $troops[$rawTroop['troop_leader']] = [
-        'name' => $rawTroop['name'],
-        'users' => []
-    ];
-}
-
-foreach ($db->query(
-    'SELECT no,name,turntime,troop,city FROM general WHERE troop!=0 AND nation = %i ORDER BY turntime ASC',
-    $me['nation']
-) as $general) {
-    if (!key_exists($general['troop'], $troops)) {
-        trigger_error("올바르지 않은 부대 소속 {$general['no']}, {$general['name']} : {$general['troop']}");
-        continue;
-    }
-
-    $general['cityText'] = CityConst::byID($general['city'])->name;
-
-    $troops[$general['troop']]['users'][] = $general;
-}
-
-if ($troops) {
-    $troopLeaders = $db->query(
-        'SELECT no,name,picture,imgsvr,turntime,city,troop FROM general WHERE no IN %li',
-        array_keys($troops)
-    );
-    $generalTurnList = [];
-
-    foreach ($db->queryAllLists(
-        'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
-        array_column($troopLeaders, 'no')
-    ) as [$generalID, $turnIdx, $brief]) {
-        if (!key_exists($generalID, $generalTurnList)) {
-            $generalTurnList[$generalID] = [];
-        }
-        $generalTurnList[$generalID][$turnIdx] = $brief;
-    }
-
-    foreach ($troopLeaders as $troopLeader) {
-        $imageTemp = GetImageURL($troopLeader['imgsvr']);
-
-        $troopLeader['pictureFullPath'] = "$imageTemp/{$troopLeader['picture']}";
-        $troopLeader['cityText'] = CityConst::byID($troopLeader['city'])->name;
-
-        $turnText = [];
-        foreach ($generalTurnList[$troopLeader['no']] as $rawTurnIdx => $brief) {
-            if ($brief != '집합') {
-                $brief = '~';
-            }
-            $turnIdx = $rawTurnIdx + 1;
-            $turnText[] = "{$turnIdx} : {$brief}";
-        }
-        $troopLeader['turnText'] = join('<br>', $turnText);
-        $troops[$troopLeader['troop']]['leader'] = $troopLeader;
-    }
-}
-
-uasort($troops, function ($lhs, $rhs) {
-    return $lhs['leader']['turntime'] <=> $rhs['leader']['turntime'];
-})
-
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=1024" />
-    <title><?= UniqueConst::$serverName ?>: 부대편성</title>
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printDist('ts', ['common', 'troop'], true) ?>
-</head>
-
-<body>
-    <div style="width:1000px;margin:auto;">
-        <table width=1000 class='tb_layout bg0'>
-            <tr>
-                <td>부 대 편 성<br><?= backButton() ?></td>
-            </tr>
-        </table>
-        <table id="troop_list" class='tb_layout bg0'>
-            <thead>
-                <tr>
-                    <td width=64 class='bg1 center'>선 택</td>
-                    <td width=130 class='bg1 center'>부 대 정 보</td>
-                    <td width=100 class='bg1 center'>부 대 장</td>
-                    <td width=576 class='bg1 center' style=table-layout:fixed;word-break:break-all;>장 수</td>
-                    <td width=130 class='bg1 center' style=table-layout:fixed;word-break:break-all;>부대장행동</td>
-                </tr>
-            </thead>
-            <tfoot>
-                <tr>
-                    <td colspan='5'>
-                        <?php if (!$troops) : ?>
-                        <?php elseif ($me['troop'] == 0) : ?>
-                            <input type=button id='btnJoinTroop' value='부 대 가 입'>
-                        <?php else : ?>
-                            <input type=button id="btnLeaveTroop" value='부 대 탈 퇴'>
-                        <?php endif; ?>
-                    </td>
-                </tr>
-            </tfoot>
-            <tbody>
-                <?php
-                foreach ($troops as $troopNo => $troop) {
-                    $troopLeader = $troop['leader'];
-                    $genlistText = [];
-                    $cityText = $troopLeader['cityText'];
-                    $cityID = $troopLeader['city'];
-                    $leaderID = $troopLeader['no'];
-
-                    foreach ($troop['users'] as $troopUser) {
-                        $spanClass = 'troopUser';
-                        if ($troopUser['city'] !== $cityID) {
-                            $spanClass .= ' diffCity';
-                        }
-                        if ($troopUser['no'] == $leaderID) {
-                            $spanClass .= ' leader';
-                        }
-                        $genlistText[] = "<span class='$spanClass' data-general-id='{$troopUser['no']}'
-            ><span class='generalName'>{$troopUser['name']}</span><span class='cityText'>【{$troopUser['cityText']}】</span
-            ></span>";
-                    }
-
-                    $genlistText = sprintf('%s (%d명)', join(', ', $genlistText), count($genlistText)); ?>
-
-                    <?php if ($me['troop'] == 0) : ?>
-                        <tr>
-                            <td align=center rowspan=2><input type='radio' class='troopId' name='troop' value='<?= $troopNo ?>'></td>
-                            <td align=center><?= $troop['name'] ?><br>【 <?= $cityText ?> 】</td>
-                            <td height=64 class='generalIcon' style='background:no-repeat center url("<?= $troopLeader['pictureFullPath'] ?>");background-size:64px;'>&nbsp;</td>
-                            <td rowspan=2 width=62><?= $genlistText ?></td>
-                            <td rowspan=2><?= $troopLeader['turnText'] ?></td>
-                        </tr>
-                        <tr>
-                            <td align=center>
-                                <font size=2>【턴】 <?= substr($troopLeader['turntime'], 14, 5) ?></font>
-                            </td>
-                            <td align=center>
-                                <font size=1><?= $troopLeader['name'] ?></font>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan=5>
-
-                            <?php else : ?>
-                        <tr>
-                            <td align=center rowspan=2>&nbsp;</td>
-                            <td align=center><?= $troop['name'] ?><br>【 <?= $cityText ?> 】</td>
-                            <td height=64 class='generalIcon' style='background:no-repeat center url("<?= $troopLeader['pictureFullPath'] ?>");background-size:64px;'>&nbsp;</td>
-                            <td rowspan=2 width=62><?= $genlistText ?></td>
-                            <td rowspan=2>
-                                <?php if ($me['no'] == $troopLeader['no']) : ?>
-                                    <select id='genNo' name=gen size=3 style=color:white;background-color:black;font-size:14px;width:128px;>";
-                                        <?php foreach ($troop['users'] as $troopUser) : ?>
-                                            <?php if ($troopUser['no'] == $me['no']) {
-                                                continue;
-                                            } ?>
-                                            <option value='<?= $troopUser['no'] ?>'><?= $troopUser['name'] ?></option>
-                                        <?php endforeach; ?>
-                                    </select><br>
-                                    <input type=button id='btnKickTroop' value='부 대 추 방' style=width:130px;height:25px;>
-                                <?php else : ?>
-                                    <?= $troopLeader['turnText'] ?>
-                                <?php endif; ?>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td align=center>
-                                <font size=2>【턴】 <?= substr($troopLeader['turntime'], 14, 5) ?></font>
-                            </td>
-                            <td align=center>
-                                <font size=1><?= $troopLeader['name'] ?></font>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td colspan=5></td>
-                        </tr>
-                <?php endif;
-                    } //foreach ($troops as $troopNo=>$troop) {
-                ?>
-
-            </tbody>
-
-        </table>
-        <br>
-        <table width=1000 class='tb_layout bg0'>
-            <tr>
-                <td width=80 class='bg1'>부 대 명</td>
-                <td width=130><input type=text style=color:white;background-color:black; size=18 maxlength=18 id='nameplate'></td>
-                <?php if ($me['troop'] == 0) : ?>
-                    <td><input type=button id='btnCreateTroop' value='부 대 창 설'></td>
-                <?php else : ?>
-                    <td><input type=button id='btnChangeTroopName' value='부 대 변 경'></td>
-                <?php endif; ?>
-            </tr>
-        </table>
-
-        <table width=1000 class='tb_layout bg0'>
-            <tr>
-                <td><?= backButton() ?></td>
-            </tr>
-            <tr>
-                <td><?= banner() ?> </td>
-            </tr>
-        </table>
-    </div>
-</body>
-
-</html>

hwe/battle_simulator.php

@@ -43,6 +43,7 @@ if ($nationID) {
 <head>
     <title><?= UniqueConst::$serverName ?>: 전투 시뮬레이터</title>
     <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1100" />
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
@@ -54,6 +55,7 @@ if ($nationID) {
         var city = <?= Json::encode($city) ?>;
         var nation = <?= Json::encode($nation) ?>;
     </script>
+    <?= WebUtil::printDist('vue', [], true) ?>
     <?= WebUtil::printDist('ts', ['common', 'battle_simulator']) ?>
 </head>
 
@@ -64,8 +66,8 @@ if ($nationID) {
                 전역 설정
             </div>
             <div class="card-body dragpad_battle">
-                <div class="row">
-                    <div class="col-sm-6">
+                <div class="row gx-0">
+                    <div class="col-sm-4">
                         <div class="input-group">
                             <input type="number" class="form-control" aria-describedby="text_year" value="<?= $startYear ?>" disabled>
                             <div class="input-group-text"> 년 시작 </div>
@@ -75,9 +77,13 @@ if ($nationID) {
                             <div class="input-group-text"> 월 </div>
                         </div>
                     </div>
-                    <div class="col-sm-6">
+                    <div class="col-sm-5 px-2">
                         <div class="btn-toolbar" role="toolbar">
                             <div class="input-group me-2" role="group">
+                                <div class="input-group-text">
+                                    시드
+                                </div>
+                                <input type="text" class="form-control" id="seed" aria-describedby="text_seed">
                                 <div class="input-group-text">
                                     반복 횟수
                                 </div>
@@ -86,6 +92,10 @@ if ($nationID) {
                                     <option value="1000">1000회 (요약 표기)</option>
                                 </select>
                             </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="btn-toolbar" role="toolbar">
                             <div class="btn-group me-2" role="group">
                                 <button type="button" class="btn btn-danger btn-begin_battle">전투</button>
                             </div>
@@ -425,6 +435,25 @@ if ($nationID) {
                             </div>
                             <input type="number" class="form-control form_killcrew" value="0" step="1">
                         </div>
+
+                        <div class="input-group mb-0">
+                            <div class="input-group-text">자신</div>
+                            <div class="input-group-text">회피 확률</div>
+                            <input type="number" class="form-control form_war_avoid_ratio" value="0" step="1" min="0" max="5">
+                            <div class="input-group-text">필살 확률</div>
+                            <input type="number" class="form-control form_war_critical_ratio" value="0" step="1" min="0" max="5">
+                            <div class="input-group-text">계략 시도 확률</div>
+                            <input type="number" class="form-control form_war_magic_trial_prob" value="0" step="1" min="0" max="5">
+                        </div>
+                        <div class="input-group mb-1">
+                            <div class="input-group-text">상대</div>
+                            <div class="input-group-text">회피 확률</div>
+                            <input type="number" class="form-control form_oppose_war_avoid_ratio" value="0" step="1" min="0" max="5">
+                            <div class="input-group-text">필살 확률</div>
+                            <input type="number" class="form-control form_oppose_war_critical_ratio" value="0" step="1" min="0" max="5">
+                            <div class="input-group-text">계략 시도 확률</div>
+                            <input type="number" class="form-control form_oppose_war_magic_trial_prob" value="0" step="1" min="0" max="5">
+                        </div>
                     </div>
                 </div>
 

hwe/c_auction.php

@@ -1,247 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$v = new Validator($_POST + $_GET);
-$v->rule('integer', [
-    'amount',
-    'cost',
-    'topv',
-    'value',
-    'term',
-    'sel'
-]);
-
-$btn = Util::getPost('btn');
-$amount = Util::getPost('amount', 'int');
-$cost = Util::getPost('cost', 'int');
-$topv = Util::getPost('topv', 'int');
-$value = Util::getPost('value', 'int');
-$term = Util::getPost('term', 'int');
-$sel = Util::getPost('sel', 'int');
-
-$msg = '';
-$msg2 = '';
-
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-increaseRefresh("입찰", 1);
-
-$turnterm = $gameStor->turnterm;
-
-$me = $db->queryFirstRow('SELECT no,name,gold,rice,special from general where owner=%i', $userID);
-
-$tradeCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no1=%i', $me['no']);
-$bidCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no2=%i', $me['no']);
-
-$btCount = $tradeCount + $bidCount;
-
-$unit = $turnterm * 60;
-
-$amount = Util::round($amount, -1);
-$cost = Util::round($cost, -1);
-$topv = Util::round($topv, -1);
-$value = Util::round($value, -1);
-if ($term > 24) {
-    $term = 24;
-}
-
-$valid = 1;
-if ($session->userGrade >= 5 || $btCount < 1) {
-} else {
-    $msg = "ㆍ<span class='ev_warning'>더이상 등록할 수 없습니다.</span>";
-    $msg2 = "ㆍ<span class='ev_warning'>더이상 등록할 수 없습니다.</span>";
-    $valid = 0;
-    $btn = "hidden";
-}
-
-if ($btn == "판매") {
-    if ($term < 0 || $term > 24) {
-        $msg = "ㆍ<span class='ev_warning'>종료기한은 1 ~ 24 턴 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($amount < 100 || $amount > 10000) {
-        $msg = "ㆍ<span class='ev_warning'>거래량은 100 ~ 10000 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($cost > $amount * 2 || $cost * 2 < $amount) {
-        $msg = "ㆍ<span class='ev_warning'>시작판매가는 50% ~ 200% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv * 10 < $amount * 11 || $topv > $amount * 2) {
-        $msg = "ㆍ<span class='ev_warning'>즉시판매가는 110% ~ 200% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv * 10 < $cost * 11) {
-        $msg = "ㆍ<span class='ev_warning'>즉시판매가는 시작판매가의 110% 이상이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($amount > $me['rice'] - GameConst::$defaultRice) {
-        $msg = "ㆍ<span class='ev_warning'>기본 군량 ".GameConst::$defaultRice."은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg = "ㆍ<span class='ev_success'>등록 성공.</span>";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term);
-        $db->insert('auction', [
-            'type'=>0,
-            'no1'=>$me['no'],
-            'name1'=>$me['name'],
-            'amount'=>$amount,
-            'cost'=>$cost,
-            'value'=>$cost,
-            'topv'=>$topv,
-            'expire'=>$date
-        ]);
-    }
-} elseif ($btn == "구매시도") {
-    $auction = $db->queryFirstRow('SELECT no2,value,topv,expire,amount FROM auction WHERE no=%i LIMIT 1', $sel);
-
-    if ($value == $auction['topv']) {
-        $valid = 2;
-    }
-    if (!$auction) {
-        $msg = "ㆍ<span class='ev_warning'>종료된 거래입니다.</span>";
-        $valid = 0;
-    }
-    if ($auction['no2'] > 0 && $value <= $auction['value']) {
-        $msg = "ㆍ<span class='ev_warning'>현재판매가보다 높게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value < $auction['value']) {
-        $msg = "ㆍ<span class='ev_warning'>현재판매가보다 높게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $auction['topv']) {
-        $msg = "ㆍ<span class='ev_warning'>즉시판매가보다 높을 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $me['gold'] - GameConst::$defaultGold) {
-        $msg = "ㆍ<span class='ev_warning'>기본 자금 ".GameConst::$defaultGold."은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg = "ㆍ<span class='ev_success'>입찰 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-        if ($auction['expire'] > $date) {
-            $date = $auction['expire'];
-        }
-        
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    } elseif ($valid == 2) {
-        $msg = "ㆍ<span class='ev_success'>즉시판매 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    }
-} elseif ($btn == "구매") {
-    if ($term < 0 || $term > 24) {
-        $msg2 = "ㆍ<span class='ev_warning'>종료기한은 1 ~ 24 턴 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($amount < 100 || $amount > 10000) {
-        $msg2 = "ㆍ<span class='ev_warning'>거래량은 100 ~ 10000 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($cost > $amount * 2 || $cost * 2 < $amount) {
-        $msg2 = "ㆍ<span class='ev_warning'>시작구매가는 50% ~ 200% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv < $amount * 0.5 || $topv > $amount * 0.9) {
-        $msg2 = "ㆍ<span class='ev_warning'>즉시구매가는 50% ~ 90% 이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($topv > $cost * 0.9) {
-        $msg2 = "ㆍ<span class='ev_warning'>즉시구매가는 시작구매가의 90% 이하이어야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($cost > $me['gold'] - GameConst::$defaultGold) {
-        $msg2 = "ㆍ<span class='ev_warning'>기본 자금 ".GameConst::$defaultGold."은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg2 = "ㆍ<span class='ev_success'>등록 성공.</span>";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term);
-
-        $db->insert('auction', [
-            'type'=>1,
-            'no1'=>$me['no'],
-            'name1'=>$me['name'],
-            'amount'=>$amount, 
-            'cost'=>$cost, 
-            'value'=>$cost, 
-            'topv'=>$topv, 
-            'expire'=>$date
-        ]);
-    }
-} elseif ($btn == "판매시도") {
-    $auction = $db->queryFirstRow('SELECT no2,value,topv,expire,amount FROM auction WHERE no=%i LIMIT 1', $sel);
-
-    if ($value == $auction['topv']) {
-        $valid = 2;
-    }
-    if (!$auction) {
-        $msg2 = "ㆍ<span class='ev_warning'>종료된 거래입니다.</span>";
-        $valid = 0;
-    }
-    if ($auction['no2'] > 0 && $value >= $auction['value']) {
-        $msg2 = "ㆍ<span class='ev_warning'>현재구매가보다 낮게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $auction['value']) {
-        $msg2 = "ㆍ<span class='ev_warning'>현재구매가보다 낮게 입찰해야 합니다.</span>";
-        $valid = 0;
-    }
-    if ($value < $auction['topv']) {
-        $msg2 = "ㆍ<span class='ev_warning'>즉시구매가보다 낮을 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($value > $me['rice'] - GameConst::$defaultRice) {
-        $msg2 = "ㆍ<span class='ev_warning'>기본 군량 ".GameConst::$defaultRice."은 거래할 수 없습니다.</span>";
-        $valid = 0;
-    }
-    if ($valid == 1) {
-        $msg2 = "ㆍ<span class='ev_success'>입찰 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-        if ($auction['expire'] > $date) {
-            $date = $auction['expire'];
-        }
-
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    } elseif ($valid == 2) {
-        $msg2 = "ㆍ<span class='ev_success'>즉시구매 성공.</span> 거래완료는 빨라도 현재로부터 1턴 뒤입니다.";
-        $date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit);
-
-        $db->update('auction', [
-            'value'=>$value,
-            'no2'=>$me['no'],
-            'name2'=>$me['name'],
-            'expire'=>$date,
-        ], 'no=%i', $sel);
-    }
-}
-
-Submit("b_auction.php", $msg, $msg2);

hwe/c_tournament.php

@@ -113,11 +113,11 @@ if($session->userGrade < 5) {
 }
 
 if($btn == "자동개최설정") {
-    $gameStor->tnmt_trig = $trig;
+    $gameStor->tnmt_trig = !!$trig;
 } elseif($btn == "개최") {
     startTournament($auto, $type);
 } elseif($btn == "중단") {
-    $gameStor->tnmt_auto = 0;
+    $gameStor->tnmt_auto = false;
     $gameStor->tournament = 0;
     $gameStor->phase = 0;
 } elseif($btn == "랜덤투입") {
@@ -225,6 +225,8 @@ if($btn == "자동개최설정") {
     finallyAll($admin['tnmt_type'], $admin['tournament'], $admin['phase']);
 } elseif($btn == "배정") {
     final16set();
+    $phase = 0;
+    startBetting($admin['tnmt_type'], 720);
 } elseif($btn == "베팅마감") {
     $dt = date("Y-m-d H:i:s", time() + 60);
     $gameStor->tournament=7;

hwe/c_vote.php

@@ -1,91 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$btn = Util::getPost('btn');
-$sel = Util::getPost('sel', 'int');
-$comment = Util::getPost('comment');
-$title = Util::getPost('title');
-$str = Util::getPost('str');
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$isVoteAdmin = in_array('vote', $session->acl[DB::prefix()]??[]);
-$isVoteAdmin = $isVoteAdmin || $session->userGrade >= 5;
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-$admin = $gameStor->getValues(['develcost', 'cost', 'vote_title', 'vote', 'votecomment']);
-
-$generalID = Session::getGeneralID();
-
-$general = General::createGeneralObjFromDB($generalID, ['vote','horse','weapon','book','item','npc','imgsvr','picture','aux'], 2);
-
-if($btn == "투표" && $general->getVar('vote') == 0 && $sel > 0) {
-    $develcost = $admin['develcost'] * 5;
-    $db->update('general', [
-        'gold'=>$db->sqleval('gold + %i', $develcost),
-        'vote'=>$sel
-    ], 'owner=%i', $userID);
-
-    if(tryUniqueItemLottery($general, '설문조사')){
-        $general->applyDB($db);
-    }
-}
-else if($btn == "댓글" && trim($comment) != "") {
-    $comment = StringUtil::neutralize($comment);
-
-    $nation = $general->getStaticNation();
-
-    if(!$admin['votecomment']){
-        $admin['votecomment'] = [];
-    }
-    $admin['votecomment'][] = [$nation['name'],$general->getName(),$comment];
-    $gameStor->votecomment = $admin['votecomment'];
-}
-
-if(!$isVoteAdmin){
-    header('location:a_vote.php', true, 303);
-    die();
-}
-
-
-if($btn == "수정") {
-    if($title != "") {
-        $gameStor->vote_title = WebUtil::htmlPurify($title);
-    }
-} elseif($btn == "추가") {
-    if($str != "") {
-        if(!$admin['vote']){
-            $admin['vote'] = [];
-        }
-        $admin['vote'][] = WebUtil::htmlPurify($str);
-        $gameStor->vote=$admin['vote'];
-    }
-} elseif($btn == "리셋") {
-    $gameStor->voteopen=1;
-    $gameStor->vote=['-'];
-    $gameStor->vote_title = '-';
-    $gameStor->votecomment=[];
-
-    $db->update('general', [
-        'vote'=>0
-    ], true);
-} elseif($btn == "알림") {
-    $db->update('general', [
-        'newvote'=>1
-    ], 'vote=0');
-} elseif($btn == "숨김") {
-    $gameStor->voteopen = 0;
-} elseif($btn == "전체통계만") {
-    $gameStor->voteopen = 1;
-} elseif($btn == "전부") {
-    $gameStor->voteopen = 2;
-}
-
-header('location:a_vote.php', true, 303);

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