game: 애니집결 시나리오의 대사 빈도를 낮춤

fix: 이민족 발동시 서버 시간 변경 문제
game: 애니집결 10차 시나리오
2023-06-24 16:53:21 +00:00 · 2023-06-23 11:27:59 +00:00 · 2023-06-23 19:28:28 +09:00 · 2023-06-18 13:23:01 +09:00 · 2023-06-11 21:57:45 +09:00 · 2023-06-11 21:56:26 +09:00
579 changed files with 30848 additions and 17289 deletions
@@ -1,15 +0,0 @@
-{
-    "presets": [
-        [
-            "@babel/preset-env",
-            {
-                "useBuiltIns": "usage",
-                "corejs": 3,
-                "modules": false
-            }
-        ]
-    ],
-    "plugins": [
-        "lodash"
-    ]
-}
@@ -10,8 +10,10 @@
 *.log

 logs/*.txt
+api_log.db
 d_log/*.txt
 d_log/*.zip
+d_log/*.db
 sess_*
 */logs/*.txt
 */logs/*/*.txt
@@ -65,3 +67,5 @@ ingame/js/*
 ingame/css/*
 gateway/js/*
 gateway/css/*
+
+*.db-journal
@@ -45,7 +45,6 @@ return [
        'hwe/api.php',
        'hwe/a_traffic.php',
        'hwe/battle_simulator.php',
-        'hwe/b_battleCenter.php',
        'hwe/b_betting.php',
        'hwe/v_chiefCenter.php',
        'hwe/b_currentCity.php',
@@ -58,7 +57,6 @@ return [
        'hwe/b_myPage.php',
        'hwe/v_processing.php',
        'hwe/b_tournament.php',
-        'hwe/b_troop.php',
        'hwe/c_tournament.php',
        'hwe/func_auction.php',
        'hwe/func_command.php',
@@ -83,7 +81,6 @@ return [
        '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,12 +98,6 @@ return [
        'hwe/j_load_scenarios.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',
@@ -115,7 +106,6 @@ 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',
@@ -2,6 +2,7 @@
 <html>
    <head>
        <meta charset="utf-8">
+        <meta name="color-scheme" content="dark">
        <title>닫혀 있습니다.</title>
        <script>
            setTimeout(function(){
@@ -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
@@ -8,26 +8,26 @@
    ],
    "config": {
        "platform": {
-            "php": "8.1"
+            "php": "8.2"
        }
    },
    "require": {
        "brandonwamboldt/utilphp": "^1.1",
        "sergeytsalkov/meekrodb": "^2.3",
-        "league/plates": "^3.3",
+        "league/plates": "^3.5",
        "vlucas/valitron": "^1.4",
-        "php-extended/php-tail": "^2.1",
-        "pguardiario/phpuri": "^1.0",
-        "symfony/lock": "^6.0",
+        "php-extended/php-tail": "^5.0",
+        "symfony/lock": "^6.2",
        "ezyang/htmlpurifier": "^4.10",
        "xemlock/htmlpurifier-html5": "^0.1.7",
        "catfan/medoo": "^2.1",
-        "phan/phan": "^5.3",
-        "nette/caching": "^3.0",
-        "illuminate/database": "^9.12",
-        "illuminate/events": "^9.12",
-        "spatie/data-transfer-object": "^3.7",
-        "php-ds/php-ds": "^1.4"
+        "phan/phan": "^5.4",
+        "nette/caching": "^3.2",
+        "illuminate/database": "^10.0",
+        "illuminate/events": "^10.0",
+        "php-ds/php-ds": "^1.4",
+        "hided62/ldto": "^1.0",
+        "league/uri": "^6.8"
    },
    "autoload": {
        "psr-4": {
@@ -48,6 +48,6 @@
        ]
    },
    "require-dev": {
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.0"
    }
 }
@@ -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>
@@ -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);
    }
 }

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

@@ -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') ?>
@@ -2,6 +2,8 @@

 namespace sammo;

+use sammo\Enums\MessageType;
+
 include "lib.php";
 include "func.php";

@@ -111,7 +113,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', [
@@ -122,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', [
@@ -133,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', [
@@ -143,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', [
@@ -154,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', [
@@ -165,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', [
@@ -176,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', [
@@ -196,7 +198,7 @@ switch ($btn) {
    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;
@@ -23,14 +23,6 @@ $ipGroupList = Util::arrayGroupBy(
    'ip_c'
 );

-function colorBlockedName($general)
-{
-    if (!$general['blocked']) {
-        return $general['name'];
-    }
-    return "<span style='color:magenta;'>{$general['name']}</span>";
-}
-
 ?>
 <!DOCTYPE html>
 <html>
@@ -38,6 +30,7 @@ function colorBlockedName($general)
 <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') ?>
@@ -108,7 +101,7 @@ function colorBlockedName($general)
            </tr>
            <?php foreach ($ipGroupList as $ipGroupC => $users) : ?>
                <tr>
-                    <td><?= join('<br>', array_map('\sammo\colorBlockedName', $users)) ?></td>
+                    <td><?= join('<br>', array_column($users, 'name')) ?></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>
@@ -2,6 +2,8 @@

 namespace sammo;

+use sammo\Enums\MessageType;
+
 include "lib.php";
 include "func.php";
 //로그인 검사
@@ -18,7 +20,7 @@ $msg = Util::getPost('msg', 'string', '메시지');

 $db = DB::db();

-//NOTE: 왜 기능이 admin2와 admin4가 같이 있는가? 
+//NOTE: 왜 기능이 admin2와 admin4가 같이 있는가?
 //NOTE: 왜 블럭 시 admin4에선 금쌀을 없애지 않는가?
 switch ($btn) {
    case "블럭 해제":
@@ -66,7 +68,7 @@ switch ($btn) {
        $src = MessageTarget::buildQuick($session->generalID);
        foreach($genlist as $generalID){
            $msgObj = new Message(
-                Message::MSGTYPE_PRIVATE,
+                MessageType::private,
                $src,
                MessageTarget::buildQuick($generalID),
                $msg,
@@ -38,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') ?>
@@ -83,6 +83,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') ?>
@@ -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') ?>
@@ -27,7 +27,6 @@ foreach ($db->queryFirstColumn(

 $inheritPointManager = InheritancePointManager::getInstance();
 foreach(General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
-    $inheritPointManager->mergeTotalInheritancePoint($genObj, true);
+    $inheritPointManager->mergeTotalInheritancePoint($genObj);
    $inheritPointManager->applyInheritanceUser($genObj->getVar('owner'));
-    $inheritPointManager->clearInheritancePoint($genObj);
 }
@@ -28,12 +28,14 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');

 <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>
    <?= 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', 'bestGeneral']) ?>
 </head>

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

@@ -41,12 +41,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>
@@ -43,12 +43,14 @@ 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=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::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
    <?= WebUtil::printDist('ts', ['common', 'hallOfFame']) ?>
 </head>

@@ -26,12 +26,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>
@@ -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>

@@ -8,7 +8,7 @@ include "func.php";
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');

-increaseRefresh("갱신정보", 2);
+increaseRefresh("갱신정보", 1);

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

@@ -23,6 +23,12 @@ $online = [];
 $curonline = getOnlineNum();
 foreach ($log as $i => $value) {
    $parse = Json::decode($value);
+    if(is_array($parse) === false){
+        continue;
+    }
+    if(count($parse) < 5){
+        continue;
+    }
    $date[$i]    = $parse[0];
    $year[$i]    = $parse[1];
    $month[$i]   = $parse[2];
@@ -52,6 +58,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 +90,7 @@ if ($admin['maxonline'] < $curonline) {
        }
    </style>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>

@@ -1,208 +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=500" />
-    <?= 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', 'battleCenter']) ?>
-</head>
-
-<body>
-    <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-12" style="border-left: solid 1px gray; border-right:solid 1px gray;">
-                <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>
-            </div>
-            <div class="col col-12 col-md-6">
-                <div class="row mx-0">
-                    <div class="col bg1 header-cell" style="color:skyblue">장수 정보</div>
-                </div>
-                <div class="row">
-                    <div class="col"><?php generalInfo($showGeneral); ?><?php generalInfo2($showGeneral); ?></div>
-                </div>
-            </div>
-
-            <div class="col col-12 col-md-6">
-                <div class="row mx-0">
-                    <div class="col bg1 header-cell">장수 열전</div>
-                </div>
-                <div class="row">
-                    <div class="col"><?= formatHistoryToHTML(getGeneralHistoryLogAll($gen)) ?></div>
-                </div>
-            </div>
-
-            <div class="col col-12 col-md-6">
-                <div class="row mx-0">
-                    <div class="col bg1 header-cell">전투 기록</div>
-                </div>
-                <div class="row">
-                    <div class="col"><?= formatHistoryToHTML(getBattleDetailLogRecent($gen, 24)) ?></div>
-                </div>
-            </div>
-
-            <div class="col col-12 col-md-6">
-                <div class="row mx-0">
-                    <div class="col bg1 header-cell">전투 결과</div>
-                </div>
-                <div class="row">
-                    <div class="col"><?= formatHistoryToHTML(getBattleResultRecent($gen, 24)) ?></div>
-                </div>
-            </div>
-
-            <?php if ($showGeneral->getNPCType() > 1 || $permission >= 2) : ?>
-                <div class="col col-12 col-md-6">
-                    <div class="row mx-0">
-                        <div class="col bg1 header-cell">개인 기록</div>
-                    </div>
-                    <div class="row">
-                        <div class="col"><?= formatHistoryToHTML(getGeneralActionLogRecent($gen, 24)) ?></div>
-                    </div>
-                </div>
-            <?php endif; ?>
-        </div>
-        <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>
-</body>
-
-</html>
@@ -23,8 +23,8 @@ $generalID = $session->generalID;

 $me = $db->queryFirstRow('SELECT no,tournament,con,turntime from general where owner=%i', $userID);

-$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'develcost']);
-
+$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'turnterm', 'develcost']);
+$turnTerm = $admin['turnterm'];
 $con = checkLimit($me['con']);
 if ($con >= 2) {
    printLimitMsg($me['turntime']);
@@ -99,7 +99,7 @@ $str2 = getTournamentTime();
 if ($str2) {
    $str2 = ', ' . $str2;
 }
-$str3 = getTournamentTermText();
+$str3 = getTournamentTermText($turnTerm);
 if ($str3) {
    $str3 = ', ' . $str3;
 }
@@ -113,12 +113,14 @@ if ($str3) {

 <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'=>[
@@ -135,7 +137,7 @@ 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>
@@ -441,13 +443,13 @@ if ($str3) {

            if ($admin['tournament'] == 6) {
                echo "
-    <tr align=center>";
+    <tr align=center style='height:2.5em;'>";

                foreach (range(0, 15) as  $i) {
                    $key = $keyMap[$i] ?? -1;
                    echo "
        <td>
-            <select size=1 id='target_{$key}' 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>
@@ -461,12 +463,12 @@ if ($str3) {

                echo "
    </tr>
-    <tr align=center>";
+    <tr align=center style='height:2.2em;'>";

                foreach (range(0, 15) as  $i) {
                    $key = $keyMap[$i] ?? -1;
                    echo "
-        <td><input type=button class='submitBtn' data-target='{$key}' 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>";
@@ -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>

@@ -446,7 +450,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>
@@ -51,12 +51,14 @@ $templates = new \League\Plates\Engine('templates');

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

@@ -42,6 +42,7 @@ if ($meLevel >= 5) {

 <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>
@@ -54,6 +55,7 @@ if ($meLevel >= 5) {
        var chiefStatMin = <?= GameConst::$chiefStatMin ?>;
        var myLevel = <?= $meLevel ?>;
    </script>
+    <?= WebUtil::printDist('vue', [], true) ?>
    <?= WebUtil::printDist('ts', ['common', 'bossInfo']) ?>

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

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

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

@@ -5,8 +5,9 @@ namespace sammo;
 include "lib.php";
 include "func.php";

-$showDieImmediatelyBtn = false;
-$availableDieImmediately = false;
+$showDieOnPrestartBtn = false;
+$showBuildNationCandidateBtn = false;
+$availableDieOnPrestart = false;

 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
@@ -28,15 +29,19 @@ if ($myset > 0) {
    $submit = 'hidden';
 }

-$targetTime = addTurn($me->getVar('lastrefresh'), $gameStor->turnterm, 2);
+$targetTime = addTurn($me->getVar('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;
@@ -47,11 +52,12 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 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=500" />
    <title><?= UniqueConst::$serverName ?>: 내정보</title>
    <?= WebUtil::printStaticValues([
-        'availableDieImmediately' => $availableDieImmediately,
+        'availableDieOnPrestart' => $availableDieOnPrestart,
        'staticValues' => [
            'items' => Util::mapWithKey(fn (string $key, BaseItem $item) => [
                'name' => $item->getName(),
@@ -65,6 +71,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
    <?= 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>

@@ -110,7 +117,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                            <?php foreach ([90, 80, 60, 40] as $targetDefenceTrain) : ?>
                                <option value='<?= $targetDefenceTrain ?>' <?= $me->getVar('defence_train') == $targetDefenceTrain ? "selected" : ""; ?>><?= formatDefenceTrain($targetDefenceTrain) ?>(훈사<?= $targetDefenceTrain ?>)</option>
                            <?php endforeach; ?>
-                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>[훈련, 사기 -3]</option>
+                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>[훈련 -3, 사기 -6]</option>
                        </select>
                        】<br><br>
                        <input type=<?= $submit ?> id='set_my_setting' name=btn style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px; value=설정저장><br>
@@ -122,9 +129,14 @@ $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 ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>
@@ -17,7 +17,8 @@ TurnExecutionHelper::executeAllCommand();
 $me = $db->queryFirstRow('select no,tournament,con,turntime from general where owner=%i', $userID);
 $generalID = $session->generalID;

-$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
+$admin = $gameStor->getValues(['tournament', 'phase', 'turnterm', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
+$turnTerm = $admin['turnterm'];

 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -105,10 +106,12 @@ $globalBetTotal = array_sum($globalBet);

 <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>
@@ -120,128 +123,80 @@ $globalBetTotal = array_sum($globalBet);
        </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()'>";
+        <?php if ($session->userGrade >= 5) : ?>
+            <form method=post action=c_tournament.php>
+                <tr>
+                    <td colspan=8><input type=textarea size=150 style=color:white;background-color:black; name=msg><input type=submit name=btn value='메시지'></td>
+                </tr>
+                <tr>
+                    <td colspan=8>
+                        <button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button>
+                        <?php if ($admin['tournament'] == 0) : ?>
+                            <select name=trig size=1 style=color:white;background-color:black;>
+                                <option style=color:white; value=0 <?= !$admin['tnmt_trig'] ? 'selected' : '' ?>>수동진행</option>
+                                <option style=color:white; value=1 <?= $admin['tnmt_trig'] ? 'selected' : '' ?>>자동진행</option>
+                            </select>
+                            <input type=submit name=btn value='자동개최설정'>
+                        <?php else : ?>
+                            <input type=submit name=btn value='중단' onclick='return confirm("진짜 중단하시겠습니까?")'>
+                        <?php endif; ?>

-            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(\"진짜 중단하시겠습니까?\")'>";
-            }
+                        <?php switch ($admin['tournament']) {
+                            case 1:
+                                echo "<input type=submit name=btn value='랜덤투입'>";
+                                echo "<input type=submit name=btn value='랜덤전부투입'>";
+                                break;
+                            case 2:
+                                echo "<input type=submit name=btn value='예선'><input type=submit name=btn value='예선전부'>";
+                                break;
+                            case 3:
+                                echo "<input type=submit name=btn value='추첨'><input type=submit name=btn value='추첨전부'>";
+                                break;
+                            case 4:
+                                echo "<input type=submit name=btn value='본선'><input type=submit name=btn value='본선전부'>";
+                                break;
+                            case 5:
+                                echo "<input type=submit name=btn value='배정'>";
+                                break;
+                            case 6:
+                                echo "<input type=submit name=btn value='베팅마감'>";
+                                break;
+                            case 7:
+                                echo "<input type=submit name=btn value='16강'>";
+                                break;
+                            case 8:
+                                echo "<input type=submit name=btn value='8강'>";
+                                break;
+                            case 9:
+                                echo "<input type=submit name=btn value='4강'>";
+                                break;
+                            case 10:
+                                echo "<input type=submit name=btn value='결승'>";
+                                break;
+                        } ?>

-            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>";
-        }
+                    </td>
+                </tr>
+            </form>
+        <?php elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) : ?>
+            <form method=post action=c_tournament.php>
+                <tr>
+                    <td colspan=8><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button><button type="submit" class="btn btn-sammo-base2" onclick='return confirm("참가비 금<?= $admin['develcost'] ?>이 필요합니다. 참가하시겠습니까?")'>참가</button><input type='hidden' name='btn' value='참가'/></td>
+                </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;
        }
@@ -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>
@@ -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>

@@ -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 == "랜덤투입") {
@@ -52,8 +52,8 @@ class DB

    /**
     * DB 객체 생성
-     * 
-     * @return \MeekroDB 
+     *
+     * @return \MeekroDB
     * @suppress PhanTypeMismatchProperty
     */
    public static function db()
@@ -61,11 +61,6 @@ class DB
        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;
    }
@@ -0,0 +1,53 @@
+<?php
+
+namespace sammo;
+
+use sammo\DTO\MenuItem;
+use sammo\DTO\MenuMulti;
+use sammo\DTO\MenuSplit;
+
+//변경을 원한다면 파일을 복제 후 수정
+
+class GlobalMenu {
+  /** @var (MenuItem|MenuMulti|MenuSplit)[] */
+
+  const version = 3;
+  static ?array $menu = null;
+  public static function getMenu(): array{
+    if(static::$menu !== null){
+      return static::$menu;
+    }
+    static::$menu = [
+      new MenuItem('천통국 베팅', 'v_nationBetting.php', condHighlightVar: 'nationBetting'),
+      new MenuMulti('게임정보', [
+        new MenuItem('세력일람', 'a_kingdomList.php', newTab: true),
+        new MenuItem('장수일람', 'a_genList.php', newTab: true),
+        new MenuItem('명장일람', 'a_bestGeneral.php', newTab: true),
+        new MenuItem('명예의전당', 'a_hallOfFame.php', newTab: true),
+        new MenuItem('왕조일람', 'a_emperior.php', newTab: true),
+      ]),
+      new MenuItem('연감', 'v_history.php', newTab: true),
+      new MenuSplit(
+        new MenuItem('게시판', '/board/community', newTab: true),
+        [
+          new MenuItem('건의/제안', '/board/request', newTab: true),
+          new MenuItem('팁/강좌', '/board/tip', newTab: true),
+          new MenuItem('패치 내역', '/board/patch', newTab: true),
+        ]
+      ),
+      new MenuSplit(
+        new MenuItem('공식 오픈 톡', 'https://open.kakao.com/o/', newTab: true),
+        [
+          new MenuItem('잡담 오픈 톡', 'https://open.kakao.com/o/', newTab: true)
+        ],
+      ),
+      new MenuItem('전투 시뮬레이터', 'battle_simulator.php', newTab: true),
+      new MenuMulti('기타 정보', [
+        new MenuItem('접속량정보', 'a_traffic.php', newTab: true),
+        new MenuItem('빙의일람', 'a_npcList', newTab: true, condShowVar: 'npcMode'),
+      ]),
+      new MenuItem('설문조사', 'v_vote.php', newTab: true, condHighlightVar: 'vote'),
+    ];
+    return static::$menu;
+  }
+}
@@ -0,0 +1,6 @@
+<?php
+namespace sammo;
+
+class ServerEnv extends ServerDefaultEnv {
+    //ServerEnv 기본값을 변경하고 싶다면 orig를 제거한 복사본을 만들고 수정
+}
@@ -7,7 +7,6 @@ use Ds\Set;
 use sammo\Enums\AuctionType;
 use sammo\Enums\InheritanceKey;
 use sammo\Enums\RankColumn;
-use sammo\Event\Action;

 require_once 'process_war.php';
 require_once 'func_gamerule.php';
@@ -886,7 +885,7 @@ function generalInfo2(General $generalObj)

 function getOnlineNum(): int
 {
-    return KVStorage::getStorage(DB::db(), 'game_env')->getValue('online') ?? 0;
+    return KVStorage::getStorage(DB::db(), 'game_env')->getValue('online_user_cnt') ?? 0;
 }

 function onlinegen(General $general)
@@ -906,7 +905,7 @@ function nationMsg(General $general)
    $nationID = $general->getNationID();
    $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');

-    return $nationStor->notice ?? '';
+    return $nationStor->nationNotice['msg'] ?? '';
 }

 function banner()
@@ -1003,19 +1002,31 @@ function increaseRefresh($type = "", $cnt = 1)

    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $gameStor->refresh = $gameStor->refresh + $cnt; //TODO: +로 증가하는 값은 별도로 분리
    $isunited = $gameStor->isunited;
    $opentime = $gameStor->opentime;

-    if ($isunited != 2 && $generalID && $userGrade < 6 && $opentime <= TimeUtil::now()) {
-        $db->update('general', [
-            'lastrefresh' => $date,
-            'con' => $db->sqleval('con + %i', $cnt),
-            'connect' => $db->sqleval('connect + %i', $cnt),
-            'refcnt' => $db->sqleval('refcnt + %i', $cnt),
-            'refresh' => $db->sqleval('refresh + %i', $cnt)
-        ], 'owner=%i', $userID);
+    if($userGrade == 6){
+        return;
    }
+    if($isunited == 2){
+        return;
+    }
+    if(!$generalID){
+        return;
+    }
+    if($opentime > $date){
+        return;
+    }
+
+    $gameStor->refresh = $gameStor->refresh + $cnt; //TODO: +로 증가하는 값은 별도로 분리
+
+    $db->update('general', [
+        'lastrefresh' => $date,
+        'con' => $db->sqleval('con + %i', $cnt),
+        'connect' => $db->sqleval('connect + %i', $cnt),
+        'refcnt' => $db->sqleval('refcnt + %i', $cnt),
+        'refresh' => $db->sqleval('refresh + %i', $cnt)
+    ], 'owner=%i', $userID);

    $date = date('Y_m_d H:i:s');
    $date2 = substr($date, 0, 10);
@@ -1033,42 +1044,6 @@ function increaseRefresh($type = "", $cnt = 1)
        ),
        FILE_APPEND
    );
