fix: typo

fix: 이민족 발동 시 수도가 이성이라 수도를 옮겼는데 다시 이성이 되는 경우 해결
fix: 이민족 발동 시 이성이 수도인 경우 문제 해결
2024-02-29 08:02:11 +09:00 · 2024-02-29 08:01:02 +09:00 · 2024-02-26 16:05:37 +00:00 · 2024-02-26 16:01:16 +00:00 · 2024-02-26 15:58:41 +00:00 · 2024-02-26 15:43:07 +00:00
169 changed files with 4435 additions and 860 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();

@@ -1054,10 +1054,10 @@ function increaseRefresh($type = "", $cnt = 1)
        'ip' => $ip,
        'date' => $date,
        'path' => "refresh",
-        'arg' => JSON::encode([
+        'arg' => Json::encode([
            'type' => $type,
        ]),
-        'aux' => JSON::encode([
+        'aux' => Json::encode([
            'generalID' => $generalID,
            'generalName' => $session->generalName,
            'userName' => $session->userName,
@@ -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;

@@ -213,7 +213,7 @@ function _setGeneralCommand(GeneralCommand $command, array $turnList):void {

    $db->update('general_turn', [
        'action'=>$commandName,
-        'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
+        'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
        'brief'=>$brief
    ], 'general_id = %i AND turn_idx IN %li', $generalID, $turnList);
 }
@@ -233,7 +233,7 @@ function _setNationCommand(NationCommand $command, array $turnList):void  {

    $db->update('nation_turn', [
        'action'=>$commandName,
-        'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
+        'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
        'brief'=>$brief
    ], 'nation_id = %i AND officer_level = %i AND turn_idx IN %li', $nationID, $officerLevel, $turnList);
 }
@@ -350,7 +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) {
@@ -899,7 +899,7 @@ function checkEmperior()
        'tiger' => $tigerstr,
        'eagle' => $eaglestr,
        'gen' => $gen,
-        'history' => JSON::encode($nationHistory),
+        'history' => Json::encode($nationHistory),
        'aux' => $statGeneral['aux']
    ]);

@@ -951,8 +951,19 @@ function updateMaxDomesticCritical(General $general, $score)
    }
 }

-function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil
+function genGenericUniqueRNG(int $year, int $month, int $generalID, ?string $reason = null): RandUtil
 {
+    if($reason){
+        return new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+            UniqueConst::$hiddenSeed,
+            'unique',
+            $year,
+            $month,
+            $generalID,
+            $reason
+        )));
+    }
+
    return new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
        UniqueConst::$hiddenSeed,
        'unique',
@@ -962,7 +973,7 @@ function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil
    )));
 }

-function genGenericUniqueRNGFromGeneral(General $general): RandUtil
+function genGenericUniqueRNGFromGeneral(General $general, string $reason): RandUtil
 {
    $logger = $general->getLogger();
    if (!$logger) {
@@ -971,5 +982,5 @@ function genGenericUniqueRNGFromGeneral(General $general): RandUtil
    $year = $logger->getYear();
    $month = $logger->getMonth();
    $generalID = $general->getID();
-    return genGenericUniqueRNG($year, $month, $generalID);
+    return genGenericUniqueRNG($year, $month, $generalID, $reason);
 }
@@ -148,63 +148,6 @@ function allButton(bool $seizeNPCMode, array $opts = [])
    ], $opts));
 }

