refac: 신규/복귀 유저 유산 포인트 지급 로직을 조금더 최적화

refac: storeOldGeneral을 General::kill로 이동
fix: 지급 버그 수정
2022-10-05 00:26:04 +09:00 · 2022-10-04 20:38:18 +09:00 · 2022-10-04 11:32:52 +09:00 · 2022-10-04 11:25:40 +09:00 · 2022-10-04 10:02:39 +09:00 · 2022-10-04 01:07:11 +09:00
291 changed files with 11100 additions and 7523 deletions
@@ -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',
@@ -26,8 +26,8 @@
        "nette/caching": "^3.0",
        "illuminate/database": "^9.12",
        "illuminate/events": "^9.12",
-        "spatie/data-transfer-object": "^3.7",
-        "php-ds/php-ds": "^1.4"
+        "php-ds/php-ds": "^1.4",
+        "hided62/ldto": "^1.0"
    },
    "autoload": {
        "psr-4": {
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "908099160e2765c04448fef3f35794c4",
+    "content-hash": "fe4387d1f2df3d3162c053a1d50a733a",
    "packages": [
        {
            "name": "brandonwamboldt/utilphp",
@@ -537,6 +537,60 @@
            },
            "time": "2021-06-11T22:34:44+00:00"
        },
+        {
+            "name": "hided62/ldto",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hided62/ldto.git",
+                "reference": "4c05401406f8afc1636a90763c13884f8fff0d14"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hided62/ldto/zipball/4c05401406f8afc1636a90763c13884f8fff0d14",
+                "reference": "4c05401406f8afc1636a90763c13884f8fff0d14",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "phan/phan": "^5.3",
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "LDTO\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Hide_D",
+                    "email": "hided62@gmail.com",
+                    "homepage": "https://hided.net",
+                    "role": "Developer"
+                }
+            ],
+            "description": "php lightweight dto library",
+            "homepage": "https://github.com/hided62/ldto",
+            "keywords": [
+                "data-transfer-object",
+                "dto",
+                "hided62",
+                "lightweight",
+                "serialize"
+            ],
+            "support": {
+                "issues": "https://github.com/hided62/ldto/issues",
+                "source": "https://github.com/hided62/ldto/tree/v1.0.0"
+            },
+            "time": "2022-08-05T14:30:13+00:00"
+        },
        {
            "name": "illuminate/bus",
            "version": "v9.12.2",
@@ -2238,69 +2292,6 @@
            },
            "time": "2021-06-29T04:31:23+00:00"
        },
-        {
-            "name": "spatie/data-transfer-object",
-            "version": "3.7.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/spatie/data-transfer-object.git",
-                "reference": "341f72c77e0fce40ea2e0dcb212cb54dc27bbe72"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/data-transfer-object/zipball/341f72c77e0fce40ea2e0dcb212cb54dc27bbe72",
-                "reference": "341f72c77e0fce40ea2e0dcb212cb54dc27bbe72",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^8.0"
-            },
-            "require-dev": {
-                "illuminate/collections": "^8.36",
-                "jetbrains/phpstorm-attributes": "^1.0",
-                "larapack/dd": "^1.1",
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Spatie\\DataTransferObject\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Brent Roose",
-                    "email": "brent@spatie.be",
-                    "homepage": "https://spatie.be",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Data transfer objects with batteries included",
-            "homepage": "https://github.com/spatie/data-transfer-object",
-            "keywords": [
-                "data-transfer-object",
-                "spatie"
-            ],
-            "support": {
-                "issues": "https://github.com/spatie/data-transfer-object/issues",
-                "source": "https://github.com/spatie/data-transfer-object/tree/3.7.3"
-            },
-            "funding": [
-                {
-                    "url": "https://spatie.be/open-source/support-us",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/spatie",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-12-30T20:31:10+00:00"
-        },
        {
            "name": "symfony/console",
            "version": "v6.0.8",
@@ -5337,5 +5328,5 @@
    "platform-overrides": {
        "php": "8.1"
    },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
@@ -40,8 +40,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>
@@ -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);
 }
@@ -34,6 +34,7 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');
    <?= 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>

@@ -20,6 +20,7 @@ increaseRefresh("왕조일람", 1);
    <?= 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>
@@ -28,6 +28,7 @@ $serverID = $emperior['server_id'] ?? ($emperior['serverID'] ?? null);
    <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" />

@@ -47,6 +47,7 @@ if ($gameStor->isunited) {
    <?= 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>
@@ -49,6 +49,7 @@ if ($scenarioIdx && key_exists($scenarioIdx, $scenarioList[$seasonIdx] ?? [])) {
    <?= 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>

@@ -32,6 +32,7 @@ if ($con >= 2) {
    <?= 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>
@@ -30,6 +30,7 @@ $sel[$type] = "selected";
    <?= 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>

@@ -83,6 +83,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>
@@ -119,6 +119,7 @@ if ($str3) {
    <?= 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'=>[
@@ -55,6 +55,7 @@ $templates = new \League\Plates\Engine('templates');
            font-size: x-small;
        }
    </style>
+    <?= WebUtil::printDist('vue', [], true) ?>
    <?= WebUtil::printDist('ts', ['common', 'currentCity']) ?>
 </head>

@@ -57,6 +57,7 @@ $templates = new \League\Plates\Engine('templates');
    <?= 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>

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

    <?php
@@ -39,6 +39,7 @@ $sel = [$type => "selected"];
    <?= 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>

@@ -48,6 +48,7 @@ if ($gameStor->isunited) {
    <?= 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>

@@ -31,6 +31,7 @@ if ($nationID == 0) {
    <?= 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>

@@ -70,6 +70,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>

@@ -115,7 +116,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>
@@ -110,6 +110,7 @@ $globalBetTotal = array_sum($globalBet);
    <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>
@@ -1,251 +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,`officer_level`,permission,penalty FROM general WHERE owner=%i', $userID);
-$permission = checkSecretPermission($me, false);
-
-$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>
-        <div class="row">
-            <?php if($me['troop'] == 0): ?>
-                <div class="col-6"><?php /*TODO: 모바일 */ ?>
-                    <div class="row gx-0 bg0">
-                        <div class="bg1 col d-grid"><span class="align-self-center center">부대명</span></div>
-                        <div class="col d-grid"><input type=text style=color:white;background-color:black; size=18 maxlength=18 id='newTroopName'></div>
-                        <div class="col d-grid"><button type='button' id="btnCreateTroop" class='btn btn-sm btn-secondary'>부대 창설</button></div>
-                    </div>
-                </div>
-            <?php endif; ?>
-            <?php if($troops && ($me['troop'] == $me['no'] || $permission == 4)): ?>
-                <div class="col-6">
-                    <div class="row gx-0 bg0">
-                        <div class="bg1 col d-grid"><span class="align-self-center center">부대명</span></div>
-                        <div class="col d-grid"><select class="form-select" id="changeNameTroopID">
-                            <?php if($permission != 4): ?>
-                                <option value="<?=$me['troop']?>"><?=$troops[$me['troop']]['name']?></option>
-                            <?php else: ?>
-                                <?php foreach ($troops as $troopNo => $troop): ?>
-                                    <option value="<?=$troopNo?>"><?=$troop['name']?></option>
-                                <?php endforeach; ?>
-                            <?php endif; ?>
-                        </select>
-                        </div>
-                        <div class="col d-grid"><input type=text style=color:white;background-color:black; size=18 maxlength=18 id='changeTroopName'></div>
-                        <div class="col d-grid"><button type='button' id="btnChangeTroopName" class='btn btn-sm btn-secondary'>이름 변경</button></div>
-                    </div>
-                </div>
-            <?php endif; ?>
-        </div>
-
-
-        <table width=1000 class='tb_layout bg0'>
-            <tr>
-                <td><?= backButton() ?></td>
-            </tr>
-            <tr>
-                <td><?= banner() ?> </td>
-            </tr>
-        </table>
-    </div>
-</body>
-
-</html>
@@ -54,6 +54,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>

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

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

 function banner()
@@ -1805,14 +1805,14 @@ 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['history'] = getNationHistoryLogAll($nationID);
@@ -1823,13 +1823,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%
@@ -2,6 +2,8 @@

 namespace sammo;

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

@@ -283,13 +285,8 @@ 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;

    //매달 사망자 수입 결산
@@ -526,7 +523,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');

@@ -557,32 +554,39 @@ function updateNationState()
    $startYear = $admin['startyear'];

    $assemblerCnts = [];
+
+    $nationCityCounts = [];
+    foreach($db->queryAllLists('SELECT nation, count(*) FROM city WHERE LEVEL>=4 GROUP BY nation') as [$nationID, $cityCnt]){
+        $nationCityCounts[$nationID] = $cityCnt;
+    }
+
    foreach ($db->queryAllLists('SELECT nation,count(no) FROM general WHERE npc = 5 GROUP BY nation') as [$nationID, $assemblerCnt]) {
        $assemblerCnts[$nationID] = $assemblerCnt;
    };

+    $nationLevelByCityCnt = [
+        0, //방랑군
+        1, //호족
+        2, //군벌
+        5, //주자사
+        8, //주목
+        11, //공
+        16, //왕
+        21, //황제
+    ];
+
    foreach ($db->query('SELECT nation,name,level,tech,aux FROM nation') as $nation) {
        //TODO: level이 진관수이소중대특 체계를 벗어날 수 있음
        $nationID = $nation['nation'];
-        $citycount = $db->queryFirstField('SELECT count(*) FROM city WHERE nation=%i AND level>=4', $nationID);
+        $cityCnt = $nationCityCounts[$nationID] ?? 0;

-
-        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;   // 황제
+        /** @var int */
+        $nationlevel = 0;
+        foreach($nationLevelByCityCnt as $cmpNationLevel => $cmpCityCnt){
+            if($cityCnt < $cmpCityCnt){
+                break;
+            }
+            $nationlevel = $cmpNationLevel;
        }

        if ($nationlevel > $nation['level']) {
@@ -596,33 +600,47 @@ function updateNationState()
                'rice' => $db->sqleval('rice + %i', $nationlevel * 1000),
            ];

+            $nationName = $nation['name'];
+            $lordName = $db->queryFirstField('SELECT name FROM general WHERE nation = %i AND officer_level = 12', $nationID);
+
+            $oldNationLevelText = getNationLevel($oldLevel);
+            $nationLevelText = getNationLevel($nationlevel);
+
+            $logger = new ActionLogger(0, $nationID, $year, $month, false);
+            $josaYi = JosaUtil::pick($lordName, '이');
+
            switch ($nationlevel) {
-                case 7:
-                    $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} 자칭"]);
+                case 7: //황제
+                    $josaRo = JosaUtil::pick($nationLevelText, '로');
+                    $logger->pushGlobalHistoryLog("<Y><b>【작위】</b></><D><b>{$nationName}</b></> {$oldNationLevelText} <Y>{$lordName}</>{$josaYi} <C>{$nationLevelText}</>{$josaRo} 옹립되었습니다.");
+                    $logger->pushNationalHistoryLog("<D><b>{$nationName}</b></> {$oldNationLevelText} <Y>{$lordName}</>{$josaYi} <C>{$nationLevelText}</>{$josaRo} 옹립");
                    $auxVal = Json::decode($nation['aux']);
                    $auxVal['can_국기변경'] = 1;
                    $auxVal['can_국호변경'] = 1;
                    $updateVals['aux'] = Json::encode($auxVal);
                    break;
-                case 6:
-                    $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) . "</>에 등극"]);
+                case 6: //왕
+                    $josaRo = JosaUtil::pick($nationLevelText, '로');
+                    $logger->pushGlobalHistoryLog("<Y><b>【작위】</b></><D><b>{$nationName}</b></>의 <Y>{$lordName}</>{$josaYi} <C>$nationLevelText</>{$josaRo} 책봉되었습니다.");
+                    $logger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$lordName}</>{$josaYi} <C>$nationLevelText</>{$josaRo} 책봉");
                    break;
-                case 5:
-                case 4:
-                case 3:
-                    $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) . "</>에 임명됨"]);
+                case 5: //공
+                case 4: //주목
+                case 3: //주자사
+                    $josaRo = JosaUtil::pick($nationLevelText, '로');
+                    $logger->pushGlobalHistoryLog("<Y><b>【작위】</b></><D><b>{$nationName}</b></>의 <Y>{$lordName}</>{$josaYi} <C>$nationLevelText</>{$josaRo} 임명되었습니다.");
+                    $logger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$lordName}</>{$josaYi} <C>$nationLevelText</>{$josaRo} 임명됨");
                    break;
-                case 2:
-                    $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) . "</>로 나서다"]);
+                case 2: //군벌
+                    $josaRa = JosaUtil::pick($nationName, '라');
+                    $josaRo = JosaUtil::pick($nationLevelText, '로');
+                    $logger->pushGlobalHistoryLog("<Y><b>【작위】</b></><Y>{$lordName}</>{$josaYi} 독립하여 <D><b>{$nationName}</b></>{$josaRa}는 <C>$nationLevelText</>{$josaRo} 나섰습니다.");
+                    $logger->pushNationalHistoryLog("<Y>{$lordName}</>{$josaYi} 독립하여 <D><b>{$nationName}</b></>{$josaRa}는 <C>$nationLevelText</>{$josaRo} 나서다");
                    break;
            }

            $db->update('nation', $updateVals, 'nation=%i', $nation['nation']);