-
-    $proxy_headers = array(
-        'HTTP_VIA',
-        'HTTP_X_FORWARDED_FOR',
-        'HTTP_FORWARDED_FOR',
-        'HTTP_X_FORWARDED',
-        'HTTP_FORWARDED',
-        'HTTP_CLIENT_IP',
-        'HTTP_FORWARDED_FOR_IP',
-        'VIA',
-        'X_FORWARDED_FOR',
-        'FORWARDED_FOR',
-        'X_FORWARDED',
-        'FORWARDED',
-        'CLIENT_IP',
-        'FORWARDED_FOR_IP',
-        'HTTP_PROXY_CONNECTION'
-    );
-
-    $str = "";
-    foreach ($proxy_headers as $x) {
-        if (isset($_SERVER[$x])) $str .= "//{$x}:{$_SERVER[$x]}";
-    }
-    if ($str != "") {
-        file_put_contents(
-            __DIR__ . "/logs/" . UniqueConst::$serverID . "/_{$date2}_ipcheck.txt",
-            sprintf(
-                "%s, %s, %s%s\n",
-                $session->userName,
-                $session->generalName,
-                $_SERVER['REMOTE_ADDR'],
-                $str
-            ),
-            FILE_APPEND
-        );
-    }
 }

 function updateTraffic()
@@ -1223,10 +1198,9 @@ function updateOnline()
        $nationname[$nation['nation']] = $nation['name'];
    }

-
    //동접수
-    $before5Min = TimeUtil::nowAddMinutes(-5);
-    $onlineUser = $db->query('SELECT no,name,nation FROM general WHERE lastrefresh > %s AND npc < 2', $before5Min);
+    $startTurn = cutTurn($gameStor->turntime, $gameStor->turnterm, false);
+    $onlineUser = $db->query('SELECT no,name,nation FROM general WHERE lastrefresh >= %s AND npc < 2', $startTurn);
    $onlineNum = count($onlineUser);
    $onlineNationUsers = Util::arrayGroupBy($onlineUser, 'nation');

@@ -1249,76 +1223,6 @@ function updateOnline()
    $gameStor->online_nation = join(', ', $onlineNation);
 }

-function addAge(RandUtil $rng)
-{
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-
-
-    //나이와 호봉 증가
-    $db->update('general', [
-        'age' => $db->sqleval('age+1'),
-    ], true);
-
-    $db->update('general', [
-        'belong' => $db->sqleval('belong+1')
-    ], 'nation != 0');
-
-    [$startYear, $year, $month] = $gameStor->getValuesAsArray(['startyear', 'year', 'month']);
-
-    if ($year >= $startYear + 3) {
-        foreach ($db->query('SELECT no,name,nation,leadership,strength,intel,aux from general where specage<=age and special=%s', GameConst::$defaultSpecialDomestic) as $general) {
-            $generalID = $general['no'];
-            $special = SpecialityHelper::pickSpecialDomestic(
-                $rng,
-                $general,
-                (Json::decode($general['aux'])['prev_types_special']) ?? []
-            );
-            $specialClass = buildGeneralSpecialDomesticClass($special);
-            $specialText = $specialClass->getName();
-            $db->update('general', [
-                'special' => $special
-            ], 'no=%i', $generalID);
-
-            $logger = new ActionLogger($generalID, $general['nation'], $year, $month);
-
-            $josaUl = JosaUtil::pick($specialText, '을');
-            $logger->pushGeneralActionLog("특기 【<b><L>{$specialText}</></b>】{$josaUl} 익혔습니다!", ActionLogger::PLAIN);
-            $logger->pushGeneralHistoryLog("특기 【<b><C>{$specialText}</></b>】{$josaUl} 습득");
-        }
-
-        foreach ($db->query('SELECT no,name,nation,leadership,strength,intel,npc,dex1,dex2,dex3,dex4,dex5,aux from general where specage2<=age and special2=%s', GameConst::$defaultSpecialWar) as $general) {
-            $generalID = $general['no'];
-            $generalAux = Json::decode($general['aux']);
-
-            $updateVars = [];
-            if (key_exists('inheritSpecificSpecialWar', $generalAux)) {
-                $special2 = $generalAux['inheritSpecificSpecialWar'];
-                unset($generalAux['inheritSpecificSpecialWar']);
-                $updateVars['aux'] = Json::encode($generalAux);
-            } else {
-                $special2 = SpecialityHelper::pickSpecialWar(
-                    $rng,
-                    $general,
-                    ($generalAux['prev_types_special2']) ?? []
-                );
-            }
-
-            $specialClass = buildGeneralSpecialWarClass($special2);
-            $specialText = $specialClass->getName();
-
-            $updateVars['special2'] = $special2;
-            $db->update('general', $updateVars, 'no=%i', $general['no']);
-
-            $logger = new ActionLogger($generalID, $general['nation'], $year, $month);
-
-            $josaUl = JosaUtil::pick($specialText, '을');
-            $logger->pushGeneralActionLog("특기 【<b><L>{$specialText}</></b>】{$josaUl} 익혔습니다!", ActionLogger::PLAIN);
-            $logger->pushGeneralHistoryLog("특기 【<b><C>{$specialText}</></b>】{$josaUl} 습득");
-        }
-    }
-}
-
 function turnDate($curtime)
 {
    $db = DB::db();
@@ -1358,7 +1262,7 @@ function triggerTournament(RandUtil $rng)
    if ($tournament != 0) {
        return;
    }
-    if ($tnmt_trig == 0) {
+    if (!$tnmt_trig) {
        return;
    }
    if (!$rng->nextBool(0.4)) {
@@ -1374,7 +1278,7 @@ function triggerTournament(RandUtil $rng)

    $tnmt_type = array_pop($tnmt_pattern);
    $gameStor->setValue('tnmt_pattern', $tnmt_pattern);
-    startTournament($tnmt_trig, $tnmt_type);
+    startTournament($tnmt_type);
 }

 function CheckHall($no)
@@ -1745,7 +1649,8 @@ function tryUniqueItemLottery(RandUtil $rng, General $general, string $acquireTy
        $prob = 1 / ($genCount * $itemTypeCnt / 10 / 4); // 건국시 4개(20%) 등장(200명시 20국 정도 됨)
    }

-    $prob = Util::valueFit($prob, null, 1 / 4); //최대치 감소
+    $prob *= GameConst::$uniqueTrialCoef;
+    $prob = Util::valueFit($prob, null, GameConst::$maxUniqueTrialProb); //최대치 감소
    $result = false;

    $prob /= sqrt(7);
@@ -1805,16 +1710,16 @@ function deleteNation(General $lord, bool $applyDB): array
            $nationID,
            $lordID
        ),
-        ['npc', 'gold', 'rice', 'experience', 'explevel', 'dedication', 'dedlevel', 'belong', 'aux'],
+        ['npc', 'owner', 'gold', 'rice', 'experience', 'explevel', 'dedication', 'dedlevel', 'belong', 'aux'],
        1
    );
    $nationGeneralList[$lordID] = $lord;

    $nation['generals'] = array_keys($nationGeneralList);
    $nation['aux'] = Json::decode($nation['aux']);
-    $nation['msg'] = $nationStor->notice;
+    $nation['msg'] = $nationStor->nationNotice['msg'] ?? '';
    $nation['scout_msg'] = $nationStor->scout_msg;
-    $nation['aux'] += $nationStor->max_power;
+    $nation['aux'] += $nationStor->max_power ?? [];
    $nation['history'] = getNationHistoryLogAll($nationID);

    $josaYi = JosaUtil::pick($nationName, '이');
@@ -1823,13 +1728,16 @@ function deleteNation(General $lord, bool $applyDB): array

    // 전 장수 재야로
    foreach ($nationGeneralList as $general) {
-        $general->setAuxVar(
-            InheritanceKey::max_belong->value,
-            max(
-                $general->getVar('belong'),
-                $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0
-            )
-        );
+        if($general->getNPCType() < 2){
+            $general->setAuxVar(
+                InheritanceKey::max_belong->value,
+                max(
+                    $general->getVar('belong'),
+                    $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0
+                )
+            );
+        }
+
        $general->setVar('belong', 0);
        $general->setVar('troop', 0);
        $general->setVar('officer_level', 0);
@@ -18,7 +18,7 @@ function registerAuction(RandUtil $rng)
        [AuctionType::BuyRice->value, AuctionType::SellRice->value],
    ));

-    $neutralbuyRiceCnt = $neutralAuctionCnt[AuctionType::BuyRice->value];
+    $neutralbuyRiceCnt = $neutralAuctionCnt[AuctionType::BuyRice->value] ?? 0;

    // 판매건 등록
    if ($rng->nextBool(1 / ($neutralbuyRiceCnt + 5))) {
@@ -38,7 +38,7 @@ function registerAuction(RandUtil $rng)
        AuctionBuyRice::openResourceAuction($dummyGeneral, $amount, $term, $cost, $topv);
    }

-    $neutralSellRiceCnt = $neutralAuctionCnt[AuctionType::SellRice->value];
+    $neutralSellRiceCnt = $neutralAuctionCnt[AuctionType::SellRice->value] ?? 0;
    // 구매건 등록
    if ($rng->nextBool(1 / ($neutralSellRiceCnt + 5))) {
        //평균 쌀의 5% ~ 25%
@@ -326,6 +326,41 @@ function buildGeneralSpecialWarClass(?string $type):BaseSpecial{
    return $obj;
 }

+function getActionCrewTypeClass(?string $type){
+    if($type === null || $type === ''){
+        $type = 'None';
+    }
+
+    static $basePath = __NAMESPACE__.'\\ActionCrewType\\';
+    $classPath = ($basePath.$type);
+
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    $classPath = ($basePath.'che_'.$type);
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    throw new \InvalidArgumentException("{$type}은 올바른 병종 효과가 아님");
+}
+
+function buildActionCrewTypeClass(?string $type):iAction{
+    static $cache = [];
+    if($type === null){
+        $type = 'None';
+    }
+    if(key_exists($type, $cache)){
+        return $cache[$type];
+    }
+    $class = getActionCrewTypeClass($type);
+
+    $obj = new $class();
+    $cache[$type]= $obj;
+    return $obj;
+}
+
 function getGeneralCommandClass(?string $type){
    if($type === null || $type === ''){
        $type = '휴식';
@@ -542,6 +577,8 @@ function getExpLevel($experience) {
        $level = Util::toInt(sqrt($experience/10));
    }

+    $level = Util::clamp($level, 0, GameConst::$maxLevel);
+
    return $level;
 }

@@ -2,6 +2,9 @@

 namespace sammo;

+use sammo\DTO\AuctionInfo;
+use sammo\Enums\AuctionType;
+use sammo\Enums\EventTarget;
 use sammo\Enums\InheritanceKey;
 use sammo\Enums\RankColumn;

@@ -182,27 +185,6 @@ function updateGeneralNumber()
    refreshNationStaticInfo();
 }

-function updateYearly()
-{
-    //통계
-    checkStatistic();
-}
-
-//관직 변경 해제
-function updateQuaterly()
-{
-    $db = DB::db();
-
-    //천도 제한 해제, 관직 변경 제한 해제
-    $db->update('nation', [
-        'chief_set' => 0,
-    ], true);
-    //관직 변경 제한 해제
-    $db->update('city', [
-        'officer_set' => 0,
-    ], true);
-}
-
 // 벌점 감소와 건국제한-1 전턴제한-1 외교제한-1, 1달마다 실행, 병사 있는 장수의 군량 감소, 수입비율 조정
 function preUpdateMonthly()
 {
@@ -218,58 +200,6 @@ function preUpdateMonthly()


    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
-    $logger = new ActionLogger(0, 0, $admin['year'], $admin['month']);
-
-    //보급선 체크
-    checkSupply();
-    //미보급도시 10% 감소
-    $db->update('city', [
-        'pop' => $db->sqleval('pop * 0.9'),
-        'trust' => $db->sqleval('trust * 0.9'),
-        'agri' => $db->sqleval('agri * 0.9'),
-        'comm' => $db->sqleval('comm * 0.9'),
-        'secu' => $db->sqleval('secu * 0.9'),
-        'def' => $db->sqleval('def * 0.9'),
-        'wall' => $db->sqleval('wall * 0.9'),
-    ], 'supply = 0');
-    //미보급도시 장수 병 훈 사 5%감소
-    //NOTE: update inner join도 가능하지만, meekrodb 기준으로 깔끔하게.
-    $unsuppliedCities = $db->query('SELECT city, nation, trust, name FROM city WHERE supply = 0');
-    foreach (Util::arrayGroupBy($unsuppliedCities, 'nation') as $nationID => $cityList) {
-        $cityIDList = Util::squeezeFromArray($cityList, 'city');
-        $db->update('general', [
-            'crew' => $db->sqleval('crew*0.95'),
-            'atmos' => $db->sqleval('atmos*0.95'),
-            'train' => $db->sqleval('train*0.95'),
-        ], 'city IN %li AND nation = %i', $cityIDList, $nationID);
-    }
-
-    //민심30이하 공백지 처리
-    $lostCities = [];
-    foreach ($unsuppliedCities as $unsuppliedCity) {
-        if ($unsuppliedCity['trust'] >= 30) {
-            continue;
-        }
-        $lostCities[$unsuppliedCity['city']] = $unsuppliedCity;
-    }
-
-    if ($lostCities) {
-        foreach ($lostCities as $lostCity) {
-            $josaYi = JosaUtil::pick($lostCity['name'], '이');
-            $logger->pushGlobalHistoryLog("<R><b>【고립】</b></><G><b>{$lostCity['name']}</b></>{$josaYi} 보급이 끊겨 <R>미지배</> 도시가 되었습니다.");
-        }
-        $db->update('general', [
-            'officer_level' => 1,
-            'officer_city' => 0
-        ], 'officer_city IN %li', array_keys($lostCities));
-        $db->update('city', [
-            'nation' => 0,
-            'officer_set' => 0,
-            'conflict' => '{}',
-            'term' => 0,
-            'front' => 0
-        ], 'city IN %li', array_keys($lostCities));
-    }

    //접률감소, 건국제한-1
    $db->update('general', [
@@ -283,18 +213,10 @@ function preUpdateMonthly()
        'rate_tmp' => $db->sqleval('rate')
    ], true);

-    //도시훈사 180년 60, 220년 87, 240년 100
-    $rate = Util::round(($admin['year'] - $admin['startyear']) / 1.5) + 60;
-    if ($rate > 100) $rate = 100;
-
    // 20 ~ 140원
    $develcost = ($admin['year'] - $admin['startyear'] + 10) * 2;
-    $gameStor->city_rate = $rate;
    $gameStor->develcost = $develcost;

-    //매달 사망자 수입 결산
-    processWarIncome();
-
    //계략, 전쟁표시 해제
    $db->update('city', [
        'state' => $db->sqleval(<<<EOD
@@ -501,8 +423,6 @@ function postUpdateMonthly(RandUtil $rng)
    if ($admin['year'] >= $admin['startyear'] + 2) {
        checkWander($rng);
    }
-    // 작위 업데이트
-    updateNationState();
    updateGeneralNumber();
    refreshNationStaticInfo();
    // 천통여부 검사
@@ -526,7 +446,7 @@ function checkWander(RandUtil $rng)
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');

-    $admin = $gameStor->getValues(['year', 'month']);
+    $admin = $gameStor->getValues(['year', 'month', 'init_year', 'init_month']);

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

@@ -545,248 +465,6 @@ function checkWander(RandUtil $rng)
    }
 }

-function updateNationState()
-{
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-
-    $history = array();
-    $admin = $gameStor->getValues(['killturn', 'year', 'month', 'fiction', 'startyear', 'show_img_level', 'turnterm', 'turntime']);
-    $year = $admin['year'];
-    $month = $admin['month'];
-    $startYear = $admin['startyear'];
-
-    $assemblerCnts = [];
-    foreach ($db->queryAllLists('SELECT nation,count(no) FROM general WHERE npc = 5 GROUP BY nation') as [$nationID, $assemblerCnt]) {
-        $assemblerCnts[$nationID] = $assemblerCnt;
-    };
-
-    foreach ($db->query('SELECT nation,name,level,tech,aux FROM nation') as $nation) {
-        //TODO: level이 진관수이소중대특 체계를 벗어날 수 있음
-        $nationID = $nation['nation'];
-        $citycount = $db->queryFirstField('SELECT count(*) FROM city WHERE nation=%i AND level>=4', $nationID);
-
-
-        if ($citycount == 0) {
-            $nationlevel = 0;   // 방랑군
-        } elseif ($citycount == 1) {
-            $nationlevel = 1;   // 호족
-        } elseif ($citycount <= 4) {
-            $nationlevel = 2;   // 군벌
-        } elseif ($citycount <= 7) {
-            $nationlevel = 3;   // 주자사
-        } elseif ($citycount <= 10) {
-            $nationlevel = 4;   // 주목
-        } elseif ($citycount <= 15) {
-            $nationlevel = 5;   // 공
-        } elseif ($citycount <= 20) {
-            $nationlevel = 6;   // 왕
-        } else {
-            $nationlevel = 7;   // 황제
-        }
-
-        if ($nationlevel > $nation['level']) {
-            $levelDiff = $nationlevel - $nation['level'];
-            $oldLevel = $nation['level'];
-            $nation['level'] = $nationlevel;
-
-            $updateVals = [
-                'level' => $nationlevel,
-                'gold' => $db->sqleval('gold + %i', $nationlevel * 1000),
-                'rice' => $db->sqleval('rice + %i', $nationlevel * 1000),
-            ];
-
-            switch ($nationlevel) {
-                case 7:
-                    $josaUl = JosaUtil::pick(getNationLevel($nationlevel), '을');
-                    $history[] = "<C>●</>{$year}년 {$month}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>{$josaUl} 자칭하였습니다.";
-                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>{$josaUl} 자칭"]);
-                    $auxVal = Json::decode($nation['aux']);
-                    $auxVal['can_국기변경'] = 1;
-                    $auxVal['can_국호변경'] = 1;
-                    $updateVals['aux'] = Json::encode($auxVal);
-                    break;
-                case 6:
-                    $history[] = "<C>●</>{$year}년 {$month}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 등극하였습니다.";
-                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 등극"]);
-                    break;
-                case 5:
-                case 4:
-                case 3:
-                    $history[] = "<C>●</>{$year}년 {$month}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 임명되었습니다.";
-                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>에 임명됨"]);
-                    break;
-                case 2:
-                    $history[] = "<C>●</>{$year}년 {$month}월:<Y><b>【작위】</b></><D><b>{$nation['name']}</b></>의 군주가 독립하여 <Y>" . getNationLevel($nationlevel) . "</>로 나섰습니다.";
-                    pushNationHistoryLog($nation['nation'], ["<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>의 군주가 <Y>" . getNationLevel($nationlevel) . "</>로 나서다"]);
-                    break;
-            }
-
-            $db->update('nation', $updateVals, 'nation=%i', $nation['nation']);
-
-            $turnRows = [];
-            foreach (Util::range(getNationChiefLevel($nation['level']), 12) as $chiefLevel) {
-                foreach (Util::range(GameConst::$maxChiefTurn) as $turnIdx) {
-                    $turnRows[] = [
-                        'nation_id' => $nation['nation'],
-                        'officer_level' => $chiefLevel,
-                        'turn_idx' => $turnIdx,
-                        'action' => '휴식',
-                        'arg' => null,
-                        'brief' => '휴식'
-                    ];
-                }
-            }
-            $db->insertIgnore('nation_turn', $turnRows);
-
-            if ($levelDiff) {
-                //유니크 아이템 하나 돌리자
-                $targetKillTurn = $admin['killturn'];
-                $targetKillTurn -= 24 * 60 / $admin['turnterm'];
-                $nationGenIDList = $db->queryFirstColumn(
-                    'SELECT no FROM general WHERE nation = %i AND killturn >= %i AND npc < 2',
-                    $nation['nation'],
-                    $targetKillTurn
-                );
-                $nationGenList = General::createGeneralObjListFromDB($nationGenIDList, ['belong', 'npc', 'aux'], 2);
-                $chiefID = null;
-
-                $uniqueLotteryWeightList = [];
-
-                $relYear = $year - $startYear;
-                $maxTrialCountByYear = 1;
-                foreach (GameConst::$maxUniqueItemLimit as $tmpVals) {
-                    [$targetYear, $targetTrialCnt] = $tmpVals;
-                    if ($relYear < $targetYear) {
-                        break;
-                    }
-                    $maxTrialCountByYear = $targetTrialCnt;
-                }
-                foreach ($nationGenList as $nationGen) {
-                    if ($nationGen->getVar('officer_level') == 12) {
-                        $chiefID = $nationGen->getID();
-                    }
-                    $trialCnt = min($maxTrialCountByYear, count(GameConst::$allItems));
-
-                    foreach ($nationGen->getItems() as $item) {
-                        if (!$item->isBuyable()) {
-                            $trialCnt -= 1;
-                        }
-                    }
-
-                    if ($trialCnt <= 0) {
-                        continue;
-                    }
-
-                    $score = $nationGen->getVar('belong') + 10;
-
-                    if ($nationGen->getVar('officer_level') == 12) {
-                        $score += 60;
-                    } else if ($nationGen->getVar('officer_level') == 11) {
-                        $score += 30;
-                    } else if ($nationGen->getVar('officer_level') > 4) {
-                        $score += 15;
-                    }
-
-                    $score *= 2 ** $trialCnt;
-
-                    $uniqueLotteryWeightList[$nationGen->getID()] = [$nationGen, $score];
-                }
-
-                $nationLevelUpRNG = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
-                    UniqueConst::$hiddenSeed,
-                    'nationLevelUp',
-                    $year,
-                    $month,
-                    $nationID
-                )));
-
-                foreach (Util::range($levelDiff) as $idx) {
-                    if (!$uniqueLotteryWeightList) {
-                        break;
-                    }
-
-                    /** @var General */
-                    $winnerObj = $nationLevelUpRNG->choiceUsingWeightPair($uniqueLotteryWeightList);
-                    unset($uniqueLotteryWeightList[$winnerObj->getID()]);
-
-                    $givenUniqueRNG = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
-                        UniqueConst::$hiddenSeed,
-                        'givenUnique',
-                        $year,
-                        $month,
-                        $nationID,
-                        $winnerObj->getID(),
-                    )));
-                    giveRandomUniqueItem($givenUniqueRNG, $winnerObj, '작위보상');
-                    $winnerObj->applyDB($db);
-                }
-
-                if ($chiefID) {
-                    $chiefObj = General::createGeneralObjFromDB($chiefID, ['belong', 'npc', 'aux'], 2);
-                    $chiefObj->increaseInheritancePoint(InheritanceKey::unifier, 250 * $levelDiff);
-                    $chiefObj->applyDB($db);
-                }
-            }
-        }
-
-        $assemblerCnt = $assemblerCnts[$nation['nation']] ?? 0;
-        $maxAssemblerCnt = [
-            1 => 0,
-            2 => 1,
-            3 => 3,
-            4 => 4,
-            5 => 6,
-            6 => 7,
-            7 => 9
-        ][$nationlevel] ?? 0;
-
-        if ($assemblerCnt < $maxAssemblerCnt) {
-            $lastAssemblerID = $gameStor->assembler_id ?? 0;
-
-            $troopLeaderRng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
-                UniqueConst::$hiddenSeed,
-                'troopLeader',
-                $year,
-                $month,
-                $nationID
-            )));
-
-            while ($assemblerCnt < $maxAssemblerCnt) {
-                $lastAssemblerID += 1;
-                $npcObj = new Scenario\GeneralBuilder(
-                    $troopLeaderRng,
-                    sprintf('부대장%4d', $lastAssemblerID),
-                    false,
-                    null,
-                    $nation['nation']
-                );
-                $npcObj->setAffinity(999)->setStat(10, 10, 10)
-                    ->setSpecialSingle('척사')->setEgo('che_은둔')
-                    ->setKillturn(70)->setGoldRice(0, 0)
-                    ->setNPCType(5)->fillRemainSpecAsZero($admin);
-                $npcObj->build($admin);
-                $npcID = $npcObj->getGeneralID();
-
-                $db->insert('troop', [
-                    'troop_leader' => $npcID,
-                    'name' => $npcObj->getGeneralName(),
-                    'nation' => $nation['nation'],
-                ]);
-                $db->update('general', [
-                    'troop' => $npcID
-                ], 'no=%i', $npcID);
-
-                $cmd = buildGeneralCommandClass('che_집합', General::createGeneralObjFromDB($npcID), $admin);
-                _setGeneralCommand($cmd, iterator_to_array(Util::range(GameConst::$maxTurn)));
-                $assemblerCnt += 1;
-                $gameStor->assembler_id = $lastAssemblerID;
-            }
-        }
-    }
-    pushGlobalHistoryLog($history, $admin['year'], $admin['month']);
-}
-
 function checkStatistic()
 {
    $db = DB::db();
@@ -1053,6 +731,16 @@ function checkEmperior()
    $nationLogger = new ActionLogger(0, $nationID, $admin['year'], $admin['month']);
    $nationLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>{$josaYi} 전토를 통일");

+    /** @var int[] */
+    $auctionList = $db->queryFirstColumn(
+        'SELECT `id` FROM `ng_auction` WHERE `type` = %s AND `finished` = 0 ORDER BY `close_date` ASC',
+        AuctionType::UniqueItem->value
+    );
+    foreach($auctionList as $auctionID){
+        $auction = new AuctionUniqueItem($auctionID, new DummyGeneral(true));
+        $auction->closeAuction(true);
+    }
+
    $inheritPointManager = InheritancePointManager::getInstance();
    $allUserGenerals = General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2'));
    foreach ($allUserGenerals as $genObj) {
@@ -1062,11 +750,12 @@ function checkEmperior()
            };
        }
    }