-
-function commandButton(array $opts = [])
-{
-    $session = Session::getInstance();
-    $userID = Session::getUserID();
-    if (!$session->isGameLoggedIn()) {
-        return '';
-    }
-
-    $db = DB::db();
-    $me = $db->queryFirstRow("select no,nation,officer_level,belong,permission,penalty from general where owner=%i", $userID);
-
-    $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i", $me['nation']) ?? [
-        'nation' => 0,
-        'level' => 0,
-        'secretlimit' => 99,
-        'color' => '#000000'
-    ];
-
-    $bgColor = $nation['color'] ?? '#000000';
-    $fgColor = newColor($bgColor);
-
-    $templates = new \League\Plates\Engine(__DIR__ . '/templates');
-    $showSecret = false;
-    $permission = checkSecretPermission($me);
-    $btnClassForTournament = $opts['btnClass'];
-    if ($opts['isTournamentApplicationOpen']) {
-        if ($btnClassForTournament != 'dropdown-item') {
-            $btnClassForTournament = 'toolbarButton2';
-        }
-    }
-
-    $btnClassForBetting = $opts['btnClass'];
-    if ($opts['isBettingActive']) {
-        if ($btnClassForTournament != 'dropdown-item') {
-            $btnClassForBetting = 'toolbarButton2';
-        }
-    }
-
-    if ($permission >= 1) {
-        $showSecret = true;
-    } else if ($me['officer_level'] == 0) {
-        $showSecret = false;
-    }
-
-    return $templates->render('commandButton', array_merge([
-        'bgColor' => $bgColor,
-        'fgColor' => $fgColor,
-        'meLevel' => $me['officer_level'],
-        'nationLevel' => $nation['level'],
-        'showSecret' => $showSecret,
-        'permission' => $permission,
-        'btnClassForTournament' => $btnClassForTournament,
-        'btnClassForBetting' => $btnClassForBetting,
-    ], $opts));
-}
-
 function formatWounded(int $value, int $wound): string
 {
    if ($wound == 0) {
@@ -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([
@@ -27,14 +27,18 @@ $rootDB = RootDB::db();
 $oNow = new \DateTimeImmutable();
 $now = $oNow->format('Y-m-d H:i:s');

-$userNick = RootDB::db()->queryFirstField('SELECT `NAME` FROM member WHERE `NO`=%i',$userID);
-if(!$userNick){
+$member = $rootDB->queryFirstRow('SELECT `name`, `penalty` FROM member WHERE `NO`=%i', $userID);
+if(!$member){
    Json::die([
        'result'=>false,
        'reason'=>'멤버 정보를 가져오지 못했습니다.'
    ]);
 }

+$userNick = $member['name'];
+$memberPenalty = Json::decode($member['penalty'] ?? '{}');
+$penalty = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
+
 $pickResult = $db->queryFirstField('SELECT pick_result FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%s', $userID, $now);
 if(!$pickResult){
    Json::die([
@@ -86,10 +90,11 @@ $db->update('general', [
    'defence_train'=>80,
    'permission'=>'normal',
    'owner'=>$userID,
-    'aux'=>Json::encode($genAux)
+    'aux'=>Json::encode($genAux),
+    'penalty'=>Json::encode($penalty),
 ], '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;

@@ -285,19 +285,6 @@ if ($lastVoteID) {
                <div id="general-position"><?php generalInfo($generalObj); ?></div>
                <div id="generalCommandButton" class="row gx-0">
                    <div class="buttonPlate bg2">
-                        <?= commandButton([
-                            'splitBtnBegin' => '<div class="btn-group">',
-                            'splitBtnEnd' => '</div>',
-                            'splitZoneSign' => '<button type="button" class="btn btn-sammo-nation dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"><span class="visually-hidden">Toggle Dropdown</span></button>',
-                            'splitZoneBegin' => '<ul class="dropdown-menu dropdown-menu-end">',
-                            'splitZoneEnd' => '</ul>',
-                            'splitSubBtnBegin' => '<li>',
-                            'splitSubBtnEnd' => '</li>',
-                            'btnClass' => 'btn btn-sammo-nation',
-                            'btnSplitClass' => 'dropdown-item',
-                            'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
-                            'isBettingActive' => $isBettingActive
-                        ])
                        ?></div>
                </div>
            </div>
@@ -398,18 +385,6 @@ if ($lastVoteID) {
                            국가 메뉴
                        </div>
                        <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
-                            <?= commandButton([
-                                'btnBegin' => '<li>',
-                                'btnEnd' => '</li>',
-                                'splitMainBegin' => '<div class="d-none">',
-                                'splitMainEnd' => '</div>',
-                                'splitSubBtnBegin' => '<li>',
-                                'splitSubBtnEnd' => '</li>',
-                                'btnClass' => 'dropdown-item',
-                                'btnSplitClass' => 'dropdown-item',
-                                'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
-                                'isBettingActive' => $isBettingActive
-                            ]) ?>
                        </ul>
                    </li>
                    <li class="nav-item dropup">
@@ -37,12 +37,12 @@ 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);
+    $defenderCityGeneralIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0', $city->getVar('nation'), $city->getVar('city'));
+    $defenderCityGeneralList = General::createObjListFromDB($defenderCityGeneralIDList, null);

    /** @var WarUnit[] */
    $defenderList = [];
-    foreach($defenderGeneralList as $defenderGeneral){
+    foreach($defenderCityGeneralList as $defenderGeneral){
        $defenderGeneral->setRawCity($rawDefenderCity);
        $defenderCandidate = new WarUnitGeneral($rng, $defenderGeneral, $rawDefenderNation, false);
        if(extractBattleOrder($defenderCandidate, $attacker) <= 0){
@@ -186,7 +186,7 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
        'year' => $year,
        'month' => $month,
        'join_mode' => $joinMode,
-    ], $attacker->getGeneral(), $city->getRaw());
+    ], $attacker->getGeneral(), $city->getRaw(), $defenderCityGeneralList);
 }

 function extractBattleOrder(WarUnit $defender, WarUnit $attacker)
@@ -529,8 +529,9 @@ function getConquerNation($city): int
    return Util::array_first_key($conflict);
 }

-function ConquerCity(array $admin, General $general, array $city)
+function ConquerCity(array $admin, General $general, array $city, array $defenderCityGeneralList)
 {
+    /** @var General[] $defenderCityGeneralList */
    $db = DB::db();

    $year = $admin['year'];
@@ -585,6 +586,21 @@ function ConquerCity(array $admin, General $general, array $city)
    if(TurnExecutionHelper::runEventHandler($db, $gameStor, EventTarget::OccupyCity)){
        $gameStor->cacheAll();
    }
+    $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+        UniqueConst::$hiddenSeed,
+        'ConquerCity',
+        $year,
+        $month,
+        $attackerNationID,
+        $attackerID,
+        $cityID
+    )));
+    foreach($defenderCityGeneralList as $defenderCityGeneral){
+        $defenderCityGeneral->onArbitraryAction($defenderCityGeneral, $rng, 'ConquerCity', null, [
+            'attacker' => $general
+        ]);
+        $defenderCityGeneral->applyDB($db);
+    }


    // 국가 멸망시
@@ -596,10 +612,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');
@@ -6,6 +6,7 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\GameConst;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
@@ -32,8 +33,18 @@ class GetReservedCommand extends \sammo\BaseAPI
        $gameStor = KVStorage::getStorage($db, 'game_env');
        $generalID = $session->generalID;

+        $invalidTurnList = 0;
+
        $rawTurn = $db->queryAllLists('SELECT turn_idx, action, arg, brief FROM general_turn WHERE general_id = %i ORDER BY turn_idx ASC', $generalID);
        foreach ($rawTurn as [$turn_idx, $action, $arg, $brief]) {
+            if($turn_idx < 0) {
+                $invalidTurnList = -1;
+                $turn_idx += GameConst::$maxTurn;
+            }
+            else if($turn_idx >= GameConst::$maxTurn) {
+                $invalidTurnList = 1;
+                $turn_idx -= GameConst::$maxTurn;
+            }
            $commandList[$turn_idx] = [
                'action' => $action,
                'brief' => $brief,
@@ -41,6 +52,19 @@ class GetReservedCommand extends \sammo\BaseAPI
            ];
        }

+        if($invalidTurnList != 0){
+            if($invalidTurnList > 0){
+                $db->update('general_turn', [
+                    'turn_idx' => $db->sqleval('turn_idx - %i', GameConst::$maxTurn)
+                ], 'general_id=%i AND turn_idx >= %i', $generalID, GameConst::$maxTurn);
+            }
+            else{
+                $db->update('general_turn', [
+                    'turn_idx' => $db->sqleval('turn_idx + %i', GameConst::$maxTurn)
+                ], 'general_id=%i AND turn_idx < 0', $generalID);
+            }
+        }
+

        [$turnTerm, $year, $month, $lastExecute] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month', 'turntime']);

@@ -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){
@@ -90,6 +90,9 @@ class BuildNationCandidate extends \sammo\BaseAPI
      return '거병을 실패했습니다.';
    }

+    $generalObj->setVar('killturn', $env['killturn']);
+    $generalObj->applyDB($db);
+
    return null;
  }
 }
@@ -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;
+  }
+}
@@ -54,7 +54,7 @@ class Join extends \sammo\BaseAPI
                'leadership',
                'strength',
                'intel',
