fix: GetConst의 텍스트 수정

fix: GameUnitDetail의 info를 기존방식으로 변경
fix: ReqCities, ReqRegion 버그
2025-01-21 17:32:30 +00:00 · 2025-01-21 17:23:07 +00:00 · 2025-01-21 17:13:37 +00:00 · 2025-01-21 16:42:19 +00:00 · 2025-01-21 16:06:03 +00:00 · 2025-01-21 16:02:24 +00:00
188 changed files with 1030 additions and 127641 deletions
@@ -12,6 +12,7 @@
        }
    },
    "require": {
+        "brandonwamboldt/utilphp": "^1.1",
        "sergeytsalkov/meekrodb": "^2.5",
        "league/plates": "^3.5",
        "vlucas/valitron": "^1.4",
@@ -4,8 +4,58 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "7edae9b6be35e66ffd0d180f5fac6679",
+    "content-hash": "deed9afdc95bc42f84784df67d295223",
    "packages": [
+        {
+            "name": "brandonwamboldt/utilphp",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/brandonwamboldt/utilphp.git",
+                "reference": "36c32efc4f0679c05163464a550f45c8d83fe683"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/brandonwamboldt/utilphp/zipball/36c32efc4f0679c05163464a550f45c8d83fe683",
+                "reference": "36c32efc4f0679c05163464a550f45c8d83fe683",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "satooshi/php-coveralls": "dev-master"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "utilphp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brandon Wamboldt",
+                    "email": "brandon.wamboldt@gmail.com"
+                }
+            ],
+            "description": "util.php is a collection of useful functions and snippets that you need or could use every day, designed to avoid conflicts with existing projects",
+            "homepage": "https://github.com/brandonwamboldt/utilphp",
+            "keywords": [
+                "collection",
+                "helpers",
+                "php",
+                "utility"
+            ],
+            "support": {
+                "issues": "https://github.com/brandonwamboldt/utilphp/issues",
+                "source": "https://github.com/brandonwamboldt/utilphp/tree/master"
+            },
+            "time": "2015-02-02T17:56:14+00:00"
+        },
        {
            "name": "brick/math",
            "version": "0.12.1",
@@ -5671,5 +5721,5 @@
    "platform-overrides": {
        "php": "8.3"
    },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.3.0"
 }
@@ -99,10 +99,7 @@ function logError(string $err, string $errstr, string $errpath, array $trace)
    $err = str_replace(ROOT, '{ROOT}', $err);
    $errstr = str_replace(ROOT, '{ROOT}', $errstr);
    $errpath = str_replace(ROOT, '{ROOT}', $errpath);