-    processSumInheritPointRank();
+
+    TurnExecutionHelper::runEventHandler($db, $gameStor, EventTarget::United);
+
    foreach ($allUserGenerals as $genObj) {
-        $inheritPointManager->mergeTotalInheritancePoint($genObj, true);
+        $inheritPointManager->mergeTotalInheritancePoint($genObj);
        $inheritPointManager->applyInheritanceUser($genObj->getVar('owner'));
-        $inheritPointManager->clearInheritancePoint($genObj);
    }

    $gameStor->isunited = 2;
@@ -1082,7 +771,7 @@ function checkEmperior()

    $chiefs = Util::convertArrayToDict(
        $db->query(
-            'SELECT no,name,picture,belong,officer_level FROM general WHERE nation=%i AND officer_level >= 5',
+            'SELECT no,npc,name,picture,belong,officer_level FROM general WHERE nation=%i AND officer_level >= 5',
            $nationID
        ),
        'officer_level'
@@ -1135,9 +824,9 @@ function checkEmperior()
    $nation = $nation;
    $nation['generals'] = $db->queryFirstColumn('SELECT `no` FROM general WHERE nation=%i', $nation['nation']);
    $nation['aux'] = Json::decode($nation['aux']);
-    $nation['msg'] = $nationStor->notice;
+    $nation['msg'] = $nationStor->nationNotice['msg'] ?? '';;
    $nation['scout_msg'] = $nationStor->scout_msg;
-    $nation['aux'] += $nationStor->max_power;
+    $nation['aux'] += $nationStor->max_power ?? [];
    $nation['history'] = getNationHistoryLogAll($nation['nation']);

    storeOldGenerals(0, $admin['year'], $admin['month']);
@@ -1214,11 +903,39 @@ function checkEmperior()
    ]);

    $hiddenSeed = UniqueConst::$hiddenSeed;
-    $history = ["<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【통일】</b></><D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일하였습니다. <span class='hidden_but_copyable'>(서버시드: $hiddenSeed})</span>"];
+    $history = ["<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【통일】</b></><D><b>{$nation['name']}</b></>{$josaYi} 전토를 통일하였습니다. <span class='hidden_but_copyable'>(서버시드: {$hiddenSeed})</span>"];
    pushGlobalHistoryLog($history, $admin['year'], $admin['month']);

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

 function updateMaxDomesticCritical(General $general, $score)
@@ -254,6 +254,7 @@ function pushGeneralHistoryLog(int $generalID, ?array $history, $year=null, $mon

 }

+/** @deprecated */
 function getGeneralHistoryLogAll(int $generalID):array {
    $db = DB::db();

@@ -263,6 +264,15 @@ function getGeneralHistoryLogAll(int $generalID):array {
    );
 }

+function getGeneralHistoryLogWithLogID(int $generalID):array {
+    $db = DB::db();
+
+    return Util::convertPairArrayToDict($db->queryAllLists(
+        'SELECT `id`, `text` from general_record WHERE general_id = %i AND log_type = "history" order by id desc',
+        $generalID
+    ));
+}
+

 function pushNationHistoryLog(int $nationID, ?array $history, ?int $year=null, ?int $month=null) {
    if(!$history){
@@ -12,6 +12,7 @@ function printLimitMsg($turntime)
    <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') ?>
@@ -118,6 +119,11 @@ function backButton()
    return "<button type='button' class='btn btn-primary back_btn' onclick=location.replace('./')>돌아가기</button><br>";
 }

+function gatewayButton()
+{
+    return "<button type='button' class='btn btn-primary back_btn' onclick=location.replace('../')>돌아가기</button><br>";
+}
+
 function CoreBackButton()
 {
    return "<button type='button' class='btn btn-primary back_btn' onclick=location.replace('v_chiefCenter.php')>돌아가기</button><br>";
@@ -25,6 +25,7 @@ function requireAdminPermissionHTML()
    <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') ?>
@@ -4,173 +4,32 @@ namespace sammo;
 use sammo\Enums\InheritanceKey;
 use sammo\Enums\RankColumn;
 use Ds\Map;
+use sammo\Enums\ResourceType;
+use sammo\Event\Action;
+
 /**
 * 시간 단위로 일어나는 이벤트들에 대한 함수 모음
 */

-
+/** @deprecated */
 function processSumInheritPointRank(){
    $db = DB::db();
-
-    $generals = General::createGeneralObjListFromDB(null, null, 2);
-
-    $points = new Map();
-    $points->allocate(count($generals));
-    foreach($generals as $general){
-        $generalID = $general->getID();
-        $points[$generalID] = 0;
-    }
-
-    foreach(InheritanceKey::cases() as $key){
-        if($key === InheritanceKey::previous){
-            continue;
-        }
-        $subPoints = InheritancePointManager::getInstance()->getInheritancePointFromAll($generals, $key);
-        foreach($generals as $general){
-            $generalID = $general->getID();
-            $points[$generalID] += $subPoints[$generalID] ?? 0;
-        }
-    }
-
-    $pointsPairs = [];
-    foreach($points as $generalID => $point){
-        $pointsPairs[] = [
-            'nation_id' => $generals[$generalID]->getNationID(),
-            'general_id' => $generalID,
-            'type' => RankColumn::inherit_point_earned_by_merge->value,
-            'value' => $point,
-        ];
-    }
-    //XXX: multiple batch update가 제공되지 않으므로..
-    $db->delete('rank_data', '`type` = %s', RankColumn::inherit_point_earned_by_merge->value);
-    $db->insert('rank_data', $pointsPairs);
-
-    $db->query(
-        'UPDATE `rank_data` D SET `value` = (SELECT SUM(`value`) FROM `rank_data` S WHERE S.general_id = D.general_id AND S.`type` IN %ls) WHERE D.`type` = %s',
-        [RankColumn::inherit_point_earned_by_action->value, RankColumn::inherit_point_earned_by_merge->value],
-        RankColumn::inherit_point_earned->value
-    );
-
-    $db->query(
-        'UPDATE `rank_data` D SET `value` = (SELECT `value` FROM `rank_data` S WHERE S.general_id = D.general_id AND S.`type` = %s) WHERE D.`type` = %s',
-        RankColumn::inherit_point_spent_dynamic->value,
-        RankColumn::inherit_point_spent->value
-    );
-}
-
-//1월마다 실행
-function processSpring() {
-    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');

-    // 1월엔 무조건 내정 1% 감소
-    $db->update('city',[
-        'dead'=>0,
-        'agri'=>$db->sqleval('agri * 0.99'),
-        'comm'=>$db->sqleval('comm * 0.99'),
-        'secu'=>$db->sqleval('secu * 0.99'),
-        'def'=>$db->sqleval('def * 0.99'),
-        'wall'=>$db->sqleval('wall * 0.99'),
-    ],true);
-
-    //인구 증가
-    popIncrease();
-
-    // > 10000 유지비 3%, > 1000 유지비 1%
-    // 유지비 1%
-    $db->update('general', [
-        'gold'=>$db->sqleval('IF(gold > 10000, gold * 0.97, gold * 0.99)')
-    ], 'gold > 1000');
-
-    // > 100000 유지비 5%, > 100000 유지비 3%, > 1000 유지비 1%
-    $db->update('nation', [
-        'gold'=>$db->sqleval('IF(gold > 100000, gold * 0.95, IF(gold > 10000, gold * 0.97, gold * 0.99))')
-    ], 'gold > 1000');
-
-    $admin = $gameStor->getValues(['year', 'month']);
-
-    pushGlobalHistoryLog(["<R>★</>{$admin['year']}년 {$admin['month']}월: <S>모두들 즐거운 게임 하고 계신가요? ^^ <Y>매너 있는 플레이</> 부탁드리고, <M>지나친 훼접</>은 삼가주세요~</>"], $admin['year'], $admin['month']);
+    $e_env = $gameStor->getValues(['startyear', 'year', 'month']);
+    $e_env['currentEventID'] = 0;
+    Action::build(["ProcessIncome", ResourceType::rice->value])->run($e_env);
 }

+
+/** @deprecated */
 function processGoldIncome() {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');

-    [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
-    $adminLog = [];
-
-
-    $nationList = $db->query('SELECT name,nation,capital,gold,level,rate_tmp,bill,type from nation');
-    $cityListByNation = Util::arrayGroupBy($db->query('SELECT * FROM city'), 'nation');
-    $generalRawListByNation = Util::arrayGroupBy($db->query('SELECT no,name,nation,gold,officer_level,dedication,city FROM general WHERE npc != 5'), 'nation');
-
-    //국가별 처리
-    foreach($nationList as $nation) {
-        $nationID = $nation['nation'];
-
-        $generalRawList = $generalRawListByNation[$nationID];
-        $income = getGoldIncome($nationID, $nation['level'], $nation['rate_tmp'], $nation['capital'], $nation['type'], $cityListByNation[$nationID]??[]);
-        $originoutcome = getOutcome(100, $generalRawList);
-        $outcome= Util::round($nation['bill'] / 100 * $originoutcome);
-
-        // 실제 지급량 계산
-        $nation['gold'] += $income;
-        // 기본량도 안될경우
-        if($nation['gold'] < GameConst::$basegold) {
-            $realoutcome = 0;
-            // 실지급률
-            $ratio = 0;
-        //기본량은 넘지만 요구량이 안될경우
-        } elseif($nation['gold'] - GameConst::$basegold < $outcome) {
-            $realoutcome = $nation['gold'] - GameConst::$basegold;
-            $nation['gold'] = GameConst::$basegold;
-            // 실지급률
-            $ratio = $realoutcome / $originoutcome;
-        } else {
-            $realoutcome = $outcome;
-            $nation['gold'] -= $realoutcome;
-            // 실지급률
-            $ratio = $realoutcome / $originoutcome;
-        }
-        $nation['gold'] = Util::valueFit($nation['gold'], GameConst::$basegold);
-        $adminLog[] = StringUtil::padStringAlignRight((string)$nation['name'],12," ")
-            ." // 세금 : ".StringUtil::padStringAlignRight((string)$income,6," ")
-            ." // 세출 : ".StringUtil::padStringAlignRight((string)$originoutcome,6," ")
-            ." // 실제 : ".tab2((string)$realoutcome,6," ")
-            ." // 지급률 : ".tab2((string)round($ratio*100,2),5," ")
-            ." % // 결과금 : ".tab2((string)$nation['gold'],6," ");
-
-        $incomeText = number_format($income);
-        $incomeLog = "이번 수입은 금 <C>$incomeText</>입니다.";
-        $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
-        $nationStor->prev_income_gold = $income;
-
-        $db->update('nation', [
-            'gold'=>$nation['gold']
-        ], 'nation=%i', $nationID);
-
-        // 각 장수들에게 지급
-        foreach ($generalRawList as $rawGeneral) {
-            $generalObj = new General($rawGeneral, null, null, null, $year, $month, false);
-            $gold = Util::round(getBill($generalObj->getVar('dedication'))*$ratio);
-            $generalObj->increaseVar('gold', $gold);
-
-            $logger = $generalObj->getLogger();
-            if($generalObj->getVar('officer_level') > 4){
-                $logger->pushGeneralActionLog($incomeLog, $logger::PLAIN);
-            }
-
-            $goldText = number_format($gold);
-            $logger->pushGeneralActionLog("봉급으로 금 <C>$goldText</>을 받았습니다.", $logger::PLAIN);
-            $generalObj->applyDB($db);
-        }
-    }
-
-    $logger = new ActionLogger(0, 0, $year, $month);
-    $logger->pushGlobalHistoryLog('<W><b>【지급】</b></>봄이 되어 봉록에 따라 자금이 지급됩니다.');
-    $logger->flush();
-
-    pushAdminLog($adminLog);
+    $e_env = $gameStor->getValues(['startyear', 'year', 'month']);
+    $e_env['currentEventID'] = 0;
+    Action::build(["ProcessIncome", ResourceType::gold->value])->run($e_env);
 }

 function popIncrease() {
@@ -304,29 +163,6 @@ function getGoldIncome(int $nationID, int $nationLevel, float $taxRate, int $cap
    return $cityIncome;
 }

-function processWarIncome() {
-    $db = DB::db();
-
-    $cityListByNation = Util::arrayGroupBy($db->query('SELECT * FROM city'), 'nation');
-
-    foreach(getAllNationStaticInfo() as $nation){
-        if($nation['level'] <= 0){
-            continue;
-        }
-        $nationID = $nation['nation'];
-        $income = getWarGoldIncome($nation['type'], $cityListByNation[$nationID]??[]);
-        $db->update('nation', [
-            'gold'=>$db->sqleval('gold + %i', $income)
-        ], 'nation=%i', $nationID);
-    }
-
-    // 10%수입, 20%부상병
-    $db->update('city', [
-        'pop'=>$db->sqleval('pop + dead * %d', 0.2),
-        'dead'=>0
-    ], true);
-}
-
 function getWarGoldIncome(string $nationType, array $cityList){
    $nationTypeObj = buildNationTypeClass($nationType);

@@ -338,115 +174,14 @@ function getWarGoldIncome(string $nationType, array $cityList){
    return $cityIncome;
 }

-
-
-//7월마다 실행
-function processFall() {
-    $db = DB::db();
-
-    // 7월엔 무조건 내정 1% 감소
-    $db->update('city',[
-        'dead'=>0,
-        'agri'=>$db->sqleval('agri * 0.99'),
-        'comm'=>$db->sqleval('comm * 0.99'),
-        'secu'=>$db->sqleval('secu * 0.99'),
-        'def'=>$db->sqleval('def * 0.99'),
-        'wall'=>$db->sqleval('wall * 0.99'),
-    ],true);
-
-    //인구 증가
-    popIncrease();
-
-    // > 10000 유지비 3%, > 1000 유지비 1%
-    // 유지비 1%
-    $db->update('general', [
-        'rice'=>$db->sqleval('IF(rice > 10000, rice * 0.97, rice * 0.99)')
-    ], 'rice > 1000');
-
-    // > 100000 유지비 5%, > 100000 유지비 3%, > 1000 유지비 1%
-    $db->update('nation', [
-        'rice'=>$db->sqleval('IF(rice > 100000, rice * 0.95, IF(rice > 10000, rice * 0.97, rice * 0.99))')
-    ], 'rice > 1000');
-}
-
+/** @deprecated */
 function processRiceIncome() {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');

-    [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
-    $adminLog = [];
-
-    $nationList = $db->query('SELECT name,level,nation,capital,rice,rate_tmp,bill,type from nation');
-    $cityListByNation = Util::arrayGroupBy($db->query('SELECT * FROM city'), 'nation');
-    $generalRawListByNation = Util::arrayGroupBy($db->query('SELECT no,name,nation,rice,officer_level,dedication,city FROM general WHERE npc != 5'), 'nation');
-
-    //국가별 처리
-    foreach($nationList as $nation) {
-        $nationID = $nation['nation'];
-
-        $generalRawList = $generalRawListByNation[$nationID];
-        $income = getRiceIncome($nation['nation'], $nation['level'], $nation['rate_tmp'], $nation['capital'], $nation['type'], $cityListByNation[$nationID]??[]);
-        $income += getWallIncome($nation['nation'], $nation['level'], $nation['rate_tmp'], $nation['capital'], $nation['type'], $cityListByNation[$nationID]??[]);
-        $originoutcome = getOutcome(100, $generalRawList);
-        $outcome= Util::round($nation['bill'] / 100 * $originoutcome);
-
-        // 실제 지급량 계산
-        $nation['rice'] += $income;
-        // 기본량도 안될경우
-        if($nation['rice'] < GameConst::$baserice) {
-            $realoutcome = 0;
-            // 실지급률
-            $ratio = 0;
-        //기본량은 넘지만 요구량이 안될경우
-        } elseif($nation['rice'] - GameConst::$baserice < $outcome) {
-            $realoutcome = $nation['rice'] - GameConst::$baserice;
-            $nation['rice'] = GameConst::$baserice;
-            // 실지급률
-            $ratio = $realoutcome / $originoutcome;
-        } else {
-            $realoutcome = $outcome;
-            $nation['rice'] -= $realoutcome;
-            // 실지급률
-            $ratio = $realoutcome / $originoutcome;
-        }
-        $nation['rice'] = Util::valueFit($nation['rice'], GameConst::$baserice);
-        $adminLog[] = StringUtil::padStringAlignRight($nation['name'],12," ")
-            ." // 세곡 : ".StringUtil::padStringAlignRight((string)$income,6," ")
-            ." // 세출 : ".StringUtil::padStringAlignRight((string)$originoutcome,6," ")
-            ." // 실제 : ".tab2((string)$realoutcome,6," ")
-            ." // 지급률 : ".tab2((string)round($ratio*100,2),5," ")
-            ." % // 결과곡 : ".tab2((string)$nation['rice'],6," ");
-
-        $incomeText = number_format($income);
-        $incomeLog = "이번 수입은 쌀 <C>$incomeText</>입니다.";
-        $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
-        $nationStor->prev_income_rice = $income;
-
-        $db->update('nation', [
-            'rice'=>$nation['rice']
-        ], 'nation=%i', $nationID);
-
-        // 각 장수들에게 지급
-        foreach ($generalRawList as $rawGeneral) {
-            $generalObj = new General($rawGeneral, null, null, null, $year, $month, false);
-            $rice = Util::round(getBill($generalObj->getVar('dedication'))*$ratio);
-            $generalObj->increaseVar('rice', $rice);
-
-            $logger = $generalObj->getLogger();
-            if($generalObj->getVar('officer_level') > 4){
-                $logger->pushGeneralActionLog($incomeLog, $logger::PLAIN);
-            }
-            $riceText = number_format($rice);
-            $logger->pushGeneralActionLog("봉급으로 쌀 <C>$riceText</>을 받았습니다.", $logger::PLAIN);
-            $generalObj->applyDB($db);
-        }
-    }
-
-    $logger = new ActionLogger(0, 0, $year, $month);
-    $logger->pushGlobalHistoryLog('<W><b>【지급】</b></>가을이 되어 봉록에 따라 군량이 지급됩니다.');
-    $logger->flush();
-
-    pushAdminLog($adminLog);
+    $e_env = $gameStor->getValues(['startyear', 'year', 'month']);
+    $e_env['currentEventID'] = 0;
+    Action::build(["ProcessIncome", ResourceType::rice->value])->run($e_env);
 }

 function getRiceIncome(int $nationID, int $nationLevel, float $taxRate, int $capitalID, string $nationType, ?array $cityList) {
@@ -5,17 +5,25 @@ namespace sammo;
 use sammo\DTO\BettingInfo;
 use sammo\Enums\InheritanceKey;

+/**
+ * @param int $turnTerm 서버 턴 단위
+ * @return int 토너먼트 초 단위
+ */
+function calcTournamentTerm(int $turnTerm): int{
+    return Util::valueFit($turnTerm, 5, 120);
+}
+
 function processTournament()
 {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');

-    $admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'tnmt_auto', 'tnmt_time', 'last_tournament_betting_id']);
+    $admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'tnmt_auto', 'tnmt_time', 'turnterm', 'last_tournament_betting_id']);
    $now = new \DateTime();
    $offset = $now->getTimestamp() - (new \DateTime($admin['tnmt_time']))->getTimestamp();

    //수동일땐 무시
-    if ($admin['tnmt_auto'] == 0) {
+    if (!$admin['tnmt_auto']) {
        return;
    }

@@ -28,18 +36,7 @@ function processTournament()
    }

    //현시간이 스탬프 지나친경우
-    $unit = [
-        1 => 720,
-        2 => 420,
-        3 => 180,
-        4 => 60,
-        5 => 30,
-        6 => 15,
-        7 => 5,
-    ][$admin['tnmt_auto']] ?? null;
-    if($unit === null){
-        throw new MustNotBeReachedException();
-    }
+    $unit = calcTournamentTerm($admin['turnterm']);

    //업데이트 횟수
    $iter = intdiv($offset, $unit) + 1;
@@ -123,10 +120,7 @@ function processTournament()

        //베팅은 무조건 60페이즈후 진행(최대 1시간)
        if ($tnmt == 6) {
-            $betTerm = $unit * 60;
-            if ($betTerm > 3600) {
-                $betTerm = 3600;
-            }
+            $betTerm = Util::valueFit($unit * 60, null, 3600);
            //처리 초 더한 날짜
            $dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i + $betTerm);
            $gameStor->tournament = $tnmt;
@@ -134,20 +128,6 @@ function processTournament()
            $gameStor->tnmt_time = $dt;
            return;
        }
-
-        if ($admin['tnmt_auto'] == 1) {
-            //처리 초 더한 날짜
-            $dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i);
-            $hr = substr($dt, 11, 2);
-            //지정시간대 넘어가면 중단 20~24시
-            if ($hr < 20) {
-                $dt = substr($dt, 0, 11) . "20:00:00";
-                $gameStor->tournament = $tnmt;
-                $gameStor->phase = $phase;
-                $gameStor->tnmt_time = $dt;
-                return;
-            }
-        }
    }

    $second = $unit * $iter;
@@ -156,35 +136,9 @@ function processTournament()
    $gameStor->tnmt_time = (new \DateTimeImmutable($admin['tnmt_time']))->add(new \DateInterval("PT{$second}S"))->format('Y-m-d H:i:s');
 }