+            $logger->flush();

            $turnRows = [];
            foreach (Util::range(getNationChiefLevel($nation['level']), 12) as $chiefLevel) {
@@ -1053,6 +1071,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) {
@@ -1064,9 +1092,8 @@ function checkEmperior()
    }
    processSumInheritPointRank();
    foreach ($allUserGenerals as $genObj) {
-        $inheritPointManager->mergeTotalInheritancePoint($genObj, true);
+        $inheritPointManager->mergeTotalInheritancePoint($genObj);
        $inheritPointManager->applyInheritanceUser($genObj->getVar('owner'));
-        $inheritPointManager->clearInheritancePoint($genObj);
    }

    $gameStor->isunited = 2;
@@ -1135,7 +1162,7 @@ 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['history'] = getNationHistoryLogAll($nation['nation']);
@@ -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){
@@ -32,6 +32,7 @@ if ($session->userGrade < 5 && !$allowReset) {
    <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 +93,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>
@@ -134,13 +135,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 +163,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>
@@ -100,7 +100,7 @@ if(in_array($stateOpt, ['try_destroy_src', 'try_destroy_dest'])){
            'reason'=>'파기'
        ];
    }
-    $msgText = "외교 서신 #{$letterNo}를 파기했습니다.";
+    $msgText = "외교 서신(#{$letterNo})을 파기했습니다.";
    $lastState = 'cancelled';
 }
 else{
@@ -114,7 +114,7 @@ else{
        'aux'=>Json::encode($aux)
    ], 'no=%i', $letterNo);

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

@@ -85,7 +85,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,7 +97,7 @@ else{
        'state'=>'cancelled',
        'aux'=>Json::encode($aux)
    ], 'no=%i', $letterNo);
-    $msgText = "외교 서신 #{$letterNo}가 거부되었습니다.";
+    $msgText = "외교 서신(#{$letterNo})이 거부되었습니다.";
    if($reason){
        $msgText .= ' 이유 : '.$reason;
    }
@@ -70,7 +70,7 @@ $db->update('ng_diplomacy', [
    'state'=>'cancelled',
    'aux'=>Json::encode($aux)
 ], 'no=%i', $letterNo);
-$msgText = "외교 서신 #{$letterNo}가 회수되었습니다.";
+$msgText = "외교 서신(#{$letterNo})이 회수되었습니다.";

 $msg = new Message(
    Message::MSGTYPE_DIPLOMACY,
@@ -226,8 +226,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);
    }

@@ -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}의 입력양식이 올바르지 않습니다.";
@@ -281,7 +281,6 @@ 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{
    $rankVars = new Map;
@@ -298,7 +297,7 @@ function extractRankVar(array $rawVal):Map{
 function simulateBattle(
    $rawAttacker, $rawAttackerCity, $rawAttackerNation,
    $rawDefenderList, $rawDefenderCity, $rawDefenderNation,
-    $startYear, $year, $month, $cityRate
+    $startYear, $year, $month
 ){

    $warSeed = bin2hex(random_bytes(16));
@@ -310,7 +309,7 @@ function simulateBattle(
        $rawAttackerNation,
        true
    );
-    $city = new WarUnitCity($warRng, $rawDefenderCity, $rawDefenderNation, $year, $month, $cityRate);
+    $city = new WarUnitCity($warRng, $rawDefenderCity, $rawDefenderNation, $year, $month, $startYear);

    $iterDefender = new \ArrayIterator($rawDefenderList);
    $iterDefender->rewind();
@@ -367,7 +366,7 @@ function simulateBattle(
        $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);

        $defenderRice += $rice;
@@ -406,7 +405,7 @@ foreach(Util::range($repeatCnt) as $repeatIdx){
    [$attacker, $city, $battleResult, $conquerCity, $attackerRice, $defenderRice] = simulateBattle(
        $rawAttacker, $rawAttackerCity, $rawAttackerNation,
        $rawDefenderList, $rawDefenderCity, $rawDefenderNation,
-        $startYear, $year, $month, $cityRate
+        $startYear, $year, $month
    );
    $lastWarLog = Util::mapWithKey(function($key, $values){
        return ConvertLog(join('<br>', $values));
@@ -29,11 +29,11 @@ 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);
@@ -90,7 +90,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 +113,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,7 +175,6 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
        'startyear' => $startYear,
        'year' => $year,
        'month' => $month,
-        'city_rate' => $cityRate,
        'join_mode' => $joinMode,
    ], $attacker->getGeneral(), $city->getRaw());
 }
@@ -27,6 +27,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;
@@ -37,7 +37,7 @@ class BidUniqueAuction extends \sammo\BaseAPI
  {
    $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);
@@ -26,7 +26,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();
@@ -67,7 +67,7 @@ class DieOnPrestart extends \sammo\BaseAPI

    $generalName = $generalObj->getName();
    $josaYi = JosaUtil::pick($generalName, '이');
-    $generalObj->kill($db, true, "<Y>{$generalName}</>{$josaYi} 이 홀연히 모습을 <R>감추었습니다</>");
+    $generalObj->kill($db, true, "<Y>{$generalName}</>{$josaYi} 홀연히 모습을 <R>감추었습니다</>");

    $session->logoutGame();
    return null;
@@ -18,12 +18,12 @@ class GetGeneralLog extends GetNationGeneralLog
        $v = new Validator($this->args);
        $v
            ->rule('required', [
-                'type',
+                'reqType',
            ])
            ->rule('int', [
                'reqTo',
            ])
-            ->rule('in', 'type', [
+            ->rule('in', 'reqType', [
                self::GENERAL_HISTORY,
                self::GENERAL_ACTION,
                self::BATTLE_RESULT,
@@ -2,6 +2,7 @@

 namespace sammo\API\General;

+use Ds\Set;
 use sammo\ActionLogger;
 use sammo\CityConst;
 use sammo\DB;
@@ -84,6 +85,40 @@ class Join extends \sammo\BaseAPI
        return static::REQ_LOGIN | static::REQ_READ_ONLY;
    }

+    public function calcRestInheritPoint(int $userID): int
+    {
+        $db = DB::db();
+
+        if (Util::toInt(UniqueConst::$seasonIdx) < 1) {
+            //이벤트 시즌은 카운트하지 않음
+            return 0;
+        }
+
+        $gameID = UniqueConst::$serverID;
+        $alreadyJoined = $db->queryFirstField('SELECT count(*) FROM `storage` WHERE `namespace` = %s AND `key` LIKE %s', 'inheritance_result', "{$gameID}_{$userID}_%");
+        if ($alreadyJoined) {
+            //이미 받았음
+            return 0;
+        }
+
+        $targetBonusPointCnt = 0;
+        //정상적으로 끝난 깃수만 제공
+        $oldGames = $db->queryFirstColumn('SELECT server_id FROM ng_games WHERE `winner_nation` IS NOT NULL AND `server_id` != %s ORDER BY `date` DESC LIMIT 8', $gameID);
+
+        if(!$oldGames){
+            return 0;
+        }
+        //이전에 장수를 생성한 적이 있는지
+        $oldGamesCnt = new Set($db->queryFirstColumn('SELECT `server_id` FROM ng_old_generals WHERE server_id IN %ls AND `owner` = %i GROUP BY `server_id`', $oldGames, $userID));
+        foreach ($oldGames as $oldGameID) {
+            if($oldGamesCnt->contains($oldGameID)) {
+                break;
+            }
+            $targetBonusPointCnt += 1;
+        }
+        return $targetBonusPointCnt;
+    }
+
    public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag)
    {
        $userID = $session->userID;
@@ -105,7 +140,7 @@ class Join extends \sammo\BaseAPI
        $inheritCity = $this->args['inheritCity'] ?? null;
        $inheritBonusStat = $this->args['inheritBonusStat'] ?? null;

-        if($inheritTurntime !== null && $inheritCity !== null){
+        if ($inheritTurntime !== null && $inheritCity !== null) {
            return '턴과 도시를 동시에 지정할 수 없습니다.';
        }

@@ -305,7 +340,7 @@ class Join extends \sammo\BaseAPI
        if ($inheritTurntime !== null) {
            $inheritTurntime = $inheritTurntime % ($admin['turnterm'] * 60);

-            $userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime%60), "inheritPoint");
+            $userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime % 60), "inheritPoint");

            $inheritTurntime += $rng->nextRangeInt(0, 999999) / 1000000;
            $turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $admin['turnterm']));
@@ -337,6 +372,11 @@ class Join extends \sammo\BaseAPI
        //상성 랜덤
        $affinity = $rng->nextRangeInt(1, 150);

+        $betray = 0;
+        if ($relYear >= 4) {
+            $betray += 2;
+        }
+
        ########## 회원정보 테이블에 입력값을 등록한다. ##########
        $db->insert('general', [
            'owner' => $userID,
@@ -365,6 +405,7 @@ class Join extends \sammo\BaseAPI
            'lastrefresh' => $now,
            'crewtype' => GameUnitConst::DEFAULT_CREWTYPE,
            'makelimit' => 0,
+            'betray' => $betray,
            'age' => $age,
            'startage' => $age,
            'personal' => $character,
@@ -402,19 +443,25 @@ class Join extends \sammo\BaseAPI
        if ($inheritRequiredPoint > 0) {
            $userLogger->push("장수 생성으로 포인트 {$inheritRequiredPoint} 소모", "inheritPoint");
            $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$userID}");
-            $inheritStor->setValue('previous', [$inheritTotalPoint - $inheritRequiredPoint, null]);
+            $inheritTotalPoint -= $inheritRequiredPoint;
+            $inheritStor->setValue('previous', [$inheritTotalPoint, null]);
            $userLogger->flush();
            $db->update('rank_data', [
-                'value'=>$db->sqleval('value + %i', $inheritRequiredPoint)
+                'value' => $db->sqleval('value + %i', $inheritRequiredPoint)
            ], 'general_id = %i AND type = %s', $generalID, RankColumn::inherit_point_spent_dynamic->value);
        }

-        $me = [
-            'no' => $generalID
-        ];

-        $log = [];
-        $mylog = [];
+        $restInheritPoint = $this->calcRestInheritPoint($userID) * 500;
+        if($restInheritPoint > 0){
+            $userLogger->push("신규/복귀 생성으로 포인트 {$restInheritPoint} 지급", "inheritPoint");
+            $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$userID}");
+            $inheritTotalPoint += $restInheritPoint;
+            $inheritStor->setValue('previous', [$inheritTotalPoint, null]);
+            $userLogger->flush();
+        }
+
+

        $logger = new ActionLogger($generalID, 0, $gameStor->year, $gameStor->month);

@@ -3,8 +3,10 @@
 namespace sammo\API\Global;

 use sammo\Session;
+use sammo\DB;
 use DateTimeInterface;
 use sammo\TurnExecutionHelper;
+use sammo\UniqueConst;

 class ExecuteEngine extends \sammo\BaseAPI
 {
@@ -20,10 +22,23 @@ class ExecuteEngine extends \sammo\BaseAPI

    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
    {
-      $updated = TurnExecutionHelper::executeAllCommand();
+      $reqServerID = $this->args['serverID'] ?? null;
+      if($reqServerID && $reqServerID !== UniqueConst::$serverID){
+        return [
+          'result' => false,
+          'reason' => '서버 아이디가 다릅니다',
+          'reqRefresh' => true,
+        ];
+      }
+
+      $updated = false;
+      $locked = false;
+      $lastExecuted = TurnExecutionHelper::executeAllCommand($updated, $locked);
      return [
        'result' => true,
        'updated' => $updated,
+        'locked' => $locked,
+        'lastExecuted' => $lastExecuted,
      ];
    }
 }
@@ -0,0 +1,128 @@
+<?php
+
+namespace sammo\API\Global;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\Util;
+use sammo\Validator;
+
+class GetRecentRecord extends \sammo\BaseAPI
+{
+
+  const ROW_LIMIT = 15;
+
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('int', 'lastGeneralRecordID')
+      ->rule('int', 'lastWorldHistoryID');
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    $this->args['lastGeneralRecordID'] = (int)($this->args['lastGeneralRecordID']??0);
+    $this->args['lastWorldHistoryID'] = (int)($this->args['lastWorldHistoryID']??0);
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+  }
+
+  private function getGlobalRecord(int $lastRecordID): array
+  {
+    $db = DB::db();
+
+    $globalRecord = $db->queryAllLists(
+      'SELECT id, `text` FROM general_record WHERE `general_id` = 0 AND log_type = %s AND id >= %i ORDER BY `id` DESC LIMIT %i',
+      'history',
+      $lastRecordID,
+      static::ROW_LIMIT + 1,
+    );
+    return $globalRecord;
+  }
+
+  private function getGeneralRecord(int $generalID, int $lastRecordID): array
+  {
+    $db = DB::db();
+
+    $generalRecord = $db->queryAllLists(
+      'SELECT id, `text` FROM general_record WHERE `general_id` = %i AND log_type = %s AND id >= %i ORDER BY `id` DESC LIMIT %i',
+      $generalID,
+      'action',
+      $lastRecordID,
+      static::ROW_LIMIT + 1,
+    );
+    return $generalRecord;
+  }
+
+  private function getHistory(int $lastHistoryID): array
+  {
+    $db = DB::db();
+
+    $history = $db->queryAllLists(
+      'SELECT id, `text` FROM world_history WHERE nation_id = 0 AND id >= %i ORDER BY `id` DESC LIMIT %i',
+      $lastHistoryID,
+      static::ROW_LIMIT + 1,
+    );
+    return $history;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $db = DB::db();
+
+    $lastHistoryID = $this->args['lastWorldHistoryID'];
+    $lastRecordID = $this->args['lastGeneralRecordID'];
+
+    $history = $this->getHistory($lastHistoryID);
+    $globalRecord = $this->getGlobalRecord($lastRecordID);
+    $generalRecord = $this->getGeneralRecord($session->generalID, $lastRecordID);
+
+    $flushHistory = true;
+    $flushGlobalRecord = true;
+    $flushGeneralRecord = true;
+
+    if($history){
+      if(Util::array_last($history)[0] == $lastHistoryID){
+        $flushHistory = false;
+        array_pop($history);
+      }
+      else if(count($history) > static::ROW_LIMIT){
+        array_pop($history);
+      }
+    }
+
+    if($globalRecord){
+      if(Util::array_last($globalRecord)[0] == $lastRecordID){
+        $flushGlobalRecord = false;
+        array_pop($globalRecord);
+      }
+      else if(count($globalRecord) > static::ROW_LIMIT){
+        array_pop($globalRecord);
+      }
+    }
+
+    if($generalRecord){
+      if(Util::array_last($generalRecord)[0] == $lastRecordID){
+        $flushGeneralRecord = false;
+        array_pop($generalRecord);
+      }
+      else if(count($generalRecord) > static::ROW_LIMIT){
+        array_pop($generalRecord);
+      }
+    }
+
+    return [
+      'result' => true,
+      'history' => $history,
+      'global' => $globalRecord,
+      'general' => $generalRecord,
+      'flushHistory' => $flushHistory?1:0,
+      'flushGlobal' => $flushGlobalRecord?1:0,
+      'flushGeneral' => $flushGeneralRecord?1:0,
+    ];
+  }
+}
@@ -67,6 +67,10 @@ class BuyHiddenBuff extends \sammo\BaseAPI
        $reqAmount = GameConst::$inheritBuffPoints[$level] -  GameConst::$inheritBuffPoints[$prevLevel];

        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        if($gameStor->isunited){
+            return '이미 천하가 통일되었습니다.';
+        }
        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
        $previousPoint = ($inheritStor->getValue('previous') ?? [0,0])[0];
        if ($previousPoint < $reqAmount) {
@@ -40,6 +40,10 @@ class BuyRandomUnique extends \sammo\BaseAPI
        }

        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        if($gameStor->isunited){
+            return '이미 천하가 통일되었습니다.';
+        }
        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
        $previousPoint = ($inheritStor->getValue('previous')??[0, 0])[0];
        $reqAmount = GameConst::$inheritItemRandomPoint;