-    $trace = array_map(function (string|array $text) {
-        if (is_array($text)) {
-            $text = Json::encode($text);
-        }
+    $trace = array_map(function (string $text) {
        return str_replace(ROOT, '{ROOT}', $text);
    }, $trace);

@@ -13,9 +13,6 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');

 [$turntime, $tnmt_time] = $gameStor->getValuesAsArray(['turntime','tnmt_time']);
-$clock = GameClock::fromStorage($gameStor);
-$turntimeDisplay = $clock->formatTick(Util::toInt($turntime), true);
-$tnmtTimeDisplay = $tnmt_time === null ? '-' : $clock->formatTick(Util::toInt($tnmt_time), true);

 $plock = $db->queryFirstField('SELECT plock FROM plock WHERE `type` ="GAME"');
 ?>
@@ -33,8 +30,8 @@ $plock = $db->queryFirstField('SELECT plock FROM plock WHERE `type` ="GAME"');
 </head>
 <body>
    <form action=_119_b.php method=post>
-    시간조정 : <input type=text size=3 name=minute><input type=submit name=btn value='분당김'><input type=submit name=btn value='분지연'> 최종갱신 : <?=$turntimeDisplay?> (tick <?=$turntime?>)<br>
-    시간조정 : <input type=text size=3 name=minute2><input type=submit name=btn value='토너분당김'><input type=submit name=btn value='토너분지연'> 토너먼트 : <?=$tnmtTimeDisplay?> (tick <?=$tnmt_time?>)<br>
+    시간조정 : <input type=text size=3 name=minute><input type=submit name=btn value='분당김'><input type=submit name=btn value='분지연'> 최종갱신 : <?=$turntime?><br>
+    시간조정 : <input type=text size=3 name=minute2><input type=submit name=btn value='토너분당김'><input type=submit name=btn value='토너분지연'> 토너먼트 : <?=$tnmt_time?><br>
    봉급지급 : <input type=submit name=btn value='금지급'><input type=submit name=btn value='쌀지급'><br>
    락 풀 기 : <input type=submit name=btn value='락걸기'><input type=submit name=btn value='락풀기'> 현재 : <?=$plock>0?"동결중":"가동중"?><br>
    </form>
@@ -38,9 +38,21 @@ switch ($btn) {
            usleep(500000);
        }

-        $clock = GameClock::fromStorage($gameStor);
-        // 스케줄 전체를 벽시계에서 빼지 않고 논리 현재 tick만 앞으로 이동합니다.
-        $clock->advance($gameStor, $clock->ticksFromMinutes($minute));
+        $gameStor->cacheValues(['turntime', 'starttime', 'tnmt_time']);
+        $turntime = (new \DateTimeImmutable($gameStor->turntime))->sub(new \DateInterval("PT{$minute}M"));
+        $starttime = (new \DateTimeImmutable($gameStor->starttime))->sub(new \DateInterval("PT{$minute}M"));
+        $tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->sub(new \DateInterval("PT{$minute}M"));
+
+        $gameStor->turntime = $turntime->format('Y-m-d H:i:s.u');
+        $gameStor->starttime = $starttime->format('Y-m-d H:i:s');
+        $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
+
+        $db->update('general', [
+            'turntime' => $db->sqleval('DATE_SUB(turntime, INTERVAL %i MINUTE)', $minute)
+        ], true);
+        $db->update('ng_auction', [
+            'close_date' => $db->sqleval('DATE_SUB(close_date, INTERVAL %i MINUTE)', $minute)
+        ], 'finished = 0');
        if ($locked) {
            unlock();
        }
@@ -54,19 +66,34 @@ switch ($btn) {
            }
            usleep(500000);
        }
-        $clock = GameClock::fromStorage($gameStor);
-        $clock->advance($gameStor, -$clock->ticksFromMinutes($minute));
+        $gameStor->cacheValues(['turntime', 'starttime', 'tnmt_time']);
+        $turntime = (new \DateTimeImmutable($gameStor->turntime))->add(new \DateInterval("PT{$minute}M"));
+        $starttime = (new \DateTimeImmutable($gameStor->starttime))->add(new \DateInterval("PT{$minute}M"));
+        $tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->add(new \DateInterval("PT{$minute}M"));
+
+        $gameStor->turntime = $turntime->format('Y-m-d H:i:s.u');
+        $gameStor->starttime = $starttime->format('Y-m-d H:i:s');
+        $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
+
+        $db->update('general', [
+            'turntime' => $db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
+        ], true);
+        $db->update('ng_auction', [
+            'close_date' => $db->sqleval('DATE_ADD(close_date, INTERVAL %i MINUTE)', $minute)
+        ], 'finished = 0');
        if ($locked) {
            unlock();
        }
        break;
    case "토너분당김":
-        $clock = GameClock::fromStorage($gameStor);
-        $gameStor->tnmt_time = Util::toInt($gameStor->tnmt_time) - $clock->ticksFromMinutes($minute2);
+        $tnmt_time = new \DateTime($gameStor->tnmt_time);
+        $tnmt_time->sub(new \DateInterval("PT{$minute2}M"));
+        $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
        break;
    case "토너분지연":
-        $clock = GameClock::fromStorage($gameStor);
-        $gameStor->tnmt_time = Util::toInt($gameStor->tnmt_time) + $clock->ticksFromMinutes($minute2);
+        $tnmt_time = new \DateTimeImmutable($gameStor->tnmt_time);
+        $tnmt_time->add(new \DateInterval("PT{$minute2}M"));
+        $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
        break;
    case "금지급":
        processGoldIncome();
@@ -40,7 +40,7 @@ $admin = getAdmin();
    </tr>
    <tr>
        <td width=110 align=right>시작시간변경</td>
-        <td width=285><input type=text size=20 maxlength=20 style=color:white;background-color:black;text-align:right; name=starttime value='<?=substr($admin['starttime_display'], 0, 19)?>'><input type=submit name=btn value=변경1></td>
+        <td width=285><input type=text size=20 maxlength=20 style=color:white;background-color:black;text-align:right; name=starttime value='<?=substr($admin['starttime'], 0, 19)?>'><input type=submit name=btn value=변경1></td>
    </tr>
    <tr>
        <td width=110 align=right>최대 장수</td>
@@ -52,7 +52,7 @@ $admin = getAdmin();
        <td width=110 align=right>시작 년도</td>
        <td width=285><input type=text size=3 maxlength=3 style=color:white;background-color:black;text-align:right; name=startyear value='<?=$admin['startyear']?>'><input type=submit name=btn value=변경4></td>
        <td width=110 align=right>최근 갱신 시간</td>
-        <td width=285>&nbsp;<?=$admin['turntime_display']?> (tick <?=$admin['turntime']?>)</td>
+        <td width=285>&nbsp;<?=$admin['turntime']?></td>
    </tr>
    <tr>
        <td width=110 align=right>턴시간</td>
@@ -43,12 +43,7 @@ switch ($btn) {
        pushGlobalHistoryLog(["<R>★</><S>{$log}</>"]);
        break;
    case "변경1":
-        $clock = GameClock::fromStorage($gameStor);
-        $gameStor->clock_base_time = TimeUtil::format(GameClock::baseTimeForProjection(
-            new \DateTimeImmutable($starttime),
-            Util::toInt($gameStor->starttime),
-            $clock->getTurnTermMinutes(),
-        ), true);
+        $gameStor->starttime = (new \DateTime($starttime))->format('Y-m-d H:i:s');
        break;
    case "변경2":
        $gameStor->maxgeneral = $maxgeneral;
@@ -83,4 +78,4 @@ switch ($btn) {
        break;
 }

-header('location:_admin1.php');
+header('location:_admin1.php');
@@ -99,7 +99,7 @@ switch ($btn) {
        ], '`no` IN %li', $genlist);
        break;
    case "강제 사망":
-        $date = GameClock::fromStorage($gameStor)->nowTick();
+        $date = TimeUtil::now(true);
        $db->update('general', [
            'killturn' => 0,
            'turntime' => $date,
@@ -31,7 +31,7 @@ $queryMap = [
 ];

 if ($reqQueryType === null || !key_exists($reqQueryType, $queryMap)) {
-    $reqQueryType = array_key_first($queryMap);
+    $reqQueryType = Util::array_first_key($queryMap);
 }

 //로그인 검사
@@ -42,7 +42,6 @@ if ($session->userGrade < 6) {
 }

 $db = DB::db();
-$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));

 if ($btn == '정렬하기') {
    $gen = 0;
@@ -112,7 +111,7 @@ $generalObj = General::createObjFromDB($gen, null, GeneralQueryMode::FullWithAcc
                    대상장수 :
                    <select name=gen size=1>
                        <?php foreach ($generalBasicList as $general) : ?>
-                            <option <?= $gen == $general['no'] ? 'selected' : '' ?> value='<?= $general['no'] ?>'><?= $general['name'] ?> (<?= substr($clock->formatTick(Util::toInt($general['turntime'])), 14, 5) ?>)</option>
+                            <option <?= $gen == $general['no'] ? 'selected' : '' ?> value='<?= $general['no'] ?>'><?= $general['name'] ?> (<?= substr($general['turntime'], 14, 5) ?>)</option>
                        <?php endforeach; ?>
                    </select>
                    <input type=submit name=btn value='조회하기'>
@@ -180,4 +179,4 @@ $generalObj = General::createObjFromDB($gen, null, GeneralQueryMode::FullWithAcc
    </table>
 </body>

-</html>
+</html>
@@ -243,14 +243,11 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');
            "SELECT nation,no,name,owner_name as ownerName, owner, picture, imgsvr,
    experience, dedication,
    dex1, dex2, dex3, dex4, dex5,
-    horse, weapon, book, item, aux
+    horse, weapon, book, item
    FROM general WHERE %l",
            $btn == "NPC 보기" ? "npc>=2" : "npc<2"
        ) as $general) {
            $generalID = $general['no'];
-            foreach (['dex1', 'dex2', 'dex3', 'dex4', 'dex5'] as $dexKey) {
-                $general[$dexKey] = CentennialAllStarGrowthService::recordableRawValue($general, $dexKey);
-            }
            $general['bgColor'] = $nationColor[$general['nation']] ?? GameConst::$basecolor4;
            $general['fgColor'] = newColor($general['bgColor']);
            $general['nationName'] = $nationName[$general['nation']];
@@ -430,4 +427,4 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');
    </div>
 </body>

-</html>
+</html>
@@ -16,7 +16,7 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("현재도시", 1);

-$lastExecute = substr(GameClock::fromStorage($gameStor)->formatTick(Util::toInt($gameStor->turntime)), 5, 14);
+$lastExecute = substr($gameStor->turntime, 5, 14);

 $me = $db->queryFirstRow('SELECT no,nation,officer_level,city from general where owner=%i', $userID);
 $myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation']) ?? [
@@ -537,4 +537,4 @@ $templates = new \League\Plates\Engine('templates');
                            </table>
 </body>

-</html>
+</html>
@@ -129,7 +129,6 @@ $templates = new \League\Plates\Engine('templates');
    );

    $generalTurnList = [];
-    $clock = GameClock::fromStorage($gameStor);

    foreach ($db->queryAllLists(
        'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
@@ -143,7 +142,6 @@ $templates = new \League\Plates\Engine('templates');

    $genCntEff = 0;
    foreach ($generals as &$general) {
-        $general['turntime'] = $clock->formatTick(Util::toInt($general['turntime']), true);
        $general['cityText'] = CityConst::byID($general['city'])->name;
        $general['troopText'] = $troopName[$general['troop']] ?? '-';

@@ -286,4 +284,4 @@ $templates = new \League\Plates\Engine('templates');
    </table>
 </body>

-</html>
+</html>
@@ -19,10 +19,10 @@ $userID = Session::getUserID();
 $generalID = $session->generalID;

 $db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-$gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
-$clock = GameClock::fromStorage($gameStor);
-$nowTick = $clock->nowTick();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+$gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
+
+increaseRefresh("내정보", 1);

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

@@ -41,30 +41,12 @@ $lastRefresh = $db->queryFirstField(
    $generalID
 );

-$nextChange = $me->getAuxVar('next_change');
-if (!is_int($nextChange)) {
-    $nextChange = null;
-}
-$nextChangeDisplay = $nextChange === null ? null : $clock->formatTick($nextChange);
-
-increaseRefresh("내정보", 1);
-if ($gameStor->turntime <= $gameStor->opentime) {
-    $targetTime = $me->getAuxVar('prestart_delete_after');
-    if (!is_int($targetTime)) {
-        $targetTime = addTurn(
-            $lastRefresh === null ? $nowTick : Util::toInt($lastRefresh),
-            $gameStor->turnterm,
-            GameConst::$minTurnDieOnPrestart
-        );
-        $me->setAuxVar('prestart_delete_after', $targetTime);
-        $me->applyDB($db);
-    }
-    $targetTimeDisplay = $clock->formatTick($targetTime);
-
-    //서버 가오픈시 할 수 있는 행동
-    if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
+$targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
+if ($gameStor->turntime <= $gameStor->opentime) {
+    //서버 가오픈시 할 수 있는 행동
+    if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
        $showDieOnPrestartBtn = true;
-        if ($targetTime <= $nowTick) {
+        if ($targetTime <= TimeUtil::now()) {
            $availableDieOnPrestart = true;
        }
    }
@@ -177,7 +159,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
            <a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>빙의 해체 요청</button></a>-->

                        <?php if ($showDieOnPrestartBtn) : ?>
-                            가오픈 기간 내 장수 삭제 (<?= $targetTimeDisplay ?> 부터)<br>
+                            가오픈 기간 내 장수 삭제 (<?= substr($targetTime, 0, 19) ?> 부터)<br>
                            <button type="button" id='dieOnPrestart' style=background-color:<?= GameConst::$basecolor2 ?>;color:white;width:160px;height:30px;font-size:14px;>장수 삭제</button><br><br>
                        <?php endif; ?>

@@ -192,7 +174,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                        <?php endif; ?>

                        <?php if ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>
-                            다른 장수 선택 (<?= $nextChangeDisplay ?? '지금' ?>부터)<br>
+                            다른 장수 선택 (<?= 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>
                        <?php endif; ?>

@@ -290,4 +272,4 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
    </div>
 </body>

-</html>
+</html>
@@ -228,10 +228,10 @@ if($btn == "자동개최설정") {
    $phase = 0;
    startBetting($admin['tnmt_type'], 720);
 } elseif($btn == "베팅마감") {
-    $clock = GameClock::fromStorage($gameStor);
+    $dt = date("Y-m-d H:i:s", time() + 60);
    $gameStor->tournament=7;
    $gameStor->phase=0;
-    $gameStor->tnmt_time = $clock->nowTick() + $clock->ticksFromSeconds(60);
+    $gameStor->tnmt_time = $dt;
 } elseif($btn == "16강") {
    finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 16);
 } elseif($btn == "8강") {
@@ -248,4 +248,4 @@ if($btn == "자동개최설정") {
    $gameStor->tnmt_msg = $msg;
 }

-header('location:b_tournament.php');
+header('location:b_tournament.php');
@@ -51,22 +51,6 @@
    display: none;
 }

-.picture_choice {
-    margin: 8px auto;
-}
-
-.picture_choice label,
-.event_picture label {
-    display: inline-flex;
-    align-items: center;
-    gap: 4px;
-    margin: 4px 8px;
-}
-
-.picture_choice img {
-    object-fit: cover;
-}
-
 .custom_picture {
    display: none;
 }
@@ -77,4 +61,4 @@

 .custom_stat {
    display: none;
-}
+}
@@ -630,11 +630,7 @@ function generalInfo(General $generalObj)
        $injury = "건강";
    }

-    $clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
-    $remaining = max(0, intdiv(
-        $generalObj->getTurnTick() - $clock->nowTick(),
-        $clock->ticksFromMinutes(1),
-    ));
+    $remaining = (new \DateTimeImmutable($generalObj->getTurnTime()))->diff(new \DateTimeImmutable())->i;

    if ($nation['color'] == "") {
        $nation['color'] = "#000000";
@@ -925,37 +921,45 @@ function banner()
    );
 }

-function addTurn(int $tick, int $turnterm, int $turn = 1, bool $withFraction = true): int
-{
-    return $tick + GameClock::TICKS_PER_TURN * $turn;
-}
-
-function subTurn(int $tick, int $turnterm, int $turn = 1, bool $withFraction = true): int
-{
-    return $tick - GameClock::TICKS_PER_TURN * $turn;
-}
-
-function cutTurn(int $tick, int $turnterm, bool $withFraction = true): int
-{
-    $remainder = $tick % GameClock::TICKS_PER_TURN;
-    if ($remainder < 0) {
-        $remainder += GameClock::TICKS_PER_TURN;
-    }
-    return $tick - $remainder;
-}
-
-/** 시나리오 초기화 입력인 벽시계를 기존 01:00 기준 월 경계로 정렬합니다. */
-function cutTurnDateTime(string $date, int $turnterm, bool $withFraction = true): string
-{
-    $dateObj = new \DateTime($date);
-    $baseDate = new \DateTime($dateObj->format('Y-m-d'));
-    $baseDate->sub(new \DateInterval('P1D'));
-    $baseDate->add(new \DateInterval('PT1H'));
-    $diffMin = intdiv($dateObj->getTimestamp() - $baseDate->getTimestamp(), 60);
-    $diffMin -= $diffMin % $turnterm;
-    $baseDate->add(new \DateInterval("PT{$diffMin}M"));
-    return $baseDate->format($withFraction ? 'Y-m-d H:i:s.u' : 'Y-m-d H:i:s');
-}
+function addTurn($date, int $turnterm, int $turn = 1, bool $withFraction = true)
+{
+    $date = new \DateTime($date);
+    $target = $turnterm * $turn;
+    $date->add(new \DateInterval("PT{$target}M"));
+    if ($withFraction) {
+        return $date->format('Y-m-d H:i:s.u');
+    }
+    return $date->format('Y-m-d H:i:s');
+}
+
+function subTurn($date, int $turnterm, int $turn = 1, bool $withFraction = true)
+{
+    $date = new \DateTime($date);
+    $target = $turnterm * $turn;
+    $date->sub(new \DateInterval("PT{$target}M"));
+    if ($withFraction) {
+        return $date->format('Y-m-d H:i:s.u');
+    }
+    return $date->format('Y-m-d H:i:s');
+}
+
+function cutTurn($date, int $turnterm, bool $withFraction = true)
+{
+    $date = new \DateTime($date);
+
+    $baseDate = new \DateTime($date->format('Y-m-d'));
+    $baseDate->sub(new \DateInterval("P1D"));
+    $baseDate->add(new \DateInterval("PT1H"));
+
+    $diffMin = intdiv($date->getTimeStamp() - $baseDate->getTimeStamp(), 60);
+    $diffMin -= $diffMin % $turnterm;
+
+    $baseDate->add(new \DateInterval("PT{$diffMin}M"));
+    if ($withFraction) {
+        return $baseDate->format('Y-m-d H:i:s.u');
+    }
+    return $baseDate->format('Y-m-d H:i:s');
+}

 function cutDay($date, int $turnterm, bool $withFraction = true)
 {
@@ -997,9 +1001,11 @@ function increaseRefresh($type = "", $cnt = 1)
    $generalID = $session->generalID;
    $userGrade = $session->userGrade;

-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $date = GameClock::fromStorage($gameStor)->nowTick();
+    $dateObj = new \DateTimeImmutable();
+    $date = TimeUtil::format($dateObj, false);
+
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
    $isunited = $gameStor->isunited;
    $opentime = $gameStor->opentime;

@@ -1041,7 +1047,7 @@ function increaseRefresh($type = "", $cnt = 1)

    $logDB = FileDB::db($logPath, $serverPath . '/../f_install/sql/api_log.sql');

-    $ip = $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'] ?? 'local';
+    $ip = $_SERVER['REMOTE_ADDR'] ?? 'local';
    $date = date('Y-m-d H:i:s');

    $logDB->insert('api_log', [
@@ -1139,19 +1145,18 @@ function unlock(): bool
    return $db->affectedRows() > 0;
 }

-function timeover(): bool
+function timeover(): bool
 {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');

-    list($turnterm, $turntime) = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
-    $clock = GameClock::fromStorage($gameStor);
-    $diff = $clock->nowTick() - Util::toInt($turntime);
+    list($turnterm, $turntime) = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
+    $diff = (new \DateTime())->getTimestamp() - (new \DateTime($turntime))->getTimestamp();

    $t = min($turnterm, 5);

-    $term = $clock->ticksFromSeconds($t);
-    if ($diff >= $term || $diff < 0) {
+    $term = $diff;
+    if ($term >= $t || $term < 0) {
        return true;
    } else {
        return false;
@@ -1164,8 +1169,9 @@ function checkDelay()
    $gameStor = KVStorage::getStorage($db, 'game_env');

    //서버정보
-    $clock = GameClock::fromStorage($gameStor);
-    $timeMinDiff = intdiv($clock->nowTick() - Util::toInt($gameStor->turntime), $clock->ticksFromMinutes(1));
+    $now = new \DateTimeImmutable();
+    $turntime = new \DateTimeImmutable($gameStor->turntime);
+    $timeMinDiff = intdiv($now->getTimestamp() - $turntime->getTimestamp(), 60);

    // 1턴이상 갱신 없었으면 서버 지연
    $term = $gameStor->turnterm;
@@ -1179,17 +1185,20 @@ function checkDelay()
    //지연 해야할 밀린 턴 횟수
    $iter = intdiv($timeMinDiff, $term);
    if ($iter > $threshold) {
-        $minute = $iter * $term;
-        $delayTick = $clock->ticksFromMinutes($minute);
-        $gameStor->turntime = Util::toInt($gameStor->turntime) + $delayTick;
-        $gameStor->starttime = Util::toInt($gameStor->starttime) + $delayTick;
-
-        $db->update('general', [
-            'turntime' => $db->sqleval('turntime + %i', $delayTick)
-        ], true);
-        $db->update('ng_auction', [
-            'close_tick' => $db->sqleval('close_tick + %i', $delayTick)
-        ], 'finished = 0');
+        $minute = $iter * $term;
+        $newTurntime = $turntime->add(new \DateInterval("PT{$minute}M"));
+        $newNextTurntime = $turntime->add(new \DateInterval("PT{$term}M"));
+        $gameStor->turntime = $newTurntime->format('Y-m-d H:i:s');
+        $gameStor->starttime = (new \DateTimeImmutable($gameStor->starttime))
+            ->add(new \DateInterval("PT{$minute}M"))
+            ->format('Y-m-d H:i:s');
+
+        $db->update('general', [
+            'turntime' => $db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
+        ], 'turntime<=DATE_ADD(turntime, INTERVAL %i MINUTE)', $term);
+        $db->update('ng_auction', [
+            'close_date' => $db->sqleval('DATE_ADD(close_date, INTERVAL %i MINUTE)', $minute)
+        ], 'finished = 0');
    }
 }

@@ -1238,15 +1247,17 @@ function updateOnline()
    $gameStor->online_nation = join(', ', $onlineNation);
 }

-function turnDate($curtime)
+function turnDate($curtime)
 {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $admin = $gameStor->getValues(['startyear', 'starttime', 'turnterm', 'year', 'month']);

    $turn = $admin['starttime'];
-    $curturn = cutTurn(Util::toInt($curtime), $admin['turnterm']);
-    $num = intdiv($curturn - Util::toInt($turn), GameClock::TICKS_PER_TURN);
+    $curturn = cutTurn($curtime, $admin['turnterm']);
+    $term = $admin['turnterm'];
+
+    $num = intdiv((strtotime($curturn) - strtotime($turn)), $term * 60);

    $date = $admin['startyear'] * 12;
    $date += $num;
@@ -1390,11 +1401,8 @@ function CheckHall($no)

    foreach ($types as [$typeName, $valueType]) {

-        if ($valueType === 'natural') {
-            $value = $generalObj->getVar($typeName);
-            if (in_array($typeName, ['dex1', 'dex2', 'dex3', 'dex4', 'dex5'], true)) {
-                $value = CentennialAllStarGrowthService::recordableValue($generalObj, $typeName);
-            }
+        if ($valueType === 'natural') {
+            $value = $generalObj->getVar($typeName);
        } else if ($valueType === 'rank') {
            $value = $generalObj->getRankVar(RankColumn::from($typeName));
        } else if ($valueType === 'calc') {
@@ -1694,21 +1702,12 @@ function tryUniqueItemLottery(RandUtil $rng, General $general, string $acquireTy
    return giveRandomUniqueItem($rng, $general, $acquireType);
 }

-function getAdmin()
-{
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $admin = $gameStor->getAll();
-    $clock = GameClock::fromStorage($gameStor);
-    foreach (['turntime', 'starttime', 'opentime', 'tnmt_time'] as $key) {
-        if (($admin[$key] ?? null) !== null) {
-            $admin["{$key}_display"] = $clock->formatTick(Util::toInt($admin[$key]), true);
-        }
-    }
-    $admin['clock_now_tick'] = $clock->nowTick();
-    $admin['clock_now_display'] = $clock->formatTick($admin['clock_now_tick'], true);
-    return $admin;
-}
+function getAdmin()
+{
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    return $gameStor->getAll();
+}

 /** @return General[] */
 function deleteNation(General $lord, bool $applyDB): array
@@ -2197,29 +2196,35 @@ function SabotageInjury(RandUtil $rng, array $cityGeneralList, string $reason):
    return $injuryCount;
 }

-function getRandTurn(RandUtil $rng, int $term, ?int $baseTick = null): int
-{
-    $db = DB::db();
-    $clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
-    $baseTick ??= $clock->nowTick();
-
-    $randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
-    $randMicrosecond = $rng->nextRangeInt(0, 999999); // 레거시 RNG 소비 6자리 유지
-
-    return $baseTick
-        + $clock->ticksFromSeconds($randSecond)
-        + intdiv($randMicrosecond * $clock->ticksPerSecond(), 1_000_000);
-}
-
-function getRandTurn2(RandUtil $rng, int $term, ?int $baseTick = null): int
-{
-    $db = DB::db();
-    $clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
-    $baseTick ??= $clock->nowTick();
-    $randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
-    $randMicrosecond = $rng->nextRangeInt(0, 999999); // 레거시 RNG 소비 6자리 유지
-
-    return $baseTick
-        - $clock->ticksFromSeconds($randSecond)
-        - intdiv($randMicrosecond * $clock->ticksPerSecond(), 1_000_000);
-}
+function getRandTurn(RandUtil $rng, $term, ?\DateTimeInterface $baseDateTime = null)
+{
+    if ($baseDateTime === null) {
+        $baseDateTime = new \DateTimeImmutable();
+    } else if ($baseDateTime instanceof \DateTime) {
+        $baseDateTime = \DateTimeImmutable::createFromMutable($baseDateTime);
+    } else if ($baseDateTime instanceof \DateTimeImmutable) {
+        //do Nothing
+    } else {
+        throw new MustNotBeReachedException();
+    }
+
+    $randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
+    $randFraction = $rng->nextRangeInt(0, 999999) / 1000000; //6자리 소수
+
+    return TimeUtil::format($baseDateTime->add(TimeUtil::secondsToDateInterval($randSecond + $randFraction)), true);
+}
+
+function getRandTurn2(RandUtil $rng, $term, ?\DateTimeInterface $baseDateTime = null)
+{
+    if ($baseDateTime === null) {
+        $baseDateTime = new \DateTimeImmutable();
+    } else if ($baseDateTime instanceof \DateTime) {
+        $baseDateTime = \DateTimeImmutable::createFromMutable($baseDateTime);
+    } else {
+        throw new MustNotBeReachedException();
+    }
+    $randSecond = $rng->nextRangeInt(0, 60 * $term - 1);
+    $randFraction = $rng->nextRangeInt(0, 999999) / 1000000; //6자리 소수
+
+    return $baseDateTime->sub(TimeUtil::secondsToDateInterval($randSecond + $randFraction))->format('Y-m-d H:i:s.u');
+}
@@ -62,12 +62,11 @@ function processAuction()
 {
    $db = DB::db();

-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $nowTick = GameClock::fromStorage($gameStor)->nowTick();
+    $now = TimeUtil::now();

    $auctionList = $db->queryAllLists(
-        'SELECT id, `type` FROM ng_auction WHERE `close_tick` <= %i AND finished = 0',
-        $nowTick
+        'SELECT id, `type` FROM ng_auction WHERE `close_date` <= %s AND finished = 0',
+        $now
    );

    if (!$auctionList) {
@@ -42,21 +42,15 @@ function pushGeneralCommand(int $generalID, int $turnCnt=1){

    $db = DB::db();

-    $db->query(
-        'UPDATE general_turn AS dst
-        LEFT JOIN general_turn AS src
-          ON src.general_id = dst.general_id
-         AND src.turn_idx = dst.turn_idx - %i
-        SET dst.action = IF(src.id IS NULL, %s, src.action),
-            dst.arg = IF(src.id IS NULL, %s, src.arg),
-            dst.brief = IF(src.id IS NULL, %s, src.brief)
-        WHERE dst.general_id = %i',
-        $turnCnt,
-        '휴식',
-        '{}',
-        '휴식',
-        $generalID
-    );
+    $db->update('general_turn', [
+        'turn_idx'=>$db->sqleval('turn_idx + %i', $turnCnt)
+    ], 'general_id=%i ORDER BY turn_idx DESC', $generalID);
+    $db->update('general_turn', [
+        'turn_idx'=>$db->sqleval('turn_idx - %i', GameConst::$maxTurn),
+        'action'=>'휴식',
+        'arg'=>'{}',
+        'brief'=>'휴식'
+    ], 'general_id=%i AND turn_idx >= %i', $generalID, GameConst::$maxTurn);
 }

 function pullGeneralCommand(int $generalID, int $turnCnt=1){
@@ -73,21 +67,15 @@ function pullGeneralCommand(int $generalID, int $turnCnt=1){

    $db = DB::db();

-    $db->query(
-        'UPDATE general_turn AS dst
-        LEFT JOIN general_turn AS src
-          ON src.general_id = dst.general_id
-         AND src.turn_idx = dst.turn_idx + %i
-        SET dst.action = IF(src.id IS NULL, %s, src.action),
-            dst.arg = IF(src.id IS NULL, %s, src.arg),
-            dst.brief = IF(src.id IS NULL, %s, src.brief)
-        WHERE dst.general_id = %i',
-        $turnCnt,
-        '휴식',
-        '{}',
-        '휴식',
-        $generalID
-    );
+    $db->update('general_turn', [
+        'turn_idx'=>$db->sqleval('turn_idx + %i', GameConst::$maxTurn),
+        'action'=>'휴식',
+        'arg'=>'{}',
+        'brief'=>'휴식'
+    ], 'general_id=%i AND turn_idx < %i', $generalID, $turnCnt);
+    $db->update('general_turn', [
+        'turn_idx'=>$db->sqleval('turn_idx - %i', $turnCnt)
+    ], 'general_id=%i ORDER BY turn_idx ASC', $generalID);
 }

 function repeatGeneralCommand(int $generalId, int $turnCnt){
@@ -138,23 +126,15 @@ function pushNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){

    $db = DB::db();

-    $db->query(
-        'UPDATE nation_turn AS dst
-        LEFT JOIN nation_turn AS src
-          ON src.nation_id = dst.nation_id
-         AND src.officer_level = dst.officer_level
-         AND src.turn_idx = dst.turn_idx - %i
-        SET dst.action = IF(src.id IS NULL, %s, src.action),
-            dst.arg = IF(src.id IS NULL, %s, src.arg),
-            dst.brief = IF(src.id IS NULL, %s, src.brief)
-        WHERE dst.nation_id = %i AND dst.officer_level = %i',
-        $turnCnt,
-        '휴식',
-        '{}',
-        '휴식',
-        $nationID,
-        $officerLevel
-    );
+    $db->update('nation_turn', [
+        'turn_idx'=>$db->sqleval('turn_idx + %i', $turnCnt)
+    ], 'nation_id=%i AND officer_level=%i ORDER BY turn_idx DESC', $nationID, $officerLevel);
+    $db->update('nation_turn', [
+        'turn_idx'=>$db->sqleval('turn_idx - %i', GameConst::$maxChiefTurn),
+        'action'=>'휴식',
+        'arg'=>'{}',
+        'brief'=>'휴식'
+    ], 'nation_id=%i AND officer_level=%i AND turn_idx >= %i ORDER BY turn_idx ASC', $nationID, $officerLevel, GameConst::$maxChiefTurn);
 }

 function pullNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
@@ -177,23 +157,15 @@ function pullNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){

    $db = DB::db();

-    $db->query(
-        'UPDATE nation_turn AS dst
-        LEFT JOIN nation_turn AS src
-          ON src.nation_id = dst.nation_id
-         AND src.officer_level = dst.officer_level
-         AND src.turn_idx = dst.turn_idx + %i
-        SET dst.action = IF(src.id IS NULL, %s, src.action),
-            dst.arg = IF(src.id IS NULL, %s, src.arg),
-            dst.brief = IF(src.id IS NULL, %s, src.brief)
-        WHERE dst.nation_id = %i AND dst.officer_level = %i',
-        $turnCnt,
-        '휴식',
-        '{}',
-        '휴식',
-        $nationID,
-        $officerLevel
-    );
+    $db->update('nation_turn', [
+        'turn_idx'=>$db->sqleval('turn_idx + %i', GameConst::$maxChiefTurn),
+        'action'=>'휴식',
+        'arg'=>'{}',
+        'brief'=>'휴식',
+    ], 'nation_id=%i AND officer_level=%i AND turn_idx < %i', $nationID, $officerLevel, $turnCnt);
+    $db->update('nation_turn', [
+        'turn_idx'=>$db->sqleval('turn_idx - %i', $turnCnt)
+    ], 'nation_id=%i AND officer_level=%i ORDER BY turn_idx ASC', $nationID, $officerLevel);
 }

 function repeatNationCommand(int $nationID, int $officerLevel, int $turnCnt){
@@ -522,4 +494,4 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
        'arg_test'=>true,
        'reason'=>'success'
    ];
-}
+}
@@ -686,7 +686,7 @@ function TechLimit($startYear, $year, $tech) : bool {
    $relYear = $year - $startYear;

    $relMaxTech = Util::valueFit(
-        floor($relYear / GameConst::$techLevelIncYear) + GameConst::$initialAllowedTechLevel,
+        floor($relYear / 5) + 1,
        1,
        GameConst::$maxTechLevel
    );
@@ -559,7 +559,7 @@ function checkStatistic()

    $nationHist = '';
    foreach (GameConst::$availableNationType as $nationType) {
-        if (!($nationHists[$nationType] ?? null)) {
+        if (!Util::array_get($nationHists[$nationType])) {
            $nationHists[$nationType] = '-';
        }
        $nationHist .= getNationType($nationType) . "({$nationHists[$nationType]}), ";
@@ -651,24 +651,16 @@ function checkStatistic()
 }


-function convForOldGeneral(array $general, int $year, int $month)
-{
-    $general['history'] = getGeneralHistoryLogAll($general['no']);
-    $clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
-    $turnTimeDisplay = $clock->formatTick(Util::toInt($general['turntime']), true);
-    $general['turntime_tick'] = Util::toInt($general['turntime']);
-    $general['turntime'] = $turnTimeDisplay;
-    if ($general['recent_war'] !== null) {
-        $general['recent_war_tick'] = Util::toInt($general['recent_war']);
-        $general['recent_war'] = $clock->formatTick(Util::toInt($general['recent_war']), true);
-    }
-    return [
+function convForOldGeneral(array $general, int $year, int $month)
+{
+    $general['history'] = getGeneralHistoryLogAll($general['no']);
+    return [
        'server_id' => UniqueConst::$serverID,
        'general_no' => $general['no'],
        'owner' => $general['owner'],
        'name' => $general['name'],
        'last_yearmonth' => $year * 100 + $month,
-        'turntime' => $turnTimeDisplay,
+        'turntime' => $general['turntime'],
        'data' => Json::encode($general)
    ];
 }
@@ -742,7 +734,7 @@ function checkEmperior()

    /** @var int[] */
    $auctionList = $db->queryFirstColumn(
-        'SELECT `id` FROM `ng_auction` WHERE `type` = %s AND `finished` = 0 ORDER BY `close_tick` ASC',
+        'SELECT `id` FROM `ng_auction` WHERE `type` = %s AND `finished` = 0 ORDER BY `close_date` ASC',
        AuctionType::UniqueItem->value
    );
    foreach($auctionList as $auctionID){
@@ -4,10 +4,6 @@ namespace sammo;

 function printLimitMsg($turntime)
 {
-    if (is_int($turntime) || (is_string($turntime) && ctype_digit(ltrim($turntime, '-')))) {
-        $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
-        $turntime = GameClock::fromStorage($gameStor)->formatTick(Util::toInt($turntime), true);
-    }
    //FIXME: template로 이동.
 ?>
    <!DOCTYPE html>
@@ -142,7 +138,7 @@ function JSCitiesBasedOnDistance(int $cityNo, int $maxDistance = 1): array{
    $distanceList = searchDistance($cityNo, $maxDistance, true);
    $result = [];
    for ($dist = 1; $dist <= $maxDistance; $dist++) {
-        $result[$dist] = $distanceList[$dist] ?? [];
+        $result[$dist] = Util::array_get($distanceList[$dist], []);
    }
    return $result;
 }
@@ -156,7 +152,7 @@ function printCitiesBasedOnDistance(int $cityNo, int $maxDistance = 1): string
    for ($dist = 1; $dist <= $maxDistance; $dist++) {
        $cityList = array_map(function ($cityID) {
            return CityConst::byID($cityID)->name;
-        }, $distanceList[$dist] ?? []);
+        }, Util::array_get($distanceList[$dist], []));

        $cityStr = join(', ', $cityList);

@@ -61,12 +61,8 @@ function chiefTurnTable()
 ";
 }

-function templateLimitMsg(string $turntime): string
-{
-    if (ctype_digit(ltrim($turntime, '-'))) {
-        $gameStor = KVStorage::getStorage(DB::db(), 'game_env');
-        $turntime = GameClock::fromStorage($gameStor)->formatTick(Util::toInt($turntime), true);
-    }
+function templateLimitMsg(string $turntime): string
+{
    return "이미 너무 많은 접속을 하셨습니다. 다음 턴에 다시 시도해주세요. (턴시간: {$turntime})";
 }

@@ -17,10 +17,10 @@ function processTournament()
 {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $clock = GameClock::fromStorage($gameStor);

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

    //수동일땐 무시
    if (!$admin['tnmt_auto']) {
@@ -122,10 +122,10 @@ function processTournament()
        if ($tnmt == 6) {
            $betTerm = Util::valueFit($unit * 60, null, 3600);
            //처리 초 더한 날짜
+            $dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i + $betTerm);
            $gameStor->tournament = $tnmt;
            $gameStor->phase = $phase;
-            $gameStor->tnmt_time = Util::toInt($admin['tnmt_time'])
-                + $clock->ticksFromSeconds($unit * $i + $betTerm);
+            $gameStor->tnmt_time = $dt;
            return;
        }
    }
@@ -133,7 +133,7 @@ function processTournament()
    $second = $unit * $iter;
    $gameStor->tournament = $tnmt;
    $gameStor->phase = $phase;
-    $gameStor->tnmt_time = Util::toInt($admin['tnmt_time']) + $clock->ticksFromSeconds($second);
+    $gameStor->tnmt_time = (new \DateTimeImmutable($admin['tnmt_time']))->add(new \DateInterval("PT{$second}S"))->format('Y-m-d H:i:s');
 }

 function getTournamentTermText(int $turnTerm)
@@ -160,8 +160,7 @@ function getTournamentTime()
    $gameStor = KVStorage::getStorage($db, 'game_env');

    list($tnmt, $tnmt_time) = $gameStor->getValuesAsArray(['tournament', 'tnmt_time']);
-    $clock = GameClock::fromStorage($gameStor);
-    $dt = substr($clock->formatTick(Util::toInt($tnmt_time)), 11, 5);
+    $dt = substr($tnmt_time, 11, 5);
    switch ($tnmt) {
        case 1:
            $tnmt = "개막시간 {$dt}";
@@ -285,11 +284,9 @@ function startTournament($type)
    $admin = $gameStor->getValues(['year', 'month', 'turnterm']);
    $turnTerm = $admin['turnterm'];
    $unit = calcTournamentTerm($turnTerm);
-    $clock = GameClock::fromStorage($gameStor);

    $gameStor->tnmt_auto = true;
-    // 기존 startTournament은 unit을 분으로 더하므로 그 계약을 유지합니다.
-    $gameStor->tnmt_time = $clock->nowTick() + $clock->ticksFromMinutes($unit);
+    $gameStor->tnmt_time = (new \DateTimeImmutable())->add(new \DateInterval("PT{$unit}M"))->format('Y-m-d H:i:s');
    $gameStor->tournament = 1;
    $gameStor->tnmt_type = $type;
    $gameStor->last_tournament_betting_id = 0;
@@ -1156,25 +1153,21 @@ function fight($tnmt_type, $tnmt, $phs, $group, $g1, $g2, $type)
        ];

        //막판 분노
-        $factor1 = 1.0;
-        $factor2 = 1.0;
        $ratio = rand() % 300;
        if ($e1 / 5 > $energy1 && $damage1 > $damage2 && $gen1[$tp] >= $ratio) {
-            $factor2 = Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $damage2 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
            $critical1 = 1;
            $str = Util::choiceRandom($crticialSkillMap[$tnmt_type]);
            $log[] = "<S>●</> <Y>{$gen1['name']}</>의 분노의 <M>{$str}</> 공격!";
        }
        $ratio = rand() % 300;
        if ($e2 / 5 > $energy2 && $damage2 > $damage1 && $gen2[$tp] >= $ratio) {
-            $factor1 = Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $damage1 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
            $critical2 = 1;
+
            $str = Util::choiceRandom($crticialSkillMap[$tnmt_type]);
            $log[] = "<S>●</> <Y>{$gen2['name']}</>의 분노의 <M>{$str}</> 공격!";
        }
-        $damage1 *= $factor1;
-        $damage2 *= $factor2;
-
        //1합 승부
        if ($phase == 1) {

@@ -16,10 +16,12 @@ $session = Session::requireLogin([])->setReadOnly();
 $userID = Session::getUserID();


+$oNow = new \DateTimeImmutable();
+
+$now = $oNow->format('Y-m-d H:i:s');
+
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$clock = GameClock::fromStorage($gameStor);
-$now = $clock->nowTick();

 $oldGeneral = $db->queryFirstField('SELECT `no` FROM general WHERE `owner`=%i', $userID);
 if($oldGeneral !== null){
@@ -42,14 +44,15 @@ if($npcmode!=1){
    ]);
 }

-$token = $db->queryFirstRow('SELECT * FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%i', $userID, $now);
+$token = $db->queryFirstRow('SELECT * FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%s', $userID, $now);
 $pickResult = [];


 if($token && $refresh){
-    $pickMoreFrom = Util::toInt($token['pick_more_from']);
+    $pickMoreFrom = (new \DateTime($token['pick_more_from']))->getTimestamp();
+    $nowT = $oNow->getTimestamp();

-    if($now >= $pickMoreFrom){
+    if($nowT >= $pickMoreFrom){
        $oldPickResult = Json::decode($token['pick_result']);

        foreach($keepResult as $keepId){
@@ -72,14 +75,15 @@ if($token && $refresh){
 }

 if($token && !$refresh){
-    $pickMoreFrom = Util::toInt($token['pick_more_from']);
+    $pickMoreFrom = (new \DateTime($token['pick_more_from']))->getTimestamp();
+    $nowT = $oNow->getTimestamp();

    Json::die([
        'result'=>true,
        'pick'=>Json::decode($token['pick_result']),
-        'pickMoreFrom'=>$clock->formatTick($pickMoreFrom),
-        'pickMoreSeconds'=>intdiv($pickMoreFrom - $now, $clock->ticksPerSecond()),
-        'validUntil'=>$clock->formatTick(Util::toInt($token['valid_until']))
+        'pickMoreFrom'=>$token['pick_more_from'],
+        'pickMoreSeconds'=>$pickMoreFrom-$nowT,
+        'validUntil'=>$token['valid_until']
    ]);
 }

@@ -96,7 +100,7 @@ foreach($db->query('SELECT `no`, `name`, leadership, strength, intel, nation, im
    $weight[$general['no']] = pow($allStat, 1.5);
 }

-foreach($db->queryFirstColumn('SELECT pick_result FROM select_npc_token WHERE `owner`!=%i AND valid_until >=%i', $userID, $now) as $reserved){
+foreach($db->queryFirstColumn('SELECT pick_result FROM select_npc_token WHERE `owner`!=%i AND valid_until >=%s', $userID, $now) as $reserved){
    $reserved = Json::decode($reserved);
    foreach(array_keys($reserved) as $reservedNPC){
        if(key_exists($reservedNPC, $weight)){
@@ -127,8 +131,8 @@ $newNonce = random_int(0, 0xfffffff);
 $validSecond = max(VALID_SECOND, $turnterm*40);
 $pickMoreSecond = max(PICK_MORE_SECOND, Util::round(pow($turnterm, 0.672)*8));

-$validUntil = $now + $clock->ticksFromSeconds($validSecond);
-$pickMoreFrom = $now + $clock->ticksFromSeconds($pickMoreSecond);
+$validUntil = $oNow->add(new \DateInterval(sprintf('PT%dS', $validSecond)));
+$pickMoreFrom = $oNow->add(new \DateInterval(sprintf('PT%dS', $pickMoreSecond)));

 $db->delete('select_npc_token', 'valid_until < %s', $now);

@@ -136,8 +140,8 @@ $inserted = 0;

 if($token){
    $db->update('select_npc_token', [
-        'valid_until'=>$validUntil,
-        'pick_more_from'=>$pickMoreFrom,
+        'valid_until'=>$validUntil->format('Y-m-d H:i:s'),
+        'pick_more_from'=>$pickMoreFrom->format('Y-m-d H:i:s'),
        'pick_result'=>Json::encode($pickResult),
        'nonce'=>$newNonce
    ], 'owner = %i AND nonce = %i', $userID, $token['nonce']);
@@ -148,8 +152,8 @@ if($token){
 else{
    $db->insertIgnore('select_npc_token', [
        'owner'=>$userID,
-        'valid_until'=>$validUntil,
-        'pick_more_from'=>$now,
+        'valid_until'=>$validUntil->format('Y-m-d H:i:s'),
+        'pick_more_from'=>'2000-01-01 01:00:00',
        'pick_result'=>Json::encode($pickResult),
        'nonce'=>$newNonce
    ]);
@@ -169,7 +173,7 @@ if($inserted === 0){
 Json::die([
    'result'=>true,
    'pick'=>$pickResult,
-    'pickMoreFrom'=>$clock->formatTick(($inserted===-1)?$pickMoreFrom:$now),
+    'pickMoreFrom'=>($inserted===-1)?$pickMoreFrom->format('Y-m-d H:i:s'):'2000-01-01 01:00:00',
    'pickMoreSeconds'=>($inserted===-1)?$pickMoreSecond:0,
-    'validUntil'=>$clock->formatTick($validUntil)
-]);
+    'validUntil'=>$validUntil->format('Y-m-d H:i:s')
+]);
@@ -10,23 +10,7 @@ function sortTokens(&$tokens){
    });
 }

-function putInfoText(&$info, ?array $currentTargetEnv){
-    if (($info['event100Growth'] ?? false) === true) {
-        if ($currentTargetEnv === null) {
-            $displayStats = CentennialAllStarGrowthService::calculateUserInitialStats($info);
-            $info['selectionStatLabel'] = '시작 능력치';
-        } else {
-            $displayStats = CentennialAllStarGrowthService::calculateUserCurrentTargetStats(
-                $info,
-                $currentTargetEnv
-            );
-            $info['selectionStatLabel'] = '현재 변경 기준 능력치';
-        }
-        $info['selectionLeadership'] = $displayStats['leadership'];
-        $info['selectionStrength'] = $displayStats['strength'];
-        $info['selectionIntel'] = $displayStats['intel'];
-    }
-
+function putInfoText(&$info){
    if(key_exists('specialDomestic', $info)){
        $class = buildGeneralSpecialDomesticClass($info['specialDomestic']);
        $info['specialDomesticName'] = $class->getName();
@@ -43,13 +27,14 @@ function putInfoText(&$info, ?array $currentTargetEnv){
 $session = Session::requireLogin([])->setReadOnly();
 $userID = Session::getUserID();

-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-$clock = GameClock::fromStorage($gameStor);
-$now = $clock->nowTick();
+$oNow = new \DateTimeImmutable();

-$eventEnv = $gameStor->getValues(['npcmode', 'startyear', 'year', 'month']);
-$npcmode = $eventEnv['npcmode'];
+$now = $oNow->format('Y-m-d H:i:s');
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$npcmode = $gameStor->getValue('npcmode');
 if($npcmode!=2){
    Json::die([
        'result'=>false,
@@ -57,8 +42,7 @@ if($npcmode!=2){
    ]);
 }

-$rawGeneral = $db->queryFirstRow('SELECT no, aux FROM general WHERE `owner` = %i', $userID);
-$currentTargetEnv = $rawGeneral ? $eventEnv : null;
+$rawGeneral = $db->queryFirstRow('SELECT no, aux FROM general WHERE `owner` = %i', $userID);
 if($rawGeneral){
    $generalAux = Json::decode($rawGeneral['aux']);
    if(key_exists('next_change', $generalAux)&& $generalAux['next_change'] > $now){
@@ -78,7 +62,7 @@ if($tokens){
    foreach($tokens as $token){
        $valid_until = $token['reserved_until'];
        $info = Json::decode($token['info']);
-        putInfoText($info, $currentTargetEnv);
+        putInfoText($info);
        $info['uniqueName'] = $token['unique_name'];
        $pick[] = $info;
    }
@@ -86,7 +70,7 @@ if($tokens){
    Json::die([
        'result'=>true,
        'pick'=>$pick,
-        'validUntil'=>$clock->formatTick(Util::toInt($valid_until))
+        'validUntil'=>$valid_until
    ]);
 }

@@ -99,12 +83,12 @@ $valid_until = null;
 foreach(pickGeneralFromPool($db, $rng, $userID, 14) as $pickObj){
    $valid_until = $pickObj->getValidUntil();
    $info = $pickObj->getInfo();
-    putInfoText($info, $currentTargetEnv);
+    putInfoText($info);
    $pick[] = $info;
 }
 sortTokens($pick);//좀 무식하지만..
 Json::die([
    'result'=>true,
    'pick'=>$pick,
-    'validUntil'=>$valid_until === null ? null : $clock->formatTick(Util::toInt($valid_until))
-]);
+    'validUntil'=>$valid_until
+]);
@@ -211,7 +211,7 @@ try{
        $show_img_level,
        !!$tournament_trig,
        $join_mode,
-        TimeUtil::format(GameClock::readWallTime(), false),
+        TimeUtil::now(),
        $autorun_user
    ));
 }
@@ -220,4 +220,4 @@ catch(\Exception $e){
        'result'=>false,
        'reason'=>$e->getMessage()
    ]);
-}
+}
@@ -144,7 +144,7 @@ function do도시임명(General $general, int $cityID, int $targetOfficerLevel):
        return '올바르지 않은 도시입니다';
    }

-    if ($general->getVar(GeneralColumn::officer_level) >= 4 && ($myPenalty[PenaltyKey::NoChiefChange->value] ?? false)) {
+    if ($general->getVar(GeneralColumn::officer_level) >= 4 && $myPenalty[PenaltyKey::NoChiefChange->value] ?? false) {
        return '수뇌인 장수를 변경할 수 없는 상태입니다.';
    }

@@ -24,8 +24,8 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $rootDB = RootDB::db();

-$clock = GameClock::fromStorage($gameStor);
-$now = $clock->nowTick();
+$oNow = new \DateTimeImmutable();
+$now = $oNow->format('Y-m-d H:i:s');

 $member = $rootDB->queryFirstRow('SELECT `name`, `penalty` FROM member WHERE `NO`=%i', $userID);
 if(!$member){
@@ -41,7 +41,7 @@ $penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefi

 $penalty = [];
 foreach($penaltyInfo as $penaltyKey => $penaltyValue){
-    if(($penaltyValue['expire'] ?? 0) > TimeUtil::now()){
+    if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
        $penalty[$penaltyKey] = $penaltyValue['value'];
    }
 }
@@ -139,4 +139,4 @@ $rootDB->insert('member_log', [
 Json::die([
    'result'=>true,
    'reason'=>'success'
-]);
+]);
@@ -8,20 +8,10 @@ WebUtil::requireAJAX();

 $pick = Util::getPost('pick');
 $leadership = Util::getPost('leadership', 'int', GameConst::$defaultStatMin);
-$isCentennialAllStar = CentennialAllStarGrowthService::isActive();
-$strength = Util::getPost(
-    $isCentennialAllStar ? 'strength' : 'leadership',
-    'int',
-    GameConst::$defaultStatMin
-);
-$intel = Util::getPost(
-    $isCentennialAllStar ? 'intel' : 'leadership',
-    'int',
-    GameConst::$defaultStatMin
-);
+$strength = Util::getPost('leadership', 'int', GameConst::$defaultStatMin);
+$intel = Util::getPost('leadership', 'int', GameConst::$defaultStatMin);
 $personal = Util::getPost('personal', 'string', null);
 $use_own_picture = Util::getPost('use_own_picture', 'bool', false);
-$pictureSource = Util::getPost('picture_source', 'string', 'selected');


 if(!$pick){
@@ -37,8 +27,8 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');

 $rootDB = RootDB::db();
-$clock = GameClock::fromStorage($gameStor);
-$now = $clock->nowTick();
+$oNow = new \DateTimeImmutable();
+$now = $oNow->format('Y-m-d H:i:s');

 $hasGeneralID = $db->queryFirstField('SELECT no FROM general WHERE owner = %i', $userID);
 if($hasGeneralID){
@@ -70,39 +60,16 @@ if(!$selectInfo){
 }
 $selectInfo = Json::decode($selectInfo);

-$ownerInfo = RootDB::db()->queryFirstRow(
-    'SELECT `name`,`picture`,`imgsvr`,`grade` FROM member WHERE `NO`=%i',
-    $userID
-);
-if(!$ownerInfo){
+$ownerInfo = RootDB::db()->queryFirstRow('SELECT `name`,`picture`,`imgsvr` FROM member WHERE `NO`=%i',$userID);
+if(!$ownerInfo){
    Json::die([
        'result'=>false,
        'reason'=>'멤버 정보를 가져오지 못했습니다.'
-    ]);
-}
-if ($isCentennialAllStar) {
-    if (!in_array($pictureSource, ['selected', 'own'], true)) {
-        Json::die([
-            'result' => false,
-            'reason' => '올바르지 않은 전콘 선택입니다.',
-        ]);
-    }
-    if ($pictureSource === 'own') {
-        $canUseOwnPicture = in_array('picture', GameConst::$generalPoolAllowOption, true)
-            && $env['show_img_level'] >= 1
-            && $ownerInfo['grade'] >= 1
-            && $ownerInfo['picture'] !== '';
-        if (!$canUseOwnPicture) {
-            Json::die([
-                'result' => false,
-                'reason' => '사용할 수 있는 내 전콘이 없습니다.',
-            ]);
-        }
-    }
-}
-
-
-$gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
+    ]);
+}
+
+
+$gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');

 if ($gencount >= $maxgeneral) {
    Json::die([
@@ -113,25 +80,12 @@ if ($gencount >= $maxgeneral) {

 $poolClass = getGeneralPoolClass(GameConst::$targetGeneralPool);
 /** @var AbsGeneralPool */
-if ($isCentennialAllStar) {
-    $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
-        UniqueConst::$hiddenSeed,
-        'selectPickedGeneral',
-        $userID,
-        $pick
-    )));
-    $pickedGeneral = new $poolClass($db, $rng, $selectInfo, $now);
-} else {
-    $pickedGeneral = new $poolClass($db, $selectInfo, $now);
-}
+$pickedGeneral = new $poolClass($db, $selectInfo, $now);

 $builder = $pickedGeneral->getGeneralBuilder();
-if ($isCentennialAllStar) {
-    CentennialAllStarGrowthService::prepareInitialUser($builder, $selectInfo);
-}

 foreach(GameConst::$generalPoolAllowOption as $allowOption){
-    if($allowOption == 'stat' && !$isCentennialAllStar){
+    if($allowOption == 'stat'){
        $leadership = Util::valueFit($leadership, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
        $strength = Util::valueFit($strength, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
        $intel = Util::valueFit($intel, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
@@ -144,23 +98,14 @@ foreach(GameConst::$generalPoolAllowOption as $allowOption){
        }
        $builder->setStat($leadership, $strength, $intel);
    }
-    else if(
-        $allowOption == 'picture'
-        && (
-            (!$isCentennialAllStar && $use_own_picture)
-            || ($isCentennialAllStar && $pictureSource === 'own')
-        )
-    ){
-        $builder->setPicture($ownerInfo['imgsvr'], $ownerInfo['picture']);
+    else if($allowOption == 'picture' && $use_own_picture){
+        $builder->setPicture($ownerInfo['imgsvr'], $ownerInfo['picture']);
    }
    else if($allowOption == 'ego'){
        if(!$personal || $personal == 'Random'){
            $personal =  Util::choiceRandom(GameConst::$availablePersonality);
        }
-        $invalidPersonal = $isCentennialAllStar
-            ? !in_array($personal, GameConst::$availablePersonality, true)
-            : !array_search($personal, GameConst::$availablePersonality);
-        if($invalidPersonal){
+        if(!array_search($personal, GameConst::$availablePersonality)){
            Json::die([
                'result'=>false,
                'reason'=>'올바르지 않은 성격입니다.'
@@ -168,7 +113,7 @@ foreach(GameConst::$generalPoolAllowOption as $allowOption){
        }
        $builder->setEgo($personal);
    }
-}
+}

 $userNick = $ownerInfo['name'];

@@ -176,29 +121,8 @@ $builder->setOwner($userID);
 $builder->setOwnerName($userNick);
 $builder->setKillturn(5);
 $builder->setNPCType(0);
-$builder->setAuxVar('next_change', $now + GameClock::TICKS_PER_TURN * 12);
-$builder->setAuxVar(
-    'prestart_delete_after',
-    addTurn($now, $env['turnterm'], GameConst::$minTurnDieOnPrestart)
-);
+$builder->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $env['turnterm']));
 $builder->fillRemainSpecAsZero($env);
-if ($isCentennialAllStar) {
-    $candidateCities = $db->queryFirstColumn(
-        'SELECT city FROM city WHERE level >= 5 AND level <= 6 AND nation = 0'
-    );
-    if (!$candidateCities) {
-        $candidateCities = $db->queryFirstColumn(
-            'SELECT city FROM city WHERE level >= 5 AND level <= 6'
-        );
-    }
-    if (!$candidateCities) {
-        Json::die([
-            'result' => false,
-            'reason' => '장수를 생성할 소·중성이 없습니다.',
-        ]);
-    }
-    $builder->setCityID($rng->choice($candidateCities));
-}
 $builder->build($env);
 $generalID = $builder->getGeneralID();
 if(!$generalID){
@@ -243,4 +167,4 @@ $rootDB->insert('member_log', [
 Json::die([
    'result'=>true,
    'reason'=>'success'
-]);
+]);
@@ -19,7 +19,6 @@ if(!class_exists('\\sammo\\DB')){

 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$clock = GameClock::fromStorage($gameStor);

 if(file_exists(__DIR__.'/.htaccess')){
    $reserved = $db->queryFirstRow(
@@ -76,8 +75,8 @@ $admin['maxUserCnt'] = $admin['maxgeneral'];
 $admin['npcMode'] = $admin['npcmode'];
 $admin['turnTerm'] = $admin['turnterm'];
 $admin['isUnited'] = $admin['isunited'];
-$admin['starttime'] = substr($clock->formatTick(Util::toInt($admin['opentime'])), 5, 11);
-$admin['turntime'] = substr($clock->formatTick(Util::toInt($admin['turntime'])), 5, 11);
+$admin['starttime'] = substr($admin['opentime'], 5, 11);
+$admin['turntime'] = substr($admin['turntime'], 5, 11);
 unset($admin['npcmode']);
 unset($admin['maxgeneral']);
 unset($admin['turnterm']);
@@ -132,4 +131,4 @@ if($general){
 Json::die([
    'game'=>$admin,
    'me'=>$me?:null
-]);
+]);
@@ -88,7 +88,7 @@ $penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefi

 $penalty = [];
 foreach ($penaltyInfo as $penaltyKey => $penaltyValue) {
-    if (($penaltyValue['expire'] ?? 0) > TimeUtil::now()) {
+    if ($penaltyValue['expire'] ?? 0 > TimeUtil::now()) {
        $penalty[$penaltyKey] = $penaltyValue['value'];
    }
 }
@@ -77,8 +77,7 @@ $month = $query['month'];
 $repeatCnt = $query['repeatCnt'];

 $rawAttacker = $query['attackerGeneral'];
-$battleClock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
-$rawAttacker['turntime'] = $battleClock->formatTick($battleClock->nowTick());
+$rawAttacker['turntime'] = TimeUtil::now();
 $rawAttackerCity = $query['attackerCity'];
 $rawAttackerNation = $query['attackerNation'];

@@ -7,7 +7,6 @@ include "func.php";
 WebUtil::requireAJAX();

 $pick = Util::getPost('pick');
-$pictureSource = Util::getPost('picture_source', 'string', 'selected');

 if(!$pick){
    Json::die([
@@ -22,8 +21,8 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');

 $rootDB = RootDB::db();
-$clock = GameClock::fromStorage($gameStor);
-$now = $clock->nowTick();
+$oNow = new \DateTimeImmutable();
+$now = $oNow->format('Y-m-d H:i:s');

 $generalID = $db->queryFirstField('SELECT no FROM general WHERE owner = %i', $userID);
 if(!$generalID){
@@ -36,20 +35,10 @@ if(!$generalID){
 list(
    $year,
    $month,
-    $startYear,
    $maxgeneral,
    $npcmode,
-    $turnterm,
-    $showImgLevel
-) = $gameStor->getValuesAsArray([
-    'year',
-    'month',
-    'startyear',
-    'maxgeneral',
-    'npcmode',
-    'turnterm',
-    'show_img_level',
-]);
+    $turnterm
+) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode', 'turnterm']);

 if($npcmode!=2){
    Json::die([
@@ -66,10 +55,7 @@ if(!$info){
    ]);
 }

-$ownerInfo = RootDB::db()->queryFirstRow(
-    'SELECT `name`,`picture`,`imgsvr`,`grade` FROM member WHERE `NO`=%i',
-    $userID
-);
+$ownerInfo = RootDB::db()->queryFirstRow('SELECT `name`,`picture`,`imgsvr` FROM member WHERE `NO`=%i',$userID);
 if(!$ownerInfo){
    Json::die([
        'result'=>false,
@@ -78,27 +64,6 @@ if(!$ownerInfo){
 }

 $info = Json::decode($info);
-$isCentennialAllStar = CentennialAllStarGrowthService::isActive();
-if ($isCentennialAllStar) {
-    if (!in_array($pictureSource, ['current', 'own', 'selected'], true)) {
-        Json::die([
-            'result' => false,
-            'reason' => '올바르지 않은 전콘 선택입니다.',
-        ]);
-    }
-    if ($pictureSource === 'own') {
-        $canUseOwnPicture = in_array('picture', GameConst::$generalPoolAllowOption, true)
-            && $showImgLevel >= 1
-            && $ownerInfo['grade'] >= 1
-            && $ownerInfo['picture'] !== '';
-        if (!$canUseOwnPicture) {
-            Json::die([
-                'result' => false,
-                'reason' => '사용할 수 있는 내 전콘이 없습니다.',
-            ]);
-        }
-    }
-}


 $generalObj = General::createObjFromDB($generalID);
@@ -136,52 +101,35 @@ $db->update('select_pool',[
    'reserved_until'=>null,
 ], '(owner=%i or reserved_until < %s) AND general_id is NULL', $userID, $now);

-if ($isCentennialAllStar) {
-    CentennialAllStarGrowthService::prepareLegacyUserReselection($generalObj);
-    CentennialAllStarGrowthService::applyTarget($generalObj, $info, [
-        'startyear' => $startYear,
-        'year' => $year,
-        'month' => $month,
-    ]);
-} else {
-    if(key_exists('leadership', $info)){
-        $generalObj->updateVar('leadership', $info['leadership']);
-        $generalObj->updateVar('strength', $info['strength']);
-        $generalObj->updateVar('intel', $info['intel']);
-    }
-    if(key_exists('dex', $info)){
-        $generalObj->updateVar('dex1', $info['dex'][0]);
-        $generalObj->updateVar('dex2', $info['dex'][1]);
-        $generalObj->updateVar('dex3', $info['dex'][2]);
-        $generalObj->updateVar('dex4', $info['dex'][3]);
-        $generalObj->updateVar('dex5', $info['dex'][4]);
-    }
-    if(key_exists('ego', $info)){
-        $generalObj->updateVar('personal', $info['ego']);
-    }
-    if(key_exists('specialDomestic', $info)){
-        $generalObj->updateVar('special', $info['specialDomestic']);
-    }
-    if(key_exists('specialWar', $info)){
-        $generalObj->updateVar('special2', $info['specialWar']);
-    }
+if(key_exists('leadership', $info)){
+    $generalObj->updateVar('leadership', $info['leadership']);
+    $generalObj->updateVar('strength', $info['strength']);
+    $generalObj->updateVar('intel', $info['intel']);
 }
-if ($isCentennialAllStar) {
-    if ($pictureSource === 'own') {
-        $generalObj->updateVar('imgsvr', $ownerInfo['imgsvr']);
-        $generalObj->updateVar('picture', $ownerInfo['picture']);
-    } elseif ($pictureSource === 'selected' && key_exists('picture', $info)) {
-        $generalObj->updateVar('imgsvr', $info['imgsvr']);
-        $generalObj->updateVar('picture', $info['picture']);
-    }
-} elseif(key_exists('picture', $info)){
+if(key_exists('picture', $info)){
    $generalObj->updateVar('imgsvr', $info['imgsvr']);
    $generalObj->updateVar('picture', $info['picture']);
 }
 if(key_exists('generalName', $info)){
    $generalObj->updateVar('name', $info['generalName']);
 }
-$generalObj->setAuxVar('next_change', $now + GameClock::TICKS_PER_TURN * 12);
+if(key_exists('dex', $info)){
+    $generalObj->updateVar('dex1', $info['dex'][0]);
+    $generalObj->updateVar('dex2', $info['dex'][1]);
+    $generalObj->updateVar('dex3', $info['dex'][2]);
+    $generalObj->updateVar('dex4', $info['dex'][3]);
+    $generalObj->updateVar('dex5', $info['dex'][4]);
+}
+if(key_exists('ego', $info)){
+    $generalObj->updateVar('personal', $info['ego']);
+}
+if(key_exists('specialDomestic', $info)){
+    $generalObj->updateVar('special', $info['specialDomestic']);
+}
+if(key_exists('specialWar', $info)){
+    $generalObj->updateVar('special2', $info['specialWar']);
+}
+$generalObj->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $turnterm));

 $userNick = $ownerInfo['name'];
 $generalObj->setVar('owner_name', $userNick);
@@ -200,4 +148,4 @@ $generalObj->applyDB($db);
 Json::die([
    'result'=>true,
    'reason'=>'success'
-]);
+]);
@@ -51,9 +51,8 @@ function MessageBox($str)

 function LogText($prefix, $variable)
 {
-    return;
-    //$text = sprintf('%s : %s'."\r\n", $prefix, TVarDumper::dump($variable));
-    //file_put_contents(ROOT.'/d_log/'.UniqueConst::$serverName.'_dbg_logs.txt', $text, FILE_APPEND);
+    $text = sprintf('%s : %s'."\r\n", $prefix, TVarDumper::dump($variable));
+    file_put_contents(ROOT.'/d_log/'.UniqueConst::$serverName.'_dbg_logs.txt', $text, FILE_APPEND);
 }

 function prepareDir(string $dirPath, bool $forceCreate=true):bool{
@@ -8,14 +8,4 @@ $session = Session::getInstance()->setReadOnly();

 $db = DB::db();

-$updated = false;
-$locked = false;
-$lastExecuted = TurnExecutionHelper::executeAllCommand($updated, $locked);
-$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
-Json::die([
-    'result' => true,
-    'updated' => $updated,
-    'locked' => $locked,
-    'lastExecutedTick' => $lastExecuted,
-    'lastExecuted' => $clock->formatTick($lastExecuted, true),
-]);
+TurnExecutionHelper::executeAllCommand();
@@ -526,7 +526,7 @@ function DeleteConflict($nation)
 function getConquerNation($city): int
 {
    $conflict = Json::decode($city['conflict']);
-    return array_key_first($conflict);
+    return Util::array_first_key($conflict);
 }

 function ConquerCity(array $admin, General $general, array $city, array $defenderCityGeneralList)
@@ -785,8 +785,8 @@ function ConquerCity(array $admin, General $general, array $city, array $defende
        'officer_set' => 0,
    ];
    if ($city['level'] > 3) {
-        $query['def'] = GameConst::$defaultCityWall;
-        $query['wall'] = GameConst::$defaultCityWall;
+        $query['def'] = 1000;
+        $query['wall'] = 1000;
    } else {
        $query['def'] = $db->sqleval('def_max/2');
        $query['wall'] = $db->sqleval('wall_max/2');
@@ -21,7 +21,7 @@ class BidUniqueAuction extends \sammo\BaseAPI
    ])
      ->rule('int', 'amount')
      ->rule('int', 'auctionID')
-      ->rule('boolean', 'extendCloseTick');
+      ->rule('boolean', 'extendCloseDate');

    if (!$v->validate()) {
      return $v->errorStr();
@@ -38,7 +38,7 @@ class BidUniqueAuction extends \sammo\BaseAPI
  {
    $auctionID = $this->args['auctionID'];
    $amount = $this->args['amount'];
-    $tryExtendCloseDate = $this->args['extendCloseTick'] ?? false;
+    $tryExtendCloseDate = $this->args['extendCloseDate'] ?? false;

    $generalID = $session->generalID;
    $general = General::createObjFromDB($generalID);
@@ -15,8 +15,6 @@ use sammo\General;
 use sammo\Json;
 use sammo\TimeUtil;
 use sammo\Util;
-use sammo\GameClock;
-use sammo\KVStorage;

 use function sammo\getAuctionLogRecent;

@@ -35,13 +33,12 @@ class GetActiveResourceAuctionList extends \sammo\BaseAPI
  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    $db = DB::db();
-    $clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));

    $buyRiceList = [];
    $sellRiceList = [];
    /** @var AuctionInfo[] */
    $auctions = array_map(fn ($raw) => AuctionInfo::fromArray($raw), $db->query(
-      'SELECT * FROM `ng_auction` WHERE `type` IN %ls AND `finished` = 0 ORDER BY `close_tick` ASC',
+      'SELECT * FROM `ng_auction` WHERE `type` IN %ls AND `finished` = 0 ORDER BY `close_date` ASC',
      [
        AuctionType::BuyRice->value,
        AuctionType::SellRice->value,
@@ -90,8 +87,8 @@ class GetActiveResourceAuctionList extends \sammo\BaseAPI
        'type' => $auction->type->value,
        'hostGeneralID' => $auction->hostGeneralID,
        'hostName' => $auction->detail->hostName,
-        'openDate' => $clock->formatTick($auction->openTick),
-        'closeDate' => $clock->formatTick($auction->closeTick),
+        'openDate' => TimeUtil::format($auction->openDate, false),
+        'closeDate' => TimeUtil::format($auction->closeDate, false),
        'amount' => $auction->detail->amount,
        'startBidAmount' => $auction->detail->startBidAmount,
        'finishBidAmount' => $auction->detail->finishBidAmount,
@@ -14,8 +14,6 @@ use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\InheritanceKey;
 use sammo\InheritancePointManager;
 use sammo\TimeUtil;
-use sammo\GameClock;
-use sammo\KVStorage;
 use sammo\Validator;
 use sammo\General;

@@ -44,7 +42,6 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI
  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    $db = DB::db();
-    $clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));

    $generalID = $session->generalID;
    $auctionID = $this->args['auctionID'];
@@ -95,11 +92,9 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI
        'target' => $auction->target,
        'isCallerHost' => $auction->hostGeneralID === $generalID,
        'hostName' => $auction->detail->hostName,
-        'closeDate' => $clock->formatTick($auction->closeTick),
+        'closeDate' => TimeUtil::format($auction->closeDate, false),
        'remainCloseDateExtensionCnt' => $auction->detail->remainCloseDateExtensionCnt,
-        'availableLatestBidCloseDate' => $auction->detail->availableLatestBidCloseTick === null
-          ? null
-          : $clock->formatTick($auction->detail->availableLatestBidCloseTick),
+        'availableLatestBidCloseDate' => TimeUtil::format($auction->detail->availableLatestBidCloseDate, false),
      ],
      'bidList' => $responseBid,
      'obfuscatedName' => $obfuscatedName,
@@ -12,8 +12,6 @@ use sammo\Enums\APIRecoveryType;
 use sammo\Enums\AuctionType;
 use sammo\TimeUtil;
 use sammo\Util;
-use sammo\GameClock;
-use sammo\KVStorage;

 class GetUniqueItemAuctionList extends \sammo\BaseAPI
 {
@@ -30,13 +28,12 @@ class GetUniqueItemAuctionList extends \sammo\BaseAPI
  public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
  {
    $db = DB::db();
-    $clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));

    $generalID = $session->generalID;

    /** @var AuctionInfo[] */
    $auctions = array_map(fn($raw)=>AuctionInfo::fromArray($raw), $db->query(
-      'SELECT * FROM `ng_auction` WHERE `type` = %s ORDER BY `close_tick` ASC',
+      'SELECT * FROM `ng_auction` WHERE `type` = %s ORDER BY `close_date` ASC',
      AuctionType::UniqueItem->value
    ) ?? []);

@@ -88,11 +85,9 @@ class GetUniqueItemAuctionList extends \sammo\BaseAPI
        'target' => $auction->target,
        'isCallerHost' => $auction->hostGeneralID === $generalID,
        'hostName' => $auction->detail->hostName,
-        'closeDate' => $clock->formatTick($auction->closeTick),
+        'closeDate' => TimeUtil::format($auction->closeDate, false),
        'remainCloseDateExtensionCnt' => $auction->detail->remainCloseDateExtensionCnt,
-        'availableLatestBidCloseDate' => $auction->detail->availableLatestBidCloseTick === null
-          ? null
-          : $clock->formatTick($auction->detail->availableLatestBidCloseTick),
+        'availableLatestBidCloseDate' => TimeUtil::format($auction->detail->availableLatestBidCloseDate, false),
        'highestBid' => [
          'generalName' => $highestBid->aux->generalName,
          'amount' => $highestBid->amount,
@@ -7,11 +7,9 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\GameConst;
-use sammo\GameClock;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
-use sammo\Util;

 use function sammo\cutTurn;

@@ -84,12 +82,11 @@ class GetReservedCommand extends \sammo\BaseAPI

        return [
            'result' => true,
-            'turnTimeTick' => Util::toInt($turnTime),
-            'turnTime' => GameClock::fromStorage($gameStor)->formatTick(Util::toInt($turnTime)),
+            'turnTime' => $turnTime,
            'turnTerm' => $turnTerm,
            'year' => $year,
            'month' => $month,
-            'date' => GameClock::fromStorage($gameStor)->formatTick(GameClock::fromStorage($gameStor)->nowTick(), true),
+            'date' => TimeUtil::now(true),
            'turn' => $commandList,
            'autorun_limit' => $generalAux['autorun_limit'] ?? null,
        ];
@@ -11,8 +11,7 @@ use sammo\Session;
 use sammo\General;
 use sammo\JosaUtil;
 use sammo\KVStorage;
-use sammo\GameClock;
-use sammo\Util;
+use sammo\TimeUtil;

 use function sammo\addTurn;
 use function sammo\increaseRefresh;
@@ -38,14 +37,8 @@ class DieOnPrestart extends \sammo\BaseAPI
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
-    $clock = GameClock::fromStorage($gameStor);
-    $nowTick = $clock->nowTick();

    $general = $db->queryFirstRow('SELECT no,name,nation,owner_name,npc FROM general WHERE owner=%i AND npc = 0', $userID);
-    if (!$general) {
-      return '장수가 없습니다';
-    }
-
    $lastRefresh = $db->queryFirstField(
      'SELECT %b FROM general_access_log WHERE %b = %i',
      GeneralAccessLogColumn::lastRefresh->value,
@@ -53,9 +46,8 @@ class DieOnPrestart extends \sammo\BaseAPI
      $general['no']
    );

-    $generalObj = General::createObjFromDB($general['no']);
-    if ($generalObj instanceof DummyGeneral) {
-      trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
+    if (!$general) {
+      return '장수가 없습니다';
    }

    increaseRefresh("장수 삭제", 1);
@@ -69,21 +61,16 @@ class DieOnPrestart extends \sammo\BaseAPI
      return '이미 국가에 소속되어있습니다.';
    }

-    $targetTime = $generalObj->getAuxVar('prestart_delete_after');
-    if (!is_int($targetTime)) {
-      $targetTime = addTurn(
-        $lastRefresh === null ? $nowTick : Util::toInt($lastRefresh),
-        $gameStor->turnterm,
-        GameConst::$minTurnDieOnPrestart
-      );
-      $generalObj->setAuxVar('prestart_delete_after', $targetTime);
-      $generalObj->applyDB($db);
+    //서버 가오픈시 할 수 있는 행동
+    $targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
+    if ($targetTime > TimeUtil::now()) {
+      $targetTimeShort = substr($targetTime, 0, 19);
+      return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
    }

-    //서버 가오픈시 할 수 있는 행동
-    if ($targetTime > $nowTick) {
-      $targetTimeShort = $clock->formatTick($targetTime);
-      return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
+    $generalObj = General::createObjFromDB($general['no']);
+    if ($generalObj instanceof DummyGeneral) {
+      trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
    }

    $generalName = $generalObj->getName();
@@ -14,7 +14,6 @@ use sammo\Enums\GeneralColumn;
 use sammo\Enums\GeneralQueryMode;
 use sammo\Enums\RankColumn;
 use sammo\GameConst;
-use sammo\GameClock;
 use sammo\General;
 use sammo\KVStorage;
 use sammo\LastTurn;
@@ -106,7 +105,6 @@ class GetFrontInfo extends \sammo\BaseAPI
    $db = DB::db();

    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $clock = GameClock::fromStorage($gameStor);
    $gameStor->cacheValues(['isunited', 'opentime', 'refresh']);

    $lastHistoryID = $this->args['lastWorldHistoryID'];
@@ -160,7 +158,6 @@ class GetFrontInfo extends \sammo\BaseAPI
  private function generateGlobalInfo(MeekroDB $db): array
  {
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $clock = GameClock::fromStorage($gameStor);

    [
      $scenarioText, $extendedGeneral, $isFiction, $npcMode,
@@ -213,8 +210,7 @@ class GetFrontInfo extends \sammo\BaseAPI
      'month' => $month,
      'autorunUser' => $autorunUser,
      'turnterm' => $turnterm,
-      'lastExecutedTick' => $lastExecuted,
-      'lastExecuted' => $clock->formatTick(Util::toInt($lastExecuted), true),
+      'lastExecuted' => $lastExecuted,
      'lastVoteID' => $lastVoteID,
      'develCost' => $develCost,
      'noticeMsg' => $noticeMsg,
@@ -228,8 +224,7 @@ class GetFrontInfo extends \sammo\BaseAPI
      'isLocked' => $isLocked,
      'tournamentType' => $tournamentType,
      'tournamentState' => $tournamentState,
-      'tournamentTimeTick' => $tournamentTime,
-      'tournamentTime' => $tournamentTime === null ? null : $clock->formatTick(Util::toInt($tournamentTime)),
+      'tournamentTime' => $tournamentTime,
      'genCount' => $globalGenCount,
      'generalCntLimit' => $generalCntLimit,
      'serverCnt' => $serverCnt,
@@ -366,7 +361,6 @@ class GetFrontInfo extends \sammo\BaseAPI

  public function generateGeneralInfo(MeekroDB $db, General $general, array $rawNation): array
  {
-    $clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));

    $permission = checkSecretPermission($general->getRaw());

@@ -431,12 +425,8 @@ class GetFrontInfo extends \sammo\BaseAPI
      'crew' => $general->getVar(GeneralColumn::crew), // number;
      'train' => $general->getVar(GeneralColumn::train), // number;
      'atmos' => $general->getVar(GeneralColumn::atmos), // number;
-      'turntimeTick' => $general->getTurnTick(), // number;
-      'turntime' => $general->getTurnTime(), // string;
-      'recent_war_tick' => $general->getVar(GeneralColumn::recent_war), // number|null;
-      'recent_war' => $general->getVar(GeneralColumn::recent_war) === null
-        ? null
-        : $clock->formatTick(Util::toInt($general->getVar(GeneralColumn::recent_war)), true), // string|null;
+      'turntime' => $general->getVar(GeneralColumn::turntime), // string;
+      'recent_war' => $general->getVar(GeneralColumn::recent_war), // string;
      'horse' => $general->getVar(GeneralColumn::horse), // GameObjClassKey;
      'weapon' => $general->getVar(GeneralColumn::weapon), // GameObjClassKey;
      'book' => $general->getVar(GeneralColumn::book), // GameObjClassKey;
@@ -554,7 +544,7 @@ class GetFrontInfo extends \sammo\BaseAPI
        'result' => false,
        'reason' => '접속 제한중입니다.',
        'recovery' => APIRecoveryType::GameQuota,
-        'recovery_arg' => $general->getTurnTime(),
+        'recovery_arg' => $general->getVar('turntime'),
      ];
    }

@@ -11,7 +11,6 @@ use sammo\Enums\APIRecoveryType;
 use sammo\Enums\GeneralAccessLogColumn;
 use sammo\Enums\RankColumn;
 use sammo\GameConst;
-use sammo\GameClock;
 use sammo\GameUnitConst;
 use sammo\General;
 use sammo\InheritancePointManager;
@@ -100,7 +99,7 @@ class Join extends \sammo\BaseAPI
        }

        $gameID = UniqueConst::$serverID;
-        $alreadyJoined = $db->queryFirstField('SELECT COUNT(*) FROM `inheritance_result` WHERE `server_id` = %s AND `owner` = %i', $gameID, $userID);
+        $alreadyJoined = $db->queryFirstField('SELECT count(*) FROM `storage` WHERE `namespace` = %s AND `key` LIKE %s', 'inheritance_result', "{$gameID}_{$userID}_%");
        if ($alreadyJoined) {
            //이미 받았음
            return 0;
@@ -158,7 +157,7 @@ class Join extends \sammo\BaseAPI

        $penalty = [];
        foreach($penaltyInfo as $penaltyKey => $penaltyValue){
-            if(($penaltyValue['expire'] ?? 0) > TimeUtil::now()){
+            if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
                $penalty[$penaltyKey] = $penaltyValue['value'];
            }
        }
@@ -166,7 +165,6 @@ class Join extends \sammo\BaseAPI
        $db = DB::db();
        $gameStor = KVStorage::getStorage($db, 'game_env');
        $gameStor->cacheValues(['year', 'month', 'maxgeneral', 'scenario', 'show_img_level', 'block_general_create', 'turnterm', 'turntime', 'genius', 'npcmode']);
-        $clock = GameClock::fromStorage($gameStor);
        ########## 동일 정보 존재여부 확인. ##########

        $block_general_create = $gameStor->getValue('block_general_create');
@@ -224,7 +222,7 @@ class Join extends \sammo\BaseAPI

        $userLogger = new UserLogger($userID, $admin['year'], $admin['month'], false);

-        $now = $clock->nowTick();
+        $now = TimeUtil::now(false);
        $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
            UniqueConst::$hiddenSeed,
            'MakeGeneral',
@@ -362,14 +360,17 @@ class Join extends \sammo\BaseAPI

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

-            $inheritTurnMicrosecond = $rng->nextRangeInt(0, 999999);
-            $turntime = cutTurn(Util::toInt($admin['turntime']), $admin['turnterm'])
-                + $clock->ticksFromSeconds($inheritTurntime)
-                + intdiv($inheritTurnMicrosecond * $clock->ticksPerSecond(), 1_000_000);
+            $inheritTurntime += $rng->nextRangeInt(0, 999999) / 1000000;
+
+            $turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $admin['turnterm']));
+            $turntime = $turntime->add(TimeUtil::secondsToDateInterval($inheritTurntime));
+            $turntime = TimeUtil::format($turntime, true);
        } else {
-            $turntime = getRandTurn($rng, $admin['turnterm'], Util::toInt($admin['turntime']));
+            $turntime = getRandTurn($rng, $admin['turnterm'], new \DateTimeImmutable($admin['turntime']));
        }

+
+        $now = TimeUtil::now(true);
        if ($now >= $turntime) {
            $turntime = addTurn($turntime, $admin['turnterm']);
        }
@@ -434,13 +435,6 @@ class Join extends \sammo\BaseAPI
            'specage2' => $specage2,
            'special2' => $special2,
            'penalty' => Json::encode($penalty),
-            'aux' => Json::encode([
-                'prestart_delete_after' => addTurn(
-                    $now,
-                    $admin['turnterm'],
-                    GameConst::$minTurnDieOnPrestart
-                ),
-            ]),
        ]);
        $generalID = $db->insertId();
        $db->insert('general_access_log', [
@@ -8,8 +8,6 @@ use DateTimeInterface;
 use sammo\Enums\APIRecoveryType;
 use sammo\TurnExecutionHelper;
 use sammo\UniqueConst;
-use sammo\GameClock;
-use sammo\KVStorage;

 class ExecuteEngine extends \sammo\BaseAPI
 {
@@ -37,13 +35,11 @@ class ExecuteEngine extends \sammo\BaseAPI
      $updated = false;
      $locked = false;
      $lastExecuted = TurnExecutionHelper::executeAllCommand($updated, $locked);
-      $clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
      return [
        'result' => true,
        'updated' => $updated,
        'locked' => $locked,
-        'lastExecutedTick' => $lastExecuted,
-        'lastExecuted' => $clock->formatTick($lastExecuted, true),
+        'lastExecuted' => $lastExecuted,
      ];
    }
 }
@@ -3,7 +3,6 @@
 namespace sammo\API\Global;

 use sammo\DB;
-use sammo\GameClock;
 use sammo\Enums\APIRecoveryType;
 use sammo\Json;
 use sammo\KVStorage;
@@ -146,8 +145,7 @@ class GeneralList extends \sammo\BaseAPI


        if (static::$withToken) {
-            $gameStor = KVStorage::getStorage($db, 'game_env');
-            $now = GameClock::fromStorage($gameStor)->nowTick();
+            $now = (new \DateTimeImmutable())->format('Y-m-d H:i:s');
            $tokens = [];
            foreach ($db->query('SELECT * FROM select_npc_token WHERE `valid_until`>=%s', $now) as $token) {
                $validUntil = $token['valid_until'];
@@ -4,7 +4,6 @@ namespace sammo\API\InheritAction;

 use sammo\Session;
 use DateTimeInterface;
-use sammo\CentennialAllStarGrowthService;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\RankColumn;
@@ -99,10 +98,6 @@ class ResetStat extends \sammo\BaseAPI
            return 'NPC는 능력치 초기화를 할 수 없습니다.';
        }

-        if (!CentennialAllStarGrowthService::isStatResetAllowed()) {
-            return '100기 올스타 장수는 능력치 초기화를 사용할 수 없습니다.';
-        }
-

        $db = DB::db();
        $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -64,11 +64,13 @@ class ResetTurnTime extends \sammo\BaseAPI
        $gameStor = KVStorage::getStorage($db, 'game_env');
        $turnTerm = $gameStor->getValue('turnterm');

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

        $afterTurn = $rng->nextFloat1() * $turnTerm * 60;
@@ -8,7 +8,6 @@ use sammo\Enums\APIRecoveryType;
 use sammo\Enums\GeneralLiteQueryMode;
 use sammo\Enums\GeneralQueryMode;
 use sammo\General;
-use sammo\GameClock;
 use sammo\GeneralLite;
 use sammo\Session;
 use sammo\Util;
@@ -265,11 +264,8 @@ class GeneralList extends \sammo\BaseAPI
            'honorText' => fn ($rawGeneral) => getHonor($rawGeneral['experience']),
            'dedLevelText' => fn ($rawGeneral) => getDedLevelText($rawGeneral['dedlevel']),
            //'0000-00-00 11:23';
-            'turntime' => fn ($rawGeneral) => GameClock::fromStorage($gameStor)
-                ->formatTick(Util::toInt($rawGeneral['turntime'])),
-            'recent_war' => fn ($rawGeneral) => $rawGeneral['recent_war'] === null
-                ? null
-                : GameClock::fromStorage($gameStor)->formatTick(Util::toInt($rawGeneral['recent_war'])),
+            'turntime' => fn ($rawGeneral) => substr($rawGeneral['turntime'], 0, 19),
+            'recent_war' => fn ($rawGeneral) => substr($rawGeneral['recent_war'], 0, 19),
            'bill' => fn ($rawGeneral) => getBillByLevel($rawGeneral['dedlevel']),
            'reservedCommand' => fn ($rawGeneral) => $reservedCommand[$rawGeneral['no']] ?? null,
            'autorun_limit' => fn ($rawGeneral) => ($rawGeneral['aux'] ?? [])['autorun_limit'] ?? 0,
@@ -8,7 +8,6 @@ use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\GeneralQueryMode;
 use sammo\GameConst;
-use sammo\GameClock;
 use sammo\General;
 use sammo\Json;
 use sammo\KVStorage;
@@ -52,8 +51,7 @@ class GetReservedCommand extends \sammo\BaseAPI
        $nationID = $me['nation'];
        $limitState = checkLimit($me['refresh_score']);
        if ($limitState >= 2) {
-            $limitTime = GameClock::fromStorage($gameStor)->formatTick(Util::toInt($me['turntime']), true);
-            return "접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 갱신 가능 시각 : {$limitTime})";
+            return "접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 갱신 가능 시각 : {$me['turntime']})";
        }

        $permission = checkSecretPermission($me);
@@ -8,11 +8,6 @@ use sammo\Util;

 abstract class AbsFromUserPool extends AbsGeneralPool{

-    protected static function getCandidateWeight(array $info, int $owner): int|float
-    {
-        return array_sum($info['dex'] ?? []);
-    }
-
    public function occupyGeneralName(): bool
    {
        $generalID = $this->getGeneralBuilder()->getGeneralID();
@@ -30,9 +25,8 @@ abstract class AbsFromUserPool extends AbsGeneralPool{
    }

    static public function pickGeneralFromPool(\MeekroDB $db, RandUtil $rng, int $owner, int $pickCnt, ?string $prefix=null):array{
-        $gameStor = KVStorage::getStorage($db, 'game_env');
-        $clock = GameClock::fromStorage($gameStor);
-        $now = $clock->nowTick();
+        $oNow = new \DateTimeImmutable();
+        $now = $oNow->format('Y-m-d H:i:s');

        $db->update('select_pool', [
            'reserved_until'=>null,
@@ -42,15 +36,17 @@ abstract class AbsFromUserPool extends AbsGeneralPool{
        $pool = [];
        foreach($db->query('SELECT id, unique_name, info FROM select_pool WHERE reserved_until IS NULL AND general_id IS NULL', $pickCnt) as $cand){
            $cand['info'] = Json::decode($cand['info']);
-            $pool[] = [$cand, static::getCandidateWeight($cand['info'], $owner)];
+            $dexTotal = array_sum($cand['info']['dex']);
+            $pool[] = [$cand, $dexTotal];
        }

        if(count($pool) < $pickCnt){
            throw new \RuntimeException('pool 부족');
        }

-        $result = [];
-        $validUntil = $now + GameClock::TICKS_PER_TURN * 2;
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $result = [];
+        $validUntil = TimeUtil::nowAddMinutes(2 * $gameStor->turnterm);
        while(count($result) < $pickCnt){
            $cand = $rng->choiceUsingWeightPair($pool);
            $poolID = $cand['id'];
@@ -73,4 +69,4 @@ abstract class AbsFromUserPool extends AbsGeneralPool{

        return array_values($result);
    }
-}
+}
@@ -34,7 +34,7 @@ abstract class AbsGeneralPool{
     * specialWar
     */

-    public function __construct(\MeekroDB $db, RandUtil $rng, array $info, int $validUntil)
+    public function __construct(\MeekroDB $db, RandUtil $rng, array $info, string $validUntil)
    {
        $this->db = $db;
        $this->info = $info;
@@ -92,7 +92,7 @@ abstract class AbsGeneralPool{
        return $this->builder;
    }

-    public function getValidUntil():int{
+    public function getValidUntil():string{
        return $this->validUntil;
    }

@@ -109,4 +109,4 @@ abstract class AbsGeneralPool{

    abstract public static function getPoolName():string;
    abstract public static function initPool(\MeekroDB $db);
-}
+}
@@ -15,7 +15,7 @@ class che_척사_오악진형도 extends \sammo\BaseItem{

    public function getWarPowerMultiplier(WarUnit $unit):array{
        $opposeCrewType = $unit->getOppose()->getCrewType();
-        if($opposeCrewType->reqCities() || $opposeCrewType->reqRegions()){
+        if($opposeCrewType->reqCities || $opposeCrewType->reqRegions){
            return [1.15, 0.85];
        }
        return [1, 1];
@@ -33,7 +33,7 @@ class event_전투특기_공성 extends \sammo\BaseItem{
    }

    public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_SIEGE;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -28,7 +28,7 @@ class event_전투특기_궁병 extends \sammo\BaseItem{
        if($statName === 'warAvoidRatio'){
            return $value + 0.2;
        }
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_ARCHER;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -28,7 +28,7 @@ class event_전투특기_귀병 extends \sammo\BaseItem{
        if($statName === 'warMagicSuccessProb'){
            return $value + 0.2;
        }
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_WIZARD;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -32,7 +32,7 @@ class event_전투특기_기병 extends \sammo\BaseItem{
    }

    public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_CAVALRY;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -33,7 +33,7 @@ class event_전투특기_보병 extends \sammo\BaseItem{
    }

    public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_FOOTMAN;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -17,7 +17,7 @@ class event_전투특기_척사 extends \sammo\BaseItem{

    public function getWarPowerMultiplier(WarUnit $unit):array{
        $opposeCrewType = $unit->getOppose()->getCrewType();
-        if($opposeCrewType->reqCities() || $opposeCrewType->reqRegions()){
+        if($opposeCrewType->reqCities || $opposeCrewType->reqRegions){
            return [1.2, 0.8];
        }
        return [1, 1];
@@ -1,68 +0,0 @@
-<?php
-
-namespace sammo\ActionScenarioEffect;
-
-use \sammo\iAction;
-use sammo\Util;
-use sammo\WarUnit;
-use sammo\WarUnitCity;
-use sammo\WarUnitTrigger\che_전멸시페이즈증가;
-use sammo\WarUnitTriggerCaller;
-
-class event_MoreEffect implements iAction
-{
-    use \sammo\DefaultAction;
-
-    public function getWarPowerMultiplier(WarUnit $unit): array
-    {
-        if ($unit->isAttacker()) {
-            return [1.4, 0.7143];
-        }
-        return [1, 1];
-    }
-
-    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
-    {
-        $scoreMap = [
-            '상업' => 2,
-            '농업' => 2,
-            '치안' => 2,
-            '기술' => 2,
-            '성벽' => 2,
-            '수비' => 2,
-            '인구' => 2,
-            '민심' => 2,
-        ];
-        if ($turnType == 'changeDefenceTrain') {
-            return 0;
-        }
-        if ($varType === 'score' && key_exists($turnType, $scoreMap)) {
-            $multiplier = $scoreMap[$turnType];
-            $value *= $multiplier;
-            return $value;
-        }
-
-        return $value;
-    }
-
-    public function onCalcNationalIncome(string $type, $amount){
-        if($type == 'gold'){
-            return $amount * 2;
-        }
-        if($type == 'rice'){
-            return $amount * 2;
-        }
-        if($type == 'pop' && $amount > 0){
-            return $amount * 2;
-        }
-        
-        return $amount;
-    }
-
-    public function getBattlePhaseSkillTriggerList(\sammo\WarUnit $unit): ?WarUnitTriggerCaller
-    {
-        return new WarUnitTriggerCaller(
-            new che_전멸시페이즈증가($unit),
-        );
-    }
-}
@@ -35,7 +35,7 @@ class che_event_공성 extends \sammo\BaseSpecial{
    }

    public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_SIEGE;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -31,7 +31,7 @@ class che_event_궁병 extends \sammo\BaseSpecial{
        if($statName === 'warAvoidRatio'){
            return $value + 0.2;
        }
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_ARCHER;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -30,7 +30,7 @@ class che_event_귀병 extends \sammo\BaseSpecial{
        if($statName === 'warMagicSuccessProb'){
            return $value + 0.2;
        }
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_WIZARD;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -35,7 +35,7 @@ class che_event_기병 extends \sammo\BaseSpecial{
    }

    public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_CAVALRY;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -35,7 +35,7 @@ class che_event_보병 extends \sammo\BaseSpecial{
    }

    public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_FOOTMAN;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -21,7 +21,7 @@ class che_event_척사 extends \sammo\BaseSpecial{

    public function getWarPowerMultiplier(WarUnit $unit):array{
        $opposeCrewType = $unit->getOppose()->getCrewType();
-        if($opposeCrewType->reqCities() || $opposeCrewType->reqRegions()){
+        if($opposeCrewType->reqCities || $opposeCrewType->reqRegions){
            return [1.2, 0.8];
        }
        return [1, 1];
@@ -35,7 +35,7 @@ class che_공성 extends \sammo\BaseSpecial{
    }

    public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_SIEGE;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -31,7 +31,7 @@ class che_궁병 extends \sammo\BaseSpecial{
        if($statName === 'warAvoidRatio'){
            return $value + 0.2;
        }
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_ARCHER;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -30,7 +30,7 @@ class che_귀병 extends \sammo\BaseSpecial{
        if($statName === 'warMagicSuccessProb'){
            return $value + 0.2;
        }
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_WIZARD;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -35,7 +35,7 @@ class che_기병 extends \sammo\BaseSpecial{
    }

    public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_CAVALRY;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -35,7 +35,7 @@ class che_보병 extends \sammo\BaseSpecial{
    }

    public function onCalcStat(General $general, string $statName, $value, $aux=null){
-        if(str_starts_with($statName, 'dex')){
+        if(\sammo\Util::starts_with($statName, 'dex')){
            $myArmType = 'dex'.GameUnitConst::T_FOOTMAN;
            $opposeArmType = 'dex'.$aux['opposeType']->armType;;
            if($aux['isAttacker'] && $opposeArmType === $statName){
@@ -21,7 +21,7 @@ class che_척사 extends \sammo\BaseSpecial{

    public function getWarPowerMultiplier(WarUnit $unit):array{
        $opposeCrewType = $unit->getOppose()->getCrewType();
-        if($opposeCrewType->reqCities() || $opposeCrewType->reqRegions()){
+        if($opposeCrewType->reqCities || $opposeCrewType->reqRegions){
            return [1.2, 0.8];
        }
        return [1, 1];
@@ -146,35 +146,40 @@ abstract class Auction
    return $this->info;
  }

-  public function shrinkCloseTick(?int $tick): ?string
+  public function shrinkCloseDate(?DateTimeInterface $date): ?string
  {
+    if ($date === null) {
+      $date = new DateTimeImmutable();
+    }
+
+    $this->info->closeDate = $date;
    $db = DB::db();
-    $clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
-    $this->info->closeTick = $tick ?? $clock->nowTick();
    $db->update('ng_auction', $this->info->toArray('id'), 'id = %i', $this->info->id);

    return null;
  }

-  public function extendLatestBidCloseTick(?int $tick): ?string
+  public function extendLatestBidCloseDate(?DateTimeInterface $date): ?string
  {
-    if ($tick === null) {
+    if ($date === null) {
      $db = DB::db();
      $gameStor = KVStorage::getStorage($db, 'game_env');
-      $clock = GameClock::fromStorage($gameStor);
      $turnTerm = $gameStor->getValue('turnterm');
-      $tick = $this->info->closeTick + $clock->ticksFromMinutes(
-        max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID)
-      );
+      $date = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
+        max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID) * 60
+      ));
    }
-    if ($this->info->detail->availableLatestBidCloseTick !== null && $tick < $this->info->detail->availableLatestBidCloseTick) {
+    else{
+      $date = DateTimeImmutable::createFromInterface($date);
+    }
+    if ($this->info->detail->availableLatestBidCloseDate !== null && $date < $this->info->detail->availableLatestBidCloseDate) {
      return '기간보다 짧습니다.';
    }
-    $this->info->detail->availableLatestBidCloseTick = $tick;
+    $this->info->detail->availableLatestBidCloseDate = $date;
    return null;
  }

-  public function extendCloseTick(int $tick, bool $force = false): ?string
+  public function extendCloseDate(DateTimeInterface $date, bool $force = false): ?string
  {
    if (!$force) {
      if ($this->info->detail->remainCloseDateExtensionCnt === null) {
@@ -188,11 +193,12 @@ abstract class Auction
      }
    }

-    if ($tick < $this->info->closeTick) {
+    if ($date < $this->info->closeDate) {
      return '종료 기간보다 짧습니다.';
    }

-    $this->info->closeTick = $tick;
+    $closeDate = DateTimeImmutable::createFromInterface($date);
+    $this->info->closeDate = $closeDate;
    return null;
  }

@@ -239,13 +245,12 @@ abstract class Auction

    //TODO: 전역 알림이 나타나야한다. 일반 메시지보다는 중요하고, 메시지보단 약하게..
    //TODO: 바로가기를 제공하는 편이 좋을 것 같다.
-    $clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
    $msg = new Message(
      MessageType::private,
      $src,
      $dest,
      $reason,
-      DateTime::createFromImmutable($clock->tickToDateTime($clock->nowTick())),
+      new DateTime(),
      new DateTime('9999-12-31'),
      []
    );
@@ -270,12 +275,7 @@ abstract class Auction
    $db->update('ng_auction', $this->info->toArray('id'), 'id = %i', $this->info->id);
  }

-  private function bidInheritPoint(
-    int $amount,
-    int $nowTick,
-    \DateTimeImmutable $nowDate,
-    bool $tryExtendCloseDate,
-  ): ?string
+  private function bidInheritPoint(int $amount, \DateTimeImmutable $now, bool $tryExtendCloseDate): ?string
  {
    $db = DB::db();

@@ -311,7 +311,7 @@ abstract class Auction
      $general->getVar('owner'),
      $general->getID(),
      $amount,
-      $nowDate,
+      $now,
      new AuctionBidItemData(
        $general->getVar('owner_name'),
        $obfuscatedName,
@@ -324,16 +324,15 @@ abstract class Auction
    }

    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $clock = GameClock::fromStorage($gameStor);
    $turnTerm = $gameStor->getValue('turnterm');

-    if ($this->info->detail->availableLatestBidCloseTick !== null) {
-      $extendedCloseTick = $nowTick + $clock->ticksFromMinutes(
-        max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID)
-      );
+    if ($this->info->detail->availableLatestBidCloseDate !== null) {
+      $extendedCloseDate = $now->add(TimeUtil::secondsToDateInterval(
+        max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID) * 60
+      ));

-      if ($extendedCloseTick > $this->info->closeTick && $this->info->closeTick < $this->info->detail->availableLatestBidCloseTick) {
-        $this->extendCloseTick(min($extendedCloseTick, $this->info->detail->availableLatestBidCloseTick), true);
+      if ($extendedCloseDate > $this->info->closeDate && $this->info->closeDate < $this->info->detail->availableLatestBidCloseDate) {
+        $this->extendCloseDate(min($extendedCloseDate, $this->info->detail->availableLatestBidCloseDate), true);
        $this->applyDB();
      }
    }
@@ -357,16 +356,12 @@ abstract class Auction
      return '경매가 이미 끝났습니다.';
    }

-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $clock = GameClock::fromStorage($gameStor);
-    $nowTick = $clock->nowTick();
-    $nowDate = $clock->tickToDateTime($nowTick);
+    $now = new \DateTimeImmutable();

-    if ($auctionInfo->closeTick < $nowTick) {
+    if ($auctionInfo->closeDate < $now) {
      return '경매가 이미 끝났습니다.';
    }
-    if ($auctionInfo->openTick > $nowTick) {
+    if ($auctionInfo->openDate > $now) {
      return '경매가 아직 시작되지 않았습니다.';
    }

@@ -382,11 +377,13 @@ abstract class Auction


    if ($auctionInfo->reqResource === ResourceType::inheritancePoint) {
-      return $this->bidInheritPoint($amount, $nowTick, $nowDate, $tryExtendCloseDate);
+      return $this->bidInheritPoint($amount, $now, $tryExtendCloseDate);
    }

    //reqResource는 말 그대로 '구매자가 내야하는 자원'이다.

+    $db = DB::db();
+
    $highestBid = $this->getHighestBid();
    if (!$auctionInfo->detail->isReverse) {
      if ($highestBid !== null && $amount <= $highestBid->amount) {
@@ -424,7 +421,7 @@ abstract class Auction
      $general->getVar('owner'),
      $general->getID(),
      $amount,
-      $nowDate,
+      $now,
      new AuctionBidItemData(
        $general->getVar('owner_name'),
        $general->getName(),
@@ -439,13 +436,14 @@ abstract class Auction

    $general->increaseVar($resType->value, -$morePoint);

+    $gameStor = KVStorage::getStorage($db, 'game_env');
    $turnTerm = $gameStor->getValue('turnterm');
-    $extendedCloseTick = $nowTick + $clock->ticksFromMinutes(
-      max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID)
-    );
+    $extendedCloseDate = $now->add(TimeUtil::secondsToDateInterval(
+      max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID) * 60
+    ));

-    if ($extendedCloseTick > $this->info->closeTick) {
-      $this->extendCloseTick($extendedCloseTick, true);
+    if ($extendedCloseDate > $this->info->closeDate) {
+      $this->extendCloseDate($extendedCloseDate, true);
      $this->applyDB();
    }

@@ -458,10 +456,10 @@ abstract class Auction

  public function tryFinish(): ?bool
  {
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $clock = GameClock::fromStorage($gameStor);
-    if ($clock->nowTick() < $this->info->closeTick) return null;
+    $now = new DateTimeImmutable();
+    if ($now < $this->info->closeDate) {
+      return null;
+    }

    //경매를 닫아야한다.
    $highestBid = $this->getHighestBid();
@@ -471,15 +469,17 @@ abstract class Auction
    }

    if ($highestBid->aux->tryExtendCloseDate) {
+      $db = DB::db();
+      $gameStor = KVStorage::getStorage($db, 'game_env');
      $turnTerm = $gameStor->getValue('turnterm');

      //연장 요청이 있었다.
-      $extendedCloseTick = $this->info->closeTick + $clock->ticksFromMinutes(
-        max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_BY_EXTENSION_QUERY)
-      );
+      $extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
+        max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_BY_EXTENSION_QUERY) * 60
+      ));

-      if ($this->extendCloseTick($extendedCloseTick) === null) {
-        $this->extendLatestBidCloseTick(null);
+      if ($this->extendCloseDate($extendedCloseDate) === null) {
+        $this->extendLatestBidCloseDate(null);
        $this->applyDB();
        return false;
      }
@@ -509,13 +509,12 @@ abstract class Auction

    //TODO: 전역 알림이 나타나야한다. 일반 메시지보다는 중요하고, 메시지보단 약하게..
    //TODO: 바로가기를 제공하는 편이 좋을 것 같다.
-    $clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
    $msg = new Message(
      MessageType::private,
      $src,
      $dest,
      $failReason,
-      DateTime::createFromImmutable($clock->tickToDateTime($clock->nowTick())),
+      new \DateTime(),
      new \DateTime('9999-12-31'),
      []
    );
@@ -56,11 +56,10 @@ abstract class AuctionBasicResource extends Auction
    }


+    $now = new \DateTimeImmutable();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $clock = GameClock::fromStorage($gameStor);
-    $nowTick = $clock->nowTick();
    $turnTerm = $gameStor->getValue('turnterm');
-    $closeTick = $nowTick + GameClock::TICKS_PER_TURN * $closeTurnCnt;
+    $closeDate = $now->add(TimeUtil::secondsToDateInterval($closeTurnCnt * $turnTerm * 60));

    $openResult = static::openAuction(new AuctionInfo(
      null,
@@ -69,8 +68,8 @@ abstract class AuctionBasicResource extends Auction
      "$amount",
      $general->getId(),
      $bidderRes,
-      $nowTick,
-      $closeTick,
+      $now,
+      $closeDate,
      new AuctionInfoDetail(
        "{$hostResName} {$amount} 경매",
        $general->getName(),
@@ -146,13 +145,12 @@ abstract class AuctionBasicResource extends Auction

    //TODO: 전역 알림이 나타나야한다. 일반 메시지보다는 중요하고, 메시지보단 약하게..
    //TODO: 바로가기를 제공하는 편이 좋을 것 같다.
-    $clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
    $msg = new Message(
      MessageType::private,
      $src,
      $dest,
      "{$this->auctionID}번 {$hostResName} 경매에 입찰이 없어 취소되었습니다.",
-      \DateTime::createFromImmutable($clock->tickToDateTime($clock->nowTick())),
+      new \DateTime(),
      new \DateTime('9999-12-31'),
      []
    );
@@ -248,8 +246,8 @@ abstract class AuctionBasicResource extends Auction
      $db = DB::db();
      $gameStor = KVStorage::getStorage($db, 'game_env');
      $turnTerm = $gameStor->getValue('turnterm');
-      $clock = GameClock::fromStorage($gameStor);
-      $this->shrinkCloseTick($clock->nowTick() + GameClock::TICKS_PER_TURN);
+      $date = (new DateTimeImmutable())->add(TimeUtil::secondsToDateInterval($turnTerm * 60));
+      $this->shrinkCloseDate($date);
    }

    return null;
@@ -72,15 +72,16 @@ class AuctionUniqueItem extends Auction

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

+    $now = new DateTimeImmutable();
+
    [$turnTerm, $year, $month] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month']);
-    $clock = GameClock::fromStorage($gameStor);
-    $nowTick = $clock->nowTick();
-    $closeTick = $nowTick + $clock->ticksFromMinutes(
-      max(static::MIN_AUCTION_CLOSE_MINUTES, $turnTerm * static::COEFF_AUCTION_CLOSE_MINUTES)
-    );
-    $availableLatestBidCloseTick = $closeTick + $clock->ticksFromMinutes(
-      max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID)
-    );
+
+    $closeDate = $now->add(TimeUtil::secondsToDateInterval(
+      max(static::MIN_AUCTION_CLOSE_MINUTES, $turnTerm * static::COEFF_AUCTION_CLOSE_MINUTES) * 60
+    ));
+    $availableLatestBidCloseDate = $closeDate->add(TimeUtil::secondsToDateInterval(
+      max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID) * 60
+    ));

    $info = new AuctionInfo(
      null,
@@ -89,8 +90,8 @@ class AuctionUniqueItem extends Auction
      $itemKey,
      $general->getID(),
      ResourceType::inheritancePoint,
-      $nowTick,
-      $closeTick,
+      $now,
+      $closeDate,
      new AuctionInfoDetail(
        "{$item->getName()} 경매",
        static::genObfuscatedName($general->getID()),
@@ -99,7 +100,7 @@ class AuctionUniqueItem extends Auction
        $startAmount,
        null,
        1,
-        $availableLatestBidCloseTick,
+        $availableLatestBidCloseDate,
      )
    );

@@ -266,22 +267,21 @@ class AuctionUniqueItem extends Auction

    if ($availableEquipUniqueCnt <= 0) {
      $turnTerm = $gameStor->getValue('turnterm');
-      $clock = GameClock::fromStorage($gameStor);
      //제한에 걸렸다면 자동 연장
-      $extendedCloseTick = $this->info->closeTick + $clock->ticksFromMinutes(
-        max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_UNIQUE_CNT)
-      );
+      $extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
+        max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_UNIQUE_CNT) * 60
+      ));

      if($bidder->getID() != $this->info->hostGeneralID){
        $this->setHostAsNeutral();
      }
-      $this->extendCloseTick($extendedCloseTick, true);
-      $this->extendLatestBidCloseTick(null);
+      $this->extendCloseDate($extendedCloseDate, true);
+      $this->extendLatestBidCloseDate(null);
      $this->applyDB();
      return '유니크 아이템 소유 제한 상태입니다. 종료 시간이 연장됩니다.';
    }

-    $isExtendCloseTickRequired = false;
+    $isExtendCloseDateRequired = false;
    foreach (GameConst::$allItems as $itemType => $itemList) {
      //아직은 그런 경우는 없지만 동일 유니크를 여러 부위에 장착할 수 있을지도 모름
      if (!key_exists($itemKey, $itemList)) {
@@ -291,13 +291,13 @@ class AuctionUniqueItem extends Auction
      $ownItem = $general->getItem($itemType);
      if ($ownItem->getRawClassName() == $itemKey) {
        //FIXME: 이 경우에는 환불이 되던가 해야함.
-        $isExtendCloseTickRequired = true;
+        $isExtendCloseDateRequired = true;
        $reasons[] = '이미 그 유니크를 가지고 있습니다.';
        continue;
      }

      if (!$ownItem->isBuyable()) {
-        $isExtendCloseTickRequired = true;
+        $isExtendCloseDateRequired = true;
        $reasons[] = '이미 다른 유니크를 가지고 있습니다.';
        continue;
      }
@@ -313,19 +313,18 @@ class AuctionUniqueItem extends Auction
    }

    if (!$availableItemTypes) {
-      if ($isExtendCloseTickRequired) {
+      if ($isExtendCloseDateRequired) {
        $turnTerm = $gameStor->getValue('turnterm');
-        $clock = GameClock::fromStorage($gameStor);
        //동일 부위 제한에 걸렸다면 자동 연장
-        $extendedCloseTick = $this->info->closeTick + $clock->ticksFromMinutes(
-          max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID)
-        );
+        $extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
+          max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID) * 60
+        ));

        if($bidder->getID() != $this->info->hostGeneralID){
          $this->setHostAsNeutral();
        }
-        $this->extendCloseTick($extendedCloseTick, true);
-        $this->extendLatestBidCloseTick(null);
+        $this->extendCloseDate($extendedCloseDate, true);
+        $this->extendLatestBidCloseDate(null);
        $this->applyDB();
      }
      return join(' ', $reasons);
@@ -1,640 +0,0 @@
-<?php
-
-namespace sammo;
-
-use sammo\Scenario\GeneralBuilder;
-
-final class CentennialAllStarGrowthService
-{
-    public const POOL_CLASS = 'SPoolUnderU100';
-    public const AUX_KEY = 'event100_allstar';
-    public const TRAIT_UNLOCK_PROGRESS = 0.4;
-    public const NPC_PROGRESS_MULTIPLIER = 0.9;
-
-    private const STAT_KEYS = ['leadership', 'strength', 'intel'];
-    private const DEX_KEYS = ['dex1', 'dex2', 'dex3', 'dex4', 'dex5'];
-
-    public static function isActive(): bool
-    {
-        return GameConst::$targetGeneralPool === self::POOL_CLASS;
-    }
-
-    public static function isStatResetAllowed(): bool
-    {
-        return !self::isActive();
-    }
-
-    public static function initialAux(array $targetInfo, ?array $userInitialStats = null): array
-    {
-        $granted = array_fill_keys(array_merge(self::STAT_KEYS, self::DEX_KEYS), 0);
-        if ($userInitialStats !== null) {
-            foreach (self::STAT_KEYS as $key) {
-                $initial = (int) ($userInitialStats[$key] ?? GameConst::$defaultStatMin);
-                $granted[$key] = max(0, $initial - min($initial, GameConst::$defaultStatMin));
-            }
-        }
-
-        return [
-            'targetId' => (string) ($targetInfo['uniqueName'] ?? ''),
-            'granted' => $granted,
-            'dexConsumed' => array_fill_keys(self::DEX_KEYS, 0),
-            'dexFloor' => array_fill_keys(self::DEX_KEYS, 0),
-            'progressMonth' => -1,
-            'milestone' => 0,
-            'naturalSpecialDomestic' => null,
-            'eventSpecialDomestic' => null,
-            'userInitialStats' => $userInitialStats,
-            'dexTargetRatio' => 1.0,
-        ];
-    }
-
-    public static function attachInitialTarget(GeneralBuilder $builder, array $targetInfo): void
-    {
-        $builder->setAuxVar(self::AUX_KEY, self::initialAux($targetInfo));
-    }
-
-    /**
-     * Builds an ordinary-user stat total while preserving the selected
-     * candidate's relative strengths as closely as integer stats allow.
-     *
-     * @return array{leadership:int,strength:int,intel:int}
-     */
-    public static function calculateUserInitialStats(array $targetInfo): array
-    {
-        $targets = [];
-        $bases = [];
-        foreach (self::STAT_KEYS as $key) {
-            $target = min(
-                GameConst::$defaultStatMax,
-                max(0, (int) ($targetInfo[$key] ?? 0))
-            );
-            $targets[$key] = $target;
-            $bases[$key] = min($target, GameConst::$defaultStatMin);
-        }
-
-        $targetTotal = array_sum($targets);
-        $desiredTotal = min(GameConst::$defaultStatTotal, $targetTotal);
-        $baseTotal = array_sum($bases);
-        $capacityTotal = $targetTotal - $baseTotal;
-        if ($capacityTotal <= 0 || $desiredTotal <= $baseTotal) {
-            return $bases;
-        }
-
-        $ratio = ($desiredTotal - $baseTotal) / $capacityTotal;
-        $result = [];
-        $fractions = [];
-        foreach (self::STAT_KEYS as $idx => $key) {
-            $raw = $bases[$key] + ($targets[$key] - $bases[$key]) * $ratio;
-            $result[$key] = (int) floor($raw);
-            $fractions[] = [
-                'key' => $key,
-                'fraction' => $raw - $result[$key],
-                'order' => $idx,
-            ];
-        }
-
-        usort($fractions, static function (array $lhs, array $rhs): int {
-            $fractionOrder = $rhs['fraction'] <=> $lhs['fraction'];
-            return $fractionOrder !== 0 ? $fractionOrder : $lhs['order'] <=> $rhs['order'];
-        });
-        $remainder = $desiredTotal - array_sum($result);
-        foreach ($fractions as $fraction) {
-            if ($remainder <= 0) {
-                break;
-            }
-            $key = $fraction['key'];
-            if ($result[$key] >= $targets[$key]) {
-                continue;
-            }
-            $result[$key]++;
-            $remainder--;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the event stat baseline that a newly selected target receives at
-     * the supplied game date. Organic growth can still leave the actual stat
-     * above this baseline.
-     *
-     * @return array{leadership:int,strength:int,intel:int}
-     */
-    public static function calculateUserCurrentTargetStats(
-        array $targetInfo,
-        array $env
-    ): array {
-        $initialStats = self::calculateUserInitialStats($targetInfo);
-        $progress = self::calculateProgress(
-            (int) $env['startyear'],
-            (int) $env['year'],
-            (int) $env['month']
-        );
-        $result = [];
-        foreach (self::STAT_KEYS as $key) {
-            $target = min(
-                GameConst::$maxLevel,
-                max(0, (int) ($targetInfo[$key] ?? 0))
-            );
-            $result[$key] = max(
-                $initialStats[$key],
-                CentennialAllStarGrowth::statFloor(
-                    $target,
-                    GameConst::$defaultStatMin,
-                    $progress
-                )
-            );
-        }
-        return $result;
-    }
-
-    public static function prepareInitialUser(
-        GeneralBuilder $builder,
-        array $targetInfo
-    ): void {
-        $initialStats = self::calculateUserInitialStats($targetInfo);
-        $builder->setStat(
-            $initialStats['leadership'],
-            $initialStats['strength'],
-            $initialStats['intel']
-        );
-        $builder->setAuxVar(
-            self::AUX_KEY,
-            self::initialAux($targetInfo, $initialStats)
-        );
-    }
-
-    /**
-     * Old 100th-season characters did not distinguish their form-entered
-     * initial stats from organic growth. Before their first reselection, treat
-     * the ordinary creation range as the replaceable initial allocation.
-     */
-    public static function prepareLegacyUserReselection(General $general): void
-    {
-        $aux = $general->getAuxVar(self::AUX_KEY);
-        if (!is_array($aux) || is_array($aux['userInitialStats'] ?? null)) {
-            return;
-        }
-
-        $granted = is_array($aux['granted'] ?? null)
-            ? $aux['granted']
-            : array_fill_keys(array_merge(self::STAT_KEYS, self::DEX_KEYS), 0);
-        $legacyInitialStats = [];
-        foreach (self::STAT_KEYS as $key) {
-            $current = (int) $general->getVar($key);
-            $granted[$key] = self::calculateLegacyUserGrant(
-                $current,
-                (int) ($granted[$key] ?? 0)
-            );
-            $beforeEventGrant = max(
-                0,
-                $current - max(0, (int) ($aux['granted'][$key] ?? 0))
-            );
-            $legacyInitialStats[$key] = min(
-                $beforeEventGrant,
-                GameConst::$defaultStatMax
-            );
-        }
-        $aux['granted'] = $granted;
-        $aux['userInitialStats'] = $legacyInitialStats;
-        $general->setAuxVar(self::AUX_KEY, $aux);
-    }
-
-    public static function calculateLegacyUserGrant(int $current, int $eventGrant): int
-    {
-        $eventGrant = max(0, $eventGrant);
-        $beforeEventGrant = max(0, $current - $eventGrant);
-        $replaceableInitialGrant = max(
-            0,
-            min($beforeEventGrant, GameConst::$defaultStatMax)
-                - min($beforeEventGrant, GameConst::$defaultStatMin)
-        );
-        return $eventGrant + $replaceableInitialGrant;
-    }
-
-    public static function calculateProgress(
-        int $startYear,
-        int $year,
-        int $month,
-        float $progressMultiplier = 1.0
-    ): float {
-        if ($progressMultiplier < 0 || $progressMultiplier > 1) {
-            throw new \InvalidArgumentException('progress multiplier must be between 0 and 1');
-        }
-        return min(
-            1,
-            CentennialAllStarGrowth::progress($startYear, $year, $month)
-                * $progressMultiplier
-        );
-    }
-
-    public static function calculateDexTargetFloor(
-        int $target,
-        array $env,
-        float $targetRatio = 1.0
-    ): int {
-        if ($targetRatio < 0 || $targetRatio > 1) {
-            throw new \InvalidArgumentException('dex target ratio must be between 0 and 1');
-        }
-        $target = min(GameConst::$dexLimit, max(0, $target));
-        $scaledTarget = (int) floor($target * $targetRatio);
-        $progress = self::calculateProgress(
-            (int) $env['startyear'],
-            (int) $env['year'],
-            (int) $env['month']
-        );
-        return CentennialAllStarGrowth::dexFloor($scaledTarget, $progress);
-    }
-
-    /**
-     * Mutates the General object but leaves persistence to the caller.
-     *
-     * @return array{progress:float,milestone:int,previousMilestone:int,targetChanged:bool,changed:bool}
-     */
-    public static function applyTarget(
-        General $general,
-        array $targetInfo,
-        array $env,
-        float $progressMultiplier = 1.0,
-        float $dexTargetRatio = 1.0
-    ): array
-    {
-        $startYear = (int) $env['startyear'];
-        $year = (int) $env['year'];
-        $month = (int) $env['month'];
-        $progress = self::calculateProgress(
-            $startYear,
-            $year,
-            $month,
-            $progressMultiplier
-        );
-        $progressMonth = (int) floor(
-            max(0, ($year - $startYear) * 12 + $month - 1)
-                * $progressMultiplier
-        );
-        $targetId = (string) ($targetInfo['uniqueName'] ?? '');
-
-        $aux = $general->getAuxVar(self::AUX_KEY);
-        if (!is_array($aux)) {
-            $aux = self::initialAux($targetInfo);
-        }
-        $granted = is_array($aux['granted'] ?? null)
-            ? $aux['granted']
-            : array_fill_keys(array_merge(self::STAT_KEYS, self::DEX_KEYS), 0);
-        $targetChanged = ($aux['targetId'] ?? '') !== $targetId;
-        $dexConsumed = is_array($aux['dexConsumed'] ?? null)
-            ? $aux['dexConsumed']
-            : array_fill_keys(self::DEX_KEYS, 0);
-        if ($targetChanged) {
-            $dexConsumed = array_fill_keys(self::DEX_KEYS, 0);
-        }
-        $dexFloor = is_array($aux['dexFloor'] ?? null)
-            ? $aux['dexFloor']
-            : array_fill_keys(self::DEX_KEYS, 0);
-        $isUserTarget = is_array($aux['userInitialStats'] ?? null);
-        $nextUserInitialStats = $targetChanged && $isUserTarget
-            ? self::calculateUserInitialStats($targetInfo)
-            : ($aux['userInitialStats'] ?? null);
-        $previousDexTargetRatio = is_numeric($aux['dexTargetRatio'] ?? null)
-            ? (float) $aux['dexTargetRatio']
-            : 1.0;
-        $dexTargetRatioChanged = $previousDexTargetRatio !== $dexTargetRatio;
-        $userCurrentTargetStats = $isUserTarget
-            ? self::calculateUserCurrentTargetStats($targetInfo, $env)
-            : null;
-        $changed = $dexTargetRatioChanged;
-
-        foreach (self::STAT_KEYS as $key) {
-            if (!array_key_exists($key, $targetInfo)) {
-                continue;
-            }
-            $target = min(GameConst::$maxLevel, max(0, (int) $targetInfo[$key]));
-            $floor = CentennialAllStarGrowth::statFloor(
-                $target,
-                GameConst::$defaultStatMin,
-                $progress
-            );
-            if ($userCurrentTargetStats !== null) {
-                $floor = $userCurrentTargetStats[$key];
-            }
-            $current = (int) $general->getVar($key);
-            if ($targetChanged) {
-                $result = CentennialAllStarGrowth::replaceTarget(
-                    $current,
-                    (int) ($granted[$key] ?? 0),
-                    $floor
-                );
-            } else {
-                $result = CentennialAllStarGrowth::advance(
-                    $current,
-                    (int) ($granted[$key] ?? 0),
-                    $floor
-                );
-            }
-            if ($result['value'] !== $current) {
-                $general->updateVar($key, $result['value']);
-                $changed = true;
-            }
-            $granted[$key] = $result['granted'];
-        }
-
-        $targetDex = $targetInfo['dex'] ?? [];
-        foreach (self::DEX_KEYS as $idx => $key) {
-            if (!array_key_exists($idx, $targetDex)) {
-                continue;
-            }
-            $floor = max(
-                0,
-                self::calculateDexTargetFloor(
-                    (int) $targetDex[$idx],
-                    $env,
-                    $dexTargetRatio
-                ) - max(0, (int) ($dexConsumed[$key] ?? 0))
-            );
-            $dexFloor[$key] = $floor;
-            $current = (int) $general->getVar($key);
-            if ($targetChanged || $dexTargetRatioChanged) {
-                $result = CentennialAllStarGrowth::replaceTarget(
-                    $current,
-                    (int) ($granted[$key] ?? 0),
-                    $floor
-                );
-            } else {
-                $result = CentennialAllStarGrowth::advance(
-                    $current,
-                    (int) ($granted[$key] ?? 0),
-                    $floor
-                );
-            }
-            if ($result['value'] !== $current) {
-                $general->updateVar($key, $result['value']);
-                $changed = true;
-            }
-            $granted[$key] = $result['granted'];
-        }
-
-        $oldEventSpecial = $aux['eventSpecialDomestic'] ?? null;
-        if ($targetChanged && $oldEventSpecial !== null
-            && $general->getVar('special') === $oldEventSpecial
-        ) {
-            $general->updateVar(
-                'special',
-                $aux['naturalSpecialDomestic'] ?? GameConst::$defaultSpecialDomestic
-            );
-            $changed = true;
-            $aux['eventSpecialDomestic'] = null;
-        }
-
-        $targetSpecial = $targetInfo['specialDomestic'] ?? null;
-        if ($progress >= self::TRAIT_UNLOCK_PROGRESS && is_string($targetSpecial) && $targetSpecial !== '') {
-            if (($aux['naturalSpecialDomestic'] ?? null) === null) {
-                $aux['naturalSpecialDomestic'] = $general->getVar('special');
-            }
-            if ($general->getVar('special') !== $targetSpecial) {
-                $general->updateVar('special', $targetSpecial);
-                $changed = true;
-            }
-            $aux['eventSpecialDomestic'] = $targetSpecial;
-        }
-
-        $previousMilestone = (int) ($aux['milestone'] ?? 0);
-        $milestone = min(5, (int) floor($progress * 5 + 0.0000001));
-        $aux['targetId'] = $targetId;
-        $aux['granted'] = $granted;
-        $aux['dexConsumed'] = $dexConsumed;
-        $aux['dexFloor'] = $dexFloor;
-        $aux['progressMonth'] = max((int) ($aux['progressMonth'] ?? -1), $progressMonth);
-        $aux['milestone'] = max($previousMilestone, $milestone);
-        $aux['userInitialStats'] = $nextUserInitialStats;
-        $aux['dexTargetRatio'] = $dexTargetRatio;
-        $general->setAuxVar(self::AUX_KEY, $aux);
-
-        return [
-            'progress' => $progress,
-            'milestone' => $milestone,
-            'previousMilestone' => $previousMilestone,
-            'targetChanged' => $targetChanged,
-            'changed' => $changed || $targetChanged || $milestone > $previousMilestone,
-        ];
-    }
-
-    public static function progressMultiplierFor(General $general): float
-    {
-        return self::progressMultiplierForNPCType($general->getNPCType());
-    }
-
-    public static function progressMultiplierForNPCType(int $npcType): float
-    {
-        return in_array($npcType, [3, 4], true)
-            ? self::NPC_PROGRESS_MULTIPLIER
-            : 1.0;
-    }
-
-    public static function dexTargetRatioForNPCType(int $npcType): float
-    {
-        return in_array($npcType, [3, 4], true)
-            ? GameConst::$centennialNpcDexTargetRatio
-            : 1.0;
-    }
-
-    public static function applyCurrentTargetToBuiltNPC(
-        \MeekroDB $db,
-        GeneralBuilder $builder,
-        array $targetInfo,
-        array $env
-    ): ?array {
-        if (!self::isActive()) {
-            return null;
-        }
-
-        $general = General::createObjFromDB($builder->getGeneralID());
-        if (!in_array($general->getNPCType(), [3, 4], true)) {
-            return null;
-        }
-        self::initializeGeneratedNPC($general, $targetInfo);
-        $result = self::applyTarget(
-            $general,
-            $targetInfo,
-            $env,
-            self::NPC_PROGRESS_MULTIPLIER,
-            GameConst::$centennialNpcDexTargetRatio
-        );
-        $general->applyDB($db);
-        return $result;
-    }
-
-    /**
-     * Keeps the ordinary M/G-general stat total while aligning its strong,
-     * middle, and weak stats with the selected all-star target. The target's
-     * creation-date growth floor is applied immediately afterwards.
-     */
-    public static function initializeGeneratedNPC(
-        General $general,
-        array $targetInfo
-    ): void {
-        $generatedStats = [];
-        foreach (self::STAT_KEYS as $key) {
-            $generatedStats[$key] = (int) $general->getVar($key);
-        }
-        $initialStats = self::calculateGeneratedNPCInitialStats(
-            $targetInfo,
-            $generatedStats
-        );
-        foreach (self::STAT_KEYS as $key) {
-            $general->updateVar($key, $initialStats[$key]);
-        }
-        foreach (self::DEX_KEYS as $key) {
-            $general->updateVar($key, 0);
-        }
-        $general->setAuxVar(self::AUX_KEY, self::initialAux($targetInfo));
-    }
-
-    /**
-     * @param array<string, mixed> $targetInfo
-     * @param array{leadership:int,strength:int,intel:int} $generatedStats
-     * @return array{leadership:int,strength:int,intel:int}
-     */
-    public static function calculateGeneratedNPCInitialStats(
-        array $targetInfo,
-        array $generatedStats
-    ): array {
-        $targetOrder = self::STAT_KEYS;
-        $keyOrder = array_flip(self::STAT_KEYS);
-        usort(
-            $targetOrder,
-            static function (string $lhs, string $rhs) use ($targetInfo, $keyOrder): int {
-                $targetCompare = (int) ($targetInfo[$rhs] ?? 0)
-                    <=> (int) ($targetInfo[$lhs] ?? 0);
-                return $targetCompare !== 0
-                    ? $targetCompare
-                    : $keyOrder[$lhs] <=> $keyOrder[$rhs];
-            }
-        );
-
-        $generatedValues = array_map(
-            static fn (string $key): int => (int) ($generatedStats[$key] ?? 0),
-            self::STAT_KEYS
-        );
-        rsort($generatedValues, SORT_NUMERIC);
-
-        $result = array_fill_keys(self::STAT_KEYS, 0);
-        foreach ($targetOrder as $idx => $key) {
-            $result[$key] = $generatedValues[$idx];
-        }
-        return $result;
-    }
-
-    /**
-     * Moves the event-backed part of a dex conversion with the converted
-     * value and consumes any guaranteed floor crossed by the source value.
-     * This keeps the monthly floor from refilling points already converted.
-     */
-    public static function reconcileDexConversion(
-        General $general,
-        string $sourceKey,
-        string $destinationKey,
-        int $sourceBefore,
-        int $sourceAfter,
-        int $destinationBefore,
-        int $destinationAfter,
-        float $convertCoeff
-    ): void {
-        if (!in_array($sourceKey, self::DEX_KEYS, true)
-            || !in_array($destinationKey, self::DEX_KEYS, true)
-            || $sourceKey === $destinationKey
-        ) {
-            throw new \InvalidArgumentException('invalid dex conversion keys');
-        }
-        if ($convertCoeff < 0 || $convertCoeff > 1) {
-            throw new \InvalidArgumentException('dex conversion coefficient must be between 0 and 1');
-        }
-
-        $sourceDecrease = max(0, $sourceBefore - $sourceAfter);
-        $destinationIncrease = max(0, $destinationAfter - $destinationBefore);
-        if ($sourceDecrease === 0 && $destinationIncrease === 0) {
-            return;
-        }
-
-        $aux = $general->getAuxVar(self::AUX_KEY);
-        if (!is_array($aux)) {
-            return;
-        }
-        $granted = is_array($aux['granted'] ?? null)
-            ? $aux['granted']
-            : array_fill_keys(array_merge(self::STAT_KEYS, self::DEX_KEYS), 0);
-        $dexConsumed = is_array($aux['dexConsumed'] ?? null)
-            ? $aux['dexConsumed']
-            : array_fill_keys(self::DEX_KEYS, 0);
-        $dexFloor = is_array($aux['dexFloor'] ?? null)
-            ? $aux['dexFloor']
-            : [];
-
-        $sourceGrantedBefore = min(
-            max(0, $sourceBefore),
-            max(0, (int) ($granted[$sourceKey] ?? 0))
-        );
-        /*
-         * A dex value can contain both organic and event-backed points. Split
-         * the actual command deltas by their share of the source total instead
-         * of consuming either bucket first. This keeps the combined ownership
-         * stable when conversion and target reselection are interleaved.
-         */
-        $eventGrantRemoved = $sourceBefore > 0
-            ? intdiv($sourceDecrease * $sourceGrantedBefore, $sourceBefore)
-            : 0;
-        $sourceGrantedAfter = max(0, $sourceGrantedBefore - $eventGrantRemoved);
-
-        $destinationGrantedBefore = min(
-            max(0, $destinationBefore),
-            max(0, (int) ($granted[$destinationKey] ?? 0))
-        );
-        $eventGrantTransferred = $sourceBefore > 0
-            ? intdiv($destinationIncrease * $sourceGrantedBefore, $sourceBefore)
-            : 0;
-        $eventGrantTransferred = min(
-            $destinationIncrease,
-            $eventGrantRemoved,
-            $eventGrantTransferred
-        );
-        $granted[$sourceKey] = $sourceGrantedAfter;
-        $granted[$destinationKey] = min(
-            max(0, $destinationAfter),
-            $destinationGrantedBefore + $eventGrantTransferred
-        );
-
-        $sourceFloor = max(
-            0,
-            (int) ($dexFloor[$sourceKey] ?? $sourceBefore)
-        );
-        $gapBefore = max(0, $sourceFloor - $sourceBefore);
-        $gapAfter = max(0, $sourceFloor - $sourceAfter);
-        $dexConsumed[$sourceKey] = max(
-            0,
-            (int) ($dexConsumed[$sourceKey] ?? 0)
-                + max(0, $gapAfter - $gapBefore)
-        );
-
-        $aux['granted'] = $granted;
-        $aux['dexConsumed'] = $dexConsumed;
-        $general->setAuxVar(self::AUX_KEY, $aux);
-    }
-
-    public static function recordableValue(General $general, string $key): int
-    {
-        $aux = $general->getAuxVar(self::AUX_KEY);
-        $granted = is_array($aux) && is_array($aux['granted'] ?? null)
-            ? (int) ($aux['granted'][$key] ?? 0)
-            : 0;
-        return CentennialAllStarGrowth::recordableValue((int) $general->getVar($key), $granted);
-    }
-
-    public static function recordableRawValue(array $general, string $key): int
-    {
-        $aux = Json::decode($general['aux'] ?? '{}');
-        $eventAux = is_array($aux[self::AUX_KEY] ?? null) ? $aux[self::AUX_KEY] : [];
-        $granted = is_array($eventAux['granted'] ?? null)
-            ? (int) ($eventAux['granted'][$key] ?? 0)
-            : 0;
-        return CentennialAllStarGrowth::recordableValue((int) ($general[$key] ?? 0), $granted);
-    }
-}
@@ -5,7 +5,6 @@ use \sammo\{
    Util, JosaUtil, DB,
    General, GameConst,
    ActionLogger,
-    Json,
    LastTurn,
    NotInheritedMethodException,
    RandUtil
@@ -119,7 +118,6 @@ abstract class BaseCommand{
        $nationID = $this->generalObj->getNationID();
        if($nationID == 0){
            $this->nation = $this->generalObj->getStaticNation();
-            $this->nation['aux'] = [];
            return;
        }

@@ -140,8 +138,7 @@ abstract class BaseCommand{
            'gold'=>0,
            'rice'=>2000,
            'tech'=>0,
-            'gennum'=>1,
-            'aux'=>'{}',
+            'gennum'=>1
        ];

        if($this->nation && $this->nation['nation'] === $nationID){
@@ -173,10 +170,6 @@ abstract class BaseCommand{
        else{
            $this->nation = $nation;
        }
-
-        if(is_string($this->nation['aux'] ?? null)){
-            $this->nation['aux'] = Json::decode($this->nation['aux']);
-        }
    }

    protected function setDestGeneral(General $destGeneralObj){
@@ -319,12 +312,12 @@ abstract class BaseCommand{

        $this->generalObj->unpackAux();
        $constraintInput = [
-            'general'=>$this->generalObj,
+            'general'=>$this->generalObj->getRaw(),
            'city'=>$this->city,
            'nation'=>$this->nation,
            'cmd_arg'=>$this->arg,

-            'destGeneral'=>$this->destGeneralObj??null,
+            'destGeneral'=>$this->destGeneralObj?$this->destGeneralObj->getRaw():null,
            'destCity'=>$this->destCity,
            'destNation'=>$this->destNation,
        ];
@@ -353,12 +346,12 @@ abstract class BaseCommand{

        $this->generalObj->unpackAux();
        $constraintInput = [
-            'general'=>$this->generalObj,
+            'general'=>$this->generalObj->getRaw(),
            'city'=>$this->city,
            'nation'=>$this->nation,
            'cmd_arg'=>$this->arg,

-            'destGeneral'=>$this->destGeneralObj??null,
+            'destGeneral'=>$this->destGeneralObj?$this->destGeneralObj->getRaw():null,
            'destCity'=>$this->destCity,
            'destNation'=>$this->destNation,
        ];
@@ -391,12 +384,12 @@ abstract class BaseCommand{

        $this->generalObj->unpackAux();
        $constraintInput = [
-            'general'=>$this->generalObj,
+            'general'=>$this->generalObj->getRaw(),
            'city'=>$this->city,
            'nation'=>$this->nation,
            'cmd_arg'=>$this->arg,

-            'destGeneral'=>$this->destGeneralObj??null,
+            'destGeneral'=>$this->destGeneralObj?$this->destGeneralObj->getRaw():null,
            'destCity'=>$this->destCity,
            'destNation'=>$this->destNation,
        ];
@@ -183,7 +183,7 @@ class che_건국 extends Command\GeneralCommand
        $general->addExperience($exp);
        $general->addDedication($ded);

-        $aux = $this->nation['aux'];
+        $aux = Json::decode($this->nation['aux']) ?? [];
        $aux['can_국기변경'] = 1;

        $db->update('city', [
@@ -181,7 +181,7 @@ class che_랜덤임관 extends Command\GeneralCommand
            if ($notIn) {

                $rawGeneralsCnt = $db->query(
-                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 50000)/(rb.value + 50000)*(CASE WHEN g.`npc` < 2 THEN 1.15 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
+                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 1000)/(rb.value + 1000)*(CASE WHEN g.`npc` < 2 THEN 1.2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
                FROM general AS g
                LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = 'killcrew_person'
                LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = 'deathcrew_person'
@@ -193,7 +193,7 @@ class che_랜덤임관 extends Command\GeneralCommand
                );
            } else {
                $rawGeneralsCnt = $db->query(
-                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 50000)/(rb.value + 50000)*(CASE WHEN g.`npc` < 2 THEN 1.15 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
+                    "SELECT g.`nation`, n.`gennum`, n.name, SUM((ra.value + 100)/(rb.value + 100)*(CASE WHEN g.`npc` < 2 THEN 1.2 ELSE 1 END)*(CASE WHEN g.`leadership` >= 40 THEN g.`leadership` ELSE 0 END)) AS warpower, SUM(SQRT(g.intel * g.strength) * 2 + g.leadership / 2)/5 AS develpower
                FROM general AS g
                LEFT JOIN `rank_data` AS ra ON g.`no` = ra.general_id AND ra.`type` = 'killcrew_person'
                LEFT JOIN `rank_data` AS rb ON g.`no` = rb.general_id AND rb.`type` = 'deathcrew_person'
@@ -208,7 +208,7 @@ class che_랜덤임관 extends Command\GeneralCommand
            foreach ($rawGeneralsCnt as $nation) {
                $calcCnt = $nation['warpower'] + $nation['develpower'];

-                if ($general->getNPCType() < 2 && str_starts_with($nation['name'], 'ⓤ')) {
+                if ($general->getNPCType() < 2 && Util::starts_with($nation['name'], 'ⓤ')) {
                    $calcCnt *= 100;
                }

@@ -194,7 +194,7 @@ class che_무작위건국 extends Command\GeneralCommand
        $general->addExperience($exp);
        $general->addDedication($ded);

-        $aux = $this->nation['aux'];
+        $aux = Json::decode($this->nation['aux']) ?? [];
        $aux['can_국기변경'] = 1;
        $aux['can_무작위수도이전'] = 1;

@@ -14,7 +14,6 @@ use function \sammo\tryUniqueItemLottery;

 use \sammo\Constraint\ConstraintHelper;
 use sammo\StaticEventHandler;
-use sammo\CentennialAllStarGrowthService;

 class che_숙련전환 extends Command\GeneralCommand
 {
@@ -158,7 +157,6 @@ class che_숙련전환 extends Command\GeneralCommand
        $logger = $general->getLogger();

        $srcDex = $general->getVar('dex' . $this->srcArmType);
-        $destDex = $general->getVar('dex' . $this->destArmType);
        $cutDex = Util::toInt($srcDex * static::$decreaseCoeff);
        $cutDexText = number_format($cutDex);
        $addDex = Util::toInt($cutDex * static::$convertCoeff);
@@ -166,19 +164,6 @@ class che_숙련전환 extends Command\GeneralCommand

        $general->increaseVar('dex' . $this->srcArmType, -$cutDex);
        $general->increaseVar('dex' . $this->destArmType, $addDex);
-        // 100기 이벤트 지급분을 목적 숙련으로 옮기고 소비한 성장 하한은 다시 채우지 않는다.
-        if (CentennialAllStarGrowthService::isActive()) {
-            CentennialAllStarGrowthService::reconcileDexConversion(
-                $general,
-                'dex' . $this->srcArmType,
-                'dex' . $this->destArmType,
-                $srcDex,
-                $general->getVar('dex' . $this->srcArmType),
-                $destDex,
-                $general->getVar('dex' . $this->destArmType),
-                static::$convertCoeff
-            );
-        }

        $josaUl = JosaUtil::pick($cutDex, '을');
        $josaRo = JosaUtil::pick($addDex, '로');
@@ -7,7 +7,6 @@ use \sammo\Util;
 use \sammo\JosaUtil;
 use \sammo\General;
 use \sammo\ActionLogger;
-use \sammo\CentennialAllStarGrowthService;
 use \sammo\GameConst;
 use \sammo\LastTurn;
 use \sammo\GameUnitConst;
@@ -191,12 +190,6 @@ class che_인재탐색 extends Command\GeneralCommand
        $newNPC->fillRemainSpecAsRandom($pickTypeList, $avgGen, $env);

        $newNPC->build($this->env);
-        CentennialAllStarGrowthService::applyCurrentTargetToBuiltNPC(
-            $db,
-            $newNPC,
-            $pickedNPC->getInfo(),
-            $this->env
-        );
        $pickedNPC->occupyGeneralName();
        $npcName = $newNPC->getGeneralName();
        $josaRa = JosaUtil::pick($npcName, '라');
@@ -79,7 +79,7 @@ class che_징병 extends Command\GeneralCommand
    protected function init()
    {
        $this->setCity();
-        $this->setNation(['tech', 'aux']);
+        $this->setNation(['tech']);

        $this->minConditionConstraints = [
            ConstraintHelper::NotBeNeutral(),
@@ -281,14 +281,14 @@ class che_징병 extends Command\GeneralCommand

                $crewObj->id = $unit->id;
                /** @var ?\sammo\GameUnitConstraints\ReqTech */
-                $reqTechObj = $unit->reqConstraints['ReqTech'] ?? null;
+                $reqTechObj = $unit->reqConstraints['reqTech'] ?? null;
                $crewObj->reqTech = $reqTechObj ? $reqTechObj->reqTech : 0;

                /** @var ?\sammo\GameUnitConstraint\ReqMinRelYear */
                $reqMinRelYearObj = $unit->reqConstraints['reqMinRelYear'] ?? null;
                $crewObj->reqYear = $reqMinRelYearObj ? $reqMinRelYearObj->reqMinRelYear : 0;

-                $crewObj->notAvailable = !$unit->isValid($general, $ownCities, $ownRegions, $relativeYear, $tech, $this->nation['aux']);
+                $crewObj->notAvailable = !$unit->isValid($general, $ownCities, $ownRegions, $relativeYear, $tech);

                $crewObj->baseRice = $general->onCalcDomestic($this->getName(), 'rice', $unit->riceWithTech($tech), ['armType' => $unit->armType]);
                $crewObj->baseCost = $general->onCalcDomestic($this->getName(), 'cost', $unit->costWithTech($tech), ['armType' => $unit->armType]);
@@ -164,7 +164,7 @@ class che_출병 extends Command\GeneralCommand

        $currDist = 999;

-        $minDist = array_key_first($distanceList);
+        $minDist = Util::array_first_key($distanceList);
        do {
            //1: 최단 거리 도시 중 공격 대상이 있는가 확인
            //2: 최단 거리 + 1 도시 중 공격 대상이 있는가 확인
@@ -180,7 +180,7 @@ class cr_건국 extends Command\GeneralCommand
        $general->addExperience($exp);
        $general->addDedication($ded);

-        $aux = $this->nation['aux'];
+        $aux = Json::decode($this->nation['aux']) ?? [];
        $aux['can_국기변경'] = 1;

        $db->update('city', [
@@ -122,7 +122,7 @@ class che_국기변경 extends Command\NationCommand
        $josaYi = JosaUtil::pick($generalName, '이');
        $josaYiNation = JosaUtil::pick($nationName, '이');

-        $aux = $this->nation['aux'];
+        $aux = Json::decode($this->nation['aux']);
        $aux["can_{$actionName}"] = 0;

        $db->update('nation', [
@@ -140,7 +140,7 @@ class che_국호변경 extends Command\NationCommand
        $josaYi = JosaUtil::pick($generalName, '이');
        $josaYiNation = JosaUtil::pick($nationName, '이');

-        $aux = $this->nation['aux'];
+        $aux = Json::decode($this->nation['aux']);
        $aux["can_{$actionName}"] = 0;

        $db->update('nation', [
@@ -119,7 +119,7 @@ class che_무작위수도이전 extends Command\NationCommand
        $josaYi = JosaUtil::pick($generalName, '이');
        $josaYiNation = JosaUtil::pick($nationName, '이');

-        $aux = $this->nation['aux'];
+        $aux = Json::decode($this->nation['aux']);
        $aux["can_무작위수도이전"] -= 1;

        $db->update('city', [
@@ -159,7 +159,7 @@ class che_발령 extends Command\NationCommand
        $destGeneral->getLogger()->pushGeneralActionLog("<Y>{$generalName}</>에 의해 <G><b>{$destCityName}</b></>{$josaRo} 발령됐습니다. <1>$date</>");

        $yearMonth = Util::joinYearMonth($this->env['year'], $this->env['month']);
-        if (cutTurn($general->getTurnTick(), $this->env['turnterm']) != cutTurn($destGeneral->getTurnTick(), $this->env['turnterm'])) {
+        if (cutTurn($general->getTurnTime(), $this->env['turnterm']) != cutTurn($destGeneral->getTurnTime(), $this->env['turnterm'])) {
            $yearMonth += 1;
        }
        $destGeneral->setAuxVar('last발령', $yearMonth);
@@ -7,7 +7,6 @@ use \sammo\Util;
 use \sammo\JosaUtil;
 use \sammo\General;
 use \sammo\ActionLogger;
-use \sammo\CentennialAllStarGrowthService;
 use \sammo\GameConst;
 use \sammo\LastTurn;
 use \sammo\GameUnitConst;
@@ -161,12 +160,6 @@ class che_의병모집 extends Command\NationCommand
            $newNPC->fillRemainSpecAsRandom($pickTypeList, $avgGen, $env);

            $newNPC->build($this->env);
-            CentennialAllStarGrowthService::applyCurrentTargetToBuiltNPC(
-                $db,
-                $newNPC,
-                $pickedNPC->getInfo(),
-                $this->env
-            );
            $pickedNPC->occupyGeneralName();
        }

@@ -137,7 +137,7 @@ class che_천도 extends Command\NationCommand
        $nationID = $general->getNationID();
        $nationStor = \sammo\KVStorage::getStorage(DB::db(), $nationID, 'nation_env');

-        $nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTick()];
+        $nationStor->last천도Trial = [$general->getVar('officer_level'), $general->getTurnTime()];

        if ($lastTurn->getCommand() != $commandName || $lastTurn->getArg() !== $this->arg) {
            $this->setResultTurn(new LastTurn(
@@ -13,14 +13,12 @@ use \sammo\{
    Message,
    CityConst,
    CityInitialDetail,
-    Json,
    StaticEventHandler
 };

 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Enums\InheritanceKey;
-use sammo\Enums\NationAuxKey;
 use sammo\Event\Action;

 class che_초토화 extends Command\NationCommand{
@@ -54,7 +52,7 @@ class che_초토화 extends Command\NationCommand{
        $env = $this->env;

        $this->setCity();
-        $this->setNation(['surlimit', 'gold', 'rice', 'capital', 'aux']);
+        $this->setNation(['surlimit', 'gold', 'rice', 'capital']);

        $this->minConditionConstraints=[
            ConstraintHelper::OccupiedCity(),
@@ -159,11 +157,6 @@ class che_초토화 extends Command\NationCommand{
        $josaYiNation = JosaUtil::pick($nationName, '이');

        $amount = $this->calcReturnAmount($destCity);
-        $aux = $this->nation['aux'];
-
-        if($destCity['level'] >= 8){
-            $aux[NationAuxKey::did_특성초토화->value] = ($aux[NationAuxKey::did_특성초토화->value] ?? 0) + 1;
-        }

        $db->update('general', [
            'experience'=>$db->sqleval('experience * 0.9')
@@ -191,7 +184,6 @@ class che_초토화 extends Command\NationCommand{
            'gold' => $db->sqleval('gold + %i', $amount),
            'rice' => $db->sqleval('rice + %i', $amount),
            'surlimit' => $db->sqleval('surlimit + %i', $this->getPostReqTurn()),
-            'aux' => Json::encode($aux),
        ], 'nation=%i', $nationID);

        \sammo\refreshNationStaticInfo();
@@ -1,108 +0,0 @@
-<?php
-namespace sammo\Command\Nation;
-
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-use sammo\DB;
-use sammo\Enums\InheritanceKey;
-use sammo\Enums\NationAuxKey;
-use \sammo\Util;
-use \sammo\JosaUtil;
-use sammo\Json;
-use sammo\LastTurn;
-use sammo\StaticEventHandler;
-use sammo\GameConst;
-
-class event_극병연구 extends Command\NationCommand{
-    static protected $actionName = '극병 연구';
-    static protected $auxType = NationAuxKey::can_극병사용;
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation(['gold','rice','aux']);
-        $this->fullConditionConstraints=[];
-
-        $name = static::$actionName;
-
-        [$reqGold, $reqRice] = $this->getCost();
-
-        $this->minConditionConstraints = [
-            ConstraintHelper::OccupiedCity(),
-            ConstraintHelper::BeChief(),
-            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
-            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
-            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
-        ];
-
-        $this->fullConditionConstraints = $this->minConditionConstraints;
-    }
-
-    public function getCommandDetailTitle():string{
-        $name = $this->getName();
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $reqTurn = $this->getPreReqTurn()+1;
-
-        $reqGoldD5 = number_format($reqGold / 10000);
-        $reqRiceD5 = number_format($reqRice / 10000);
-
-        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
-    }
-
-    public function getPreReqTurn():int{
-        return 23;
-    }
-
-    public function getPostReqTurn():int{
-        return 0;
-    }
-
-    public function getCost():array{
-        return [100000, 100000];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if(!$this->hasFullConditionMet()){
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-        
-        $db = DB::db();
-        $general = $this->generalObj;
-        $nationID = $general->getNationID();
-
-        $actionName = static::$actionName;
-        
-        $aux = $this->nation['aux'];
-        $aux[static::$auxType->value] = 1;
-        [$reqGold, $reqRice] = $this->getCost();
-
-        $logger = $general->getLogger();
-
-        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
-        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
-
-        $generalName = $general->getName();
-        $josaYi = JosaUtil::pick($generalName, '이');
-        
-        $db->update('nation', [
-            'gold' => $db->sqleval('gold - %i', $reqGold),
-            'rice' => $db->sqleval('rice - %i', $reqRice),
-            'aux' => Json::encode($aux),
-        ], 'nation=%i', $nationID);
-
-        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
-        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
-        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
-
-        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
-        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
-        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
-        $general->applyDB($db);
-        
-        return true;
-    }
-}
@@ -1,107 +0,0 @@
-<?php
-namespace sammo\Command\Nation;
-
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-use sammo\DB;
-use sammo\Enums\InheritanceKey;
-use sammo\Enums\NationAuxKey;
-use \sammo\Util;
-use \sammo\JosaUtil;
-use sammo\Json;
-use sammo\LastTurn;
-use sammo\StaticEventHandler;
-use sammo\GameConst;
-
-class event_대검병연구 extends Command\NationCommand{
-    static protected $actionName = '대검병 연구';
-    static protected $auxType = NationAuxKey::can_대검병사용;
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation(['gold','rice','aux']);
-        $this->fullConditionConstraints=[];
-
-        $name = static::$actionName;
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $this->minConditionConstraints = [
-            ConstraintHelper::OccupiedCity(),
-            ConstraintHelper::BeChief(),
-            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
-            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
-            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
-        ];
-
-        $this->fullConditionConstraints = $this->minConditionConstraints;
-    }
-
-    public function getCommandDetailTitle():string{
-        $name = $this->getName();
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $reqTurn = $this->getPreReqTurn()+1;
-
-        $reqGoldD5 = number_format($reqGold / 10000);
-        $reqRiceD5 = number_format($reqRice / 10000);
-
-        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
-    }
-
-    public function getPreReqTurn():int{
-        return 11;
-    }
-
-    public function getPostReqTurn():int{
-        return 0;
-    }
-
-    public function getCost():array{
-        return [50000, 50000];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if(!$this->hasFullConditionMet()){
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-        
-        $db = DB::db();
-        $general = $this->generalObj;
-        $nationID = $general->getNationID();
-
-        $actionName = static::$actionName;
-        
-        $aux = $this->nation['aux'];
-        $aux[static::$auxType->value] = 1;
-        [$reqGold, $reqRice] = $this->getCost();
-
-        $logger = $general->getLogger();
-
-        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
-        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
-
-        $generalName = $general->getName();
-        $josaYi = JosaUtil::pick($generalName, '이');
-        
-        $db->update('nation', [
-            'gold' => $db->sqleval('gold - %i', $reqGold),
-            'rice' => $db->sqleval('rice - %i', $reqRice),
-            'aux' => Json::encode($aux),
-        ], 'nation=%i', $nationID);
-
-        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
-        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
-        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
-
-        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
-        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
-        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
-        $general->applyDB($db);
-        
-        return true;
-    }
-}
@@ -1,107 +0,0 @@
-<?php
-namespace sammo\Command\Nation;
-
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-use sammo\DB;
-use sammo\Enums\InheritanceKey;
-use sammo\Enums\NationAuxKey;
-use \sammo\Util;
-use \sammo\JosaUtil;
-use sammo\Json;
-use sammo\LastTurn;
-use sammo\StaticEventHandler;
-use sammo\GameConst;
-
-class event_무희연구 extends Command\NationCommand{
-    static protected $actionName = '무희 연구';
-    static protected $auxType = NationAuxKey::can_무희사용;
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation(['gold','rice','aux']);
-        $this->fullConditionConstraints=[];
-
-        $name = static::$actionName;
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $this->minConditionConstraints = [
-            ConstraintHelper::OccupiedCity(),
-            ConstraintHelper::BeChief(),
-            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
-            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
-            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
-        ];
-
-        $this->fullConditionConstraints = $this->minConditionConstraints;
-    }
-
-    public function getCommandDetailTitle():string{
-        $name = $this->getName();
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $reqTurn = $this->getPreReqTurn()+1;
-
-        $reqGoldD5 = number_format($reqGold / 10000);
-        $reqRiceD5 = number_format($reqRice / 10000);
-
-        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
-    }
-
-    public function getPreReqTurn():int{
-        return 23;
-    }
-
-    public function getPostReqTurn():int{
-        return 0;
-    }
-
-    public function getCost():array{
-        return [100000, 100000];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if(!$this->hasFullConditionMet()){
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-        
-        $db = DB::db();
-        $general = $this->generalObj;
-        $nationID = $general->getNationID();
-
-        $actionName = static::$actionName;
-        
-        $aux = $this->nation['aux'];
-        $aux[static::$auxType->value] = 1;
-        [$reqGold, $reqRice] = $this->getCost();
-
-        $logger = $general->getLogger();
-
-        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
-        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
-
-        $generalName = $general->getName();
-        $josaYi = JosaUtil::pick($generalName, '이');
-        
-        $db->update('nation', [
-            'gold' => $db->sqleval('gold - %i', $reqGold),
-            'rice' => $db->sqleval('rice - %i', $reqRice),
-            'aux' => Json::encode($aux),
-        ], 'nation=%i', $nationID);
-
-        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
-        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
-        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
-
-        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
-        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
-        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
-        $general->applyDB($db);
-        
-        return true;
-    }
-}
@@ -1,107 +0,0 @@
-<?php
-namespace sammo\Command\Nation;
-
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-use sammo\DB;
-use sammo\Enums\InheritanceKey;
-use sammo\Enums\NationAuxKey;
-use \sammo\Util;
-use \sammo\JosaUtil;
-use sammo\Json;
-use sammo\LastTurn;
-use sammo\StaticEventHandler;
-use sammo\GameConst;
-
-class event_산저병연구 extends Command\NationCommand{
-    static protected $actionName = '산저병 연구';
-    static protected $auxType = NationAuxKey::can_산저병사용;
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation(['gold','rice','aux']);
-        $this->fullConditionConstraints=[];
-
-        $name = static::$actionName;
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $this->minConditionConstraints = [
-            ConstraintHelper::OccupiedCity(),
-            ConstraintHelper::BeChief(),
-            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
-            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
-            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
-        ];
-
-        $this->fullConditionConstraints = $this->minConditionConstraints;
-    }
-
-    public function getCommandDetailTitle():string{
-        $name = $this->getName();
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $reqTurn = $this->getPreReqTurn()+1;
-
-        $reqGoldD5 = number_format($reqGold / 10000);
-        $reqRiceD5 = number_format($reqRice / 10000);
-
-        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
-    }
-
-    public function getPreReqTurn():int{
-        return 11;
-    }
-
-    public function getPostReqTurn():int{
-        return 0;
-    }
-
-    public function getCost():array{
-        return [50000, 50000];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if(!$this->hasFullConditionMet()){
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-        
-        $db = DB::db();
-        $general = $this->generalObj;
-        $nationID = $general->getNationID();
-
-        $actionName = static::$actionName;
-        
-        $aux = $this->nation['aux'];
-        $aux[static::$auxType->value] = 1;
-        [$reqGold, $reqRice] = $this->getCost();
-
-        $logger = $general->getLogger();
-
-        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
-        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
-
-        $generalName = $general->getName();
-        $josaYi = JosaUtil::pick($generalName, '이');
-        
-        $db->update('nation', [
-            'gold' => $db->sqleval('gold - %i', $reqGold),
-            'rice' => $db->sqleval('rice - %i', $reqRice),
-            'aux' => Json::encode($aux),
-        ], 'nation=%i', $nationID);
-
-        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
-        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
-        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
-
-        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
-        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
-        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
-        $general->applyDB($db);
-        
-        return true;
-    }
-}
@@ -1,107 +0,0 @@
-<?php
-namespace sammo\Command\Nation;
-
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-use sammo\DB;
-use sammo\Enums\InheritanceKey;
-use sammo\Enums\NationAuxKey;
-use \sammo\Util;
-use \sammo\JosaUtil;
-use sammo\Json;
-use sammo\LastTurn;
-use sammo\StaticEventHandler;
-use sammo\GameConst;
-
-class event_상병연구 extends Command\NationCommand{
-    static protected $actionName = '상병 연구';
-    static protected $auxType = NationAuxKey::can_상병사용;
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation(['gold','rice','aux']);
-        $this->fullConditionConstraints=[];
-
-        $name = static::$actionName;
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $this->minConditionConstraints = [
-            ConstraintHelper::OccupiedCity(),
-            ConstraintHelper::BeChief(),
-            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
-            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
-            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
-        ];
-
-        $this->fullConditionConstraints = $this->minConditionConstraints;
-    }
-
-    public function getCommandDetailTitle():string{
-        $name = $this->getName();
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $reqTurn = $this->getPreReqTurn()+1;
-
-        $reqGoldD5 = number_format($reqGold / 10000);
-        $reqRiceD5 = number_format($reqRice / 10000);
-
-        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
-    }
-
-    public function getPreReqTurn():int{
-        return 23;
-    }
-
-    public function getPostReqTurn():int{
-        return 0;
-    }
-
-    public function getCost():array{
-        return [100000, 100000];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if(!$this->hasFullConditionMet()){
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-        
-        $db = DB::db();
-        $general = $this->generalObj;
-        $nationID = $general->getNationID();
-
-        $actionName = static::$actionName;
-        
-        $aux = $this->nation['aux'];
-        $aux[static::$auxType->value] = 1;
-        [$reqGold, $reqRice] = $this->getCost();
-
-        $logger = $general->getLogger();
-
-        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
-        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
-
-        $generalName = $general->getName();
-        $josaYi = JosaUtil::pick($generalName, '이');
-        
-        $db->update('nation', [
-            'gold' => $db->sqleval('gold - %i', $reqGold),
-            'rice' => $db->sqleval('rice - %i', $reqRice),
-            'aux' => Json::encode($aux),
-        ], 'nation=%i', $nationID);
-
-        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
-        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
-        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
-
-        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
-        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
-        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
-        $general->applyDB($db);
-        
-        return true;
-    }
-}
@@ -1,107 +0,0 @@
-<?php
-namespace sammo\Command\Nation;
-
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-use sammo\DB;
-use sammo\Enums\InheritanceKey;
-use sammo\Enums\NationAuxKey;
-use \sammo\Util;
-use \sammo\JosaUtil;
-use sammo\Json;
-use sammo\LastTurn;
-use sammo\StaticEventHandler;
-use sammo\GameConst;
-
-class event_원융노병연구 extends Command\NationCommand{
-    static protected $actionName = '원융노병 연구';
-    static protected $auxType = NationAuxKey::can_원융노병사용;
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation(['gold','rice','aux']);
-        $this->fullConditionConstraints=[];
-
-        $name = static::$actionName;
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $this->minConditionConstraints = [
-            ConstraintHelper::OccupiedCity(),
-            ConstraintHelper::BeChief(),
-            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
-            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
-            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
-        ];
-
-        $this->fullConditionConstraints = $this->minConditionConstraints;
-    }
-
-    public function getCommandDetailTitle():string{
-        $name = $this->getName();
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $reqTurn = $this->getPreReqTurn()+1;
-
-        $reqGoldD5 = number_format($reqGold / 10000);
-        $reqRiceD5 = number_format($reqRice / 10000);
-
-        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
-    }
-
-    public function getPreReqTurn():int{
-        return 23;
-    }
-
-    public function getPostReqTurn():int{
-        return 0;
-    }
-
-    public function getCost():array{
-        return [100000, 100000];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if(!$this->hasFullConditionMet()){
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-        
-        $db = DB::db();
-        $general = $this->generalObj;
-        $nationID = $general->getNationID();
-
-        $actionName = static::$actionName;
-        
-        $aux = $this->nation['aux'];
-        $aux[static::$auxType->value] = 1;
-        [$reqGold, $reqRice] = $this->getCost();
-
-        $logger = $general->getLogger();
-
-        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
-        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
-
-        $generalName = $general->getName();
-        $josaYi = JosaUtil::pick($generalName, '이');
-        
-        $db->update('nation', [
-            'gold' => $db->sqleval('gold - %i', $reqGold),
-            'rice' => $db->sqleval('rice - %i', $reqRice),
-            'aux' => Json::encode($aux),
-        ], 'nation=%i', $nationID);
-
-        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
-        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
-        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
-
-        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
-        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
-        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
-        $general->applyDB($db);
-        
-        return true;
-    }
-}
@@ -1,107 +0,0 @@
-<?php
-namespace sammo\Command\Nation;
-
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-use sammo\DB;
-use sammo\Enums\InheritanceKey;
-use sammo\Enums\NationAuxKey;
-use \sammo\Util;
-use \sammo\JosaUtil;
-use sammo\Json;
-use sammo\LastTurn;
-use sammo\StaticEventHandler;
-use sammo\GameConst;
-
-class event_음귀병연구 extends Command\NationCommand{
-    static protected $actionName = '음귀병 연구';
-    static protected $auxType = NationAuxKey::can_음귀병사용;
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation(['gold','rice','aux']);
-        $this->fullConditionConstraints=[];
-
-        $name = static::$actionName;
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $this->minConditionConstraints = [
-            ConstraintHelper::OccupiedCity(),
-            ConstraintHelper::BeChief(),
-            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
-            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
-            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
-        ];
-
-        $this->fullConditionConstraints = $this->minConditionConstraints;
-    }
-
-    public function getCommandDetailTitle():string{
-        $name = $this->getName();
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $reqTurn = $this->getPreReqTurn()+1;
-
-        $reqGoldD5 = number_format($reqGold / 10000);
-        $reqRiceD5 = number_format($reqRice / 10000);
-
-        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
-    }
-
-    public function getPreReqTurn():int{
-        return 11;
-    }
-
-    public function getPostReqTurn():int{
-        return 0;
-    }
-
-    public function getCost():array{
-        return [50000, 50000];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if(!$this->hasFullConditionMet()){
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-        
-        $db = DB::db();
-        $general = $this->generalObj;
-        $nationID = $general->getNationID();
-
-        $actionName = static::$actionName;
-        
-        $aux = $this->nation['aux'];
-        $aux[static::$auxType->value] = 1;
-        [$reqGold, $reqRice] = $this->getCost();
-
-        $logger = $general->getLogger();
-
-        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
-        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
-
-        $generalName = $general->getName();
-        $josaYi = JosaUtil::pick($generalName, '이');
-        
-        $db->update('nation', [
-            'gold' => $db->sqleval('gold - %i', $reqGold),
-            'rice' => $db->sqleval('rice - %i', $reqRice),
-            'aux' => Json::encode($aux),
-        ], 'nation=%i', $nationID);
-
-        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
-        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
-        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
-
-        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
-        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
-        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
-        $general->applyDB($db);
-        
-        return true;
-    }
-}
@@ -1,107 +0,0 @@
-<?php
-namespace sammo\Command\Nation;
-
-use \sammo\Command;
-use sammo\Constraint\ConstraintHelper;
-use sammo\DB;
-use sammo\Enums\InheritanceKey;
-use sammo\Enums\NationAuxKey;
-use \sammo\Util;
-use \sammo\JosaUtil;
-use sammo\Json;
-use sammo\LastTurn;
-use sammo\StaticEventHandler;
-use sammo\GameConst;
-
-class event_화륜차연구 extends Command\NationCommand{
-    static protected $actionName = '화륜차 연구';
-    static protected $auxType = NationAuxKey::can_화륜차사용;
-
-    protected function argTest():bool{
-        return true;
-    }
-
-    protected function init(){
-        $this->setCity();
-        $this->setNation(['gold','rice','aux']);
-        $this->fullConditionConstraints=[];
-
-        $name = static::$actionName;
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $this->minConditionConstraints = [
-            ConstraintHelper::OccupiedCity(),
-            ConstraintHelper::BeChief(),
-            ConstraintHelper::ReqNationAuxValue(static::$auxType->value, 0, "<", 1, "{$name}가 이미 완료되었습니다."),
-            ConstraintHelper::ReqNationGold(GameConst::$basegold + $reqGold),
-            ConstraintHelper::ReqNationRice(GameConst::$baserice + $reqRice),
-        ];
-
-        $this->fullConditionConstraints = $this->minConditionConstraints;
-    }
-    
-    public function getCommandDetailTitle():string{
-        $name = $this->getName();
-
-        [$reqGold, $reqRice] = $this->getCost();
-        $reqTurn = $this->getPreReqTurn()+1;
-
-        $reqGoldD5 = number_format($reqGold / 10000);
-        $reqRiceD5 = number_format($reqRice / 10000);
-
-        return "{$name}/{$reqTurn}턴(금/쌀 {$reqGoldD5}만)";
-    }
-
-    public function getPreReqTurn():int{
-        return 23;
-    }
-
-    public function getPostReqTurn():int{
-        return 0;
-    }
-
-    public function getCost():array{
-        return [100000, 100000];
-    }
-
-    public function run(\Sammo\RandUtil $rng):bool{
-        if(!$this->hasFullConditionMet()){
-            throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
-        }
-        
-        $db = DB::db();
-        $general = $this->generalObj;
-        $nationID = $general->getNationID();
-
-        $actionName = static::$actionName;
-        
-        $aux = $this->nation['aux'];
-        $aux[static::$auxType->value] = 1;
-        [$reqGold, $reqRice] = $this->getCost();
-
-        $logger = $general->getLogger();
-
-        $general->addExperience(5 * ($this->getPreReqTurn() + 1));
-        $general->addDedication(5 * ($this->getPreReqTurn() + 1));
-
-        $generalName = $general->getName();
-        $josaYi = JosaUtil::pick($generalName, '이');
-        
-        $db->update('nation', [
-            'gold' => $db->sqleval('gold - %i', $reqGold),
-            'rice' => $db->sqleval('rice - %i', $reqRice),
-            'aux' => Json::encode($aux),
-        ], 'nation=%i', $nationID);
-
-        $logger->pushGeneralActionLog("<M>{$actionName}</> 완료");
-        $logger->pushGeneralHistoryLog("<M>{$actionName}</> 완료");
-        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <M>{$actionName}</> 완료");
-
-        $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
-        StaticEventHandler::handleEvent($this->generalObj, $this->destGeneralObj, $this::class, $this->env, $this->arg ?? []);
-        $this->setResultTurn(new LastTurn($this->getName(), $this->arg, 0));
-        $general->applyDB($db);
-        
-        return true;
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hide_D	1f556cf88c	fix: GetConst의 텍스트 수정	2025-01-21 17:32:30 +00:00
Hide_D	76625cf472	fix: GameUnitDetail의 info를 기존방식으로 변경	2025-01-21 17:23:07 +00:00
Hide_D	84fee0f1f2	fix: ReqCities, ReqRegion 버그	2025-01-21 17:13:37 +00:00
Hide_D	9f81c760d0	병종 데이터 수정	2025-01-21 16:42:19 +00:00
Hide_D	f26ac8c37b	refac: GameUnitConstBase의 getBuildData	2025-01-21 16:06:03 +00:00
Hide_D	7cffa68d04	UnitConstBase 적용용	2025-01-21 16:02:24 +00:00
Hide_D	01094d376f	feat, refac(wip): 징병 기준을 GameUnitConstraint 기반으로 변경	2025-01-21 15:41:41 +00:00
Hide_D	77ec4c6572	feat(wip): GameUnitConstrint	2025-01-21 15:26:29 +00:00
Hide_D	3e5727a166	feat(wip): GameUnitConstraint 개념 추가	2025-01-21 14:25:56 +00:00