-                'inheritTurntime',
+                'inheritTurntimeZone',
            ])
            ->rule('boolean', [
                'pic'
@@ -72,7 +72,8 @@ class Join extends \sammo\BaseAPI
            ], GameConst::$defaultStatMax)
            ->rule('in', 'character', array_merge(GameConst::$availablePersonality, ['Random']))
            ->rule('in', 'inheritSpecial', GameConst::$availableSpecialWar)
-            ->rule('min', 'inheritTurntime', 0)
+            ->rule('min', 'inheritTurntimeZone', 0)
+            ->rule('max', 'inheritTurntimeZone', 59)
            ->rule('in', 'inheritCity', array_keys(CityConst::all()))
            ->rule('integerArray', 'inheritBonusStat');

@@ -139,22 +140,21 @@ class Join extends \sammo\BaseAPI
        $intel = $this->args['intel'];

        $inheritSpecial = $this->args['inheritSpecial'] ?? null;
-        $inheritTurntime = $this->args['inheritTurntime'] ?? null;
+        $inheritTurntimeZone = $this->args['inheritTurntimeZone'] ?? null;
        $inheritCity = $this->args['inheritCity'] ?? null;
        $inheritBonusStat = $this->args['inheritBonusStat'] ?? null;

-        if ($inheritTurntime !== null && $inheritCity !== null) {
-            return '턴과 도시를 동시에 지정할 수 없습니다.';
-        }
-
        $rootDB = RootDB::db();
        //회원 테이블에서 정보확인
-        $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr FROM member WHERE no=%i', $userID);
+        $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr, `penalty` FROM member WHERE no=%i', $userID);

        if (!$member) {
            return "잘못된 접근입니다!!!";
        }

+        $memberPenalty = Json::decode($member['penalty'] ?? "{}");
+        $penalty = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
+
        $db = DB::db();
        $gameStor = KVStorage::getStorage($db, 'game_env');
        $gameStor->cacheValues(['year', 'month', 'maxgeneral', 'scenario', 'show_img_level', 'block_general_create', 'turnterm', 'turntime', 'genius', 'npcmode']);
