fix: 트래픽에서 접속자수가 제대로 집계되지 않는 문제

fix: 수비X 관련 warning
- 버그는 있으나 의도대로는 작동하였음
2023-08-13 07:26:09 +00:00 · 2023-08-12 10:07:58 +00:00 · 2023-08-12 10:06:08 +00:00 · 2023-08-10 19:08:21 +09:00 · 2023-08-10 19:06:40 +09:00 · 2023-08-10 19:06:01 +09:00
107 changed files with 2217 additions and 509 deletions
@@ -15,9 +15,8 @@ return [
    // Note that the **only** effect of choosing `'5.6'` is to infer
    // that functions removed in php 7.0 exist.
    // (See `backward_compatibility_checks` for additional options)
-    "target_php_version" => '8.1',
-    "minimum_target_php_version" => '8.1',
-    'backward_compatibility_checks ' => true,
+    "target_php_version" => '8.2',
+    "minimum_target_php_version" => '8.2',
    'minimum_severity' => \Phan\Issue::SEVERITY_NORMAL,

    'file_list' => [
@@ -29,8 +28,6 @@ return [
        'hwe/_admin1_submit.php',
        'hwe/_admin2.php',
        'hwe/_admin2_submit.php',
-        'hwe/_admin4.php',
-        'hwe/_admin4_submit.php',
        'hwe/_admin5.php',
        'hwe/_admin5_submit.php',
        'hwe/_admin7.php',
@@ -33,7 +33,7 @@ $src = MessageTarget::buildQuick($session->generalID);
 $genObjList = [];
 $env = [];
 if ($genlist) {
-    $genObjList = General::createGeneralObjListFromDB($genlist);
+    $genObjList = General::createObjListFromDB($genlist);
    $env = $gameStor->cacheAll();
 }
 switch ($btn) {
@@ -76,7 +76,7 @@ if (!$gen) {
    $gen = $generalBasicList[0]['no'];
 }

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

 ?>
 <!DOCTYPE html>
@@ -26,7 +26,7 @@ foreach ($db->queryFirstColumn(
 }

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

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

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

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

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

 if ($admin['maxrefresh'] == 0) {
    $admin['maxrefresh'] = 1;
@@ -113,13 +98,13 @@ if ($admin['maxonline'] < $curonline) {
                        </td>
                    </tr>
                    <?php
-                    $refresh[] = $admin['refresh'];
-                    foreach ($refresh as $i => $value) {
+                    foreach ($recentTraffic as $trafficItem) {
+                        $value = $trafficItem['refresh'];
                        $w = round($value / $admin['maxrefresh'] * 100, 1);
                        $color = getTrafficColor($w);
-                        $dt = substr($date[$i], 11, 5); ?>
+                        $dt = substr($trafficItem['date'], 11, 5); ?>
                        <tr height=30>
-                            <td width=100 align=center><?= $year[$i] ?>년 <?= $month[$i] ?>월</td>
+                            <td width=100 align=center><?= $trafficItem['year'] ?>년 <?= $trafficItem['month'] ?>월</td>
                            <td width=60 align=center class='bg2'><?= $dt ?></td>
                            <td width=2 align=center class='bg1'></td>
                            <td width=320>
@@ -154,13 +139,13 @@ if ($admin['maxonline'] < $curonline) {
                        </td>
                    </tr>
                    <?php
-                    $online[] = $curonline;
-                    foreach ($online as $i => $value) {
+                    foreach ($recentTraffic as $trafficItem) {
+                        $value = $trafficItem['online'];
                        $w = round($value / $admin['maxonline'] * 100, 1);
                        $color = getTrafficColor($w);
-                        $dt = substr($date[$i], 11, 5); ?>
+                        $dt = substr($trafficItem['date'], 11, 5); ?>
                        <tr height=30>
-                            <td width=100 align=center><?= $year[$i] ?>년 <?= $month[$i] ?>월</td>
+                            <td width=100 align=center><?= $trafficItem['year'] ?>년 <?= $trafficItem['month'] ?>월</td>
                            <td width=60 align=center class='bg2'><?= $dt ?></td>
                            <td width=2 align=center class='bg1'></td>
                            <td width=320>
@@ -2,6 +2,7 @@

 namespace sammo;

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

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

                                if ($ourGeneral && !$isNPC) {
                                    $turnText = [];
-                                    $generalObj = new General($general, null, null, null, null, null, null, false);
-                                    foreach ($generalTurnList[$generalObj->getID()] as $turnRawIdx => $turn) {
+                                    foreach ($generalTurnList[$general['no']] as $turnRawIdx => $turn) {
                                        $turnIdx = $turnRawIdx + 1;
                                        $turnText[] = "{$turnIdx} : $turn";
                                    }
@@ -24,7 +24,7 @@ $gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);

 increaseRefresh("내정보", 1);

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

 $myset = $me->getVar('myset');
 if ($myset > 0) {
@@ -37,7 +37,8 @@ $lastRefresh = $db->queryFirstField(
    'SELECT %b FROM %b WHERE %b = %i',
    GeneralAccessLogColumn::lastRefresh->value,
    TableName::generalAccessLog->value,
-    GeneralAccessLogColumn::generalID->value, $generalID
+    GeneralAccessLogColumn::generalID->value,
+    $generalID
 );

 $targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
@@ -50,13 +51,19 @@ if ($gameStor->turntime <= $gameStor->opentime) {
        }
    }

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

 $use_treatment = $me->getAuxVar('use_treatment') ?? 10;
 $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
+
+$changeDefence999Train = -3;
+$changeDefence999Atmos = -6;
+$changeDefence999Train = $me->onCalcDomestic('changeDefenceTrain', "train999", $changeDefence999Train);
+$changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $changeDefence999Atmos);
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -128,7 +135,10 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                            <?php foreach ([90, 80, 60, 40] as $targetDefenceTrain) : ?>
                                <option value='<?= $targetDefenceTrain ?>' <?= $me->getVar('defence_train') == $targetDefenceTrain ? "selected" : ""; ?>><?= formatDefenceTrain($targetDefenceTrain) ?>(훈사<?= $targetDefenceTrain ?>)</option>
                            <?php endforeach; ?>
-                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>[훈련 -3, 사기 -6]</option>
+                            <option value=999 <?= $me->getVar('defence_train') == 999 ? "selected" : ""; ?>><?= formatDefenceTrain(999) ?>
+                            <?php if($changeDefence999Train != 0 || $changeDefence999Train != 0):
+                            ?>[<?=$changeDefence999Train!=0?"훈련 {$changeDefence999Train},":''?><?=$changeDefence999Atmos!=0?"사기 {$changeDefence999Atmos}":''
+                            ?>]<?php endif?></option>
                        </select>
                        】<br><br>
                        <input type=<?= $submit ?> id='set_my_setting' name=btn style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px; value=설정저장><br>
@@ -150,6 +160,11 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                            <button type="button" id='buildNationCandidate' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>사전 거병</button><br><br>
                        <?php endif; ?>

+                        <?php if (GameConst::$availableInstantAction['instantRetreat'] ?? false) : ?>
+                            거리 3칸 이내 아국 도시로 즉시 이동<br>
+                            <button type="button" id='instantRetreat' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>접경 귀환</button><br><br>
+                        <?php endif; ?>
+
                        <?php if ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>
                            다른 장수 선택 (<?= substr($me->getAuxVar('next_change') ?? TimeUtil::now(), 0, 19) ?> 부터)<br>
                            <a href="select_general_from_pool.php" id='select_general_from_pool'><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>다른 장수 선택</button></a><br><br>
@@ -178,7 +193,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                        <div class="row mx-1">
                            <div class="btn-group" role="group">
                                <?php foreach ($me->getItems() as $itemKey => $item) : ?>
-                                    <button type="button" data-item-type='<?=$itemKey?>' class="drop-item-btn btn btn-primary <?= $item->getName() == '-' ? 'disabled' : '' ?>"><?= $item->getName() ?></button>
+                                    <button type="button" data-item-type='<?= $itemKey ?>' class="drop-item-btn btn btn-primary <?= $item->getName() == '-' ? 'disabled' : '' ?>"><?= $item->getName() ?></button>
                                <?php endforeach; ?>
                            </div>
                        </div>
@@ -18,7 +18,7 @@ $me = $db->queryFirstRow(
    'SELECT no,tournament,refresh_score,turntime from `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id where owner=%i', $userID
 );
-
+$generalID = $me['no'];
 $admin = $gameStor->getValues(['tournament', 'phase', 'turnterm', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
 $turnTerm = $admin['turnterm'];

@@ -149,7 +149,7 @@ function getRandGenName(RandUtil $rng)



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

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

    if ($admin['maxrefresh'] < $admin['refresh']) {
@@ -1083,6 +1083,19 @@ function updateTraffic()
    $gameStor->maxrefresh = $admin['maxrefresh'];
    $gameStor->maxonline = $admin['maxonline'];

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

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

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

    $ttw = $generalObj->getRankVar(RankColumn::ttw);
    $ttd = $generalObj->getRankVar(RankColumn::ttd);
@@ -1714,14 +1727,13 @@ function deleteNation(General $lord, bool $applyDB): array
    $logger->pushGlobalHistoryLog("<R><b>【멸망】</b></><D><b>{$nationName}</b></>{$josaUn} <R>멸망</>했습니다.");


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

@@ -350,7 +350,7 @@ function setGeneralCommand(int $generalID, array $rawTurnList, string $command,
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $env = $gameStor->getAll();
-    $general = General::createGeneralObjFromDB($generalID);
+    $general = General::createObjFromDB($generalID);

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

    if($general->getVar('officer_level') < 5){
        return [
@@ -256,6 +256,41 @@ function buildItemClass(?string $type):BaseItem{
    return $obj;
 }

+function getScenarioEffectClass(?string $type){
+    if($type === null || $type === ''){
+        $type = 'None';
+    }
+
+    static $basePath = __NAMESPACE__.'\\ActionScenarioEffect\\';
+    $classPath = ($basePath.$type);
+
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    $classPath = ($basePath.'che_'.$type);
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    throw new \InvalidArgumentException("{$type}은 시나리오 효과 클래스가 아님");
+}
+
+function buildScenarioEffectClass(?string $type):iAction{
+    static $cache = [];
+    if($type === null){
+        $type = 'None';
+    }
+    if(key_exists($type, $cache)){
+        return $cache[$type];
+    }
+    $class = getScenarioEffectClass($type);
+
+    $obj = new $class();
+    $cache[$type]= $obj;
+    return $obj;
+}
+
 function getGeneralSpecialDomesticClass(?string $type){
    if($type === null || $type === ''){
        $type = GameConst::$defaultSpecialDomestic;
@@ -451,7 +451,7 @@ function checkWander(RandUtil $rng)

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

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

    $inheritPointManager = InheritancePointManager::getInstance();
-    $allUserGenerals = General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2'));
+    $allUserGenerals = General::createObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc < 2'));
    foreach ($allUserGenerals as $genObj) {
        if ($genObj->getNationID() == $nationID) {
            if ($genObj->getVar('officer_level') > 4) {
@@ -364,7 +364,14 @@ function disaster(RandUtil $rng) {
    $logger->flush();

    if (!$isGood) {
-        $generalListByCity = Util::arrayGroupBy($db->query('SELECT no, name, nation, city, officer_level, injury, leadership, strength, intel, horse, weapon, book, item, crew, crewtype, atmos, train, special, special2 FROM general WHERE city IN %li', Util::squeezeFromArray($targetCityList, 'city')), 'city');
+        [$queryColumns,,] = General::mergeQueryColumn();
+        $generalListByCity = Util::arrayGroupBy(
+            $db->query(
+                'SELECT %l FROM general WHERE city IN %li',
+                Util::formatListOfBackticks($queryColumns),
+                Util::squeezeFromArray($targetCityList, 'city')
+            ),
+            'city');
        //NOTE: 쿼리 1번이지만 복잡하기 vs 쿼리 여러번이지만 조금 더 깔끔하기
        foreach ($targetCityList as $city) {
            $affectRatio = Util::valueFit($city['secu'] / $city['secu_max'] / 0.8, 0, 1);
@@ -882,7 +882,7 @@ function setGift($tnmt_type, $tnmt, $phase)
        //포상 장수 이름, 금액
        $resultHelper[$generalID]['reward'] += $cost;
        $resultHelper[$generalID]['msg'] = "<span class='ev_highlight'>4강 진출</span>";
-        General::createGeneralObjFromDB($generalID)->increaseInheritancePoint(InheritanceKey::tournament, 10);
+        General::createObjFromDB($generalID)->increaseInheritancePoint(InheritanceKey::tournament, 10);
    }
    //결승자 명성 돈
    $cost = $admin['develcost'] * 6;
@@ -946,7 +946,7 @@ function setGift($tnmt_type, $tnmt, $phase)
    $winnerLogger->pushGlobalHistoryLog("<B><b>【대회】</b></><C>{$tp}</> 대회에서 <Y>{$winner['name']}</>{$josaYiWinner} <C>우승</>, <Y>{$runnerUp['name']}</>{$josaYiRunnerUp} <C>준우승</>을 차지하여 천하에 이름을 떨칩니다!", ActionLogger::EVENT_YEAR_MONTH);
    $winnerLogger->pushGlobalHistoryLog("<B><b>【대회】</b></><C>{$tp}</> 대회의 <S>우승자</>에게는 <C>{$winnerRewardText}</>, <S>준우승자</>에겐 <C>{$runnerUpRewardText}</>의 <S>상금</>과 약간의 <S>명성</>이 주어집니다!", ActionLogger::EVENT_YEAR_MONTH);

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

    foreach ($resultHelper as $generalID => $general) {
        $rewardText = number_format($general['reward']);
@@ -199,17 +199,25 @@ if($reserve_open){
    ]);
 }

-Json::die(ResetHelper::buildScenario(
-    $turnterm,
-    $sync,
-    $scenario,
-    $fiction,
-    $extend,
-    $block_general_create,
-    $npcmode,
-    $show_img_level,
-    !!$tournament_trig,
-    $join_mode,
-    TimeUtil::now(),
-    $autorun_user
-));
+try{
+    Json::die(ResetHelper::buildScenario(
+        $turnterm,
+        $sync,
+        $scenario,
+        $fiction,
+        $extend,
+        $block_general_create,
+        $npcmode,
+        $show_img_level,
+        !!$tournament_trig,
+        $join_mode,
+        TimeUtil::now(),
+        $autorun_user
+    ));
+}
+catch(\Exception $e){
+    Json::die([
+        'result'=>false,
+        'reason'=>$e->getMessage()
+    ]);
+}
@@ -1,6 +1,7 @@
 <?php
 namespace sammo;

+use sammo\Enums\GeneralLiteQueryMode;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\MessageType;

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

    if($general instanceof DummyGeneral){
        Json::die([
@@ -89,7 +89,7 @@ $db->update('general', [
    'aux'=>Json::encode($genAux)
 ], 'owner <= 0 AND npc = 2 AND no = %i', $pick);
 $db->insertIgnore('general_access_log', [
-    GeneralAccessLogColumn::generalID->value => $generalID,
+    GeneralAccessLogColumn::generalID->value => $pick,
    GeneralAccessLogColumn::userID->value => $userID,
    GeneralAccessLogColumn::lastRefresh->value => $now,
 ]);
@@ -36,15 +36,19 @@ if($tnmt < 0 || $tnmt > 1){
 }

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


 if($defence_train !== $me->getVar('defence_train')){
    if($defence_train == 999){
        $me->increaseVar('myset', -1);
        $me->setVar('defence_train', $defence_train);
-        $me->increaseVarWithLimit('train', -3, 20);
-        $me->increaseVarWithLimit('atmos', -6, 20);
+        $affectedTrain = -3;
+        $affectedAtmos = -6;
+        $affectedTrain = $me->onCalcDomestic('changeDefenceTrain', "train{$defence_train}", $affectedTrain);
+        $affectedAtmos = $me->onCalcDomestic('changeDefenceTrain', "atmos{$defence_train}", $affectedAtmos);
+        $me->increaseVarWithLimit('train', $affectedTrain, 20, GameConst::$maxTrainByWar);
+        $me->increaseVarWithLimit('atmos', $affectedAtmos, 20, GameConst::$maxAtmosByWar);
    }
    else{
        $me->increaseVar('myset', -1);
@@ -66,7 +66,7 @@ if(!$ownerInfo){
 $info = Json::decode($info);


-$generalObj = General::createGeneralObjFromDB($generalID);
+$generalObj = General::createObjFromDB($generalID);
 $oldGeneralName = $generalObj->getName();
 $db->update('select_pool', [
    'general_id'=>-$generalID,
@@ -59,7 +59,7 @@ if ($limitState >= 2) {
    exit();
 }

-$generalObj = General::createGeneralObjFromDB($me['no'], null, GeneralQueryMode::FullWithAccessLog);
+$generalObj = General::createObjFromDB($me['no'], null, GeneralQueryMode::FullWithAccessLog);
 $generalObj->setRawCity($db->queryFirstRow('SELECT * FROM city WHERE city = %i', $generalObj->getCityID()));
 $scenario = $gameStor->scenario_text;

@@ -38,7 +38,7 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
    $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'));
-    $defenderGeneralList = General::createGeneralObjListFromDB($defenderIDList, null);
+    $defenderGeneralList = General::createObjListFromDB($defenderIDList, null);

    /** @var WarUnit[] */
    $defenderList = [];
@@ -596,10 +596,10 @@ function ConquerCity(array $admin, General $general, array $city)

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

        $josaUl = JosaUtil::pick($defenderNationName, '을');
        $attackerLogger->pushNationalHistoryLog("<D><b>{$defenderNationName}</b></>{$josaUl} 정복");
@@ -39,7 +39,7 @@ class BidBuyRiceAuction extends \sammo\BaseAPI
    $amount = $this->args['amount'];

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

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

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

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

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

@@ -77,7 +77,7 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI
    $inheritMgr = InheritancePointManager::getInstance();
    //preveious라서 column을 최대한 비울 수 있다.
    $remainPoint = $inheritMgr->getInheritancePoint(
-      General::createGeneralObjFromDB($generalID, ['owner'], GeneralQueryMode::Core),
+      General::createObjFromDB($generalID),
      InheritanceKey::previous
    );

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

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

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

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

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

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

    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -59,7 +59,7 @@ class BuildNationCandidate extends \sammo\BaseAPI

    $env = $gameStor->getAll();

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

    $validCmd = false;
    foreach(GameConst::$availableGeneralCommand as $cmdList){
@@ -68,7 +68,7 @@ class DieOnPrestart extends \sammo\BaseAPI
      return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
    }

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

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

        return [
@@ -534,7 +534,7 @@ class GetFrontInfo extends \sammo\BaseAPI
  {
    $generalID = $session->generalID;
    //NOTE: 이 경우 staticNation 정보를 조회한다.
-    $general = General::createGeneralObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
+    $general = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
    $nationID = $general->getNationID();
    $cityID = $general->getCityID();

@@ -0,0 +1,81 @@
+<?php
+
+namespace sammo\API\General;
+
+use sammo\DB;
+use sammo\DummyGeneral;
+use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralAccessLogColumn;
+use sammo\GameConst;
+use sammo\Session;
+use sammo\General;
+use sammo\JosaUtil;
+use sammo\KVStorage;
+use sammo\LiteHashDRBG;
+use sammo\RandUtil;
+use sammo\TimeUtil;
+use sammo\UniqueConst;
+use sammo\Util;
+
+use function sammo\addTurn;
+use function sammo\buildGeneralCommandClass;
+use function sammo\increaseRefresh;
+
+class InstantRetreat extends \sammo\BaseAPI
+{
+  public function validateArgs(): ?string
+  {
+    return null;
+  }
+
+  public function getRequiredSessionMode(): int
+  {
+    return static::REQ_GAME_LOGIN;
+  }
+
+  public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
+  {
+
+    if(!(GameConst::$availableInstantAction['instantRetreat'] ?? false)){
+        return '접경귀환을 사용할 수 없는 시나리오입니다.';
+    }
+
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $gameStor->cacheAll();
+
+    $general = General::createObjFromDB($session->generalID);
+
+    if (!$general) {
+      return '장수가 없습니다';
+    }
+
+    increaseRefresh("접경귀환", 1);
+
+    $commandObj = buildGeneralCommandClass('che_접경귀환', $general, $gameStor->getAll(true));
+    $logger = $general->getLogger();
+
+    if (!$commandObj->hasFullConditionMet()) {
+        $logger->pushGeneralActionLog($commandObj->getFailString());
+        $reason = $commandObj->getFailString();
+        return $reason;
+    }
+
+    $result = $commandObj->run(new RandUtil(
+        new LiteHashDRBG(Util::simpleSerialize(
+            UniqueConst::$hiddenSeed,
+            'InstantRetreat',
+            $general->getID(),
+            $gameStor->year,
+            $gameStor->month,
+            $general->getCityID(),
+        ))
+    ));
+
+    if (!$result) {
+        return '가까운 아국 도시가 없습니다.';
+    }
+
+    return null;
+  }
+}
@@ -49,7 +49,7 @@ class BuyHiddenBuff extends \sammo\BaseAPI
        $type = $this->args['type'];
        $level = $this->args['level'];

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

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

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

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

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

-        $general = General::createGeneralObjFromDB($generalID);
+        $general = General::createObjFromDB($generalID);
        if ($userID != $general->getVar('owner')) {
            return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
        }
@@ -5,8 +5,10 @@ namespace sammo\API\Nation;
 use ArrayObject;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
 use sammo\Enums\GeneralQueryMode;
 use sammo\General;
+use sammo\GeneralLite;
 use sammo\Session;
 use sammo\Util;

@@ -165,7 +167,7 @@ class GeneralList extends \sammo\BaseAPI



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

        $rawGeneralList = Util::convertArrayToDict(
            $db->query(
@@ -14,14 +14,6 @@ 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
@@ -66,7 +58,7 @@ class GetNationInfo extends \sammo\BaseAPI
      ];
    }

-    $generalObj = General::createGeneralObjFromDB($session->generalID, null, GeneralQueryMode::FullWithoutIAction);
+    $generalObj = General::createObjFromDB($session->generalID);

    $gameStor = KVStorage::getStorage($db, 'game_env');
    $gameEnv = $gameStor->getValues(['year', 'month', 'startyear']);
@@ -12,6 +12,7 @@ use sammo\General;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
+use sammo\Util;

 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
@@ -42,7 +43,8 @@ class GetReservedCommand extends \sammo\BaseAPI

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

        $nationLevel = $db->queryFirstField('SELECT level FROM nation WHERE nation = %i', $me['nation']);
@@ -62,7 +64,11 @@ class GetReservedCommand extends \sammo\BaseAPI
        [$turnTerm, $year, $month, $lastExecute] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month', 'turntime']);

        $generals = [];
-        foreach ($db->query('SELECT no,name,turntime,npc,city,nation,officer_level FROM general WHERE nation = %i AND officer_level >= 5', $nationID) as $rawGeneral) {
+        foreach ($db->query(
+            'SELECT %l FROM general WHERE nation = %i AND officer_level >= 5',
+            Util::formatListOfBackticks(General::mergeQueryColumn()[0]),
+            $nationID
+        ) as $rawGeneral) {
            $generals[$rawGeneral['officer_level']] = new General($rawGeneral, null, null, null, null, $year, $month, false);
        }

@@ -113,7 +119,7 @@ class GetReservedCommand extends \sammo\BaseAPI
            ];
        }

-        $generalObj = General::createGeneralObjFromDB($session->generalID, null, GeneralQueryMode::FullWithoutIAction);
+        $generalObj = General::createObjFromDB($session->generalID);


        return [
@@ -6,8 +6,10 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\DTO\VoteComment;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
 use sammo\Enums\GeneralQueryMode;
 use sammo\General;
+use sammo\GeneralLite;
 use sammo\Session;
 use sammo\TimeUtil;
 use sammo\Validator;
@@ -41,7 +43,7 @@ class AddComment extends \sammo\BaseAPI
    $text = mb_substr($this->args['text'], 0, 200);

    $generalID = $session->generalID;
-    $general = General::createGeneralObjFromDB($generalID, null, GeneralQueryMode::Core);
+    $general = GeneralLite::createObjFromDB($generalID, null, GeneralLiteQueryMode::Core);
    $generalName = $general->getName();
    $nationID = $general->getNationID();
    $nationName = $general->getStaticNation()['name'];
@@ -106,7 +106,7 @@ class Vote extends \sammo\BaseAPI
        $gameStor = KVStorage::getStorage($db, 'game_env');
        $voteReward = $gameStor->getValue('develcost') * 5;

-        $general = General::createGeneralObjFromDB($generalID, ['gold', 'horse', 'weapon', 'book', 'item', 'npc', 'imgsvr', 'picture', 'aux'], GeneralQueryMode::Lite);
+        $general = General::createObjFromDB($generalID, null, GeneralQueryMode::Full);
        $general->increaseVar('gold', $voteReward);
        $uniqueRng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
            UniqueConst::$hiddenSeed,
@@ -18,7 +18,7 @@ class che_저격_수극 extends \sammo\BaseItem{
    protected $buyable = true;
    protected $reqSecu = 1000;

-    public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
        return new WarUnitTriggerCaller(
            new che_저격시도($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM, 1, 20, 40),
            new che_저격발동($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM)
@@ -0,0 +1,12 @@
+<?php
+namespace sammo\ActionScenarioEffect;
+use \sammo\iAction;
+use \sammo\General;
+
+class None implements iAction{
+    use \sammo\DefaultAction;
+
+    protected $id = -1;
+    protected $name = '-';
+    protected $info = '';
+}
@@ -0,0 +1,44 @@
+<?php
+
+namespace sammo\ActionScenarioEffect;
+
+use \sammo\iAction;
+use sammo\WarUnit;
+use sammo\WarUnitCity;
+use sammo\WarUnitTrigger\che_전멸시페이즈증가;
+use sammo\WarUnitTriggerCaller;
+
+class event_StrongAttacker implements iAction
+{
+    use \sammo\DefaultAction;
+
+    public function getWarPowerMultiplier(WarUnit $unit): array
+    {
+        if ($unit instanceof WarUnitCity) {
+            return [1, 1];
+        }
+        if ($unit->getOppose() instanceof WarUnitCity) {
+            return [1, 1];
+        }
+
+        if ($unit->isAttacker()) {
+            return [1.4, 0.7143];
+        }
+        return [1, 1];
+    }
+
+    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
+    {
+        if ($turnType == 'changeDefenceTrain') {
+            return 0;
+        }
+        return $value;
+    }
+
+    public function getBattlePhaseSkillTriggerList(\sammo\WarUnit $unit): ?WarUnitTriggerCaller
+    {
+        return new WarUnitTriggerCaller(
+            new che_전멸시페이즈증가($unit),
+        );
+    }
+}
@@ -218,7 +218,7 @@ abstract class Auction
    if ($bidItem->generalID === $this->general->getID()) {
      $oldBidder = $this->general;
    } else {
-      $oldBidder = General::createGeneralObjFromDB($bidItem->generalID);
+      $oldBidder = General::createObjFromDB($bidItem->generalID);
    }

    if ($this->info->reqResource === ResourceType::inheritancePoint) {
@@ -485,7 +485,7 @@ abstract class Auction
      }
    }

-    $bidder =  General::createGeneralObjFromDB($highestBid->generalID);
+    $bidder =  General::createObjFromDB($highestBid->generalID);
    $failReason = $this->finishAuction($highestBid, $bidder);
    if ($failReason === null) {
      $this->closeAuction();
@@ -116,7 +116,7 @@ abstract class AuctionBasicResource extends Auction
    } else if ($this->info->hostGeneralID == 0) {
      $auctionHost = $this->genDummy();
    } else {
-      $auctionHost = General::createGeneralObjFromDB($this->info->hostGeneralID);
+      $auctionHost = General::createObjFromDB($this->info->hostGeneralID);
    }

    $hostRes = static::$hostRes;
@@ -164,7 +164,7 @@ abstract class AuctionBasicResource extends Auction
    } else if ($this->info->hostGeneralID == 0) {
      $auctionHost = $this->genDummy();
    } else {
-      $auctionHost = General::createGeneralObjFromDB($this->info->hostGeneralID);
+      $auctionHost = General::createObjFromDB($this->info->hostGeneralID);
    }

    $highestBid = $this->getHighestBid();
@@ -175,7 +175,7 @@ abstract class AuctionBasicResource extends Auction
    if ($this->general->getID() === $highestBid->generalID) {
      $bidder = $this->general;
    } else {
-      $bidder = General::createGeneralObjFromDB($highestBid->generalID);
+      $bidder = General::createObjFromDB($highestBid->generalID);
    }

    $hostRes = static::$hostRes;
@@ -19,7 +19,7 @@ class AutorunGeneralPolicy{
    static $소집해제 = '소집해제';

    static $출병 = '출병';
-    
+
    //static $NPC증여 = 'NPC증여';
    static $NPC헌납 = 'NPC헌납';
    static $NPC사망대비 = 'NPC사망대비';
@@ -31,12 +31,12 @@ class AutorunGeneralPolicy{
    static $귀환 = '귀환';
    //static $전투이동 = '전투이동';
    //static $내정이동 = '내정이동';
-    
+
    static $국가선택 = '국가선택';
    static $집합 = '집합';
    static $건국 = '건국';
    static $선양 = '선양';
-    
+


    static public array $default_priority = [
@@ -74,7 +74,7 @@ class AutorunGeneralPolicy{
    public $can소집해제 = true;

    public $can출병 = true;
-    
+
    //public $canNPC증여 = true;
    public $canNPC헌납 = true;

@@ -91,7 +91,7 @@ class AutorunGeneralPolicy{

    public array $priority;

-    function doNPCState(General $general){
+    function doNPCState(GeneralBase $general){
        $npc = $general->getNPCType();
        $nationID = $general->getNationID();

@@ -115,7 +115,7 @@ class AutorunGeneralPolicy{

    }

-    function __construct(General $general, $aiOptions, ?array $nationPolicy, ?array $serverPolicy, array $nation, array $env){
+    function __construct(GeneralBase $general, $aiOptions, ?array $nationPolicy, ?array $serverPolicy, array $nation, array $env){
        $this->priority = static::$default_priority;

        if($serverPolicy && key_exists('priority', $serverPolicy)){
@@ -165,7 +165,7 @@ class AutorunGeneralPolicy{
        $this->can전투준비 = false;

        $this->can출병 = false;
-        
+
        //$this->canNPC증여 = false;
        $this->canNPC헌납 = false;

@@ -194,9 +194,9 @@ class AutorunGeneralPolicy{
                $this->can금쌀구매 = true;
                $this->can상인무시 = true;
                break;
-            case 'recruit_high': 
+            case 'recruit_high':
                $this->can모병 = true;
-            case 'recruit': 
+            case 'recruit':
                $this->can징병 = true;
                $this->can소집해제 = true;
                $this->can금쌀구매 = true;
@@ -179,7 +179,7 @@ class AutorunNationPolicy {
        'cureThreshold'=>10,
    ];

-    function __construct(General $general, $aiOptions, ?array $nationPolicy, ?array $serverPolicy, array $nation, array $env)
+    function __construct(GeneralBase $general, $aiOptions, ?array $nationPolicy, ?array $serverPolicy, array $nation, array $env)
    {
        foreach(static::$defaultPolicy as $policy=>$value){
            $this->{$policy} = $value;
@@ -6,6 +6,7 @@ use Ds\Map;
 use sammo\DTO\BettingInfo;
 use sammo\DTO\BettingItem;
 use sammo\Enums\GeneralQueryMode;
+use sammo\Enums\InheritanceKey;
 use sammo\Enums\RankColumn;

 class Betting
@@ -351,6 +352,8 @@ class Betting

        $db = DB::db();

+        $pointManager = InheritancePointManager::getInstance();
+
        if ($this->info->reqInheritancePoint) {
            /** @var Map<int,UserLogger> */
            $loggers = new Map();
@@ -362,11 +365,8 @@ class Betting
                $userID = $rewardItem['userID'];
                $amount = $rewardItem['amount'];

-                $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
-                $previousPoint = ($inheritStor->getValue('previous') ?? [0, 0])[0];
-                $nextPoint = $previousPoint + $amount;
-                $inheritStor->setValue('previous', [$nextPoint, 0]);
-                $inheritStor->invalidateCacheValue('previous'); //XXX: 실제로는 previous 값을 사용할 수 없도록 락을 걸어야 한다.
+                $nextPoint = $pointManager->increaseInheritancePointRaw($userID, InheritanceKey::previous, $amount);
+                $previousPoint = $nextPoint - $amount;//역산

                $generalID = $rewardItem['generalID'];
                $db->update('rank_data', [
@@ -402,7 +402,7 @@ class Betting
                $userLogger->flush();
            }
        } else {
-            $generalList = General::createGeneralObjListFromDB(array_unique(Util::squeezeFromArray($rewardList, 'generalID')), ['gold', 'npc', 'betgold'], GeneralQueryMode::Lite);
+            $generalList = General::createObjListFromDB(array_unique(Util::squeezeFromArray($rewardList, 'generalID')));
            foreach ($rewardList as $rewardItem) {
                $gambler = $generalList[$rewardItem['generalID']];
                $reward = Util::round($rewardItem['amount']);
@@ -7,11 +7,7 @@ use \sammo\{
    Util,
    JosaUtil,
    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
    LastTurn,
-    GameUnitConst,
    Command,
    ScoutMessage
 };
@@ -77,7 +73,7 @@ class che_등용 extends Command\GeneralCommand

    protected function initWithArg()
    {
-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['nation', 'experience', 'dedication'], GeneralQueryMode::Lite);
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID']);
        $this->setDestGeneral($destGeneral);

        [$reqGold, $reqRice] = $this->getCost();
@@ -68,7 +68,7 @@ class che_등용수락 extends Command\GeneralCommand{

    protected function initWithArg()
    {
-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null);
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID'], null);
        $this->setDestGeneral($destGeneral);
        $this->setDestNation($this->arg['destNationID'], ['gennum', 'scout']);

@@ -67,7 +67,7 @@ class che_모반시도 extends Command\GeneralCommand{

        $lordID = $db->queryFirstField('SELECT no FROM general WHERE nation = %i AND officer_level = 12', $nationID);

-        $lordGeneral = General::createGeneralObjFromDB($lordID);
+        $lordGeneral = General::createObjFromDB($lordID);

        $generalName = $general->getName();
        $lordName = $lordGeneral->getName();
@@ -66,7 +66,7 @@ class che_선양 extends Command\GeneralCommand

    protected function initWithArg()
    {
-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'nation'], GeneralQueryMode::Lite);
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID']);
        $this->setDestGeneral($destGeneral);

        $this->fullConditionConstraints = [
@@ -84,7 +84,7 @@ class che_장수대상임관 extends Command\GeneralCommand{
    protected function initWithArg()
    {
        $destGeneralID = $this->arg['destGeneralID'];
-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['nation'], GeneralQueryMode::Lite);
+        $destGeneral = General::createObjFromDB($destGeneralID);
        $this->setDestGeneral($destGeneral);
        $this->setDestNation($this->destGeneralObj->getVar('nation'), ['gennum', 'scout']);

@@ -0,0 +1,107 @@
+<?php
+namespace sammo\Command\General;
+
+use \sammo\{
+    DB, Util, JosaUtil,
+    General,
+    ActionLogger,
+    GameConst, GameUnitConst,
+    LastTurn,
+    Command
+};
+
+use \sammo\Constraint\ConstraintHelper;
+use sammo\CityConst;
+
+use function sammo\searchDistance;
+
+class che_접경귀환 extends Command\GeneralCommand{
+    static protected $actionName = '접경귀환';
+
+    protected function argTest():bool{
+        $this->arg = null;
+        return true;
+    }
+
+    protected function init()
+    {
+
+        $general = $this->generalObj;
+
+        $this->setCity();
+        $this->setNation();
+
+        [$reqGold, $reqRice] = $this->getCost();
+
+        $this->fullConditionConstraints=[
+            ConstraintHelper::NotBeNeutral(),
+            ConstraintHelper::NotWanderingNation(),
+            ConstraintHelper::NotOccupiedCity()
+        ];
+    }
+
+    public function getCost():array{
+        return [0, 0];
+    }
+
+    public function getPreReqTurn():int{
+        return 0;
+    }
+
+    public function getPostReqTurn():int{
+        return 0;
+    }
+
+    public function run(\Sammo\RandUtil $rng):bool{
+        if(!$this->hasFullConditionMet()){
+            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
+        }
+
+        $db = DB::db();
+
+        $general = $this->generalObj;
+        $cityID = $general->getCityID();
+        $logger = $general->getLogger();
+
+        $distanceList = searchDistance($cityID, 3, true);
+
+        $occupiedCityList = new \Ds\Set($db->queryFirstColumn(
+            'SELECT city FROM city WHERE nation = %i AND city IN %li AND supply = 1',
+            $general->getNationID(),
+            array_merge(...$distanceList)
+        ));
+
+        $nearestCityList = [];
+        foreach($distanceList as $cityList){
+            foreach($cityList as $cityID){
+                if($occupiedCityList->contains($cityID)){
+                    $nearestCityList[] = $cityID;
+                }
+            }
+            if($nearestCityList){
+                break;
+            }
+        }
+
+        if(!$nearestCityList){
+            $logger->pushGeneralActionLog("3칸 이내에 아국 도시가 없습니다.");
+            return false;
+        }
+
+        $destCityID = $rng->choice($nearestCityList);
+        $destCityName = CityConst::byID($destCityID)->name;
+
+        $josaRo = JosaUtil::pick($destCityName, '로');
+        $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>{$josaRo} 접경귀환했습니다.");
+        $general->setVar('city', $destCityID);
+
+        //TODO: InstantAction일때에만 설정하지 않는게 나은데..
+        //$this->setResultTurn(new LastTurn(static::getName(), $this->arg));
+
+        $general->applyDB($db);
+
+        return true;
+    }
+
+
+}
@@ -87,7 +87,7 @@ class che_증여 extends Command\GeneralCommand

    protected function initWithArg()
    {
-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'rice', 'nation'], GeneralQueryMode::Lite);
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID']);
        $this->setDestGeneral($destGeneral);

        $this->fullConditionConstraints = [
@@ -269,7 +269,7 @@ class che_화계 extends Command\GeneralCommand
        $destCityGeneralList = [];

        $cityGeneralID = $db->queryFirstColumn('SELECT no FROM general WHERE city = %i AND nation = %i', $destCityID, $destNationID);
-        $destCityGeneralList = General::createGeneralObjListFromDB($cityGeneralID, ['name', 'city', 'nation', 'officer_level', 'leadership', 'horse', 'strength', 'weapon', 'intel', 'book', 'item', 'last_turn', 'injury', 'special', 'special2', 'injury', 'crewtype', 'crew', 'atmos', 'train']);
+        $destCityGeneralList = General::createObjListFromDB($cityGeneralID, ['name', 'city', 'nation', 'officer_level', 'leadership', 'horse', 'strength', 'weapon', 'intel', 'book', 'item', 'last_turn', 'injury', 'special', 'special2', 'injury', 'crewtype', 'crew', 'atmos', 'train']);
        foreach ($destCityGeneralList as &$destCityGeneral) {
            $destCityGeneral->setRawCity($this->destCity);
            unset($destCityGeneral);
@@ -92,7 +92,7 @@ class che_몰수 extends Command\NationCommand

    protected function initWithArg()
    {
-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'rice', 'npc', 'nation', 'imgsvr', 'picture'], GeneralQueryMode::Lite);
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID']);
        $this->setDestGeneral($destGeneral);

        $env = $this->env;
@@ -72,7 +72,7 @@ class che_발령 extends Command\NationCommand
    {
        $this->setDestCity($this->arg['destCityID']);

-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite);
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID']);
        $this->setDestGeneral($destGeneral);

        if ($this->arg['destGeneralID'] == $this->getGeneral()->getID()) {
@@ -104,7 +104,7 @@ class che_불가침수락 extends Command\NationCommand
        $env = $this->env;
        $relYear = $env['year'] - $env['startyear'];

-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite);
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID']);
        $this->setDestGeneral($destGeneral);
        $this->setDestNation($this->arg['destNationID']);

@@ -78,7 +78,7 @@ class che_불가침파기수락 extends Command\NationCommand

    protected function initWithArg()
    {
-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite);
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID']);
        $this->setDestGeneral($destGeneral);
        $this->setDestNation($this->arg['destNationID']);

@@ -87,7 +87,7 @@ class che_종전수락 extends Command\NationCommand

    protected function initWithArg()
    {
-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null, GeneralQueryMode::Lite);
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID']);
        $this->setDestGeneral($destGeneral);
        $this->setDestNation($this->arg['destNationID']);

@@ -82,7 +82,7 @@ class che_포상 extends Command\NationCommand

    protected function initWithArg()
    {
-        $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'rice', 'nation'], GeneralQueryMode::Lite);
+        $destGeneral = General::createObjFromDB($this->arg['destGeneralID']);
        $this->setDestGeneral($destGeneral);

        if($this->arg['destGeneralID'] == $this->getGeneral()->getID()){
@@ -95,7 +95,7 @@ class che_필사즉생 extends Command\NationCommand{
        $broadcastMessage = "<Y>{$generalName}</>{$josaYi} <M>필사즉생</>을 발동하였습니다.";

        $targetGeneralList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND no != %i', $nationID, $generalID);
-        foreach(General::createGeneralObjListFromDB($targetGeneralList, ['train', 'atmos'], GeneralQueryMode::Lite) as $targetGeneral){
+        foreach(General::createObjListFromDB($targetGeneralList) as $targetGeneral){
            $targetGeneral->getLogger()->pushGeneralActionLog($broadcastMessage, ActionLogger::PLAIN);
            if($targetGeneral->getVar('train') < 100){
                $targetGeneral->setVar('train', 100);
@@ -163,7 +163,7 @@ class che_허보 extends Command\NationCommand
        $destNationCityList = $db->queryFirstColumn('SELECT city FROM city WHERE nation = %i AND supply = 1', $destNationID);

        $targetGeneralList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i', $destNationID, $destCityID);
-        foreach (General::createGeneralObjListFromDB($targetGeneralList) as $targetGeneralID => $targetGeneral) {
+        foreach (General::createObjListFromDB($targetGeneralList) as $targetGeneralID => $targetGeneral) {
            $targetLogger = $targetGeneral->getLogger();
            $targetLogger->pushGeneralActionLog($destBroadcastMessage, ActionLogger::PLAIN);

@@ -53,11 +53,11 @@ class AvailableRecruitCrewType extends Constraint{
        }

        $crewType = GameUnitConst::byID($this->arg);
-        if($crewType->isValid($ownCities, $ownRegions, $year = $startyear, $tech)){
+        if($crewType->isValid($ownCities, $ownRegions, $year - $startyear, $tech)){
            return true;
        }

        $this->reason = "현재 선택할 수 없는 병종입니다.";
        return false;
    }
-}
+}
@@ -156,6 +156,10 @@ class ConstraintHelper{
        return [__FUNCTION__];
    }

+    static function NotOccupiedCity():array{
+        return [__FUNCTION__];
+    }
+
    static function NotOccupiedDestCity():array{
        return [__FUNCTION__];
    }
@@ -0,0 +1,37 @@
+<?php
+
+namespace sammo\Constraint;
+
+class NotOccupiedCity extends Constraint{
+    const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_CITY;
+
+    public function checkInputValues(bool $throwExeception=true):bool{
+        if(!parent::checkInputValues($throwExeception) && !$throwExeception){
+            return false;
+        }
+
+        if(!key_exists('nation', $this->general)){
+            if(!$throwExeception){return false; }
+            throw new \InvalidArgumentException("require nation in general");
+        }
+
+        if(!key_exists('nation', $this->city)){
+            if(!$throwExeception){return false; }
+            throw new \InvalidArgumentException("require nation in city");
+        }
+
+        return true;
+    }
+
+    public function test():bool{
+        $this->checkInputValues();
+        $this->tested = true;
+
+        if($this->city['nation'] != $this->general['nation']){
+            return true;
+        }
+
+        $this->reason = "아국입니다.";
+        return false;
+    }
+}
@@ -20,7 +20,7 @@ class ReqGeneralCrewMargin extends Constraint{
            throw new \InvalidArgumentException("{$this->arg} is invalid crewtype");
        }

-        foreach(['leadership','strength','intel','crew','crewtype','nation','officer_level'] as $key){
+        foreach(['leadership','strength','intel','crew','crewtype','nation','officer_level','aux'] as $key){
            if(!key_exists($key, $this->general)){
                if(!$throwExeception){return false; }
                throw new \InvalidArgumentException("require {$key} in general");
@@ -39,7 +39,7 @@ class ReqGeneralCrewMargin extends Constraint{

        //XXX: 왜 General -> obj -> General 변환을 하고 있나?
        //FIXME: RankVar, city에 따라 통솔이 바뀐다면 이 부분에 문제가 발생.
-        $generalObj = new General($this->general, null, null, null, null, null, null, true);
+        $generalObj = new General($this->general, null, null, null, null, 180, 1);

        if($reqCrewType->id != $generalObj->getCrewTypeObj()->id){
            return true;
@@ -76,7 +76,7 @@ class DiplomaticMessage extends Message{

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

-        $destGeneralObj = General::createGeneralObjFromDB($this->dest->generalID, ['picture', 'imgsvr', 'aux'], GeneralQueryMode::Lite);
+        $destGeneralObj = General::createObjFromDB($this->dest->generalID);

        $commandObj = buildNationCommandClass('che_불가침수락', $destGeneralObj, $gameStor->getAll(true), new LastTurn(), [
            'destNationID'=>$this->src->nationID,
@@ -100,7 +100,7 @@ class DiplomaticMessage extends Message{
    protected function cancelNA(){
        $gameStor = KVStorage::getStorage(DB::db(), 'game_env');

-        $destGeneralObj = General::createGeneralObjFromDB($this->dest->generalID, ['picture', 'imgsvr', 'aux'], GeneralQueryMode::Lite);
+        $destGeneralObj = General::createObjFromDB($this->dest->generalID);

        $commandObj = buildNationCommandClass('che_불가침파기수락', $destGeneralObj, $gameStor->getAll(true), new LastTurn(), [
            'destNationID'=>$this->src->nationID,
@@ -122,7 +122,7 @@ class DiplomaticMessage extends Message{
    protected function stopWar(){
        $gameStor = KVStorage::getStorage(DB::db(), 'game_env');

-        $destGeneralObj = General::createGeneralObjFromDB($this->dest->generalID, ['picture', 'imgsvr', 'aux'], GeneralQueryMode::Lite);
+        $destGeneralObj = General::createObjFromDB($this->dest->generalID);

        $commandObj = buildNationCommandClass('che_종전수락', $destGeneralObj, $gameStor->getAll(true), new LastTurn(), [
            'destNationID'=>$this->src->nationID,
@@ -0,0 +1,45 @@
+<?php
+
+namespace sammo;
+
+use sammo\Enums\InheritanceKey;
+
+class DummyGeneralLite extends GeneralLite
+{
+    public function __construct(bool $initLogger = true)
+    {
+        $raw = [
+            'no' => 0,
+            'name' => 'Dummy',
+            'npc' => 3,
+            'city' => 0,
+            'nation' => 0,
+            'officer_level' => 0,
+            'crewtype' => -1,
+            'turntime' => '2012-03-04 05:06:07.000000',
+            'experience' => 0,
+            'dedication' => 0,
+            'gold' => 0,
+            'rice' => 0,
+            'leadership' => 10,
+            'strength' => 10,
+            'intel' => 10,
+            'imgsvr' => 0,
+            'picture' => 'default.jpg',
+        ];
+
+        $this->raw = $raw;
+
+        if ($initLogger) {
+            $this->initLogger(1, 1);
+        }
+    }
+
+    function applyDB($db): bool
+    {
+        if ($this->logger) {
+            $this->initLogger($this->logger->getYear(), $this->logger->getMonth());
+        }
+        return true;
+    }
+}
@@ -0,0 +1,14 @@
+<?php
+
+namespace sammo\Enums;
+
+// mergeQueryColumn, createGeneralLiteObjListFromDB, createGeneralLiteObjFromDB 호출시 column 특수 모드 지정
+enum GeneralLiteQueryMode: int
+{
+    /** 장수 식별을 위한 최소한의 정보, logger 초기화 없음 */
+    case Core = 0;
+    /** 게임 내에서 필수 이벤트 처리를 위한 정보 */
+    case Lite = 1;
+    /** 게임 내 모든 이벤트 처리를 위한 정보 */
+    case Full = 2;
+}
@@ -5,12 +5,6 @@ namespace sammo\Enums;
 // mergeQueryColumn, createGeneralObjListFromDB, createGeneralObjFromDB 호출시 column 특수 모드 지정
 enum GeneralQueryMode: int
 {
-    /** 장수 식별을 위한 최소한의 정보, logger 초기화 없음 */
-    case Core = 0;
-    /** 게임 내에서 필수 이벤트 처리를 위한 정보, iAction 제외 */
-    case Lite = 1;
-    /** 게임 내 모든 이벤트 처리를 위한 정보, iAction 제외 */
-    case FullWithoutIAction = 2;
    /** 게임 내 모든 이벤트 처리를 위한 정보, iAction 포함 */
    case Full = 3;
    /** 접속 정보를 포함한 모든 정보 */
@@ -28,7 +28,7 @@ class LostUniqueItem extends \sammo\Event\Action
    if (!$generalIDList) {
      return;
    }
-    $generals = General::createGeneralObjListFromDB($generalIDList);
+    $generals = General::createObjListFromDB($generalIDList);

    $lostItems = [];
    $totalLostCnt = 0;
@@ -18,7 +18,7 @@ class MergeInheritPointRank extends \sammo\Event\Action
  {
    $db = DB::db();

-    $generals = General::createGeneralObjListFromDB(null, null);
+    $generals = General::createObjListFromDB(null, null);

    $points = new Map();
    $points->allocate(count($generals));
@@ -39,7 +39,11 @@ class ProcessIncome extends \sammo\Event\Action

    $nationList = $db->query('SELECT name,nation,capital,gold,level,rate_tmp,bill,type from nation');
    $cityListByNation = Util::arrayGroupBy($db->query('SELECT * FROM city'), 'nation');
-    $generalRawListByNation = Util::arrayGroupBy($db->query('SELECT no,name,nation,gold,officer_level,dedication,city FROM general WHERE npc != 5'), 'nation');
+    //FIXME: factory 형태로 바꿔야함
+    $generalRawListByNation = Util::arrayGroupBy($db->query(
+      'SELECT %l FROM general WHERE npc != 5',
+      Util::formatListOfBackticks(General::mergeQueryColumn()[0])
+    ), 'nation');

    //국가별 처리
    foreach ($nationList as $nation) {
@@ -119,7 +123,11 @@ class ProcessIncome extends \sammo\Event\Action

    $nationList = $db->query('SELECT name,level,nation,capital,rice,rate_tmp,bill,type from nation');
    $cityListByNation = Util::arrayGroupBy($db->query('SELECT * FROM city'), 'nation');
-    $generalRawListByNation = Util::arrayGroupBy($db->query('SELECT no,name,nation,rice,officer_level,dedication,city FROM general WHERE npc != 5'), 'nation');
+    //FIXME: factory 형태로 바꿔야함
+    $generalRawListByNation = Util::arrayGroupBy($db->query(
+      'SELECT %l FROM general WHERE npc != 5',
+      Util::formatListOfBackticks(General::mergeQueryColumn()[0])
+    ), 'nation');

    //국가별 처리
    foreach ($nationList as $nation) {
@@ -84,7 +84,7 @@ class ProvideNPCTroopLeader extends \sammo\Event\Action
          'troop' => $npcID
        ], 'no=%i', $npcID);

-        $cmd = buildGeneralCommandClass('che_집합', General::createGeneralObjFromDB($npcID), $env);
+        $cmd = buildGeneralCommandClass('che_집합', General::createObjFromDB($npcID), $env);
        _setGeneralCommand($cmd, iterator_to_array(Util::range(GameConst::$maxTurn)));
        $NPCTroopLeaderCnt += 1;
        $gameStor->lastNPCTroopLeaderID = $lastNPCTroopLeaderID;
@@ -112,7 +112,12 @@ class RaiseDisaster extends \sammo\Event\Action
    $logger->flush();

    if (!$isGood) {
-      $generalListByCity = Util::arrayGroupBy($db->query('SELECT no, name, nation, city, officer_level, injury, leadership, strength, intel, horse, weapon, book, item, crew, crewtype, atmos, train, special, special2 FROM general WHERE city IN %li', Util::squeezeFromArray($targetCityList, 'city')), 'city');
+      //FIXME: factory 형태로 바꿔야함
+      $generalListByCity = Util::arrayGroupBy($db->query(
+        'SELECT %l FROM general WHERE city IN %li',
+        Util::formatListOfBackticks(General::mergeQueryColumn()[0]),
+        Util::squeezeFromArray($targetCityList, 'city')),
+      'city');
      //NOTE: 쿼리 1번이지만 복잡하기 vs 쿼리 여러번이지만 조금 더 깔끔하기
      foreach ($targetCityList as $city) {
        $affectRatio = Util::valueFit($city['secu'] / $city['secu_max'] / 0.8, 0, 1);
@@ -140,7 +140,7 @@ class UpdateNationLevel extends \sammo\Event\Action
            $nation['nation'],
            $targetKillTurn
          );
-          $nationGenList = General::createGeneralObjListFromDB($nationGenIDList, ['belong', 'npc', 'aux']);
+          $nationGenList = General::createObjListFromDB($nationGenIDList, ['belong', 'npc', 'aux']);
          $chiefID = null;

          $uniqueLotteryWeightList = [];
@@ -215,7 +215,7 @@ class UpdateNationLevel extends \sammo\Event\Action
          }

          if ($chiefID) {
-            $chiefObj = General::createGeneralObjFromDB($chiefID, ['belong', 'npc', 'aux'], GeneralQueryMode::Lite);
+            $chiefObj = General::createObjFromDB($chiefID);
            $chiefObj->increaseInheritancePoint(InheritanceKey::unifier, 250 * $levelDiff);
            $chiefObj->applyDB($db);
          }
@@ -225,6 +225,19 @@ class GameConstBase
    public static $inheritSpecificSpecialPoint = 4000;
    public static $inheritResetAttrPointBase = [1000, 1000, 2000, 3000];//필요하면 늘려서 쓰기

+    /** @var ?string */
+    public static $scenarioEffect = null;
+
+    public static $defaultInstantAction = [
+        'dieOnPrestart' => true,
+        'buildNationCandidate' => true,
+    ];
+
+    public static $availableInstantAction = [
+        'dieOnPrestart' => true,
+        'buildNationCandidate' => true,
+    ];
+
    public static $allItems = [
        'horse' => [
            'che_명마_01_노기' => 0, 'che_명마_02_조랑' => 0, 'che_명마_03_노새' => 0,
@@ -10,27 +10,20 @@ use sammo\Enums\InheritanceKey;
 use sammo\Enums\RankColumn;
 use sammo\WarUnitTrigger as WarUnitTrigger;

-class General implements iAction
+class General extends GeneralBase implements iAction
 {
-    use LazyVarUpdater;
+    use LazyVarAndAuxUpdater;

-    protected $raw = [];
-    protected $rawCity = null;
-
-
-    /** @var Map<RankColumn,int|float> */
+    /** @var Map<RankColumn,int> */
    protected Map $rankVarRead;
-    /** @var Map<RankColumn,int|float> */
+    /** @var Map<RankColumn,int> */
    protected Map $rankVarIncrease;
-    /** @var Map<RankColumn,int|float> */
+    /** @var Map<RankColumn,int> */
    protected Map $rankVarSet;

-    /** @var Map<GeneralAccessLogColumn,int|float> */
+    /** @var Map<GeneralAccessLogColumn,int|float|string> */
    protected ?Map $accessLogRead;

-    /** @var \sammo\ActionLogger */
-    protected $logger;
-
    protected $activatedSkill = [];
    protected $logActivatedSkill = [];
    protected $isFinished = false;
@@ -49,47 +42,26 @@ class General implements iAction
    protected $itemObjs = [];
    /** @var ?iAction */
    protected $inheritBuffObj = null;
+    /** @var ?iAction */
+    protected $scenarioEffect = null;
+
    /** @var ?GameUnitDetail */
    protected $crewType = null;

    protected $lastTurn = null;
    protected $resultTurn = null;

-    const TURNTIME_FULL_MS = -1;
-    const TURNTIME_FULL = 0;
-    const TURNTIME_HMS = 1;
-    const TURNTIME_HM = 2;
-
    protected $calcCache = [];

-    protected static $prohibitedDirectUpdateVars = [
-        //Reason: iAction
-        'leadership' => 1,
-        'power' => 1,
-        'intel' => 1,
-        'nation' => 2,
-        'officer_level' => 1,
-        //NOTE: officerLevelObj로 인해 국가의 '레벨'이 바뀌는 것도 조심해야 하나, 국가 레벨의 변경은 월 초/말에만 일어남.
-        'special' => 1,
-        'special2' => 1,
-        'personal' => 1,
-        'horse' => 1,
-        'weapon' => 1,
-        'book' => 1,
-        'item' => 1
-    ];
-
-
    /**
     * @param array $raw DB row값.
     * @param null|Map<RankColumn,int|float> $rawRank
     * @param null|Map<GeneralAccessLogColumn,int> $rawAccessLog
     * @param null|array $city DB city 테이블의 row값
-     * @param int|null $year 게임 연도
-     * @param int|null $month 게임 월
-     * @param bool $fullConstruct iAction, 및 ActionLogger 초기화 여부, false인 경우 no, name, city, nation, officer_level 정도로 초기화 가능
+     * @param int $year 게임 연도
+     * @param int $month 게임 월
     */
-    public function __construct(array $raw, ?Map $rawRank, ?Map $rawAccessLog, ?array $city, ?array $nation, ?int $year, ?int $month, bool $fullConstruct = true)
+    public function __construct(array $raw, ?Map $rawRank, ?Map $rawAccessLog, ?array $city, ?array $nation, int $year, int $month)
    {
        //TODO:  밖에서 가져오도록 하면 버그 확률이 높아짐. 필요한 raw 값을 직접 구해야함.

@@ -106,9 +78,7 @@ class General implements iAction
            $this->resultTurn = $this->lastTurn->duplicate();
        }

-        if ($year !== null && $month !== null) {
-            $this->initLogger($year, $month);
-        }
+        $this->initLogger($year, $month);

        if ($rawRank) {
            $this->rankVarRead = $rawRank;
@@ -122,10 +92,6 @@ class General implements iAction
        $this->rankVarIncrease = new Map();
        $this->rankVarSet = new Map();

-        if (!$fullConstruct) {
-            return;
-        }
-
        $this->nationType = buildNationTypeClass($nation['type']);
        $this->officerLevelObj = new TriggerOfficerLevel($this->raw, $nation['level']);

@@ -141,41 +107,14 @@ class General implements iAction
        $this->itemObjs['book'] = buildItemClass($raw['book']);
        $this->itemObjs['item'] = buildItemClass($raw['item']);

-        if (key_exists('aux', $this->raw)) {
-            $rawInheritBuff = $this->getAuxVar('inheritBuff');
-            if ($rawInheritBuff !== null) {
-                $this->inheritBuffObj = new TriggerInheritBuff($rawInheritBuff);
-            }
+        $rawInheritBuff = $this->getAuxVar('inheritBuff');
+        if ($rawInheritBuff !== null) {
+            $this->inheritBuffObj = new TriggerInheritBuff($rawInheritBuff);
        }
-    }

-    function initLogger(int $year, int $month)
-    {
-        $this->logger = new ActionLogger(
-            $this->getVar('no'),
-            $this->getVar('nation'),
-            $year,
-            $month,
-            false
-        );
-    }
-
-    function getTurnTime(int $short = self::TURNTIME_FULL_MS)
-    {
-        return [
-            self::TURNTIME_FULL_MS => function ($turntime) {
-                return $turntime;
-            },
-            self::TURNTIME_FULL => function ($turntime) {
-                return substr($turntime, 0, 19);
-            },
-            self::TURNTIME_HMS => function ($turntime) {
-                return substr($turntime, 11, 8);
-            },
-            self::TURNTIME_HM => function ($turntime) {
-                return substr($turntime, 11, 5);
-            },
-        ][$short]($this->getVar('turntime'));
+        if(GameConst::$scenarioEffect){
+            $this->scenarioEffect = buildScenarioEffectClass(GameConst::$scenarioEffect);
+        }
    }

    function setItem(string $itemKey = 'item', ?string $itemCode)
@@ -200,11 +139,6 @@ class General implements iAction
        return $this->itemObjs[$itemKey];
    }

-    function getNPCType(): int
-    {
-        return $this->raw['npc'];
-    }
-
    /** @return BaseItem[] */
    function getItems(): array
    {
@@ -281,48 +215,13 @@ class General implements iAction
        }
    }

-    function getName(): string
-    {
-        return $this->raw['name'];
-    }
-
    function getInfo(): string
    {
        //iAction용 info로는 적절하지 않음
        return '';
    }

-    function getID(): int
-    {
-        return $this->raw['no'];
-    }
-
-    function getRawCity(): ?array
-    {
-        return $this->rawCity;
-    }
-
-    function setRawCity(?array $city)
-    {
-        $this->rawCity = $city;
-    }
-
-    function getCityID(): int
-    {
-        return $this->raw['city'];
-    }
-
-    function getNationID(): int
-    {
-        return $this->raw['nation'];
-    }
-
-    function getStaticNation(): array
-    {
-        return getNationStaticInfo($this->raw['nation']);
-    }
-
-    function getLogger(): ?ActionLogger
+    function getLogger(): ActionLogger
    {
        return $this->logger;
    }
@@ -459,20 +358,7 @@ class General implements iAction
        $statValue = Util::clamp($statValue, 0, GameConst::$maxLevel);

        if ($withIActionObj) {
-            foreach ([
-                $this->nationType,
-                $this->officerLevelObj,
-                $this->specialDomesticObj,
-                $this->specialWarObj,
-                $this->personalityObj,
-                $this->inheritBuffObj,
-            ] as $actionObj) {
-                if ($actionObj !== null) {
-                    $statValue = $actionObj->onCalcStat($this, $statName, $statValue);
-                }
-            }
-
-            foreach ($this->itemObjs as $actionObj) {
+            foreach ($this->getActionList() as $actionObj) {
                if ($actionObj !== null) {
                    $statValue = $actionObj->onCalcStat($this, $statName, $statValue);
                }
@@ -505,17 +391,6 @@ class General implements iAction
        return $this->getStatValue('intel', $withInjury, $withIActionObj, $withStatAdjust, $useFloor);
    }

-    function getDex(GameUnitDetail $crewType)
-    {
-        $armType = $crewType->armType;
-
-        if ($armType == GameUnitConst::T_CASTLE) {
-            $armType = GameUnitConst::T_SIEGE;
-        }
-
-        return $this->getVar("dex{$armType}");
-    }
-
    function addDex(GameUnitDetail $crewType, float $exp, bool $affectTrainAtmos = false)
    {
        $armType = $crewType->armType;
@@ -593,8 +468,11 @@ class General implements iAction
        }
    }

-    function updateVar(string $key, $value)
+    function updateVar(string|\BackedEnum $key, $value)
    {
+        if($key instanceof \BackedEnum){
+            $key = $key->value;
+        }
        if (($this->raw[$key] ?? null) === $value) {
            return;
        }
@@ -890,6 +768,7 @@ class General implements iAction
            $this->personalityObj,
            $this->crewType,
            $this->inheritBuffObj,
+            $this->scenarioEffect
        ], $this->itemObjs);
    }

@@ -1032,85 +911,6 @@ class General implements iAction
        return $caller;
    }

-    static public function mergeQueryColumn(?array $reqColumns = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): array
-    {
-        $minimumColumn = ['no', 'name', 'npc', 'city', 'nation', 'officer_level', 'officer_city'];
-        $defaultEventColumn = [
-            'no', 'name', 'npc', 'owner', 'city', 'nation', 'officer_level', 'officer_city',
-            'special', 'special2', 'personal',
-            'horse', 'weapon', 'book', 'item', 'last_turn', 'aux',
-        ];
-        $fullColumn = [
-            'no', 'name', 'owner', 'owner_name', 'picture', 'imgsvr', 'nation', 'city', 'troop', 'injury', 'affinity',
-            'leadership', 'leadership_exp', 'strength', 'strength_exp', 'intel', 'intel_exp', 'weapon', 'book', 'horse', 'item',
-            'experience', 'dedication', 'officer_level', 'officer_city', 'gold', 'rice', 'crew', 'crewtype', 'train', 'atmos', 'turntime',
-            'makelimit', 'killturn', 'block', 'dedlevel', 'explevel', 'age', 'startage', 'belong',
-            'personal', 'special', 'special2', 'defence_train', 'tnmt', 'npc', 'npc_org', 'deadyear', 'npcmsg',
-            'dex1', 'dex2', 'dex3', 'dex4', 'dex5', 'betray',
-            'recent_war', 'last_turn', 'myset',
-            'specage', 'specage2', 'aux', 'permission', 'penalty',
-        ];
-        $fullAcessLogColumn = [
-            GeneralAccessLogColumn::refreshScore,
-            GeneralAccessLogColumn::refreshScoreTotal,
-        ];
-
-        if ($reqColumns === null) {
-            switch ($queryMode) {
-                case GeneralQueryMode::Core:
-                    return [$minimumColumn, [], []];
-                case GeneralQueryMode::Lite:
-                    return [$defaultEventColumn, [], []];
-                case GeneralQueryMode::FullWithoutIAction:
-                case GeneralQueryMode::Full:
-                    return [$fullColumn, RankColumn::cases(), []];
-                case GeneralQueryMode::FullWithAccessLog:
-                    return [$fullColumn, RankColumn::cases(), $fullAcessLogColumn];
-            }
-        }
-
-        /** @var RankColumn[] */
-        $rankColumn = [];
-        $subColumn = [];
-        $accessLogColumn = [];
-        foreach ($reqColumns as $column) {
-            if ($column instanceof RankColumn) {
-                $rankColumn[] = $column;
-                continue;
-            }
-            if ($column instanceof GeneralAccessLogColumn) {
-                $accessLogColumn[] = $column;
-                continue;
-            }
-
-
-            $enumKey = RankColumn::tryFrom($column);
-            if ($enumKey !== null) {
-                $rankColumn[] = $enumKey;
-                continue;
-            }
-            $enumKey = GeneralAccessLogColumn::tryFrom($column);
-            if ($enumKey !== null) {
-                $accessLogColumn[] = $enumKey;
-                continue;
-            }
-            $subColumn[] = $column;
-        }
-
-        switch ($queryMode) {
-            case GeneralQueryMode::Core:
-            case GeneralQueryMode::Lite:
-                return [array_unique(array_merge($minimumColumn, $subColumn)), $rankColumn, $accessLogColumn];
-            case GeneralQueryMode::FullWithoutIAction:
-            case GeneralQueryMode::Full:
-                return [array_unique(array_merge($defaultEventColumn, $subColumn)), $rankColumn, $accessLogColumn];
-            case GeneralQueryMode::FullWithAccessLog:
-                return [array_unique(array_merge($fullColumn, $subColumn)), $rankColumn, array_unique(array_merge($fullAcessLogColumn, $accessLogColumn))];
-            default:
-                 throw new \RuntimeException('invalid query mode');
-        }
-    }
-
    /**
     * @param ?int[] $generalIDList
     * @param null|array<string|RankColumn> $column
@@ -1118,20 +918,15 @@ class General implements iAction
     * @return \sammo\General[]
     * @throws MustNotBeReachedException
     */
-    static public function createGeneralObjListFromDB(?array $generalIDList, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): array
+    static public function createObjListFromDB(?array $generalIDList, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): array
    {
        if ($generalIDList === []) {
            return [];
        }

        $db = DB::db();
-        if ($queryMode->value > 0) {
-            $gameStor = KVStorage::getStorage($db, 'game_env');
-            [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
-        } else {
-            $year = null;
-            $month = null;
-        }
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);

        /**
         * @var string[] $column
@@ -1196,25 +991,24 @@ class General implements iAction
                $result[$generalID] = new DummyGeneral($queryMode->value > 0);
                continue;
            }
-            if ($rawRanks->hasKey($generalID) && $rawRanks[$generalID]->count() !== count($rankColumn)) {
+            /** @var Map<RankColumn,int|float> */
+            $generalRankValues = $rawRanks[$generalID] ?? new Map();
+            if ($generalRankValues->count() !== count($rankColumn)) {
                throw new \RuntimeException('column의 수가 일치하지 않음 : ' . $generalID);
            }
-            $result[$generalID] = new static($rawGenerals[$generalID], $rawRanks[$generalID] ?? null, $rawAccessLogs[$generalID] ?? null, null, null, $year, $month, $queryMode->value >= GeneralQueryMode::Full->value);
+
+            $generalAccessLog = $rawAccessLogs[$generalID] ?? new Map();
+            $result[$generalID] = new static($rawGenerals[$generalID], $generalRankValues, $generalAccessLog, null, null, $year, $month);
        }

        return $result;
    }

-    static public function createGeneralObjFromDB(int $generalID, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): self
+    static public function createObjFromDB(int $generalID, ?array $column = null, GeneralQueryMode $queryMode = GeneralQueryMode::Full): self
    {
        $db = DB::db();
-        if ($queryMode->value > 0) {
-            $gameStor = KVStorage::getStorage($db, 'game_env');
-            [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
-        } else {
-            $year = null;
-            $month = null;
-        }
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);

        /**
         * @var string[] $column
@@ -1268,7 +1062,7 @@ class General implements iAction
        }


-        $general = new static($rawGeneral, $rawRankValues, $rawAccessLog, null, null, $year, $month, $queryMode->value >= GeneralQueryMode::Full->value);
+        $general = new static($rawGeneral, $rawRankValues, $rawAccessLog, null, null, $year, $month);

        return $general;
    }
@@ -3514,7 +3514,7 @@ class GeneralAI
        $db = DB::db();
        $generalIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation = %i AND no != %i', $nationID, $this->general->getID());

-        $nationGenerals = General::createGeneralObjListFromDB($generalIDList);
+        $nationGenerals = General::createObjListFromDB($generalIDList);

        $lastWar = \PHP_INT_MAX;
        foreach ($nationGenerals as $nationGeneral) {
@@ -0,0 +1,229 @@
+<?php
+
+namespace sammo;
+
+use Ds\Map;
+use sammo\Enums\GeneralAccessLogColumn;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\Enums\GeneralQueryMode;
+use sammo\Enums\RankColumn;
+
+abstract class GeneralBase
+{
+    use LazyVarUpdater;
+
+    protected $raw = [];
+    protected $rawCity = null;
+
+    /** @var Map<RankColumn,int> */
+    protected Map $rankVarRead;
+
+    /** @var \sammo\ActionLogger */
+    protected $logger;
+
+    const TURNTIME_FULL_MS = -1;
+    const TURNTIME_FULL = 0;
+    const TURNTIME_HMS = 1;
+    const TURNTIME_HM = 2;
+
+    protected static $prohibitedDirectUpdateVars = [
+        //Reason: iAction
+        'leadership' => 1,
+        'power' => 1,
+        'intel' => 1,
+        'nation' => 2,
+        'officer_level' => 1,
+        //NOTE: officerLevelObj로 인해 국가의 '레벨'이 바뀌는 것도 조심해야 하나, 국가 레벨의 변경은 월 초/말에만 일어남.
+        'special' => 1,
+        'special2' => 1,
+        'personal' => 1,
+        'horse' => 1,
+        'weapon' => 1,
+        'book' => 1,
+        'item' => 1
+    ];
+
+    function initLogger(int $year, int $month)
+    {
+        $this->logger = new ActionLogger(
+            $this->getVar('no'),
+            $this->getVar('nation'),
+            $year,
+            $month,
+            false
+        );
+    }
+
+    function getTurnTime(int $short = self::TURNTIME_FULL_MS): ?string
+    {
+        if(!key_exists('turntime', $this->raw)){
+            return null;
+        }
+
+        return [
+            self::TURNTIME_FULL_MS => function ($turntime) {
+                return $turntime;
+            },
+            self::TURNTIME_FULL => function ($turntime) {
+                return substr($turntime, 0, 19);
+            },
+            self::TURNTIME_HMS => function ($turntime) {
+                return substr($turntime, 11, 8);
+            },
+            self::TURNTIME_HM => function ($turntime) {
+                return substr($turntime, 11, 5);
+            },
+        ][$short]($this->getVar('turntime'));
+    }
+
+    function getNPCType(): int
+    {
+        return $this->raw['npc'];
+    }
+
+    function getName(): string
+    {
+        return $this->raw['name'];
+    }
+
+    function getID(): int
+    {
+        return $this->raw['no'];
+    }
+
+    function getRawCity(): ?array
+    {
+        return $this->rawCity;
+    }
+
+    function setRawCity(?array $city)
+    {
+        $this->rawCity = $city;
+    }
+
+    function getCityID(): int
+    {
+        return $this->raw['city'];
+    }
+
+    function getNationID(): int
+    {
+        return $this->raw['nation'];
+    }
+
+    function getStaticNation(): array
+    {
+        return getNationStaticInfo($this->raw['nation']);
+    }
+
+    function getLogger(): ?ActionLogger
+    {
+        return $this->logger;
+    }
+
+    function getDex(GameUnitDetail $crewType)
+    {
+        $armType = $crewType->armType;
+
+        if ($armType == GameUnitConst::T_CASTLE) {
+            $armType = GameUnitConst::T_SIEGE;
+        }
+
+        return $this->getVar("dex{$armType}");
+    }
+
+    function getRankVar(RankColumn $key, $defaultValue = null): int
+    {
+        if (!$this->rankVarRead->hasKey($key)) {
+            if ($defaultValue === null) {
+                throw new \RuntimeException('인자가 없음 : ' . $key->value);
+            }
+            return $defaultValue;
+        }
+
+        return $this->rankVarRead[$key];
+    }
+
+    abstract function applyDB($db): bool;
+
+    static public function mergeQueryColumn(?array $reqColumns = null, GeneralQueryMode|GeneralLiteQueryMode $queryMode = GeneralQueryMode::Full): array
+    {
+        $minimumColumn = ['no', 'name', 'owner', 'npc', 'city', 'nation', 'officer_level', 'officer_city'];
+        $defaultEventColumn = [
+            'no', 'name', 'npc', 'owner', 'city', 'nation', 'officer_level', 'officer_city',
+            'special', 'special2', 'personal',
+            'horse', 'weapon', 'book', 'item', 'last_turn', 'aux', 'turntime',
+        ];
+        $fullColumn = [
+            'no', 'name', 'owner', 'owner_name', 'picture', 'imgsvr', 'nation', 'city', 'troop', 'injury', 'affinity',
+            'leadership', 'leadership_exp', 'strength', 'strength_exp', 'intel', 'intel_exp', 'weapon', 'book', 'horse', 'item',
+            'experience', 'dedication', 'officer_level', 'officer_city', 'gold', 'rice', 'crew', 'crewtype', 'train', 'atmos', 'turntime',
+            'makelimit', 'killturn', 'block', 'dedlevel', 'explevel', 'age', 'startage', 'belong',
+            'personal', 'special', 'special2', 'defence_train', 'tnmt', 'npc', 'npc_org', 'deadyear', 'npcmsg',
+            'dex1', 'dex2', 'dex3', 'dex4', 'dex5', 'betray',
+            'recent_war', 'last_turn', 'myset',
+            'specage', 'specage2', 'aux', 'permission', 'penalty',
+        ];
+        $fullAcessLogColumn = [
+            GeneralAccessLogColumn::refreshScore,
+            GeneralAccessLogColumn::refreshScoreTotal,
+        ];
+
+        if ($reqColumns === null) {
+            switch ($queryMode) {
+                case GeneralLiteQueryMode::Core:
+                    return [$minimumColumn, [], []];
+                case GeneralLiteQueryMode::Lite:
+                    return [$defaultEventColumn, [], []];
+                case GeneralLiteQueryMode::Full:
+                case GeneralQueryMode::Full:
+                    return [$fullColumn, RankColumn::cases(), []];
+                case GeneralQueryMode::FullWithAccessLog:
+                    return [$fullColumn, RankColumn::cases(), $fullAcessLogColumn];
+            }
+        }
+
+        /** @var RankColumn[] */
+        $rankColumn = [];
+        $subColumn = [];
+        $accessLogColumn = [];
+        foreach ($reqColumns as $column) {
+            if ($column instanceof RankColumn) {
+                $rankColumn[] = $column;
+                continue;
+            }
+            if ($column instanceof GeneralAccessLogColumn) {
+                $accessLogColumn[] = $column;
+                continue;
+            }
+
+
+            $enumKey = RankColumn::tryFrom($column);
+            if ($enumKey !== null) {
+                $rankColumn[] = $enumKey;
+                continue;
+            }
+            $enumKey = GeneralAccessLogColumn::tryFrom($column);
+            if ($enumKey !== null) {
+                $accessLogColumn[] = $enumKey;
+                continue;
+            }
+            $subColumn[] = $column;
+        }
+
+        switch ($queryMode) {
+            case GeneralLiteQueryMode::Core:
+                return [array_unique(array_merge($minimumColumn, $subColumn)), $rankColumn, $accessLogColumn];
+            case GeneralLiteQueryMode::Lite:
+                return [array_unique(array_merge($defaultEventColumn, $subColumn)), $rankColumn, $accessLogColumn];
+            case GeneralLiteQueryMode::Full:
+            case GeneralQueryMode::Full:
+                return [array_unique(array_merge($fullColumn, $subColumn)), $rankColumn, $accessLogColumn];
+            case GeneralQueryMode::FullWithAccessLog:
+                return [array_unique(array_merge($fullColumn, $subColumn)), $rankColumn, array_unique(array_merge($fullAcessLogColumn, $accessLogColumn))];
+            default:
+                 throw new \RuntimeException('invalid query mode');
+        }
+    }
+
+}
@@ -0,0 +1,179 @@
+<?php
+
+namespace sammo;
+
+use Ds\Map;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\Enums\RankColumn;
+
+class GeneralLite extends GeneralBase
+{
+    /**
+     * @param array $raw DB row값.
+     * @param null|array $city DB city 테이블의 row값
+     * @param int|null $year 게임 연도
+     * @param int|null $month 게임 월
+     */
+    public function __construct(array $raw, ?Map $rawRank, ?array $city, ?array $nation, ?int $year, ?int $month)
+    {
+        if ($nation === null) {
+            $nation = getNationStaticInfo($raw['nation']);
+        }
+
+        $this->raw = $raw;
+        $this->rawCity = $city;
+
+        if ($year !== null && $month !== null) {
+            $this->initLogger($year, $month);
+        }
+
+        if ($rawRank) {
+            $this->rankVarRead = $rawRank;
+        } else {
+            $this->rankVarRead = new Map();
+        }
+    }
+
+    /**
+     * @param \MeekroDB $db
+     */
+    function applyDB($db): bool
+    {
+        $updateVals = $this->getUpdatedValues();
+
+
+        $generalID = $this->getID();
+        $result = false;
+
+        if ($updateVals) {
+            $db->update('general', $updateVals, 'no=%i', $generalID);
+            $result = $result || $db->affectedRows() > 0;
+            if (key_exists('nation', $updateVals)) {
+                $db->update('rank_data', [
+                    'nation_id' => $updateVals['nation']
+                ], 'general_id = %i', $generalID);
+                $result = true;
+            }
+            $this->flushUpdateValues();
+        }
+
+        $this->getLogger()->flush();
+        return $result;
+    }
+
+    /**
+     * @param ?int[] $generalIDList
+     * @param null|array<string|RankColumn> $column
+     * @param GeneralLiteQueryMode $queryMode
+     * @return \sammo\GeneralLite[]
+     * @throws MustNotBeReachedException
+     */
+    static public function createObjListFromDB(?array $generalIDList, ?array $column = null, GeneralLiteQueryMode $queryMode = GeneralLiteQueryMode::Full): array
+    {
+        if ($generalIDList === []) {
+            return [];
+        }
+
+        if($queryMode > GeneralLiteQueryMode::Full){
+            throw new \InvalidArgumentException('지원하지 않는 queryMode:' . $queryMode->name);
+        }
+
+        $db = DB::db();
+        if ($queryMode->value > 0) {
+            $gameStor = KVStorage::getStorage($db, 'game_env');
+            [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
+        } else {
+            $year = null;
+            $month = null;
+        }
+
+        /**
+         * @var string[] $column
+         */
+        [$column, $rankColumn,] = static::mergeQueryColumn($column, $queryMode);
+
+        if ($generalIDList === null) {
+            $rawGenerals = Util::convertArrayToDict(
+                $db->query('SELECT %l FROM general WHERE 1', Util::formatListOfBackticks($column)),
+                'no'
+            );
+
+            $generalIDList = array_keys($rawGenerals);
+        } else {
+            $rawGenerals = Util::convertArrayToDict(
+                $db->query('SELECT %l FROM general WHERE no IN %li', Util::formatListOfBackticks($column), $generalIDList),
+                'no'
+            );
+        }
+
+        /** @var Map<int,Map<RankColumn,int|float>> */
+        $rawRanks = new Map();
+        if ($rankColumn) {
+            $rawValue = $db->queryAllLists(
+                'SELECT `general_id`, `type`, `value` FROM rank_data WHERE general_id IN %li AND `type` IN %ls',
+                $generalIDList,
+                array_map(fn (\BackedEnum $e) => $e->value, $rankColumn)
+            );
+            foreach ($rawValue as [$generalID, $rawRankType, $rankValue]) {
+                if (!$rawRanks->hasKey($generalID)) {
+                    $rawRanks[$generalID] = new Map();
+                }
+
+                $rankType = RankColumn::from($rawRankType);
+                $rawRanks[$generalID][$rankType] = $rankValue;
+            }
+        }
+
+        $result = [];
+        foreach ($generalIDList as $generalID) {
+            if (!key_exists($generalID, $rawGenerals)) {
+                $result[$generalID] = new DummyGeneral($queryMode->value > 0);
+                continue;
+            }
+            $result[$generalID] = new static($rawGenerals[$generalID], $rawRanks[$generalID] ?? null, null, null, $year, $month);
+        }
+
+        return $result;
+    }
+
+    static public function createObjFromDB(int $generalID, ?array $column = null, GeneralLiteQueryMode $queryMode = GeneralLiteQueryMode::Full): self
+    {
+        $db = DB::db();
+        if ($queryMode->value > 0) {
+            $gameStor = KVStorage::getStorage($db, 'game_env');
+            [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
+        } else {
+            $year = null;
+            $month = null;
+        }
+
+        /**
+         * @var string[] $column
+         * @var RankColumn[] $rankColumn
+         */
+        [$column, $rankColumn,] = static::mergeQueryColumn($column, $queryMode);
+
+        $rawGeneral = $db->queryFirstRow('SELECT %l FROM general WHERE no = %i', Util::formatListOfBackticks($column), $generalID);
+
+        if (!$rawGeneral) {
+            return new DummyGeneralLite($queryMode->value > 0);
+        }
+
+        $rawRankValues = new Map();
+        if ($rankColumn) {
+            $rawValue = $db->queryAllLists(
+                'SELECT `type`, `value` FROM rank_data WHERE general_id = %i AND `type` IN %ls',
+                $generalID,
+                array_map(fn (\BackedEnum $e) => $e->value, $rankColumn)
+            );
+            foreach ($rawValue as [$rawRankType, $rankValue]) {
+                $rankType = RankColumn::tryFrom($rawRankType);
+                $rawRankValues->put($rankType, $rankValue);
+            }
+        }
+
+        $general = new static($rawGeneral, $rawRankValues, null, null, $year, $month);
+
+        return $general;
+    }
+}
@@ -125,6 +125,10 @@ class InheritancePointManager
      return $value;
    }

+    if($gameStor->isunited != 0 && $key !== InheritanceKey::previous){
+      return 0;
+    }
+
    if (is_array($storeType)) {
      [$storSubType, $storSubKey] = $storeType;
      if ($storSubType === 'rank') {
@@ -220,7 +224,7 @@ class InheritancePointManager
    $inheritStor->setValue($key, [$value, $aux]);
  }

-  public function increaseInheritancePoint(General $general, InheritanceKey $key, $value, $aux = null)
+  public function increaseInheritancePointRaw(int $ownerID, InheritanceKey $key, $value, $aux = null): int|float|null
  {
    if (!is_int($value) && !is_float($value)) {
      throw new \InvalidArgumentException("{$value}는 숫자가 아님");
@@ -234,18 +238,9 @@ class InheritancePointManager
      throw new \InvalidArgumentException("{$key->value}는 직접 저장형 유산 포인트가 아님");
    }

-    $ownerID = $general->getVar('owner');
-    if (!$ownerID) {
-      return;
-    }
-
-    if ($general->getVar('npc') >= 2) {
-      return;
-    }
-
    $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
    if ($gameStor->isunited != 0) {
-      return;
+      return null;
    }

    $inheritStor = KVStorage::getStorage(DB::db(), "inheritance_{$ownerID}");
@@ -257,6 +252,22 @@ class InheritancePointManager

    $newValue = $oldValue + $value * $multiplier;
    $inheritStor->setValue($key->value, [$newValue, $aux]);
+    return $newValue;
+  }
+
+  public function increaseInheritancePoint(General $general, InheritanceKey $key, $value, $aux = null)
+  {
+
+    $ownerID = $general->getVar('owner');
+    if (!$ownerID) {
+      return;
+    }
+
+    if ($general->getVar('npc') >= 2) {
+      return;
+    }
+
+    return $this->increaseInheritancePointRaw($ownerID, $key, $value, $aux);
  }

  public function clearInheritancePoint(?int $ownerID)
@@ -353,7 +364,7 @@ class InheritancePointManager

    $userLogger = new UserLogger($ownerID);

-    $previousPoint = ($allPoints[InheritanceKey::previous->value] ?? [0, 0])[0];
+    $previousPoint = ($allPoints[InheritanceKey::previous->value] ?? [0, null])[0];

    $keepValues = [];

@@ -0,0 +1,73 @@
+<?php
+namespace sammo;
+
+trait LazyVarAndAuxUpdater{
+    use LazyVarUpdater;
+
+    protected $auxVar = null;
+    protected $auxUpdated = false;
+
+    function getRaw(bool $extractAux=false):array{
+        if($extractAux){
+            $this->getAuxVar('');
+
+        }
+        return $this->raw;
+    }
+
+    function unpackAux(){
+        if(!key_exists('auxVar', $this->raw)){
+            if(!key_exists('aux', $this->raw)){
+                throw new \RuntimeException('aux is not set');
+            }
+            $this->raw['auxVar'] = Json::decode($this->raw['aux']??'{}');
+        }
+    }
+
+    function getAuxVar(string|\BackedEnum $key){
+        if($key instanceof \BackedEnum){
+            $key = $key->value;
+        }
+        $this->unpackAux();
+        return $this->raw['auxVar'][$key]??null;
+    }
+
+    function setAuxVar(string|\BackedEnum $key, $var){
+        if($key instanceof \BackedEnum){
+            $key = $key->value;
+        }
+        $oldVar = $this->getAuxVar($key);
+
+        if($oldVar === $var){
+            return;
+        }
+
+        if($var === null){
+            unset($this->raw['auxVar'][$key]);
+            $this->auxUpdated = true;
+            return;
+        }
+        $this->raw['auxVar'][$key] = $var;
+        $this->auxUpdated = true;
+    }
+
+    function getUpdatedValues():array {
+        if($this->auxUpdated){
+            $this->setVar('aux', Json::encode($this->raw['auxVar']));
+            $this->auxUpdated = false;
+        }
+        $updateVals = [];
+        foreach(array_keys($this->updatedVar) as $key){
+            $updateVals[$key] = $this->raw[$key];
+        }
+        return $updateVals;
+    }
+
+    function flushUpdateValues():void {
+        $this->updatedVar = [];
+        if(key_exists('auxVar', $this->raw)){
+            $this->auxUpdated = false;
+            unset($this->raw['auxVar']);
+        }
+    }
+}
@@ -4,14 +4,8 @@ namespace sammo;
 trait LazyVarUpdater{
    protected $raw = [];
    protected $updatedVar = [];
-    protected $auxVar = null;
-    protected $auxUpdated = false;

-    function getRaw(bool $extractAux=false):array{
-        if($extractAux){
-            $this->getAuxVar('');
-
-        }
+    function getRaw():array{
        return $this->raw;
    }

@@ -38,15 +32,6 @@ trait LazyVarUpdater{
        return true;
    }

-    function unpackAux(){
-        if(!key_exists('auxVar', $this->raw)){
-            if(!key_exists('aux', $this->raw)){
-                throw new \RuntimeException('aux is not set');
-            }
-            $this->raw['auxVar'] = Json::decode($this->raw['aux']??'{}');
-        }
-    }
-
    function setVar(string|\BackedEnum $key, $value){
        if($key instanceof \BackedEnum){
            $key = $key->value;
@@ -54,33 +39,6 @@ trait LazyVarUpdater{
        return $this->updateVar($key, $value);
    }

-    function getAuxVar(string|\BackedEnum $key){
-        if($key instanceof \BackedEnum){
-            $key = $key->value;
-        }
-        $this->unpackAux();
-        return $this->raw['auxVar'][$key]??null;
-    }
-
-    function setAuxVar(string|\BackedEnum $key, $var){
-        if($key instanceof \BackedEnum){
-            $key = $key->value;
-        }
-        $oldVar = $this->getAuxVar($key);
-
-        if($oldVar === $var){
-            return;
-        }
-
-        if($var === null){
-            unset($this->raw['auxVar'][$key]);
-            $this->auxUpdated = true;
-            return;
-        }
-        $this->raw['auxVar'][$key] = $var;
-        $this->auxUpdated = true;
-    }
-
    function updateVar(string|\BackedEnum $key, $value){
        if($key instanceof \BackedEnum){
            $key = $key->value;
@@ -160,10 +118,6 @@ trait LazyVarUpdater{
    }

    function getUpdatedValues():array {
-        if($this->auxUpdated){
-            $this->setVar('aux', Json::encode($this->raw['auxVar']));
-            $this->auxUpdated = false;
-        }
        $updateVals = [];
        foreach(array_keys($this->updatedVar) as $key){
            $updateVals[$key] = $this->raw[$key];
@@ -173,9 +127,5 @@ trait LazyVarUpdater{

    function flushUpdateValues():void {
        $this->updatedVar = [];
-        if(key_exists('auxVar', $this->raw)){
-            $this->auxUpdated = false;
-            unset($this->raw['auxVar']);
-        }
    }
 }
@@ -66,7 +66,7 @@ class RaiseInvaderMessage extends Message
        }

        $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
-        $general = \sammo\General::createGeneralObjFromDB($receiverID);
+        $general = \sammo\General::createObjFromDB($receiverID);

        $logger = $general->getLogger();

@@ -508,6 +508,18 @@ class Scenario{
            throw new \RuntimeException('유닛 파일이 올바르게 지정되지 않음! : '.$unitSet);
        }

+        if(key_exists('scenarioEffect', $this->gameConf)){
+            $className = getScenarioEffectClass($this->gameConf['scenarioEffect']);
+            if($className === 'None'){
+                $this->gameConf['scenarioEffect'] = null;
+            }
+        }
+
+        $this->gameConf['availableInstantAction'] = array_merge(
+            GameConstBase::$defaultInstantAction,
+            $this->gameConf['availableInstantAction']??[]
+        );
+
        Util::generatePHPClassFile($path.'/GameConst.php', $this->gameConf, 'GameConstBase', 'sammo');

        copy("$mapPath/$mapName.php", $path.'/CityConst.php');
@@ -68,7 +68,7 @@ class ScoutMessage extends Message
        }

        $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
-        $general = \sammo\General::createGeneralObjFromDB($receiverID);
+        $general = \sammo\General::createObjFromDB($receiverID);

        $logger = $general->getLogger();

@@ -125,8 +125,8 @@ class ScoutMessage extends Message
        $now = TimeUtil::now();
        //XXX: 뭔가 기존 쿼리가 애매하다. invalid 관련해서 다른 옵션이 가능한가?
        $rawMsgList = Util::convertArrayToDict($db->query(
-            'SELECT * FROM `message` WHERE 
-            `mailbox` = %i AND `type` = "private" AND `dest` = `mailbox` AND `valid_until` > %s AND 
+            'SELECT * FROM `message` WHERE
+            `mailbox` = %i AND `type` = "private" AND `dest` = `mailbox` AND `valid_until` > %s AND
            JSON_VALUE(message, "$.option.action") = %s',
            $generalID,
            $now,
@@ -239,7 +239,7 @@ class TurnExecutionHelper
                return [true, $currentTurn];
            }

-            $general = General::createGeneralObjFromDB($rawGeneral['no']);
+            $general = General::createObjFromDB($rawGeneral['no']);
            $nationStor = KVStorage::getStorage($db, $general->getNationID(), 'nation_env');
            $turnObj = new static($general);

@@ -22,6 +22,10 @@ class che_저격발동 extends BaseWarUnitTrigger
            return true;
        }

+        if(($selfEnv['저격발동자']?? -1) !== $this->raiseType){
+            return true;
+        }
+
        if ($selfEnv['저격발동'] ?? false) {
            return true;
        }
@@ -44,6 +44,7 @@ class che_저격시도 extends BaseWarUnitTrigger{
        }

        $self->activateSkill('저격');
+        $selfEnv['저격발동자'] = $this->raiseType;
        $selfEnv['woundMin'] = $this->woundMin;
        $selfEnv['woundMax'] = $this->woundMax;
        $selfEnv['addAtmos'] = $this->addAtmos;
@@ -0,0 +1,943 @@
+{
+    "title": "【가상모드27-d】 아시아 명장전(파죽지세)",
+    "startYear": 180,
+    "history": [
+        "<C>●</>180년 1월:<L><b>【가상모드27-d】</b>아시아 명장전!(파죽지세)</>",
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>삼국지를 기반으로 아시아의 고대 명장들이 추가된 시나리오"
+    ],
+    "stat": {
+        "total": 310,
+        "min": 40,
+        "max": 140
+    },
+    "iconPath": ".",
+    "fiction": 1,
+    "nation":[],
+    "diplomacy":[],
+    "const": {
+        "scenarioEffect": "event_StrongAttacker",
+        "availableInstantAction": {
+            "instantRetreat": true
+        }
+    },
+    "general":[
+        [0, "아회남", null, 0, null, 65, 74, 26, 0, 160, 300, null, null],
+        [0, "이적", null, 0, null, 40, 24, 84, 0, 160, 300, null, null],
+        [0, "윤상", null, 0, null, 51, 44, 62, 0, 160, 300, null, null],
+        [0, "윤묵", null, 0, null, 26, 15, 66, 0, 160, 300, null, null],
+        [0, "우금", null, 0, null, 85, 82, 75, 0, 160, 300, null, null],
+        [0, "위관", null, 0, null, 69, 46, 79, 0, 160, 300, null, null],
+        [0, "원윤", null, 0, null, 32, 14, 39, 0, 160, 300, null, null],
+        [0, "원희", null, 0, null, 66, 51, 63, 0, 160, 300, null, null],
+        [0, "염행", null, 0, null, 78, 90, 58, 0, 160, 300, null, null],
+        [0, "염유", null, 0, null, 71, 57, 71, 0, 160, 300, null, null],
+        [0, "원술", null, 0, null, 76, 65, 75, 0, 160, 300, null, null, "천한 것들관 상종을 하면 안돼"],
+        [0, "원상", null, 0, null, 63, 75, 42, 0, 160, 300, null, null],
+        [0, "원소", null, 0, null, 90, 69, 81, 0, 160, 300, null, null],
+        [0, "염상", null, 0, null, 40, 27, 71, 0, 160, 300, null, null],
+        [0, "원담", null, 0, null, 60, 78, 30, 0, 160, 300, null, null],
+        [0, "염포", null, 0, null, 40, 25, 82, 0, 160, 300, null, null],
+        [0, "왕위", null, 0, null, 60, 70, 62, 0, 160, 300, null, null],
+        [0, "왕윤", null, 0, null, 26, 6, 68, 0, 160, 300, null, null],
+        [0, "왕항", null, 0, null, 76, 60, 61, 0, 160, 300, null, null],
+        [0, "왕찬", null, 0, null, 15, 3, 79, 0, 160, 300, null, null],
+        [0, "왕수", null, 0, null, 54, 27, 77, 0, 160, 300, null, null],
+        [0, "왕숙", null, 0, null, 36, 22, 76, 0, 160, 300, null, null],
+        [0, "왕준", null, 0, null, 85, 73, 84, 0, 160, 300, null, null],
+        [0, "왕쌍", null, 0, null, 67, 88, 19, 0, 160, 300, null, null],
+        [0, "왕창", null, 0, null, 74, 64, 79, 0, 160, 300, null, null],
+        [0, "왕평", null, 0, null, 88, 81, 70, 0, 160, 300, null, null],
+        [0, "왕보", null, 0, null, 62, 41, 79, 0, 160, 300, null, null],
+        [0, "왕문", null, 0, null, 65, 64, 31, 0, 160, 300, null, null],
+        [0, "왕릉1", null, 0, null, 74, 64, 71, 0, 160, 300, null, null],
+        [0, "왕루", null, 0, null, 28, 30, 79, 0, 160, 300, null, null],
+        [0, "왕랑", null, 0, null, 47, 35, 79, 0, 160, 300, null, null],
+        [0, "온회", null, 0, null, 62, 36, 74, 0, 160, 300, null, null],
+        [0, "하안", null, 0, null, 15, 30, 72, 0, 160, 300, null, null],
+        [0, "괴월", null, 0, null, 50, 38, 85, 0, 160, 300, null, null],
+        [0, "괴량", null, 0, null, 68, 33, 88, 0, 160, 300, null, null],
+        [0, "가화", null, 0, null, 49, 65, 41, 0, 160, 300, null, null],
+        [0, "가규", null, 0, null, 78, 61, 84, 0, 160, 300, null, null],
+        [0, "하의", null, 0, null, 56, 69, 36, 0, 160, 300, null, null],
+        [0, "화흠", null, 0, null, 51, 33, 88, 0, 160, 300, null, null],
+        [0, "가후", null, 0, null, 81, 22, 98, 0, 160, 300, null, null, "이기기 위한 전략만 내드리겠습니다"],
+        [0, "곽가", null, 0, null, 78, 16, 99, 0, 160, 300, null, null, "조공을 위한 명이 조금만 더 남았다면..."],
+        [0, "악환", null, 0, null, 65, 80, 42, 0, 160, 300, null, null],
+        [0, "곽사", null, 0, null, 64, 76, 13, 0, 160, 300, null, null],
+        [0, "악취", null, 0, null, 53, 66, 61, 0, 160, 300, null, null],
+        [0, "곽준", null, 0, null, 73, 66, 73, 0, 160, 300, null, null],
+        [0, "학소", null, 0, null, 90, 71, 88, 0, 160, 300, null, null],
+        [0, "악진", null, 0, null, 80, 85, 56, 0, 160, 300, null, null],
+        [0, "곽도", null, 0, null, 62, 50, 82, 0, 160, 300, null, null],
+        [0, "학맹", null, 0, null, 62, 67, 42, 0, 160, 300, null, null],
+        [0, "곽유지", null, 0, null, 28, 9, 69, 0, 160, 300, null, null],
+        [0, "곽익", null, 0, null, 73, 69, 69, 0, 160, 300, null, null],
+        [0, "곽회", null, 0, null, 90, 77, 85, 0, 160, 300, null, null],
+        [0, "하후위", null, 0, null, 71, 73, 49, 0, 160, 300, null, null],
+        [0, "하후연", null, 0, null, 95, 92, 74, 0, 160, 300, null, null, "궁술로 날 당해낼 자가 있을까?"],
+        [0, "하후은", null, 0, null, 63, 72, 53, 0, 160, 300, null, null],
+        [0, "하후화", null, 0, null, 48, 51, 71, 0, 160, 300, null, null],
+        [0, "하후혜", null, 0, null, 50, 44, 76, 0, 160, 300, null, null],
+        [0, "하후현", null, 0, null, 54, 39, 76, 0, 160, 300, null, null],
+        [0, "하후상", null, 0, null, 79, 72, 75, 0, 160, 300, null, null],
+        [0, "하후덕", null, 0, null, 69, 73, 32, 0, 160, 300, null, null],
+        [0, "하후돈", null, 0, null, 91, 88, 68, 0, 160, 300, null, null],
+        [0, "하후패", null, 0, null, 79, 85, 77, 0, 160, 300, null, null],
+        [0, "하후무", null, 0, null, 20, 7, 4, 0, 160, 300, null, null],
+        [0, "가충", null, 0, null, 54, 31, 89, 0, 160, 300, null, null],
+        [0, "하진", null, 0, null, 68, 54, 75, 0, 160, 300, null, null],
+        [0, "화웅", null, 0, null, 78, 90, 55, 0, 160, 300, null, null],
+        [0, "한윤", null, 0, null, 26, 29, 65, 0, 160, 300, null, null],
+        [0, "관우", null, 0, null, 96, 99, 76, 0, 160, 300, null, null, "차가 식기 전에 적장의 목을 베어 오겠소!"],
+        [0, "환계", null, 0, null, 25, 26, 68, 0, 160, 300, null, null],
+        [0, "관해", null, 0, null, 70, 82, 10, 0, 160, 300, null, null],
+        [0, "관구검", null, 0, null, 84, 86, 62, 0, 160, 300, null, null],
+        [0, "한현", null, 0, null, 22, 33, 7, 0, 160, 300, null, null],
+        [0, "한호", null, 0, null, 73, 72, 84, 0, 160, 300, null, null],
+        [0, "관흥", null, 0, null, 76, 84, 67, 0, 160, 300, null, null],
+        [0, "관색", null, 0, null, 74, 83, 56, 0, 160, 300, null, null],
+        [0, "한수", null, 0, null, 78, 75, 79, 0, 160, 300, null, null],
+        [0, "한숭", null, 0, null, 25, 15, 71, 0, 160, 300, null, null],
+        [0, "관정", null, 0, null, 36, 52, 73, 0, 160, 300, null, null],
+        [0, "한섬", null, 0, null, 69, 66, 36, 0, 160, 300, null, null],
+        [0, "감택", null, 0, null, 51, 49, 83, 0, 160, 300, null, null],
+        [0, "한충", null, 0, null, 64, 67, 18, 0, 160, 300, null, null],
+        [0, "한당", null, 0, null, 76, 85, 61, 0, 160, 300, null, null],
+        [0, "한덕", null, 0, null, 63, 76, 25, 0, 160, 300, null, null],
+        [0, "감녕", null, 0, null, 92, 95, 76, 0, 160, 300, null, null],
+        [0, "한복", null, 0, null, 28, 3, 27, 0, 160, 300, null, null],
+        [0, "관평", null, 0, null, 78, 82, 72, 0, 160, 300, null, null],
+        [0, "간옹", null, 0, null, 20, 32, 75, 0, 160, 300, null, null],
+        [0, "안량", null, 0, null, 88, 96, 43, 0, 160, 300, null, null],
+        [0, "위연", null, 0, null, 91, 90, 75, 0, 160, 300, null, null],
+        [0, "국의", null, 0, null, 84, 78, 51, 0, 160, 300, null, null],
+        [0, "희지재", null, 0, null, 63, 35, 91, 0, 160, 300, null, null],
+        [0, "위속", null, 0, null, 67, 78, 31, 0, 160, 300, null, null],
+        [0, "위유", null, 0, null, 46, 29, 74, 0, 160, 300, null, null],
+        [0, "우금2", null, 0, null, 72, 79, 38, 0, 160, 300, null, null],
+        [0, "우보", null, 0, null, 38, 60, 21, 0, 160, 300, null, null],
+        [0, "강유", null, 0, null, 92, 80, 93, 0, 160, 300, null, null],
+        [0, "공지", null, 0, null, 43, 53, 62, 0, 160, 300, null, null],
+        [0, "교유", null, 0, null, 64, 69, 38, 0, 160, 300, null, null],
+        [0, "공도", null, 0, null, 59, 70, 23, 0, 160, 300, null, null],
+        [0, "허공", null, 0, null, 44, 66, 64, 0, 160, 300, null, null],
+        [0, "허정", null, 0, null, 23, 5, 68, 0, 160, 300, null, null],
+        [0, "허저", null, 0, null, 74, 97, 36, 0, 160, 300, null, null],
+        [0, "허유", null, 0, null, 36, 21, 80, 0, 160, 300, null, null],
+        [0, "기령", null, 0, null, 85, 84, 51, 0, 160, 300, null, null],
+        [0, "김의", null, 0, null, 32, 38, 65, 0, 160, 300, null, null],
+        [0, "김배삼결", null, 0, null, 64, 76, 19, 0, 160, 300, null, null],
+        [0, "김선", null, 0, null, 52, 68, 13, 0, 160, 300, null, null],
+        [0, "우번", null, 0, null, 46, 46, 87, 0, 160, 300, null, null],
+        [0, "형도영", null, 0, null, 69, 79, 41, 0, 160, 300, null, null],
+        [0, "엄안", null, 0, null, 82, 83, 72, 0, 160, 300, null, null],
+        [0, "엄망", null, 0, null, 68, 71, 40, 0, 160, 300, null, null],
+        [0, "엄준", null, 0, null, 41, 12, 71, 0, 160, 300, null, null],
+        [0, "엄정", null, 0, null, 50, 55, 39, 0, 160, 300, null, null],
+        [0, "엄백호", null, 0, null, 67, 70, 42, 0, 160, 300, null, null],
+        [0, "엄여", null, 0, null, 61, 78, 44, 0, 160, 300, null, null],
+        [0, "오의", null, 0, null, 79, 73, 70, 0, 160, 300, null, null],
+        [0, "황개", null, 0, null, 80, 86, 70, 0, 160, 300, null, null],
+        [0, "고간", null, 0, null, 74, 56, 48, 0, 160, 300, null, null],
+        [0, "황권", null, 0, null, 75, 59, 88, 0, 160, 300, null, null],
+        [0, "고유", null, 0, null, 57, 43, 72, 0, 160, 300, null, null],
+        [0, "고순", null, 0, null, 87, 89, 60, 0, 160, 300, null, null],
+        [0, "고상", null, 0, null, 68, 68, 53, 0, 160, 300, null, null],
+        [0, "고승", null, 0, null, 67, 73, 41, 0, 160, 300, null, null],
+        [0, "후성", null, 0, null, 74, 75, 68, 0, 160, 300, null, null],
+        [0, "후선", null, 0, null, 63, 66, 34, 0, 160, 300, null, null],
+        [0, "황조", null, 0, null, 81, 66, 62, 0, 160, 300, null, null],
+        [0, "공손월", null, 0, null, 74, 72, 47, 0, 160, 300, null, null],
+        [0, "공손연", null, 0, null, 65, 70, 60, 0, 160, 300, null, null],
+        [0, "공손공", null, 0, null, 39, 17, 69, 0, 160, 300, null, null],
+        [0, "공손강", null, 0, null, 72, 66, 65, 0, 160, 300, null, null],
+        [0, "공손찬", null, 0, null, 86, 82, 60, 0, 160, 300, null, null],
+        [0, "공손속", null, 0, null, 63, 68, 57, 0, 160, 300, null, null],
+        [0, "공손도", null, 0, null, 67, 71, 66, 0, 160, 300, null, null],
+        [0, "공손범", null, 0, null, 73, 69, 66, 0, 160, 300, null, null],
+        [0, "황충", null, 0, null, 88, 96, 70, 0, 160, 300, null, null],
+        [0, "고정", null, 0, null, 55, 63, 43, 0, 160, 300, null, null],
+        [0, "고패", null, 0, null, 66, 61, 69, 0, 160, 300, null, null],
+        [0, "황보숭", null, 0, null, 91, 61, 82, 0, 160, 300, null, null],
+        [0, "공융", null, 0, null, 30, 5, 73, 0, 160, 300, null, null],
+        [0, "고람", null, 0, null, 76, 82, 68, 0, 160, 300, null, null],
+        [0, "오경", null, 0, null, 69, 66, 52, 0, 160, 300, null, null],
+        [0, "호거아", null, 0, null, 70, 82, 41, 0, 160, 300, null, null],
+        [0, "호진", null, 0, null, 65, 74, 12, 0, 160, 300, null, null],
+        [0, "올돌골", null, 0, null, 79, 86, 11, 0, 160, 300, null, null],
+        [0, "호반", null, 0, null, 55, 55, 59, 0, 160, 300, null, null],
+        [0, "오반", null, 0, null, 74, 71, 59, 0, 160, 300, null, null],
+        [0, "고옹", null, 0, null, 52, 18, 81, 0, 160, 300, null, null],
+        [0, "오란", null, 0, null, 68, 80, 35, 0, 160, 300, null, null],
+        [0, "채화", null, 0, null, 39, 50, 1, 0, 160, 300, null, null],
+        [0, "채중", null, 0, null, 40, 54, 2, 0, 160, 300, null, null],
+        [0, "채모", null, 0, null, 70, 70, 77, 0, 160, 300, null, null],
+        [0, "착융", null, 0, null, 60, 69, 38, 0, 160, 300, null, null],
+        [0, "사마의", null, 0, null, 99, 63, 98, 0, 160, 300, null, null],
+        [0, "사마염", null, 0, null, 69, 59, 77, 0, 160, 300, null, null],
+        [0, "사마사", null, 0, null, 84, 64, 89, 0, 160, 300, null, null],
+        [0, "사마소", null, 0, null, 85, 57, 88, 0, 160, 300, null, null],
+        [0, "사마부", null, 0, null, 70, 37, 77, 0, 160, 300, null, null],
+        [0, "사마랑", null, 0, null, 20, 21, 72, 0, 160, 300, null, null],
+        [0, "사마가", null, 0, null, 66, 84, 25, 0, 160, 300, null, null],
+        [0, "주흔", null, 0, null, 65, 62, 73, 0, 160, 300, null, null],
+        [0, "주앙", null, 0, null, 74, 65, 65, 0, 160, 300, null, null],
+        [0, "주지", null, 0, null, 73, 85, 41, 0, 160, 300, null, null],
+        [0, "주창", null, 0, null, 68, 77, 42, 0, 160, 300, null, null],
+        [0, "주태", null, 0, null, 84, 90, 48, 0, 160, 300, null, null],
+        [0, "주방", null, 0, null, 52, 41, 80, 0, 160, 300, null, null],
+        [0, "주유", null, 0, null, 97, 71, 98, 0, 160, 300, null, null],
+        [0, "주환", null, 0, null, 87, 84, 77, 0, 160, 300, null, null],
+        [0, "주거", null, 0, null, 77, 57, 72, 0, 160, 300, null, null],
+        [0, "축융", null, 0, null, 72, 75, 35, 0, 160, 300, null, null],
+        [0, "주준", null, 0, null, 89, 65, 76, 0, 160, 300, null, null],
+        [0, "주연", null, 0, null, 86, 75, 74, 0, 160, 300, null, null],
+        [0, "주치", null, 0, null, 71, 56, 72, 0, 160, 300, null, null],
+        [0, "주포", null, 0, null, 68, 73, 34, 0, 160, 300, null, null],
+        [0, "주령", null, 0, null, 78, 73, 67, 0, 160, 300, null, null],
+        [0, "순욱", null, 0, null, 78, 38, 97, 0, 160, 300, null, null],
+        [0, "순우경", null, 0, null, 78, 66, 29, 0, 160, 300, null, null],
+        [0, "순심", null, 0, null, 45, 25, 78, 0, 160, 300, null, null],
+        [0, "순유", null, 0, null, 80, 35, 95, 0, 160, 300, null, null],
+        [0, "장완", null, 0, null, 78, 34, 89, 0, 160, 300, null, null],
+        [0, "종회", null, 0, null, 88, 62, 93, 0, 160, 300, null, null],
+        [0, "장간", null, 0, null, 19, 6, 66, 0, 160, 300, null, null],
+        [0, "장의거", null, 0, null, 71, 58, 59, 0, 160, 300, null, null],
+        [0, "장흠", null, 0, null, 78, 85, 54, 0, 160, 300, null, null],
+        [0, "장제3", null, 0, null, 62, 43, 85, 0, 160, 300, null, null],
+        [0, "초주", null, 0, null, 16, 3, 67, 0, 160, 300, null, null],
+        [0, "초촉", null, 0, null, 65, 76, 33, 0, 160, 300, null, null],
+        [0, "향총", null, 0, null, 76, 61, 77, 0, 160, 300, null, null],
+        [0, "종요", null, 0, null, 79, 24, 90, 0, 160, 300, null, null],
+        [0, "향랑", null, 0, null, 28, 18, 74, 0, 160, 300, null, null],
+        [0, "서영", null, 0, null, 92, 80, 62, 0, 160, 300, null, null],
+        [0, "제갈각", null, 0, null, 72, 47, 90, 0, 160, 300, null, null],
+        [0, "제갈근", null, 0, null, 75, 34, 85, 0, 160, 300, null, null],
+        [0, "제갈균", null, 0, null, 29, 25, 52, 0, 160, 300, null, null],
+        [0, "제갈탄", null, 0, null, 72, 72, 76, 0, 160, 300, null, null],
+        [0, "제갈량", null, 0, null, 98, 43, 100, 0, 160, 300, null, null],
+        [0, "서황", null, 0, null, 95, 94, 78, 0, 160, 300, null, null],
+        [0, "서서", null, 0, null, 90, 64, 94, 0, 160, 300, null, null],
+        [0, "서성", null, 0, null, 86, 81, 78, 0, 160, 300, null, null],
+        [0, "서막", null, 0, null, 55, 32, 68, 0, 160, 300, null, null],
+        [0, "신의", null, 0, null, 55, 59, 60, 0, 160, 300, null, null],
+        [0, "신탐", null, 0, null, 56, 62, 54, 0, 160, 300, null, null],
+        [0, "심배", null, 0, null, 80, 60, 84, 0, 160, 300, null, null],
+        [0, "신비", null, 0, null, 42, 24, 79, 0, 160, 300, null, null],
+        [0, "신평", null, 0, null, 69, 43, 77, 0, 160, 300, null, null],
+        [0, "진복", null, 0, null, 31, 7, 73, 0, 160, 300, null, null],
+        [0, "진랑", null, 0, null, 58, 70, 35, 0, 160, 300, null, null],
+        [0, "휴고", null, 0, null, 63, 71, 38, 0, 160, 300, null, null],
+        [0, "추단", null, 0, null, 61, 64, 34, 0, 160, 300, null, null],
+        [0, "성의", null, 0, null, 74, 72, 41, 0, 160, 300, null, null],
+        [0, "성공영", null, 0, null, 73, 71, 80, 0, 160, 300, null, null],
+        [0, "설종", null, 0, null, 34, 16, 73, 0, 160, 300, null, null],
+        [0, "단경1", null, 0, null, 71, 68, 43, 0, 160, 300, null, null],
+        [0, "전종", null, 0, null, 78, 72, 75, 0, 160, 300, null, null],
+        [0, "조예", null, 0, null, 72, 52, 82, 0, 160, 300, null, null],
+        [0, "조휴", null, 0, null, 84, 78, 62, 0, 160, 300, null, null],
+        [0, "송헌", null, 0, null, 68, 77, 38, 0, 160, 300, null, null],
+        [0, "조앙", null, 0, null, 78, 67, 69, 0, 160, 300, null, null],
+        [0, "조홍", null, 0, null, 80, 75, 55, 0, 160, 300, null, null],
+        [0, "조순", null, 0, null, 85, 83, 63, 0, 160, 300, null, null],
+        [0, "조창", null, 0, null, 86, 91, 59, 0, 160, 300, null, null],
+        [0, "조식", null, 0, null, 45, 22, 86, 0, 160, 300, null, null],
+        [0, "조진", null, 0, null, 88, 74, 70, 0, 160, 300, null, null],
+        [0, "조인", null, 0, null, 94, 90, 72, 0, 160, 300, null, null],
+        [0, "조성", null, 0, null, 54, 74, 38, 0, 160, 300, null, null],
+        [0, "조조", null, 0, null, 100, 72, 96, 0, 160, 300, null, null, "미망인이 더 매력적이란 말이야... 후후"],
+        [0, "조충", null, 0, null, 43, 21, 74, 0, 160, 300, null, null],
+        [0, "장패", null, 0, null, 78, 86, 53, 0, 160, 300, null, null],
+        [0, "조비", null, 0, null, 75, 71, 87, 0, 160, 300, null, null, "새로운 왕조를 열겠다..."],
+        [0, "조표", null, 0, null, 54, 69, 32, 0, 160, 300, null, null],
+        [0, "저수", null, 0, null, 86, 46, 95, 0, 160, 300, null, null],
+        [0, "소비", null, 0, null, 69, 63, 66, 0, 160, 300, null, null],
+        [0, "조무", null, 0, null, 70, 71, 66, 0, 160, 300, null, null],
+        [0, "손환", null, 0, null, 82, 73, 76, 0, 160, 300, null, null],
+        [0, "손견", null, 0, null, 94, 95, 73, 0, 160, 300, null, null],
+        [0, "손건", null, 0, null, 44, 33, 79, 0, 160, 300, null, null],
+        [0, "손권", null, 0, null, 86, 69, 83, 0, 160, 300, null, null],
+        [0, "손교", null, 0, null, 77, 72, 67, 0, 160, 300, null, null],
+        [0, "손책", null, 0, null, 93, 97, 74, 0, 160, 300, null, null],
+        [0, "손소", null, 0, null, 82, 79, 76, 0, 160, 300, null, null],
+        [0, "손정", null, 0, null, 66, 53, 73, 0, 160, 300, null, null],
+        [0, "손중", null, 0, null, 62, 71, 36, 0, 160, 300, null, null],
+        [0, "손등", null, 0, null, 62, 37, 79, 0, 160, 300, null, null],
+        [0, "손유", null, 0, null, 77, 70, 68, 0, 160, 300, null, null],
+        [0, "손익", null, 0, null, 67, 83, 27, 0, 160, 300, null, null],
+        [0, "손례", null, 0, null, 78, 81, 67, 0, 160, 300, null, null],
+        [0, "태사자", null, 0, null, 94, 94, 72, 0, 160, 300, null, null],
+        [0, "대래동주", null, 0, null, 51, 53, 54, 0, 160, 300, null, null],
+        [0, "대릉", null, 0, null, 70, 75, 39, 0, 160, 300, null, null],
+        [0, "타사대왕", null, 0, null, 62, 59, 70, 0, 160, 300, null, null],
+        [0, "담웅", null, 0, null, 58, 73, 14, 0, 160, 300, null, null],
+        [0, "장윤", null, 0, null, 72, 67, 42, 0, 160, 300, null, null],
+        [0, "조운", null, 0, null, 94, 96, 75, 0, 160, 300, null, null],
+        [0, "장위", null, 0, null, 74, 66, 45, 0, 160, 300, null, null],
+        [0, "장영", null, 0, null, 75, 74, 41, 0, 160, 300, null, null],
+        [0, "장연", null, 0, null, 76, 81, 57, 0, 160, 300, null, null],
+        [0, "장횡", null, 0, null, 59, 70, 23, 0, 160, 300, null, null],
+        [0, "장온", null, 0, null, 32, 10, 72, 0, 160, 300, null, null],
+        [0, "장개", null, 0, null, 34, 66, 8, 0, 160, 300, null, null],
+        [0, "장각", null, 0, null, 87, 35, 90, 0, 160, 300, null, null],
+        [0, "장기", null, 0, null, 74, 35, 76, 0, 160, 300, null, null],
+        [0, "장의", null, 0, null, 79, 72, 75, 0, 160, 300, null, null],
+        [0, "장훈", null, 0, null, 72, 68, 41, 0, 160, 300, null, null],
+        [0, "장굉", null, 0, null, 24, 22, 86, 0, 160, 300, null, null],
+        [0, "장합", null, 0, null, 92, 89, 76, 0, 160, 300, null, null],
+        [0, "조홍2", null, 0, null, 66, 72, 28, 0, 160, 300, null, null],
+        [0, "장제2", null, 0, null, 70, 66, 55, 0, 160, 300, null, null],
+        [0, "장수", null, 0, null, 80, 73, 64, 0, 160, 300, null, null],
+        [0, "장소", null, 0, null, 41, 13, 87, 0, 160, 300, null, null],
+        [0, "장송", null, 0, null, 40, 6, 85, 0, 160, 300, null, null],
+        [0, "장임", null, 0, null, 85, 84, 78, 0, 160, 300, null, null],
+        [0, "장제", null, 0, null, 67, 43, 80, 0, 160, 300, null, null],
+        [0, "장막", null, 0, null, 52, 53, 71, 0, 160, 300, null, null],
+        [0, "조범", null, 0, null, 28, 21, 32, 0, 160, 300, null, null],
+        [0, "장비", null, 0, null, 87, 98, 72, 0, 160, 300, null, null],
+        [0, "장포", null, 0, null, 78, 84, 48, 0, 160, 300, null, null],
+        [0, "장보", null, 0, null, 83, 71, 81, 0, 160, 300, null, null],
+        [0, "장만성", null, 0, null, 75, 81, 45, 0, 160, 300, null, null],
+        [0, "장양", null, 0, null, 72, 70, 66, 0, 160, 300, null, null],
+        [0, "장익", null, 0, null, 75, 74, 76, 0, 160, 300, null, null],
+        [0, "장료", null, 0, null, 96, 94, 78, 0, 160, 300, null, null],
+        [0, "장량", null, 0, null, 78, 80, 74, 0, 160, 300, null, null],
+        [0, "조루", null, 0, null, 70, 43, 68, 0, 160, 300, null, null],
+        [0, "장로", null, 0, null, 65, 42, 81, 0, 160, 300, null, null],
+        [0, "진횡", null, 0, null, 64, 63, 26, 0, 160, 300, null, null],
+        [0, "진응", null, 0, null, 62, 72, 45, 0, 160, 300, null, null],
+        [0, "진기", null, 0, null, 58, 65, 43, 0, 160, 300, null, null],
+        [0, "진궁", null, 0, null, 84, 55, 90, 0, 160, 300, null, null],
+        [0, "진교", null, 0, null, 61, 27, 77, 0, 160, 300, null, null],
+        [0, "진군", null, 0, null, 32, 14, 75, 0, 160, 300, null, null],
+        [0, "진규", null, 0, null, 30, 4, 82, 0, 160, 300, null, null],
+        [0, "진식", null, 0, null, 70, 71, 25, 0, 160, 300, null, null],
+        [0, "진진", null, 0, null, 46, 46, 69, 0, 160, 300, null, null],
+        [0, "진태", null, 0, null, 86, 77, 89, 0, 160, 300, null, null],
+        [0, "진등", null, 0, null, 79, 64, 81, 0, 160, 300, null, null],
+        [0, "진도", null, 0, null, 82, 78, 67, 0, 160, 300, null, null],
+        [0, "진무", null, 0, null, 76, 87, 43, 0, 160, 300, null, null],
+        [0, "진란", null, 0, null, 66, 69, 40, 0, 160, 300, null, null],
+        [0, "진림", null, 0, null, 25, 9, 75, 0, 160, 300, null, null],
+        [0, "정욱", null, 0, null, 76, 49, 94, 0, 160, 300, null, null],
+        [0, "정원지", null, 0, null, 69, 74, 17, 0, 160, 300, null, null],
+        [0, "정은", null, 0, null, 69, 73, 40, 0, 160, 300, null, null],
+        [0, "정원", null, 0, null, 70, 76, 35, 0, 160, 300, null, null],
+        [0, "정보", null, 0, null, 84, 79, 79, 0, 160, 300, null, null],
+        [0, "정봉", null, 0, null, 81, 92, 75, 0, 160, 300, null, null],
+        [0, "전위", null, 0, null, 79, 98, 42, 0, 160, 300, null, null],
+        [0, "전해", null, 0, null, 68, 65, 58, 0, 160, 300, null, null],
+        [0, "전주", null, 0, null, 66, 66, 73, 0, 160, 300, null, null],
+        [0, "전풍", null, 0, null, 82, 43, 96, 0, 160, 300, null, null],
+        [0, "전예", null, 0, null, 93, 85, 80, 0, 160, 300, null, null],
+        [0, "동윤", null, 0, null, 47, 28, 79, 0, 160, 300, null, null],
+        [0, "동화", null, 0, null, 57, 34, 75, 0, 160, 300, null, null],
+        [0, "등애", null, 0, null, 92, 80, 94, 0, 160, 300, null, null],
+        [0, "도겸", null, 0, null, 51, 27, 64, 0, 160, 300, null, null],
+        [0, "등현", null, 0, null, 61, 73, 45, 0, 160, 300, null, null],
+        [0, "등지", null, 0, null, 73, 52, 81, 0, 160, 300, null, null],
+        [0, "동습", null, 0, null, 72, 85, 50, 0, 160, 300, null, null],
+        [0, "동승", null, 0, null, 56, 53, 65, 0, 160, 300, null, null],
+        [0, "동소", null, 0, null, 34, 25, 80, 0, 160, 300, null, null],
+        [0, "동탁", null, 0, null, 91, 87, 72, 0, 160, 300, null, null],
+        [0, "동도나", null, 0, null, 68, 73, 31, 0, 160, 300, null, null],
+        [0, "동민", null, 0, null, 49, 60, 25, 0, 160, 300, null, null],
+        [0, "등무", null, 0, null, 61, 75, 29, 0, 160, 300, null, null],
+        [0, "두기", null, 0, null, 74, 43, 78, 0, 160, 300, null, null],
+        [0, "두예", null, 0, null, 96, 69, 95, 0, 160, 300, null, null],
+        [0, "배원소", null, 0, null, 49, 65, 25, 0, 160, 300, null, null],
+        [0, "마완", null, 0, null, 71, 74, 16, 0, 160, 300, null, null],
+        [0, "마휴", null, 0, null, 68, 73, 48, 0, 160, 300, null, null],
+        [0, "파재", null, 0, null, 74, 74, 55, 0, 160, 300, null, null],
+        [0, "마준", null, 0, null, 38, 52, 31, 0, 160, 300, null, null],
+        [0, "마속", null, 0, null, 61, 67, 84, 0, 160, 300, null, null],
+        [0, "마대", null, 0, null, 79, 85, 62, 0, 160, 300, null, null],
+        [0, "마충", null, 0, null, 78, 72, 68, 0, 160, 300, null, null],
+        [0, "마초", null, 0, null, 86, 97, 44, 0, 160, 300, null, null, "서량의 금마초 나가신다!"],
+        [0, "마철", null, 0, null, 70, 62, 58, 0, 160, 300, null, null],
+        [0, "마등", null, 0, null, 85, 80, 52, 0, 160, 300, null, null],
+        [0, "마량", null, 0, null, 53, 23, 85, 0, 160, 300, null, null],
+        [0, "반준", null, 0, null, 61, 46, 82, 0, 160, 300, null, null],
+        [0, "반장", null, 0, null, 76, 80, 69, 0, 160, 300, null, null],
+        [0, "번조", null, 0, null, 66, 73, 31, 0, 160, 300, null, null],
+        [0, "번능", null, 0, null, 69, 61, 36, 0, 160, 300, null, null],
+        [0, "반봉", null, 0, null, 56, 77, 4, 0, 160, 300, null, null],
+        [0, "비의", null, 0, null, 82, 56, 88, 0, 160, 300, null, null],
+        [0, "비연", null, 0, null, 60, 66, 21, 0, 160, 300, null, null],
+        [0, "비시", null, 0, null, 18, 28, 65, 0, 160, 300, null, null],
+        [0, "미축", null, 0, null, 33, 29, 78, 0, 160, 300, null, null],
+        [0, "미방", null, 0, null, 54, 61, 32, 0, 160, 300, null, null],
+        [0, "비요", null, 0, null, 70, 66, 73, 0, 160, 300, null, null],
+        [0, "무안국", null, 0, null, 70, 79, 34, 0, 160, 300, null, null],
+        [0, "풍습", null, 0, null, 72, 71, 39, 0, 160, 300, null, null],
+        [0, "부사인", null, 0, null, 46, 63, 37, 0, 160, 300, null, null],
+        [0, "부첨", null, 0, null, 73, 85, 76, 0, 160, 300, null, null],
+        [0, "부손", null, 0, null, 29, 13, 70, 0, 160, 300, null, null],
+        [0, "문앙", null, 0, null, 76, 96, 65, 0, 160, 300, null, null],
+        [0, "문흠", null, 0, null, 74, 79, 43, 0, 160, 300, null, null],
+        [0, "문추", null, 0, null, 87, 95, 49, 0, 160, 300, null, null],
+        [0, "문빙", null, 0, null, 88, 85, 69, 0, 160, 300, null, null],
+        [0, "변희", null, 0, null, 56, 70, 62, 0, 160, 300, null, null],
+        [0, "망아장", null, 0, null, 45, 79, 3, 0, 160, 300, null, null],
+        [0, "봉기", null, 0, null, 56, 48, 84, 0, 160, 300, null, null],
+        [0, "방희", null, 0, null, 60, 38, 69, 0, 160, 300, null, null],
+        [0, "법정", null, 0, null, 82, 47, 94, 0, 160, 300, null, null],
+        [0, "방통", null, 0, null, 79, 34, 97, 0, 160, 300, null, null],
+        [0, "방덕", null, 0, null, 89, 94, 70, 0, 160, 300, null, null],
+        [0, "포륭", null, 0, null, 58, 76, 49, 0, 160, 300, null, null],
+        [0, "목순", null, 0, null, 52, 77, 11, 0, 160, 300, null, null],
+        [0, "목록대왕", null, 0, null, 65, 71, 39, 0, 160, 300, null, null],
+        [0, "보즐", null, 0, null, 83, 51, 81, 0, 160, 300, null, null],
+        [0, "만총", null, 0, null, 88, 64, 87, 0, 160, 300, null, null],
+        [0, "모개", null, 0, null, 63, 39, 60, 0, 160, 300, null, null],
+        [0, "맹획", null, 0, null, 81, 88, 42, 0, 160, 300, null, null],
+        [0, "맹체", null, 0, null, 75, 73, 75, 0, 160, 300, null, null],
+        [0, "맹우", null, 0, null, 50, 68, 22, 0, 160, 300, null, null],
+        [0, "유섭", null, 0, null, 62, 79, 24, 0, 160, 300, null, null],
+        [0, "양부", null, 0, null, 62, 68, 68, 0, 160, 300, null, null],
+        [0, "옹개", null, 0, null, 73, 75, 57, 0, 160, 300, null, null],
+        [0, "양의", null, 0, null, 68, 40, 82, 0, 160, 300, null, null],
+        [0, "양호", null, 0, null, 94, 69, 92, 0, 160, 300, null, null],
+        [0, "양홍", null, 0, null, 33, 15, 77, 0, 160, 300, null, null],
+        [0, "양앙", null, 0, null, 68, 72, 38, 0, 160, 300, null, null],
+        [0, "양추", null, 0, null, 52, 65, 40, 0, 160, 300, null, null],
+        [0, "양수", null, 0, null, 46, 23, 83, 0, 160, 300, null, null],
+        [0, "양추2", null, 0, null, 67, 64, 60, 0, 160, 300, null, null],
+        [0, "양송", null, 0, null, 17, 5, 28, 0, 160, 300, null, null],
+        [0, "양임", null, 0, null, 70, 78, 56, 0, 160, 300, null, null],
+        [0, "양조", null, 0, null, 53, 61, 36, 0, 160, 300, null, null],
+        [0, "양백", null, 0, null, 44, 45, 19, 0, 160, 300, null, null],
+        [0, "양부2", null, 0, null, 67, 50, 83, 0, 160, 300, null, null],
+        [0, "양봉", null, 0, null, 66, 65, 31, 0, 160, 300, null, null],
+        [0, "양봉2", null, 0, null, 54, 62, 53, 0, 160, 300, null, null],
+        [0, "뇌동", null, 0, null, 69, 78, 51, 0, 160, 300, null, null],
+        [0, "뇌박", null, 0, null, 62, 70, 36, 0, 160, 300, null, null],
+        [0, "이이", null, 0, null, 63, 77, 19, 0, 160, 300, null, null],
+        [0, "이회", null, 0, null, 79, 65, 79, 0, 160, 300, null, null],
+        [0, "이각", null, 0, null, 69, 72, 24, 0, 160, 300, null, null],
+        [0, "육항", null, 0, null, 94, 68, 93, 0, 160, 300, null, null],
+        [0, "육적", null, 0, null, 20, 7, 72, 0, 160, 300, null, null],
+        [0, "육손", null, 0, null, 97, 71, 96, 0, 160, 300, null, null],
+        [0, "이엄", null, 0, null, 83, 84, 76, 0, 160, 300, null, null],
+        [0, "이유", null, 0, null, 61, 26, 93, 0, 160, 300, null, null],
+        [0, "이숙", null, 0, null, 46, 69, 61, 0, 160, 300, null, null],
+        [0, "이통", null, 0, null, 73, 81, 62, 0, 160, 300, null, null],
+        [0, "이전", null, 0, null, 78, 80, 79, 0, 160, 300, null, null],
+        [0, "이풍", null, 0, null, 69, 74, 50, 0, 160, 300, null, null],
+        [0, "유언", null, 0, null, 61, 38, 80, 0, 160, 300, null, null],
+        [0, "유괴", null, 0, null, 71, 73, 67, 0, 160, 300, null, null],
+        [0, "유기", null, 0, null, 52, 12, 63, 0, 160, 300, null, null],
+        [0, "유우", null, 0, null, 62, 33, 75, 0, 160, 300, null, null],
+        [0, "유훈", null, 0, null, 47, 63, 35, 0, 160, 300, null, null],
+        [0, "유현", null, 0, null, 54, 66, 51, 0, 160, 300, null, null],
+        [0, "유순", null, 0, null, 63, 46, 41, 0, 160, 300, null, null],
+        [0, "유장", null, 0, null, 31, 5, 34, 0, 160, 300, null, null],
+        [0, "유심", null, 0, null, 60, 62, 70, 0, 160, 300, null, null],
+        [0, "유선", null, 0, null, 3, 5, 9, 0, 160, 300, null, null],
+        [0, "유종", null, 0, null, 24, 22, 65, 0, 160, 300, null, null],
+        [0, "유도", null, 0, null, 25, 23, 26, 0, 160, 300, null, null],
+        [0, "유파", null, 0, null, 29, 22, 75, 0, 160, 300, null, null],
+        [0, "유반", null, 0, null, 69, 76, 47, 0, 160, 300, null, null],
+        [0, "유비", null, 0, null, 88, 78, 75, 0, 160, 300, null, null, "한왕실은 중산정왕의 후손인 내가 이어받겠다...!"],
+        [0, "유표", null, 0, null, 48, 31, 72, 0, 160, 300, null, null],
+        [0, "유복", null, 0, null, 64, 49, 74, 0, 160, 300, null, null],
+        [0, "유벽", null, 0, null, 70, 72, 47, 0, 160, 300, null, null],
+        [0, "유봉", null, 0, null, 75, 79, 44, 0, 160, 300, null, null],
+        [0, "유엽", null, 0, null, 56, 32, 92, 0, 160, 300, null, null],
+        [0, "유요", null, 0, null, 62, 67, 46, 0, 160, 300, null, null],
+        [0, "여위황", null, 0, null, 58, 63, 29, 0, 160, 300, null, null],
+        [0, "요화", null, 0, null, 73, 76, 69, 0, 160, 300, null, null],
+        [0, "양흥", null, 0, null, 61, 65, 19, 0, 160, 300, null, null],
+        [0, "양습", null, 0, null, 73, 40, 74, 0, 160, 300, null, null],
+        [0, "양서", null, 0, null, 56, 62, 66, 0, 160, 300, null, null],
+        [0, "능조", null, 0, null, 75, 81, 42, 0, 160, 300, null, null],
+        [0, "능통", null, 0, null, 83, 89, 60, 0, 160, 300, null, null],
+        [0, "여개", null, 0, null, 53, 30, 67, 0, 160, 300, null, null],
+        [0, "여건", null, 0, null, 57, 70, 62, 0, 160, 300, null, null],
+        [0, "여광", null, 0, null, 56, 70, 13, 0, 160, 300, null, null],
+        [0, "여상", null, 0, null, 54, 71, 12, 0, 160, 300, null, null],
+        [0, "여대", null, 0, null, 80, 71, 70, 0, 160, 300, null, null],
+        [0, "여범", null, 0, null, 73, 63, 75, 0, 160, 300, null, null],
+        [0, "여포", null, 0, null, 89, 100, 42, 0, 160, 300, null, null, "다 덤비거라! 하하하하"],
+        [0, "여몽", null, 0, null, 91, 81, 90, 0, 160, 300, null, null],
+        [0, "윤직", null, 0, null, 46, 42, 73, 0, 160, 300, null, null],
+        [0, "냉포", null, 0, null, 71, 82, 61, 0, 160, 300, null, null],
+        [0, "누규", null, 0, null, 52, 13, 87, 0, 160, 300, null, null],
+        [0, "노숙", null, 0, null, 89, 56, 93, 0, 160, 300, null, null],
+        [0, "노식", null, 0, null, 86, 63, 82, 0, 160, 300, null, null],
+        [0, "범강", null, 0, null, 49, 50, 36, 0, 160, 300, null, null],
+        [0, "장달", null, 0, null, 43, 56, 34, 0, 160, 300, null, null],
+        [0, "규람", null, 0, null, 55, 70, 58, 0, 160, 300, null, null],
+        [0, "대원", null, 0, null, 38, 32, 68, 0, 160, 300, null, null],
+        [0, "왕기", null, 0, null, 81, 72, 86, 0, 160, 300, null, null],
+        [0, "왕상", null, 0, null, 23, 19, 68, 0, 160, 300, null, null],
+        [0, "왕돈", null, 0, null, 60, 66, 46, 0, 160, 300, null, null],
+        [0, "악침", null, 0, null, 73, 75, 43, 0, 160, 300, null, null],
+        [0, "하제", null, 0, null, 83, 70, 82, 0, 160, 300, null, null],
+        [0, "환범", null, 0, null, 40, 11, 78, 0, 160, 300, null, null],
+        [0, "견초", null, 0, null, 72, 79, 73, 0, 160, 300, null, null],
+        [0, "고당륭", null, 0, null, 35, 24, 76, 0, 160, 300, null, null],
+        [0, "오찬", null, 0, null, 68, 41, 78, 0, 160, 300, null, null],
+        [0, "호질", null, 0, null, 73, 46, 74, 0, 160, 300, null, null],
+        [0, "오질", null, 0, null, 16, 29, 68, 0, 160, 300, null, null],
+        [0, "호준", null, 0, null, 79, 76, 62, 0, 160, 300, null, null],
+        [0, "고담", null, 0, null, 53, 23, 77, 0, 160, 300, null, null],
+        [0, "최림", null, 0, null, 32, 22, 66, 0, 160, 300, null, null],
+        [0, "사마망", null, 0, null, 78, 58, 83, 0, 160, 300, null, null],
+        [0, "주이", null, 0, null, 70, 73, 61, 0, 160, 300, null, null],
+        [0, "전단", null, 0, null, 67, 64, 39, 0, 160, 300, null, null],
+        [0, "조우", null, 0, null, 50, 43, 37, 0, 160, 300, null, null],
+        [0, "조상", null, 0, null, 39, 33, 30, 0, 160, 300, null, null],
+        [0, "조방", null, 0, null, 20, 14, 27, 0, 160, 300, null, null],
+        [0, "태사향", null, 0, null, 57, 66, 48, 0, 160, 300, null, null],
+        [0, "장휴", null, 0, null, 63, 27, 74, 0, 160, 300, null, null],
+        [0, "장호", null, 0, null, 75, 74, 51, 0, 160, 300, null, null],
+        [0, "조광", null, 0, null, 67, 71, 53, 0, 160, 300, null, null],
+        [0, "장집", null, 0, null, 76, 29, 80, 0, 160, 300, null, null],
+        [0, "장승", null, 0, null, 77, 70, 75, 0, 160, 300, null, null],
+        [0, "장소2", null, 0, null, 23, 56, 31, 0, 160, 300, null, null],
+        [0, "조통", null, 0, null, 68, 67, 61, 0, 160, 300, null, null],
+        [0, "진표", null, 0, null, 66, 42, 74, 0, 160, 300, null, null],
+        [0, "정무", null, 0, null, 56, 35, 75, 0, 160, 300, null, null],
+        [0, "정봉2", null, 0, null, 66, 66, 53, 0, 160, 300, null, null],
+        [0, "전만", null, 0, null, 51, 73, 39, 0, 160, 300, null, null],
+        [0, "마균", null, 0, null, 22, 17, 71, 0, 160, 300, null, null],
+        [0, "방회", null, 0, null, 69, 75, 49, 0, 160, 300, null, null],
+        [0, "낙통", null, 0, null, 76, 58, 75, 0, 160, 300, null, null],
+        [0, "육개", null, 0, null, 65, 61, 79, 0, 160, 300, null, null],
+        [0, "유찬", null, 0, null, 78, 81, 64, 0, 160, 300, null, null],
+        [0, "유소", null, 0, null, 68, 53, 74, 0, 160, 300, null, null],
+        [0, "요립", null, 0, null, 32, 15, 76, 0, 160, 300, null, null],
+        [0, "여거", null, 0, null, 78, 69, 71, 0, 160, 300, null, null],
+        [0, "제갈첨", null, 0, null, 70, 57, 76, 0, 160, 300, null, null],
+        [0, "손휴", null, 0, null, 57, 42, 78, 0, 160, 300, null, null],
+        [0, "극정", null, 0, null, 42, 23, 68, 0, 160, 300, null, null],
+        [0, "호분", null, 0, null, 71, 76, 50, 0, 160, 300, null, null],
+        [0, "손량", null, 0, null, 32, 26, 70, 0, 160, 300, null, null],
+        [0, "마막", null, 0, null, 34, 12, 44, 0, 160, 300, null, null],
+        [0, "손호", null, 0, null, 41, 73, 71, 0, 160, 300, null, null],
+        [0, "조모", null, 0, null, 54, 61, 59, 0, 160, 300, null, null],
+        [0, "조환", null, 0, null, 30, 28, 30, 0, 160, 300, null, null],
+        [0, "사마유", null, 0, null, 71, 68, 75, 0, 160, 300, null, null],
+        [0, "제갈상", null, 0, null, 64, 79, 62, 0, 160, 300, null, null],
+        [0, "손화", null, 0, null, 31, 39, 68, 0, 160, 300, null, null],
+        [0, "염우", null, 0, null, 52, 61, 51, 0, 160, 300, null, null],
+        [0, "왕경", null, 0, null, 67, 63, 71, 0, 160, 300, null, null],
+        [0, "왕혼", null, 0, null, 74, 71, 63, 0, 160, 300, null, null],
+        [0, "곽혁", null, 0, null, 33, 29, 70, 0, 160, 300, null, null],
+        [0, "가범", null, 0, null, 60, 62, 73, 0, 160, 300, null, null],
+        [0, "서질", null, 0, null, 68, 83, 24, 0, 160, 300, null, null],
+        [0, "손준", null, 0, null, 64, 70, 65, 0, 160, 300, null, null],
+        [0, "손침", null, 0, null, 58, 55, 65, 0, 160, 300, null, null],
+        [0, "우사", null, 0, null, 61, 34, 74, 0, 160, 300, null, null],
+        [0, "진건", null, 0, null, 72, 71, 65, 0, 160, 300, null, null],
+        [0, "동궐", null, 0, null, 65, 59, 76, 0, 160, 300, null, null],
+        [0, "당자", null, 0, null, 61, 71, 50, 0, 160, 300, null, null],
+        [0, "등충", null, 0, null, 76, 80, 69, 0, 160, 300, null, null],
+        [0, "황숭", null, 0, null, 67, 63, 72, 0, 160, 300, null, null],
+        [0, "화핵", null, 0, null, 20, 24, 71, 0, 160, 300, null, null],
+        [0, "허의", null, 0, null, 51, 74, 15, 0, 160, 300, null, null],
+        [0, "송겸", null, 0, null, 66, 78, 42, 0, 160, 300, null, null],
+        [0, "호제", null, 0, null, 57, 39, 68, 0, 160, 300, null, null],
+        [0, "나헌", null, 0, null, 86, 70, 82, 0, 160, 300, null, null],
+        [0, "노숙2", null, 0, null, 73, 53, 74, 0, 160, 300, null, null],
+        [0, "구성", null, 0, null, 63, 70, 38, 0, 160, 300, null, null],
+        [0, "어부라", null, 0, null, 72, 68, 21, 0, 160, 300, null, null],
+        [0, "아하소과", null, 0, null, 61, 76, 13, 0, 160, 300, null, null],
+        [0, "가비능", null, 0, null, 77, 69, 52, 0, 160, 300, null, null],
+        [0, "구력거", null, 0, null, 80, 68, 56, 0, 160, 300, null, null],
+        [0, "강단", null, 0, null, 65, 83, 48, 0, 160, 300, null, null],
+        [0, "황란", null, 0, null, 63, 75, 44, 0, 160, 300, null, null],
+        [0, "호주천", null, 0, null, 70, 71, 40, 0, 160, 300, null, null],
+        [0, "종리목", null, 0, null, 84, 72, 82, 0, 160, 300, null, null],
+        [0, "제갈교", null, 0, null, 62, 27, 75, 0, 160, 300, null, null],
+        [0, "답돈", null, 0, null, 84, 82, 61, 0, 160, 300, null, null],
+        [0, "반임", null, 0, null, 66, 79, 38, 0, 160, 300, null, null],
+        [0, "보도근", null, 0, null, 64, 73, 50, 0, 160, 300, null, null],
+        [0, "미당대왕", null, 0, null, 59, 69, 21, 0, 160, 300, null, null],
+        [0, "유표2", null, 0, null, 73, 74, 48, 0, 160, 300, null, null],
+        [0, "루반", null, 0, null, 65, 76, 39, 0, 160, 300, null, null],
+        [0, "손관", null, 0, null, 72, 78, 51, 0, 160, 300, null, null],
+        [0, "곽석", null, 0, null, 59, 71, 48, 0, 160, 300, null, null],
+        [0, "주조", null, 0, null, 63, 68, 26, 0, 160, 300, null, null],
+        [0, "장거", null, 0, null, 79, 75, 56, 0, 160, 300, null, null],
+        [0, "장순", null, 0, null, 73, 81, 60, 0, 160, 300, null, null],
+        [0, "철리길", null, 0, null, 77, 70, 52, 0, 160, 300, null, null],
+        [0, "주삭", null, 0, null, 54, 60, 50, 0, 160, 300, null, null],
+        [0, "황월영", null, 0, null, 46, 33, 78, 0, 160, 300, null, null],
+        [0, "채염", null, 0, null, 42, 26, 82, 0, 160, 300, null, null],
+        [0, "소교", null, 0, null, 23, 15, 78, 0, 160, 300, null, null],
+        [0, "신헌영", null, 0, null, 65, 35, 90, 0, 160, 300, null, null, "내가 사내로 태어났더라면..."],
+        [0, "손상향", null, 0, null, 72, 79, 55, 0, 160, 300, null, null],
+        [0, "대교", null, 0, null, 22, 30, 78, 0, 160, 300, null, null],
+        [0, "초선", null, 0, null, 12, 22, 71, 0, 160, 300, null, null],
+        [0, "교모", null, 0, null, 54, 45, 69, 0, 160, 300, null, null],
+        [0, "관구수", null, 0, null, 58, 62, 33, 0, 160, 300, null, null],
+        [0, "관구전", null, 0, null, 63, 60, 69, 0, 160, 300, null, null],
+        [0, "원유", null, 0, null, 56, 40, 73, 0, 160, 300, null, null],
+        [0, "왕광", null, 0, null, 65, 55, 61, 0, 160, 300, null, null],
+        [0, "신창", null, 0, null, 50, 26, 42, 0, 160, 300, null, null],
+        [0, "사마주", null, 0, null, 61, 52, 61, 0, 160, 300, null, null],
+        [0, "양제", null, 0, null, 67, 68, 71, 0, 160, 300, null, null],
+        [0, "성만", null, 0, null, 61, 68, 66, 0, 160, 300, null, null],
+        [0, "오연", null, 0, null, 66, 73, 42, 0, 160, 300, null, null],
+        [0, "맹충", null, 0, null, 47, 28, 72, 0, 160, 300, null, null],
+        [0, "잠혼", null, 0, null, 1, 1, 22, 0, 160, 300, null, null],
+        [0, "사정", null, 0, null, 64, 76, 34, 0, 160, 300, null, null],
+        [0, "심영", null, 0, null, 70, 77, 61, 0, 160, 300, null, null],
+        [0, "도준", null, 0, null, 65, 66, 46, 0, 160, 300, null, null],
+        [0, "만욱", null, 0, null, 21, 25, 71, 0, 160, 300, null, null],
+        [0, "오언", null, 0, null, 76, 81, 65, 0, 160, 300, null, null],
+        [0, "위막", null, 0, null, 57, 62, 59, 0, 160, 300, null, null],
+        [0, "시삭", null, 0, null, 38, 65, 47, 0, 160, 300, null, null],
+        [0, "전속", null, 0, null, 47, 60, 55, 0, 160, 300, null, null],
+        [0, "장화", null, 0, null, 36, 27, 78, 0, 160, 300, null, null],
+        [0, "오거", null, 0, null, 49, 61, 23, 0, 160, 300, null, null],
+        [0, "추정", null, 0, null, 70, 64, 66, 0, 160, 300, null, null],
+        [0, "장특", null, 0, null, 73, 54, 75, 0, 160, 300, null, null],
+        [0, "곽마", null, 0, null, 68, 71, 47, 0, 160, 300, null, null],
+        [0, "석포", null, 0, null, 69, 71, 56, 0, 160, 300, null, null],
+        [0, "견홍", null, 0, null, 70, 74, 66, 0, 160, 300, null, null],
+        [0, "한거자", null, 0, null, 51, 59, 51, 0, 160, 300, null, null],
+        [0, "휴원진", null, 0, null, 52, 68, 45, 0, 160, 300, null, null],
+        [0, "곽원", null, 0, null, 66, 73, 36, 0, 160, 300, null, null],
+        [0, "계옹", null, 0, null, 63, 52, 41, 0, 160, 300, null, null],
+        [0, "이부", null, 0, null, 31, 36, 74, 0, 160, 300, null, null],
+        [0, "왕업", null, 0, null, 33, 6, 35, 0, 160, 300, null, null],
+        [0, "좌혁", null, 0, null, 62, 66, 51, 0, 160, 300, null, null],
+        [0, "화타", null, 0, null, 57, 25, 73, 0, 160, 300, null, null, "아픈 사람들 모두 내게 오시오~"],
+        [0, "사마휘", null, 0, null, 55, 26, 82, 0, 160, 300, null, null, "좋지 좋아~"],
+        [0, "우길", null, 0, null, 23, 15, 90, 0, 160, 300, null, null, "길조로다"],
+        [0, "헌제", null, 0, null, 22, 18, 68, 0, 160, 300, null, null, "한왕실은 정녕 여기서 끝이란 말인가.."],
+        [0, "왕검", null, 0, null, 92, 51, 91, 0, 160, 300, null, null],
+        [0, "위만", null, 0, null, 93, 90, 62, 0, 160, 300, null, null],
+        [0, "부분노", null, 0, null, 97, 68, 96, 0, 160, 300, null, null],
+        [0, "무휼", null, 0, null, 98, 93, 72, 0, 160, 300, null, null],
+        [0, "태조대왕", null, 0, null, 92, 63, 91, 0, 160, 300, null, null],
+        [0, "명림답부", null, 0, null, 94, 68, 99, 0, 160, 300, null, null],
+        [0, "달가", null, 0, null, 91, 60, 96, 0, 160, 300, null, null],
+        [0, "고노자", null, 0, null, 93, 96, 62, 0, 160, 300, null, null],
+        [0, "미천왕", null, 0, null, 91, 60, 88, 0, 160, 300, null, null],
+        [0, "고무", null, 0, null, 90, 93, 63, 0, 160, 300, null, null],
+        [0, "광개토대왕", null, 0, null, 100, 99, 71, 0, 160, 300, null, null],
+        [0, "장수왕", null, 0, null, 97, 94, 63, 0, 160, 300, null, null],
+        [0, "을지문덕", null, 0, null, 99, 70, 98, 0, 160, 300, null, null],
+        [0, "고흘", null, 0, null, 88, 91, 63, 0, 160, 300, null, null],
+        [0, "온달", null, 0, null, 90, 92, 60, 0, 160, 300, null, null],
+        [0, "고건무", null, 0, null, 97, 91, 71, 0, 160, 300, null, null],
+        [0, "양만춘", null, 0, null, 98, 69, 91, 0, 160, 300, null, null],
+        [0, "연개소문", null, 0, null, 92, 66, 91, 0, 160, 300, null, null],
+        [0, "근초고왕", null, 0, null, 93, 93, 70, 0, 160, 300, null, null],
+        [0, "목라근자", null, 0, null, 89, 90, 68, 0, 160, 300, null, null],
+        [0, "근구수왕", null, 0, null, 90, 63, 89, 0, 160, 300, null, null],
+        [0, "사법명", null, 0, null, 91, 66, 92, 0, 160, 300, null, null],
+        [0, "찬수류", null, 0, null, 87, 60, 83, 0, 160, 300, null, null],
+        [0, "해례곤", null, 0, null, 86, 88, 59, 0, 160, 300, null, null],
+        [0, "목간나", null, 0, null, 85, 87, 61, 0, 160, 300, null, null],
+        [0, "윤충", null, 0, null, 90, 87, 59, 0, 160, 300, null, null],
+        [0, "의직", null, 0, null, 85, 61, 83, 0, 160, 300, null, null],
+        [0, "계백", null, 0, null, 93, 71, 94, 0, 160, 300, null, null],
+        [0, "귀실복신", null, 0, null, 83, 57, 82, 0, 160, 300, null, null],
+        [0, "흑치상지", null, 0, null, 90, 73, 92, 0, 160, 300, null, null],
+        [0, "석탈해", null, 0, null, 98, 71, 93, 0, 160, 300, null, null],
+        [0, "물계자", null, 0, null, 88, 94, 43, 0, 160, 300, null, null],
+        [0, "석우로", null, 0, null, 87, 91, 54, 0, 160, 300, null, null],
+        [0, "이사부", null, 0, null, 90, 72, 93, 0, 160, 300, null, null],
+        [0, "거칠부", null, 0, null, 92, 73, 90, 0, 160, 300, null, null],
+        [0, "진흥왕", null, 0, null, 91, 66, 91, 0, 160, 300, null, null],
+        [0, "사다함", null, 0, null, 86, 91, 66, 0, 160, 300, null, null],
+        [0, "김세종", null, 0, null, 88, 63, 87, 0, 160, 300, null, null],
+        [0, "김무력", null, 0, null, 90, 93, 63, 0, 160, 300, null, null],
+        [0, "알천", null, 0, null, 93, 96, 51, 0, 160, 300, null, null],
+        [0, "김유신", null, 0, null, 97, 70, 99, 0, 160, 300, null, null],
+        [0, "김흠돌", null, 0, null, 87, 90, 52, 0, 160, 300, null, null],
+        [0, "김품일", null, 0, null, 83, 56, 82, 0, 160, 300, null, null],
+        [0, "김천존", null, 0, null, 84, 60, 82, 0, 160, 300, null, null],
+        [0, "죽지", null, 0, null, 83, 86, 52, 0, 160, 300, null, null],
+        [0, "문무왕", null, 0, null, 92, 73, 96, 0, 160, 300, null, null],
+        [0, "시득", null, 0, null, 98, 67, 90, 0, 160, 300, null, null],
+        [0, "장보고", null, 0, null, 99, 72, 96, 0, 160, 300, null, null],
+        [0, "김웅원", null, 0, null, 92, 91, 66, 0, 160, 300, null, null],
+        [0, "대조영", null, 0, null, 96, 92, 63, 0, 160, 300, null, null],
+        [0, "대무예", null, 0, null, 90, 97, 59, 0, 160, 300, null, null],
+        [0, "장문휴", null, 0, null, 88, 89, 53, 0, 160, 300, null, null],
+        [0, "대인수", null, 0, null, 89, 60, 85, 0, 160, 300, null, null],
+        [0, "궁예", null, 0, null, 91, 90, 57, 0, 160, 300, null, null],
+        [0, "왕건", null, 0, null, 96, 68, 98, 0, 160, 300, null, null],
+        [0, "이흔암", null, 0, null, 83, 82, 49, 0, 160, 300, null, null],
+        [0, "견훤", null, 0, null, 91, 65, 90, 0, 160, 300, null, null],
+        [0, "상귀", null, 0, null, 87, 88, 55, 0, 160, 300, null, null],
+        [0, "상애", null, 0, null, 76, 69, 41, 0, 160, 300, null, null],
+        [0, "관흔", null, 0, null, 79, 52, 83, 0, 160, 300, null, null],
+        [0, "유금필", null, 0, null, 87, 94, 58, 0, 160, 300, null, null],
+        [0, "배현경", null, 0, null, 86, 48, 90, 0, 160, 300, null, null],
+        [0, "서희", null, 0, null, 71, 26, 99, 0, 160, 300, null, null],
+        [0, "양규", null, 0, null, 95, 66, 93, 0, 160, 300, null, null],
+        [0, "김숙흥", null, 0, null, 87, 90, 57, 0, 160, 300, null, null],
+        [0, "지채문", null, 0, null, 86, 63, 88, 0, 160, 300, null, null],
+        [0, "강감찬", null, 0, null, 94, 68, 96, 0, 160, 300, null, null],
+        [0, "강민첨", null, 0, null, 92, 93, 64, 0, 160, 300, null, null],
+        [0, "윤관", null, 0, null, 87, 58, 86, 0, 160, 300, null, null],
+        [0, "척준경", null, 0, null, 90, 108, 61, 0, 160, 300, null, null],
+        [0, "허재", null, 0, null, 73, 48, 81, 0, 160, 300, null, null],
+        [0, "김의원", null, 0, null, 80, 86, 51, 0, 160, 300, null, null],
+        [0, "김부식", null, 0, null, 51, 21, 92, 0, 160, 300, null, null],
+        [0, "두경승", null, 0, null, 88, 62, 86, 0, 160, 300, null, null],
+        [0, "김취려", null, 0, null, 90, 88, 58, 0, 160, 300, null, null],
+        [0, "박서", null, 0, null, 86, 52, 87, 0, 160, 300, null, null],
+        [0, "김경손", null, 0, null, 73, 92, 58, 0, 160, 300, null, null],
+        [0, "김윤후", null, 0, null, 82, 51, 83, 0, 160, 300, null, null],
+        [0, "김방경", null, 0, null, 93, 56, 87, 0, 160, 300, null, null],
+        [0, "정세운", null, 0, null, 86, 82, 62, 0, 160, 300, null, null],
+        [0, "최영", null, 0, null, 96, 92, 71, 0, 160, 300, null, null],
+        [0, "정지", null, 0, null, 88, 91, 66, 0, 160, 300, null, null],
+        [0, "최무선", null, 0, null, 87, 59, 93, 0, 160, 300, null, null],
+        [0, "이성계", null, 0, null, 96, 62, 92, 0, 160, 300, null, null],
+        [0, "김성우", null, 0, null, 87, 84, 53, 0, 160, 300, null, null],
+        [0, "김종서", null, 0, null, 93, 66, 92, 0, 160, 300, null, null],
+        [0, "남이", null, 0, null, 89, 90, 63, 0, 160, 300, null, null],
+        [0, "권율", null, 0, null, 94, 70, 93, 0, 160, 300, null, null],
+        [0, "황진", null, 0, null, 87, 96, 53, 0, 160, 300, null, null],
+        [0, "곽재우", null, 0, null, 92, 71, 92, 0, 160, 300, null, null],
+        [0, "김시민", null, 0, null, 93, 72, 96, 0, 160, 300, null, null],
+        [0, "이순신", null, 0, null, 103, 76, 101, 0, 160, 300, null, null, "나의 죽음을 적에게 알리지 마라"],
+        [0, "정문부", null, 0, null, 87, 56, 83, 0, 160, 300, null, null],
+        [0, "정충신", null, 0, null, 82, 51, 90, 0, 160, 300, null, null],
+        [0, "원균", null, 0, null, 1, 1, 1, 0, 160, 300, null, null],
+        [0, "관중", null, 0, null, 91, 45, 98, 0, 160, 300, null, null],
+        [0, "몽무", null, 0, null, 88, 96, 53, 0, 160, 300, null, null],
+        [0, "몽염", null, 0, null, 91, 83, 71, 0, 160, 300, null, null],
+        [0, "몽오", null, 0, null, 90, 86, 60, 0, 160, 300, null, null],
+        [0, "방난", null, 0, null, 91, 57, 93, 0, 160, 300, null, null],
+        [0, "백기", null, 0, null, 100, 63, 92, 0, 160, 300, null, null],
+        [0, "범려", null, 0, null, 78, 22, 96, 0, 160, 300, null, null],
+        [0, "사마양저", null, 0, null, 88, 51, 92, 0, 160, 300, null, null],
+        [0, "사마착", null, 0, null, 93, 91, 66, 0, 160, 300, null, null],
+        [0, "손빈", null, 0, null, 80, 16, 96, 0, 160, 300, null, null],
+        [0, "손무", null, 0, null, 98, 32, 100, 0, 160, 300, null, null],
+        [0, "신릉군", null, 0, null, 81, 39, 90, 0, 160, 300, null, null],
+        [0, "악양", null, 0, null, 83, 36, 96, 0, 160, 300, null, null],
+        [0, "악의", null, 0, null, 96, 70, 98, 0, 160, 300, null, null],
+        [0, "염파", null, 0, null, 98, 97, 80, 0, 160, 300, null, null],
+        [0, "오기", null, 0, null, 93, 39, 95, 0, 160, 300, null, null],
+        [0, "오운", null, 0, null, 88, 51, 90, 0, 160, 300, null, null],
+        [0, "왕분", null, 0, null, 89, 91, 68, 0, 160, 300, null, null],
+        [0, "왕전", null, 0, null, 95, 66, 93, 0, 160, 300, null, null],
+        [0, "왕흘", null, 0, null, 93, 92, 60, 0, 160, 300, null, null],
+        [0, "이목", null, 0, null, 96, 69, 98, 0, 160, 300, null, null],
+        [0, "이신", null, 0, null, 89, 90, 57, 0, 160, 300, null, null],
+        [0, "전단2", null, 0, null, 94, 59, 93, 0, 160, 300, null, null],
+        [0, "조사", null, 0, null, 91, 63, 91, 0, 160, 300, null, null],
+        [0, "진개", null, 0, null, 88, 87, 50, 0, 160, 300, null, null],
+        [0, "항연", null, 0, null, 90, 88, 60, 0, 160, 300, null, null],
+        [0, "한신", null, 0, null, 100, 74, 95, 0, 160, 300, null, null],
+        [0, "항적", null, 0, null, 99, 100, 65, 0, 160, 300, null, null],
+        [0, "장한", null, 0, null, 88, 66, 87, 0, 160, 300, null, null],
+        [0, "유방", null, 0, null, 90, 66, 85, 0, 160, 300, null, null],
+        [0, "조참", null, 0, null, 89, 53, 87, 0, 160, 300, null, null],
+        [0, "팽월", null, 0, null, 92, 93, 60, 0, 160, 300, null, null],
+        [0, "영포", null, 0, null, 93, 93, 58, 0, 160, 300, null, null],
+        [0, "종리말", null, 0, null, 90, 83, 66, 0, 160, 300, null, null],
+        [0, "주발", null, 0, null, 82, 50, 83, 0, 160, 300, null, null],
+        [0, "번쾌", null, 0, null, 87, 92, 63, 0, 160, 300, null, null],
+        [0, "역상", null, 0, null, 83, 52, 83, 0, 160, 300, null, null],
+        [0, "관영", null, 0, null, 86, 87, 60, 0, 160, 300, null, null],
+        [0, "부관", null, 0, null, 83, 58, 88, 0, 160, 300, null, null],
+        [0, "근흡", null, 0, null, 86, 90, 52, 0, 160, 300, null, null],
+        [0, "왕릉2", null, 0, null, 90, 87, 56, 0, 160, 300, null, null],
+        [0, "계포", null, 0, null, 83, 62, 90, 0, 160, 300, null, null],
+        [0, "용저", null, 0, null, 86, 92, 41, 0, 160, 300, null, null],
+        [0, "곽거병", null, 0, null, 93, 92, 53, 0, 160, 300, null, null],
+        [0, "마원", null, 0, null, 90, 52, 83, 0, 160, 300, null, null],
+        [0, "위청", null, 0, null, 92, 91, 52, 0, 160, 300, null, null],
+        [0, "주아부", null, 0, null, 86, 41, 92, 0, 160, 300, null, null],
+        [0, "곽자의", null, 0, null, 98, 97, 61, 0, 160, 300, null, null],
+        [0, "나오에 카네츠구", null, 0, null, 87, 42, 91, 0, 160, 300, null, null],
+        [0, "다케다 신겐", null, 0, null, 91, 50, 93, 0, 160, 300, null, null],
+        [0, "도요토미 히데요시", null, 0, null, 98, 70, 97, 0, 160, 300, null, null],
+        [0, "고니시 유키나가", null, 0, null, 96, 68, 94, 0, 160, 300, null, null],
+        [0, "가토 기요마사", null, 0, null, 92, 93, 66, 0, 160, 300, null, null],
+        [0, "도요토미 히데나가", null, 0, null, 94, 70, 92, 0, 160, 300, null, null],
+        [0, "도도 다카토라", null, 0, null, 90, 92, 62, 0, 160, 300, null, null],
+        [0, "도쿠가와 이에야스", null, 0, null, 92, 68, 91, 0, 160, 300, null, null],
+        [0, "모리 모토나리", null, 0, null, 88, 42, 96, 0, 160, 300, null, null],
+        [0, "우에스기 겐신", null, 0, null, 91, 96, 78, 0, 160, 300, null, null],
+        [0, "오다 노부나가", null, 0, null, 93, 73, 92, 0, 160, 300, null, null],
+        [0, "이마가와 요시모토", null, 0, null, 89, 91, 71, 0, 160, 300, null, null],
+        [0, "사나다 마사유키", null, 0, null, 93, 66, 90, 0, 160, 300, null, null],
+        [0, "사나다 노부시게", null, 0, null, 94, 92, 70, 0, 160, 300, null, null],
+        [0, "시마즈 이에히사", null, 0, null, 96, 94, 63, 0, 160, 300, null, null],
+        [0, "시마즈 요시히로", null, 0, null, 93, 88, 63, 0, 160, 300, null, null],
+        [0, "코바야카와타카카게", null, 0, null, 90, 61, 92, 0, 160, 300, null, null],
+        [0, "타치바나 도세츠", null, 0, null, 91, 89, 71, 0, 160, 300, null, null],
+        [0, "타치바나 무네시게", null, 0, null, 90, 69, 88, 0, 160, 300, null, null],
+        [0, "타카하시 쇼운", null, 0, null, 92, 91, 70, 0, 160, 300, null, null],
+        [0, "호조 우지야스", null, 0, null, 89, 58, 91, 0, 160, 300, null, null],
+        [0, "칭기즈 칸", null, 0, null, 100, 99, 63, 0, 160, 300, null, null],
+        [0, "오고타이 칸", null, 0, null, 98, 93, 64, 0, 160, 300, null, null],
+        [0, "자무카", null, 0, null, 97, 96, 60, 0, 160, 300, null, null],
+        [0, "수부타이", null, 0, null, 94, 71, 91, 0, 160, 300, null, null],
+        [0, "제베", null, 0, null, 93, 97, 68, 0, 160, 300, null, null]
+    ],
+    "general_ex":[
+
+    ],
+    "initialEvents": [
+        [
+            true,
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ]
+        ]
+    ],
+    "events": [
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                180,
+                1
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                180,
+                7
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                181,
+                1
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                181,
+                7
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                182,
+                1
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                182,
+                7
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "destroy_nation",
+            1000,
+            [
+                "and",
+                [
+                    "Date",
+                    ">=",
+                    183,
+                    1
+                ],
+                [
+                    "RemainNation",
+                    "==",
+                    1
+                ]
+            ],
+            [
+                "BlockScoutAction"
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ]
+    ]
+}
@@ -0,0 +1,56 @@
+{
+    "title":"【공백지】 파죽지세",
+    "startYear":180,
+    "map":{
+        "mapName":"miniche"
+    },
+    "history":[
+    ],
+    "const": {
+        "joinRuinedNPCProp":0,
+        "npcBanMessageProb":1,
+        "scenarioEffect": "event_StrongAttacker",
+        "availableInstantAction": {
+            "instantRetreat": true
+        }
+    },
+    "events":[
+        [
+            "month", 1000,
+            ["or", ["Date", "==", null, 12], ["Date", "==", null, 6]],
+            ["CreateManyNPC", 10, 10],
+            ["DeleteEvent"]
+        ],
+        [
+            "month", 1000,
+            ["Date", "==", 181, 1],
+            ["RaiseNPCNation"],
+            ["DeleteEvent"]
+        ],
+        [
+            "month", 999,
+            ["Date", "==", 181, 1],
+            ["OpenNationBetting", 4, 5000],
+            ["OpenNationBetting", 1, 2000],
+            ["DeleteEvent"]
+        ],
+        [
+            "month", 999,
+            ["and",
+                ["Date", ">=", 183, 1],
+                ["RemainNation", "<=", 8]
+            ],
+            ["OpenNationBetting", 1, 1000],
+            ["DeleteEvent"]
+        ],
+        [
+            "destroy_nation", 1000,
+            ["and",
+                ["Date", ">=", 183, 1],
+                ["RemainNation", "==", 1]
+            ],
+            ["BlockScoutAction"],
+            ["DeleteEvent"]
+        ]
+    ]
+}
@@ -131,6 +131,7 @@ const apiRealPath = {
      itemType: ItemTypeKey;
    }>,
    DieOnPrestart: POST as APICallT<undefined>,
+    InstantRetreat: POST as APICallT<undefined>,
    BuildNationCandidate: POST as APICallT<undefined>,
    GetCommandTable: GET as APICallT<undefined, CommandTableResponse>,
    GetFrontInfo: GET as APICallT<{
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hide_D	d2a90157b9	fix: 트래픽에서 접속자수가 제대로 집계되지 않는 문제	2023-08-13 07:26:09 +00:00
Hide_D	a32cb3a2c0	fix: 수비X 관련 warning - 버그는 있으나 의도대로는 작동하였음	2023-08-12 10:07:58 +00:00
Hide_D	7c0a3a6955	fix: 접속량 정보가 기록되지 않았음	2023-08-12 10:06:08 +00:00
Hide_D	7d2e2945a1	fix: 연감 한번 더 수정	2023-08-10 19:08:21 +09:00
Hide_D	dc526c7359	fix: 연감 수정	2023-08-10 19:06:40 +09:00
Hide_D	6c4cb484da	fix: 연감 1개월차 수정	2023-08-10 19:06:01 +09:00
Hide_D	d41246de9d	fix: 초기 시작시 연감이 안보임	2023-08-10 19:04:55 +09:00
Hide_D	6d40783224	fix: 수극으로 인한 저격 소모	2023-08-07 13:19:52 +00:00
Hide_D	6eb6014e80	game: 출병시 전멸시페이즈 증가 적용 - 마지막 페이즈가 아닐 때 전멸 시 페이즈 증가	2023-08-07 11:26:43 +00:00
Hide_D	103cf3f882	game: 파죽지세 시나리오에서 수비끔시 훈사영향없음	2023-08-07 11:24:17 +00:00
Hide_D	5969e0c82b	fix: 수극이 다른 저격과 따로 동작	2023-08-05 10:12:34 +00:00
Hide_D	945f9027dd	game: StrongAttacker의 보정을 공방40%씩으로 - 병종저격하면 동률	2023-08-05 09:10:17 +00:00
Hide_D	0bf3145042	game: 파죽지세 모드, 접경귀환	2023-08-05 09:01:54 +00:00
Hide_D	905669755f	feat: 접경 귀환 기능 추가	2023-08-05 08:57:15 +00:00
Hide_D	57b12e8c04	fix: Session에서 로그인 정보를 세심히.	2023-08-05 08:47:45 +00:00
Hide_D	eccd883edc	feat: NotOccupiedCity constraint	2023-08-05 07:59:26 +00:00
Hide_D	895b134cd0	feat: InstantAction 개념 추가	2023-08-05 07:54:55 +00:00
Hide_D	7258573e4d	misc: 닥공전 이름을 파죽지세로 변경	2023-08-05 07:20:12 +00:00
Hide_D	cbdfa6f6fc	feat: 닥공전 기능 추가 - 장수 상대로 공격자인 경우 - 공, 방 50%씩	2023-08-05 07:15:36 +00:00
Hide_D	ed25c58410	fix: 오타 수정	2023-08-05 07:14:40 +00:00
Hide_D	16cfa46864	feat: scenarioEffect 추가 - 모든 General에 iAction으로 작동	2023-08-05 06:53:19 +00:00
Hide_D	e54a0a6668	feat: 시나리오 생성 시 에러가 발생하면 메시지를 띄움	2023-08-05 06:52:50 +00:00
Hide_D	eb545724ea	fix: 천통후 이벤트에서 유산 포인트를 얻을 수 있는 문제 수정	2023-08-05 05:19:40 +00:00
Hide_D	7858b48bad	fix: b_betting 수정	2023-08-03 16:20:32 +00:00
Hide_D	a4ed41edbe	fix: mergeQueryColumn위치 수정	2023-08-03 14:19:23 +00:00
Hide_D	b5a9e52c43	fix: 인사부는 GeneralLite가 아니라 General 필요 - 추방시 명성 깎이는 문제 때문	2023-08-03 13:35:55 +00:00
Hide_D	c6166d3295	fix: 수뇌임명 안되는 버그 수정 - 아니 대체 왜 경고를 안 띄우는거야!	2023-08-03 13:32:37 +00:00
Hide_D	9520d29109	fix: General 생성 코드 수정	2023-08-03 13:31:30 +00:00
Hide_D	3edfff146e	General 클래스를 General, GeneralLite로 분리 (#236 ) 내부 코드 사용례에서 General 테이블의 column을 일부만 가져오는 경우가 다수 있습니다. 다만 General 클래스에서 각종 iAction에 해당하는 트리거 함수 호출을 위해서는 모든 column을 다 가져와야 정상 동작이 가능한 만큼, iAction interface를 구현한 General 클래스와, 구현하지 않은 GeneralLite 클래스 둘로 나눕니다. 또한 General 클래스에서는 필요한 column을 다 가져오도록 변경합니다. Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/236	2023-08-03 21:32:01 +09:00
Hide_D	38416ccdf8	fix,refac: 잠재적인 버그 위치 수정 - aux가 null이 아니라 0으로 되고 있었음 - (0 == null) == true이니 그동안 되고는 있었겠으나.. - increaseInheritancePointRaw()를 호출하도록 변경	2023-08-01 16:24:55 +00:00
Hide_D	eeb5eabd12	feat: increaseInheritancePoint에 더해진 후의 값 반환	2023-08-01 16:24:52 +00:00
Hide_D	41273f97db	feat,refac: increaseInheritancePointRaw 추가 - ownerID만으로 처리 가능	2023-08-01 16:24:43 +00:00
Jinhyun KimandGitea	0e23677e1b	Merge pull request 'fix: 징병 가능 여부 판별 시 상대 년도 판별 로직 오류 해결' (#233 ) from jyp9/core:relyearfix into devel	2023-07-29 14:57:59 +00:00
Hide_D	0f085c7f36	fix: zero-ref	2023-07-27 17:27:11 +00:00
Hide_D	bd90076441	phan: update config.php	2023-07-27 17:27:08 +00:00
Hide_D	1801bdf55b	fix: 설문조사 시 아이템 추첨 문제 - tryUniqueItemLottery()는 itemObjs 배열을 요구 - itemObjs 배열은 GeneralQueryMode::Full 에서만 사용가능 - 즉, Lite여서는 안됨!	2023-07-21 13:26:26 +00:00
Hide_D	f27f0edfb6	fix: 빙의시 경고 제거	2023-07-21 13:22:04 +00:00
Hide_D	02f23e7db4	fix: 토너먼트 경고 해제	2023-07-21 13:09:45 +00:00
Hide_D	9871e24811	fix: defaultEventColumn에 turntime 추가 - 많이 쓰일 것으로 예상	2023-07-18 11:05:07 +09:00
Hide_D	a7dac2ce15	fix: mergeQueryColumn에서 query 계산 방식 변경 - 요청 쿼리 = queryMode + reqColumn로 변경 - 기존에는 null일 경우에만 queryMode 전체, null이 아니면 queryMode를 한 단계 낮추고, reqColumn을 더하는 형태였음 - 지난 버그에서 혼동을 일으키는 요소였으므로 수정	2023-07-18 10:54:36 +09:00
Hide_D	ed1d2cbf0d	Revert "fix: 발령에서 destGeneral에 turntime 필요" This reverts commit `06ca32802b`.	2023-07-18 10:49:37 +09:00
Hide_D	06ca32802b	fix: 발령에서 destGeneral에 turntime 필요	2023-07-17 17:44:45 +00:00
Hide_D	568b45f93a	fix: minimumColumn에 owner 필요	2023-07-17 17:43:32 +00:00