fix: g65 접경귀환도 수정

fix: 접경귀환시 rawCity도 초기화
fix: onCalcOpposeStat이 제대로 전파되지 않았음
2024-01-02 11:15:07 +09:00 · 2024-01-02 11:13:29 +09:00 · 2023-12-30 04:14:57 +00:00 · 2023-12-30 04:01:53 +00:00 · 2023-12-28 05:22:43 +00:00 · 2023-12-27 15:19:29 +00:00
304 changed files with 9372 additions and 2797 deletions
@@ -69,3 +69,5 @@ gateway/js/*
 gateway/css/*
 *.db-journal
 d_log/cachegrind.*
@@ -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',
+    "target_php_version" => '8.2',
-    "minimum_target_php_version" => '8.1',
+    "minimum_target_php_version" => '8.2',
    'backward_compatibility_checks ' => true,
    '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',
@@ -29,5 +29,5 @@
        "josa",
        "sammo"
    ],
-    "editor.tabSize": 2
+    "editor.tabSize": 4
 }
@@ -30,10 +30,10 @@ require(__DIR__ . '/../vendor/autoload.php');
 <body>
    <div class="container">
-        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 설치</h1>
+        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 설치</h1>
-        <div class="row justify-content-md-center">
+        <div class="row justify-content-lg-center">
-            <div class="col col-12 col-md-10 col-lg-7">
+            <div class="col col-12 col-lg-10 col-lg-7">
                <div class="card" id="db_form_card" style="display:none">
                    <h3 class="card-header">
                        설치(DB 설정)
@@ -74,28 +74,7 @@ switch ($btn) {
        case "120분턴": $turnterm = 120; break;
        default: throw new \Exception("알 수 없는 턴 기간");
        }
-        $oldunit = $admin['turnterm'] * 60;
+        ServerTool::changeServerTerm($turnterm);
        $unit = $turnterm * 60;
        $unitDiff = $unit / $oldunit;
        $servTurnTime = new \DateTimeImmutable($admin['turntime']);
        foreach ($db->query('SELECT no,turntime FROM general') as $gen) {
            $genTurnTime = new \DateTimeImmutable($gen['turntime']);
            $timeDiff = TimeUtil::DateIntervalToSeconds($genTurnTime->diff($servTurnTime));
            $timeDiff *= $unitDiff;
            $newGenTurnTime = $servTurnTime->add(TimeUtil::secondsToDateInterval($timeDiff));
            $db->update('general', [
                'turntime'=>$newGenTurnTime->format('Y-m-d H:i:s.u')
            ], 'no=%i', $gen['no']);
        }
        $turn = ($admin['year'] - $admin['startyear']) * 12 + $admin['month'] - 1;
        $starttime = $servTurnTime->sub(TimeUtil::secondsToDateInterval($turn * $unit))->format('Y-m-d H:i:s');
        $starttime = cutTurn($starttime, $turnterm, false);
        $gameStor->turnterm = $turnterm;
        $gameStor->starttime = $starttime;
        pushGlobalHistoryLog(["<R>★</>턴시간이 <C>$btn</>으로 변경됩니다."]);
        break;
 }
@@ -33,18 +33,18 @@ $src = MessageTarget::buildQuick($session->generalID);
 $genObjList = [];
 $env = [];
 if ($genlist) {
-    $genObjList = General::createGeneralObjListFromDB($genlist);
+    $genObjList = General::createObjListFromDB($genlist);
    $env = $gameStor->cacheAll();
 }
 switch ($btn) {
    case "전체 접속허용":
-        $db->update('general', [
+        $db->update('general_access_log', [
-            'con' => 0
+            'refresh_score' => 0
        ], true);
        break;
    case "전체 접속제한":
-        $db->update('general', [
+        $db->update('general_access_log', [
-            'con' => 1000
+            'refresh_score' => 1000
        ], true);
        break;
    case "블럭 해제":
@@ -186,14 +186,14 @@ switch ($btn) {
        ], '`no` IN %li', $genlist);
        break;
    case "접속 허용":
-        $db->update('general', [
+        $db->update('general_access_log', [
-            'con' => 0
+            'refresh_score' => 0
-        ], '`no` IN %li', $genlist);
+        ], '`general_id` IN %li', $genlist);
        break;
    case "접속 제한":
-        $db->update('general', [
+        $db->update('general_access_log', [
-            'con' => 1000
+            'refresh_score' => 1000
-        ], '`no` IN %li', $genlist);
+        ], '`general_id` IN %li', $genlist);
        break;
    case "메세지 전달":
        $text = $msg ?? '';
@@ -1,133 +0,0 @@
 <?php
 namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 if ($session->userGrade < 5) {
    die(requireAdminPermissionHTML());
 }
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $conlimit = $gameStor->conlimit;
 $ipGroupList = Util::arrayGroupBy(
    $db->query(
        'SELECT name,ip,lastconnect,owner,block,substring_index(ip,".",3) as ip_c from general WHERE ip!="" and npc<2'
    ),
    'ip_c'
 );
 function colorBlockedName($general)
 {
    if (!$general['blocked']) {
        return $general['name'];
    }
    return "<span style='color:magenta;'>{$general['name']}</span>";
 }
 ?>
 <!DOCTYPE html>
 <html>
 <head>
    <title>멀티관리</title>
    <meta charset="UTF-8">
    <meta name="color-scheme" content="dark">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printDist('ts', 'common', true) ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
    <table align=center width=1000 class='tb_layout bg0'>
        <tr>
            <td>멀 티 관 리<br><?= backButton() ?></td>
        </tr>
    </table>
    <form name=form1 method=post action=_admin4_submit.php>
        <table align=center width=1000 class='tb_layout bg0'>
            <tr>
                <td width=80 align=center rowspan=3>회원선택<br><br>
                    <font color=cyan>NPC</font><br>
                    <font color=skyblue>NPC유저</font><br>
                    <font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b>
                </td>
                <td width=105 rowspan=3>
                    <?php
                    echo "
            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>";
                    foreach ($db->query('SELECT no,name,npc,block,con from general where ip!=\'\' order by npc,ip') as $general) {
                        $style = "style=;";
                        if ($general['block']         > 0) {
                            $style .= "background-color:red;";
                        }
                        $npcColor = getNPCColor($general['npc']);
                        if($npcColor !== null){
                            $style .= "color:{$npcColor};";
                        }
                        echo "
                <option value={$general['no']} $style>{$general['name']}</option>";
                    }
                    echo "
            </select>";
                    ?>
                </td>
                <td width=100 align=center>블럭</td>
                <td width=504>
                    <input type=submit name=btn value='블럭 해제'><input type=submit name=btn value='1단계 블럭'><input type=submit name=btn value='2단계 블럭'><input type=submit name=btn value='3단계 블럭'><input type=submit name=btn value='무한삭턴'><br>
                    1단계:발언권, 2단계:턴블럭
                </td>
            </tr>
            <tr>
                <td align=center>강제 사망</td>
                <td><input type=submit name=btn value='강제 사망'></td>
            </tr>
            <tr>
                <td align=center>메세지 전달</td>
                <td><input type=textarea size=60 maxlength=255 name=msg style=background-color:black;color:white;><input type=submit name=btn value='메세지 전달'></td>
            </tr>
        </table>
        <table align=center width=1000 class='tb_layout bg0'>
            <tr>
                <td align=center width=100>장수명</td>
                <td align=center width=180>최근로그인</td>
                <td align=center width=129>IP</td>
                <td align=center width=100>ID</td>
            </tr>
            <?php foreach ($ipGroupList as $ipGroupC => $users) : ?>
                <tr>
                    <td><?= join('<br>', array_map('\sammo\colorBlockedName', $users)) ?></td>
                    <td><?= join('<br>', array_column($users, 'lastconnect')) ?></td>
                    <td><?= join('<br>', array_column($users, 'ip')) ?></td>
                    <td><?= join('<br>', array_column($users, 'owner')) ?></td>
                </tr>
            <?php endforeach; ?>
        </table>
        <?php
        //NOTE: password의 md5 해시가 같은지 확인하는 방식으로는 앞으로 잡아낼 수 없다. 폐기
        ?>
    </form>
    <table align=center width=1000 class='tb_layout bg0'>
        <tr>
            <td><?= backButton() ?></td>
        </tr>
        <tr>
            <td><?= banner() ?> </td>
        </tr>
    </table>
 </body>
 </html>
@@ -1,86 +0,0 @@
 <?php
 namespace sammo;
 use sammo\Enums\MessageType;
 include "lib.php";
 include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 if ($session->userGrade < 5) {
    header('location:_admin4.php');
    die();
 }
 $btn = Util::getPost('btn');
 $genlist = Util::getPost('genlist', 'array_int');
 $msg = Util::getPost('msg', 'string', '메시지');
 $db = DB::db();
 //NOTE: 왜 기능이 admin2와 admin4가 같이 있는가?
 //NOTE: 왜 블럭 시 admin4에선 금쌀을 없애지 않는가?
 switch ($btn) {
    case "블럭 해제":
        DB::db()->query('update general set block=0 where no IN %li', $genlist);
        break;
    case "1단계 블럭":
        $date = TimeUtil::now();
        $db = DB::db();
        $db->query('update general set block=1,killturn=24 where no IN %li', $genlist);
        //FIXME: subquery로 하는게 더 빠를 듯.
        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
        break;
    case "2단계 블럭":
        $date = TimeUtil::now();
        $db = DB::db();
        $db->query('update general set block=2,killturn=24 where no IN %li', $genlist);
        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
        break;
    case "3단계 블럭":
        $date = TimeUtil::now();
        $db = DB::db();
        $db->query('update general set block=3,killturn=24 where no IN %li', $genlist);
        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
        break;
    case "무한삭턴":
        DB::db()->query('update general set killturn=8000 where no IN %li', $genlist);
        break;
    case "강제 사망":
        $date = TimeUtil::now(true);
        $db->update('general', [
            'killturn' => 0,
            'turntime' => $date,
        ], '`no` IN %li', $genlist);
        $db->update('general_turn', [
            'action' => '휴식',
            'arg' => '{}',
            'brief' => '휴식'
        ], 'general_id IN %li AND turn_idx = 0', $genlist);
        break;
    case "메세지 전달":
        $date = TimeUtil::now();
        $src = MessageTarget::buildQuick($session->generalID);
        foreach($genlist as $generalID){
            $msgObj = new Message(
                MessageType::private,
                $src,
                MessageTarget::buildQuick($generalID),
                $msg,
                new \DateTime(),
                new \DateTime('9999-12-31'),
                []
            );
            if ($msgObj) {
                $msgObj->send(true);
            }
        }
        break;
 }
 header('location:_admin4.php');
@@ -66,8 +66,6 @@ $sel2[$type2] = "selected";
                        <option <?= $sel[8] ?? '' ?> value=8>평무</option>
                        <option <?= $sel[9] ?? '' ?> value=9>평지</option>
                        <option <?= $sel[10] ?? '' ?> value=10>평Lv</option>
                        <option <?= $sel[11] ?? '' ?> value=11>접속률</option>
                        <option <?= $sel[12] ?? '' ?> value=12>단기접</option>
                        <option <?= $sel[13] ?? '' ?> value=13>보숙</option>
                        <option <?= $sel[14] ?? '' ?> value=14>궁숙</option>
                        <option <?= $sel[15] ?? '' ?> value=15>기숙</option>
@@ -105,8 +103,6 @@ $sel2[$type2] = "selected";
    <table align=center width=1600 class="tb_layout bg0">
        <tr class='bg1'>
            <td align=center>국명</td>
            <td align=center>접률</td>
            <td align=center>단접</td>
            <td align=center>국력</td>
            <td align=center>장수</td>
            <td align=center>속령</td>
@@ -147,8 +143,6 @@ SELECT
    A.gold,
    A.rice,
    COUNT(B.nation) AS gennum,
    ROUND(AVG(B.connect), 1) AS connect,
    ROUND(AVG(B.con), 1) AS con,
    ROUND(AVG(B.dex1)) AS dex1,
    ROUND(AVG(B.dex2)) AS dex2,
    ROUND(AVG(B.dex3)) AS dex3,
@@ -193,12 +187,6 @@ GROUP BY B.nation
            case 10:
                $query .= " order by avg(B.explevel) desc";
                break;
            case 11:
                $query .= " order by avg(B.connect) desc";
                break;
            case 12:
                $query .= " order by avg(B.con) desc";
                break;
            case 13:
                $query .= " order by avg(B.dex1) desc";
                break;
@@ -240,8 +228,6 @@ from city where nation=%i', $nation['nation']);
            echo "
    <tr>
        <td align=center style=background-color:{$nation['color']};color:" . newColor($nation['color']) . ";>{$nation['name']}</td>
        <td align=center>&nbsp;{$nation['connect']}&nbsp;</td>
        <td align=center>&nbsp;{$nation['con']}&nbsp;</td>
        <td align=center>&nbsp;{$nation['power']}&nbsp;</td>
        <td align=center>&nbsp;{$gen['cnt']}&nbsp;</td>
        <td align=center>&nbsp;{$city['cnt']}&nbsp;</td>
@@ -2,6 +2,8 @@
 namespace sammo;
 use sammo\Enums\GeneralQueryMode;
 include "lib.php";
 include "func.php";
@@ -74,7 +76,7 @@ if (!$gen) {
    $gen = $generalBasicList[0]['no'];
 }
-$generalObj = General::createGeneralObjFromDB($gen);
+$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'));
 }
@@ -16,10 +16,13 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("장수일람", 2);
-$me = $db->queryFirstRow('SELECT con,turntime FROM general WHERE owner = %i', $userID);
+$me = $db->queryFirstRow(
    'SELECT refresh_score,turntime FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner = %i', $userID
 );
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }
@@ -102,7 +105,7 @@ if ($gameStor->isunited) {
        6 => ['dedication', true],
        7 => ['officer_level', true],
        8 => ['killturn', false],
-        9 => ['connect', true],
+        9 => ['refresh_score_total', true],
        10 => ['experience', true],
        11 => ['personal', true],
        12 => ['special', true],
@@ -111,7 +114,12 @@ if ($gameStor->isunited) {
        15 => ['npc', true],
    ][$type];
-    $generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect from general order by %b %l', $orderKey, $orderDesc ? 'desc' : '');
+    $generalList = $db->query(
        'SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,refresh_score_total
        FROM `general` LEFT JOIN `general_access_log` ON general.no = general_access_log.general_id order by %b %l',
        $orderKey,
        $orderDesc ? 'desc' : ''
    );
    echo "
 <table align=center width=1000 class='tb_layout bg0'>
@@ -163,7 +171,7 @@ if ($gameStor->isunited) {
            $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
        }
-        $general['connect'] = Util::round($general['connect'], -1);
+        $general['refresh_score_total'] = Util::round($general['refresh_score_total'], -1);
        $imageTemp = GetImageURL($general['imgsvr']);
        echo "
@@ -192,8 +200,8 @@ if ($gameStor->isunited) {
        <td align=center>$strength</td>
        <td align=center>$intel</td>
        <td align=center>{$general['killturn']}</td>
-        <td align=center>{$general['connect']}";
+        <td align=center>" . $general['refresh_score_total'] ?? 0;
-        echo "<br>【" . getConnect($general['connect']) . "】</td>
+        echo "<br>【" . getRefreshScoreText($general['refresh_score_total'] ?? 0) . "】</td>
    </tr>";
    }
    echo "
@@ -13,10 +13,13 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 $gameStor->cacheValues(['killturn', 'autorun_user', 'turnterm']);
 increaseRefresh("세력일람", 2);
-$me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT refresh_score, turntime FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }
@@ -2,6 +2,8 @@
 namespace sammo;
 use sammo\Enums\GeneralAccessLogColumn;
 include "lib.php";
 include "func.php";
@@ -10,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);
+$recentTraffic = $admin['recentTraffic'] ?? [];
 $date = [];
 $year = [];
 $month = [];
 $refresh = [];
 $online = [];
 $curonline = getOnlineNum();
-foreach ($log as $i => $value) {
+
-    $parse = Json::decode($value);
+$recentTraffic[] = [
-    if(is_array($parse) === false){
+    'year'    => $admin['year'],
-        continue;
+    'month'   => $admin['month'],
-    }
+    'refresh' => $admin['refresh'],
-    if(count($parse) < 5){
+    'online'  => $curonline,
-        continue;
+    'date' => TimeUtil::now()
-    }
+];
    $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();
 if ($admin['maxrefresh'] == 0) {
    $admin['maxrefresh'] = 1;
@@ -111,13 +98,13 @@ if ($admin['maxonline'] < $curonline) {
                        </td>
                    </tr>
                    <?php
-                    $refresh[] = $admin['refresh'];
+                    foreach ($recentTraffic as $trafficItem) {
-                    foreach ($refresh as $i => $value) {
+                        $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>
@@ -152,13 +139,13 @@ if ($admin['maxonline'] < $curonline) {
                        </td>
                    </tr>
                    <?php
-                    $online[] = $curonline;
+                    foreach ($recentTraffic as $trafficItem) {
-                    foreach ($online as $i => $value) {
+                        $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>
@@ -193,19 +180,24 @@ if ($admin['maxonline'] < $curonline) {
            </td>
        </tr>
        <?php
-        $max_refresh = $db->queryFirstRow('SELECT sum(refresh) as refresh, sum(`connect`) as `connect` from general');
+        $totalRefresh = [
-        $max_refresh['name'] = '접속자 총합';
+            ...$db->queryFirstRow('SELECT sum(`refresh`) as `refresh`, sum(`refresh_score_total`) as `refresh_score_total` from general_access_log'),
            'name' => '접속자 총합'
        ];
-        $refresh_result = array_merge([$max_refresh], $db->query('SELECT `name`,refresh,`connect` FROM general ORDER BY refresh DESC LIMIT 5'));
+        $top5Refresh = $db->query(
            'SELECT `name`, `log`.`refresh`, `refresh_score_total` FROM `general_access_log` AS `log`
            INNER JOIN `general` ON `log`.`general_id` = `general`.`no` ORDER BY `log`.`refresh` DESC LIMIT 5'
        );
-        foreach ($refresh_result as $i => $user) {
+        foreach (array_merge([$totalRefresh], $top5Refresh) as $i => $user) {
-            $w = round($user['refresh'] / max(1, $max_refresh['refresh']) * 100, 1);
+            $w = round($user['refresh'] / max(1, $totalRefresh['refresh']) * 100, 1);
            $w2 = round(100 - $w, 1);
            $color = getTrafficColor($w);
        ?>
            <tr>
                <td width=98 align=center><?= $user['name'] ?></td>
-                <td width=98 align=center><?= $user['connect'] ?>(<?= $user['refresh'] ?>)</td>
+                <td width=98 align=center><?= $user['refresh_score_total'] ?>(<?= $user['refresh'] ?>)</td>
                <td width=798>
                    <?php if ($w == 0) : ?>
                    <?php elseif ($w < 10) : ?>
@@ -2,6 +2,8 @@
 namespace sammo;
 use sammo\Enums\GeneralLiteQueryMode;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\RankColumn;
 include "lib.php";
@@ -21,12 +23,15 @@ $generalID = $session->generalID;
-$me = $db->queryFirstRow('SELECT no,tournament,con,turntime from general where owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no,tournament,refresh_score,turntime FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id where owner=%i', $userID
 );
 $admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'turnterm', 'develcost']);
 $turnTerm = $admin['turnterm'];
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }
@@ -107,7 +112,7 @@ if ($str3) {
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
    MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
@@ -502,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',
@@ -560,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'],
-                            0
+                            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 = - (
@@ -211,7 +211,7 @@ $templates = new \League\Plates\Engine('templates');
                                $city['trade'] = "- ";
                            }
-                            $dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'], 2)[0];
+                            $dbColumns = General::mergeQueryColumn(['npc', 'defence_train', 'no', 'picture', 'imgsvr', 'name', 'injury', 'leadership', 'strength', 'intel', 'officer_level', 'nation', 'crewtype', 'crew', 'train', 'atmos'])[0];
                            if ($showDetailedInfo) {
                                $generals = $db->query(
                                    'SELECT %l from general where city=%i order by turntime',
@@ -327,8 +327,7 @@ $templates = new \League\Plates\Engine('templates');
                                if ($ourGeneral && !$isNPC) {
                                    $turnText = [];
-                                    $generalObj = new General($general, null, null, null, null, null, false);
+                                    foreach ($generalTurnList[$general['no']] as $turnRawIdx => $turn) {
                                    foreach ($generalTurnList[$generalObj->getID()] as $turnRawIdx => $turn) {
                                        $turnIdx = $turnRawIdx + 1;
                                        $turnText[] = "{$turnIdx} : $turn";
                                    }
@@ -19,12 +19,15 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("암행부", 1);
-$me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no,nation,officer_level,refresh_score,turntime,belong,permission,penalty FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
 $nationLevel = $db->queryFirstField('SELECT level FROM nation WHERE nation=%i', $me['nation']);
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }
@@ -45,7 +48,7 @@ $templates = new \League\Plates\Engine('templates');
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
    MessageBox("접속제한이 얼마 남지 않았습니다!");
 } ?>
@@ -97,7 +97,7 @@ if ($gameStor->isunited) {
        7 => ['gold', true],
        8 => ['rice', true],
        9 => ['crew', true],
-        10 => ['connect', true],
+        10 => ['refresh_score_total', true],
        11 => ['personal', true],
        12 => ['special', true],
        13 => ['special2', true],
@@ -105,7 +105,9 @@ if ($gameStor->isunited) {
        15 => ['npc', true],
    ][$type];
-    $generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect,gold,rice,crew,belong from general where nation = %i order by %b %l', $me['nation'], $orderKey, $orderDesc ? 'desc' : '');
+    $generalList = $db->query(
        'SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,refresh_score_total,gold,rice,crew,belong
        FROM `general` LEFT JOIN `general_access_log` ON general.no = general_access_log.general_id where nation = %i order by %b %l', $me['nation'], $orderKey, $orderDesc ? 'desc' : '');
    echo "
 <table align=center class='tb_layout bg0'>
@@ -173,8 +175,8 @@ if ($gameStor->isunited) {
        <td align=center>" . displayCharInfo($general['personal']) . "</td>
        <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>
        <td align=center>{$general['belong']}</td>
-        <td align=center>{$general['connect']}";
+        <td align=center>". $general['refresh_score_total'] ?? 0;
-        echo "<br>(" . getConnect($general['connect']) . ")</td>
+        echo "<br>(" . getRefreshScoreText($general['refresh_score_total'] ?? 0) . ")</td>
    </tr>";
    }
    echo "
@@ -2,6 +2,10 @@
 namespace sammo;
 use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\TableName;
 include "lib.php";
 include "func.php";
@@ -20,7 +24,7 @@ $gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
 increaseRefresh("내정보", 1);
-$me = General::createGeneralObjFromDB($generalID);
+$me = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
 $myset = $me->getVar('myset');
 if ($myset > 0) {
@@ -29,7 +33,15 @@ if ($myset > 0) {
    $submit = 'hidden';
 }
-$targetTime = addTurn($me->getVar('lastrefresh'), $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
+$lastRefresh = $db->queryFirstField(
    'SELECT %b FROM %b WHERE %b = %i',
    GeneralAccessLogColumn::lastRefresh->value,
    TableName::generalAccessLog->value,
    GeneralAccessLogColumn::generalID->value,
    $generalID
 );
 $targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
 if ($gameStor->turntime <= $gameStor->opentime) {
    //서버 가오픈시 할 수 있는 행동
    if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
@@ -39,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>
@@ -81,13 +99,13 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
            <div class="col">내 정 보<br><?= backButton() ?></div>
        </div>
        <div class="row gx-0">
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                <div class="row">
                    <div class="col"><?php generalInfo($me); ?><?php generalInfo2($me); ?></div>
                </div>
            </div>
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                <div class="row mx-0 gx-0">
                    <div class="col" style='padding-left:2ch;'>
                        토너먼트 【
@@ -117,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>
@@ -139,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>
@@ -167,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>
@@ -178,7 +204,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                    </div>
                </div>
            </div>
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                <div class="row gx-0">
                    <div class="col bg1 text-center">
                        <h4 style='color:skyblue'>개인 기록</h4>
@@ -191,7 +217,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                    <button type="button" class="load_old_log btn btn-secondary" data-log_type="generalAction">이전 로그 불러오기</button>
                </div>
            </div>
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                <div class="row gx-0">
                    <div class="col bg1 text-center">
                        <h4 style='color:orange'>전투 기록</h4>
@@ -205,7 +231,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                </div>
            </div>
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                <div class="row gx-0">
                    <div class="col bg1 text-center">
                        <h4 style='color:skyblue'>장수 열전</h4>
@@ -215,7 +241,7 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
                    <?= formatHistoryToHTML(getGeneralHistoryLogAll($generalID)) ?>
                </div>
            </div>
-            <div class="col col-12 col-md-6">
+            <div class="col col-12 col-lg-6">
                <div class="row gx-0">
                    <div class="col bg1 text-center">
                        <h4 style='color:orange'>전투 결과</h4>
@@ -14,14 +14,16 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("토너먼트", 1);
 TurnExecutionHelper::executeAllCommand();
-$me = $db->queryFirstRow('select no,tournament,con,turntime from general where owner=%i', $userID);
+$me = $db->queryFirstRow(
-$generalID = $session->generalID;
+    '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'];
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }
@@ -100,7 +102,7 @@ $globalBetTotal = array_sum($globalBet);
 ?>
 <!DOCTYPE html>
 <html>
-<?php if ($con == 1) {
+<?php if ($limitState == 1) {
    MessageBox("접속제한이 얼마 남지 않았습니다! 제한량이 모자라다면 참여를 해보세요^^");
 } ?>
@@ -0,0 +1,6 @@
 <?php
 namespace sammo;
 class ServerEnv extends ServerDefaultEnv {
    //ServerEnv 기본값을 변경하고 싶다면 orig를 제거한 복사본을 만들고 수정
 }
@@ -5,6 +5,9 @@ namespace sammo;
 use DateTime;
 use Ds\Set;
 use sammo\Enums\AuctionType;
 use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\GeneralColumn;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
 use sammo\Enums\RankColumn;
@@ -103,10 +106,9 @@ function GetImageURL($imgsvr, $filepath = '')
 }
 /**
- * @param null|int $con 장수의 벌점
+ * @param null|int $refreshScore 장수의 벌점
 * @param null|int $conlimit 최대 벌점
 */