@@ -232,7 +232,7 @@ class Join extends \sammo\BaseAPI
        if ($inheritSpecial !== null) {
            $inheritRequiredPoint += GameConst::$inheritBornSpecialPoint;
        }
-        if ($inheritTurntime !== null) {
+        if ($inheritTurntimeZone !== null) {
            $inheritRequiredPoint += GameConst::$inheritBornTurntimePoint;
        }

@@ -347,12 +347,14 @@ class Join extends \sammo\BaseAPI
            $experience *= 0.8;
        }

-        if ($inheritTurntime !== null) {
-            $inheritTurntime = $inheritTurntime % ($admin['turnterm'] * 60);
+        if ($inheritTurntimeZone !== null) {
+            $inheritTurntime = $inheritTurntimeZone * $admin['turnterm'];
+            $inheritTurntime += $rng->nextRangeInt(0, Util::clamp($admin['turnterm'] - 1, 0));

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

            $inheritTurntime += $rng->nextRangeInt(0, 999999) / 1000000;
+
            $turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $admin['turnterm']));
            $turntime = $turntime->add(TimeUtil::secondsToDateInterval($inheritTurntime));
            $turntime = TimeUtil::format($turntime, true);
@@ -424,7 +426,8 @@ class Join extends \sammo\BaseAPI
            'specage' => $specage,
            'special' => $special,
            'specage2' => $specage2,
-            'special2' => $special2
+            'special2' => $special2,
+            'penalty' => Json::encode($penalty),
        ]);
        $generalID = $db->insertId();
        $db->insert('general_access_log', [
@@ -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 '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
        }
@@ -52,7 +52,7 @@ class ResetTurnTime extends \sammo\BaseAPI

        $db = DB::db();
        $gameStor = KVStorage::getStorage($db, 'game_env');
-        if($gameStor->isunited){
+        if ($gameStor->isunited) {
            return '이미 천하가 통일되었습니다.';
        }
        $inheritStor = KVStorage::getStorage($db, "inheritance_{$userID}");
@@ -62,36 +62,25 @@ class ResetTurnTime extends \sammo\BaseAPI
        }

        $gameStor = KVStorage::getStorage($db, 'game_env');
-        [$turnTerm, $serverTurnTime] = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
+        $turnTerm = $gameStor->getValue('turnterm');

        $currTurnTime = new DateTimeImmutable($general->getTurnTime());
-        $serverTurnTimeObj = new DateTimeImmutable($serverTurnTime);

        $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
            UniqueConst::$hiddenSeed,
            'ResetTurnTime',
            $userID,
-            $general->getTurnTime()
+            $general->getAuxVar('nextTurnTimeBase') ?? $general->getTurnTime()
        )));

-        $afterTurn = $rng->nextRange($turnTerm * -60 / 2, $turnTerm * 60 / 2);
+        $afterTurn = $rng->nextFloat1() * $turnTerm * 60;

        $userLogger = new UserLogger($userID);
-        if($afterTurn >= 0){
-            $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 뒤로 밀림", intdiv(Util::toInt($afterTurn), 60), $afterTurn%60), "inheritPoint");
-        }
-        else{
-            $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾼 결과 %02d:%02d 앞으로 당김", intdiv(Util::toInt(-$afterTurn), 60), (-$afterTurn)%60), "inheritPoint");
-        }
+        $userLogger->push(sprintf("{$reqPoint} 포인트로 턴 시간을 바꾸어 다다음 턴부터 %02d:%02d 적용", intdiv(Util::toInt($afterTurn), 60), $afterTurn % 60), "inheritPoint");
        $userLogger->flush();

-        $turnTime = $currTurnTime->add(TimeUtil::secondsToDateInterval($afterTurn));
-        if ($turnTime <= $serverTurnTimeObj && $serverTurnTimeObj <= $currTurnTime) {
-            $turnTime = $turnTime->add(TimeUtil::secondsToDateInterval($turnTerm * 60));
-        }
-
-        $general->setVar('turntime', TimeUtil::format($turnTime, true));
        $general->setAuxVar('inheritResetTurnTime', $nextLevel);
+        $general->setAuxVar('nextTurnTimeBase', $afterTurn);
        $inheritStor->setValue('previous', [$previousPoint - $reqPoint, null]);
        $general->increaseRankVar(RankColumn::inherit_point_spent_dynamic, $reqPoint);
        $general->applyDB($db);
@@ -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 '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
        }
@@ -7,9 +7,11 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\MessageType;
+use sammo\Json;
 use sammo\Message;
 use sammo\MessageTarget;
 use sammo\Validator;
+use sammo\Util;

 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
@@ -170,6 +172,8 @@ class SendMessage extends \sammo\BaseAPI
      return '장수가 없습니다.';
    }