-function getTournamentTerm(): ?int
+function getTournamentTermText(int $turnTerm)
 {
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-
-    $tnmt_auto = $gameStor->tnmt_auto;
-    if ($tnmt_auto === null) {
-        $tnmt_auto = $gameStor->tnmt_trig;
-    }
-
-    return [
-        0 => null,
-        1 => 12 * 60,
-        2 => 7 * 60,
-        3 => 3 * 60,
-        4 => 1 * 60,
-        5 => 30,
-        6 => 15,
-        7 => 5,
-    ][$tnmt_auto] ?? null;
-}
-
-function getTournamentTermText()
-{
-    $term = getTournamentTerm();
-
-    if ($term === null) {
-        return '수동';
-    }
+    $term = calcTournamentTerm($turnTerm);

    if ($term % 60 === 0) {
        $termMin = intdiv($term, 60);
@@ -320,26 +274,18 @@ function printFighting($tournament, $phase)
    }
 }

-function startTournament($auto, $type)
+function startTournament($type)
 {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');

    eraseTnmtFightLogAll();

-    $unit = [
-        1 => 60,
-        2 => 60,
-        3 => 60,
-        4 => 60,
-        5 => 30,
-        6 => 15,
-        7 => 5,
-    ][$auto] ?? 60;
+    $admin = $gameStor->getValues(['year', 'month', 'turnterm']);
+    $turnTerm = $admin['turnterm'];
+    $unit = calcTournamentTerm($turnTerm);

-    $admin = $gameStor->getValues(['year', 'month']);
-
-    $gameStor->tnmt_auto = $auto;
+    $gameStor->tnmt_auto = true;
    $gameStor->tnmt_time = (new \DateTimeImmutable())->add(new \DateInterval("PT{$unit}M"))->format('Y-m-d H:i:s');
    $gameStor->tournament = 1;
    $gameStor->tnmt_type = $type;
@@ -392,7 +338,7 @@ function getDummyBettingInfo(string $tnmt_type): BettingInfo
    );
 }

-function startBetting($type, $unit)
+function startBetting($type)
 {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -431,7 +377,6 @@ function startBetting($type, $unit)
            aux: $general
        );
    }
-    $candidateCnt = count($candidates);

    Betting::openBetting(new BettingInfo(
        id: $bettingID,
@@ -982,7 +927,7 @@ function setGift($tnmt_type, $tnmt, $phase)
    }

    //자동진행 끝
-    $gameStor->tnmt_auto = 0;
+    $gameStor->tnmt_auto = false;

    //장수열전 기록
    /** @var ActionLogger */
@@ -1041,7 +986,7 @@ function setRefund()
    }

    //자동진행 끝
-    $gameStor->tnmt_auto = 0;
+    $gameStor->tnmt_auto = false;
 }

 //10차이 1.1, 50 차이 1.17, 100차이 1.2
@@ -2,452 +2,44 @@

 namespace sammo;

-use sammo\DTO\VoteInfo;
-
 include "lib.php";
 include "func.php";
+Session::requireLogin()->loginGame()->setReadOnly();

-$session = Session::requireLogin()->loginGame()->setReadOnly();
-$userID = Session::getUserID();
+$mapName = GameConst::$mapName;

-increaseRefresh("메인", 1);
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-if (!$userID) {
-    header('Location:..');
-    die();
-}
-
-//턴 실행.
-TurnExecutionHelper::executeAllCommand();
-
-if (!$session->isGameLoggedIn()) {
-    header('Location:..');
-    die();
-}
-
-$me = $db->queryFirstRow(
-    'SELECT no,con,turntime,newmsg,newvote,`officer_level` from general where owner = %i',
-    $userID
-);
-
-//그새 사망이면
-if ($me === null) {
-    $session->logoutGame();
-    header('Location: ../');
-    die();
-}
-
-$gameStor->cacheAll(true);
-
-if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
-    $db->update('general', [
-        'newmsg' => 0,
-        'newvote' => 0
-    ], 'owner=%i', $userID);
-}
-
-$plock = boolval($db->queryFirstField('SELECT plock FROM plock WHERE `type`="GAME" LIMIT 1'));
-
-$con = checkLimit($me['con']);
-if ($con >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-$generalObj = General::createGeneralObjFromDB($me['no']);
-$generalObj->setRawCity($db->queryFirstRow('SELECT * FROM city WHERE city = %i', $generalObj->getCityID()));
-$scenario = $gameStor->scenario_text;
-
-$nationID = $generalObj->getNationID();
-if ($nationID) {
-    $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
-    $nationStor->cacheAll();
-}
-
-if ($gameStor->extended_general == 0) {
-    $extend = "표준";
-} else {
-    $extend = "확장";
-}
-if ($gameStor->fiction == 0) {
-    $fiction = "사실";
-} else {
-    $fiction = "가상";
-}
-if ($gameStor->npcmode == 0) {
-    $npcmode = "불가능";
-} else if ($gameStor->npcmode == 1) {
-    $npcmode = "가능";
-} else {
-    $npcmode = "선택 생성";
-}
-$color = "cyan";
-$serverName = UniqueConst::$serverName;
-$serverCnt = $gameStor->server_cnt;
-
-$auctionCount = $db->queryFirstField('SELECT count(*) FROM ng_auction WHERE finished = 0');
-$isTournamentActive = $gameStor->tournament > 0;
-$isTournamentApplicationOpen = $gameStor->tournament == 1;
-$isBettingActive = $gameStor->tournament == 6;
-
-$myNationStatic = getNationStaticInfo($generalObj->getNationID());
-$nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
-
-$autorunUser = ($gameStor->autorun_user) ?? [];
-$otherTextInfo = [];
-
-if ($gameStor->join_mode == 'onlyRandom') {
-    $otherTextInfo[] = '랜덤 임관 전용';
-}
-if ($autorunUser['limit_minutes'] ?? false) {
-    $otherTextInfo[] = getAutorunInfo($autorunUser);
-}
-
-if (!$otherTextInfo) {
-    $otherTextInfo = '표준';
-} else {
-    $otherTextInfo = join(', ', $otherTextInfo);
-}
-
-$lastVoteID = $gameStor->lastVote;
-$lastVote = null;
-if ($lastVoteID) {
-    $voteStor = KVStorage::getStorage($db, 'vote');
-    $lastVote = VoteInfo::fromArray($voteStor->getValue("vote_{$lastVoteID}"));
-    if ($lastVote->endDate && $lastVote->endDate < TimeUtil::now()) {
-        $lastVote = null;
-    }
-}
 ?>
 <!DOCTYPE html>
 <html>

 <head>
-    <title><?= $serverName ?>: 메인</title>
    <meta charset="UTF-8">
+    <meta name="color-scheme" content="dark">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=500" />
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('d_shared/base_map.js') ?>
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <?= WebUtil::printDist('vue', 'v_main', true) ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printCSS('css/map.css') ?>
+    <title><?= UniqueConst::$serverName ?>: 메인</title>
    <?= WebUtil::printStaticValues([
-        //deprecated, staticValues를 이용할 것
-        'serverName' => $serverName,
-        'serverCnt' => $serverCnt,
-        'serverNick' => DB::prefix(),
-        'serverID' => UniqueConst::$serverID,
-        'maxTurn' => GameConst::$maxTurn,
-        'maxPushTurn' => 12,
-        'serverNow' => TimeUtil::now(false),
-        'lastExecuted' => $gameStor->turntime,
-        'isLocked' => $plock,
-        'isTournamentActive' => $isTournamentActive,
-        'isBettingActive' => $isBettingActive,
        'staticValues' => [
-            'serverName' => $serverName,
-            'serverCnt' => $serverCnt,
-            'serverNick' => DB::prefix(),
-            'serverID' => UniqueConst::$serverID,
-            'maxTurn' => GameConst::$maxTurn,
-            'maxPushTurn' => 12,
-            'commandList' => getCommandTable($generalObj),
-            'serverNow' => TimeUtil::now(false),
-            'lastExecuted' => $gameStor->turntime,
-            'isLocked' => $plock,
-            'isTournamentActive' => $isTournamentActive,
-            'isBettingActive' => $isBettingActive,
-            'mapName' => GameConst::$mapName,
-            'unitSet' => GameConst::$unitSet,
+          'serverName' => UniqueConst::$serverName,
+          'serverNick' => DB::prefix(),
+          'serverID' => UniqueConst::$serverID,
+          'mapName' => GameConst::$mapName,
+          'unitSet' => GameConst::$unitSet,
+
+          'maxTurn' => GameConst::$maxTurn,
+          'maxPushTurn' => 12,
+          'serverNow' => TimeUtil::now(false),
        ]
-    ]) ?>
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
+    ], false) ?>
+    <?= 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::printDist('vue', 'v_front', true) ?>
 </head>

-<body class="img_back sam-color-<?= $nationColorType ?>">
-    <div id="container" class="bg0">
-        <div class="row toolbars gx-0">
-            <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></button></div>
-        </div>
-        <div class="tb_layout row gx-0">
-            <div id="server_title" class="row py-2 center">
-                <h3>삼국지 모의전투 HiDCHe <?= $serverName . $serverCnt ?>기 <span class="avoid-wrap">(<font color=cyan><?= $scenario ?></font>)</span></h3>
-            </div>
-
-            <div class="row center gx-0">
-                <div class="s-border-t col py-2 col-8 col-md-4" style="color:<?= $color ?>;">
-                    <?= $scenario ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
-                    NPC 수, 상성 : <?= $extend ?>,<?= $fiction ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
-                    NPC선택 : <?= $npcmode ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
-                    토너먼트 : <?= getTournamentTermText() ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
-                    기타 설정: <?= $otherTextInfo ?>
-                </div>
-
-                <div class="s-border-t col py-2 col-8 col-md-4"><?= info(2) ?></div>
-                <div class="s-border-t col py-2 col-4 col-md-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
-                <div class="s-border-t col py-2 col-4 col-md-2">턴당 갱신횟수 : <?= $gameStor->conlimit ?>회</div>
-                <div class="s-border-t col py-2 col-8 col-md-4"><?= info(3) ?></div>
-                <div class="s-border-t py-2 col col-6 col-md-4">
-                    <?php if ($isTournamentActive) : ?>
-                        ↑<span style='color:cyan'><?= (['전력전', '통솔전', '일기토', '설전',])[$gameStor->tnmt_type] ?? '' ?> <?= getTournament($gameStor->tournament) ?> <?= getTournamentTime() ?></span>↑
-                    <?php else : ?>
-                        <span style='color:magenta'>현재 토너먼트 경기 없음</span>
-                    <?php endif; ?>
-                </div>
-                <div class="s-border-t py-2 col col-6 col-md-2">
-                    <div style="display:inline-block;"><?= $plock ? ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
-                </div>
-                <div class="s-border-t py-2 col col-6 col-md-2">
-                    <?php if ($auctionCount > 0) : ?>
-                        <span style='color:cyan'><?= $auctionCount ?>건</span> 거래 진행중
-                    <?php else : ?>
-                        <span style='color:magenta'>진행중 거래 없음</span>
-                    <?php endif; ?>
-                </div>
-                <div class="s-border-t py-2 col col-6 col-md-4 vote-cell">
-                    <?php
-                    ?>
-                    <?php if ($lastVote === null) : ?>
-                        <span style='color:magenta'>진행중 설문 없음</span>
-                    <?php else : ?>
-                        <span style='color:cyan'>설문 진행중</span> : <span><?= $lastVote->title ?></span>
-                    <?php endif; ?>
-                </div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t px-2 py-2">접속중인 국가: <?= $gameStor->online_nation ?></div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t px-2 py-2">운영자 메세지 : <span style='color:yellow;'><?= $gameStor->msg ?></span></div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t py-2" id="nation-msg-position">
-                    <div class="px-2">【 국가방침 】</div>
-                    <div id='nation-msg-box'>
-                        <div id='nation-msg'><?= nationMsg($generalObj) ?></div>
-                    </div>
-                </div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t px-2 py-2">
-                    【 접속자 】<?= onlinegen($generalObj) ?>
-                </div>
-            </div>
-            <?php if ($session->userGrade >= 5) : ?>
-                <div class="row">
-                    <div class="col">
-                        <a href='_admin1.php' target='_blank'><button type='button'>게임관리</button></a>
-                        <a href='_admin2.php' target='_blank'><button type='button'>회원관리</button></a>
-                        <a href='_admin4.php' target='_blank'><button type='button'>멀티관리</button></a>
-                        <a href='_admin5.php' target='_blank'><button type='button'>일제정보</button></a>
-                        <a href='_admin7.php' target='_blank'><button type='button'>로그정보</button></a>
-                        <a href='_admin8.php' target='_blank'><button type='button'>외교정보</button></a>
-                        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
-                    </div>
-                </div>
-            <?php elseif ($session->userGrade == 4) : ?>
-                <div class="row">
-                    <div class="col">
-                        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
-                    </div>
-                </div>
-            <?php endif; ?>
-            <div id="map_view" class="gx-0">
-                <div id="mapZone" class="view-item"><?= getMapHtml() ?></div>
-                <div class="view-item" id="reservedCommandZone">
-                    <div id="reservedCommandList"></div>
-                    <div id="actionMiniPlate" class="gx-0 row">
-                        <div class="col">
-                            <div class="gx-1 row">
-                                <div class="col-8 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
-                                <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div id="cityInfo" class="view-item" style="border:none;text-align:center;"><?= cityInfo($generalObj) ?></div>
-                <div id="nation-position"><?php myNationInfo($generalObj); ?></div>
-                <div id="general-position"><?php generalInfo($generalObj); ?></div>
-                <div id="generalCommandButton" class="row gx-0">
-                    <div class="buttonPlate bg2">
-                        <?= commandButton([
-                            'splitBtnBegin' => '<div class="btn-group">',
-                            'splitBtnEnd' => '</div>',
-                            'splitZoneSign' => '<button type="button" class="btn btn-sammo-nation dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"><span class="visually-hidden">Toggle Dropdown</span></button>',
-                            'splitZoneBegin' => '<ul class="dropdown-menu dropdown-menu-end">',
-                            'splitZoneEnd' => '</ul>',
-                            'splitSubBtnBegin' => '<li>',
-                            'splitSubBtnEnd' => '</li>',
-                            'btnClass' => 'btn btn-sammo-nation',
-                            'btnSplitClass' => 'dropdown-item',
-                            'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
-                            'isBettingActive' => $isBettingActive
-                        ])
-                        ?></div>
-                </div>
-            </div>
-        </div>
-        <div id="actionMiniPlateSub" class="gx-0 row">
-            <div class="col">
-                <div class="gx-1 row">
-                    <div class="col-3 d-grid"><button type='button' class="btn btn-dark" onclick="scrollHardTo('reservedCommandList')">명령으로</button></div>
-                    <div class="col-5 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
-                    <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
-                </div>
-            </div>
-        </div>
-        <div class="row gx-0">
-            <div class="col-md-6" id="general_public_record-position">
-                <div class="bg1 center s-border-tb"><b>장수 동향</b></div>
-                <div id="general_public_record" style="text-align:left;"><?= formatHistoryToHTML(getGlobalActionLogRecent(15)) ?></div>
-            </div>
-            <div class="col-md-6" id="general_log-position">
-                <div class="bg1 center s-border-tb"><b>개인 기록</b></div>
-                <div id="general_log" style="text-align:left;"><?= formatHistoryToHTML(getGeneralActionLogRecent($me['no'], 15)) ?></div>
-            </div>
-            <div class="col-12" id="world_history-position">
-                <div class="bg1 center s-border-tb"><b>중원 정세</b></div>
-                <div id="world_history" colspan=2 style="text-align:left;"><?= formatHistoryToHTML(getGlobalHistoryLogRecent(15)) ?></div>
-            </div>
-        </div>
-        <div class="row toolbars gx-0">
-            <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></div>
-
-            <div id="message_board" class="row gx-0">
-                <div class="message_input_form bg0 gx-0 row">
-                    <div id="mailbox_list-col" class="col-6 col-md-2 d-grid">
-                        <select id="mailbox_list" size="1" class="form-control bg-dark text-white">
-                        </select>
-                    </div>
-                    <div id="msg_input-col" class="col-12 col-md-8 d-grid">
-                        <input type="text" id="msg_input" maxlength="99" class="form-control">
-                    </div>
-                    <div id="msg_submit-col" class="col-6 col-md-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
-                </div>
-                <div class="col-md-6 board_side bg0"><a id="public_talk_position"></a>
-                    <div class="board_header bg0">전체 메시지(최고99자)</div>
-                    <section class="public_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="public">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-                <div class="col-md-6 board_side bg0"><a id="national_talk_position"></a>
-                    <div class="board_header bg0">국가 메시지(최고99자)</div>
-                    <section class="national_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="national">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-                <div class="col-md-6 board_side bg0"><a id="private_talk_position"></a>
-                    <div class="board_header bg0">개인 메시지(최고99자)</div>
-                    <section class="private_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="private">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-                <div class="col-md-6 board_side bg0"><a id="diplomacy_talk_position"></a>
-                    <div class="board_header bg0">외교 메시지(최고99자)</div>
-                    <section class="diplomacy_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="diplomacy">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-            </div>
-            <div class="row toolbars gx-0">
-                <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></div><?= banner() ?>
-            </div>
-        </div>
-        <?php
-        if ($con == 1) {
-            MessageBox("접속제한이 얼마 남지 않았습니다!");
-        }
-        if ($me['newmsg'] == 1) {
-            MessageBox("새로운 서신이 도착했습니다!");
-        }
-        if ($me['newvote'] == 1) {
-            $develcost = $gameStor->develcost * 5;
-            MessageBox("설문조사에 참여하시면 금{$develcost}과 유니크템을 드립니다! (우측 상단 설문조사 메뉴)");
-        }
-        ?>
-    </div>
-    <nav class="navbar navbar-expand fixed-bottom navbar-dark bg-dark d-sm-block d-md-none p-0" id="navbar500">
-        <div class="container-fluid px-0">
-            <div class="collapse navbar-collapse">
-                <ul class="navbar-nav me-auto mx-auto">
-                    <li class="nav-item dropup">
-                        <div class="dropdown-toggle text-white btn btn-sammo-base2" id="navbarGlobal" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            외부 메뉴
-                        </div>
-                        <ul class="dropdown-menu dropdown-menu-start" aria-labelledby="navbarGlobal" id="navbarGlobalItems">
-                            <?= allButton($gameStor->npcmode == 1, ['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item']) ?>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropup">
-                        <div class="dropdown-toggle btn btn-sammo-nation" id="navbarNation" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            국가 메뉴
-                        </div>
-                        <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
-                            <?= commandButton([
-                                'btnBegin' => '<li>',
-                                'btnEnd' => '</li>',
-                                'splitMainBegin' => '<div class="d-none">',
-                                'splitMainEnd' => '</div>',
-                                'splitSubBtnBegin' => '<li>',
-                                'splitSubBtnEnd' => '</li>',
-                                'btnClass' => 'dropdown-item',
-                                'btnSplitClass' => 'dropdown-item',
-                                'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
-                                'isBettingActive' => $isBettingActive
-                            ]) ?>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropup">
-                        <div class="dropdown-toggle text-white btn btn-dark" id="navbarQuick" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            빠른 이동
-                        </div>
-                        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown" id="navbarQuickItems">
-                            <li><a class="dropdown-item disabled">국가 정보</a></button></li>
-                            <hr class="dropdown-divider">
-                            </hr>
-                            <li><button type="button" onclick="scrollHardTo('nation-msg-position')" class="dropdown-item">방침</button></li>
-                            <li><button type="button" onclick="scrollHardTo('reservedCommandList')" class="dropdown-item">명령</button></li>
-                            <li><button type="button" onclick="scrollHardTo('nation-position')" class="dropdown-item">국가</button></li>
-                            <li><button type="button" onclick="scrollHardTo('general-position')" class="dropdown-item">장수</button></li>
-                            <li><button type="button" onclick="scrollHardTo('cityInfo')" class="dropdown-item">도시</button></li>
-                            <li><a class="dropdown-item disabled">동향 정보</a></button></li>
-                            <hr class="dropdown-divider">
-                            </hr>
-                            <li><button type="button" onclick="scrollHardTo('mapZone')" class="dropdown-item">지도</button></li>
-                            <li><button type="button" onclick="scrollHardTo('general_public_record-position')" class="dropdown-item">동향</button></li>
-                            <li><button type="button" onclick="scrollHardTo('general_log-position')" class="dropdown-item">개인</button></li>
-                            <li><button type="button" onclick="scrollHardTo('world_history-position')" class="dropdown-item">정세</button></li>
-                            <li><span>&nbsp;</span></li>
-                            <li><a class="dropdown-item disabled">메시지</a></button></li>
-                            <hr class="dropdown-divider">
-                            </hr>
-                            <li><button type="button" onclick="scrollHardTo('public_talk_position')" class="dropdown-item">전체</button></li>
-                            <li><button type="button" onclick="scrollHardTo('national_talk_position')" class="dropdown-item">국가</button></li>
-                            <li><button type="button" onclick="scrollHardTo('private_talk_position')" class="dropdown-item">개인</button></li>
-                            <li><button type="button" onclick="scrollHardTo('diplomacy_talk_position')" class="dropdown-item">외교</button></li>
-                            <li><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></li>
-                        </ul>
-                    </li>
-                    <li class="nav-item">
-                        <a class="refreshPage btn btn-sammo-base2 text-white" role="button">갱신</a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </nav>
+<body>
+    <div id="app"></div>
 </body>

 </html>