@@ -51,6 +51,11 @@ class ResetSpecialWar extends \sammo\BaseAPI
        $reqPoint = GameConst::$inheritResetAttrPointBase[$nextLevel];

        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        if($gameStor->isunited){
+            return '이미 천하가 통일되었습니다.';
+        }
+
        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
        $previousPoint = ($inheritStor->getValue('previous') ?? [0, 0])[0];
        if ($previousPoint < $reqPoint) {
@@ -50,6 +50,10 @@ class ResetTurnTime extends \sammo\BaseAPI
        $reqPoint = GameConst::$inheritResetAttrPointBase[$nextLevel];

        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        if($gameStor->isunited){
+            return '이미 천하가 통일되었습니다.';
+        }
        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
        $previousPoint = ($inheritStor->getValue('previous') ?? [0, 0])[0];
        if ($previousPoint < $reqPoint) {
@@ -65,6 +65,10 @@ class SetNextSpecialWar extends \sammo\BaseAPI
        $reqAmount = GameConst::$inheritSpecificSpecialPoint;

        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        if($gameStor->isunited){
+            return '이미 천하가 통일되었습니다.';
+        }
        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
        $previousPoint = ($inheritStor->getValue('previous') ?? [0, 0])[0];
        if ($previousPoint < $reqAmount) {
@@ -2,6 +2,7 @@

 namespace sammo\API\Nation;

+use ArrayObject;
 use sammo\DB;
 use sammo\General;
 use sammo\Session;
@@ -44,9 +45,12 @@ class GeneralList extends \sammo\BaseAPI
        'belong' => 0,
        'connect' => 0,

+        'troop' => 0,
+        'city' => 0,
+
        'con' => 1,
-        'specage' => 1,
-        'specage2' => 1,
+        'specage' => 0,
+        'specage2' => 0,
        'leadership_exp' => 1,
        'strength_exp' => 1,
        'intel_exp' => 1,
@@ -56,14 +60,12 @@ class GeneralList extends \sammo\BaseAPI
        'dex4' => 1,
        'dex5' => 1,

-        'city' => 1,
        'experience' => 1,
        'dedication' => 1,

        'officer_level' => 1,
        'officer_city' => 1,
        'defence_train' => 1,
-        'troop' => 1,
        'crewtype' => 1,
        'crew' => 1,
        'train' => 1,
@@ -125,7 +127,7 @@ class GeneralList extends \sammo\BaseAPI
        if ($level >= 5) {
            return $level;
        }
-        if ($this->permission > 1) {
+        if ($this->permission >= 1) {
            return $level;
        }
        return 1;
@@ -157,35 +159,59 @@ class GeneralList extends \sammo\BaseAPI

        $rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE nation = %i ORDER BY turntime ASC', Util::formatListOfBackticks($queryColumns), $nationID), 'no');

+        /** @var ArrayObject[] */
+        $troops = [];
+        foreach ($db->queryAllLists('SELECT troop_leader,name FROM troop WHERE nation = %i', $nationID) as [$troopLeaderID, $troopName]) {
+            if (!key_exists($troopLeaderID, $rawGeneralList)) {
+                continue;
+            }
+            $troopTurnTime = $rawGeneralList[$troopLeaderID]['turntime'];
+            $troops[$troopLeaderID] = new ArrayObject([
+                'id' => $troopLeaderID,
+                'name' => $troopName,
+                'turntime' => $troopTurnTime,
+                'reservedCommand' => [],
+            ]);
+        }
+
        $reservedCommand = [];
-        if ($this->permission >= 1) {
-            $nonNPCGeneralIDList = [];
-            foreach ($rawGeneralList as $rawGeneral) {
-                if ($rawGeneral['npc'] < 2) {
-                    $nonNPCGeneralIDList[] = $rawGeneral['no'];
+        if ($this->permission >= 1 || count($troops)) {
+            $reservedCommandTargetGeneralIDList = [];
+
+            if($this->permission >= 1){
+                foreach ($rawGeneralList as $rawGeneral) {
+                    if ($rawGeneral['npc'] < 2) {
+                        $reservedCommandTargetGeneralIDList[$rawGeneral['no']] = $rawGeneral['no'];
+                    }
                }
            }
+            foreach($troops as $troop){
+                $reservedCommandTargetGeneralIDList[$troop['id']] = $troop['id'];
+            }
+            

-            $rawTurnList = $db->query(
-                'SELECT general_id, turn_idx, action, arg, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id asc, turn_idx asc',
-                $nonNPCGeneralIDList
-            );
-
-            foreach ($rawTurnList as $rawTurn) {
-                [
-                    'general_id' => $generalID,
-                    'action' => $action,
-                    'arg' => $arg,
-                    'brief' => $brief,
-                ] = $rawTurn;
-                if (!key_exists($generalID, $reservedCommand)) {
-                    $reservedCommand[$generalID] = [];
+            if($reservedCommandTargetGeneralIDList){
+                $rawTurnList = $db->query(
+                    'SELECT general_id, turn_idx, action, arg, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id asc, turn_idx asc',
+                    array_values($reservedCommandTargetGeneralIDList)
+                );
+    
+                foreach ($rawTurnList as $rawTurn) {
+                    [
+                        'general_id' => $generalID,
+                        'action' => $action,
+                        'arg' => $arg,
+                        'brief' => $brief,
+                    ] = $rawTurn;
+                    if (!key_exists($generalID, $reservedCommand)) {
+                        $reservedCommand[$generalID] = [];
+                    }
+                    $reservedCommand[$generalID][] = [
+                        'action' => $action,
+                        'arg' => $arg,
+                        'brief' => $brief
+                    ];
                }
-                $reservedCommand[$generalID][] = [
-                    'action' => $action,
-                    'arg' => $arg,
-                    'brief' => $brief
-                ];
            }
        }

@@ -251,6 +277,17 @@ class GeneralList extends \sammo\BaseAPI
            $resultColumns[$column] = $column;
        }

+        foreach ($troops as $troop){
+            $troopLeaderID = $troop['id'];
+            $troop['reservedCommand'] = array_map(function($turnObj){
+                $brief = $turnObj['brief'];
+                if($brief == '집합'){
+                    return $brief;
+                }
+                return '-';
+            }, $specialViewFilter['reservedCommand']($rawGeneralList[$troopLeaderID]));
+        }
+
        $generalList = [];
        foreach ($rawGeneralList as $rawGeneral) {
            //General 생성?
@@ -271,20 +308,14 @@ class GeneralList extends \sammo\BaseAPI
            $generalList[] = $item;
        }

-        if ($this->permission >= 1) {
-            $troops = $db->queryAllLists('SELECT troop_leader,name FROM troop WHERE nation = %i', $nationID);
-        } else {
-            $troops = null;
-        }
-
-
        $result = [
            'result' => true,
            'permission' => $this->permission,
            'column' => array_keys($resultColumns),
            'list' => $generalList,
-            'troops' => $troops,
+            'troops' => array_values($troops),
            'env' => $env,
+            'myGeneralID' => $session->generalID,
        ];

        return $result;
@@ -9,11 +9,12 @@ use sammo\Validator;
 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
 use function sammo\getBattleDetailLogMore;
+use function sammo\getBattleDetailLogRecent;
 use function sammo\getBattleResultMore;
 use function sammo\getBattleResultRecent;
 use function sammo\getGeneralActionLogMore;
 use function sammo\getGeneralActionLogRecent;
-use function sammo\getGeneralHistoryLogAll;
+use function sammo\getGeneralHistoryLogWithLogID;

 class GetGeneralLog extends \sammo\BaseAPI
 {
@@ -28,13 +29,13 @@ class GetGeneralLog extends \sammo\BaseAPI
        $v
            ->rule('required', [
                'generalID',
-                'type',
+                'reqType',
            ])
            ->rule('integer', [
                'generalID',
                'reqTo',
            ])
-            ->rule('in', 'type', [
+            ->rule('in', 'reqType', [
                self::GENERAL_HISTORY,
                self::GENERAL_ACTION,
                self::BATTLE_RESULT,
@@ -76,11 +77,11 @@ class GetGeneralLog extends \sammo\BaseAPI
            return '같은 나라의 장수가 아닙니다.';
        }

-        $reqType = $this->args['type'];
+        $reqType = $this->args['reqType'];
        if (
            $reqType === self::GENERAL_ACTION &&
            $testGeneralNPCType < 2 &&
-            $generalID !== $me['generalID'] &&
+            $generalID !== $me['no'] &&
            $permission < 2
        ) {
            return '권한이 부족합니다. 유저 장수의 개인 기록은 수뇌만 열람 가능합니다.';
@@ -103,7 +104,7 @@ class GetGeneralLog extends \sammo\BaseAPI
        $userID = $session->userID;

        $targetGeneralID = $this->getTargetGeneralID($session);
-        $reqType = $this->args['type'];
+        $reqType = $this->args['reqType'];
        $reqTo = $this->args['reqTo'] ?? null;

        $db = DB::db();
@@ -124,7 +125,7 @@ class GetGeneralLog extends \sammo\BaseAPI
                'result' => true,
                'reqType' => $reqType,
                'generalID' => $targetGeneralID,
-                'log' => getGeneralHistoryLogAll($targetGeneralID)
+                'log' => getGeneralHistoryLogWithLogID($targetGeneralID)
            ];
        }

@@ -156,7 +157,7 @@ class GetGeneralLog extends \sammo\BaseAPI
                'reqType' => $reqType,
                'generalID' => $targetGeneralID,
                'log' => $reqTo === null
-                    ? getBattleResultRecent($targetGeneralID, 30)
+                    ? getBattleDetailLogRecent($targetGeneralID, 30)
                    : getBattleDetailLogMore($targetGeneralID, $reqTo, 30)
            ];
        }
@@ -0,0 +1,104 @@
+<?php
+
+namespace sammo\API\Nation;
+
+use sammo\DB;
+use sammo\GameConst;
+use sammo\General;
+use sammo\KVStorage;
+use sammo\LastTurn;
+use sammo\Session;
+use sammo\Util;
+use sammo\Validator;
+
+use function sammo\buildNationCommandClass;
+use function sammo\checkLimit;
+use function sammo\checkSecretPermission;
+use function sammo\getBattleDetailLogMore;
+use function sammo\getBattleResultMore;
+use function sammo\getBattleResultRecent;
+use function sammo\getGeneralActionLogMore;
+use function sammo\getGeneralActionLogRecent;
+use function sammo\getGeneralHistoryLogAll;
+use function sammo\getNationStaticInfo;
+
+class GetNationInfo extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+        $v->rule('boolean', 'full');
+
+        if (!$v->validate()) {
+            return $v->errorStr();
+        }
+        return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+  }
+
+  public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $userID = $session->userID;
+
+    $db = DB::db();
+    $nationID = $db->queryFirstField('SELECT nation FROM general WHERE `owner` = %i', $userID);
+
+    if (!$nationID) {
+      return [
+        'result' => true,
+        'nation' => getNationStaticInfo(0)
+      ];
+    }
+
+    $isFull = $this->args['full'] ?? false;
+
+    if(!$isFull){
+      $nation = getNationStaticInfo($nationID);
+      return [
+        'result' => true,
+        'nation' => $nation,
+      ];
+    }
+
+    $generalObj = General::createGeneralObjFromDB($session->generalID, null, 1);
+
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $gameEnv = $gameStor->getValues(['year', 'month', 'startyear']);
+
+    $nation = $db->queryFirstRow(
+      'SELECT nation, `name`, color, capital, gennum, gold, rice, bill, rate, secretlimit, chief_set, scout, war, strategic_cmd_limit, surlimit, tech, `power`, `level`, `type` FROM nation WHERE id = %i',
+      $nationID
+    );
+    $nationStor = \sammo\KVStorage::getStorage($db, $nationID, 'nation_env');
+    $nationStor->cacheAll();
+
+
+    //전략 정보를 매번 읽어와야하나?
+    $impossibleStrategicCommandLists = [];
+    $strategicCommandLists = GameConst::$availableChiefCommand['전략'];
+    $yearMonth = Util::joinYearMonth($gameEnv['year'], $gameEnv['month']);
+    foreach ($strategicCommandLists as $command) {
+        $cmd = buildNationCommandClass($command, $generalObj, $gameEnv, new LastTurn());
+        $nextAvailableTurn = $cmd->getNextAvailableTurn();
+        if ($nextAvailableTurn > $yearMonth) {
+            $impossibleStrategicCommandLists[] = [$cmd->getName(), $nextAvailableTurn - $yearMonth];
+        }
+    }
+
+    $troopName = [];
+    foreach ($db->queryAllLists('SELECT troop_leader, name FROM troop WHERE nation=%i', $nationID) as [$troopID, $tName]) {
+        $troopName[$troopID] = $tName;
+    }
+
+    return [
+      'result' => true,
+      'nation' => $nation,
+      'impossibleStrategicCommandLists' => $impossibleStrategicCommandLists,
+      'troops' => $troopName,
+    ];
+  }
+}
@@ -6,6 +6,7 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\KVStorage;
+use sammo\TimeUtil;
 use sammo\Validator;
 use sammo\WebUtil;

@@ -36,7 +37,7 @@ class SetNotice extends \sammo\BaseAPI
        $msg = $this->args['msg'];
        $userID = $session->userID;
        $db = DB::db();
-        $me = $db->queryFirstRow('SELECT `no`,nation,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
+        $me = $db->queryFirstRow('SELECT `no`,`name`,nation,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);

        $permission = checkSecretPermission($me, false);
        if($permission < 0){
@@ -49,7 +50,12 @@ class SetNotice extends \sammo\BaseAPI
        $nationID = $me['nation'];

        $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
-        $nationStor->notice = WebUtil::htmlPurify($msg);
+        $nationStor->nationNotice = [
+            'date'=>TimeUtil::now(),
+            'msg'=>WebUtil::htmlPurify($msg),
+            'author'=>$me['name'],
+            'authorID'=>$me['no'],
+        ];

        return [
            'result' => true
@@ -10,6 +10,7 @@ use sammo\Validator;

 use function sammo\checkSecretPermission;

+/** @deprecated */
 class SetTroopName extends \sammo\BaseAPI
 {
  public function validateArgs(): ?string
@@ -63,9 +63,9 @@ class GetReservedCommand extends \sammo\BaseAPI

        $nationTurnList = [];
        foreach ($db->queryAllLists(
-                'SELECT officer_level, turn_idx, action, arg, brief FROM nation_turn WHERE nation_id = %i ORDER BY officer_level DESC, turn_idx ASC',
-                $me['nation']
-            ) as [$officer_level, $turn_idx, $action, $arg, $brief]) {
+            'SELECT officer_level, turn_idx, action, arg, brief FROM nation_turn WHERE nation_id = %i ORDER BY officer_level DESC, turn_idx ASC',
+            $me['nation']
+        ) as [$officer_level, $turn_idx, $action, $arg, $brief]) {
            if (!key_exists($officer_level, $nationTurnList)) {
                $nationTurnList[$officer_level] = [];
            }
@@ -76,6 +76,14 @@ class GetReservedCommand extends \sammo\BaseAPI
            ];
        }

+        $troopList = [];
+        foreach ($db->queryAllLists(
+            'SELECT troop_leader, `name` FROM troop WHERE `nation` = %i',
+            $nationID
+        ) as [$troopID, $troopName]) {
+            $troopList[$troopID] = $troopName;
+        }
+

        $nationChiefList = [];
        foreach ($nationTurnList as $officer_level => $turnBrief) {
@@ -111,7 +119,8 @@ class GetReservedCommand extends \sammo\BaseAPI
            'turnTerm' => $turnTerm,
            'date' => TimeUtil::now(true),
            'chiefList' => $nationChiefList,
-            'isChief'=>($me['officer_level'] > 4),
+            'troopList' => $troopList,
+            'isChief' => ($me['officer_level'] > 4),
            'autorun_limit' => $generalObj->getAuxVar('autorun_limit'),
            'officerLevel' => $me['officer_level'],
            'commandList' => getChiefCommandTable($generalObj),
@@ -0,0 +1,46 @@
+<?php
+
+namespace sammo\API\Troop;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+
+class ExitTroop extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $generalID = $session->generalID;
+    $db = DB::db();
+
+    $troopID = $db->queryFirstField('SELECT troop FROM general WHERE no = %i', $generalID);
+    if($troopID == 0){
+      return '부대에 소속되어 있지 않습니다.';
+    }
+
+    if($generalID != $troopID){
+      $db->update('general', [
+        'troop' => 0,
+      ], '`no` = %i', $generalID);
+      return null;
+    }
+
+    //부대장이다.
+    $db->update('general', [
+      'troop' => 0,
+    ], '`troop` = %i', $troopID);
+    $db->delete('troop', 'troop_leader = %i', $troopID);
+
+    return null;
+  }
+}
@@ -0,0 +1,59 @@
+<?php
+
+namespace sammo\API\Troop;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\StringUtil;
+use sammo\Validator;
+
+class JoinTroop extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'troopID',
+    ])
+      ->rule('integer', 'troopID');
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $userID = $session->userID;
+    $troopID = $this->args['troopID'];
+
+    $db = DB::db();
+    $me = $db->queryFirstRow('SELECT `no`,nation,`troop`,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
+    if ($me['troop'] != 0) {
+      return '이미 부대에 소속되어 있습니다.';
+    }
+    $nationID = $me['nation'];
+    if ($nationID == 0) {
+      return '국가에 소속되어 있지 않습니다.';
+    }
+
+    $troopExists = $db->queryFirstField('SELECT `troop_leader` FROM `troop` WHERE `troop_leader` = %i AND `nation` = %i', $troopID, $nationID);
+    if (!$troopExists) {
+      return '부대가 올바르지 않습니다.';
+    }
+    $generalID = $me['no'];
+
+    $db->update('general', [
+      'troop' => $troopID,
+    ], '`no` = %i AND `troop` = %i', $generalID, 0);
+
+    return null;
+  }
+}
@@ -0,0 +1,57 @@
+<?php
+
+namespace sammo\API\Troop;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\Validator;
+
+class KickFromTroop extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'troopID',
+      'generalID',
+    ])
+      ->rule('integer', 'troopID')
+      ->rule('integer', 'generalID');
+
+      if (!$v->validate()) {
+        return $v->errorStr();
+      }
+      return null;
+    }
+
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $generalID = $this->args['generalID'];
+    $db = DB::db();
+
+    $troopID = $db->queryFirstField('SELECT troop FROM general WHERE no = %i', $generalID);
+    if($troopID == 0){
+      return '부대에 소속되어 있지 않습니다.';
+    }
+
+    if($troopID != $this->args['troopID']){
+      return '다른 부대에 소속되어 있습니다.';
+    }
+
+    if($troopID == $generalID){
+      return '부대장을 추방할 수 없습니다.';
+    }
+
+    $db->update('general', [
+      'troop' => 0,
+    ], '`no` = %i AND `troop` = %i', $generalID, $troopID);
+    return null;
+  }
+}
@@ -0,0 +1,68 @@
+<?php
+
+namespace sammo\API\Troop;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\StringUtil;
+use sammo\Validator;
+
+class NewTroop extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'troopName',
+    ])
+      ->rule('stringWidthBetween', 'troopName', 1, 18);
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $userID = $session->userID;
+    $troopName = StringUtil::neutralize($this->args['troopName']);
+    if(!$troopName){
+      return '부대 이름이 없습니다.';
+    }
+
+    $db = DB::db();
+    $me = $db->queryFirstRow('SELECT `no`,nation,`troop`,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
+    if($me['troop'] != 0){
+      return '이미 부대에 소속되어 있습니다.';
+    }
+    $nationID = $me['nation'];
+    if($nationID == 0){
+      return '국가에 소속되어 있지 않습니다.';
+    }
+
+    $generalID = $me['no'];
+
+    $db->insert('troop', [
+      'name'=>$troopName,
+      'troop_leader'=>$generalID,
+      'nation'=>$nationID,
+    ]);
+
+    if($db->affectedRows() == 0){
+      return '부대가 생성되지 않았습니다. 버그일 수 있습니다.';
+    }
+
+    $db->update('general', [
+      'troop'=>$generalID
+    ], '`no` = %i', $generalID);
+
+    return null;
+  }
+}
@@ -0,0 +1,65 @@
+<?php
+
+namespace sammo\API\Troop;
+
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\StringUtil;
+use sammo\Validator;
+
+use function sammo\checkSecretPermission;
+
+class SetTroopName extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    $v = new Validator($this->args);
+    $v->rule('required', [
+      'troopID',
+      'troopName',
+    ])
+      ->rule('stringWidthBetween', 'troopName', 1, 18)
+      ->rule('integer', 'troopID');
+
+    if (!$v->validate()) {
+      return $v->errorStr();
+    }
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+  }
+
+  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag)
+  {
+    $userID = $session->userID;
+    $db = DB::db();
+    $me = $db->queryFirstRow('SELECT `no`,nation,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
+    $permission = checkSecretPermission($me, false);
+    $troopID = $this->args['troopID'];
+
+    $generalID = $me['no'];
+    if($generalID != $troopID && $permission < 4){
+      return "권한이 부족합니다.";
+    }
+
+    $troopName = StringUtil::neutralize($this->args['troopName']);
+    if(!$troopName){
+      return '부대 이름이 없습니다.';
+    }
+
+    $nationID = $me['nation'];
+    $db->update('troop', [
+      'name'=>$troopName
+    ], 'troop_leader=%i AND `nation`=%i',$troopID, $nationID);
+
+    if($db->affectedRows() == 0){
+      return '부대가 없습니다.';
+    }
+
+    return null;
+  }
+}
@@ -5,8 +5,8 @@ use \sammo\General;

 class che_계략_향낭 extends \sammo\BaseItem{

-    protected $rawName = '항냥';
-    protected $name = '항냥(계략)';
+    protected $rawName = '향낭';
+    protected $name = '향낭(계략)';
    protected $info = '[계략] 화계·탈취·파괴·선동 : 성공률 +50%p';
    protected $cost = 3000;
    protected $consumable = true;
@@ -12,7 +12,7 @@ class che_내정_납금박산로 extends \sammo\BaseItem{
    protected $cost = 200;
    protected $consumable = false;

-    public function onCalcStrategic(string $turnType, string $varType, $value){
+    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null): float{
        if(in_array($turnType, ['상업', '농업', '기술', '성벽', '수비', '치안', '민심', '인구'])){
            if($varType == 'success') return $value + 0.15;
        }
@@ -10,7 +10,7 @@ class che_명마_12_옥란백용구 extends \sammo\BaseStatItem{
    public function __construct()
    {
        parent::__construct();
-        $this->info .= "<br>[전투] 남은 병력이 적을수록 회피 확률 증가. 최대 +30%p";
+        $this->info .= "<br>[전투] 남은 병력이 적을수록 회피 확률 증가. 최대 +50%p";
    }

    public function onCalcStat(General $general, string $statName, $value, $aux = null)
@@ -20,7 +20,7 @@ class che_명마_12_옥란백용구 extends \sammo\BaseStatItem{
            $leadership = $general->getLeadership(true, true, true, false);
            $crewL = $general->getVar('crew') / 100;

-            return $value + \sammo\Util::valueFit((1 - $crewL / $leadership) * 0.3, 0, 0.3);
+            return $value + \sammo\Util::valueFit((1 - $crewL / $leadership) * 0.5, 0, 0.5);
        }
        return $value;
    }
@@ -12,7 +12,7 @@ class che_조달_주판 extends \sammo\BaseItem{
    protected $cost = 200;
    protected $consumable = false;

-    public function onCalcStrategic(string $turnType, string $varType, $value){
+    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null): float{
        if($turnType === '조달'){
            if($varType == 'success') return $value + 0.2;
            if($varType == 'score') return $value * 2;
@@ -9,7 +9,7 @@ class che_징병_낙주 extends \sammo\BaseItem{

    protected $rawName = '낙주';
    protected $name = '낙주(징병)';
-    protected $info = '[군사] 징·모병비 -30%, 통솔 순수 능력치 보정 +15%';
+    protected $info = '[군사] 징·모병비 -30%<br>[기타] 통솔 순수 능력치 보정 +15%, 징병/모병/소집해제 시 인구 변동 없음';
    protected $cost = 200;
    protected $consumable = false;

@@ -18,6 +18,10 @@ class che_징병_낙주 extends \sammo\BaseItem{
            if($varType == 'cost') return $value * 0.7;
        }

+        if($turnType == '징집인구' && $varType == 'score'){
+            return 0;
+        }
+
        return $value;
    }

@@ -9,7 +9,7 @@ class event_전투특기_징병 extends \sammo\BaseItem{

    protected $rawName = '비급';
    protected $name = '비급(징병)';
-    protected $info = '[군사] 징·모병비 -50%, 통솔 순수 능력치 보정 +25%';
+    protected $info = '[군사] 징병/모병 시 훈사 70/84 제공<br>[기타] 통솔 순수 능력치 보정 +25%, 징병/모병/소집해제 시 인구 변동 없음';
    protected $cost = 100;
    protected $buyable = true;
    protected $consumable = false;
@@ -17,7 +17,18 @@ class event_전투특기_징병 extends \sammo\BaseItem{

    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
        if(in_array($turnType, ['징병', '모병'])){
-            if($varType == 'cost') return $value * 0.5;
+            if($varType == 'train' || $varType == 'atmos'){
+                if($turnType === '징병'){
+                    return 70;
+                }
+                else{
+                    return 84;
+                }
+            }
+        }
+
+        if($turnType == '징집인구' && $varType == 'score'){
+            return 0;
        }

        return $value;
@@ -11,7 +11,7 @@ class event_전투특기_필살 extends \sammo\BaseItem{

    protected $rawName = '비급';
    protected $name = '비급(필살)';
-    protected $info = '[전투] 필살 확률 +30%p, 필살 발동시 대상 회피 불가, 필살 계수 항상 최대';
+    protected $info = '[전투] 필살 확률 +30%p, 필살 발동시 대상 회피 불가, 필살 계수 향상';
    protected $cost = 100;
    protected $buyable = true;
    protected $consumable = false;
@@ -22,8 +22,8 @@ class event_전투특기_필살 extends \sammo\BaseItem{
            return $value + 0.3;
        }
        if($statName === 'criticalDamageRange'){
-            [, $rangeMax] = $value;
-            return [$rangeMax, $rangeMax];
+            [$rangeMin, $rangeMax] = $value;
+            return [($rangeMin + $rangeMax) / 2, $rangeMax];
        }

        return $value;
@@ -9,7 +9,7 @@ class che_event_징병 extends \sammo\BaseSpecial{

    protected $id = 72;
    protected $name = '징병';
-    protected $info = '[군사] 징·모병비 -50%, 통솔 순수 능력치 보정 +25%';
+    protected $info = '[군사] 징병/모병 시 훈사 70/84 제공<br>[기타] 통솔 순수 능력치 보정 +25%, 징병/모병/소집해제 시 인구 변동 없음';

    static $selectWeightType = SpecialityHelper::WEIGHT_NORM;
    static $selectWeight = 1;
@@ -21,9 +21,20 @@ class che_event_징병 extends \sammo\BaseSpecial{

    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
        if(in_array($turnType, ['징병', '모병'])){
-            if($varType == 'cost') return $value * 0.5;
+            if($varType == 'train' || $varType == 'atmos'){
+                if($turnType === '징병'){
+                    return 70;
+                }
+                else{
+                    return 84;
+                }
+            }
        }
-        
+
+        if($turnType == '징집인구' && $varType == 'score'){
+            return 0;
+        }
+
        return $value;
    }

@@ -11,7 +11,7 @@ class che_event_필살 extends \sammo\BaseSpecial{

    protected $id = 71;
    protected $name = '필살';
-    protected $info = '[전투] 필살 확률 +30%p, 필살 발동시 대상 회피 불가, 필살 계수 항상 최대';
+    protected $info = '[전투] 필살 확률 +30%p, 필살 발동시 대상 회피 불가, 필살 계수 향상';

    static $selectWeightType = SpecialityHelper::WEIGHT_NORM;
    static $selectWeight = 1;
@@ -26,10 +26,10 @@ class che_event_필살 extends \sammo\BaseSpecial{
            return $value + 0.30;
        }
        if($statName === 'criticalDamageRange'){
-            [, $rangeMax] = $value;
-            return [$rangeMax, $rangeMax];
+            [$rangeMin, $rangeMax] = $value;
+            return [($rangeMin + $rangeMax) / 2, $rangeMax];
        }
-        
+
        return $value;
    }

@@ -9,7 +9,7 @@ class che_징병 extends \sammo\BaseSpecial{

    protected $id = 72;
    protected $name = '징병';
-    protected $info = '[군사] 징·모병비 -50%, 통솔 순수 능력치 보정 +25%';
+    protected $info = '[군사] 징병/모병 시 훈사 70/84 제공<br>[기타] 통솔 순수 능력치 보정 +25%, 징병/모병/소집해제 시 인구 변동 없음';

    static $selectWeightType = SpecialityHelper::WEIGHT_NORM;
    static $selectWeight = 1;
@@ -21,9 +21,20 @@ class che_징병 extends \sammo\BaseSpecial{

    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
        if(in_array($turnType, ['징병', '모병'])){
-            if($varType == 'cost') return $value * 0.5;
+            if($varType == 'train' || $varType == 'atmos'){
+                if($turnType === '징병'){
+                    return 70;
+                }
+                else{
+                    return 84;
+                }
+            }
        }
-        
+
+        if($turnType == '징집인구' && $varType == 'score'){
+            return 0;
+        }
+
        return $value;
    }

@@ -14,7 +14,7 @@ class che_필살 extends \sammo\BaseSpecial{

    protected $id = 71;
    protected $name = '필살';
-    protected $info = '[전투] 필살 확률 +30%p, 필살 발동시 대상 회피 불가, 필살 계수 항상 최대';
+    protected $info = '[전투] 필살 확률 +30%p, 필살 발동시 대상 회피 불가, 필살 계수 향상';

    static $selectWeightType = SpecialityHelper::WEIGHT_NORM;
    static $selectWeight = 1;
@@ -29,8 +29,8 @@ class che_필살 extends \sammo\BaseSpecial{
            return $value + 0.30;
        }
        if($statName === 'criticalDamageRange'){
-            [, $rangeMax] = $value;
-            return [$rangeMax, $rangeMax];
+            [$rangeMin, $rangeMax] = $value;
+            return [($rangeMin + $rangeMax) / 2, $rangeMax];
        }

        return $value;
@@ -22,7 +22,7 @@ abstract class Auction

  public const COEFF_AUCTION_CLOSE_MINUTES = 24;
  public const COEFF_EXTENSION_MINUTES_PER_BID = (1 / 6);
-  public const COEFF_EXTENSION_MINUTES_LIMIT_BY_BID = 1;
+  public const COEFF_EXTENSION_MINUTES_LIMIT_BY_BID = 0.5;
  public const COEFF_EXTENSION_MINUTES_BY_EXTENSION_QUERY = 1;
  public const MIN_AUCTION_CLOSE_MINUTES = 30;
  public const MIN_EXTENSION_MINUTES_PER_BID = 1;
@@ -40,6 +40,7 @@ abstract class Auction
    if ($namePool === null) {
      $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
        UniqueConst::$hiddenSeed,
+        'obfuscatedNamePool',
      )));
      $namePool = [];
      foreach (GameConst::$randGenFirstName as $ch0) {
@@ -281,6 +282,9 @@ abstract class Auction
    $general = $this->general;

    $highestBid = $this->getHighestBid();
+    if ($highestBid !== null && $amount < $highestBid->amount * 1.01) {
+      return '현재입찰가보다 1% 높게 입찰해야 합니다.';
+    }
    if ($highestBid !== null && $amount < $highestBid->amount + 10) {
      return '현재입찰가보다 10 포인트 높게 입찰해야 합니다.';
    }
@@ -53,12 +53,19 @@ class AuctionUniqueItem extends Auction
    }

    $availableCnt = 0;
-    foreach(GameConst::$allItems as $itemType => $itemList){
-      $availableCnt += $itemList[$itemKey] ?? 0;
+    foreach (GameConst::$allItems as $itemType => $itemList) {
+      if (!key_exists($itemKey, $itemList)) {
+        continue;
+      }
+      $ownItem = $general->getItem($itemType);
+      if ($ownItem !== null && !$ownItem->isBuyable()) {
+        return '이미 가진 아이템이 있습니다.';
+      }
+      $availableCnt += $itemList[$itemKey];
      $availableCnt -= $db->queryFirstField('SELECT count(*) FROM `general` WHERE %b = %s', $itemType, $itemKey);
    }

-    if($availableCnt <= 0){
+    if ($availableCnt <= 0) {
      return '그 유니크를 더 얻을 수 없습니다.';
    }

@@ -129,7 +136,7 @@ class AuctionUniqueItem extends Auction
  public function bid(int $amount, bool $tryExtendCloseDate): ?string
  {

-    if($this->info->finished){
+    if ($this->info->finished) {
      return '경매가 종료되었습니다.';
    }

@@ -146,7 +153,7 @@ class AuctionUniqueItem extends Auction
    }

    $db = DB::db();
-    if($auctionIDList){
+    if ($auctionIDList) {
      $rawHighestBids = Util::convertArrayToDict($db->query(
        'SELECT bid.* FROM `ng_auction_bid` bid INNER JOIN (
          SELECT `auction_id`, MAX(`amount`) as `max_amount`
@@ -158,8 +165,7 @@ class AuctionUniqueItem extends Auction
        ON bid.`auction_id` = max_bid.`auction_id` AND bid.`amount` = max_bid.`max_amount`',
        $auctionIDList,
      ) ?? [], 'auction_id');
-    }
-    else{
+    } else {
      $rawHighestBids = [];
    }

@@ -177,7 +183,14 @@ class AuctionUniqueItem extends Auction

    $bidItemTypes = new Set();
    foreach (GameConst::$allItems as $itemType => $itemList) {
-      if (($itemList[$itemCode] ?? 0) <= 0) {
+      if (!key_exists($itemCode, $itemList)) {
+        continue;
+      }
+      $ownItem = $this->general->getItem($itemType);
+      if ($ownItem !== null && !$ownItem->isBuyable()) {
+        return '이미 가진 아이템이 있습니다.';
+      }
+      if ($itemList[$itemCode] <= 0) {
        continue;
      }
      $bidItemTypes->add($itemType);
@@ -212,6 +225,11 @@ class AuctionUniqueItem extends Auction
    return $this->_bid($amount, $tryExtendCloseDate);
  }

+  protected function setHostAsNeutral(){
+    $this->info->hostGeneralID = 0;
+    $this->info->detail->hostName = '(상인)';
+  }
+
  protected function finishAuction(AuctionBidItem $highestBid, General $bidder): ?string
  {
    $itemKey = $this->info->target;
@@ -250,6 +268,9 @@ class AuctionUniqueItem extends Auction
        max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_UNIQUE_CNT) * 60
      ));

+      if($bidder->getID() != $this->info->hostGeneralID){
+        $this->setHostAsNeutral();
+      }
      $this->extendCloseDate($extendedCloseDate, true);
      $this->extendLatestBidCloseDate(null);
      $this->applyDB();
@@ -295,8 +316,12 @@ class AuctionUniqueItem extends Auction
          max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID) * 60
        ));

+        if($bidder->getID() != $this->info->hostGeneralID){
+          $this->setHostAsNeutral();
+        }
        $this->extendCloseDate($extendedCloseDate, true);
        $this->extendLatestBidCloseDate(null);
+        $this->applyDB();
      }
      return join(' ', $reasons);
    }
@@ -146,6 +146,8 @@ class AutorunNationPolicy {
    public $safeRecruitCityPopulationRatio = 0.5;
    public $properWarTrainAtmos = 90;

+    public $cureThreshold = 10;
+
    ///이쪽의 값이 실제 초기화 값임
    public static $defaultPolicy = [
        'reqNationGold'=>10000,
@@ -173,6 +175,8 @@ class AutorunNationPolicy {
        'minNPCRecruitCityPopulation'=>50000,
        'safeRecruitCityPopulationRatio'=>0.5,
        'properWarTrainAtmos'=>90,
+
+        'cureThreshold'=>10,
    ];

    function __construct(General $general, $aiOptions, ?array $nationPolicy, ?array $serverPolicy, array $nation, array $env)
@@ -152,6 +152,8 @@ class che_강행 extends Command\GeneralCommand

        [$reqGold, $reqRice] = $this->getCost();
        $general->increaseVarWithLimit('gold', -$reqGold, 0);
+        $general->increaseVarWithLimit('train', -5, 20);
+        $general->increaseVarWithLimit('atmos', -5, 20);
        $general->addExperience($exp);
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
@@ -179,6 +179,15 @@ class che_등용수락 extends Command\GeneralCommand{
        $db->update('nation', $setScoutNationValues, 'nation=%i', $destNationID);

        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        if($general->getNPCType() < 2){
+            $general->setAuxVar(
+                InheritanceKey::max_belong->value,
+                max(
+                    $general->getVar('belong'),
+                    $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0
+                )
+            );
+        }
        $general->setVar('permission', 'normal');
        $general->setVar('belong', 1);
        $general->setVar('officer_level', 1);
@@ -62,8 +62,6 @@ class che_소집해제 extends Command\GeneralCommand{
        $general = $this->generalObj;
        $date = $general->getTurnTime($general::TURNTIME_HM);

-        $crew = $general->getVar('crew');
-
        $logger = $general->getLogger();

        $logger->pushGeneralActionLog("병사들을 <R>소집해제</>하였습니다. <1>$date</>");
@@ -71,8 +69,10 @@ class che_소집해제 extends Command\GeneralCommand{
        $exp = 70;
        $ded = 100;

+        $crewUp = $general->onCalcDomestic('징집인구', 'score', $general->getVar('crew'));
+
        $db->update('city', [
-            'pop'=>$db->sqleval('pop + %i', $crew)
+            'pop'=>$db->sqleval('pop + %i', $crewUp)
        ], 'city=%i', $general->getCityID());

        $general->setVar('crew', 0);
@@ -10,6 +10,7 @@ use \sammo\{
 use \sammo\Constraint\ConstraintHelper;

 use function sammo\tryUniqueItemLottery;
+use function sammo\CheckHall;

 class che_은퇴 extends Command\GeneralCommand{
    static protected $actionName = '은퇴';
@@ -59,12 +60,17 @@ class che_은퇴 extends Command\GeneralCommand{
        }

        $db = DB::db();
+        $env = $this->env;

        $general = $this->generalObj;
        $date = $general->getTurnTime($general::TURNTIME_HM);

        $logger = $general->getLogger();

+        if ($env['isunited'] == 0) {
+            CheckHall($general->getID());
+        }
+
        $general->rebirth();
        $logger->pushGeneralActionLog("은퇴하였습니다. <1>$date</>");

@@ -91,7 +91,7 @@ class che_집합 extends Command\GeneralCommand{
        }
        foreach($generalList as $targetGeneralID){
            $targetLogger = new ActionLogger($targetGeneralID, $general->getNationID(), $env['year'], $env['month']);
-            $targetLogger->pushGeneralActionLog("{$troopName}의 부대원들은 <G><b>{$cityName}</b></>{$josaRo} 집합되었습니다.", ActionLogger::PLAIN);
+            $targetLogger->pushGeneralActionLog("{$troopName} 부대원들은 <G><b>{$cityName}</b></>{$josaRo} 집합되었습니다.", ActionLogger::PLAIN);
            $targetLogger->flush();
        }

@@ -184,10 +184,13 @@ class che_징병 extends Command\GeneralCommand

        $logger = $general->getLogger();

+        $setTrain = $general->onCalcDomestic(static::$actionName, 'train', static::$defaultTrain);
+        $setAtmos = $general->onCalcDomestic(static::$actionName, 'atmos', static::$defaultAtmos);
+
        if ($reqCrewType->id == $currCrewType->id && $currCrew > 0) {
            $logger->pushGeneralActionLog("{$crewTypeName} <C>{$reqCrewText}</>명을 추가{$this->getName()}했습니다. <1>$date</>");
-            $train = ($currCrew * $general->getVar('train') + $reqCrew * static::$defaultTrain) / ($currCrew + $reqCrew);
-            $atmos = ($currCrew * $general->getVar('atmos') + $reqCrew * static::$defaultAtmos) / ($currCrew + $reqCrew);
+            $train = ($currCrew * $general->getVar('train') + $reqCrew * $setTrain) / ($currCrew + $reqCrew);
+            $atmos = ($currCrew * $general->getVar('atmos') + $reqCrew * $setAtmos) / ($currCrew + $reqCrew);

            $general->increaseVar('crew', $reqCrew);
            $general->setVar('train', $train);
@@ -196,15 +199,17 @@ class che_징병 extends Command\GeneralCommand
            $logger->pushGeneralActionLog("{$crewTypeName} <C>{$reqCrewText}</>명을 {$this->getName()}했습니다. <1>$date</>");
            $general->setVar('crewtype', $reqCrewType->id);
            $general->setVar('crew', $reqCrew);
-            $general->setVar('train', static::$defaultTrain);
-            $general->setVar('atmos', static::$defaultAtmos);
+            $general->setVar('train', $setTrain);
+            $general->setVar('atmos', $setAtmos);
        }

-        $newTrust = Util::valueFit($this->city['trust'] - ($reqCrew / $this->city['pop']) / static::$costOffset * 100, 0);
+        $reqCrewDown = $general->onCalcDomestic('징집인구', 'score', $reqCrew);
+
+        $newTrust = Util::valueFit($this->city['trust'] - ($reqCrewDown / $this->city['pop']) / static::$costOffset * 100, 0);

        $db->update('city', [
            'trust' => $newTrust,
-            'pop' => $this->city['pop'] - $reqCrew
+            'pop' => $this->city['pop'] - $reqCrewDown
        ], 'city=%i', $general->getCityID());

        $exp = Util::round($reqCrew / 100);
@@ -113,6 +113,15 @@ class che_하야 extends Command\GeneralCommand{
        $general->setVar('troop', 0);

        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
+        if($general->getNPCType() < 2){
+            $general->setAuxVar(
+                InheritanceKey::max_belong->value,
+                max(
+                    $general->getVar('belong'),
+                    $general->getAuxVar(InheritanceKey::max_belong->value) ?? 0
+                )
+            );
+        }

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
@@ -65,8 +65,17 @@ class che_해산 extends Command\GeneralCommand{
        $env = $this->env;

        $general = $this->generalObj;
+        $logger = $general->getLogger();
        $date = $general->getTurnTime($general::TURNTIME_HM);

+        $initYearMonth = Util::joinYearMonth($env['init_year'], $env['init_month']);
+        $yearMonth = Util::joinYearMonth($env['year'], $env['month']);
+        if($yearMonth <= $initYearMonth){
+            $logger->pushGeneralActionLog("다음 턴부터 해산할 수 있습니다. <1>$date</>");
+            $this->alternative = new che_인재탐색($general, $this->env, null);
+            return false;
+        }
+
        $generalName = $general->getName();
        $josaYi = JosaUtil::pick($generalName, '이');

@@ -87,7 +96,7 @@ class che_해산 extends Command\GeneralCommand{

        refreshNationStaticInfo();

-        $logger = $general->getLogger();
+
        $logger->pushGeneralActionLog("세력을 해산했습니다. <1>$date</>");
        $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} 세력을 해산했습니다.");
        $logger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>{$josaUl} 해산");
@@ -94,6 +94,7 @@ class che_화계 extends Command\GeneralCommand

        $prob = $maxGenScore / GameConst::$sabotageProbCoefByStat;
        $prob += $probCorrection;
+        $prob += (sqrt(count($destCityGeneralList)) - 1) * GameConst::$sabotageDefenceCoefByGeneralCnt;

        $prob += $destCity['secu'] / $destCity['secu_max'] / 5; //최대 20%p
        $prob += $destCity['supply'] ? 0.1 : 0;
@@ -111,6 +111,7 @@ class che_물자원조 extends Command\NationCommand
            ConstraintHelper::OccupiedCity(),
            ConstraintHelper::BeChief(),
            ConstraintHelper::SuppliedCity(),
+            ConstraintHelper::DifferentDestNation(),
            ConstraintHelper::ReqNationGold(GameConst::$basegold + (($goldAmount > 0) ? 1 : 0)),
            ConstraintHelper::ReqNationRice(GameConst::$baserice + (($riceAmount > 0) ? 1 : 0)),
            ConstraintHelper::ReqNationValue('surlimit', '외교제한', '==', 0, '외교제한중입니다.'),
@@ -112,7 +112,7 @@ class che_불가침수락 extends Command\NationCommand
        $month = $this->arg['month'];

        $currentMonth = $env['year'] * 12 + $env['month'] - 1;
-        $reqMonth = $year * 12 + $month - 1;
+        $reqMonth = $year * 12 + $month;

        $nationID = $this->nation['nation'];

@@ -199,7 +199,7 @@ class che_불가침수락 extends Command\NationCommand
        $destLogger = $this->destGeneralObj->getLogger();

        $currentMonth = $env['year'] * 12 + $env['month'] - 1;
-        $reqMonth = $year * 12 + $month - 1;
+        $reqMonth = $year * 12 + $month;

        $db->update(
            'diplomacy',
@@ -165,7 +165,7 @@ class che_불가침파기수락 extends Command\NationCommand
        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>{$josaWa}의 불가침 파기 수락");

        $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYiGeneral} <D><b>{$destNationName}</b></>{$josaWa}의 불가침 조약을 <M>파기</> 하였습니다.");
-        $logger->pushGlobalHistoryLog("<Y><b>【종전】</b></><D><b>{$nationName}</b></>{$josaYiNation} <D><b>{$destNationName}</b></>{$josaWa}의 불가침 조약을 <M>파기</> 하였습니다.");
+        $logger->pushGlobalHistoryLog("<Y><b>【파기】</b></><D><b>{$nationName}</b></>{$josaYiNation} <D><b>{$destNationName}</b></>{$josaWa}의 불가침 조약을 <M>파기</> 하였습니다.");


        $josaWa = JosaUtil::pick($nationName, '와');
@@ -131,7 +131,7 @@ class che_의병모집 extends Command\NationCommand
        $gameStor = KVStorage::getStorage($db, 'game_env'); //TODO: 차라리 env가 이거여야..?

        $avgGenCnt = $db->queryFirstField('SELECT avg(gennum) FROM nation WHERE level > 0');
-        $createGenCnt = 5 + Util::round($avgGenCnt / 10);
+        $createGenCnt = 3 + Util::round($avgGenCnt / 8);
        $createGenIdx = $gameStor->npccount + 1;
        $lastCreatGenIdx = $createGenIdx + $createGenCnt;

@@ -156,6 +156,7 @@ class che_의병모집 extends Command\NationCommand
            $newNPC->setNPCType(4);
            $newNPC->setMoney(1000, 1000);
            $newNPC->setSpecYear(19, 19);
+            $newNPC->setExpDed($avgGen['exp'], $avgGen['ded']);
            $newNPC->fillRemainSpecAsRandom($pickTypeList, $avgGen, $env);

            $newNPC->build($this->env);
@@ -75,7 +75,7 @@ class che_피장파장 extends Command\NationCommand
        $env = $this->env;

        $this->setCity();
-        $this->setNation();
+        $this->setNation(['strategic_cmd_limit']);

        $this->minConditionConstraints = [
            ConstraintHelper::OccupiedCity(),
@@ -113,6 +113,7 @@ class che_피장파장 extends Command\NationCommand
                [0, 1],
                '선포, 전쟁중인 상대국에게만 가능합니다.'
            ),
+            ConstraintHelper::AvailableStrategicCommand(),
        ];
    }

@@ -120,8 +121,9 @@ class che_피장파장 extends Command\NationCommand
    {
        $name = $this->getName();
        $reqTurn = $this->getPreReqTurn() + 1;
+        $postReqTurn = $this->getPostReqTurn();

-        return "{$name}/{$reqTurn}턴(대상 재사용 대기 {$this->getTargetPostReqTurn()})";
+        return "{$name}/{$reqTurn}턴(재사용 대기 $postReqTurn, 대상 재사용 대기 {$this->getTargetPostReqTurn()})";
    }

    public function getCost(): array
@@ -136,7 +138,7 @@ class che_피장파장 extends Command\NationCommand

    public function getPostReqTurn(): int
    {
-        return 0;
+        return 8;
    }

    public function getTargetPostReqTurn(): int
@@ -2,13 +2,13 @@

 namespace sammo\DTO;

-use sammo\DTO\Attr\Convert;
-use sammo\DTO\Attr\JsonString;
-use sammo\DTO\Attr\NullIsUndefined;
-use sammo\DTO\Attr\RawName;
-use sammo\DTO\Converter\DateTimeConverter;
+use LDTO\Attr\Convert;
+use LDTO\Attr\JsonString;
+use LDTO\Attr\NullIsUndefined;
+use LDTO\Attr\RawName;
+use LDTO\Converter\DateTimeConverter;

-class AuctionBidItem extends DTO
+class AuctionBidItem extends \LDTO\DTO
 {
  public function __construct(
    #[NullIsUndefined]
@@ -2,9 +2,9 @@

 namespace sammo\DTO;

-use sammo\DTO\Attr\NullIsUndefined;
+use LDTO\Attr\NullIsUndefined;

-class AuctionBidItemData extends DTO
+class AuctionBidItemData extends \LDTO\DTO
 {
  public function __construct(
    #[NullIsUndefined]
@@ -2,15 +2,15 @@

 namespace sammo\DTO;

-use sammo\DTO\Attr\Convert;
-use sammo\DTO\Attr\JsonString;
-use sammo\DTO\Attr\NullIsUndefined;
-use sammo\DTO\Attr\RawName;
-use sammo\DTO\Converter\DateTimeConverter;
+use LDTO\Attr\Convert;
+use LDTO\Attr\JsonString;
+use LDTO\Attr\NullIsUndefined;
+use LDTO\Attr\RawName;
+use LDTO\Converter\DateTimeConverter;
 use sammo\Enums\AuctionType;
 use sammo\Enums\ResourceType;

-class AuctionInfo extends DTO
+class AuctionInfo extends \LDTO\DTO
 {
 	public function __construct(
 		#[NullIsUndefined]
@@ -2,11 +2,11 @@

 namespace sammo\DTO;

-use sammo\DTO\Attr\Convert;
-use sammo\DTO\Attr\NullIsUndefined;
-use sammo\DTO\Converter\DateTimeConverter;
+use LDTO\Attr\Convert;
+use LDTO\Attr\NullIsUndefined;
+use LDTO\Converter\DateTimeConverter;

-class AuctionInfoDetail extends DTO
+class AuctionInfoDetail extends \LDTO\DTO
 {
 	public function __construct(
 		public string $title,
@@ -2,13 +2,13 @@

 namespace sammo\DTO;

-use sammo\DTO\Attr\Convert;
-use sammo\DTO\Converter\MapConverter;
+use LDTO\Attr\Convert;
+use LDTO\Converter\MapConverter;
 use sammo\DTO\SelectItem;

 //https://json2dto.atymic.dev/

-class BettingInfo extends DTO
+class BettingInfo extends \LDTO\DTO
 {
  public function __construct(
    public int $id,
@@ -2,10 +2,10 @@

 namespace sammo\DTO;

-use sammo\DTO\Attr\NullIsUndefined;
-use sammo\DTO\Attr\RawName;
+use LDTO\Attr\NullIsUndefined;
+use LDTO\Attr\RawName;

-class BettingItem extends DTO
+class BettingItem extends \LDTO\DTO
 {
 	public function __construct(
 		#[RawName('id')]
@@ -2,10 +2,10 @@

 namespace sammo\DTO;

-use sammo\DTO\Attr\Convert;
-use sammo\DTO\Converter\MapConverter;
+use LDTO\Attr\Convert;
+use LDTO\Converter\MapConverter;

-class SelectItem extends DTO
+class SelectItem extends \LDTO\DTO
 {
 	public function __construct(
 		public string $title,
@@ -2,10 +2,10 @@

 namespace sammo\DTO;

-use sammo\DTO\Attr\NullIsUndefined;
-use sammo\DTO\Attr\RawName;
+use LDTO\Attr\NullIsUndefined;
+use LDTO\Attr\RawName;

-class VoteComment extends DTO
+class VoteComment extends \LDTO\DTO
 {
  public function __construct(
    #[NullIsUndefined]
@@ -2,7 +2,7 @@

 namespace sammo\DTO;

-class VoteInfo extends DTO
+class VoteInfo extends \LDTO\DTO
 {
  public function __construct(
    public int $id,
@@ -0,0 +1,14 @@
+<?php
+namespace sammo\Enums;
+
+/**
+ * API 호출 결과가 false이면서, 대상 API가 처리할 수 없는 추가 동작이 있는 경우 사용.
+ * 예시: 턴을 예약해야 하지만, 장수가 사망하여 게이트웨이로 이동해야함.
+ */
+enum APIRecoveryType: string{
+  case Login = 'login';//로그인 재시도부터 시작한다
+  case TwoFactorAuth = '2fa';//로그인은 가능하지만 인증코드 입력이 필요하다
+  case Gateway = 'gateway';//로그인 완료. 게임 서버 리스트를 띄워야한다
+  case GameLogin = 'game_login';//서버 업데이트 등으로 다시 게임 정보 수신 필요
+  case GameQuota = 'game_quota';//접속 제한
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hide_D	142b96836e	refac: 신규/복귀 유저 유산 포인트 지급 로직을 조금더 최적화	2022-10-05 00:26:04 +09:00
Hide_D	9be0d2ec2d	refac: storeOldGeneral을 General::kill로 이동	2022-10-04 20:38:18 +09:00
Hide_D	fd817650e7	fix: 지급 버그 수정	2022-10-04 11:32:52 +09:00
Hide_D	3c6cb96a9b	feat: 신규/복귀 유저에게 장수 생성 시 유산 포인트 제공 - 이벤트 깃수 제외 500포인트 - 8기까지 적립	2022-10-04 11:25:40 +09:00
Hide_D	c4537454f9	fix: 최대 임관년도 수 계산 버그 재 수정	2022-10-04 10:02:39 +09:00
Hide_D	82cdaa433e	fix: 최대 임관년도 수 계산 버그	2022-10-04 01:07:11 +09:00
Hide_D	32dd3ff43f	misc: AI에서 삭턴NPC 구분 기준을 1턴 추가	2022-10-04 00:13:52 +09:00
Hide_D	6a5840faaa	fix: AI 후방 발령 누락분 수정	2022-10-03 23:38:53 +09:00
Hide_D	5b0a3b064d	fix: AI 후방 발령 로직 버그 수정 - 징병시 인구 소모가 없는 경우 후방 발령 제외 - NPC 수뇌일때와 유저 수뇌일 때 도시 인구 계산식 다른 버그 수정	2022-10-03 23:37:07 +09:00
Hide_D	14b8bb9790	fix: 2번 연속 멸망 시 유산 포인트 계산 오류	2022-10-03 11:32:22 +09:00
Hide_D	650f4a5903	fix: 구조상 베팅 당첨 포인트는 은퇴시 반영되어야 함	2022-10-03 00:37:18 +09:00
Hide_D	c50410a6da	game: 은퇴시 토너먼트 보정치를 100%로 - 실수였음!	2022-10-02 23:27:41 +09:00
Hide_D	b2a676cd8b	game: 옥란백용구 향상 최대 30% -> 50%	2022-10-02 23:25:00 +09:00
Hide_D	50a75e4543	refac, game: 은퇴 시 포인트 반영 방식 변경 - 반영하지 않고 은퇴 이후로 넘기는 포인트 추가 - 은퇴시 계수를 Obj로 이동	2022-10-02 19:41:38 +09:00
Hide_D	22172ac66f	fix: null coalesing 수정	2022-10-02 19:39:35 +09:00
Hide_D	392aaa343d	fix: calcGenType을 updateInstance()로 이동	2022-10-02 19:36:17 +09:00
Hide_D	d924f47d58	fix: warning 발생 제거	2022-10-02 19:35:05 +09:00
Hide_D	3b70cbe724	fix: GeneralAI env 설정 관련 버그 수정	2022-10-02 17:46:20 +09:00
Hide_D	5c3233f883	misc: 서버 리셋 페이지에서 기본 설정값 변경 - 자율 행동 전부 선택 - 자율 행동 기본 시간 24시간 - 사실모드: 가상	2022-10-02 17:43:40 +09:00
Hide_D	b570bfa9d4	fix: NPC선전포고, 긴급포상에서 내부 NPC 국가 상태를 업데이트하도록 수정	2022-10-02 17:37:40 +09:00
Hide_D	270cb25285	refac: GeneralAI에서 상태를 추가 업데이트할 수 있도록 구조 변경	2022-10-02 17:33:23 +09:00
Hide_D	7d3b0db924	game: 계략 성공률을 5%p 하향 - 계략 성공률에 인구수를 반영하기 이전과 비교하여 1명있을 때에는 동일 - 한명도 없을때는 5%p 상승 - 두명 이상일 때에는 이전 대비 성공률 하향	2022-10-02 15:59:30 +09:00
Hide_D	74d310e113	fix: 불가침에서 '까지'는 해당 월을 포함하여야 함	2022-10-02 15:55:31 +09:00
Hide_D	45afb1c090	fix: 수동 은퇴 시 명예의전당에 등록되지 않는 버그	2022-09-27 10:00:44 +09:00
Hide_D	40fc2f8bbf	fix: NPC 순간이동이 보급이 끊긴 도시에도 갈 수 있는 버그 수정	2022-09-24 22:29:58 +09:00
Hide_D	a9de5a92e1	build: pre-commit에 lint 제거	2022-09-24 20:58:56 +09:00
Hide_D	c592b00c3f	game: 피장파장에 추가되었던 글로벌 전략 1턴 제거	2022-09-24 20:57:44 +09:00
Hide_D	2c81be4d12	game: 계략 방어 확률에 도시 거주 장수 수 반영 - sqrt(장수 수) * 5%p	2022-09-23 21:59:51 +09:00
Hide_D	f10289f7b6	game: 피장파장은 이제 전략 - 글로벌 쿨 1턴 - 피장파장 쿨 8턴	2022-09-23 21:56:15 +09:00
Hide_D	c1f06b4ce5	fix: 최대 임관 년도 수 제어 규약 우회	2022-09-22 11:54:47 +09:00
Hide_D	9ad3dbba90	game: 배신 관련 최종 수정, 20%부터, +10%p씩 - 공지 추가	2022-09-21 23:25:20 +09:00
Hide_D	12c62f87f7	game: 초기 배신 수치 추가 보정 - 배신 수치를 '2'로 변경. - 명성 패널티를 30%로 시작해서 45%, 60%	2022-09-21 23:16:29 +09:00
Hide_D	635f1ae077	feat, game: 초반 '배신 수치' 1 증가, 배신 패널티 증가 - 184년 1월부터 배신수치 1 증가. - 배신 패널티 당 15%, 최대 6회	2022-09-21 23:12:56 +09:00
Hide_D	c89bd2f63f	fix: 하야, 망명 시 최대 임관 년수가 반영되지 않는 버그 수정	2022-09-21 22:48:55 +09:00
Hide_D	2f94a8a2ca	fix: 가오픈 기간 중 사망 메시지에서 조사가 중복되어 나오던 문제 수정 (#226 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/226 Reviewed-by: Hide_D <hided62@gmail.com>	2022-09-14 12:07:08 +09:00
Jinhyun Kim	85b0d35af0	fix: 가오픈 기간 중 사망 메시지에서 조사가 중복되어 나오던 문제 수정	2022-09-14 11:42:19 +09:00
Hide_D	b25acacb1e	fix: 징병 특기에 '비용 감소' 제거 누락	2022-09-10 19:04:46 +09:00
Hide_D	c05a43f3b1	fix(oauth): 이메일 변경 시 oauthID를 받아오지 못하는 분기 수정	2022-09-09 03:28:18 +09:00
Hide_D	d99976daa9	fix(oauth): 카카오로그인에서 이메일만 바뀐 경우 이메일 갱신	2022-09-09 03:11:34 +09:00
Hide_D	62f53d09bf	feat, game: 징병 전특 리밸런싱, 징병/소집해제시 인구 변동 트리거 설정	2022-09-06 19:48:52 +09:00
Hide_D	88c78ec892	game, misc: 작위 상승 메시지 변경	2022-09-01 02:49:20 +09:00
Hide_D	006ca76922	refac: ExecuteEngine 반환 타입 변경	2022-08-30 22:51:14 +09:00
Hide_D	8cb2e2a447	fix: OAuth Redirect UTI가 사전 값과 다른 경우 domain 보정	2022-08-28 18:00:53 +09:00
Hide_D	517c85d003	misc: oauth.php 에러 상세 표기	2022-08-28 17:37:55 +09:00
Hide_D	83556b710c	fix, feat: HTTP_HOST가 다른 경우에도 oauth redirect 허용 - oauth 대상에서 redirect 허용 host를 설정해야함.	2022-08-28 17:24:25 +09:00
Hide_D	a43b9091f8	feat: WebUtil::replaceDomain	2022-08-28 17:21:37 +09:00
Hide_D	e83a1bef49	fix, misc: 사이시옷 수정	2022-08-28 15:45:44 +09:00
Hide_D	1147a8262c	fix: 아이템 이름 오기	2022-08-28 15:41:50 +09:00
Hide_D	8a987cc55e	fix: 조사 관련 문제 수정	2022-08-28 15:40:52 +09:00
Hide_D	b28ca864f9	dep: package update	2022-08-28 15:30:35 +09:00
Hide_D	4bf77a5c55	game: 궁병 공격 시도, 추가페이즈 선제 공격 - 수비 선제와 구조적으로 동일 - 첫번째 상대에게 선제 사격 - 궁병과 궁병의 대결인 경우 항상 맞 선제 사격	2022-08-28 14:35:14 +09:00
Hide_D	4ebc20f182	game: 전투 첫 페이즈 계략시도 보정은 무장 제외	2022-08-28 14:17:09 +09:00
Hide_D	9eff1ccaed	fix: 경매장 이름 풀 난수 생성기에 seed 초기화값 문제 수정	2022-08-27 12:15:12 +09:00
Hide_D	66170c98dd	game: 수비 끔 시 사기 감소량 -3 => -6	2022-08-27 03:00:16 +09:00
Hide_D	397c054c66	game: 유니크 경매 제한 시간 감소 - 1분턴 마감시간 기준 1시간 -> 30분	2022-08-27 02:57:01 +09:00
Hide_D	0611551dc0	game: 의병모집 생성량 변경 - 3 + 연감 기준 평균 장수수 / 8 (반올림) - 국가별 장수수가 평균 80명부터 역전	2022-08-27 02:46:44 +09:00
Hide_D	008f88d995	game: 전투시 얻는 기술량에서 공격자 상향 - 공격자 기술: 공격자가 입은 피해 * 0.012 (구 0.01) - 수비자 기술: 수비자가 입은 피해 * 0.009 (구 0.01)	2022-08-27 02:39:47 +09:00
Hide_D	7fe450bc07	Revert "revert: LazyVarUpdater에 \BackedEnum 롤백" This reverts commit `a88ec71b44`.	2022-08-26 22:16:06 +09:00
Hide_D	a88ec71b44	revert: LazyVarUpdater에 \BackedEnum 롤백	2022-08-26 17:30:24 +09:00
Hide_D	8a5a3b67f7	refac: utilGame/getNPCColor	2022-08-26 01:06:43 +09:00
Hide_D	63771da876	misc: utilGame/index.ts	2022-08-26 00:34:56 +09:00
Hide_D	68891fafdb	misc: CityColumn enum	2022-08-26 00:34:45 +09:00
Hide_D	df31300a0b	refac: GeneralBasicCard의 부대장 요구 정보를 간소화	2022-08-26 00:34:42 +09:00
Hide_D	16fb782bbf	refac: LazyVarUpdater의 key로 BackedEnum 허용	2022-08-26 00:34:39 +09:00
Hide_D	ed3e013a53	misc: GeneralColumn enum 추가	2022-08-26 00:34:32 +09:00
Hide_D	0bf568a655	feat: 국방 설정 시, 작성자와 작성 일시를 기록	2022-08-26 00:34:15 +09:00
Hide_D	a5e481af96	fix: utilGame format에서 한단계 다르게 차이나는 버그 수정	2022-08-21 18:53:55 +09:00
Hide_D	78a9641c14	dep: lodash -> lodash-es	2022-08-21 18:14:36 +09:00
Hide_D	b517000650	game: 성벽 공격 시 소모 쌀 20% 감소	2022-08-21 17:52:25 +09:00
Hide_D	1d20eb3c3e	game: 초반 M장 생성 시 무지장 대량 생성	2022-08-21 17:42:33 +09:00
Hide_D	8248ccbcd5	game: 시간이 지남에 따라 성벽 강화 - 183년 기준 동일. - 220년 기준 40% 전투력 상승	2022-08-20 15:03:58 +09:00
Hide_D	b880b9bace	game: NPC가 조금 더 상위병종을 시도할 확률을 높임	2022-08-20 14:39:51 +09:00
Hide_D	2da374410b	game: 필살 계수 향상 방식 너프	2022-08-20 14:29:54 +09:00
Hide_D	fff8f9493b	game: 유니크 아이템 경매 시 현재가보다 1% 더 높아야 함	2022-08-20 14:15:49 +09:00
Hide_D	987baaa307	misc: 아시아 명장전 장수 구성 수정	2022-08-19 21:11:02 +09:00
Hide_D	9512ea9b52	feat: APICoveryType에 맞게 InvalidResponse 확장	2022-08-18 01:08:38 +09:00
Hide_D	b0f3c1c97d	feat: APIRecoveryType Enum 생성	2022-08-18 01:08:35 +09:00
Hide_D	e823b97cf2	fix: 세션 관리 api 에러	2022-08-18 01:08:28 +09:00
Hide_D	203859ee5f	dep: denque 추가	2022-08-16 23:58:21 +09:00
Hide_D	4870e2fa30	feat: GetRecentRecord 추가 - 메인페이지 최신 로그	2022-08-16 23:57:47 +09:00
Hide_D	970b702a2b	fix: 빙의장은 제대로 유산을 받지 못하는 버그 수정	2022-08-13 03:18:31 +09:00
Hide_D	053288b227	fix: applyDB시 rankVarRead 처리 오류 (=은퇴 버그 수정) - 은퇴는 applyDB 이후에 실행됨 - applyDB 코드 오류로 이후 key값 문제로 은퇴가 실행되지 않음	2022-08-13 03:12:09 +09:00
Hide_D	e9b975bea7	fix: 의병모집에서 명성, 계급이 설정되지 않는 버그 수정	2022-08-12 02:25:12 +09:00
Hide_D	89fda44db8	game: 목우 상향, 무상성화	2022-08-10 23:53:19 +09:00
Hide_D	fac8536095	fix: 도시 비중 계산식에서 '종사' 누락	2022-08-09 02:04:39 +09:00
Hide_D	c79e65b6b7	misc: 아시아 명장전 유저장 스탯 수정	2022-08-08 21:38:02 +09:00
Hide_D	677e65ff6d	dep: npm package update	2022-08-06 20:26:35 +09:00
Hide_D	0c7589d524	fix,misc: phan 검사 수준 복구	2022-08-05 23:45:31 +09:00
Hide_D	da27ae2bad	dep,refac: DTO를 composer 외부로 이동	2022-08-05 23:43:38 +09:00
Hide_D	f8cd58bcb3	refac: conv_general_stat을 xlrd대신 opnepyxl로 변경 - 국가명 - 수뇌는 아직 테스트 안 해 보았음...	2022-08-03 00:53:41 +09:00
sarsandHide_D	3671a289b8	아시아 명장전 시나리오(비급) 추가 (#225 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/225 Reviewed-by: Hide_D <hided62@gmail.com> Co-authored-by: sars <sarsntony@gmail.com> Co-committed-by: sars <sarsntony@gmail.com>	2022-08-02 16:47:41 +09:00
Hide_D	48f4dbec50	misc: 부대편성 1000px 버튼의 위치를 명확히	2022-07-31 22:34:33 +09:00
Hide_D	bdb29006e9	refac: 부대편성에서 1000px 모드 버튼을 좌하단으로	2022-07-31 22:20:29 +09:00
Hide_D	5ea324f103	fix: v-b-tooltip에서 undefined -> string type 초기화 생략	2022-07-31 20:34:18 +09:00
Hide_D	2f0cd32c18	fix: 부대 편성에서 부대장 집합 순서로 정렬 필요	2022-07-31 19:50:52 +09:00
Hide_D	e8911d40df	fix: 부대 편성에서 부대장과 다른 도시 표기가 안됨	2022-07-31 12:08:40 +09:00
Hide_D	89f173e7e3	fix: 베팅 최소 한도가 10이 아니라 1로 된 버그 수정	2022-07-30 21:13:00 +09:00
Hide_D	b0ab3f6ace	fix: css 누락, 로딩 누락	2022-07-30 20:48:31 +09:00
Hide_D	641af435d4	fix: 리셋 페이지 css	2022-07-30 20:45:27 +09:00
Hide_D	16a2f20af0	fix: 장수 카드에서 '남은 시간'이 제대로 표기 안됨	2022-07-30 20:16:08 +09:00
Hide_D	79734a6dcf	fix: 부대명 변경이 아무에게나 보임	2022-07-30 19:44:30 +09:00
Hide_D	2e2ff1b150	feat: 감찰부에서 '이전', '다음' 버튼	2022-07-30 19:34:34 +09:00
Hide_D	5ce899ee6e	fix: 장수 카드에 부상스탯 미반영	2022-07-30 14:25:23 +09:00
Hide_D	e041080773	fix: 유산 포인트가 0이어도 동작	2022-07-30 12:15:07 +09:00
Hide_D	f8448fbb51	fix: 자동 해산에 필요한 변수를 제공하지 않음	2022-07-30 10:34:40 +09:00
Hide_D	8defcd29a4	fix: 인자 오류 수정	2022-07-30 10:31:31 +09:00
Hide_D	fba60df9d1	fix: binarysearch 상한 에러	2022-07-29 01:24:09 +09:00
Hide_D	a4ff1f44ba	build: source-map 활성화(디버그용)	2022-07-29 01:13:51 +09:00
Hide_D	7b75f4e01b	misc: GeneralLiteCard grid 조정	2022-07-27 23:02:35 +09:00
Hide_D	a9fc69e70f	game: 벽력거 비용 약 상승, 목우 비용 하향	2022-07-27 22:52:02 +09:00
Hide_D	a06c574327	fix: non vue page css 누락	2022-07-27 22:37:27 +09:00
Hide_D	420ae2f45b	fix: 동일 부위 제한일 때, 무한히 알림오는 버그 - 의도대로라면 1턴마다 한번씩이어야함	2022-07-27 22:33:12 +09:00
Hide_D	850073a096	game: 유니크 낙찰 시 연장될 때 '상인' 전환 - 개최자와 낙찰자가 다를때에만	2022-07-27 22:30:22 +09:00
Hide_D	e40aa88253	misc: 유니크 경매장에서 아이템 효과 툴팁	2022-07-27 22:21:25 +09:00
Hide_D	ff92b0149a	game: 벽력거 방어력 약 하향	2022-07-27 22:08:12 +09:00
Hide_D	e6049a17a2	fix: 강행이 훈련,사기가 떨어지지 않는 문제	2022-07-27 21:59:29 +09:00
Hide_D	9bc1bc13f2	fix: 누락된 토너먼트 css	2022-07-27 21:57:58 +09:00
Hide_D	b9cda08a4e	fix: 천하통일 후에는 유산 포인트 사용 방지	2022-07-27 21:54:49 +09:00
Hide_D	4e2193fe6f	fix: 불가침 파기시 header 수정	2022-07-27 21:49:45 +09:00
Hide_D	155af45378	refac: bootstrap.scss 분리 후 별도 빌드	2022-07-27 21:44:24 +09:00
Hide_D	66d6bbc772	feat: 경량 base.scss	2022-07-27 20:53:44 +09:00
Hide_D	066a6d4e6a	build: bootstrap.scss 분리	2022-07-27 20:48:43 +09:00
Hide_D	94f5834b61	fix: 시나리오 생성시 성격에 class prefix 없음	2022-07-27 19:44:05 +09:00
Hide_D	947286bd09	game: npc 징병 쌀 기준 낮춤	2022-07-27 18:48:37 +09:00
Hide_D	a0dee353b5	feat: 새 부대편성 페이지 (#223 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/223	2022-07-27 18:01:41 +09:00
Hide_D	308b1f2348	fix: 감찰부 장수 변경시 tooltip 빈칸 버그	2022-07-26 23:56:50 +09:00
Hide_D	897780cf1c	dep: package update	2022-07-26 23:32:43 +09:00
Hide_D	0f8a8011be	fix: 중복되는 WarUnitTrigger의 priority 정정	2022-07-25 00:29:20 +09:00
Hide_D	7ebfd960b1	fix: 도시 관직 수치 조회 권한이 잘못됨	2022-07-24 17:23:20 +09:00
Hide_D	7b3d64996d	fix: 감찰부 도시 관직명 누락	2022-07-24 17:15:06 +09:00
Hide_D	e578a2f310	fix: 아이템 경매 버그 수정	2022-07-19 21:24:55 +09:00
Hide_D	eecb4f699b	game: 이미 같은 부위에 다른 유니크가 있는 경우, 경매 진행 방지	2022-07-17 22:34:05 +09:00
Hide_D	9f4f7a759e	fix: 원조를 같은 국가로 지정할 수 있는 버그 수정	2022-07-17 16:40:40 +09:00
Hide_D	11a98eb184	fix: 장수 카드 부대 집합지가 항상 주황색	2022-07-17 16:40:35 +09:00
Hide_D	ed0bc5e19f	fix,refac: Nation/GetGeneralList에서 부대정보는 공개되어야 함	2022-07-17 01:37:07 +09:00
Hide_D	020a2d2668	fix: 감찰부 표기(*), 이름순 정렬	2022-07-16 16:39:12 +09:00
Hide_D	27cdd3ee4b	misc: 구 감찰부 제거	2022-07-16 15:56:39 +09:00
Hide_D	43a95979e1	refac: 감찰부 vue3 재 작성 (#222 ) - 장수 정보, 추가 정보 vue3 component - b_battleCenter -> v_battleCenter Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/222	2022-07-16 15:49:23 +09:00
Hide_D	800106f9cb	fix: 등용 버그 수정 시도	2022-07-14 11:40:30 +09:00
Hide_D	e5c50e48d3	refac: defineComponent => vue3 setup	2022-07-13 22:37:37 +09:00
Hide_D	08e43bed71	fix: 서버 오픈 첫 턴에는 해산 불가	2022-07-13 22:07:25 +09:00
Hide_D	6773b8cddb	fix: dependency 변경에 따른 오류 수정	2022-07-13 01:17:46 +09:00
Hide_D	23c030fd00	dep: package update	2022-07-12 21:47:01 +09:00
Hide_D	d5e67bb16d	refac: defineComponent => vue3 setup	2022-07-12 01:48:59 +09:00
Hide_D	188e3a0fa6	refac: defindComponent => vue3 setup	2022-07-12 01:26:33 +09:00
Hide_D	b31ee022af	refac: defineComponent => vue3 setup	2022-07-12 00:28:08 +09:00
Hide_D	87e063e03e	fix,refac: 회의실에서 줄 바꿈이 표기 안되는 버그 수정	2022-07-12 00:09:58 +09:00
Hide_D	48fe26e4b1	refac: 숫자 입력기 재작성 - 입력마다 min, max clamp 작업 취소	2022-07-11 21:55:26 +09:00
Hide_D	88fcc64537	game: NPC 요양 기준 설정 가능	2022-07-11 20:23:55 +09:00
Hide_D	d9beabbbbc	feat: 발령시 장수 목록에 부대장 추가 표기	2022-07-10 21:58:30 +09:00
Hide_D	3da0a7d950	feat: 부대장인 경우 부대이름으로 검색 가능	2022-07-10 21:52:54 +09:00
Hide_D	50b1db75f0	fix: 본인이 아닌 수뇌자리에도 부대장 발령 표기	2022-07-10 21:27:34 +09:00
Hide_D	94bb96d208	feat: 부대장 발령 시 부대장 대신 부대 이름 표기	2022-07-10 20:50:33 +09:00
Hide_D	93490276fd	misc: 집합에서 불필요한 조사 제거	2022-07-10 17:12:12 +09:00
Hide_D	73a7bf5a61	fix: 내정 도구 유니크가 동작하지 않는 버그 수정	2022-07-09 23:09:09 +09:00
Hide_D	8a1f8f8e2c	fix: JsonString이 string->int auto casting하는 버그 수정	2022-07-09 13:02:13 +09:00
Hide_D	39c88c11c4	misc: 에러 확인을 위해 추가 메시지	2022-07-09 12:26:50 +09:00
Hide_D	c2e956a639	misc: DTO 에러에서 name을 포함하여 알림	2022-07-09 12:13:15 +09:00
Hide_D	368f31d1fa	fix: 유니크 옥션 인자 빠짐 수정	2022-07-09 12:12:15 +09:00
Hide_D	d3390dc490	fix: 상인 등록 경매에서 warning 수정	2022-07-09 12:00:00 +09:00
Hide_D	eb36b6a52f	fix: vue script ts error	2022-07-08 21:47:13 +09:00
Hide_D	be882000ad	fix: 183년 이전 선포된 경우 공백지 출병을 시도하는 버그 수정	2022-07-08 15:53:37 +09:00
Hide_D	266c1c6a5b	fix: 깃수 종료 시 열린 경매 자동 닫기	2022-07-07 22:00:12 +09:00