+    $penalty = Json::decode($me['penalty'] ?? '{}');
+
    $limitState = checkLimit($me['refresh_score']);
    if ($limitState >= 2) {
      return '접속 제한입니다.';
@@ -226,8 +230,10 @@ class SendMessage extends \sammo\BaseAPI
      $now = new \DateTime();
      $lastMsg = new \DateTime($session->lastMsg ?? '0000-00-00');
      $msg_interval = $now->getTimestamp() - $lastMsg->getTimestamp();
-      if ($msg_interval < 2) {
-        return '개인메세지는 2초당 1건만 보낼 수 있습니다!';
+
+      $msg_min_interval = $penalty['sendPrivateMsgDelay'] ?? 2;
+      if ($msg_interval < $msg_min_interval) {
+        return "개인메세지는 {$msg_min_interval}초당 1건만 보낼 수 있습니다!";
      }
      $session->lastMsg = $now->format('Y-m-d H:i:s');

@@ -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(
@@ -311,7 +313,7 @@ class GeneralList extends \sammo\BaseAPI
        foreach ($rawGeneralList as $rawGeneral) {
            //General 생성?
            if (key_exists('aux', $rawGeneral)) {
-                $rawGeneral['aux'] = \sammo\JSON::decode($rawGeneral['aux']);
+                $rawGeneral['aux'] = \sammo\Json::decode($rawGeneral['aux']);
            }

            $item = [];
@@ -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,11 +64,20 @@ 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);
        }

        $nationTurnList = [];
+
+        //혹시 정규 턴을 벗어난 턴이 있는지 체크
+        $invalidUnderTurnList = [];
+        $invalidOverTurnList = [];
+
        foreach ($db->queryAllLists(
            'SELECT officer_level, turn_idx, action, arg, brief FROM nation_turn WHERE nation_id = %i ORDER BY officer_level DESC, turn_idx ASC',
            $me['nation']
@@ -74,6 +85,14 @@ class GetReservedCommand extends \sammo\BaseAPI
            if (!key_exists($officer_level, $nationTurnList)) {
                $nationTurnList[$officer_level] = [];
            }
+            if($turn_idx < 0){
+                $invalidUnderTurnList[$officer_level] = $turn_idx;
+                $turn_idx += GameConst::$maxChiefTurn;
+            }
+            else if($turn_idx >= GameConst::$maxChiefTurn){
+                $invalidOverTurnList[$officer_level] = $turn_idx;
+                $turn_idx -= GameConst::$maxChiefTurn;
+            }
            $nationTurnList[$officer_level][$turn_idx] = [
                'action' => $action,
                'brief' => $brief,
@@ -81,6 +100,21 @@ class GetReservedCommand extends \sammo\BaseAPI
            ];
        }

+        if($invalidUnderTurnList){
+            $db->update(
+                'nation_turn', [
+                    'turn_idx' => $db->sqleval('`turn_idx` + %i', GameConst::$maxChiefTurn)
+                ], 'nation_id = %i AND officer_level IN %li AND turn_idx < 0', $me['nation'], array_keys($invalidUnderTurnList)
+            );
+        }
+        if($invalidOverTurnList){
+            $db->update(
+                'nation_turn', [
+                    'turn_idx' => $db->sqleval('`turn_idx` - %i', GameConst::$maxChiefTurn)
+                ], 'nation_id = %i AND officer_level IN %li AND turn_idx >= %i', $me['nation'], array_keys($invalidOverTurnList), GameConst::$maxChiefTurn
+            );
+        }
+
        $troopList = [];
        foreach ($db->queryAllLists(
            'SELECT troop_leader, `name` FROM troop WHERE `nation` = %i',
@@ -113,7 +147,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,
@@ -21,7 +21,7 @@ class che_무기_02_단궁 extends \sammo\BaseStatItem{
    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
        return new WarUnitTriggerCaller(
            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 102, 0.01, 10, 30),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 102)
        );
    }
 }
@@ -20,7 +20,7 @@ class che_무기_07_맥궁 extends \sammo\BaseStatItem{
    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
        return new WarUnitTriggerCaller(
            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 107, 0.2, 20, 40),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 107)
        );
    }
 }
@@ -20,7 +20,7 @@ class che_무기_09_동호비궁 extends \sammo\BaseStatItem{
    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
        return new WarUnitTriggerCaller(
            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 109, 0.2, 20, 40, 20),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 109)
        );
    }
 }
@@ -20,7 +20,7 @@ class che_무기_11_이광궁 extends \sammo\BaseStatItem{
    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
        return new WarUnitTriggerCaller(
            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 111, 0.10, 20, 40, 10),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 111)
        );
    }
 }
@@ -20,7 +20,7 @@ class che_무기_13_양유기궁 extends \sammo\BaseStatItem{
    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
        return new WarUnitTriggerCaller(
            new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 113, 0.1, 20, 40, 10),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 113)
        );
    }
 }
@@ -21,7 +21,7 @@ class che_저격_매화수전 extends \sammo\BaseItem{
    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
        return new WarUnitTriggerCaller(
            new che_저격시도($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*304, 0.5, 20, 40),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*304)
        );
    }
 }
@@ -21,7 +21,7 @@ class che_저격_비도 extends \sammo\BaseItem{
    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
        return new WarUnitTriggerCaller(
            new che_저격시도($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*305, 0.5, 20, 40),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*305)
        );
    }
 }