@@ -28,10 +28,12 @@ if ($session->userGrade < 5 && !$allowReset) {
 <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=device-width, initial-scale=1" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printCSS('css/install.css') ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
    <?= WebUtil::printDist('ts', ['common', 'install']) ?>
 </head>

@@ -92,8 +94,8 @@ if ($session->userGrade < 5 && !$allowReset) {
                                <label for="fiction" class="col-sm-3 col-form-label">NPC 상성</label>
                                <div class="col-sm-9">
                                    <div id="fiction" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
-                                        <input type="radio" id="fiction_0" class="btn-check" name="fiction" value="0" checked><label for="fiction_0" class="btn btn-secondary"> 연의 </label>
-                                        <input type="radio" id="fiction_1" class="btn-check" name="fiction" value="1"><label for="fiction_1" class="btn btn-secondary"> 가상 </label>
+                                        <input type="radio" id="fiction_0" class="btn-check" name="fiction" value="0"><label for="fiction_0" class="btn btn-secondary"> 연의 </label>
+                                        <input type="radio" id="fiction_1" class="btn-check" name="fiction" value="1" checked><label for="fiction_1" class="btn btn-secondary"> 가상 </label>
                                    </div>
                                </div>
                            </div>
@@ -113,6 +115,7 @@ if ($session->userGrade < 5 && !$allowReset) {
                                <div class="col-sm-9">
                                    <div id="block_general_create" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
                                        <input type="radio" class="btn-check" id="block_general_create_0" name="block_general_create" value="0" checked><label for="block_general_create_0" class="btn btn-secondary">가능</label>
+                                        <input type="radio" class="btn-check" id="block_general_create_2" name="block_general_create" value="2"><label for="block_general_create_2" class="btn btn-secondary">장수명무작위</label>
                                        <input type="radio" class="btn-check" id="block_general_create_1" name="block_general_create" value="1"><label for="block_general_create_1" class="btn btn-secondary">불가</label>
                                    </div>
                                </div>
@@ -134,13 +137,13 @@ if ($session->userGrade < 5 && !$allowReset) {
                                <div class="col-sm-9">
                                    <div class="input-group">
                                        <div class="btn-group btn-group-toggle" data-bs-toggle="buttons">
-                                            <input type="checkbox" id="autorun_develop" class="autorun_user_chk btn-check" data-key="develop" name="autorun_user[]" value="develop"><label class="btn btn-secondary" for="autorun_develop">내정</label>
-                                            <input type="checkbox" id="autorun_warp" class="autorun_user_chk btn-check" data-key="warp" name="autorun_user[]" value="warp"><label class="btn btn-secondary" for="autorun_warp">순간이동</label>
-                                            <input type="checkbox" id="autorun_recruit" class="autorun_user_chk btn-check" data-key="recruit" name="autorun_user[]" value="recruit"><label class="btn btn-secondary" for="autorun_recruit">징병</label>
-                                            <input type="checkbox" id="autorun_recruit_high" class="autorun_user_chk btn-check" data-key="recruit_high" name="autorun_user[]" value="recruit_high"><label class="btn btn-secondary" for="autorun_recruit_high">모병</label>
-                                            <input type="checkbox" id="autorun_train" class="autorun_user_chk btn-check" data-key="train" name="autorun_user[]" value="train"><label class="btn btn-secondary" for="autorun_train">훈사</label>
-                                            <input type="checkbox" id="autorun_battle" class="autorun_user_chk btn-check" data-key="battle" name="autorun_user[]" value="battle"><label class="btn btn-secondary" for="autorun_battle">출병</label>
-                                            <input type="checkbox" id="autorun_chief" class="autorun_user_chk btn-check" data-key="chief" name="autorun_user[]" value="chief"><label class="btn btn-secondary" for="autorun_chief">기본 사령턴</label>
+                                            <input type="checkbox" id="autorun_develop" class="autorun_user_chk btn-check" data-key="develop" name="autorun_user[]" value="develop" checked><label class="btn btn-secondary" for="autorun_develop">내정</label>
+                                            <input type="checkbox" id="autorun_warp" class="autorun_user_chk btn-check" data-key="warp" name="autorun_user[]" value="warp" checked><label class="btn btn-secondary" for="autorun_warp">순간이동</label>
+                                            <input type="checkbox" id="autorun_recruit" class="autorun_user_chk btn-check" data-key="recruit" name="autorun_user[]" value="recruit" checked><label class="btn btn-secondary" for="autorun_recruit">징병</label>
+                                            <input type="checkbox" id="autorun_recruit_high" class="autorun_user_chk btn-check" data-key="recruit_high" name="autorun_user[]" value="recruit_high" checked><label class="btn btn-secondary" for="autorun_recruit_high">모병</label>
+                                            <input type="checkbox" id="autorun_train" class="autorun_user_chk btn-check" data-key="train" name="autorun_user[]" value="train" checked><label class="btn btn-secondary" for="autorun_train">훈사</label>
+                                            <input type="checkbox" id="autorun_battle" class="autorun_user_chk btn-check" data-key="battle" name="autorun_user[]" value="battle" checked><label class="btn btn-secondary" for="autorun_battle">출병</label>
+                                            <input type="checkbox" id="autorun_chief" class="autorun_user_chk btn-check" data-key="chief" name="autorun_user[]" value="chief" checked><label class="btn btn-secondary" for="autorun_chief">기본 사령턴</label>
                                        </div>
                                    </div>
                                </div>
@@ -162,7 +165,7 @@ if ($session->userGrade < 5 && !$allowReset) {
                                            <option value="480">8시간</option>
                                            <option value="600">10시간</option>
                                            <option value="720">12시간</option>
-                                            <option value="1440">24시간</option>
+                                            <option value="1440" selected>24시간</option>
                                            <option value="2160">36시간</option>
                                            <option value="2880">48시간</option>
                                            <option value="3600">60시간</option>
@@ -194,17 +197,11 @@ if ($session->userGrade < 5 && !$allowReset) {
                            </div>

                            <div class="form-group row">
-                                <label for="tournament_trig" class="col-sm-3 col-form-label"><span class="text-nowrap">토너먼트 자동 시작</span> <span class="text-nowrap">경기 단위</span></label>
+                                <label for="tournament_trig" class="col-sm-3 col-form-label"><span class="text-nowrap">토너먼트 자동 시작</span></label>
                                <div class="col-sm-9" id="tournament_trig">
                                    <div id="tournament_trig" class="btn-group-toggle btn-group flex-wrap" data-bs-toggle="buttons">
-                                        <input type="radio" class="btn-check" id="tournament_trig_0" name="tournament_trig" value="0"><label for="tournament_trig_0" class="btn btn-secondary w-25">안함</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_1" name="tournament_trig" value="1"><label for="tournament_trig_1" class="btn btn-secondary w-25">12분(총 5일)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_2" name="tournament_trig" value="2"><label for="tournament_trig_2" class="btn btn-secondary w-25">7분(총 10시간)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_3" name="tournament_trig" value="3"><label for="tournament_trig_3" class="btn btn-secondary w-25">3분(총 4시간)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_4" name="tournament_trig" value="4" checked><label for="tournament_trig_4" class="btn btn-secondary w-25">1분(총 82분)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_5" name="tournament_trig" value="5"><label for="tournament_trig_5" class="btn btn-secondary w-25">30초(총 41분)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_6" name="tournament_trig" value="6"><label for="tournament_trig_6" class="btn btn-secondary w-25">15초(총 21분)</label>
-                                        <input type="radio" class="btn-check" id="tournament_trig_7" name="tournament_trig" value="7"><label for="tournament_trig_7" class="btn btn-secondary w-25">5초(총 7분)</label>
+                                        <input type="radio" class="btn-check" id="tournament_trig_0" name="tournament_trig" value="0"><label for="tournament_trig_0" class="btn btn-secondary w-25">수동</label>
+                                        <input type="radio" class="btn-check" id="tournament_trig_1" name="tournament_trig" checked value="1"><label for="tournament_trig_1" class="btn btn-secondary w-25">자동</label>
                                    </div>
                                </div>
                            </div>
@@ -21,6 +21,7 @@ if ($session->userGrade == 5) {
 <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=device-width, initial-scale=1" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
@@ -56,7 +56,7 @@ else if(
    $status = 'closed';
 }
 else if(
-    $isUnited > 0 && 
+    $isUnited > 0 &&
    $now->getTimestamp() - $lastTurn->getTimestamp() > ($reservedDate->getTimestamp() - $now->getTimestamp()) * 2
 ){
    //천통 & 비정지 상태 & 2/3 넘음
@@ -88,7 +88,7 @@ $result = ResetHelper::buildScenario(
    $options['block_general_create'],
    $options['npcmode'],
    $options['show_img_level'],
-    $options['tournament_trig'],
+    !!$options['tournament_trig'],
    $options['join_mode'],
    $options['starttime'],
    $options['autorun_user']?:null
@@ -1,61 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-
-WebUtil::requireAJAX();
-
-$availableDieImmediately = false;
-
-//로그인 검사
-$session = Session::requireGameLogin();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-$general = $db->queryFirstRow('SELECT no,name,owner_name,npc,lastrefresh FROM general WHERE owner=%i AND npc = 0', $userID);
-
-if(!$general){
-    Json::die([
-        'result'=>false,
-        'reason'=>'장수가 없습니다.'
-    ]);
-}
-
-increaseRefresh("장수 삭제", 1);
-$gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
-
-if($gameStor->turntime > $gameStor->opentime){
-    Json::die([
-        'result'=>false,
-        'reason'=>'이미 서버가 시작되었습니다.'
-    ]);
-}
-
-
-$targetTime = addTurn($general['lastrefresh'], $gameStor->turnterm, 2);
-if($targetTime > TimeUtil::now()){
-    $targetTimeShort = substr($targetTime, 0, 19);
-    Json::die([
-        'result'=>false,
-        'reason'=>"아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다."
-    ]);
-}
-
-
-$generalObj = General::createGeneralObjFromDB($general['no']);
-if($generalObj instanceof DummyGeneral){
-    trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
-}
-$generalName = $generalObj->getName();
-$josaYi = JosaUtil::pick($generalName, '이');
-$generalObj->kill($db, true, "<Y>{$generalName}</>{$josaYi} 이 홀연히 모습을 <R>감추었습니다</>");
-
-$session->logoutGame();
-Json::die([
-    'result'=>true,
-    'reason'=>'success'
-]);
@@ -1,6 +1,8 @@
 <?php
 namespace sammo;

+use sammo\Enums\MessageType;
+
 include "lib.php";
 include "func.php";

@@ -100,7 +102,7 @@ if(in_array($stateOpt, ['try_destroy_src', 'try_destroy_dest'])){
            'reason'=>'파기'
        ];
    }
-    $msgText = "외교 서신 #{$letterNo}를 파기했습니다.";
+    $msgText = "외교 서신(#{$letterNo})을 파기했습니다.";
    $lastState = 'cancelled';
 }
 else{
@@ -114,12 +116,12 @@ else{
        'aux'=>Json::encode($aux)
    ], 'no=%i', $letterNo);

-    $msgText = "외교 서신 #{$letterNo}를 파기 요청합니다.";
+    $msgText = "외교 서신(#{$letterNo})을 파기 요청합니다.";
    $lastState = 'activated';
 }

 $msg = new Message(
-    Message::MSGTYPE_DIPLOMACY,
+    MessageType::diplomacy,
    $src,
    $dest,
    $msgText,
@@ -1,6 +1,8 @@
 <?php
 namespace sammo;

+use sammo\Enums\MessageType;
+
 include "lib.php";
 include "func.php";

@@ -85,7 +87,7 @@ if($isAgree){
        ], 'no=%i', $prevLetterNo);
        $prevLetterNo = $db->queryFirstField('SELECT prev_no FROM ng_diplomacy WHERE state != \'cancelled\' AND no = %i', $prevLetterNo);
    }
-    $msgText = "외교 서신 #{$letterNo}가 승인되었습니다.";
+    $msgText = "외교 서신( #{$letterNo})이 승인되었습니다.";
 }
 else{
    $aux['reason'] = [
@@ -97,14 +99,14 @@ else{
        'state'=>'cancelled',
        'aux'=>Json::encode($aux)
    ], 'no=%i', $letterNo);
-    $msgText = "외교 서신 #{$letterNo}가 거부되었습니다.";
+    $msgText = "외교 서신(#{$letterNo})이 거부되었습니다.";
    if($reason){
        $msgText .= ' 이유 : '.$reason;
    }
 }

 $msg = new Message(
-    Message::MSGTYPE_DIPLOMACY,
+    MessageType::diplomacy,
    $src,
    $dest,
    $msgText,
@@ -115,7 +117,7 @@ $msg = new Message(
 $msgID = $msg->send();

 $msg = new Message(
-    Message::MSGTYPE_NATIONAL,
+    MessageType::national,
    $src,
    $dest,
    $msgText,
@@ -1,6 +1,8 @@
 <?php
 namespace sammo;

+use sammo\Enums\MessageType;
+
 include "lib.php";
 include "func.php";

@@ -70,10 +72,10 @@ $db->update('ng_diplomacy', [
    'state'=>'cancelled',
    'aux'=>Json::encode($aux)
 ], 'no=%i', $letterNo);
-$msgText = "외교 서신 #{$letterNo}가 회수되었습니다.";
+$msgText = "외교 서신(#{$letterNo})이 회수되었습니다.";

 $msg = new Message(
-    Message::MSGTYPE_DIPLOMACY,
+    MessageType::diplomacy,
    $src,
    $dest,
    $msgText,
@@ -1,6 +1,8 @@
 <?php
 namespace sammo;

+use sammo\Enums\MessageType;
+
 include "lib.php";
 include "func.php";

@@ -176,7 +178,7 @@ else{


 $msg = new Message(
-    Message::MSGTYPE_DIPLOMACY,
+    MessageType::diplomacy,
    $src,
    $dest,
    $msgText,
@@ -109,9 +109,9 @@ $scenario = (int)$_POST['scenario'];
 $fiction = (int)$_POST['fiction'];
 $extend = (int)$_POST['extend'];
 $npcmode = (int)$_POST['npcmode'];
-$block_general_create = (bool)$_POST['block_general_create'];
+$block_general_create = (int)$_POST['block_general_create'];
 $show_img_level = (int)$_POST['show_img_level'];
-$tournament_trig = (int)$_POST['tournament_trig'];
+$tournament_trig = !!(int)$_POST['tournament_trig'];
 $join_mode = $_POST['join_mode'];
 $autorun_user_minutes = (int)$_POST['autorun_user_minutes'];
 $autorun_user_options = [];
@@ -208,7 +208,7 @@ Json::die(ResetHelper::buildScenario(
    $block_general_create,
    $npcmode,
    $show_img_level,
-    $tournament_trig,
+    !!$tournament_trig,
    $join_mode,
    TimeUtil::now(),
    $autorun_user
@@ -1,19 +0,0 @@
-<?php
-namespace sammo;
-
-include('lib.php');
-include('func.php');
-
-$session = Session::requireGameLogin([])->setReadOnly();
-
-if(!Session::getInstance()->generalID){
-    Json::die([
-        "nation"=>[]
-    ]);
-}
-
-//NOTE: 모든 국가, 모든 장수에 대해서 같은 결과라면 캐싱 가능하지 않을까?
-
-Json::die([
-    "nation"=>getMailboxList()
-]);
@@ -1,63 +0,0 @@
-<?php
-namespace sammo;
-
-include 'lib.php';
-include 'func.php';
-
-WebUtil::requireAJAX();
-
-//{msgID: 1206, response: true}
-$session = Session::requireGameLogin([])->setReadOnly();
-
-
-$generalID = Session::getInstance()->generalID;
-
-if (!$generalID) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'로그인하지 않음'
-    ]);
-}
-
-$jsonPost = Json::decode(Util::getPost('data', 'string', '{}'));
-
-$msgID = Util::toInt($jsonPost['msgID']??null);
-$msgResponse = $jsonPost['response']??null;
-
-if ($msgID === null || !is_bool($msgResponse)) {
-    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 인자'
-    ]);
-}
-
-$general = DB::db()->queryFirstRow('SELECT `no`, `name`, `nation`, `officer_level`, `npc`, `gold`, `rice`, `troop`, `aux` from `general` where `no` = %i', $generalID);
-if(!$general){
-    Json::die([
-        'result'=>false,
-        'reason'=>'존재하지 않는 장수'
-    ]);
-}
-
-$msg = Message::getMessageByID($msgID);
-if($msg === null){
-    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 메시지'
-    ]);
-}
-$reason = 'success';
-$gameStor = KVStorage::getStorage(DB::db(), 'game_env');
-$gameStor->cacheAll();
-if($msgResponse){
-    $result = $msg->agreeMessage($general['no'], $reason);
-}
-else{
-    $result = $msg->declineMessage($general['no'], $reason);
-}
-
-
-Json::die([
-    'result' => $result!==DiplomaticMessage::INVALID,
-    'reason' => $reason
-]);
@@ -1,74 +0,0 @@
-<?php
-namespace sammo;
-
-include('lib.php');
-include('func.php');
-
-WebUtil::requireAJAX();
-
-$session = Session::requireGameLogin([]);
-$userID = Session::getUserID();
-
-$msgID = Util::getPost('msgID', 'int');
-if($msgID === null){
-    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 범위 입니다.'
-    ]);
-}
-
-$lastMsgGet = Json::decode($session->lastMsgGet)??[];
-$now = new \DateTime();
-$delayTime = false;
-if(count($lastMsgGet) >= 10){
-    try{
-        if($lastMsgGet[0] !== 'string'){
-            throw new \Exception('Why not string?');
-        }
-        $first = new \DateTime($lastMsgGet[0]);
-        $diff = $first->diff($now);
-        if($diff->days == 0 && $diff->h > 0 && $diff->i == 0 && $diff->s <= 5){
-            $delayTime = true;
-        }
-        array_shift($lastMsgGet);
-    }
-    catch(\Exception $e){
-        $lastMsgGet = [];
-    } 
-}
-$lastMsgGet[] = $now;
-$session->lastMsgGet = Json::encode($lastMsgGet);
-
-if($delayTime){
-    sleep(1);
-}
-$session->setReadOnly();
-
-list($generalID, $nationID, $generalName) = DB::db()->queryFirstList(
-    'select `no`, `nation`, `name` from `general` where owner = %i',
-    $userID
-);
-
-if($nationID === null){
-    Json::die([
-        'result'=>false,
-        'reason'=>'장수가 사망했습니다.'
-    ]);
-}
-
-$reason = Message::deleteMsg($msgID, $generalID);
-if($reason === null){
-    $result = [
-        'result'=>true,
-        'reason'=>'success'
-    ];
-}
-else{
-    $result = [
-        'result'=>false,
-        'reason'=>$reason
-    ];
-}
-
-
-Json::die($result);
@@ -1,118 +0,0 @@
-<?php
-namespace sammo;
-
-include('lib.php');
-include('func.php');
-
-$session = Session::requireGameLogin([]);
-$userID = Session::getUserID();
-
-$reqTo = Util::getPost('to', 'int');
-$reqType = Util::getPost('type', 'string');
-
-if($reqTo === null){
-    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 범위 입니다.'
-    ]);
-}
-if($reqType === null || !in_array($reqType, ['private', 'public', 'national', 'diplomacy'])){
-    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 타입입니다.'
-    ]);
-}
-
-$lastMsgGet = Json::decode($session->lastMsgGet)??[];
-$now = new \DateTime();
-$delayTime = false;
-if(count($lastMsgGet) >= 10){
-    try{
-        if($lastMsgGet[0] !== 'string'){
-            throw new \Exception('Why not string?');
-        }
-        $first = new \DateTime($lastMsgGet[0]);
-        $diff = $first->diff($now);
-        if($diff->days == 0 && $diff->h > 0 && $diff->i == 0 && $diff->s <= 1){
-            $delayTime = true;
-        }
-        array_shift($lastMsgGet);
-    }
-    catch(\Exception $e){
-        $lastMsgGet = [];
-    }
-}
-$lastMsgGet[] = $now;
-$session->lastMsgGet = Json::encode($lastMsgGet);
-
-if($delayTime){
-    sleep(1);
-}
-$session->setReadOnly();
-
-$me = DB::db()->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
-
-if($me === null){
-    Json::die([
-        'result'=>false,
-        'reason'=>'장수가 사망했습니다.'
-    ]);
-}
-
-[$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']];
-$permission = checkSecretPermission($me, false);
-
-$result = [
-    'private'=>[],
-    'public'=>[],
-    'national'=>[],
-    'diplomacy'=>[],
-    'result'=>true,
-    'keepRecent'=>true,
-    'sequence'=>0,
-    'nationID'=>$nationID,
-    'generalName'=>$generalName,
-];
-$result['result'] = true;
-
-$nextSequence = $reqTo;
-
-if($reqType == 'private'){
-    $result['private'] = array_map(function(Message $msg) use (&$nextSequence){
-        if($msg->id > $nextSequence){
-            $nextSequence = $msg->id;
-        }
-        return $msg->toArray();
-    }, Message::getMessagesFromMailBoxOld($generalID, Message::MSGTYPE_PRIVATE, $reqTo, 15));
-}
-else if($reqType == 'public'){
-    $result['public'] = array_map(function(Message $msg)use (&$nextSequence){
-        if($msg->id > $nextSequence){
-            $nextSequence = $msg->id;
-        }
-        return $msg->toArray();
-    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_PUBLIC, Message::MSGTYPE_PUBLIC, $reqTo, 15));
-}
-else if($reqType == 'national'){
-    $result['national'] = array_map(function(Message $msg)use (&$nextSequence){
-        if($msg->id > $nextSequence){
-            $nextSequence = $msg->id;
-        }
-        return $msg->toArray();
-    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, $reqTo, 15));
-}
-else{
-    $result['diplomacy'] = array_map(function(Message $msg)use (&$nextSequence, $permission){
-        if($msg->id > $nextSequence){
-            $nextSequence = $msg->id;
-        }
-        $values = $msg->toArray();
-        if($msg->dest->nationID != 0 && $permission < 3){
-            $values['text'] = '(외교 메시지입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
-            $values['option']['invalid'] = true;
-        }
-        return $values;
-    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, $reqTo, 15));
-}
-
-Json::die($result);
@@ -1,120 +0,0 @@
-<?php
-namespace sammo;
-
-include('lib.php');
-include('func.php');
-
-$session = Session::requireGameLogin([]);
-$userID = Session::getUserID();
-
-$reqSequence = Util::getPost('sequence', 'int', -1);
-
-$lastMsgGet = Json::decode($session->lastMsgGet)??[];
-$now = new \DateTime();
-$delayTime = false;
-if(count($lastMsgGet) >= 10){
-    try{
-        if(!is_string($lastMsgGet[0])){
-            throw new \Exception('Why not string?');
-        }
-        $first = new \DateTime($lastMsgGet[0]);
-        $diff = $first->diff($now);
-        if($diff->days == 0 && $diff->h > 0 && $diff->i == 0 && $diff->s <= 1){
-            $delayTime = true;
-        }
-        array_shift($lastMsgGet);
-    }
-    catch(\Exception $e){
-        $lastMsgGet = [];
-    }
-}
-$lastMsgGet[] = TimeUtil::now();
-$session->lastMsgGet = Json::encode($lastMsgGet);
-
-if($delayTime){
-    usleep(200);
-}
-$session->setReadOnly();
-
-
-$db = DB::db();
-$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
-
-if($me === null){
-    Json::die([
-        'result'=>false,
-        'reason'=>'장수가 사망했습니다.'
-    ]);
-}
-
-[$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']];
-$permission = checkSecretPermission($me, false);
-
-$result = [];
-$result['result'] = true;
-$result['keepRecent'] = false;
-$nextSequence = $reqSequence;
-$minSequence = $reqSequence;
-$lastType = null;
-
-$result['private'] = array_map(function(Message $msg) use (&$nextSequence, &$minSequence, &$lastType){
-    if($msg->id > $nextSequence){
-        $nextSequence = $msg->id;
-    }
-    if($msg->id <= $minSequence){
-        $minSequence = $msg->id;
-        $lastType = 'private';
-    }
-    return $msg->toArray();
-}, Message::getMessagesFromMailBox($generalID, Message::MSGTYPE_PRIVATE, 15, $reqSequence));
-
-$result['public'] = array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType){
-    if($msg->id > $nextSequence){
-        $nextSequence = $msg->id;
-    }
-    if($msg->id <= $minSequence){
-        $minSequence = $msg->id;
-        $lastType = 'public';
-    }
-    return $msg->toArray();
-}, Message::getMessagesFromMailBox(Message::MAILBOX_PUBLIC, Message::MSGTYPE_PUBLIC, 15, $reqSequence));
-
-$result['national'] = array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType){
-    if($msg->id > $nextSequence){
-        $nextSequence = $msg->id;
-    }
-    if($msg->id <= $minSequence){
-        $minSequence = $msg->id;
-        $lastType = 'national';
-    }
-    return $msg->toArray();
-}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, 15, $reqSequence));
-
-$result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType, $permission){
-    if($msg->id > $nextSequence){
-        $nextSequence = $msg->id;
-    }
-    if($msg->id <= $minSequence){
-        $minSequence = $msg->id;
-        $lastType = 'diplomacy';
-    }
-    $values = $msg->toArray();
-    if($msg->dest->nationID != 0 && $permission < 3){
-        $values['text'] = '(외교 메시지입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
-        $values['option']['invalid'] = true;
-    }
-    return $values;
-}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 15, $reqSequence));
-
-if($lastType !== null){
-    array_pop($result[$lastType]);
-    $result['keepRecent'] = true;
-}
-else if($reqSequence <= 0){
-    $result['keepRecent'] = true;
-}
-
-$result['sequence'] = $nextSequence;
-$result['nationID'] = $nationID;
-$result['generalName'] = $generalName;
-Json::die($result);
@@ -1,206 +0,0 @@
-<?php
-namespace sammo;
-
-include 'lib.php';
-include 'func.php';
-
-WebUtil::requireAJAX();
-
-$post = Json::decode(Util::getPost('data', 'string', '{}'));
-'@phan-var mixed[] $post';
-
-$v = new Validator($post);
-$v->rule('required', ['mailbox','text']);
-$v->rule('integer', 'mailbox');
-$v->rule('lengthMin', 'text', 1);
-
-if(!$v->validate()){
-    Json::die([
-        'result'=>false,
-        'reason'=>$v->errorStr(),
-        'msgID'=>null
-    ]);
-}
-
-$mailbox = (int)$post['mailbox'];
-$text = trim(StringUtil::cutStringForWidth($post['text'], 199, ''));
-
-$session = Session::requireGameLogin([
-    'msgID'=>null
-]); 
-$userID = Session::getUserID();
-//NOTE: 전송 메시지 시간 계산을 위해 Session을 쓰기 가능 상태로 열어둠.
-
-increaseRefresh('서신전달', 1);
-
-if(getBlockLevel() == 1 || getBlockLevel() == 3) {
-    Json::die([
-        'result' => false,
-        'reason' => '차단되었습니다.',
-        'msgID'=>null
-    ]);
-}
-
-/**
- * 메시지 전송 코드.
- * 
- * TODO: 장기적으로 ajax는 한곳에 모을 필요가 있을 듯.
- */
-
-$now = new \DateTime();
-$unlimited = new \DateTime('9999-12-31');
-
-$db = DB::db();
-$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission,belong FROM general WHERE `owner`=%i', $userID);
-
-if(!$me){
-    $session->logoutGame();
-    Json::die([
-        'result' => false,
-        'reason' => '로그인되지 않았습니다.',
-        'msgID' => null
-    ]);
-}
-
-$con = checkLimit($me['con']);
-if($con >= 2) { 
-    Json::die([
-        'result' => false,
-        'reason' => '접속 제한입니다.',
-        'msgID' => null
-    ]);
- }
-
-$me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
-$permission = checkSecretPermission($me);
-$srcNation = getNationStaticInfo($me['nation']);
-
-$src = new MessageTarget($me['no'], $me['name'], $srcNation['nation'], $srcNation['name'], $srcNation['color'], $me['icon']);
-
-// 전체 메세지
-if($mailbox == Message::MAILBOX_PUBLIC) {
-    $msg = new Message(
-        Message::MSGTYPE_PUBLIC, 
-        $src, 
-        $src,
-        $text, 
-        $now, 
-        $unlimited, 
-        []
-    );
-    $msgID = $msg->send();
-    Json::die([
-        'result' => true,
-        'reason' => 'SUCCESS',
-        'msgID' => $msgID
-    ]);
-
-
-} 
-
-// 국가 메세지
-if($mailbox >= Message::MAILBOX_NATIONAL) {
-
-    if($permission < 4){
-        $destNationID = $me['nation'];
-    }
-    else{
-        $destNationID = $mailbox - Message::MAILBOX_NATIONAL;
-    }
-
-    if($destNationID == $me['nation']){
-        $msgType = Message::MSGTYPE_NATIONAL;
-    }
-    else{
-        $msgType = Message::MSGTYPE_DIPLOMACY;
-    }
-
-    $destNation = getNationStaticInfo($destNationID);
-
-    $dest = new MessageTarget(0, '', $destNation['nation'], $destNation['name'], $destNation['color']);
-
-    $msg = new Message(
-        $msgType,
-        $src,
-        $dest,
-        $text,
-        $now,
-        $unlimited,
-        []
-    );
-    $msgID = $msg->send();
-    Json::die([
-        'result' => true,
-        'reason' => 'SUCCESS',
-        'msgID' => $msgID
-    ]);
-}
-
-// 개인 메세지
-if($mailbox > 0) {
-    $lastMsg = new \DateTime($session->lastMsg??'0000-00-00');
-
-    $msg_interval = $now->getTimestamp() - $lastMsg->getTimestamp();
-    //NOTE: 여기서 유저 레벨을 구별할 코드가 필요할까?
-    if($msg_interval < 2){
-        Json::die([
-            'result' => false,
-            'reason' => '개인메세지는 2초당 1건만 보낼 수 있습니다!',
-            'msgID' => null
-        ]);
-    }
-    
-    $session->lastMsg = $now->format('Y-m-d H:i:s');
-
-    $destUser = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,permission,penalty FROM general WHERE `no`=%i',$mailbox);
-    
-    if(!$destUser){
-        Json::die([
-            'result' => false,
-            'reason' => '존재하지 않는 유저입니다.',
-            'msgID' => null
-        ]);
-    }
-
-    $destPermission = checkSecretPermission($destUser, false);
-    if($permission == 4 && $destPermission == 4 && $destUser['nation'] != $me['nation']){
-        Json::die([
-            'result' => false,
-            'reason' => '외교권자끼리는 메시지를 보낼 수 없습니다.',
-            'msgID' => null
-        ]);
-    }
-
-    $destNation = getNationStaticInfo($destUser['nation']);
-
-    $dest = new MessageTarget(
-        $destUser['no'],
-        $destUser['name'],
-        $destNation['nation'],
-        $destNation['name'],
-        $destNation['color'],
-        GetImageURL($destUser['imgsvr'], $destUser['picture'])
-    );
-
-    $msg = new Message(
-        Message::MSGTYPE_PRIVATE,
-        $src,
-        $dest,
-        $text,
-        $now,
-        $unlimited,
-        []
-    );
-    $msgID = $msg->send();
-    Json::die([
-        'result' => true,
-        'reason' => 'SUCCESS',
-        'msgID' => $msgID
-    ]);
-}
-
-Json::die([
-    'result' => false,
-    'reason' => '알 수 없는 에러',
-    'msgID' => null
-]);
@@ -1,6 +1,8 @@
 <?php
 namespace sammo;