-function checkLimit($con = null)
+function checkLimit($refreshScore = null)
 {
    $session = Session::getInstance();
    if ($session->userGrade >= 4) {
@@ -116,15 +118,15 @@ function checkLimit($con = null)
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    if ($con === null) {
+    if ($refreshScore === null) {
-        $con = $db->queryFirstField('SELECT con FROM general WHERE `owner`=%i', Session::getUserID());
+        $refreshScore = $db->queryFirstField('SELECT refresh_score FROM general_access_log WHERE `general_id`=%i', Session::getGeneralID());
    }
-    $conlimit = $gameStor->conlimit;
+    $refreshLimit = $gameStor->refreshLimit;
-    if ($con > $conlimit) {
+    if ($refreshScore > $refreshLimit) {
        return 2;
        //접속제한 90%이면 경고문구
-    } elseif ($con > $conlimit * 0.9) {
+    } elseif ($refreshScore > $refreshLimit * 0.9) {
        return 1;
    } else {
        return 0;
@@ -147,7 +149,7 @@ function getRandGenName(RandUtil $rng)
-function cityInfo(General $generalObj)
+function cityInfo(GeneralLite $generalObj)
 {
    $db = DB::db();
@@ -642,7 +644,7 @@ function generalInfo(General $generalObj)
        $age = "<font color=red>{$age} 세</font>";
    }
-    $connectCnt = round($generalObj->getVar('connect'), -1);
+    $refreshScoreTotal = round($generalObj->getAccessLogVar(GeneralAccessLogColumn::refreshScoreTotal) ?? 0, -1);
    $specialDomestic = $generalObj->getVar('special') === GameConst::$defaultSpecialDomestic
        ? "{$generalObj->getVar('specage')}세"
        : "<font color=limegreen>" . displayiActionObjInfo($generalObj->getSpecialDomestic()) . "</font>";
@@ -751,7 +753,7 @@ function generalInfo(General $generalObj)
        <td style='text-align:center;' class='bg1'><b>부대</b></td>
        <td style='text-align:center;' colspan=3>{$troopInfo}</td>
        <td style='text-align:center;' class='bg1'><b>벌점</b></td>
-        <td style='text-align:center;' colspan=5>" . getConnect($connectCnt) . " {$connectCnt}({$generalObj->getVar('con')})</td>
+        <td style='text-align:center;' colspan=5>" . getRefreshScoreText($refreshScoreTotal) . " {$refreshScoreTotal}({$generalObj->getAccessLogVar(GeneralAccessLogColumn::refreshScore)})</td>
    </tr>
 </table>";
 }
@@ -998,52 +1000,69 @@ function increaseRefresh($type = "", $cnt = 1)
    $generalID = $session->generalID;
    $userGrade = $session->userGrade;
-    $date = TimeUtil::now();
+    $dateObj = new \DateTimeImmutable();
    $date = TimeUtil::format($dateObj, false);
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $isunited = $gameStor->isunited;
    $opentime = $gameStor->opentime;
-    if($userGrade == 6){
+    if ($userGrade == 6) {
        return;
    }
-    if($isunited == 2){
+    if ($isunited == 2) {
        return;
    }
-    if(!$generalID){
+    if (!$generalID) {
        return;
    }
-    if($opentime > $date){
+    if ($opentime > $date) {
        return;
    }
    $gameStor->refresh = $gameStor->refresh + $cnt; //TODO: +로 증가하는 값은 별도로 분리
-    $db->update('general', [
+    $db->insertUpdate('general_access_log', [
-        'lastrefresh' => $date,
+        GeneralAccessLogColumn::generalID->value => $generalID,
-        'con' => $db->sqleval('con + %i', $cnt),
+        GeneralAccessLogColumn::userID->value => $userID,
-        'connect' => $db->sqleval('connect + %i', $cnt),
+        GeneralAccessLogColumn::lastRefresh->value => $date,
-        'refcnt' => $db->sqleval('refcnt + %i', $cnt),
+        GeneralAccessLogColumn::refreshTotal->value => $cnt,
-        'refresh' => $db->sqleval('refresh + %i', $cnt)
+        GeneralAccessLogColumn::refresh->value => $cnt,
-    ], 'owner=%i', $userID);
+        GeneralAccessLogColumn::refreshScore->value => $cnt,
        GeneralAccessLogColumn::refreshScoreTotal->value => $cnt,
    ], [
        GeneralAccessLogColumn::lastRefresh->value => $date,
        GeneralAccessLogColumn::refreshTotal->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refreshTotal->value, $cnt),
        GeneralAccessLogColumn::refresh->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refresh->value, $cnt),
        GeneralAccessLogColumn::refreshScore->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refreshScore->value, $cnt),
        GeneralAccessLogColumn::refreshScoreTotal->value => $db->sqleval('%b + %i', GeneralAccessLogColumn::refreshScoreTotal->value, $cnt),
    ]);
-    $date = date('Y_m_d H:i:s');
+    $serverPath = __DIR__;
-    $date2 = substr($date, 0, 10);
+
-    $online = getOnlineNum();
+    $serverID = UniqueConst::$serverID;
-    file_put_contents(
+    $logPath = "{$serverPath}/logs/{$serverID}/api_log.db";
-        __DIR__ . "/logs/" . UniqueConst::$serverID . "/_{$date2}_refresh.txt",
+
-        sprintf(
+    $logDB = FileDB::db($logPath, $serverPath . '/../f_install/sql/api_log.sql');
-            "%s, %s, %s, %s, %s, %d\n",
+
-            $date,
+    $ip = $_SERVER['REMOTE_ADDR'] ?? 'local';
-            $session->userName,
+    $date = date('Y-m-d H:i:s');
-            $session->generalName,
+
-            $session->ip,
+    $logDB->insert('api_log', [
-            $type,
+        'user_id' => $session->userID,
-            $online
+        'ip' => $ip,
-        ),
+        'date' => $date,
-        FILE_APPEND
+        'path' => "refresh",
-    );
+        'arg' => JSON::encode([
            'type' => $type,
        ]),
        'aux' => JSON::encode([
            'generalID' => $generalID,
            'generalName' => $session->generalName,
            'userName' => $session->userName,
        ]),
    ]);
 }
 function updateTraffic()
@@ -1051,12 +1070,9 @@ 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 */
    //최다갱신자
    $user = $db->queryFirstRow('select name,refresh from general order by refresh desc limit 1');
    if ($admin['maxrefresh'] < $admin['refresh']) {
        $admin['maxrefresh'] = $admin['refresh'];
    }
@@ -1067,22 +1083,20 @@ function updateTraffic()
    $gameStor->maxrefresh = $admin['maxrefresh'];
    $gameStor->maxonline = $admin['maxonline'];
-    $db->update('general', ['refresh' => 0], true);
+    $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;
-    $date = TimeUtil::now();
+    $db->update('general_access_log', ['refresh' => 0], true);
    //일시|년|월|총갱신|접속자|최다갱신자
    file_put_contents(
        __DIR__ . "/logs/" . UniqueConst::$serverID . "/_traffic.txt",
        Json::encode([
            $date,
            $admin['year'],
            $admin['month'],
            $admin['refresh'],
            $online,
            $user['name'] . "(" . $user['refresh'] . ")"
        ]) . "\n",
        FILE_APPEND
    );
 }
 function CheckOverhead()
@@ -1090,13 +1104,13 @@ function CheckOverhead()
    //서버정보
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    list($turnterm, $conlimit) = $gameStor->getValuesAsArray(['turnterm', 'conlimit']);
+    [$turnterm, $refreshLimit] = $gameStor->getValuesAsArray(['turnterm', 'refreshLimit']);
-    $con = Util::round(pow($turnterm, 0.6) * 3) * 10;
+    $nextRefreshLimit = Util::round(pow($turnterm, 0.6) * 3) * 10;
-    if ($con != $conlimit) {
+    if ($nextRefreshLimit != $refreshLimit) {
-        $gameStor->conlimit = $con;
+        $gameStor->refreshLimit = $nextRefreshLimit;
    }
 }
@@ -1200,7 +1214,16 @@ function updateOnline()
    //동접수
    $startTurn = cutTurn($gameStor->turntime, $gameStor->turnterm, false);
-    $onlineUser = $db->query('SELECT no,name,nation FROM general WHERE lastrefresh >= %s AND npc < 2', $startTurn);
+    $onlineUser = $db->query(
        'SELECT %b, %b, %b FROM `general_access_log` as `log` INNER JOIN `general` ON `log`.%b = `general`.%b WHERE %b >= %s',
        GeneralColumn::no->value,
        GeneralColumn::name->value,
        GeneralColumn::nation->value,
        GeneralAccessLogColumn::generalID->value,
        GeneralColumn::no->value,
        GeneralAccessLogColumn::lastRefresh->value,
        $startTurn
    );
    $onlineNum = count($onlineUser);
    $onlineNationUsers = Util::arrayGroupBy($onlineUser, 'nation');
@@ -1314,7 +1337,7 @@ function CheckHall($no)
        ["betrate", 'calc'],
    ];
-    $generalObj = General::createGeneralObjFromDB($no, null, 2);
+    $generalObj = General::createObjFromDB($no);
    $ttw = $generalObj->getRankVar(RankColumn::ttw);
    $ttd = $generalObj->getRankVar(RankColumn::ttd);
@@ -1704,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'],
        1
    );
    $nationGeneralList[$lordID] = $lord;
@@ -1728,7 +1750,7 @@ function deleteNation(General $lord, bool $applyDB): array
    // 전 장수 재야로
    foreach ($nationGeneralList as $general) {
-        if($general->getNPCType() < 2){
+        if ($general->getNPCType() < 2) {
            $general->setAuxVar(
                InheritanceKey::max_belong->value,
                max(
@@ -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 [
@@ -133,19 +133,19 @@ function getNationType(?string $type) {
 }
-function getConnect($con) {
+function getRefreshScoreText($score) {
-    if($con < 50)        $conname = '안함';
+    if($score < 50)        $scoreName = '안함';
-    elseif($con <   100) $conname = '무관심';
+    elseif($score <   100) $scoreName = '무관심';
-    elseif($con <   200) $conname = '가끔';
+    elseif($score <   200) $scoreName = '가끔';
-    elseif($con <   400) $conname = '보통';
+    elseif($score <   400) $scoreName = '보통';
-    elseif($con <   800) $conname = '자주';
+    elseif($score <   800) $scoreName = '자주';
-    elseif($con <  1600) $conname = '열심';
+    elseif($score <  1600) $scoreName = '열심';
-    elseif($con <  3200) $conname = '중독';
+    elseif($score <  3200) $scoreName = '중독';
-    elseif($con <  6400) $conname = '폐인';
+    elseif($score <  6400) $scoreName = '폐인';
-    elseif($con < 12800) $conname = '경고';
+    elseif($score < 12800) $scoreName = '경고';
-    else $conname = '헐...';
+    else $scoreName = '헐...';
-    return $conname;
+    return $scoreName;
 }
 function getNationType2(?string $type) {
@@ -256,6 +256,75 @@ 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 getBuffClass(?string $type){
    if($type === null || $type === ''){
        $type = 'None';
    }
    static $basePath = __NAMESPACE__.'\\ActionBuff\\';
    $classPath = ($basePath.$type);
    if(class_exists($classPath)){
        return $classPath;
    }
    $classPath = ($basePath.'che_'.$type);
    if(class_exists($classPath)){
        return $classPath;
    }
    throw new \InvalidArgumentException("{$type}은 버프 클래스가 아님");
 }
 function buildBuffClass(?string $type):iAction{
    static $cache = [];
    if($type === null){
        $type = 'None';
    }
    if(key_exists($type, $cache)){
        return $cache[$type];
    }
    $class = getBuffClass($type);
    $obj = new $class();
    $cache[$type]= $obj;
    return $obj;
 }
 function getGeneralSpecialDomesticClass(?string $type){
    if($type === null || $type === ''){
        $type = GameConst::$defaultSpecialDomestic;
@@ -326,6 +395,41 @@ function buildGeneralSpecialWarClass(?string $type):BaseSpecial{
    return $obj;
 }
 function getActionCrewTypeClass(?string $type){
    if($type === null || $type === ''){
        $type = 'None';
    }
    static $basePath = __NAMESPACE__.'\\ActionCrewType\\';
    $classPath = ($basePath.$type);
    if(class_exists($classPath)){
        return $classPath;
    }
    $classPath = ($basePath.'che_'.$type);
    if(class_exists($classPath)){
        return $classPath;
    }
    throw new \InvalidArgumentException("{$type}은 올바른 병종 효과가 아님");
 }
 function buildActionCrewTypeClass(?string $type):iAction{
    static $cache = [];
    if($type === null){
        $type = 'None';
    }
    if(key_exists($type, $cache)){
        return $cache[$type];
    }
    $class = getActionCrewTypeClass($type);
    $obj = new $class();
    $cache[$type]= $obj;
    return $obj;
 }
 function getGeneralCommandClass(?string $type){
    if($type === null || $type === ''){
        $type = '휴식';
@@ -346,6 +450,27 @@ function buildGeneralCommandClass(?string $type, General $generalObj, array $env
    return new $class($generalObj, $env, $arg);
 }
 function getUserActionCommandClass(?string $type){
    if($type === null || $type === ''){
        $type = '휴식';
    }
    static $basePath = __NAMESPACE__.'\\Command\\UserAction\\';
    $classPath = ($basePath.$type);
    if(class_exists($classPath)){
        return $classPath;
    }
    throw new \InvalidArgumentException("{$type}은 올바른 개변 전략 커맨드가 아님");
 }
 function buildUserActionCommandClass(?string $type, General $generalObj, array $env, $arg = null):Command\UserActionCommand{
    $class = getUserActionCommandClass($type);
    return new $class($generalObj, $env, $arg);
 }
 function getNationCommandClass(?string $type){
    if($type === null || $type === ''){
        $type = '휴식';
@@ -542,6 +667,8 @@ function getExpLevel($experience) {
        $level = Util::toInt(sqrt($experience/10));
    }
    $level = Util::clamp($level, 0, GameConst::$maxLevel);
    return $level;
 }
@@ -202,8 +202,10 @@ function preUpdateMonthly()
    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
    //접률감소, 건국제한-1
    $db->update('general_access_log', [
        'refresh_score_total' => $db->sqleval('floor(refresh_score_total*0.99)'),
    ], true);
    $db->update('general', [
        'connect' => $db->sqleval('floor(connect*0.99)'),
        'makelimit' => $db->sqleval('greatest(0, makelimit - 1)'),
    ], true);
    //전략제한-1, 외교제한-1, 세율동기화
@@ -301,7 +303,6 @@ function postUpdateMonthly(RandUtil $rng)
                WHERE g.nation = A.nation)
        +(select round(sum(dex1+dex2+dex3+dex4+dex5)/1000) from general where nation=A.nation)
        +(select round(sum(experience+dedication)/100) from general where nation=A.nation)
        +(select round(avg(connect)) from general where nation=A.nation)
    )/10)
    as power,
    (select sum(crew) from general where nation=A.nation) as totalCrew
@@ -450,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();
@@ -697,7 +698,7 @@ function checkEmperior()
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $admin = $gameStor->getValues(['year', 'month', 'isunited', 'conlimit']);
+    $admin = $gameStor->getValues(['year', 'month', 'isunited', 'refreshLimit']);
    if ($admin['isunited'] != 0) {
        return;
    }
@@ -742,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) {
@@ -759,7 +760,7 @@ function checkEmperior()
    }
    $gameStor->isunited = 2;
-    $gameStor->conlimit = $gameStor->conlimit * 100;
+    $gameStor->refreshLimit = $gameStor->refreshLimit * 100;
    foreach ($db->queryFirstColumn('SELECT no FROM general WHERE npc<2 AND age>=%i', GameConst::$minPushHallAge) as $hallGeneralNo) {
        CheckHall($hallGeneralNo);
@@ -771,7 +772,7 @@ function checkEmperior()
    $chiefs = Util::convertArrayToDict(
        $db->query(
-            'SELECT no,name,picture,belong,officer_level FROM general WHERE nation=%i AND officer_level >= 5',
+            'SELECT no,npc,name,picture,belong,officer_level FROM general WHERE nation=%i AND officer_level >= 5',
            $nationID
        ),
        'officer_level'
@@ -908,6 +909,34 @@ function checkEmperior()
    //연감 월결산
    LogHistory();
    $availableInvaderGame = false;
    foreach(CityConst::all() as $city){
        if($city->level == 4){
            $availableInvaderGame = true;
            break;
        }
    }
    if($availableInvaderGame){
        $invaderMsgCnt = 2;
        foreach(range(12, 5, -1) as $chiefLevel){
            if(!key_exists($chiefLevel, $chiefs)){
                continue;
            }
            $targetChief = $chiefs[$chiefLevel];
            if($targetChief['npc'] >= 2){
                continue;
            }
            $invaderMsgs = RaiseInvaderMessage::buildRaiseInvaderMessage($targetChief['no']);
            foreach($invaderMsgs as $invaderMsg){
                $invaderMsg->send();
            }
            $invaderMsgCnt--;
            if($invaderMsgCnt <= 0){
                break;
            }
        }
    }
 }
 function updateMaxDomesticCritical(General $general, $score)
@@ -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);
@@ -383,7 +390,7 @@ function disaster(RandUtil $rng) {
            $generalList = array_map(
                function($rawGeneral) use ($city, $year, $month){
-                    return new General($rawGeneral, null, $city, null, $year, $month, false);
+                    return new General($rawGeneral, null, null, $city, null, $year, $month, false);
                },
                $generalListByCity[$city['city']]??[]
            );
@@ -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']);
@@ -39,8 +39,8 @@ if ($session->userGrade < 5 && !$allowReset) {
 <body>
    <div class="container">
-        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 리셋</h1>
+        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 리셋</h1>
-        <div class="row justify-content-md-center">
+        <div class="row justify-content-lg-center">
            <div class="col col-lg-8">
                <div class="card" id="game_form_card">
@@ -32,8 +32,8 @@ if ($session->userGrade == 5) {
 <body>
    <div class="container" style="min-width:720px;">
-        <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 리셋</h1>
+        <h1 class="row justify-content-lg-center">삼국지 모의전투 HiDCHe 리셋</h1>
-        <div class="row justify-content-md-center">
+        <div class="row justify-content-lg-center">
            <div class="col col-lg-8">
                <div class="card" id="db_form_card">
@@ -17,10 +17,13 @@ $text = Util::getPost('text');
 increaseRefresh("회의실", 1);
-$me = $db->queryFirstRow('SELECT no, nation, name, officer_level, permission, con, turntime, belong, penalty, `picture`,`imgsvr` FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no, nation, name, officer_level, permission, refresh_score, turntime, belong, penalty, `picture`,`imgsvr` FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -50,7 +53,7 @@ if($permission < 0){
        'result'=>false,
        'reason'=>'국가에 소속되어있지 않습니다.'
    ]);
-    
+
 }
 else if ($isSecretBoard && $permission < 2) {
    Json::die([
@@ -16,10 +16,13 @@ $text = Util::getPost('text');
 increaseRefresh("회의실", 1);
-$me = $db->queryFirstRow('SELECT no, nation, name, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no, nation, name, officer_level, permission, refresh_score, turntime, belong, penalty FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -58,7 +61,7 @@ if($permission < 0){
        'result'=>false,
        'reason'=>'국가에 소속되어있지 않습니다.'
    ]);
-    
+
 }
 else if ($isSecretBoard && $permission < 2) {
    Json::die([
@@ -16,11 +16,14 @@ $isSecretBoard = Util::getPost('isSecret', 'bool', false);
 increaseRefresh("회의실", 1);
-$me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no, nation, officer_level, permission, refresh_score, turntime, belong, penalty FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -33,7 +36,7 @@ if($permission < 0){
        'result'=>false,
        'reason'=>'국가에 소속되어있지 않습니다.'
    ]);
-    
+
 }
 else if ($isSecretBoard && $permission < 2) {
    Json::die([
@@ -72,4 +75,3 @@ Json::die([
    'articles'=>$articles,
    'reason'=>'success'
 ]);
@@ -17,10 +17,13 @@ $letterNo = Util::getPost('letterNo', 'int');
 increaseRefresh("외교부", 1);
-$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -16,11 +16,14 @@ $isSecretBoard = Util::getPost('isSecret', 'bool', false);
 increaseRefresh("외교부", 1);
-$me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no, nation, officer_level, permission, refresh_score, turntime, belong, penalty FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -33,7 +36,7 @@ if($permission < 0){
        'result'=>false,
        'reason'=>'국가에 소속되어있지 않습니다.'
    ]);
-    
+
 }
 $letters = [];
@@ -83,4 +86,3 @@ Json::die([
    'myNationID'=>$me['nation'],
    'reason'=>'success'
 ]);
@@ -22,10 +22,13 @@ $reason = Util::getPost('reason', 'string', '');
 increaseRefresh("외교부", 1);
-$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -17,10 +17,13 @@ $letterNo = Util::getPost('letterNo', 'int');
 increaseRefresh("외교부", 1);
-$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -24,10 +24,13 @@ if($prevNo < 1){
    $prevNo = null;
 }
-$me = $db->queryFirstRow('SELECT no, name, nation, officer_level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no, name, nation, officer_level, permission, refresh_score, turntime, belong, penalty, picture, imgsvr FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -33,12 +33,15 @@ if($generalID <= 0 || $reqTo <= 0){
 $db = DB::db();
-$me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no,nation,officer_level,refresh_score,turntime,belong,permission,penalty FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
 $nationID = $me['nation'];
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    Json::die([
        'result'=>false,
        'reason'=>'접속 제한입니다.'
@@ -61,7 +64,7 @@ if($generalID !== $targetID){
            'reason'=>'권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.'
        ]);
    }
-    
+
    if($testGeneralNationID !== $nationID){
        Json::die([
            'result'=>false,
@@ -199,17 +199,25 @@ if($reserve_open){
    ]);
 }
-Json::die(ResetHelper::buildScenario(
+try{
-    $turnterm,
+    Json::die(ResetHelper::buildScenario(
-    $sync,
+        $turnterm,
-    $scenario,
+        $sync,
-    $fiction,
+        $scenario,
-    $extend,
+        $fiction,
-    $block_general_create,
+        $extend,
-    $npcmode,
+        $block_general_create,
-    $show_img_level,
+        $npcmode,
-    !!$tournament_trig,
+        $show_img_level,
-    $join_mode,
+        !!$tournament_trig,
-    TimeUtil::now(),
+        $join_mode,
-    $autorun_user
+        TimeUtil::now(),
-));
+        $autorun_user
    ));
 }
 catch(\Exception $e){
    Json::die([
        'result'=>false,
        'reason'=>$e->getMessage()
    ]);
 }
@@ -1,6 +1,8 @@
 <?php
 namespace sammo;
 use sammo\Enums\GeneralLiteQueryMode;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\MessageType;
 include "lib.php";
@@ -45,12 +47,7 @@ if($destGeneralID==0){
    $general->setVar('nation', $nationID);
 }
 else{
-    $general = General::createGeneralObjFromDB($destGeneralID, [
+    $general = General::createObjFromDB($destGeneralID);
        'name', 'leadership', 'strength', 'intel', 'gold','rice',
        'troop','officer_level','npc','picture','imgsvr',
        'permission','penalty','belong', 'crewtype',
        'experience', 'dedication', 'betray', 'dedlevel', 'explevel', 'makelimit', 'aux',
    ], 1);
    if($general instanceof DummyGeneral){
        Json::die([
@@ -1,6 +1,8 @@
 <?php
 namespace sammo;
 use sammo\Enums\GeneralAccessLogColumn;
 include "lib.php";
 include "func.php";
@@ -86,6 +88,11 @@ $db->update('general', [
    'owner'=>$userID,
    'aux'=>Json::encode($genAux)
 ], 'owner <= 0 AND npc = 2 AND no = %i', $pick);
 $db->insertIgnore('general_access_log', [
    GeneralAccessLogColumn::generalID->value => $pick,
    GeneralAccessLogColumn::userID->value => $userID,
    GeneralAccessLogColumn::lastRefresh->value => $now,
 ]);
 if(!$db->affectedRows()){
    Json::die([
@@ -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);
+        $affectedTrain = -3;
-        $me->increaseVarWithLimit('atmos', -6, 20);
+        $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);
@@ -39,7 +39,10 @@ if (!$data || !is_array($data)) {
 $db = DB::db();
-$me = $db->queryFirstRow('SELECT no, name, npc, nation, city, officer_level, con, turntime, belong, permission, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow(
    'SELECT no, name, npc, nation, city, officer_level, refresh_score, turntime, belong, permission, penalty FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
 );
 $nationID = $me['nation'];
@@ -1,4 +1,5 @@
 <?php
 namespace sammo;
 use Ds\Map;
@@ -15,48 +16,48 @@ $userID = Session::getUserID();
 increaseRefresh("시뮬레이터", 0);
 $query = Util::getPost('query');
-if($query === null){
+if ($query === null) {
    Json::die([
-        'result'=>false,
+        'result' => false,
-        'reason'=>'입력값이 없습니다.'
+        'reason' => '입력값이 없습니다.'
    ]);
 }
 $action = Util::getPost('action');
-if($action === null || !in_array($action, ['reorder', 'battle'])){
+if ($action === null || !in_array($action, ['reorder', 'battle'])) {
    Json::die([
-        'result'=>false,
+        'result' => false,
-        'reason'=>'원하는 동작이 지정되지 않았습니다.'
+        'reason' => '원하는 동작이 지정되지 않았습니다.'
    ]);
 }
 $query = Json::decode($query);
-if($query === null){
+if ($query === null) {
    Json::die([
-        'result'=>false,
+        'result' => false,
-        'reason'=>'올바르지 않은 JSON입니다.'
+        'reason' => '올바르지 않은 JSON입니다.'
    ]);
 }
 $defaultCheck = [
-    'required'=>[
+    'required' => [
        'attackerGeneral', 'attackerCity', 'attackerNation',
        'defenderGenerals', 'defenderCity', 'defenderNation',
        'year', 'month', 'repeatCnt'
    ],
-    'integer'=>[
+    'integer' => [
-        'year','month','repeatCnt'
+        'year', 'month', 'repeatCnt'
    ],
-    'between'=>[
+    'between' => [
        ['month', [1, 12]]
    ],
-    'in'=>[
+    'in' => [
        ['repeatCnt', [1, 1000]]
    ],
-    'min'=>[
+    'min' => [
        ['year', 0]
    ],
-    'array'=>[
+    'array' => [
        'attackerGeneral', 'attackerCity', 'attackerNation',
        'defenderGenerals', 'defenderCity', 'defenderNation'
    ],
@@ -64,10 +65,10 @@ $defaultCheck = [
 $v = new Validator($query);
 $v->rules($defaultCheck);
-if(!$v->validate()){
+if (!$v->validate()) {
    Json::die([
-        'result'=>false,
+        'result' => false,
-        'reason'=>$v->errorStr()
+        'reason' => $v->errorStr()
    ]);
 }
@@ -86,20 +87,110 @@ $rawDefenderNation = $query['defenderNation'];
 $warSeed = $query['seed'] ?? '';
 $cityCheck = [
    'required' => [
        'city', 'nation', 'supply', 'name',
        'pop', 'agri', 'comm', 'secu', 'def', 'wall',
        'trust', 'level',
        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
        'dead', 'state', 'conflict',
    ],
    'numeric' => [
        'pop', 'agri', 'comm', 'secu', 'def', 'wall', 'trust', 'dead'
    ],
    'integer' => [
        'city', 'nation', 'supply',
        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
        'state',
    ],
    'min' => [
        ['def', 0],
        ['wall', 0],
        ['trust', 0],
        ['pop', 0],
        ['comm', 0],
        ['secu', 0],
        ['city', 1],
        ['nation', 0]
    ],
    'in' => [
        ['level', array_keys(getCityLevelList())]
    ]
 ];
 $v = new Validator($rawAttackerCity);
 $v->rules($cityCheck);
 if (!$v->validate()) {
    Json::die([
        'result' => false,
        'reason' => '[출병도시]' . $v->errorStr()
    ]);
 }
 $v = new Validator($rawDefenderCity);
 $v->rules($cityCheck);
 if (!$v->validate()) {
    Json::die([
        'result' => false,
        'reason' => '[수비도시]' . $v->errorStr()
    ]);
 }
 $nationCheck = [
    'required' => [
        'type', 'tech', 'level', 'capital',
        'nation', 'name', 'gold', 'rice', 'gennum'
    ],
    'integer' => [
        'level', 'capital', 'nation', 'gennum',
    ],
    'numeric' => [
        'tech', 'gold', 'rice'
    ],
    'min' => [
        ['tech', 0],
        ['gold', 0],
        ['rice', 0],
        ['gennum', 1],
    ],
    'in' => [
        ['type', GameConst::$availableNationType],
        ['level', array_keys(getNationLevelList())]
    ]
 ];
 $v = new Validator($rawAttackerNation);
 $v->rules($nationCheck);
 if (!$v->validate()) {
    Json::die([
        'result' => false,
        'reason' => '[출병국]' . $v->errorStr()
    ]);
 }
 $v = new Validator($rawDefenderNation);
 $v->rules($nationCheck);
 if (!$v->validate()) {
    Json::die([
        'result' => false,
        'reason' => '[수비국]' . $v->errorStr()
    ]);
 }
 $generalCheck = [
-    'required'=>[
+    'required' => [
        'no', 'name', 'nation', 'turntime', 'personal', 'special2', 'crew', 'crewtype', 'atmos', 'train',
        'intel', 'intel_exp', 'book', 'strength', 'strength_exp', 'weapon', 'injury', 'leadership', 'leadership_exp', 'horse', 'item',
        'explevel', 'experience', 'dedication', 'officer_level', 'officer_city', 'gold', 'rice', 'dex1', 'dex2', 'dex3', 'dex4', 'dex5',
        'recent_war', 'warnum', 'killnum', 'killcrew',
    ],
-    'integer'=>[
+    'integer' => [
        'no', 'nation', 'crew', 'crewtype', 'atmos', 'train',
        'intel', 'intel_exp', 'strength', 'strength_exp',  'injury', 'leadership', 'leadership_exp',
        'explevel', 'experience', 'dedication', 'officer_level', 'officer_city', 'gold', 'rice', 'dex1', 'dex2', 'dex3', 'dex4', 'dex5',
        'warnum', 'killnum', 'killcrew',
    ],
-    'min'=>[
+    'min' => [
        ['no', 1],
        ['nation', 1],
        ['crew', 0],
@@ -118,14 +209,14 @@ $generalCheck = [
        ['killnum', 0],
        ['killcrew', 0],
    ],
-    'between'=>[
+    'between' => [
        ['train', [40, GameConst::$maxTrainByWar]],
        ['atmos', [40, GameConst::$maxAtmosByWar]],
        ['explevel', [0, 300]],
        ['injury', [0, 80]],
        ['officer_level', [1, 12]]
    ],
-    'in'=>[
+    'in' => [
        ['personal', array_merge(GameConst::$availablePersonality, GameConst::$optionalPersonality)],
        ['special2', array_merge(GameConst::$availableSpecialWar, GameConst::$optionalSpecialWar)],
        ['crewtype', array_keys(GameUnitConst::all())],
@@ -134,11 +225,11 @@ $generalCheck = [
        ['book', array_merge(array_keys(GameConst::$allItems['book']), ['None'])],
        ['item', array_merge(array_keys(GameConst::$allItems['item']), ['None'])],
    ],
-    'array'=>['inheritBuff'],
+    'array' => ['inheritBuff'],
 ];
 $inheritBuffCheck = [
-    'between'=>[
+    'between' => [
        [TriggerInheritBuff::WAR_AVOID_RATIO, [0, 5]],
        [TriggerInheritBuff::WAR_CRITICAL_RATIO, [0, 5]],
        [TriggerInheritBuff::WAR_MAGIC_TRIAL_PROB, [0, 5]],
@@ -149,49 +240,67 @@ $inheritBuffCheck = [
    ]
 ];
 if(!$warSeed){
    $warSeed = bin2hex(random_bytes(16));
 }
 else {
    $repeatCnt = 1;
 }
 $tmpRNG = new RandUtil(new LiteHashDRBG($warSeed));
 $v = new Validator($rawAttacker);
 $v->rules($generalCheck);
-if(!$v->validate()){
+if (!$v->validate()) {
    Json::die([
-        'result'=>false,
+        'result' => false,
-        'reason'=>'[출병자]'.$v->errorStr()
+        'reason' => '[출병자]' . $v->errorStr()
    ]);
 }
 $rawAttacker['aux'] = [];
-if(key_exists('inheritBuff', $rawAttacker)){
+if (key_exists('inheritBuff', $rawAttacker)) {
    $v = new Validator($rawAttacker['inheritBuff']);
    $v->rules($inheritBuffCheck);
-    if(!$v->validate()){
+    if (!$v->validate()) {
        Json::die([
-            'result'=>false,
+            'result' => false,
-            'reason'=>'[출병자]'.$v->errorStr()
+            'reason' => '[출병자]' . $v->errorStr()
        ]);
    }
    $rawAttacker['aux']['inheritBuff'] = $rawAttacker['inheritBuff'];
 }
 $rawAttacker['aux'] = Json::encode($rawAttacker['aux']);
 $rawAttacker['owner'] = 0;
 $attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), null, $rawAttackerCity, $rawAttackerNation, $year, $month);
 $attacker = new WarUnitGeneral(
    $tmpRNG,
    $attackerGeneral,
    $rawAttackerNation,
    true
 );
 /** @var WarUnit[] */
 $defenderList = [];
-foreach($rawDefenderList as $idx=>$rawDefenderGeneral){
+
 foreach ($rawDefenderList as $idx => $rawDefenderGeneral) {
    $v = new Validator($rawDefenderGeneral);
    $v->rules($generalCheck);
-    if(!$v->validate()){
+    if (!$v->validate()) {
-        $idx+=1;
+        $idx += 1;
        Json::die([
-            'result'=>false,
+            'result' => false,
-            'reason'=>"[수비자{$idx}]".$v->errorStr()
+            'reason' => "[수비자{$idx}]" . $v->errorStr()
        ]);
    }
    $rawDefenderGeneral['aux'] = [];
-    if(key_exists('inheritBuff', $rawDefenderGeneral)){
+    if (key_exists('inheritBuff', $rawDefenderGeneral)) {
        $v = new Validator($rawDefenderGeneral['inheritBuff']);
        $v->rules($inheritBuffCheck);
-        if(!$v->validate()){
+        if (!$v->validate()) {
-            $idx+=1;
+            $idx += 1;
            Json::die([
-                'result'=>false,
+                'result' => false,
-                'reason'=>"[수비자{$idx}]".$v->errorStr()
+                'reason' => "[수비자{$idx}]" . $v->errorStr()
            ]);
        }
        $rawDefenderGeneral['aux']['inheritBuff'] = $rawDefenderGeneral['inheritBuff'];
@@ -199,135 +308,54 @@ foreach($rawDefenderList as $idx=>$rawDefenderGeneral){
    $rawDefenderGeneral['aux'] = Json::encode($rawDefenderGeneral['aux']);
    $rawDefenderGeneral['owner'] = 0;
-    $defenderList[] = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), $rawDefenderCity, $rawAttackerNation, $year, $month, true);
+    $defenderGeneral = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), null, $rawDefenderCity, $rawAttackerNation, $year, $month, true);
    $defenderList[] = new WarUnitGeneral(
        $tmpRNG,
        $defenderGeneral,
        $rawDefenderNation,
        false
    );
 }
 if ($action == 'reorder') {
    $noRng = NoRNG::rngInstance();
-$cityCheck = [
+    usort($defenderList, function (WarUnit $lhs, WarUnit $rhs) use ($attacker) {
-    'required'=>[
+        return - (extractBattleOrder($lhs, $attacker) <=> extractBattleOrder($rhs, $attacker));
        'city', 'nation', 'supply', 'name',
        'pop', 'agri', 'comm', 'secu', 'def', 'wall',
        'trust', 'level',
        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
        'dead', 'state', 'conflict',
    ],
    'numeric'=>[
        'pop', 'agri', 'comm', 'secu', 'def', 'wall', 'trust', 'dead'
    ],
    'integer'=>[
        'city', 'nation', 'supply',
        'pop_max', 'agri_max', 'comm_max', 'secu_max', 'def_max', 'wall_max',
        'state',
    ],
    'min'=>[
        ['def', 0],
        ['wall', 0],
        ['trust', 0],
        ['pop', 0],
        ['comm', 0],
        ['secu', 0],
        ['city', 1],
        ['nation', 0]
    ],
    'in'=>[
        ['level', array_keys(getCityLevelList())]
    ]
 ];
 $v = new Validator($rawAttackerCity);
 $v->rules($cityCheck);
 if(!$v->validate()){
    Json::die([
        'result'=>false,
        'reason'=>'[출병도시]'.$v->errorStr()
    ]);
 }
 $v = new Validator($rawDefenderCity);
 $v->rules($cityCheck);
 if(!$v->validate()){
    Json::die([
        'result'=>false,
        'reason'=>'[수비도시]'.$v->errorStr()
    ]);
 }
 $nationCheck = [
    'required'=>[
        'type', 'tech', 'level', 'capital',
        'nation', 'name', 'gold', 'rice', 'gennum'
    ],
    'integer'=>[
        'level', 'capital', 'nation', 'gennum',
    ],
    'numeric'=>[
        'tech', 'gold', 'rice'
    ],
    'min'=>[
        ['tech', 0],
        ['gold', 0],
        ['rice', 0],
        ['gennum', 1],
    ],
    'in'=>[
        ['type', GameConst::$availableNationType],
        ['level', array_keys(getNationLevelList())]
    ]
 ];
 $v = new Validator($rawAttackerNation);
 $v->rules($nationCheck);
 if(!$v->validate()){
    Json::die([
        'result'=>false,
        'reason'=>'[출병국]'.$v->errorStr()
    ]);
 }
 $v = new Validator($rawDefenderNation);
 $v->rules($nationCheck);
 if(!$v->validate()){
    Json::die([
        'result'=>false,
        'reason'=>'[수비국]'.$v->errorStr()
    ]);
 }
 if($action == 'reorder'){
    usort($defenderList, function(General $lhs, General $rhs){
        return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
    });
    $order = [];
-    foreach($defenderList as $defenderGeneral){
+    foreach ($defenderList as $defender) {
-        $order[] = $defenderGeneral->getID();
+        $order[] = $defender->getGeneral()->getID();
    }
    Json::die([
-        'result'=>true,
+        'result' => true,
-        'reason'=>'success',
+        'reason' => 'success',
-        'order'=>$order
+        'order' => $order
    ]);
 }
-usort($defenderList, function(General $lhs, General $rhs){
+$rawDefenderList = [];
-    return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
+foreach($defenderList as $unit){
-});
+    if(extractBattleOrder($unit, $attacker) <= 0){
-
+        continue;
-$rawDefenderList = array_map(function(General $general){
+    }
-    return $general->getRaw();
+    $rawDefenderList[] = $unit->getRaw();
-}, $defenderList);
+}
 unset($defenderList);
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $startYear = $gameStor->startyear;
-function extractRankVar(array $rawVal):Map{
+function extractRankVar(array $rawVal): Map
 {
    $rankVars = new Map;
-    foreach($rawVal as $rawKey=>$rawVal){
+    foreach ($rawVal as $rawKey => $rawVal) {
        $key = RankColumn::tryFrom($rawKey);
-        if($key === null){
+        if ($key === null) {
            continue;
        }
        $rankVars[$key] = $rawVal;
@@ -336,80 +364,104 @@ function extractRankVar(array $rawVal):Map{
 }
 function simulateBattle(
-    $rawAttacker, $rawAttackerCity, $rawAttackerNation,
+    $rawAttacker,
-    $rawDefenderList, $rawDefenderCity, $rawDefenderNation,
+    $rawAttackerCity,
-    $startYear, $year, $month, $warSeed
+    $rawAttackerNation,
-){
+    $rawDefenderList,
    $rawDefenderCity,
    $rawDefenderNation,
    $startYear,
    $year,
    $month,
    $warSeed
 ) {
-    if(!$warSeed){
+    if (!$warSeed) {
        $warSeed = bin2hex(random_bytes(16));
    }
    $warRng = new RandUtil(new LiteHashDRBG($warSeed));
    $attackerGeneral = new General($rawAttacker, extractRankVar($rawAttacker), null, $rawAttackerCity, $rawAttackerNation, $year, $month);
    $attacker = new WarUnitGeneral(
        $warRng,
-        new General($rawAttacker, extractRankVar($rawAttacker), $rawAttackerCity, $rawAttackerNation, $year, $month),
+        $attackerGeneral,
        $rawAttackerNation,
        true
    );
    $city = new WarUnitCity($warRng, $rawDefenderCity, $rawDefenderNation, $year, $month, $startYear);
-    $iterDefender = new \ArrayIterator($rawDefenderList);
+    /** @var WarUnit[] */
    $defenderList = [];
    foreach ($rawDefenderList as $rawDefenderGeneral) {
        $defenderGeneral = new General($rawDefenderGeneral, extractRankVar($rawDefenderGeneral), null, $rawDefenderCity, $rawAttackerNation, $year, $month, true);
        $defenderList[] = new WarUnitGeneral(
            $warRng,
            $defenderGeneral,
            $rawDefenderNation,
            false
        );
    }
    if(count($defenderList) && extractBattleOrder($city, $attacker) > 0){
        $defenderList[] = $city;
    }
    usort($defenderList, function (WarUnit $lhs, WarUnit $rhs) use ($attacker) {
        return - (extractBattleOrder($lhs, $attacker) <=> extractBattleOrder($rhs, $attacker));
    });
    $iterDefender = new \ArrayIterator($defenderList);
    $iterDefender->rewind();
    $battleResult = [];
-    $attackerRice = $rawAttacker['rice'];
+    $attackerRice = $attacker->getGeneral()->getVar('rice');
    $defenderRice = 0;
-    $getNextDefender = function(?WarUnit $prevDefender, bool $reqNext)
+    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext)
-        use ($warRng, $iterDefender, $rawDefenderCity, $rawDefenderNation, $year, $month, &$battleResult, &$defenderRice) {
+    use ($iterDefender, &$battleResult, &$defenderRice, $attacker): ?WarUnit {
-        if($prevDefender !== null){
+        if ($prevDefender !== null) {
            $prevDefender->getLogger()->rollback();
            $battleResult[] = $prevDefender;
-            if($prevDefender instanceof WarUnitGeneral){
+            if ($prevDefender instanceof WarUnitGeneral) {
                $defenderRice -= $prevDefender->getVar('rice');
            }
        }
-        if(!$reqNext){
+        if (!$reqNext) {
            return null;
        }
-        if(!$iterDefender->valid()){
+        if (!$iterDefender->valid()) {
            return null;
        }
-        $defenderObj = new General($iterDefender->current(), extractRankVar($iterDefender->current()), $rawDefenderCity, $rawDefenderNation, $year, $month);
+        /** @var WarUnit */
-        if(extractBattleOrder($defenderObj) <= 0){
+        $defender = $iterDefender->current();
        if (extractBattleOrder($defender, $attacker) <= 0) {
            return null;
        }
-        $defenderRice += $defenderObj->getVar('rice');
+        if($defender instanceof WarUnitGeneral){
            $defenderRice += $defender->getVar('rice');
        }
        $retVal = new WarUnitGeneral(
            $warRng,
            $defenderObj,
            $rawDefenderNation,
            false
        );
        $iterDefender->next();
-        return $retVal;
+        return $defender;
    };
-    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city, $year - $startYear);
+    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city);
    $rawDefenderCity = $city->getRaw();
    $updateAttackerNation = [];
    $updateDefenderNation = [];
    $attackerRice -= $attacker->getVar('rice');
-    if($city->getPhase() > 0){
+    if ($city->getPhase() > 0) {
        $rice = $city->getKilled() / 100 * 0.8;
        $rice *= $city->getCrewType()->rice;
-        $rice *= getTechCost($rawDefenderNation['tech']);
+        $rice *= getTechCost($city->getRawNation()['tech']);
        $rice *= $city->getCityTrainAtmos() / 100 - 0.2;
        Util::setRound($rice);
@@ -417,8 +469,8 @@ function simulateBattle(
    }
    $totalDead = $attacker->getKilled() + $attacker->getDead();
-    $attackerCityDead = $totalDead * 0.4;
+    //$attackerCityDead = $totalDead * 0.4;
-    $defenderCityDead = $totalDead * 0.6;
+    //$defenderCityDead = $totalDead * 0.6;
    return [$attacker, $city, $battleResult, $conquerCity, $attackerRice, $defenderRice];
 }
@@ -444,18 +496,26 @@ $avgWar = 0;
 $attackerActivatedSkills = [];
 $defendersActivatedSkills = [];
 if($warSeed){
    $repeatCnt = 1;
 }
-foreach(Util::range($repeatCnt) as $repeatIdx){
+foreach (Util::range($repeatCnt) as $repeatIdx) {
    if($repeatIdx > 0){
        $warSeed = bin2hex(random_bytes(16));
    }
    /** @var WarUnit $attacker */
    [$attacker, $city, $battleResult, $conquerCity, $attackerRice, $defenderRice] = simulateBattle(
-        $rawAttacker, $rawAttackerCity, $rawAttackerNation,
+        $rawAttacker,
-        $rawDefenderList, $rawDefenderCity, $rawDefenderNation,
+        $rawAttackerCity,
-        $startYear, $year, $month, $warSeed
+        $rawAttackerNation,
        $rawDefenderList,
        $rawDefenderCity,
        $rawDefenderNation,
        $startYear,
        $year,
        $month,
        $warSeed
    );
-    $lastWarLog = Util::mapWithKey(function($key, $values){
+    $lastWarLog = Util::mapWithKey(function ($key, $values) {
        return ConvertLog(join('<br>', $values));
    }, $attacker->getLogger()->rollback());
@@ -478,48 +538,45 @@ foreach(Util::range($repeatCnt) as $repeatIdx){
    $avgWar += count($battleResult) / $repeatCnt;
-    foreach($attacker->getActivatedSkillLog() as $skillName => $skillCnt){
+    foreach ($attacker->getActivatedSkillLog() as $skillName => $skillCnt) {
-        if(!key_exists($skillName, $attackerActivatedSkills)){
+        if (!key_exists($skillName, $attackerActivatedSkills)) {
            $attackerActivatedSkills[$skillName] = $skillCnt / $repeatCnt;
-        }
+        } else {
        else{
            $attackerActivatedSkills[$skillName] += $skillCnt / $repeatCnt;
        }
    }
-    foreach($battleResult as $idx=>$defender){
+    foreach ($battleResult as $idx => $defender) {
-        while($idx >= count($defendersActivatedSkills)){
+        while ($idx >= count($defendersActivatedSkills)) {
            $defendersActivatedSkills[] = [];
        }
        $activatedSkills = &$defendersActivatedSkills[$idx];
-        foreach($defender->getActivatedSkillLog() as $skillName => $skillCnt){
+        foreach ($defender->getActivatedSkillLog() as $skillName => $skillCnt) {
-            if(!key_exists($skillName, $activatedSkills)){
+            if (!key_exists($skillName, $activatedSkills)) {
                $activatedSkills[$skillName] = $skillCnt / $repeatCnt;
-            }
+            } else {
            else{
                $activatedSkills[$skillName] += $skillCnt / $repeatCnt;
            }
        }
    }
 }
 Json::die([
-    'result'=>true,
+    'result' => true,
-    'datetime'=>$rawAttacker['turntime'],
+    'datetime' => $rawAttacker['turntime'],
-    'reason'=>'success',
+    'reason' => 'success',
-    'lastWarLog'=>$lastWarLog,
+    'lastWarLog' => $lastWarLog,
-    'avgWar'=>$avgWar,
+    'avgWar' => $avgWar,
-    'phase'=>$avgPhase,
+    'phase' => $avgPhase,
-    'killed'=>$attackerKilled,
+    'killed' => $attackerKilled,
-    'maxKilled'=>$attackerMaxKilled,
+    'maxKilled' => $attackerMaxKilled,
-    'minKilled'=>$attackerMinKilled,
+    'minKilled' => $attackerMinKilled,
-    'dead'=>$attackerDead,
+    'dead' => $attackerDead,
-    'maxDead'=>$attackerMaxDead,
+    'maxDead' => $attackerMaxDead,
-    'minDead'=>$attackerMinDead,
+    'minDead' => $attackerMinDead,
-    'attackerRice'=>$attackerAvgRice,
+    'attackerRice' => $attackerAvgRice,
-    'defenderRice'=>$defenderAvgRice,
+    'defenderRice' => $defenderAvgRice,
-    'attackerSkills'=>$attackerActivatedSkills,
+    'attackerSkills' => $attackerActivatedSkills,
-    'defendersSkills'=>$defendersActivatedSkills,
+    'defendersSkills' => $defendersActivatedSkills,
 ]);
@@ -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,
@@ -3,6 +3,7 @@
 namespace sammo;
 use sammo\DTO\VoteInfo;
 use sammo\Enums\GeneralQueryMode;
 include "lib.php";
 include "func.php";
@@ -29,7 +30,8 @@ if (!$session->isGameLoggedIn()) {
 }
 $me = $db->queryFirstRow(
-    'SELECT no,con,turntime,newmsg,newvote,`officer_level` from general where owner = %i',
+    'SELECT no,refresh_score,turntime,newmsg,newvote,`officer_level` FROM `general`
    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner = %i',
    $userID
 );
@@ -51,13 +53,13 @@ if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
 $plock = boolval($db->queryFirstField('SELECT plock FROM plock WHERE `type`="GAME" LIMIT 1'));
-$con = checkLimit($me['con']);
+$limitState = checkLimit($me['refresh_score']);
-if ($con >= 2) {
+if ($limitState >= 2) {
    printLimitMsg($me['turntime']);
    exit();
 }
-$generalObj = General::createGeneralObjFromDB($me['no']);
+$generalObj = General::createObjFromDB($me['no'], null, GeneralQueryMode::FullWithAccessLog);
 $generalObj->setRawCity($db->queryFirstRow('SELECT * FROM city WHERE city = %i', $generalObj->getCityID()));
 $scenario = $gameStor->scenario_text;
@@ -180,44 +182,44 @@ if ($lastVoteID) {
            </div>
            <div class="row center gx-0">
-                <div class="s-border-t col py-2 col-8 col-md-4" style="color:<?= $color ?>;">
+                <div class="s-border-t col py-2 col-8 col-lg-4" style="color:<?= $color ?>;">
                    <?= $scenario ?>
                </div>
-                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
                    NPC 수, 상성 : <?= $extend ?>,<?= $fiction ?>
                </div>
-                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
                    NPC선택 : <?= $npcmode ?>
                </div>
-                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
                    토너먼트 : <?= getTournamentTermText($gameStor->turnterm) ?>
                </div>
-                <div class="s-border-t col py-2 col-4 col-md-2" style="color:<?= $color ?>;">
+                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
                    기타 설정: <?= $otherTextInfo ?>
                </div>
-                <div class="s-border-t col py-2 col-8 col-md-4"><?= info(2) ?></div>
+                <div class="s-border-t col py-2 col-8 col-lg-4"><?= info(2) ?></div>
-                <div class="s-border-t col py-2 col-4 col-md-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
+                <div class="s-border-t col py-2 col-4 col-lg-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
-                <div class="s-border-t col py-2 col-4 col-md-2">턴당 갱신횟수 : <?= $gameStor->conlimit ?>회</div>
+                <div class="s-border-t col py-2 col-4 col-lg-2">턴당 갱신횟수 : <?= $gameStor->refreshLimit ?>회</div>
-                <div class="s-border-t col py-2 col-8 col-md-4"><?= info(3) ?></div>
+                <div class="s-border-t col py-2 col-8 col-lg-4"><?= info(3) ?></div>
-                <div class="s-border-t py-2 col col-6 col-md-4">
+                <div class="s-border-t py-2 col col-6 col-lg-4">
                    <?php if ($isTournamentActive) : ?>
                        ↑<span style='color:cyan'><?= (['전력전', '통솔전', '일기토', '설전',])[$gameStor->tnmt_type] ?? '' ?> <?= getTournament($gameStor->tournament) ?> <?= getTournamentTime() ?></span>↑
                    <?php else : ?>
                        <span style='color:magenta'>현재 토너먼트 경기 없음</span>
                    <?php endif; ?>
                </div>
-                <div class="s-border-t py-2 col col-6 col-md-2">
+                <div class="s-border-t py-2 col col-6 col-lg-2">
                    <div style="display:inline-block;"><?= $plock ? ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
                </div>
-                <div class="s-border-t py-2 col col-6 col-md-2">
+                <div class="s-border-t py-2 col col-6 col-lg-2">
                    <?php if ($auctionCount > 0) : ?>
                        <span style='color:cyan'><?= $auctionCount ?>건</span> 거래 진행중
                    <?php else : ?>
                        <span style='color:magenta'>진행중 거래 없음</span>
                    <?php endif; ?>
                </div>
-                <div class="s-border-t py-2 col col-6 col-md-4 vote-cell">
+                <div class="s-border-t py-2 col col-6 col-lg-4 vote-cell">
                    <?php
                    ?>
                    <?php if ($lastVote === null) : ?>
@@ -283,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>
@@ -310,11 +299,11 @@ if ($lastVoteID) {
            </div>
        </div>
        <div class="row gx-0">
-            <div class="col-md-6" id="general_public_record-position">
+            <div class="col-lg-6" id="general_public_record-position">
                <div class="bg1 center s-border-tb"><b>장수 동향</b></div>
                <div id="general_public_record" style="text-align:left;"><?= formatHistoryToHTML(getGlobalActionLogRecent(15)) ?></div>
            </div>
-            <div class="col-md-6" id="general_log-position">
+            <div class="col-lg-6" id="general_log-position">
                <div class="bg1 center s-border-tb"><b>개인 기록</b></div>
                <div id="general_log" style="text-align:left;"><?= formatHistoryToHTML(getGeneralActionLogRecent($me['no'], 15)) ?></div>
            </div>
@@ -328,34 +317,34 @@ if ($lastVoteID) {
            <div id="message_board" class="row gx-0">
                <div class="message_input_form bg0 gx-0 row">
-                    <div id="mailbox_list-col" class="col-6 col-md-2 d-grid">
+                    <div id="mailbox_list-col" class="col-6 col-lg-2 d-grid">
                        <select id="mailbox_list" size="1" class="form-control bg-dark text-white">
                        </select>
                    </div>
-                    <div id="msg_input-col" class="col-12 col-md-8 d-grid">
+                    <div id="msg_input-col" class="col-12 col-lg-8 d-grid">
                        <input type="text" id="msg_input" maxlength="99" class="form-control">
                    </div>
-                    <div id="msg_submit-col" class="col-6 col-md-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
+                    <div id="msg_submit-col" class="col-6 col-lg-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
                </div>
-                <div class="col-md-6 board_side bg0"><a id="public_talk_position"></a>
+                <div class="col-lg-6 board_side bg0"><a id="public_talk_position"></a>
                    <div class="board_header bg0">전체 메시지(최고99자)</div>
                    <section class="public_message">
                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="public">이전 메시지 불러오기</button></div>
                    </section>
                </div>
-                <div class="col-md-6 board_side bg0"><a id="national_talk_position"></a>
+                <div class="col-lg-6 board_side bg0"><a id="national_talk_position"></a>
                    <div class="board_header bg0">국가 메시지(최고99자)</div>
                    <section class="national_message">
                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="national">이전 메시지 불러오기</button></div>
                    </section>
                </div>
-                <div class="col-md-6 board_side bg0"><a id="private_talk_position"></a>
+                <div class="col-lg-6 board_side bg0"><a id="private_talk_position"></a>
                    <div class="board_header bg0">개인 메시지(최고99자)</div>
                    <section class="private_message">
                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="private">이전 메시지 불러오기</button></div>
                    </section>
                </div>
-                <div class="col-md-6 board_side bg0"><a id="diplomacy_talk_position"></a>
+                <div class="col-lg-6 board_side bg0"><a id="diplomacy_talk_position"></a>
                    <div class="board_header bg0">외교 메시지(최고99자)</div>
                    <section class="diplomacy_message">
                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="diplomacy">이전 메시지 불러오기</button></div>
@@ -367,7 +356,7 @@ if ($lastVoteID) {
            </div>
        </div>
        <?php
-        if ($con == 1) {
+        if ($limitState == 1) {
            MessageBox("접속제한이 얼마 남지 않았습니다!");
        }
        if ($me['newmsg'] == 1) {
@@ -379,7 +368,7 @@ if ($lastVoteID) {
        }
        ?>
    </div>
-    <nav class="navbar navbar-expand fixed-bottom navbar-dark bg-dark d-sm-block d-md-none p-0" id="navbar500">
+    <nav class="navbar navbar-expand fixed-bottom navbar-dark bg-dark d-sm-block d-lg-none p-0" id="navbar500">
        <div class="container-fluid px-0">
            <div class="collapse navbar-collapse">
                <ul class="navbar-nav me-auto mx-auto">
@@ -396,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">
@@ -3,6 +3,7 @@
 namespace sammo;
 use sammo\Enums\EventTarget;
 use sammo\Enums\GeneralQueryMode;
 function processWar(string $warSeed, General $attackerGeneral, array $rawAttackerNation, array $rawDefenderCity)
 {
@@ -36,17 +37,33 @@ 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'));
+    $defenderCityGeneralIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0', $city->getVar('nation'), $city->getVar('city'));
-    $defenderList = General::createGeneralObjListFromDB($defenderIDList, null, 2);
+    $defenderCityGeneralList = General::createObjListFromDB($defenderCityGeneralIDList, null);
-    usort($defenderList, function (General $lhs, General $rhs) {
+    /** @var WarUnit[] */
-        return - (extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
+    $defenderList = [];
    foreach($defenderCityGeneralList as $defenderGeneral){
        $defenderGeneral->setRawCity($rawDefenderCity);
        $defenderCandidate = new WarUnitGeneral($rng, $defenderGeneral, $rawDefenderNation, false);
        if(extractBattleOrder($defenderCandidate, $attacker) <= 0){
            continue;
        }
        $defenderList[] = $defenderCandidate;
    }
    if(count($defenderList) && extractBattleOrder($city, $attacker) > 0){
        $defenderList[] = $city;
    }
    usort($defenderList, function (WarUnit $lhs, WarUnit $rhs) use ($attacker) {
        return - (extractBattleOrder($lhs, $attacker) <=> extractBattleOrder($rhs, $attacker));
    });
    $iterDefender = new \ArrayIterator($defenderList);
    $iterDefender->rewind();
-    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext) use ($rng, $iterDefender, $rawDefenderNation, $rawDefenderCity, $db) {
+    $getNextDefender = function (?WarUnit $prevDefender, bool $reqNext) use ($iterDefender, $db, $attacker) {
        if ($prevDefender !== null) {
            $prevDefender->applyDB($db);
        }
@@ -59,24 +76,16 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
            return null;
        }
        /** @var WarUnit */
        $nextDefender = $iterDefender->current();
-        $nextDefender->setRawCity($rawDefenderCity);
+        if (extractBattleOrder($nextDefender, $attacker) <= 0) {
        if (extractBattleOrder($nextDefender) <= 0) {
            return null;
        }
        $retVal = new WarUnitGeneral(
            $rng,
            $nextDefender,
            $rawDefenderNation,
            false
        );
        $iterDefender->next();
-        return $retVal;
+        return $nextDefender;
    };
-    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city, $year - $startYear);
+    $conquerCity = processWar_NG($warSeed, $attacker, $getNextDefender, $city);
    $attacker->applyDB($db);
@@ -177,11 +186,20 @@ 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(General $general)
+function extractBattleOrder(WarUnit $defender, WarUnit $attacker)
 {
    if($defender instanceof WarUnitCity){
        if(!($attacker instanceof WarUnitGeneral)){
            return 0;
        }
        $attackerGeneral = $attacker->getGeneral();
        return $attackerGeneral->onCalcOpposeStat($defender->getGeneral(), 'cityBattleOrder', -1);
    }
    $general = $defender->getGeneral();
    if ($general->getVar('crew') == 0) {
        return 0;
    }
@@ -204,7 +222,10 @@ function extractBattleOrder(General $general)
    $totalStat = ($realStat + $fullStat) / 2;
    $totalCrew = $general->getVar('crew') / 1000000 * (($general->getVar('train') * $general->getVar('atmos')) ** 1.5);
-    return $totalStat + $totalCrew / 100;
+    $value = $totalStat + $totalCrew / 100;
    $value = $general->onCalcStat($general, 'battleOrder', $value, ['attacker' => $attacker->getGeneral()]);
    $value = $attacker->getGeneral()->onCalcOpposeStat($general, 'battleOrder', $value, ['attacker' => $attacker->getGeneral()]);
    return $value;
 }
 function processWar_NG(
@@ -212,7 +233,6 @@ function processWar_NG(
    WarUnitGeneral $attacker,
    callable $getNextDefender,
    WarUnitCity $city,
    int $relYear
 ): bool {
    $templates = new \League\Plates\Engine(__DIR__ . '/templates');
@@ -225,6 +245,7 @@ function processWar_NG(
    $attackerNationUpdate = [];
    $defenderNationUpdate = [];
    /** @var WarUnit */
    $defender = ($getNextDefender)(null, true);
    $conquerCity = false;
@@ -240,6 +261,7 @@ function processWar_NG(
        $logWritten = false;
        if ($defender === null) {
            $defender = $city;
            $defender->setSiege();
            if ($city->getNationVar('rice') <= 0 && $city->getVar('supply')) {
                //병량 패퇴
@@ -406,21 +428,28 @@ function processWar_NG(
            $attacker->logBattleResult();
            $defender->logBattleResult();
-            $attacker->addWin();
+            if (!($defender instanceof WarUnitCity) || $defender->isSiege()){
-            $defender->addLose();
+                $attacker->addWin();
                $defender->addLose();
-            $attacker->tryWound();
+                $attacker->tryWound();
-            $defender->tryWound();
+                $defender->tryWound();
-            if ($defender === $city) {
+                if ($defender === $city) {
-                $attacker->addLevelExp(1000);
+                    $attacker->addLevelExp(1000);
-                $conquerCity = true;
+                    $conquerCity = true;
-                break;
+                    break;
                }
            }
            $josaYi = JosaUtil::pick($defender->getCrewTypeName(), '이');
-            if ($noRice) {
+            if ($defender instanceof WarUnitCity && !$defender->isSiege()){
                //실제 공성을 위해 다시 초기화
                $defender->setOppose(null);
            }
            else if ($noRice) {
                $logger->pushGlobalActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.");
                $attacker->getLogger()->pushGeneralActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.", ActionLogger::PLAIN);
                $defender->getLogger()->pushGeneralActionLog("군량 부족으로 패퇴합니다.", ActionLogger::PLAIN);
@@ -455,12 +484,18 @@ function processWar_NG(
    $attacker->finishBattle();
    $defender->finishBattle();
-    if ($defender instanceof WarUnitCity) {
+    if($city->getDead() || $defender instanceof WarUnitCity){
-        $newConflict = $defender->addConflict();
+        if($city !== $defender){
            $city->setOppose($attacker);
            $city->setSiege();
            $city->finishBattle();
        }
        $newConflict = $city->addConflict();
        if ($newConflict) {
            $nationName = $attacker->getNationVar('name');
            $josaYi = JosaUtil::pick($nationName, '이');
-            $logger->pushGlobalHistoryLog("<M><b>【분쟁】</b></><D><b>{$nationName}</b></>{$josaYi} <G><b>{$defender->getName()}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다.");
+            $logger->pushGlobalHistoryLog("<M><b>【분쟁】</b></><D><b>{$nationName}</b></>{$josaYi} <G><b>{$city->getName()}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다.");
        }
    }
@@ -497,8 +532,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'];
@@ -553,6 +589,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);
    }
    // 국가 멸망시
@@ -564,10 +615,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'], 1)[0]),
+            Util::formatListOfBackticks(General::mergeQueryColumn()[0]),
            $defenderNationID,
            12
-        ), null, $city, $loseNation, $year, $month, false);
+        ), null, null, $city, $loseNation, $year, $month);
        $josaUl = JosaUtil::pick($defenderNationName, '을');
        $attackerLogger->pushNationalHistoryLog("<D><b>{$defenderNationName}</b></>{$josaUl} 정복");
@@ -664,11 +715,12 @@ function ConquerCity(array $admin, General $general, array $city)
            $minCity = findNextCapital($cityID, $defenderNationID);
            $minCityName = CityConst::byID($minCity)->name;
            $josaRo = JosaUtil::pick($minCityName, '로');
            $josaYi = JosaUtil::pick($defenderNationName, '이');
-            $attackerLogger->pushGlobalHistoryLog("<M><b>【긴급천도】</b></><D><b>{$defenderNationName}</b></>{$josaYi} 수도가 함락되어 <G><b>$minCityName</b></>으로 긴급천도하였습니다.");
+            $attackerLogger->pushGlobalHistoryLog("<M><b>【긴급천도】</b></><D><b>{$defenderNationName}</b></>{$josaYi} 수도가 함락되어 <G><b>$minCityName</b></>{$josaRo} 긴급천도하였습니다.");
-            $moveLog = "수도가 함락되어 <G><b>$minCityName</b></>으로 <M>긴급천도</>합니다.";
+            $moveLog = "수도가 함락되어 <G><b>$minCityName</b></>{$josaRo} <M>긴급천도</>합니다.";
            //아국 수뇌부에게 로그 전달
            foreach ($db->queryFirstColumn(
                'SELECT no FROM general WHERE nation=%i AND officer_level>=5',
@@ -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);
@@ -10,6 +10,7 @@ use sammo\DTO\AuctionBidItem;
 use sammo\DTO\AuctionInfo;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\AuctionType;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
 use sammo\InheritancePointManager;
 use sammo\TimeUtil;
@@ -76,7 +77,7 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI
    $inheritMgr = InheritancePointManager::getInstance();
    //preveious라서 column을 최대한 비울 수 있다.
    $remainPoint = $inheritMgr->getInheritancePoint(
-      General::createGeneralObjFromDB($generalID, ['owner'], 0),
+      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');
@@ -42,9 +42,12 @@ class GetBettingList extends \sammo\BaseAPI
        $bettingStor = KVStorage::getStorage($db, 'betting');
        $userID = $session->userID;
-        $me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,penalty,permission FROM general WHERE owner=%i', $userID);
+        $me = $db->queryFirstRow(
-        $con = checkLimit($me['con']);
+            'SELECT no,nation,officer_level,refresh_score,turntime,belong,penalty,permission FROM `general`
-        if ($con >= 2) {
+            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
        );
        $limitState = checkLimit($me['refresh_score']);
        if ($limitState >= 2) {
            return "접속 제한중입니다.";
        }
@@ -0,0 +1,48 @@
 <?php
 namespace sammo\API\Command;
 use sammo\Session;
 use DateTimeInterface;
 use sammo\Command\UserActionCommand;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
 use sammo\DTO\UserAction;
 use function sammo\cutTurn;
 class GetReservedUserAction extends \sammo\BaseAPI
 {
    public function validateArgs(): ?string
    {
        return null;
    }
    public function getRequiredSessionMode(): int
    {
        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
    }
    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
    {
        $db = DB::db();
        $generalID = $session->generalID;
        $userActionKey = UserActionCommand::USER_ACTION_KEY;
        $rawUserActions = $db->queryFirstField('SELECT JSON_QUERY(`aux`, %s) FROM general WHERE no=%i', "$.{$userActionKey}", $generalID);
        if($rawUserActions === null){
            $rawUserActions = '{}';
        }
        $userActions = UserAction::fromArray(Json::decode($rawUserActions));
        return [
            'result' => true,
            'userActions' => $userActions->toArray(),
        ];
    }
 }
@@ -0,0 +1,91 @@
 <?php
 namespace sammo\API\Command;
 use sammo\Session;
 use DateTimeInterface;
 use sammo\Command\UserActionCommand;
 use sammo\DB;
 use sammo\DTO\UserAction;
 use sammo\DTO\UserActionItem;
 use sammo\Enums\APIRecoveryType;
 use sammo\GameConst;
 use sammo\General;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\Util;
 use sammo\Validator;
 use function sammo\buildUserActionCommandClass;
 use function sammo\setGeneralCommand;
 class ReserveUserAction extends \sammo\BaseAPI
 {
    public function validateArgs(): ?string
    {
        $v = new Validator($this->args);
        $v->rule('required', [
            'turnIdx',
            'action'
        ])
            ->rule('int', 'turnIdx')
            ->rule('max', 'turnIdx', GameConst::$maxTurn)
            ->rule('min', 'turnIdx', 0)
            ->rule('lengthMin', 'action', 1);
        if (!$v->validate()) {
            return $v->errorStr();
        }
        return null;
    }
    public function getRequiredSessionMode(): int
    {
        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
    }
    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
    {
        $turnIdx = $this->args['turnIdx'];
        $action = $this->args['action'];
        $userActionKey = UserActionCommand::USER_ACTION_KEY;
        if($turnIdx < 0 || $turnIdx >= GameConst::$maxTurn){
            return '올바르지 않은 턴입니다.';
        }
        if(!in_array($action, Util::array_flatten(GameConst::$availableUserActionCommand))){
            return '사용할 수 없는 커맨드입니다.';
        }
        $db = DB::db();
        $generalID = $session->generalID;
        $rawUserActions = $db->queryFirstField('SELECT JSON_QUERY(`aux`, %s) FROM general WHERE no=%i', "$.{$userActionKey}", $generalID);
        if(!$rawUserActions){
            $rawUserActions = '{}';
        }
        $tmp = Json::decode($rawUserActions);
        $userActions = UserAction::fromArray($tmp);
        $gameStor = KVStorage::getStorage($db, 'game_env');
        $gameStor->cacheAll();
        $general = General::createObjFromDB($generalID);
        $item = buildUserActionCommandClass($action, $general, $gameStor->getAll());
        $userActions->reserved[$turnIdx] = new UserActionItem(
            $item->getRawClassName(),
            $item->getBrief(),
            null,
        );
        $db->update('general', [
            'aux' => $db->sqleval('JSON_SET(`aux`, %s, JSON_EXTRACT(%s, "$"))', "$.{$userActionKey}", Json::encode($userActions->toArray())),
        ], 'no=%i', $generalID);
        return [
            'result' => true,
        ];
    }
 }
@@ -39,7 +39,7 @@ class BuildNationCandidate extends \sammo\BaseAPI
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $gameStor->cacheValues(['opentime', 'turntime']);
-    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc,lastrefresh FROM general WHERE owner=%i', $userID);
+    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc FROM general WHERE owner=%i', $userID);
    if (!$general) {
      return '장수가 없습니다';
@@ -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){
@@ -5,6 +5,7 @@ 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;
@@ -37,7 +38,13 @@ class DieOnPrestart extends \sammo\BaseAPI
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
-    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc,lastrefresh FROM general WHERE owner=%i AND npc = 0', $userID);
+    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc FROM general WHERE owner=%i AND npc = 0', $userID);
    $lastRefresh = $db->queryFirstField(
      'SELECT %b FROM general_access_log WHERE %b = %i',
      GeneralAccessLogColumn::lastRefresh->value,
      GeneralAccessLogColumn::generalID->value,
      $general['no']
    );
    if (!$general) {
      return '장수가 없습니다';
@@ -55,13 +62,13 @@ class DieOnPrestart extends \sammo\BaseAPI
    }
    //서버 가오픈시 할 수 있는 행동
-    $targetTime = addTurn($general['lastrefresh'], $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
+    $targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
    if ($targetTime > TimeUtil::now()) {
      $targetTimeShort = substr($targetTime, 0, 19);
      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 [
@@ -5,11 +5,16 @@ namespace sammo\API\General;
 use DateTimeInterface;
 use MeekroDB;
 use sammo\CityConst;
 use sammo\Command\UserActionCommand;
 use sammo\DB;
 use sammo\DTO\UserAction;
 use sammo\DTO\VoteInfo;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\CityColumn;
 use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\GeneralAuxKey;
 use sammo\Enums\GeneralColumn;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\RankColumn;
 use sammo\GameConst;
 use sammo\General;
@@ -25,6 +30,7 @@ use function sammo\buildNationCommandClass;
 use function sammo\checkLimit;
 use function sammo\getTournamentTermText;
 use function sammo\buildNationTypeClass;
 use function sammo\buildUserActionCommandClass;
 use function sammo\calcLeadershipBonus;
 use function sammo\checkSecretPermission;
 use function sammo\getBillByLevel;
@@ -99,7 +105,8 @@ class GetFrontInfo extends \sammo\BaseAPI
    return $history;
  }
-  private function generateRecentRecord(int $generalID){
+  private function generateRecentRecord(int $generalID)
  {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -173,7 +180,7 @@ class GetFrontInfo extends \sammo\BaseAPI
      'online_nation', 'online_user_cnt',
      'year', 'month', 'startyear',
      'maxgeneral',
-      'conlimit',
+      'refreshLimit',
      'server_cnt',
    ]);
@@ -245,7 +252,7 @@ class GetFrontInfo extends \sammo\BaseAPI
      $nationID
    );
-    if($nationPopulation['cityCnt'] == 0){
+    if ($nationPopulation['cityCnt'] == 0) {
      $nationPopulation = [
        'cityCnt' => 0,
        'now' => 0,
@@ -359,6 +366,8 @@ class GetFrontInfo extends \sammo\BaseAPI
  public function generateGeneralInfo(MeekroDB $db, General $general, array $rawNation): array
  {
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $admin = $gameStor->getAll(true);
    $permission = checkSecretPermission($general->getRaw());
@@ -383,7 +392,8 @@ class GetFrontInfo extends \sammo\BaseAPI
      'specialWar' => $general->getVar(GeneralColumn::special2), // GameObjClassKey;
      'personal' => $general->getVar(GeneralColumn::personal), // GameObjClassKey;
      'belong' => $general->getVar(GeneralColumn::belong), // number;
-      'connect' => $general->getVar(GeneralColumn::connect), // number;
+
      'refreshScoreTotal' => $general->getAccessLogVar(GeneralAccessLogColumn::refreshScoreTotal, 0), // number;
      'officerLevel' => $general->getVar(GeneralColumn::officer_level), // number;
      'officerLevelText' => getOfficerLevelText($general->getVar(GeneralColumn::officer_level), $rawNation['level']), // string;
@@ -400,7 +410,7 @@ class GetFrontInfo extends \sammo\BaseAPI
      'troop' => $general->getVar(GeneralColumn::troop), // number;
      //P0 End
-      'con' => $general->getVar(GeneralColumn::con), // number;
+      'refreshScore' => $general->getAccessLogVar(GeneralAccessLogColumn::refreshScore, 0), // number;
      'specage' => $general->getVar(GeneralColumn::specage), // number;
      'specage2' => $general->getVar(GeneralColumn::specage2), // number;
      'leadership_exp' => $general->getVar(GeneralColumn::leadership_exp), // number;
@@ -440,6 +450,21 @@ class GetFrontInfo extends \sammo\BaseAPI
      'permission' => $permission,
    ];
    $rawUserAction = $general->getAuxVar(UserActionCommand::USER_ACTION_KEY) ?? [];
    $userAction = UserAction::fromArray($rawUserAction);
    $impossibleUserAction = [];
    $yearMonth = Util::joinYearMonth($admin['year'], $admin['month']);
    if ($userAction->nextAvailableTurn) {
      foreach ($userAction->nextAvailableTurn as $command => $nextAvailableTurn) {
        if ($nextAvailableTurn > $yearMonth) {
          $impossibleUserAction[] = [$command, $nextAvailableTurn - $yearMonth];
        }
      }
    }
    $result['impossibleUserAction'] = $impossibleUserAction;
    $nationID = $general->getNationID();
    $troopID = $general->getVar(GeneralColumn::troop);
    if (!$troopID) {
@@ -480,6 +505,7 @@ class GetFrontInfo extends \sammo\BaseAPI
      'name' => $troopName,
    ];
    return $result;
  }
@@ -531,12 +557,12 @@ class GetFrontInfo extends \sammo\BaseAPI
  {
    $generalID = $session->generalID;
    //NOTE: 이 경우 staticNation 정보를 조회한다.
-    $general = General::createGeneralObjFromDB($generalID);
+    $general = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
    $nationID = $general->getNationID();
    $cityID = $general->getCityID();
-    $con = checkLimit($general->getVar('con'));
+    $limitState = checkLimit($general->getAccessLogVar(GeneralAccessLogColumn::refreshScore, 0));
-    if ($con >= 2) {
+    if ($limitState >= 2) {
      return [
        'result' => false,
        'reason' => '접속 제한중입니다.',
@@ -573,7 +599,7 @@ class GetFrontInfo extends \sammo\BaseAPI
    if ($globalInfo['lastVote']) {
      $myLastVoteID = $db->queryFirstField('SELECT vote_id FROM vote WHERE general_id = %i ORDER BY vote_id DESC LIMIT 1', $generalID);
-      if($myLastVoteID) {
+      if ($myLastVoteID) {
        $auxInfo['myLastVote'] = $myLastVoteID;
      }
    }
@@ -0,0 +1,68 @@
 <?php
 namespace sammo\API\General;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\GameConst;
 use sammo\General;
 use sammo\Session;
 use sammo\KVStorage;
 use sammo\Util;
 use function sammo\buildUserActionCommandClass;
 class GetUserActionCommandTable extends \sammo\BaseAPI
 {
    public function validateArgs(): ?string
    {
        return null;
    }
    public function getRequiredSessionMode(): int
    {
        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
    }
    public function launch(Session $session, ?\DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
    {
        $generalID = $session->generalID;
        $db = DB::db();
        $gameStor = KVStorage::getStorage($db, 'game_env');
        $gameStor->turnOnCache();
        $env = $gameStor->getAll();
        $general = General::createObjFromDB($generalID);
        $commandTable = [];
        foreach (GameConst::$availableUserActionCommand as $commandCategory => $commandList) {
            $subList = [];
            foreach ($commandList as $commandClassName) {
                $commandObj = buildUserActionCommandClass($commandClassName, $general, $env);
                if (!$commandObj->canDisplay()) {
                    continue;
                }
                $subList[] = [
                    'value' => Util::getClassNameFromObj($commandObj),
                    'compensation' => $commandObj->getCompensationStyle(),
                    'possible' => $commandObj->hasMinConditionMet(),
                    'title' => $commandObj->getCommandDetailTitle(),
                    'simpleName' => $commandObj->getName(),
                    'reqArg' => $commandObj::$reqArg,
                ];
            }
            $commandTable[] = [
                'category' => $commandCategory,
                'values' => $subList
            ];
        }
        return [
            'result' => true,
            'commandTable' => $commandTable,
        ];
    }
 }
@@ -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;
  }
 }
@@ -8,6 +8,7 @@ use sammo\Auction;
 use sammo\CityConst;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\RankColumn;
 use sammo\GameConst;
 use sammo\GameUnitConst;
@@ -414,8 +415,6 @@ class Join extends \sammo\BaseAPI
            'officer_level' => 0,
            'turntime' => $turntime,
            'killturn' => 6,
            'lastconnect' => $now,
            'lastrefresh' => $now,
            'crewtype' => GameUnitConst::DEFAULT_CREWTYPE,
            'makelimit' => 0,
            'betray' => $betray,
@@ -428,6 +427,11 @@ class Join extends \sammo\BaseAPI
            'special2' => $special2
        ]);
        $generalID = $db->insertId();
        $db->insert('general_access_log', [
            GeneralAccessLogColumn::generalID->value => $generalID,
            GeneralAccessLogColumn::userID->value => $userID,
            GeneralAccessLogColumn::lastRefresh->value => $now,
        ]);
        if($blockCustomGeneralName){
            //XXX: 클래스가 이게 맞나?
@@ -42,9 +42,12 @@ class GeneralList extends \sammo\BaseAPI
        $userID = $session->userID;
        if ($session->isGameLoggedIn()) {
            increaseRefresh("장수일람", 2);
-            $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner=%i', $userID);
+            $me = $db->queryFirstRow(
-            $con = checkLimit($me['con']);
+                'SELECT refresh_score, turntime FROM `general`
-            if ($con >= 2) {
+                LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
            );
            $limitState = checkLimit($me['refresh_score']);
            if ($limitState >= 2) {
                return '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.';
            }
        } else {
@@ -62,7 +65,8 @@ class GeneralList extends \sammo\BaseAPI
        $session->setReadOnly();
-        $rawGeneralList = $db->queryAllLists('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,owner_name as ownerName,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect from general');
+        $rawGeneralList = $db->queryAllLists(
            'SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,owner_name as ownerName,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,refresh_score_total from `general` LEFT JOIN `general_access_log` ON general.no = general_access_log.general_id');
        $ownerNameList = [];
        if ($gameStor->isunited) {
@@ -73,7 +77,7 @@ class GeneralList extends \sammo\BaseAPI
        $generalList = [];
        foreach ($rawGeneralList as $rawGeneral) {
-            [$owner, $no, $picture, $imgsvr, $npc, $age, $nation, $special, $special2, $personal, $name, $ownerName, $injury, $leadership, $strength, $intel, $experience, $dedication, $officerLevel, $killturn, $connectCnt] = $rawGeneral;
+            [$owner, $no, $picture, $imgsvr, $npc, $age, $nation, $special, $special2, $personal, $name, $ownerName, $injury, $leadership, $strength, $intel, $experience, $dedication, $officerLevel, $killturn, $refreshScoreTotal] = $rawGeneral;
            if (key_exists($owner, $ownerNameList)) {
                $ownerName = $ownerNameList[$owner];
@@ -104,7 +108,7 @@ class GeneralList extends \sammo\BaseAPI
                getDed($dedication),
                getOfficerLevelText($officerLevel, $nationArr['level']),
                $killturn,
-                $connectCnt
+                $refreshScoreTotal ?: 0,
            ];
        }
@@ -129,6 +133,8 @@ class GeneralList extends \sammo\BaseAPI
            'honorText',
            'dedLevelText',
            'officerLevelText',
            'killturn',
            'refreshScoreTotal',
        ];
        $result = [
@@ -148,13 +148,16 @@ class GetHistory extends \sammo\BaseAPI
      }
      increaseRefresh("연감", 1);
-      $me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner = %i', $session->userID);
+      $me = $db->queryFirstRow(
        'SELECT refresh_score, turntime FROM `general`
        LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner = %i', $session->userID
      );
      if (!$me) {
        return '장수가 사망했습니다.';
      }
-      $con = checkLimit($me['con']);
+      $limitState = checkLimit($me['refresh_score']);
-      if ($con >= 2) {
+      if ($limitState >= 2) {
        return templateLimitMsg($me['turntime']);
      }
    }
@@ -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");
            $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->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 '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
        }
@@ -75,7 +75,7 @@ class GetOldMessage extends \sammo\BaseAPI
    $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
+    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
    if ($me === null) {
      return '장수가 사망했습니다.';
@@ -73,7 +73,7 @@ class GetRecentMessage extends \sammo\BaseAPI
    $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
+    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
    if ($me === null) {
      return '장수가 사망했습니다.';
@@ -108,7 +108,7 @@ class SendMessage extends \sammo\BaseAPI
    $unlimited = new \DateTime('9999-12-31');
    $db = DB::db();
-    $destUser = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,permission,penalty FROM general WHERE `no`=%i', $destGeneralID);
+    $destUser = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`picture`,`imgsvr`,permission,penalty FROM general WHERE `no`=%i', $destGeneralID);
    if (!$destUser) {
      return '존재하지 않는 유저입니다.';
@@ -160,15 +160,18 @@ class SendMessage extends \sammo\BaseAPI
    }
    $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`officer_level`,`con`,`picture`,`imgsvr`,penalty,permission,belong FROM general WHERE `owner`=%i', $userID);
+    $me = $db->queryFirstRow(
      'SELECT `no`,`name`,`nation`,`officer_level`,`refresh_score`,`picture`,`imgsvr`,penalty,permission,belong FROM `general`
      LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE `owner`=%i', $userID
    );
    if (!$me) {
      $session->logoutGame();
      return '장수가 없습니다.';
    }
-    $con = checkLimit($me['con']);
+    $limitState = checkLimit($me['refresh_score']);
-    if ($con >= 2) {
+    if ($limitState >= 2) {
      return '접속 제한입니다.';
    }
@@ -3,9 +3,14 @@
 namespace sammo\API\Nation;
 use ArrayObject;
 use sammo\Command\UserActionCommand;
 use sammo\DB;
 use sammo\DTO\UserAction;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\GeneralLiteQueryMode;
 use sammo\Enums\GeneralQueryMode;
 use sammo\General;
 use sammo\GeneralLite;
 use sammo\Session;
 use sammo\Util;
@@ -44,12 +49,10 @@ class GeneralList extends \sammo\BaseAPI
        'special2' => 0,
        'personal' => 0,
        'belong' => 0,
        'connect' => 0,
        'troop' => 0,
        'city' => 0,
        'con' => 1,
        'specage' => 0,
        'specage2' => 0,
        'leadership_exp' => 1,
@@ -83,6 +86,11 @@ class GeneralList extends \sammo\BaseAPI
        'owner_name' => 9, //안씀.
        //accessLog
        'refresh_score_total' => 0,
        'refresh_score' => 1,
        //RANK
        'warnum' => 1,
        'killnum' => 1,
@@ -95,6 +103,8 @@ class GeneralList extends \sammo\BaseAPI
    static $columnRemap = [
        'special' => 'specialDomestic',
        'special2' => 'specialWar',
        'refresh_score_total' => 'refreshScoreTotal',
        'refresh_score' => 'refreshScore',
        'aux' => null,
    ];
@@ -109,6 +119,9 @@ class GeneralList extends \sammo\BaseAPI
        'reservedCommand' => 1,
        'autorun_limit' => 1,
        'impossibleUserAction' => 1,
        'reservedUserAction' => 1,
    ];
    public function validateArgs(): ?string
@@ -143,9 +156,13 @@ class GeneralList extends \sammo\BaseAPI
        $gameStor = \sammo\KVStorage::getStorage($db, 'game_env');
        $env = $gameStor->getValues(['year', 'month', 'turntime', 'turnterm', 'autorun_user', 'killturn']);
-        $me = $db->queryFirstRow('SELECT con, turntime, belong, nation, officer_level, permission, penalty FROM general WHERE owner=%i', $session->getUserID());
+        $me = $db->queryFirstRow(
-        $con = checkLimit($me['con']);
+            'SELECT refresh_score, turntime, belong, nation, officer_level, permission, penalty FROM `general`
-        if ($con >= 2) {
+            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i',
            $session->getUserID()
        );
        $limitState = checkLimit($me['refresh_score']);
        if ($limitState >= 2) {
            return '접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다.';
        }
@@ -156,9 +173,18 @@ class GeneralList extends \sammo\BaseAPI
-        [$queryColumns, $rankColumns] = General::mergeQueryColumn(array_keys(static::$viewColumns), 1);
+        [$queryColumns, $rankColumns, $accessLogColumns] = GeneralLite::mergeQueryColumn(array_keys(static::$viewColumns), GeneralLiteQueryMode::Lite);
-        $rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE nation = %i ORDER BY turntime ASC', Util::formatListOfBackticks($queryColumns), $nationID), 'no');
+        $rawGeneralList = Util::convertArrayToDict(
            $db->query(
                'SELECT %l, %l from `general` LEFT JOIN general_access_log
                ON `general`.`no` = general_access_log.general_id WHERE nation = %i ORDER BY turntime ASC',
                Util::formatListOfBackticks($queryColumns),
                Util::formatListOfBackticks($accessLogColumns),
                $nationID
            ),
            'no'
        );
        /** @var ArrayObject[] */
        $troops = [];
@@ -179,19 +205,19 @@ class GeneralList extends \sammo\BaseAPI
        if ($this->permission >= 1 || count($troops)) {
            $reservedCommandTargetGeneralIDList = [];
-            if($this->permission >= 1){
+            if ($this->permission >= 1) {
                foreach ($rawGeneralList as $rawGeneral) {
                    if ($rawGeneral['npc'] < 2) {
                        $reservedCommandTargetGeneralIDList[$rawGeneral['no']] = $rawGeneral['no'];
                    }
                }
            }
-            foreach($troops as $troop){
+            foreach ($troops as $troop) {
                $reservedCommandTargetGeneralIDList[$troop['id']] = $troop['id'];
            }
-            if($reservedCommandTargetGeneralIDList){
+            if ($reservedCommandTargetGeneralIDList) {
                $rawTurnList = $db->query(
                    'SELECT general_id, turn_idx, action, arg, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id asc, turn_idx asc',
                    array_values($reservedCommandTargetGeneralIDList)
@@ -249,6 +275,50 @@ class GeneralList extends \sammo\BaseAPI
            'bill' => fn ($rawGeneral) => getBillByLevel($rawGeneral['dedlevel']),
            'reservedCommand' => fn ($rawGeneral) => $reservedCommand[$rawGeneral['no']] ?? null,
            'autorun_limit' => fn ($rawGeneral) => ($rawGeneral['aux'] ?? [])['autorun_limit'] ?? 0,
            'impossibleUserAction' => function ($rawGeneral) use ($env) {
                $rawUserAction = ($rawGeneral['aux'] ?? [])[UserActionCommand::USER_ACTION_KEY] ?? [];
                $userAction = UserAction::fromArray($rawUserAction);
                $impossibleUserAction = [];
                $yearMonth = Util::joinYearMonth($env['year'], $env['month']);
                if ($userAction->nextAvailableTurn) {
                    foreach ($userAction->nextAvailableTurn as $command => $nextAvailableTurn) {
                        if ($nextAvailableTurn > $yearMonth) {
                            $impossibleUserAction[] = [$command, $nextAvailableTurn - $yearMonth];
                        }
                    }
                }
                return $impossibleUserAction;
            },
            'reservedUserAction' => function ($rawGeneral) use ($env) {
                $rawUserAction = ($rawGeneral['aux'] ?? [])[UserActionCommand::USER_ACTION_KEY] ?? [];
                $userAction = UserAction::fromArray($rawUserAction);
                $reservedUserAction = [];
                $emptyTurnObj = [
                    'brief' => '휴식',
                    'action' => '휴식',
                    'arg' => [],
                ];
                for($i = 0; $i < 5; $i++){
                    $reservedUserAction[] = $emptyTurnObj;
                }
                if ($userAction->reserved) {
                    foreach ($userAction->reserved as $turnIdx => $reserved) {
                        if($turnIdx >= 5){
                            continue;
                        }
                        $reservedUserAction[$turnIdx] = [
                            'brief' => $reserved->brief,
                            'action' => $reserved->command,
                            'arg' => [],
                        ];
                    }
                }
                return $reservedUserAction;
            },
        ];
        foreach ($rankColumns as $rankKey) {
@@ -278,11 +348,11 @@ class GeneralList extends \sammo\BaseAPI
            $resultColumns[$column] = $column;
        }
-        foreach ($troops as $troop){
+        foreach ($troops as $troop) {
            $troopLeaderID = $troop['id'];
-            $troop['reservedCommand'] = array_map(function($turnObj){
+            $troop['reservedCommand'] = array_map(function ($turnObj) {
                $brief = $turnObj['brief'];
-                if($brief == '집합'){
+                if ($brief == '집합') {
                    return $brief;
                }
                return '-';
@@ -109,10 +109,12 @@ class GetGeneralLog extends \sammo\BaseAPI
        $reqTo = $this->args['reqTo'] ?? null;
        $db = DB::db();
-        $me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID);
+        $me = $db->queryFirstRow(
            'SELECT no,nation,officer_level,refresh_score,turntime,belong,permission,penalty FROM `general`
            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID);
-        $con = checkLimit($me['con']);
+        $limitState = checkLimit($me['refresh_score']);
-        if ($con >= 2) {
+        if ($limitState >= 2) {
            return '접속 제한입니다.';
        }
@@ -4,6 +4,7 @@ namespace sammo\API\Nation;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\GeneralQueryMode;
 use sammo\GameConst;
 use sammo\General;
 use sammo\KVStorage;
@@ -13,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
@@ -65,7 +58,7 @@ class GetNationInfo extends \sammo\BaseAPI
      ];
    }
-    $generalObj = General::createGeneralObjFromDB($session->generalID, null, 1);
+    $generalObj = General::createObjFromDB($session->generalID);
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $gameEnv = $gameStor->getValues(['year', 'month', 'startyear']);
@@ -6,11 +6,13 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\GeneralQueryMode;
 use sammo\GameConst;
 use sammo\General;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
 use sammo\Util;
 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
@@ -39,12 +41,16 @@ class GetReservedCommand extends \sammo\BaseAPI
        $gameStor = KVStorage::getStorage($db, 'game_env');
        $userID = $session->userID;
-        $me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,penalty,permission FROM general WHERE owner=%i', $userID);
+        $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
        );
        $nationLevel = $db->queryFirstField('SELECT level FROM nation WHERE nation = %i', $me['nation']);
        $nationID = $me['nation'];
-        $con = checkLimit($me['con']);
+        $limitState = checkLimit($me['refresh_score']);
-        if ($con >= 2) {
+        if ($limitState >= 2) {
            return "접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 갱신 가능 시각 : {$me['turntime']})";
        }
@@ -58,8 +64,12 @@ 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(
-            $generals[$rawGeneral['officer_level']] = new General($rawGeneral, null, null, null, $year, $month, false);
+            '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 = [];
@@ -109,7 +119,7 @@ class GetReservedCommand extends \sammo\BaseAPI
            ];
        }
-        $generalObj = General::createGeneralObjFromDB($session->generalID);
+        $generalObj = General::createObjFromDB($session->generalID);
        return [
@@ -6,7 +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;
@@ -40,7 +43,7 @@ class AddComment extends \sammo\BaseAPI
    $text = mb_substr($this->args['text'], 0, 200);
    $generalID = $session->generalID;
-    $general = General::createGeneralObjFromDB($generalID, [], 0);
+    $general = GeneralLite::createObjFromDB($generalID, null, GeneralLiteQueryMode::Core);
    $generalName = $general->getName();
    $nationID = $general->getNationID();
    $nationName = $general->getStaticNation()['name'];
@@ -6,6 +6,7 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\DTO\VoteInfo;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\GeneralQueryMode;
 use sammo\General;
 use sammo\Json;
 use sammo\KVStorage;
@@ -105,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'], 2);
+        $general = General::createObjFromDB($generalID, null, GeneralQueryMode::Full);
        $general->increaseVar('gold', $voteReward);
        $uniqueRng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
            UniqueConst::$hiddenSeed,
@@ -0,0 +1,19 @@
 <?php
 namespace sammo\ActionBuff;
 use sammo\General;
 use \sammo\iAction;
 class g65_계략성공 implements iAction
 {
    use \sammo\DefaultAction;
    function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
    {
        if($turnType == '계략'){
            if($varType == 'success') return $value + 20;
        }
        return $value;
    }
 }
@@ -0,0 +1,21 @@
 <?php
 namespace sammo\ActionBuff;
 use sammo\General;
 use \sammo\iAction;
 class g65_내정성공 implements iAction
 {
    use \sammo\DefaultAction;
    static protected $target = ['상업', '농업', '치안', '기술', '인구', '성벽', '수비', '민심'];
    function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
    {
        if ($varType == 'success' && in_array($turnType, static::$target)) {
            return $value + 1;
        }
        return $value;
    }
 }
@@ -0,0 +1,19 @@
 <?php
 namespace sammo\ActionBuff;
 use sammo\General;
 use \sammo\iAction;
 class g65_사기40 implements iAction
 {
    use \sammo\DefaultAction;
    function onCalcStat(General $general, string $statName, $value, $aux = null)
    {
        if ($statName == 'bonusAtmos') {
            return $value + 40;
        }
        return $value;
    }
 }
@@ -0,0 +1,60 @@
 <?php
 namespace sammo\ActionBuff;
 use sammo\GameUnitConst;
 use sammo\General;
 use \sammo\iAction;
 class g65_전투순위보정 implements iAction
 {
    use \sammo\DefaultAction;
    function onCalcStat(General $defender, string $statName, $value, $aux = null)
    {
        //방어자 입장에서 coef가 높다면 전투순위를 높인다.
        if ($statName == 'battleOrder') {
            if ($aux === null) throw new \RuntimeException('전투순위보정에 필요한 aux가 없습니다.');
            /** @var General */
            $attacker = $aux['attacker'];
            $defenderCrewType = $defender->getCrewTypeObj();
            $attackerCrewType = $attacker->getCrewTypeObj();
            $attackerCoef = $attackerCrewType->getAttackCoef($defenderCrewType) * $defenderCrewType->getDefenceCoef($attackerCrewType);
            $defenderCoef = $defenderCrewType->getAttackCoef($attackerCrewType) * $attackerCrewType->getDefenceCoef($defenderCrewType);
            if ($attackerCoef < $defenderCoef) {
                return $value * 4;
            } else if ($attackerCoef > $defenderCoef) {
                return $value / 2;
            } else if ($attackerCrewType->armType == $defenderCrewType->armType) {
                return $value * 2;
            }
        }
        return $value;
    }
    function onCalcOpposeStat(General $defender, string $statName, $value, $aux = null)
    {
        //공격자 입장에서 coef가 높다면 전투순위를 높인다.
        if ($statName == 'battleOrder') {
            if ($aux === null) throw new \RuntimeException('전투순위보정에 필요한 aux가 없습니다.');
            /** @var General */
            $attacker = $aux['attacker'];
            $defenderCrewType = $defender->getCrewTypeObj();
            $attackerCrewType = $attacker->getCrewTypeObj();
            $attackerCoef = $attackerCrewType->getAttackCoef($defenderCrewType) * $defenderCrewType->getDefenceCoef($attackerCrewType);
            $defenderCoef = $defenderCrewType->getAttackCoef($attackerCrewType) * $attackerCrewType->getDefenceCoef($defenderCrewType);
            if ($attackerCoef > $defenderCoef) {
                return $value * 4;
            } else if ($attackerCoef < $defenderCoef) {
                return $value / 2;
            } else if ($attackerCrewType->armType == $defenderCrewType->armType) {
                return $value * 2;
            }
        }
        return $value;
    }
 }
@@ -0,0 +1,19 @@
 <?php
 namespace sammo\ActionBuff;
 use \sammo\iAction;
 class g65_징병비용무시 implements iAction
 {
    use \sammo\DefaultAction;
    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
    {
        if ($varType == 'cost' && in_array($turnType, ['징병', '모병'])) {
            return 0;
        }
        return $value;
    }
 }
@@ -0,0 +1,19 @@
 <?php
 namespace sammo\ActionBuff;
 use \sammo\iAction;
 class g65_징병인구무시 implements iAction
 {
    use \sammo\DefaultAction;
    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
    {
        if ($turnType == '징집인구' && $varType == 'score') {
            return 0;
        }
        return $value;
    }
 }
@@ -0,0 +1,12 @@
 <?php
 namespace sammo\ActionCrewType;
 use \sammo\iAction;
 use \sammo\General;
 class None implements iAction{
    use \sammo\DefaultAction;
    protected $id = -1;
    protected $name = '-';
    protected $info = '';
 }
@@ -0,0 +1,20 @@
 <?php
 namespace sammo\ActionCrewType;
 use \sammo\iAction;
 use \sammo\General;
 class che_성벽선제 implements iAction{
    use \sammo\DefaultAction;
    protected $name = '성벽선제';
    protected $info = '전투 가능한 성벽이라면 선제공격을 합니다.';
    public function onCalcOpposeStat(General $general, string $statName, $value, $aux = null)
    {
        if($statName == 'cityBattleOrder'){
            // battleOrder는 스탯과 유사한 수치를 가지므로, 아주 충분히 높은값을 설정한다.
            return 10000;
        }
        return $value;
    }
 }
@@ -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)
@@ -25,15 +25,15 @@ class che_병가 extends \sammo\BaseNation{
            if($varType == 'score') return $value * 0.9;
            if($varType == 'cost') return $value * 1.2;
        }
-        
+
        return $value;
    }
    public function onCalcNationalIncome(string $type, $amount):int{
        if($type == 'pop' && $amount > 0){
-            return Util::toInt($amount * 0.8);
+            return $amount * 0.8;
        }
-        
+
        return $amount;
    }
 }
@@ -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 = '';
 }
--- a/Show More
+++ b/Show More