@@ -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)
@@ -29,13 +29,13 @@ class che_음양가 extends \sammo\BaseNation{
        if($type == 'pop' && $amount > 0){
            return $amount * 1.2;
        }
-        
+
        return $amount;
    }

    public function onCalcStrategic(string $turnType, string $varType, $value){
        if($varType == 'delay'){
-            return $value * 2;
+            return Util::round($value * 4 / 3);
        }
        return $value;
    }
@@ -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),
+        );
+    }
+}
@@ -25,7 +25,7 @@ class che_event_저격 extends \sammo\BaseSpecial{
    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
        return new WarUnitTriggerCaller(
            new che_저격시도($unit, che_저격시도::TYPE_NONE, 0.5, 20, 40),
-            new che_저격발동($unit)
+            new che_저격발동($unit, che_저격시도::TYPE_NONE)
        );
    }
 }
@@ -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) {
@@ -267,7 +267,7 @@ abstract class Auction
    if ($isRollback) {
      $highestBid = $this->getHighestBid();
      if ($highestBid !== null) {
-        $this->refundBid($highestBid, "{$this->info->id}번 {$this->info->detail->title} 경매가 취소되었습니다.");
+        $this->refundBid($highestBid, "{$this->info->id}번 {$this->info->detail->title}가 취소되었습니다.");
      }
      $this->rollbackAuction();
    }
@@ -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']);
@@ -158,7 +158,7 @@ class che_강행 extends Command\GeneralCommand
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -174,7 +174,7 @@ class che_거병 extends Command\GeneralCommand{

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -201,7 +201,7 @@ class che_건국 extends Command\GeneralCommand
        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '건국');
+        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국');
        $general->applyDB($db);

        return true;
@@ -112,7 +112,7 @@ class che_견문 extends Command\GeneralCommand{
        $general->addExperience($exp);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -178,7 +178,7 @@ class che_군량매매 extends Command\GeneralCommand{

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -95,7 +95,7 @@ class che_귀환 extends Command\GeneralCommand{
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -134,7 +134,7 @@ class che_기술연구 extends che_상업투자{

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -126,7 +126,7 @@ class che_단련 extends Command\GeneralCommand{
        $general->increaseVar($incStat, 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -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();
@@ -173,7 +169,7 @@ class che_등용 extends Command\GeneralCommand

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -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']);

@@ -169,7 +169,7 @@ class che_등용수락 extends Command\GeneralCommand{
        $logger->pushGeneralActionLog("<D>{$destNationName}</>{$josaRo} 망명하여 수도로 이동합니다.");
        $destLogger->pushGeneralActionLog("<Y>{$generalName}</> 등용에 성공했습니다.");

-        $logger->pushGeneralHistoryLog("<D>{$destNationName}</>{$josaRo} 망명");
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>{$josaRo} 망명");
        $destLogger->pushGeneralHistoryLog("<Y>{$generalName}</> 등용에 성공");

        $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <D><b>{$destNationName}</b></>{$josaRo} <S>망명</>하였습니다.");
@@ -212,4 +212,4 @@ class che_등용수락 extends Command\GeneralCommand{

        return true;
    }
-}
+}
@@ -281,7 +281,7 @@ class che_랜덤임관 extends Command\GeneralCommand
        $general->addExperience($exp);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '랜덤 임관');
+        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '랜덤 임관');
        $general->applyDB($db);

        return true;
@@ -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();
@@ -216,7 +216,7 @@ class che_무작위건국 extends Command\GeneralCommand
        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '건국');
+        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국');
        $general->applyDB($db);

        return true;
@@ -148,7 +148,7 @@ class che_물자조달 extends Command\GeneralCommand{

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -106,7 +106,7 @@ class che_사기진작 extends Command\GeneralCommand{
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -218,7 +218,7 @@ class che_상업투자 extends Command\GeneralCommand{
        $general->increaseVar(static::$statKey.'_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -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 = [
@@ -179,7 +179,7 @@ class che_숙련전환 extends Command\GeneralCommand
        $general->increaseVar('leadership_exp', 2);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -75,7 +75,7 @@ class che_은퇴 extends Command\GeneralCommand{
        $logger->pushGeneralActionLog("은퇴하였습니다. <1>$date</>");

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -164,7 +164,7 @@ class che_이동 extends Command\GeneralCommand
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);

@@ -152,7 +152,7 @@ class che_인재탐색 extends Command\GeneralCommand
            $general->increaseVar($incStat, 1);
            $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
            $general->checkStatChange();
-            tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+            tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
            $general->applyDB($db);
            return true;
        }
@@ -218,7 +218,7 @@ class che_인재탐색 extends Command\GeneralCommand
        $general->increaseVar($incStat, 3);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);
        return true;
    }
@@ -172,7 +172,7 @@ class che_임관 extends Command\GeneralCommand
        $general->addExperience($exp);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -196,7 +196,7 @@ class che_장비매매 extends Command\GeneralCommand
        $general->addExperience($exp);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -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']);

@@ -170,7 +170,7 @@ class che_장수대상임관 extends Command\GeneralCommand{
        $general->addExperience($exp);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -121,7 +121,7 @@ class che_전투태세 extends Command\GeneralCommand{
        $general->increaseVar('leadership_exp', 3);
        $this->setResultTurn($turnResult);
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -103,7 +103,7 @@ class che_전투특기초기화 extends Command\GeneralCommand{
        $logger->pushGeneralActionLog("새로운 {$specialName}를 가질 준비가 되었습니다. <1>$date</>");

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -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;
+    }
+
+
+}
@@ -188,7 +188,7 @@ class che_정착장려 extends Command\GeneralCommand{
        $general->increaseVar(static::$statKey.'_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -188,7 +188,7 @@ class che_주민선정 extends Command\GeneralCommand{
        $general->increaseVar(static::$statKey.'_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $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 = [
@@ -170,7 +170,7 @@ class che_증여 extends Command\GeneralCommand

        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);

        $general->applyDB($db);
        $destGeneral->applyDB($db);
@@ -103,7 +103,7 @@ class che_집합 extends Command\GeneralCommand{
        $general->increaseVar('leadership_exp', 1);
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -227,7 +227,7 @@ class che_징병 extends Command\GeneralCommand
        $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
        $general->checkStatChange();
        $general->setAuxVar('armType', $reqCrewType->armType);
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -253,7 +253,7 @@ class che_출병 extends Command\GeneralCommand

        processWar($warRngSeed, $general, $this->nation, $this->destCity);

-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
        $general->applyDB($db);

        return true;
@@ -30,11 +30,8 @@ class che_하야 extends Command\GeneralCommand{

        $this->setNation();

-        $relYear = $env['year'] - $env['startyear'];
-
        $this->fullConditionConstraints=[
            ConstraintHelper::NotBeNeutral(),
-            ConstraintHelper::NotOpeningPart($relYear),
            ConstraintHelper::NotLord(),
        ];
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
devsamanddevsam	6cebc903c9	fix: typo	2024-02-29 08:02:11 +09:00
devsamanddevsam	c0190959e3	fix: 이민족 발동 시 수도가 이성이라 수도를 옮겼는데 다시 이성이 되는 경우 해결	2024-02-29 08:01:02 +09:00
Hide_D	bb26366769	fix: 이민족 발동 시 이성이 수도인 경우 문제 해결	2024-02-26 16:05:37 +00:00
Hide_D	71849a457b	game: 종횡가의 전략 디메리트 감소 - 전략 쿨타임 2배 -> 4/3배	2024-02-26 16:01:16 +00:00
Hide_D	7c1a8d96a2	fix: 정규턴에 어긋나는 개인턴, 사령턴을 보정 - 조회시에만 사용	2024-02-26 15:58:41 +00:00
Hide_D	cebd152daf	fix: 경매장 소수점 제거	2024-02-26 15:43:07 +00:00
Hide_D	2ca03389d2	fix: 유니크 경매 항목 변경시 금액이 자동 조절되도록 수정 - 굳이 기존 값을 남길 이유가 없어보임	2024-02-24 15:14:24 +00:00
Hide_D	cacf0981ce	game: 턴 시간과 도시 지정을 같이 가능하도록 변경	2024-02-24 12:05:49 +00:00
Hide_D	bcf5b5cb7d	game: 턴 지정 단위를 1/30에서 1/60으로 변경	2024-02-24 11:46:32 +00:00
Hide_D	66b2f1a8f2	game: NPC는 건국 한턴 기다림	2024-02-24 11:45:08 +00:00
Hide_D	40ecca5440	game, feat: 커맨드마다 다른 랜덤값으로 유니크 시도 - 사전 거병 후 개인 턴일 때, 유니크 중복이 발생하는 경우가 있었음	2024-02-24 11:28:38 +00:00
Hide_D	a96c2312d0	game, feat: 턴 시간 지정 방식을 30단계 중 선택하도록 변경 - 1분서버인 경우 120초 단위로 - 유산포인트 3000 -> 2500	2024-02-24 11:21:04 +00:00
Hide_D	faff3f4e6a	JSON -> Json - 대체 왜 어떤 파일에는 에러가 나지 않았는가	2024-02-20 18:45:40 +09:00
Hide_D	83abf44380	feat: 유저의 제재 목록을 장수 생성/빙의시 가져옴	2024-02-18 03:24:21 +00:00
Hide_D	e83960d67f	fix: 사전거병시 삭턴 정상 반영	2024-02-18 03:10:42 +00:00
Hide_D	c6b2e64c05	penalty에 sendPrivateMsgDelay추가	2024-02-18 03:08:21 +00:00
Hide_D	029f719112	fix: 스탯 계산 시에 캐시 사용하는 부분 수정 시도 (#241 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/241	2024-02-17 00:01:49 +09:00
Hide_D	46f460c8ad	Merge branch 'devel' into stat_cache_fix	2024-02-17 00:01:40 +09:00
Hide_D	af4401d9bb	fix: 사전거병 후 군주가 사라지는 경우에 대한 수정 (#247 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/247	2024-02-17 00:01:34 +09:00
devsamanddevsam	2f00aee947	아주 약간 효율적으로 수정	2024-01-26 22:17:06 +09:00
devsamanddevsam	dd2b032fa3	리뷰 내용 반영	2024-01-26 22:13:44 +09:00
Hide_D	1b858ae36c	fix: onCalcOpposeStat이 제대로 전파되지 않았음	2023-12-30 04:15:33 +00:00
devsamanddevsam	69f4d8e2c7	fix: 사전거병 후 군주가 사라지는 경우에 대한 수정	2023-12-29 12:07:59 +09:00
Hide_D	f24aea0120	fix: 수정된 턴 시간 변경 로직에서 바뀌기 이전 턴을 시드로 계속 사용하는 문제 수정 (#246 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/246 Reviewed-by: Hide_D <hided62@gmail.com>	2023-12-27 17:42:48 +09:00
Jinhyun Kim	f6dc7f49e2	fix: 수정된 턴 시간 변경 로직에서 바뀌기 이전 턴을 시드로 계속 사용하는 문제 수정	2023-12-27 17:25:51 +09:00
Hide_D	c1f105226f	refac: 기존 commandButton.php 삭제 - 이젠 MainControlBar로 대체됨	2023-12-25 08:28:36 +00:00
Hide_D	cecab2b0cf	feat: 이호경식 발동시 '어느 국가'인지 바로 표기	2023-12-25 08:07:57 +00:00
Hide_D	39f4e89b03	feat: HasRouteWithEnemy에서 "교전 중인 국가가 아닙니다" 추가 - 경로에 도달할 방법이 없는 것은 맞으나.. - 교전중이 아니라는 것에 의미가 있음	2023-12-25 08:05:34 +00:00
Hide_D	83f595a27a	feat: 종전시 세력 정보란에 문구 남김	2023-12-25 07:59:57 +00:00
Hide_D	b0db11544d	fix: 인사부 연동 스크립트 오타 수정	2023-12-25 07:56:27 +00:00
Hide_D	8e3551cb11	feat: 턴 시간 변경을 직관적인 동작으로 재 설계 - '다다음턴' 부터 시간을 00:00 ~ 59:59까지 랜덤하게	2023-12-25 07:51:54 +00:00
Hide_D	61d99a3043	초기 3년 이전에도 하야 가능 - 기존엔 1인국의 문제가 있었으나, 이미 NPC국이 자리를 채웠다.	2023-12-25 07:30:25 +00:00
Hide_D	fe80deff0c	【가상모드27-e】 아시아 명장전(비급+파죽지세) (#244 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/244	2023-11-21 00:12:38 +09:00
포스트모더니즘	536c00f5a8	【가상모드27-e】 아시아 명장전(비급+파죽지세)	2023-11-21 00:04:20 +09:00
포스트모더니즘	66ed8635dd	【가상모드14-b】 걸그룹대전(비급) 시나리오 추가	2023-11-20 23:49:45 +09:00
포스트모더니즘	311c485cec	fix: 불가침 제의를 같은 국가로 지정할 수 있는 버그 수정	2023-10-30 12:23:16 +09:00
포스트모더니즘andHide_D	5b5cf4e6d3	misc: 허보 대상 도시 선택 시에 선포 중인 경우 추가	2023-10-30 09:21:47 +09:00
포스트모더니즘	c5ed2d47fc	fix: 스탯 계산 시에 캐시 사용하는 부분 수정 시도	2023-10-29 09:05:29 +09:00
포스트모더니즘	428ec0d0ed	misc: 유니크 경매 취소 시에 경매 경매가 취소되었다고 표시되는 문제 수정	2023-10-29 08:37:36 +09:00
Jinhyun Kim	96c5f987d6	misc: 등용장 수락 시에도 국가 이름 볼드 처리	2023-10-14 07:57:27 +09:00
Hide_D	f0ae28b087	fix: 이전 커밋에서 ' 하나를 "로 변경	2023-09-15 12:54:31 +09:00
Jinhyun Kim	fa4a266d77	misc: 개인 기록에 전략 수행 내역이 남도록 수정, 백성동원 대상 도시도 남도록 수정	2023-09-09 07:48:48 +09:00
Hide_D	32e854858e	feat: 랜덤 턴 초기화 시간 범위를 상세하게 알려줌	2023-09-03 17:11:41 +00:00
Hide_D	f13371e679	fix: 저격에서 raiseType을 저격시도/저격발동 일치	2023-08-17 10:25:04 +09:00
Hide_D	2420f594a6	game: 자동 출병 조건 일부 수정 - 국고 병령이 2000 밑이더라도, 유저장은 출병	2023-08-14 07:30:16 +00:00
Hide_D	b7b0a1050c	feat: 도시 함락 시 수비 장수에게 트리거 발동	2023-08-14 06:04:43 +00:00
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