+use sammo\Enums\MessageType;
+
 include "lib.php";
 include "func.php";

@@ -226,8 +228,8 @@ function do추방(General $general, int $myOfficerLevel):?string{
    }
    else{
        $betrayCnt = $general->getVar('betray');
-        $general->addExperience(-$general->getVar('experience')*0.1*$betrayCnt);
-        $general->addDedication(-$general->getVar('dedication')*0.1*$betrayCnt);
+        $general->addExperience(-$general->getVar('experience')*0.15*$betrayCnt);
+        $general->addDedication(-$general->getVar('dedication')*0.15*$betrayCnt);
        $general->increaseVarWithLimit('betray', 1, null, GameConst::$maxBetrayCnt);
    }

@@ -268,7 +270,7 @@ function do추방(General $general, int $myOfficerLevel):?string{
                GetImageURL($general->getVar('imgsvr'), $general->getVar('picture'))
            );
            $msg = new Message(
-                Message::MSGTYPE_PUBLIC,
+                MessageType::public,
                $src,
                $src,
                $str,
@@ -56,7 +56,7 @@ if(file_exists(__DIR__.'/.htaccess')){
            'scenarioName'=>$options['scenarioName'],
            'turnterm'=>$options['turnterm'],
            'fictionMode'=>($options['fiction']?'가상':'사실'),
-            'block_general_create'=>(!!$options['block_general_create']),
+            'block_general_create'=>Util::toInt($options['block_general_create']),
            'npcMode'=>([0=>'불가',1=>'가능',2=>'선택 생성'][$options['npcmode']]),
            'openDatetime'=>$reserved['date'],
            'starttime'=>$options['starttime'],
@@ -90,7 +90,7 @@ $admin['scenario'] = $admin['scenario_text'];
 $admin['userCnt'] = $genCnt;
 $admin['npcCnt'] = $npcCnt;
 $admin['nationCnt'] = $nationCnt;
-$admin['block_general_create'] = !!$admin['block_general_create'];
+$admin['block_general_create'] = $admin['block_general_create'];
 $admin['npcMode'] = [0=>'불가',1=>'가능',2=>'선택 생성'][$admin['npcMode']];
 $admin['fictionMode'] = $admin['fiction']?'가상':'사실';

@@ -44,7 +44,7 @@ if($defence_train !== $me->getVar('defence_train')){
        $me->increaseVar('myset', -1);
        $me->setVar('defence_train', $defence_train);
        $me->increaseVarWithLimit('train', -3, 20);
-        $me->increaseVarWithLimit('atmos', -3, 20);
+        $me->increaseVarWithLimit('atmos', -6, 20);
    }
    else{
        $me->increaseVar('myset', -1);
@@ -82,7 +82,7 @@ function applyNationPolicy($policy, $nationID, $generalName): ?string
                    return "{$troopID}는 국가의 부대가 아닙니다.";
                }
                if ($troopCache[$troopID] != 'Neutral') {
-                    return "부대({$troopID}는 하나의 역할만 지정할 수 있습니다.";
+                    return "부대({$troopID})는 하나의 역할만 지정할 수 있습니다.";
                }
                if (!is_array($troopTarget) || count($troopTarget) != 2) {
                    return "{$troopID}의 입력양식이 올바르지 않습니다.";
@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;

 use Ds\Map;
@@ -15,48 +16,48 @@ $userID = Session::getUserID();
 increaseRefresh("시뮬레이터", 0);

 $query = Util::getPost('query');
-if($query === null){
+if ($query === null) {
    Json::die([
-        'result'=>false,
-        'reason'=>'입력값이 없습니다.'
+        'result' => false,
+        'reason' => '입력값이 없습니다.'
    ]);
 }

 $action = Util::getPost('action');
-if($action === null || !in_array($action, ['reorder', 'battle'])){
+if ($action === null || !in_array($action, ['reorder', 'battle'])) {
    Json::die([
-        'result'=>false,
-        'reason'=>'원하는 동작이 지정되지 않았습니다.'
+        'result' => false,
+        'reason' => '원하는 동작이 지정되지 않았습니다.'
    ]);
 }

 $query = Json::decode($query);
-if($query === null){
+if ($query === null) {
    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 JSON입니다.'
+        'result' => false,
+        'reason' => '올바르지 않은 JSON입니다.'
    ]);
 }

 $defaultCheck = [
-    'required'=>[
+    'required' => [
        'attackerGeneral', 'attackerCity', 'attackerNation',
        'defenderGenerals', 'defenderCity', 'defenderNation',
        'year', 'month', 'repeatCnt'
    ],
-    'integer'=>[
-        'year','month','repeatCnt'
+    'integer' => [
+        'year', 'month', 'repeatCnt'
    ],
-    'between'=>[
+    'between' => [
        ['month', [1, 12]]
    ],
-    'in'=>[
+    'in' => [
        ['repeatCnt', [1, 1000]]
    ],
-    'min'=>[
+    'min' => [
        ['year', 0]
    ],
-    'array'=>[
+    'array' => [
        'attackerGeneral', 'attackerCity', 'attackerNation',
        'defenderGenerals', 'defenderCity', 'defenderNation'
    ],
@@ -64,10 +65,10 @@ $defaultCheck = [

 $v = new Validator($query);
 $v->rules($defaultCheck);
-if(!$v->validate()){
+if (!$v->validate()) {
    Json::die([
-        'result'=>false,
-        'reason'=>$v->errorStr()
+        'result' => false,
+        'reason' => $v->errorStr()
    ]);
 }

@@ -84,21 +85,112 @@ $rawDefenderList = $query['defenderGenerals'];
 $rawDefenderCity = $query['defenderCity'];
 $rawDefenderNation = $query['defenderNation'];

+$warSeed = $query['seed'] ?? '';
+
+$cityCheck = [
+    'required' => [
+        'city', 'nation', 'supply', 'name',
+        'pop', 'agri', 'comm', 'secu', 'def', 'wall',
+        'trust', 'level',
+        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
+        'dead', 'state', 'conflict',
+    ],
+    'numeric' => [
+        'pop', 'agri', 'comm', 'secu', 'def', 'wall', 'trust', 'dead'
+    ],
+    'integer' => [
+        'city', 'nation', 'supply',
+        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
+        'state',
+    ],
+    'min' => [
+        ['def', 0],
+        ['wall', 0],
+        ['trust', 0],
+        ['pop', 0],
+        ['comm', 0],
+        ['secu', 0],
+        ['city', 1],
+        ['nation', 0]
+    ],
+    'in' => [
+        ['level', array_keys(getCityLevelList())]
+    ]
+];
+
+$v = new Validator($rawAttackerCity);
+$v->rules($cityCheck);
+if (!$v->validate()) {
+    Json::die([
+        'result' => false,
+        'reason' => '[출병도시]' . $v->errorStr()
+    ]);
+}
+
+$v = new Validator($rawDefenderCity);
+$v->rules($cityCheck);
+if (!$v->validate()) {
+    Json::die([
+        'result' => false,
+        'reason' => '[수비도시]' . $v->errorStr()
+    ]);
+}
+
+$nationCheck = [
+    'required' => [
+        'type', 'tech', 'level', 'capital',
+        'nation', 'name', 'gold', 'rice', 'gennum'
+    ],
+    'integer' => [
+        'level', 'capital', 'nation', 'gennum',
+    ],
+    'numeric' => [
+        'tech', 'gold', 'rice'
+    ],
+    'min' => [
+        ['tech', 0],
+        ['gold', 0],
+        ['rice', 0],
+        ['gennum', 1],
+    ],
+    'in' => [
+        ['type', GameConst::$availableNationType],
+        ['level', array_keys(getNationLevelList())]
+    ]
+];
+
+$v = new Validator($rawAttackerNation);
+$v->rules($nationCheck);
+if (!$v->validate()) {
+    Json::die([
+        'result' => false,
+        'reason' => '[출병국]' . $v->errorStr()
+    ]);
+}
+
+$v = new Validator($rawDefenderNation);
+$v->rules($nationCheck);
+if (!$v->validate()) {
+    Json::die([
+        'result' => false,
+        'reason' => '[수비국]' . $v->errorStr()
+    ]);
+}

 $generalCheck = [
-    'required'=>[
+    'required' => [
        'no', 'name', 'nation', 'turntime', 'personal', 'special2', 'crew', 'crewtype', 'atmos', 'train',
        'intel', 'intel_exp', 'book', 'strength', 'strength_exp', 'weapon', 'injury', 'leadership', 'leadership_exp', 'horse', 'item',
        'explevel', 'experience', 'dedication', 'officer_level', 'officer_city', 'gold', 'rice', 'dex1', 'dex2', 'dex3', 'dex4', 'dex5',
        'recent_war', 'warnum', 'killnum', 'killcrew',
    ],
-    'integer'=>[
+    'integer' => [
        'no', 'nation', 'crew', 'crewtype', 'atmos', 'train',
        'intel', 'intel_exp', 'strength', 'strength_exp',  'injury', 'leadership', 'leadership_exp',
        'explevel', 'experience', 'dedication', 'officer_level', 'officer_city', 'gold', 'rice', 'dex1', 'dex2', 'dex3', 'dex4', 'dex5',
        'warnum', 'killnum', 'killcrew',
    ],
-    'min'=>[
+    'min' => [
        ['no', 1],
        ['nation', 1],
        ['crew', 0],
@@ -117,14 +209,14 @@ $generalCheck = [
        ['killnum', 0],
        ['killcrew', 0],
    ],
-    'between'=>[
+    'between' => [
        ['train', [40, GameConst::$maxTrainByWar]],
        ['atmos', [40, GameConst::$maxAtmosByWar]],
        ['explevel', [0, 300]],
        ['injury', [0, 80]],
        ['officer_level', [1, 12]]
    ],
-    'in'=>[
+    'in' => [
        ['personal', array_merge(GameConst::$availablePersonality, GameConst::$optionalPersonality)],
        ['special2', array_merge(GameConst::$availableSpecialWar, GameConst::$optionalSpecialWar)],
        ['crewtype', array_keys(GameUnitConst::all())],
@@ -132,162 +224,138 @@ $generalCheck = [
        ['weapon', array_merge(array_keys(GameConst::$allItems['weapon']), ['None'])],
        ['book', array_merge(array_keys(GameConst::$allItems['book']), ['None'])],
        ['item', array_merge(array_keys(GameConst::$allItems['item']), ['None'])],
+    ],
+    'array' => ['inheritBuff'],
+];
+
+$inheritBuffCheck = [
+    'between' => [
+        [TriggerInheritBuff::WAR_AVOID_RATIO, [0, 5]],
+        [TriggerInheritBuff::WAR_CRITICAL_RATIO, [0, 5]],
+        [TriggerInheritBuff::WAR_MAGIC_TRIAL_PROB, [0, 5]],
+
+        [TriggerInheritBuff::OPPOSE_WAR_AVOID_RATIO, [0, 5]],
+        [TriggerInheritBuff::OPPOSE_WAR_CRITICAL_RATIO, [0, 5]],
+        [TriggerInheritBuff::OPPOSE_WAR_MAGIC_TRIAL_PROB, [0, 5]],
    ]
 ];

+if(!$warSeed){
+    $warSeed = bin2hex(random_bytes(16));
+}
+else {
+    $repeatCnt = 1;
+}
+$tmpRNG = new RandUtil(new LiteHashDRBG($warSeed));
+
 $v = new Validator($rawAttacker);
 $v->rules($generalCheck);
-if(!$v->validate()){
+if (!$v->validate()) {
    Json::die([
-        'result'=>false,
-        'reason'=>'[출병자]'.$v->errorStr()
+        'result' => false,
+        'reason' => '[출병자]' . $v->errorStr()
    ]);
 }
-$rawAttacker['owner'] = 0;
-
-$defenderList = [];
-foreach($rawDefenderList as $idx=>$rawDefenderGeneral){
-    $v = new Validator($rawDefenderGeneral);
-    $v->rules($generalCheck);
-    if(!$v->validate()){
-        $idx+=1;
+$rawAttacker['aux'] = [];
+if (key_exists('inheritBuff', $rawAttacker)) {
+    $v = new Validator($rawAttacker['inheritBuff']);
+    $v->rules($inheritBuffCheck);
+    if (!$v->validate()) {
        Json::die([
-            'result'=>false,
-            'reason'=>"[수비자{$idx}]".$v->errorStr()
+            'result' => false,
+            'reason' => '[출병자]' . $v->errorStr()
        ]);
    }
+    $rawAttacker['aux']['inheritBuff'] = $rawAttacker['inheritBuff'];
+}
+$rawAttacker['aux'] = Json::encode($rawAttacker['aux']);
+$rawAttacker['owner'] = 0;
+$attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month);
+$attacker = new WarUnitGeneral(
+    $tmpRNG,
+    $attackerGeneral,
+    $rawAttackerNation,
+    true
+);
+
+
+/** @var WarUnit[] */
+$defenderList = [];
+
+foreach ($rawDefenderList as $idx => $rawDefenderGeneral) {
+    $v = new Validator($rawDefenderGeneral);
+    $v->rules($generalCheck);
+    if (!$v->validate()) {
+        $idx += 1;
+        Json::die([
+            'result' => false,
+            'reason' => "[수비자{$idx}]" . $v->errorStr()
+        ]);
+    }
+    $rawDefenderGeneral['aux'] = [];
+    if (key_exists('inheritBuff', $rawDefenderGeneral)) {
+        $v = new Validator($rawDefenderGeneral['inheritBuff']);
+        $v->rules($inheritBuffCheck);
+        if (!$v->validate()) {
+            $idx += 1;
+            Json::die([
+                'result' => false,
+                'reason' => "[수비자{$idx}]" . $v->errorStr()
+            ]);
+        }
+        $rawDefenderGeneral['aux']['inheritBuff'] = $rawDefenderGeneral['inheritBuff'];
+    }
+    $rawDefenderGeneral['aux'] = Json::encode($rawDefenderGeneral['aux']);
    $rawDefenderGeneral['owner'] = 0;

-    $defenderList[] = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), $rawDefenderCity, $rawAttackerNation, $year, $month, true);
+    $defenderGeneral = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), $rawDefenderCity, $rawAttackerNation, $year, $month, true);
+
+    $defenderList[] = new WarUnitGeneral(
+        $tmpRNG,
+        $defenderGeneral,
+        $rawDefenderNation,
+        false
+    );
 }

+if ($action == 'reorder') {
+    $noRng = NoRNG::rngInstance();

-$cityCheck = [
-    'required'=>[
-        'city', 'nation', 'supply', 'name',
-        'pop', 'agri', 'comm', 'secu', 'def', 'wall',
-        'trust', 'level',
-        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
-        'dead', 'state', 'conflict',
-    ],
-    'numeric'=>[
-        'pop', 'agri', 'comm', 'secu', 'def', 'wall', 'trust', 'dead'
-    ],
-    'integer'=>[
-        'city', 'nation', 'supply',
-        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
-        'state',
-    ],
-    'min'=>[
-        ['def', 0],
-        ['wall', 0],
-        ['trust', 0],
-        ['pop', 0],
-        ['comm', 0],
-        ['secu', 0],
-        ['city', 1],
-        ['nation', 0]
-    ],
-    'in'=>[
-        ['level', array_keys(getCityLevelList())]
-    ]
-];
-
-$v = new Validator($rawAttackerCity);
-$v->rules($cityCheck);
-if(!$v->validate()){
-    Json::die([
-        'result'=>false,
-        'reason'=>'[출병도시]'.$v->errorStr()
-    ]);
-}
-
-$v = new Validator($rawDefenderCity);
-$v->rules($cityCheck);
-if(!$v->validate()){
-    Json::die([
-        'result'=>false,
-        'reason'=>'[수비도시]'.$v->errorStr()
-    ]);
-}
-
-$nationCheck = [
-    'required'=>[
-        'type', 'tech', 'level', 'capital',
-        'nation', 'name', 'gold', 'rice', 'gennum'
-    ],
-    'integer'=>[
-        'level', 'capital', 'nation', 'gennum',
-    ],
-    'numeric'=>[
-        'tech', 'gold', 'rice'
-    ],
-    'min'=>[
-        ['tech', 0],
-        ['gold', 0],
-        ['rice', 0],
-        ['gennum', 1],
-    ],
-    'in'=>[
-        ['type', GameConst::$availableNationType],
-        ['level', array_keys(getNationLevelList())]
-    ]
-];
-
-$v = new Validator($rawAttackerNation);
-$v->rules($nationCheck);
-if(!$v->validate()){
-    Json::die([
-        'result'=>false,
-        'reason'=>'[출병국]'.$v->errorStr()
-    ]);
-}
-
-$v = new Validator($rawDefenderNation);
-$v->rules($nationCheck);
-if(!$v->validate()){
-    Json::die([
-        'result'=>false,
-        'reason'=>'[수비국]'.$v->errorStr()
-    ]);
-}
-
-if($action == 'reorder'){
-    usort($defenderList, function(General $lhs, General $rhs){
-        return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
+    usort($defenderList, function (WarUnit $lhs, WarUnit $rhs) use ($attacker) {
+        return - (extractBattleOrder($lhs, $attacker) <=> extractBattleOrder($rhs, $attacker));
    });

    $order = [];
-    foreach($defenderList as $defenderGeneral){
-        $order[] = $defenderGeneral->getID();
+    foreach ($defenderList as $defender) {
+        $order[] = $defender->getGeneral()->getID();
    }

    Json::die([
-        'result'=>true,
-        'reason'=>'success',
-        'order'=>$order
+        'result' => true,
+        'reason' => 'success',
+        'order' => $order
    ]);
 }

-usort($defenderList, function(General $lhs, General $rhs){
-    return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
-});
-
-$rawDefenderList = array_map(function(General $general){
-    return $general->getRaw();
-}, $defenderList);
+$rawDefenderList = [];
+foreach($defenderList as $unit){
+    if(extractBattleOrder($unit, $attacker) <= 0){
+        continue;
+    }
+    $rawDefenderList[] = $unit->getRaw();
+}
 unset($defenderList);

 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $startYear = $gameStor->startyear;
-$cityRate = Util::round(($year - $startYear) / 1.5) + 60;

-function extractRankVar(array $rawVal):Map{
+function extractRankVar(array $rawVal): Map
+{
    $rankVars = new Map;
-    foreach($rawVal as $rawKey=>$rawVal){
+    foreach ($rawVal as $rawKey => $rawVal) {
        $key = RankColumn::tryFrom($rawKey);
-        if($key === null){
+        if ($key === null) {
            continue;
        }
        $rankVars[$key] = $rawVal;
@@ -296,86 +364,113 @@ function extractRankVar(array $rawVal):Map{
 }

 function simulateBattle(
-    $rawAttacker, $rawAttackerCity, $rawAttackerNation,
-    $rawDefenderList, $rawDefenderCity, $rawDefenderNation,
-    $startYear, $year, $month, $cityRate
-){
+    $rawAttacker,
+    $rawAttackerCity,
+    $rawAttackerNation,
+    $rawDefenderList,
+    $rawDefenderCity,
+    $rawDefenderNation,
+    $startYear,
+    $year,
+    $month,
+    $warSeed
+) {
+
+    if (!$warSeed) {
+        $warSeed = bin2hex(random_bytes(16));
+    }

-    $warSeed = bin2hex(random_bytes(16));
    $warRng = new RandUtil(new LiteHashDRBG($warSeed));

+    $attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month);
    $attacker = new WarUnitGeneral(
        $warRng,
-        new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month),
+        $attackerGeneral,
        $rawAttackerNation,
        true
    );
-    $city = new WarUnitCity($warRng, $rawDefenderCity, $rawDefenderNation, $year, $month, $cityRate);
+    $city = new WarUnitCity($warRng, $rawDefenderCity, $rawDefenderNation, $year, $month, $startYear);

-    $iterDefender = new \ArrayIterator($rawDefenderList);
+    /** @var WarUnit[] */
+    $defenderList = [];
+
+    foreach ($rawDefenderList as $rawDefenderGeneral) {
+        $defenderGeneral = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), $rawDefenderCity, $rawAttackerNation, $year, $month, true);
+
+        $defenderList[] = new WarUnitGeneral(
+            $warRng,
+            $defenderGeneral,
+            $rawDefenderNation,
+            false
+        );
+    }
+
+    if(count($defenderList) && extractBattleOrder($city, $attacker) > 0){
+        $defenderList[] = $city;
+    }
+
+    usort($defenderList, function (WarUnit $lhs, WarUnit $rhs) use ($attacker) {
+        return - (extractBattleOrder($lhs, $attacker) <=> extractBattleOrder($rhs, $attacker));
+    });
+
+    $iterDefender = new \ArrayIterator($defenderList);
    $iterDefender->rewind();

    $battleResult = [];

-    $attackerRice = $rawAttacker['rice'];
+    $attackerRice = $attacker->getGeneral()->getVar('rice');
    $defenderRice = 0;

-    $getNextDefender = function(?WarUnit $prevDefender, bool $reqNext)
-        use ($warRng, $iterDefender, $rawDefenderCity, $rawDefenderNation, $year, $month, &$battleResult, &$defenderRice) {
-        if($prevDefender !== null){
+    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext)
+    use ($iterDefender, &$battleResult, &$defenderRice, $attacker): ?WarUnit {
+        if ($prevDefender !== null) {
            $prevDefender->getLogger()->rollback();
            $battleResult[] = $prevDefender;
-            if($prevDefender instanceof WarUnitGeneral){
+            if ($prevDefender instanceof WarUnitGeneral) {
                $defenderRice -= $prevDefender->getVar('rice');
            }
        }

-        if(!$reqNext){
+        if (!$reqNext) {
            return null;
        }

-        if(!$iterDefender->valid()){
+        if (!$iterDefender->valid()) {
            return null;
        }

-        $defenderObj = new General($iterDefender->current(), extractRankVar($iterDefender->current()), $rawDefenderCity, $rawDefenderNation, $year, $month);
-        if(extractBattleOrder($defenderObj) <= 0){
+        /** @var WarUnit */
+        $defender = $iterDefender->current();
+
+        if (extractBattleOrder($defender, $attacker) <= 0) {
            return null;
        }

-        $defenderRice += $defenderObj->getVar('rice');
+        if($defender instanceof WarUnitGeneral){
+            $defenderRice += $defender->getVar('rice');
+        }

-        $retVal = new WarUnitGeneral(
-            $warRng,
-            $defenderObj,
-            $rawDefenderNation,
-            false
-        );
        $iterDefender->next();
-        return $retVal;
+        return $defender;
    };

-    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city, $year - $startYear);
-
-    $rawDefenderCity = $city->getRaw();
-    $updateAttackerNation = [];
-    $updateDefenderNation = [];
+    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city);

    $attackerRice -= $attacker->getVar('rice');

-    if($city->getPhase() > 0){
+    if ($city->getPhase() > 0) {
        $rice = $city->getKilled() / 100 * 0.8;
        $rice *= $city->getCrewType()->rice;
-        $rice *= getTechCost($rawDefenderNation['tech']);
-        $rice *= $cityRate / 100 - 0.2;
+        $rice *= getTechCost($city->getRawNation()['tech']);
+        $rice *= $city->getCityTrainAtmos() / 100 - 0.2;
        Util::setRound($rice);

        $defenderRice += $rice;
    }

    $totalDead = $attacker->getKilled() + $attacker->getDead();
-    $attackerCityDead = $totalDead * 0.4;
-    $defenderCityDead = $totalDead * 0.6;
+    //$attackerCityDead = $totalDead * 0.4;
+    //$defenderCityDead = $totalDead * 0.6;

    return [$attacker, $city, $battleResult, $conquerCity, $attackerRice, $defenderRice];
 }
@@ -401,14 +496,26 @@ $avgWar = 0;
 $attackerActivatedSkills = [];
 $defendersActivatedSkills = [];

-foreach(Util::range($repeatCnt) as $repeatIdx){
+
+foreach (Util::range($repeatCnt) as $repeatIdx) {
+    if($repeatIdx > 0){
+        $warSeed = bin2hex(random_bytes(16));
+    }
+
    /** @var WarUnit $attacker */
    [$attacker, $city, $battleResult, $conquerCity, $attackerRice, $defenderRice] = simulateBattle(
-        $rawAttacker, $rawAttackerCity, $rawAttackerNation,
-        $rawDefenderList, $rawDefenderCity, $rawDefenderNation,
-        $startYear, $year, $month, $cityRate
+        $rawAttacker,
+        $rawAttackerCity,
+        $rawAttackerNation,
+        $rawDefenderList,
+        $rawDefenderCity,
+        $rawDefenderNation,
+        $startYear,
+        $year,
+        $month,
+        $warSeed
    );
-    $lastWarLog = Util::mapWithKey(function($key, $values){
+    $lastWarLog = Util::mapWithKey(function ($key, $values) {
        return ConvertLog(join('<br>', $values));
    }, $attacker->getLogger()->rollback());

@@ -431,48 +538,45 @@ foreach(Util::range($repeatCnt) as $repeatIdx){

    $avgWar += count($battleResult) / $repeatCnt;

-    foreach($attacker->getActivatedSkillLog() as $skillName => $skillCnt){
-        if(!key_exists($skillName, $attackerActivatedSkills)){
+    foreach ($attacker->getActivatedSkillLog() as $skillName => $skillCnt) {
+        if (!key_exists($skillName, $attackerActivatedSkills)) {
            $attackerActivatedSkills[$skillName] = $skillCnt / $repeatCnt;
-        }
-        else{
+        } else {
            $attackerActivatedSkills[$skillName] += $skillCnt / $repeatCnt;
        }
    }

-    foreach($battleResult as $idx=>$defender){
-        while($idx >= count($defendersActivatedSkills)){
+    foreach ($battleResult as $idx => $defender) {
+        while ($idx >= count($defendersActivatedSkills)) {
            $defendersActivatedSkills[] = [];
        }

        $activatedSkills = &$defendersActivatedSkills[$idx];
-        foreach($defender->getActivatedSkillLog() as $skillName => $skillCnt){
-            if(!key_exists($skillName, $activatedSkills)){
+        foreach ($defender->getActivatedSkillLog() as $skillName => $skillCnt) {
+            if (!key_exists($skillName, $activatedSkills)) {
                $activatedSkills[$skillName] = $skillCnt / $repeatCnt;
-            }
-            else{
+            } else {
                $activatedSkills[$skillName] += $skillCnt / $repeatCnt;
            }
        }
-
    }
 }

 Json::die([
-    'result'=>true,
-    'datetime'=>$rawAttacker['turntime'],
-    'reason'=>'success',
-    'lastWarLog'=>$lastWarLog,
-    'avgWar'=>$avgWar,
-    'phase'=>$avgPhase,
-    'killed'=>$attackerKilled,
-    'maxKilled'=>$attackerMaxKilled,
-    'minKilled'=>$attackerMinKilled,
-    'dead'=>$attackerDead,
-    'maxDead'=>$attackerMaxDead,
-    'minDead'=>$attackerMinDead,
-    'attackerRice'=>$attackerAvgRice,
-    'defenderRice'=>$defenderAvgRice,
-    'attackerSkills'=>$attackerActivatedSkills,
-    'defendersSkills'=>$defendersActivatedSkills,
+    'result' => true,
+    'datetime' => $rawAttacker['turntime'],
+    'reason' => 'success',
+    'lastWarLog' => $lastWarLog,
+    'avgWar' => $avgWar,
+    'phase' => $avgPhase,
+    'killed' => $attackerKilled,
+    'maxKilled' => $attackerMaxKilled,
+    'minKilled' => $attackerMinKilled,
+    'dead' => $attackerDead,
+    'maxDead' => $attackerMaxDead,
+    'minDead' => $attackerMinDead,
+    'attackerRice' => $attackerAvgRice,
+    'defenderRice' => $defenderAvgRice,
+    'attackerSkills' => $attackerActivatedSkills,
+    'defendersSkills' => $defendersActivatedSkills,
 ]);
@@ -1,172 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-WebUtil::requireAJAX();
-// $btn, $name, $troop
-$action = Util::getPost('action');
-$name = Util::getPost('name');
-$gen = Util::getPost('gen', 'int');
-$troop = Util::getPost('troop', 'int');
-
-//로그인 검사
-$session = Session::requireGameLogin([])->setReadOnly();
-$userID = $session::getUserID();
-
-increaseRefresh("부대명령", 0);
-
-$db = DB::db();
-
-$me = $db->queryFirstRow('SELECT `no`, name, nation, troop FROM general WHERE `owner`=%i', $userID);
-$generalID = $me['no'];
-$nationID = $me['nation'];
-
-if($action == '부대창설'){
-    $name = StringUtil::neutralize($name);
-    if(!$name){
-        Json::die([
-            'result'=>false,
-            'reason'=>'부대 이름이 없습니다.'
-        ]);
-    }
-    if($me['troop'] != 0){
-        Json::die([
-            'result'=>false,
-            'reason'=>'이미 부대에 가입해있습니다.'
-        ]);
-    }
-    $db->insert('troop',[
-        'troop_leader'=>$generalID,
-        'name'=>$name,
-        'nation'=>$nationID,
-    ]);
-
-    $db->update('general', [
-        'troop'=>$generalID,
-    ], 'no=%i',$generalID);
-
-    Json::die([
-        'result'=>true,
-        'reason'=>'success'
-    ]);
-}
-
-if($action == '부대변경'){
-    $name = StringUtil::neutralize($name);
-    if(!$name){
-        Json::die([
-            'result'=>false,
-            'reason'=>'부대 이름이 없습니다.'
-        ]);
-    }
-
-    $db->update('troop', [
-        'name'=>$name
-    ], 'troop_leader=%i',$generalID);
-
-    if($db->affectedRows() == 0){
-        Json::die([
-            'result'=>false,
-            'reason'=>'부대장이 아닙니다.'
-        ]);
-    }
-
-    Json::die([
-        'result'=>true,
-        'reason'=>'success'
-    ]);
-}
-
-if($action == '부대추방'){
-    if (!$gen){
-        Json::die([
-            'result'=>false,
-            'reason'=>'장수를 지정해야 합니다.'
-        ]);
-    }
-
-    $db->update('general', [
-        'troop'=>0
-    ], 'no=%i AND troop = %i', $gen, $generalID);
-
-    if($db->affectedRows() == 0){
-        Json::die([
-            'result'=>false,
-            'reason'=>'부대장이 아니거나, 장수를 잘못 지정했습니다.'
-        ]);
-    }
-
-    Json::die([
-        'result'=>true,
-        'reason'=>'success'
-    ]);
-}
-
-if ($action == '부대가입') {
-    if(!$troop){
-        Json::die([
-            'result'=>false,
-            'reason'=>'부대를 지정해야 합니다.'
-        ]);
-    }
-
-    if($me['troop'] === $generalID){
-        Json::die([
-            'result'=>false,
-            'reason'=>'부대장입니다.'
-        ]);
-    }
-
-    $troopExists = $db->queryFirstField('SELECT `troop_leader` FROM `troop` WHERE `troop_leader` = %i AND `nation` = %i', $troop, $nationID);
-
-    if (!$troopExists) {
-        Json::die([
-            'result'=>false,
-            'reason'=>'올바른 부대장이 아닙니다.'
-        ]);
-    }
-
-    $db->update('general', [
-        'troop'=>$troop
-    ], 'no=%i', $generalID);
-
-    Json::die([
-        'result'=>true,
-        'reason'=>'success'
-    ]);
-}
-
-if($action ==  "부대탈퇴") {
-
-    if($me['troop'] == 0){
-        Json::die([
-            'result'=>false,
-            'reason'=>'부대에 속해있지 않습니다.'
-        ]);
-    }
-
-    //부대장일 경우
-    if($me['troop'] === $generalID){
-        $db->update('general', [
-            'troop'=>0
-        ], 'troop=%i',$generalID);
-        $db->delete('troop', 'troop_leader=%i', $generalID);
-    }
-    else{
-        $db->update('general', [
-            'troop'=>0
-        ], 'no=%i', $generalID);
-    }
-
-    Json::die([
-        'result'=>true,
-        'reason'=>'success'
-    ]);
-}
-
-Json::die([
-    'result'=>false,
-    'reason'=>'올바르지 않은 명령입니다.'
-]);
@@ -0,0 +1,22 @@
+
+
+function getCityPosition(){
+    return {"1":["서량",127,101],"2":["무도",127,222],"3":["성도",127,344],"4":["건녕",127,384],"5":["안정",167,141],"6":["한중",167,222],"7":["검각",167,263],"8":["자동",167,303],"9":["강주",167,344],"10":["장안",208,182],"11":["영안",208,384],"12":["홍농",248,182],"13":["완",248,222],"14":["양양",248,303],"15":["강릉",248,344],"16":["무릉",248,384],"17":["영릉",248,425],"18":["낙양",289,182],"19":["신야",289,263],"20":["강하",289,344],"21":["장사",289,384],"22":["계양",289,425],"23":["남해",289,465],"24":["업",329,101],"25":["진유",329,141],"26":["허창",329,182],"27":["여남",329,222],"28":["시상",329,344],"29":["평원",370,60],"30":["복양",370,101],"31":["초",370,141],"32":["수춘",370,222],"33":["단양",370,263],"34":["여강",370,303],"35":["계",410,20],"36":["남피",410,60],"37":["소패",410,141],"38":["건업",410,222],"39":["북평",451,20],"40":["북해",451,101],"41":["하비",451,141],"42":["광릉",451,182],"43":["오",451,263],"44":["회계",451,303],"45":["양평",491,20],"46":["국내",532,20],"47":["한",532,60],"48":["사비",532,101],"49":["매소",572,60],"50":["서라벌",572,101],"51":["운남",127,425],"52":["천수",127,182],"53":["졸본",572,20]};
+}
+
+function formatCityInfo(city) {
+
+
+    var regionMap = {"하북":1,"1":"하북","중원":2,"2":"중원","서북":3,"3":"서북","서촉":4,"4":"서촉","남중":5,"5":"남중","초":6,"6":"초","오월":7,"7":"오월","동이":8,"8":"동이"};
+
+    var levelMap = {"수":1,"1":"수","진":2,"2":"진","관":3,"3":"관","이":4,"4":"이","소":5,"5":"소","중":6,"6":"중","대":7,"7":"대","특":8,"8":"특"};
+
+    var region_str = regionMap[city.region];
+    var level_str = levelMap[city.level];
+
+    city.text = '【' + region_str + '|' + level_str + '】' + city.name;
+    city.region_str = region_str;
+    city.level_str = level_str;
+
+    return city;
+}
@@ -9,6 +9,9 @@ $loader->addClassMap((function () {
    $d_settingMap = [];
    foreach (glob(__DIR__.'/d_setting/*.orig.php') as $filepath) {
        $filepath = str_replace('.orig.php', '.php', $filepath);
+        if(!file_exists($filepath)) {
+            continue;
+        }
        $filename = basename($filepath);
        $classname = explode('.', $filename)[0];
        $d_settingMap['sammo\\'.$classname] = $filepath;
@@ -63,8 +66,8 @@ function prepareDir(string $dirPath, bool $forceCreate=true):bool{
        if(!unlink($dirPath)){
            return false;
        }
-        return mkdir($dirPath);
+        return mkdir($dirPath, 0775);
    }

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

 namespace sammo;

+use sammo\Enums\EventTarget;

 function processWar(string $warSeed, General $attackerGeneral, array $rawAttackerNation, array $rawDefenderCity)
 {
@@ -29,23 +30,39 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
    }

    $gameStor = KVStorage::getStorage($db, 'game_env');
-    [$startYear, $year, $month, $cityRate, $joinMode] = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'city_rate', 'join_mode']);
+    [$startYear, $year, $month, $joinMode] = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'join_mode']);

    $attacker = new WarUnitGeneral($rng, $attackerGeneral,$rawAttackerNation, true);

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

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

-    usort($defenderList, function (General $lhs, General $rhs) {
-        return - (extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
+    /** @var WarUnit[] */
+    $defenderList = [];
+    foreach($defenderGeneralList as $defenderGeneral){
+        $defenderGeneral->setRawCity($rawDefenderCity);
+        $defenderCandidate = new WarUnitGeneral($rng, $defenderGeneral, $rawDefenderNation, false);
+        if(extractBattleOrder($defenderCandidate, $attacker) <= 0){
+            continue;
+        }
+
+        $defenderList[] = $defenderCandidate;
+    }
+
+    if(count($defenderList) && extractBattleOrder($city, $attacker) > 0){
+        $defenderList[] = $city;
+    }
+
+    usort($defenderList, function (WarUnit $lhs, WarUnit $rhs) use ($attacker) {
+        return - (extractBattleOrder($lhs, $attacker) <=> extractBattleOrder($rhs, $attacker));
    });

    $iterDefender = new \ArrayIterator($defenderList);
    $iterDefender->rewind();

-    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext) use ($rng, $iterDefender, $rawDefenderNation, $rawDefenderCity, $db) {
+    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext) use ($iterDefender, $db, $attacker) {
        if ($prevDefender !== null) {
            $prevDefender->applyDB($db);
        }
@@ -58,24 +75,16 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
            return null;
        }

+        /** @var WarUnit */
        $nextDefender = $iterDefender->current();
-        $nextDefender->setRawCity($rawDefenderCity);
-        if (extractBattleOrder($nextDefender) <= 0) {
+        if (extractBattleOrder($nextDefender, $attacker) <= 0) {
            return null;
        }
-
-
-        $retVal = new WarUnitGeneral(
-            $rng,
-            $nextDefender,
-            $rawDefenderNation,
-            false
-        );
        $iterDefender->next();
-        return $retVal;
+        return $nextDefender;
    };

-    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city, $year - $startYear);
+    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city);

    $attacker->applyDB($db);

@@ -90,7 +99,7 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
            $rice = $city->getKilled() / 100 * 0.8;
            $rice *= $city->getCrewType()->rice;
            $rice *= getTechCost($rawDefenderNation['tech']);
-            $rice *= $cityRate / 100 - 0.2;
+            $rice *= $city->getCityTrainAtmos() / 100 - 0.2;
            Util::setRound($rice);

            $updateDefenderNation['rice'] = max(0, $rawDefenderNation['rice'] - $rice);
@@ -113,8 +122,8 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
        'dead' => $db->sqleval('dead + %i', $totalDead * 0.6)
    ], 'city=%i', $rawDefenderCity['city']);

-    $attackerIncTech = buildNationTypeClass($rawAttackerNation['type'])->onCalcDomestic('기술', 'score', $attacker->getDead() * 0.01);
-    $defenderIncTech = buildNationTypeClass($rawDefenderNation['type'])->onCalcDomestic('기술', 'score', $attacker->getKilled() * 0.01);
+    $attackerIncTech = buildNationTypeClass($rawAttackerNation['type'])->onCalcDomestic('기술', 'score', $attacker->getDead() * 0.012);
+    $defenderIncTech = buildNationTypeClass($rawDefenderNation['type'])->onCalcDomestic('기술', 'score', $attacker->getKilled() * 0.009);

    $attackerGenCnt = $rawAttackerNation['gennum'];
    $defenderGenCnt = $rawDefenderNation['gennum'];
@@ -175,13 +184,21 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
        'startyear' => $startYear,
        'year' => $year,
        'month' => $month,
-        'city_rate' => $cityRate,
        'join_mode' => $joinMode,
    ], $attacker->getGeneral(), $city->getRaw());
 }

-function extractBattleOrder(General $general)
+function extractBattleOrder(WarUnit $defender, WarUnit $attacker)
 {
+    if($defender instanceof WarUnitCity){
+        if(!($attacker instanceof WarUnitGeneral)){
+            return 0;
+        }
+        $attackerGeneral = $attacker->getGeneral();
+        return $attackerGeneral->onCalcOpposeStat($defender->getGeneral(), 'cityBattleOrder', -1);
+    }
+
+    $general = $defender->getGeneral();
    if ($general->getVar('crew') == 0) {
        return 0;
    }
@@ -212,7 +229,6 @@ function processWar_NG(
    WarUnitGeneral $attacker,
    callable $getNextDefender,
    WarUnitCity $city,
-    int $relYear
 ): bool {
    $templates = new \League\Plates\Engine(__DIR__ . '/templates');

@@ -225,6 +241,7 @@ function processWar_NG(
    $attackerNationUpdate = [];
    $defenderNationUpdate = [];

+    /** @var WarUnit */
    $defender = ($getNextDefender)(null, true);
    $conquerCity = false;

@@ -240,6 +257,7 @@ function processWar_NG(
        $logWritten = false;
        if ($defender === null) {
            $defender = $city;
+            $defender->setSiege();

            if ($city->getNationVar('rice') <= 0 && $city->getVar('supply')) {
                //병량 패퇴
@@ -406,21 +424,28 @@ function processWar_NG(
            $attacker->logBattleResult();
            $defender->logBattleResult();

-            $attacker->addWin();
-            $defender->addLose();
+            if (!($defender instanceof WarUnitCity) || $defender->isSiege()){
+                $attacker->addWin();
+                $defender->addLose();

-            $attacker->tryWound();
-            $defender->tryWound();
+                $attacker->tryWound();
+                $defender->tryWound();

-            if ($defender === $city) {
-                $attacker->addLevelExp(1000);
-                $conquerCity = true;
-                break;
+                if ($defender === $city) {
+                    $attacker->addLevelExp(1000);
+                    $conquerCity = true;
+                    break;
+                }
            }

+
            $josaYi = JosaUtil::pick($defender->getCrewTypeName(), '이');

-            if ($noRice) {
+            if ($defender instanceof WarUnitCity && !$defender->isSiege()){
+                //실제 공성을 위해 다시 초기화
+                $defender->setOppose(null);
+            }
+            else if ($noRice) {
                $logger->pushGlobalActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.");
                $attacker->getLogger()->pushGeneralActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.", ActionLogger::PLAIN);
                $defender->getLogger()->pushGeneralActionLog("군량 부족으로 패퇴합니다.", ActionLogger::PLAIN);
@@ -455,12 +480,18 @@ function processWar_NG(
    $attacker->finishBattle();
    $defender->finishBattle();

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

@@ -550,23 +581,10 @@ function ConquerCity(array $admin, General $general, array $city)
    $gameStor = KVStorage::getStorage($db, 'game_env');

    // 이벤트 핸들러 동작
-    $e_env = null;
-    foreach (DB::db()->query('SELECT * FROM event WHERE target = "OCCUPY_CITY" ORDER BY `priority` DESC, `id` ASC') as $rawEvent) {
-        if ($e_env === null) {
-            $e_env = $gameStor->getAll(false);
-        }
-        $eventID = $rawEvent['id'];
-        $cond = Json::decode($rawEvent['condition']);
-        $action = Json::decode($rawEvent['action']);
-        $event = new Event\EventHandler($cond, $action);
-        $e_env['currentEventID'] = $eventID;
-
-        $event->tryRunEvent($e_env);
+    if(TurnExecutionHelper::runEventHandler($db, $gameStor, EventTarget::OccupyCity)){
+        $gameStor->cacheAll();
    }

-    if ($e_env !== null) {
-        $gameStor->resetCache();
-    }

    // 국가 멸망시
    if ($defenderNationID && $db->queryFirstField('SELECT count(city) FROM city WHERE nation = %i', $defenderNationID) === 1) {
@@ -662,27 +680,11 @@ function ConquerCity(array $admin, General $general, array $city)
        }

        // 이벤트 핸들러 동작
-        $e_env = null;
-        foreach (DB::db()->query('SELECT * FROM event WHERE target = "DESTROY_NATION" ORDER BY `priority` DESC, `id` ASC') as $rawEvent) {
-            if ($e_env === null) {
-                $e_env = $gameStor->getAll(false);
-            }
-            $eventID = $rawEvent['id'];
-            $cond = Json::decode($rawEvent['condition']);
-            $action = Json::decode($rawEvent['action']);
-            $event = new Event\EventHandler($cond, $action);
-            $e_env['currentEventID'] = $eventID;
-
-            $event->tryRunEvent($e_env);
-        }
-
-        if ($e_env !== null) {
-            $gameStor->resetCache();
-        }
+        TurnExecutionHelper::runEventHandler($db, $gameStor, EventTarget::DestroyNation);

        // 멸망이 아니면
    } else {
-        // 태수,군사,종사은 일반으로...
+        // 태수,군사,종사는 일반으로...
        $db->update('general', [
            'officer_level' => 1,
            'officer_city' => 0,
@@ -693,11 +695,12 @@ function ConquerCity(array $admin, General $general, array $city)
            $minCity = findNextCapital($cityID, $defenderNationID);

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

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

-            $moveLog = "수도가 함락되어 <G><b>$minCityName</b></>으로 <M>긴급천도</>합니다.";
+            $moveLog = "수도가 함락되어 <G><b>$minCityName</b></>{$josaRo} <M>긴급천도</>합니다.";
            //아국 수뇌부에게 로그 전달
            foreach ($db->queryFirstColumn(
                'SELECT no FROM general WHERE nation=%i AND officer_level>=5',
@@ -11,6 +11,7 @@ include "func.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>
@@ -27,6 +28,7 @@ include "func.php";
    <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::printDist('ts', ['common', 'recent_map'], true) ?>
+    <?= WebUtil::printDist('vue', [], true) ?>
    <style>
        html {
            width: 700px;
@@ -6,6 +6,7 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\AuctionBuyRice;
 use sammo\AuctionUniqueItem;
+use sammo\Enums\APIRecoveryType;
 use sammo\Validator;
 use sammo\General;

@@ -32,7 +33,7 @@ class BidBuyRiceAuction extends \sammo\BaseAPI
    return static::REQ_GAME_LOGIN;
  }

-  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    $auctionID = $this->args['auctionID'];
    $amount = $this->args['amount'];
@@ -5,6 +5,7 @@ namespace sammo\API\Auction;
 use sammo\Session;
 use DateTimeInterface;
 use sammo\AuctionSellRice;
+use sammo\Enums\APIRecoveryType;
 use sammo\Validator;
 use sammo\General;

@@ -31,7 +32,7 @@ class BidSellRiceAuction extends \sammo\BaseAPI
    return static::REQ_GAME_LOGIN;
  }

-  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    $auctionID = $this->args['auctionID'];
    $amount = $this->args['amount'];
@@ -5,6 +5,7 @@ namespace sammo\API\Auction;
 use sammo\Session;
 use DateTimeInterface;
 use sammo\AuctionUniqueItem;
+use sammo\Enums\APIRecoveryType;
 use sammo\Validator;
 use sammo\GameConst;
 use sammo\General;
@@ -33,11 +34,11 @@ class BidUniqueAuction extends \sammo\BaseAPI
    return static::REQ_GAME_LOGIN;
  }

-  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    $auctionID = $this->args['auctionID'];
    $amount = $this->args['amount'];
-    $tryExtendCloseDate = $this->arg['extendCloseDate'] ?? false;
+    $tryExtendCloseDate = $this->args['extendCloseDate'] ?? false;

    $generalID = $session->generalID;
    $general = General::createGeneralObjFromDB($generalID);
@@ -8,6 +8,7 @@ use sammo\AuctionSellRice;
 use sammo\DB;
 use sammo\DTO\AuctionBidItem;
 use sammo\DTO\AuctionInfo;
+use sammo\Enums\APIRecoveryType;
 use sammo\Enums\AuctionType;
 use sammo\Validator;
 use sammo\General;
@@ -29,7 +30,7 @@ class GetActiveResourceAuctionList extends \sammo\BaseAPI
    return static::REQ_GAME_LOGIN;
  }

-  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    $db = DB::db();

@@ -8,6 +8,7 @@ use sammo\AuctionUniqueItem;
 use sammo\DB;
 use sammo\DTO\AuctionBidItem;
 use sammo\DTO\AuctionInfo;
+use sammo\Enums\APIRecoveryType;
 use sammo\Enums\AuctionType;
 use sammo\Enums\InheritanceKey;
 use sammo\InheritancePointManager;
@@ -37,7 +38,7 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI
    return static::REQ_GAME_LOGIN;
  }

-  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    $db = DB::db();

@@ -8,6 +8,7 @@ use sammo\AuctionUniqueItem;
 use sammo\DB;
 use sammo\DTO\AuctionBidItem;
 use sammo\DTO\AuctionInfo;
+use sammo\Enums\APIRecoveryType;
 use sammo\Enums\AuctionType;
 use sammo\TimeUtil;
 use sammo\Util;
@@ -24,7 +25,7 @@ class GetUniqueItemAuctionList extends \sammo\BaseAPI
    return static::REQ_GAME_LOGIN;
  }

-  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    $db = DB::db();

@@ -6,6 +6,7 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\AuctionBuyRice;
 use sammo\DB;
+use sammo\Enums\APIRecoveryType;
 use sammo\Validator;
 use sammo\GameConst;
 use sammo\General;
@@ -52,7 +53,7 @@ class OpenBuyRiceAuction extends \sammo\BaseAPI
    return static::REQ_GAME_LOGIN;
  }

-  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    /** @var int */
    $amount = $this->args['amount'];
@@ -6,6 +6,7 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\AuctionSellRice;
 use sammo\DB;
+use sammo\Enums\APIRecoveryType;
 use sammo\Validator;
 use sammo\GameConst;
 use sammo\General;
@@ -52,7 +53,7 @@ class OpenSellRiceAuction extends \sammo\BaseAPI
    return static::REQ_GAME_LOGIN;
  }

-  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    /** @var int */
    $amount = $this->args['amount'];
@@ -6,6 +6,7 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\AuctionUniqueItem;
 use sammo\DB;
+use sammo\Enums\APIRecoveryType;
 use sammo\Validator;
 use sammo\GameConst;
 use sammo\General;
@@ -49,7 +50,7 @@ class OpenUniqueAuction extends \sammo\BaseAPI
    return static::REQ_GAME_LOGIN;
  }

-  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    $itemID = $this->args['itemID'];
    $amount = $this->args['amount'];
@@ -7,6 +7,7 @@ use DateTimeInterface;
 use sammo\Betting;
 use sammo\DB;
 use sammo\DTO\BettingItem;
+use sammo\Enums\APIRecoveryType;
 use sammo\Validator;
 use sammo\GameConst;
 use sammo\KVStorage;
@@ -26,7 +27,7 @@ class Bet extends \sammo\BaseAPI
            ->rule('int', 'bettingID')
            ->rule('integerArray', 'bettingType')
            ->rule('int', 'amount')
-            ->rule('min', 'amount', 1);
+            ->rule('min', 'amount', 10);

        if (!$v->validate()) {
            return $v->errorStr();
@@ -39,7 +40,7 @@ class Bet extends \sammo\BaseAPI
        return static::REQ_GAME_LOGIN;
    }

-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
    {
        /** @var int */
        $bettingID = $this->args['bettingID'];
@@ -6,6 +6,7 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\DTO\BettingInfo;
+use sammo\Enums\APIRecoveryType;
 use sammo\KVStorage;
 use sammo\Util;
 use sammo\Validator;
@@ -32,7 +33,7 @@ class GetBettingDetail extends \sammo\BaseAPI
        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
    }

-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
    {
        $db = DB::db();

@@ -6,6 +6,7 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\DTO\BettingInfo;
+use sammo\Enums\APIRecoveryType;
 use sammo\KVStorage;
 use sammo\Validator;

@@ -29,7 +30,7 @@ class GetBettingList extends \sammo\BaseAPI
        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
    }

-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
    {
        $db = DB::db();

@@ -5,6 +5,7 @@ namespace sammo\API\Command;
 use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
+use sammo\Enums\APIRecoveryType;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
@@ -23,7 +24,7 @@ class GetReservedCommand extends \sammo\BaseAPI
        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
    }

-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
    {
        $db = DB::db();

@@ -4,6 +4,7 @@ namespace sammo\API\Command;

 use sammo\Session;
 use DateTimeInterface;
+use sammo\Enums\APIRecoveryType;
 use sammo\Validator;

 use function sammo\pushGeneralCommand;
@@ -31,7 +32,7 @@ class PushCommand extends \sammo\BaseAPI
        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
    }

-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
    {
        $amount = $this->args['amount'];
        if($amount == 0){
@@ -4,6 +4,7 @@ namespace sammo\API\Command;

 use sammo\Session;
 use DateTimeInterface;
+use sammo\Enums\APIRecoveryType;
 use sammo\Validator;

 use function sammo\repeatGeneralCommand;
@@ -31,7 +32,7 @@ class RepeatCommand extends \sammo\BaseAPI
        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
    }

-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
    {

        $amount = $this->args['amount'];
@@ -4,6 +4,7 @@ namespace sammo\API\Command;

 use sammo\Session;
 use DateTimeInterface;
+use sammo\Enums\APIRecoveryType;
 use sammo\GameConst;
 use sammo\Util;
 use sammo\Validator;
@@ -36,7 +37,7 @@ class ReserveBulkCommand extends \sammo\BaseAPI
        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
    }

-    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
    {
        $briefList = [];
        foreach ($this->args as $idx => $turn) {
--- a/Show More
+++ b/Show More