feat: replace game schedules with logical ticks

- storage에 의미없이 쌓이는 데이터 이관

.gitignore

@@ -29,6 +29,7 @@ d_pic/*.jpg
 d_pic/*.gif
 d_pic/*.png
 d_pic/*.webp
+d_pic/*.avif
 d_pic/uploaded_image
 
 /dist_js

composer.json

@@ -12,7 +12,6 @@
         }
     },
     "require": {
-        "brandonwamboldt/utilphp": "^1.1",
         "sergeytsalkov/meekrodb": "^2.5",
         "league/plates": "^3.5",
         "vlucas/valitron": "^1.4",

composer.lock

@@ -4,58 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "deed9afdc95bc42f84784df67d295223",
+    "content-hash": "7edae9b6be35e66ffd0d180f5fac6679",
     "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",
@@ -5721,5 +5671,5 @@
     "platform-overrides": {
         "php": "8.3"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

f_config/config.php

@@ -99,7 +99,10 @@ 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 $text) {
+    $trace = array_map(function (string|array $text) {
+        if (is_array($text)) {
+            $text = Json::encode($text);
+        }
         return str_replace(ROOT, '{ROOT}', $text);
     }, $trace);
 

f_install/j_create_admin.php

@@ -56,7 +56,7 @@ $rootDB->insert('member', [
     'token_valid_until' => '2999-01-01 00:00:00',
     'pw' => $finalPassword,
     'salt' => $userSalt,
-    'grade' => 6,
+    'grade' => 7,
     'name' => $nickname,
     'reg_date' => $nowDate
 ]);

f_install/sql/common_schema.sql

@@ -92,4 +92,14 @@ CREATE TABLE `login_token` (
 	INDEX `by_date` (`user_id`, `expire_date`)
 )
 COLLATE='utf8mb4_general_ci'
-ENGINE=Aria;
+ENGINE=Aria;
+
+CREATE TABLE `banned_member` (
+	`no` INT NOT NULL AUTO_INCREMENT,
+	`hashed_email` VARCHAR(128) NOT NULL COLLATE 'utf8mb4_general_ci' COMMENT 'SHA512(salt | email | salt )',
+	`info` TEXT NULL COLLATE 'utf8mb4_general_ci' COMMENT '부가정보',
+	PRIMARY KEY (`no`),
+	UNIQUE INDEX `email` (`hashed_email`(128))
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE = Aria;

hwe/_119.php

@@ -13,6 +13,9 @@ $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"');
 ?>
@@ -30,8 +33,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='분지연'> 최종갱신 : <?=$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=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=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>

hwe/_119_b.php

@@ -38,21 +38,9 @@ switch ($btn) {
             usleep(500000);
         }
 
-        $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');
+        $clock = GameClock::fromStorage($gameStor);
+        // 스케줄 전체를 벽시계에서 빼지 않고 논리 현재 tick만 앞으로 이동합니다.
+        $clock->advance($gameStor, $clock->ticksFromMinutes($minute));
         if ($locked) {
             unlock();
         }
@@ -66,34 +54,19 @@ switch ($btn) {
             }
             usleep(500000);
         }
-        $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');
+        $clock = GameClock::fromStorage($gameStor);
+        $clock->advance($gameStor, -$clock->ticksFromMinutes($minute));
         if ($locked) {
             unlock();
         }
         break;
     case "토너분당김":
-        $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');
+        $clock = GameClock::fromStorage($gameStor);
+        $gameStor->tnmt_time = Util::toInt($gameStor->tnmt_time) - $clock->ticksFromMinutes($minute2);
         break;
     case "토너분지연":
-        $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');
+        $clock = GameClock::fromStorage($gameStor);
+        $gameStor->tnmt_time = Util::toInt($gameStor->tnmt_time) + $clock->ticksFromMinutes($minute2);
         break;
     case "금지급":
         processGoldIncome();

hwe/_admin1.php

@@ -6,7 +6,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if($session->userGrade < 5) {
+if($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 
@@ -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'], 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_display'], 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']?></td>
+        <td width=285>&nbsp;<?=$admin['turntime_display']?> (tick <?=$admin['turntime']?>)</td>
     </tr>
     <tr>
         <td width=110 align=right>턴시간</td>

hwe/_admin1_submit.php

@@ -6,7 +6,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     header('location:_admin1.php');
     die();
 }
@@ -43,7 +43,12 @@ switch ($btn) {
         pushGlobalHistoryLog(["<R>★</><S>{$log}</>"]);
         break;
     case "변경1":
-        $gameStor->starttime = (new \DateTime($starttime))->format('Y-m-d H:i:s');
+        $clock = GameClock::fromStorage($gameStor);
+        $gameStor->clock_base_time = TimeUtil::format(GameClock::baseTimeForProjection(
+            new \DateTimeImmutable($starttime),
+            Util::toInt($gameStor->starttime),
+            $clock->getTurnTermMinutes(),
+        ), true);
         break;
     case "변경2":
         $gameStor->maxgeneral = $maxgeneral;
@@ -78,4 +83,4 @@ switch ($btn) {
         break;
 }
 
-header('location:_admin1.php');
+header('location:_admin1.php');

hwe/_admin2.php

@@ -7,7 +7,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 

hwe/_admin2_submit.php

@@ -15,7 +15,7 @@ $msg = Util::getPost('msg', 'string');
 //로그인 검사
 $session = Session::requireLogin()->loginGame()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     header('location:_admin2.php');
 }
 
@@ -99,7 +99,7 @@ switch ($btn) {
         ], '`no` IN %li', $genlist);
         break;
     case "강제 사망":
-        $date = TimeUtil::now(true);
+        $date = GameClock::fromStorage($gameStor)->nowTick();
         $db->update('general', [
             'killturn' => 0,
             'turntime' => $date,

hwe/_admin5.php

@@ -20,7 +20,7 @@ if ($type2 < 0 || $type2 > 6) {
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 

hwe/_admin5_submit.php

@@ -12,7 +12,7 @@ $nation = Util::getPost('nation', 'int');
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     header('location:_admin5.php');
     die();
 }

hwe/_admin7.php

@@ -31,17 +31,18 @@ $queryMap = [
 ];
 
 if ($reqQueryType === null || !key_exists($reqQueryType, $queryMap)) {
-    $reqQueryType = Util::array_first_key($queryMap);
+    $reqQueryType = array_key_first($queryMap);
 }
 
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 
 $db = DB::db();
+$clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
 
 if ($btn == '정렬하기') {
     $gen = 0;
@@ -111,7 +112,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($general['turntime'], 14, 5) ?>)</option>
+                            <option <?= $gen == $general['no'] ? 'selected' : '' ?> value='<?= $general['no'] ?>'><?= $general['name'] ?> (<?= substr($clock->formatTick(Util::toInt($general['turntime'])), 14, 5) ?>)</option>
                         <?php endforeach; ?>
                     </select>
                     <input type=submit name=btn value='조회하기'>
@@ -179,4 +180,4 @@ $generalObj = General::createObjFromDB($gen, null, GeneralQueryMode::FullWithAcc
     </table>
 </body>
 
-</html>
+</html>

hwe/_admin8.php

@@ -12,7 +12,7 @@ $type = 0;
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die(requireAdminPermissionHTML());
 }
 

hwe/_admin_force_rehall.php

@@ -7,7 +7,7 @@ include "func.php";
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die('권한 부족');
 }
 

hwe/a_bestGeneral.php

@@ -243,11 +243,14 @@ $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
+    horse, weapon, book, item, aux
     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']];
@@ -427,4 +430,4 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');
     </div>
 </body>
 
-</html>
+</html>

hwe/b_currentCity.php

@@ -16,7 +16,7 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("현재도시", 1);
 
-$lastExecute = substr($gameStor->turntime, 5, 14);
+$lastExecute = substr(GameClock::fromStorage($gameStor)->formatTick(Util::toInt($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']) ?? [
@@ -177,7 +177,7 @@ $templates = new \League\Plates\Engine('templates');
                                 $valid = 1;
                             }
 
-                            if ($userGrade >= 5) {
+                            if ($userGrade >= 6) {
                                 $valid = true;
                                 $showDetailedInfo = true;
                             }
@@ -275,7 +275,7 @@ $templates = new \League\Plates\Engine('templates');
                                     $ourGeneral = false;
                                 }
 
-                                if ($userGrade == 6) {
+                                if ($userGrade == 7) {
                                     $ourGeneral = true;
                                 }
 
@@ -537,4 +537,4 @@ $templates = new \League\Plates\Engine('templates');
                             </table>
 </body>
 
-</html>
+</html>

hwe/b_genList.php

@@ -129,6 +129,7 @@ $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',
@@ -142,6 +143,7 @@ $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']] ?? '-';
 
@@ -284,4 +286,4 @@ $templates = new \League\Plates\Engine('templates');
     </table>
 </body>
 
-</html>
+</html>

hwe/b_myPage.php

@@ -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']);
-
-increaseRefresh("내정보", 1);
+$gameStor = KVStorage::getStorage($db, 'game_env');
+$gameStor->cacheValues(['turntime', 'opentime', 'autorun_user', 'npcmode']);
+$clock = GameClock::fromStorage($gameStor);
+$nowTick = $clock->nowTick();
 
 $me = General::createObjFromDB($generalID, null, GeneralQueryMode::FullWithAccessLog);
 
@@ -41,12 +41,30 @@ $lastRefresh = $db->queryFirstField(
     $generalID
 );
 
-$targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
-if ($gameStor->turntime <= $gameStor->opentime) {
-    //서버 가오픈시 할 수 있는 행동
-    if ($me->getNPCType() == 0 && $me->getNationID() == 0) {
+$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) {
         $showDieOnPrestartBtn = true;
-        if ($targetTime <= TimeUtil::now()) {
+        if ($targetTime <= $nowTick) {
             $availableDieOnPrestart = true;
         }
     }
@@ -159,7 +177,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) : ?>
-                            가오픈 기간 내 장수 삭제 (<?= substr($targetTime, 0, 19) ?> 부터)<br>
+                            가오픈 기간 내 장수 삭제 (<?= $targetTimeDisplay ?> 부터)<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; ?>
 
@@ -174,7 +192,7 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
                         <?php endif; ?>
 
                         <?php if ($gameStor->npcmode == 2 && $me->getNPCType() == 0) : ?>
-                            다른 장수 선택 (<?= substr($me->getAuxVar('next_change') ?? TimeUtil::now(), 0, 19) ?> 부터)<br>
+                            다른 장수 선택 (<?= $nextChangeDisplay ?? '지금' ?>부터)<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; ?>
 
@@ -272,4 +290,4 @@ $changeDefence999Atmos = $me->onCalcDomestic('changeDefenceTrain', "atmos999", $
     </div>
 </body>
 
-</html>
+</html>

hwe/b_tournament.php

@@ -125,63 +125,7 @@ $globalBetTotal = array_sum($globalBet);
         </tr>
     </table>
     <table align=center class='tb_layout bg0'>
-        <?php if ($session->userGrade >= 5) : ?>
-            <form method=post action=c_tournament.php>
-                <tr>
-                    <td colspan=8><input type=textarea size=150 style=color:white;background-color:black; name=msg><input type=submit name=btn value='메시지'></td>
-                </tr>
-                <tr>
-                    <td colspan=8>
-                        <button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button>
-                        <?php if ($admin['tournament'] == 0) : ?>
-                            <select name=trig size=1 style=color:white;background-color:black;>
-                                <option style=color:white; value=0 <?= !$admin['tnmt_trig'] ? 'selected' : '' ?>>수동진행</option>
-                                <option style=color:white; value=1 <?= $admin['tnmt_trig'] ? 'selected' : '' ?>>자동진행</option>
-                            </select>
-                            <input type=submit name=btn value='자동개최설정'>
-                        <?php else : ?>
-                            <input type=submit name=btn value='중단' onclick='return confirm("진짜 중단하시겠습니까?")'>
-                        <?php endif; ?>
-
-
-                        <?php switch ($admin['tournament']) {
-                            case 1:
-                                echo "<input type=submit name=btn value='랜덤투입'>";
-                                echo "<input type=submit name=btn value='랜덤전부투입'>";
-                                break;
-                            case 2:
-                                echo "<input type=submit name=btn value='예선'><input type=submit name=btn value='예선전부'>";
-                                break;
-                            case 3:
-                                echo "<input type=submit name=btn value='추첨'><input type=submit name=btn value='추첨전부'>";
-                                break;
-                            case 4:
-                                echo "<input type=submit name=btn value='본선'><input type=submit name=btn value='본선전부'>";
-                                break;
-                            case 5:
-                                echo "<input type=submit name=btn value='배정'>";
-                                break;
-                            case 6:
-                                echo "<input type=submit name=btn value='베팅마감'>";
-                                break;
-                            case 7:
-                                echo "<input type=submit name=btn value='16강'>";
-                                break;
-                            case 8:
-                                echo "<input type=submit name=btn value='8강'>";
-                                break;
-                            case 9:
-                                echo "<input type=submit name=btn value='4강'>";
-                                break;
-                            case 10:
-                                echo "<input type=submit name=btn value='결승'>";
-                                break;
-                        } ?>
-
-                    </td>
-                </tr>
-            </form>
-        <?php elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) : ?>
+        <?php if ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) : ?>
             <form method=post action=c_tournament.php>
                 <tr>
                     <td colspan=8><button type="button" class="btn btn-secondary" onclick='location.reload()'>갱신</button><button type="submit" class="btn btn-sammo-base2" onclick='return confirm("참가비 금<?= $admin['develcost'] ?>이 필요합니다. 참가하시겠습니까?")'>참가</button><input type='hidden' name='btn' value='참가'/></td>

hwe/c_tournament.php

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

hwe/css/select_general_from_pool.css

@@ -51,6 +51,22 @@
     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;
 }
@@ -61,4 +77,4 @@
 
 .custom_stat {
     display: none;
-}
+}

hwe/func.php

@@ -112,7 +112,7 @@ function GetImageURL($imgsvr, $filepath = '')
 function checkLimit($refreshScore = null)
 {
     $session = Session::getInstance();
-    if ($session->userGrade >= 4) {
+    if ($session->userGrade >= 6) {
         return 0;
     }
 
@@ -630,7 +630,11 @@ function generalInfo(General $generalObj)
         $injury = "건강";
     }
 
-    $remaining = (new \DateTimeImmutable($generalObj->getTurnTime()))->diff(new \DateTimeImmutable())->i;
+    $clock = GameClock::fromStorage(KVStorage::getStorage(DB::db(), 'game_env'));
+    $remaining = max(0, intdiv(
+        $generalObj->getTurnTick() - $clock->nowTick(),
+        $clock->ticksFromMinutes(1),
+    ));
 
     if ($nation['color'] == "") {
         $nation['color'] = "#000000";
@@ -921,45 +925,37 @@ function banner()
     );
 }
 
-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 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 cutDay($date, int $turnterm, bool $withFraction = true)
 {
@@ -1001,15 +997,13 @@ function increaseRefresh($type = "", $cnt = 1)
     $generalID = $session->generalID;
     $userGrade = $session->userGrade;
 
-    $dateObj = new \DateTimeImmutable();
-    $date = TimeUtil::format($dateObj, false);
-
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $date = GameClock::fromStorage($gameStor)->nowTick();
     $isunited = $gameStor->isunited;
     $opentime = $gameStor->opentime;
 
-    if ($userGrade == 6) {
+    if ($userGrade >= 6) {
         return;
     }
     if ($isunited == 2) {
@@ -1047,7 +1041,7 @@ function increaseRefresh($type = "", $cnt = 1)
 
     $logDB = FileDB::db($logPath, $serverPath . '/../f_install/sql/api_log.sql');
 
-    $ip = $_SERVER['REMOTE_ADDR'] ?? 'local';
+    $ip = $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'] ?? 'local';
     $date = date('Y-m-d H:i:s');
 
     $logDB->insert('api_log', [
@@ -1107,7 +1101,7 @@ function CheckOverhead()
     $gameStor = KVStorage::getStorage($db, 'game_env');
     [$turnterm, $refreshLimit] = $gameStor->getValuesAsArray(['turnterm', 'refreshLimit']);
 
-    $nextRefreshLimit = Util::round(pow($turnterm, 0.6) * 3) * 10;
+    $nextRefreshLimit = Util::round(pow($turnterm, 0.6) * 3) * GameConst::$refreshLimitCoef;
 
 
     if ($nextRefreshLimit != $refreshLimit) {
@@ -1145,18 +1139,19 @@ 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']);
-    $diff = (new \DateTime())->getTimestamp() - (new \DateTime($turntime))->getTimestamp();
+    list($turnterm, $turntime) = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
+    $clock = GameClock::fromStorage($gameStor);
+    $diff = $clock->nowTick() - Util::toInt($turntime);
 
     $t = min($turnterm, 5);
 
-    $term = $diff;
-    if ($term >= $t || $term < 0) {
+    $term = $clock->ticksFromSeconds($t);
+    if ($diff >= $term || $diff < 0) {
         return true;
     } else {
         return false;
@@ -1169,9 +1164,8 @@ function checkDelay()
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     //서버정보
-    $now = new \DateTimeImmutable();
-    $turntime = new \DateTimeImmutable($gameStor->turntime);
-    $timeMinDiff = intdiv($now->getTimestamp() - $turntime->getTimestamp(), 60);
+    $clock = GameClock::fromStorage($gameStor);
+    $timeMinDiff = intdiv($clock->nowTick() - Util::toInt($gameStor->turntime), $clock->ticksFromMinutes(1));
 
     // 1턴이상 갱신 없었으면 서버 지연
     $term = $gameStor->turnterm;
@@ -1185,20 +1179,17 @@ function checkDelay()
     //지연 해야할 밀린 턴 횟수
     $iter = intdiv($timeMinDiff, $term);
     if ($iter > $threshold) {
-        $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');
+        $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');
     }
 }
 
@@ -1247,17 +1238,15 @@ 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($curtime, $admin['turnterm']);
-    $term = $admin['turnterm'];
-
-    $num = intdiv((strtotime($curturn) - strtotime($turn)), $term * 60);
+    $curturn = cutTurn(Util::toInt($curtime), $admin['turnterm']);
+    $num = intdiv($curturn - Util::toInt($turn), GameClock::TICKS_PER_TURN);
 
     $date = $admin['startyear'] * 12;
     $date += $num;
@@ -1401,8 +1390,11 @@ function CheckHall($no)
 
     foreach ($types as [$typeName, $valueType]) {
 
-        if ($valueType === 'natural') {
-            $value = $generalObj->getVar($typeName);
+        if ($valueType === 'natural') {
+            $value = $generalObj->getVar($typeName);
+            if (in_array($typeName, ['dex1', 'dex2', 'dex3', 'dex4', 'dex5'], true)) {
+                $value = CentennialAllStarGrowthService::recordableValue($generalObj, $typeName);
+            }
         } else if ($valueType === 'rank') {
             $value = $generalObj->getRankVar(RankColumn::from($typeName));
         } else if ($valueType === 'calc') {
@@ -1702,12 +1694,21 @@ function tryUniqueItemLottery(RandUtil $rng, General $general, string $acquireTy
     return giveRandomUniqueItem($rng, $general, $acquireType);
 }
 
-function getAdmin()
-{
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    return $gameStor->getAll();
-}
+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;
+}
 
 /** @return General[] */
 function deleteNation(General $lord, bool $applyDB): array
@@ -2196,35 +2197,29 @@ function SabotageInjury(RandUtil $rng, array $cityGeneralList, string $reason):
     return $injuryCount;
 }
 
-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');
-}
+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);
+}

hwe/func_auction.php

@@ -62,11 +62,12 @@ function processAuction()
 {
     $db = DB::db();
 
-    $now = TimeUtil::now();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $nowTick = GameClock::fromStorage($gameStor)->nowTick();
 
     $auctionList = $db->queryAllLists(
-        'SELECT id, `type` FROM ng_auction WHERE `close_date` <= %s AND finished = 0',
-        $now
+        'SELECT id, `type` FROM ng_auction WHERE `close_tick` <= %i AND finished = 0',
+        $nowTick
     );
 
     if (!$auctionList) {

hwe/func_command.php

@@ -42,15 +42,21 @@ function pushGeneralCommand(int $generalID, int $turnCnt=1){
 
     $db = DB::db();
 
-    $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);
+    $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
+    );
 }
 
 function pullGeneralCommand(int $generalID, int $turnCnt=1){
@@ -67,15 +73,21 @@ function pullGeneralCommand(int $generalID, int $turnCnt=1){
 
     $db = DB::db();
 
-    $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);
+    $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
+    );
 }
 
 function repeatGeneralCommand(int $generalId, int $turnCnt){
@@ -126,15 +138,23 @@ function pushNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
 
     $db = DB::db();
 
-    $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);
+    $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
+    );
 }
 
 function pullNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
@@ -157,15 +177,23 @@ function pullNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
 
     $db = DB::db();
 
-    $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);
+    $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
+    );
 }
 
 function repeatNationCommand(int $nationID, int $officerLevel, int $turnCnt){
@@ -494,4 +522,4 @@ function setNationCommand(int $generalID, array $turnList, string $command, ?arr
         'arg_test'=>true,
         'reason'=>'success'
     ];
-}
+}

hwe/func_converter.php

@@ -457,6 +457,29 @@ function buildWarUnitTriggerClass(?string $type, WarUnit $unit, ?array $args = n
     return $class->newInstanceArgs(array_merge([$unit], $args));
 }
 
+function getStaticEventClass(string $type){
+    static $basePath = __NAMESPACE__.'\\StaticEvent\\';
+    $classPath = ($basePath.$type);
+
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+
+    throw new \InvalidArgumentException("{$type}은 StaticEvent가 아님");
+}
+
+function buildStaticEventClass(?string $type):BaseStaticEvent{
+    static $cache = [];
+    if(key_exists($type, $cache)){
+        return $cache[$type];
+    }
+
+    $class = getStaticEventClass($type);
+    $obj = new $class();
+    $cache[$type] = $obj;
+    return $obj;
+}
+
 function getGeneralPoolClass(string $type){
     static $basePath = __NAMESPACE__.'\\GeneralPool\\';
     $classPath = ($basePath.$type);
@@ -663,7 +686,7 @@ function TechLimit($startYear, $year, $tech) : bool {
     $relYear = $year - $startYear;
 
     $relMaxTech = Util::valueFit(
-        floor($relYear / 5) + 1,
+        floor($relYear / GameConst::$techLevelIncYear) + GameConst::$initialAllowedTechLevel,
         1,
         GameConst::$maxTechLevel
     );

hwe/func_gamerule.php

@@ -559,7 +559,7 @@ function checkStatistic()
 
     $nationHist = '';
     foreach (GameConst::$availableNationType as $nationType) {
-        if (!Util::array_get($nationHists[$nationType])) {
+        if (!($nationHists[$nationType] ?? null)) {
             $nationHists[$nationType] = '-';
         }
         $nationHist .= getNationType($nationType) . "({$nationHists[$nationType]}), ";
@@ -651,16 +651,24 @@ function checkStatistic()
 }
 
 
-function convForOldGeneral(array $general, int $year, int $month)
-{
-    $general['history'] = getGeneralHistoryLogAll($general['no']);
-    return [
+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 [
         'server_id' => UniqueConst::$serverID,
         'general_no' => $general['no'],
         'owner' => $general['owner'],
         'name' => $general['name'],
         'last_yearmonth' => $year * 100 + $month,
-        'turntime' => $general['turntime'],
+        'turntime' => $turnTimeDisplay,
         'data' => Json::encode($general)
     ];
 }
@@ -734,7 +742,7 @@ function checkEmperior()
 
     /** @var int[] */
     $auctionList = $db->queryFirstColumn(
-        'SELECT `id` FROM `ng_auction` WHERE `type` = %s AND `finished` = 0 ORDER BY `close_date` ASC',
+        'SELECT `id` FROM `ng_auction` WHERE `type` = %s AND `finished` = 0 ORDER BY `close_tick` ASC',
         AuctionType::UniqueItem->value
     );
     foreach($auctionList as $auctionID){

hwe/func_legacy.php

@@ -4,6 +4,10 @@ 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>
@@ -138,7 +142,7 @@ function JSCitiesBasedOnDistance(int $cityNo, int $maxDistance = 1): array{
     $distanceList = searchDistance($cityNo, $maxDistance, true);
     $result = [];
     for ($dist = 1; $dist <= $maxDistance; $dist++) {
-        $result[$dist] = Util::array_get($distanceList[$dist], []);
+        $result[$dist] = $distanceList[$dist] ?? [];
     }
     return $result;
 }
@@ -152,7 +156,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;
-        }, Util::array_get($distanceList[$dist], []));
+        }, $distanceList[$dist] ?? []);
 
         $cityStr = join(', ', $cityList);
 

hwe/func_template.php

@@ -61,8 +61,12 @@ function chiefTurnTable()
 ";
 }
 
-function templateLimitMsg(string $turntime): string
-{
+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);
+    }
     return "이미 너무 많은 접속을 하셨습니다. 다음 턴에 다시 시도해주세요. (턴시간: {$turntime})";
 }
 

hwe/func_tournament.php

@@ -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']);
-    $now = new \DateTime();
-    $offset = $now->getTimestamp() - (new \DateTime($admin['tnmt_time']))->getTimestamp();
+    $offset = intdiv($clock->nowTick() - Util::toInt($admin['tnmt_time']), $clock->ticksPerSecond());
 
     //수동일땐 무시
     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 = $dt;
+            $gameStor->tnmt_time = Util::toInt($admin['tnmt_time'])
+                + $clock->ticksFromSeconds($unit * $i + $betTerm);
             return;
         }
     }
@@ -133,7 +133,7 @@ function processTournament()
     $second = $unit * $iter;
     $gameStor->tournament = $tnmt;
     $gameStor->phase = $phase;
-    $gameStor->tnmt_time = (new \DateTimeImmutable($admin['tnmt_time']))->add(new \DateInterval("PT{$second}S"))->format('Y-m-d H:i:s');
+    $gameStor->tnmt_time = Util::toInt($admin['tnmt_time']) + $clock->ticksFromSeconds($second);
 }
 
 function getTournamentTermText(int $turnTerm)
@@ -160,7 +160,8 @@ function getTournamentTime()
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
     list($tnmt, $tnmt_time) = $gameStor->getValuesAsArray(['tournament', 'tnmt_time']);
-    $dt = substr($tnmt_time, 11, 5);
+    $clock = GameClock::fromStorage($gameStor);
+    $dt = substr($clock->formatTick(Util::toInt($tnmt_time)), 11, 5);
     switch ($tnmt) {
         case 1:
             $tnmt = "개막시간 {$dt}";
@@ -284,9 +285,11 @@ function startTournament($type)
     $admin = $gameStor->getValues(['year', 'month', 'turnterm']);
     $turnTerm = $admin['turnterm'];
     $unit = calcTournamentTerm($turnTerm);
+    $clock = GameClock::fromStorage($gameStor);
 
     $gameStor->tnmt_auto = true;
-    $gameStor->tnmt_time = (new \DateTimeImmutable())->add(new \DateInterval("PT{$unit}M"))->format('Y-m-d H:i:s');
+    // 기존 startTournament은 unit을 분으로 더하므로 그 계약을 유지합니다.
+    $gameStor->tnmt_time = $clock->nowTick() + $clock->ticksFromMinutes($unit);
     $gameStor->tournament = 1;
     $gameStor->tnmt_type = $type;
     $gameStor->last_tournament_betting_id = 0;
@@ -1153,21 +1156,25 @@ 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) {
-            $damage2 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $factor2 = 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) {
-            $damage1 *= Util::round((rand() % 301 + 200) / 100); // 200 ~ 500%
+            $factor1 = 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) {
 

hwe/install_db.php

@@ -7,10 +7,10 @@ include "func.php";
 
 $session = Session::requireLogin();
 
-if ($session->userGrade < 5) {
+if ($session->userGrade < 6) {
     die('관리자 아님');
 }
-if ($session->userGrade == 5) {
+if ($session->userGrade == 6) {
     die('DB 리셋 권한을 가지고 있지 않습니다.');
 }
 

hwe/j_get_city_list.php

@@ -18,7 +18,7 @@ else{
     $availableNextCall = $session->availableNextCallGetCityList??'2000-01-01 00:00:00';
     $now = new \DateTimeImmutable();
 
-    if($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 5){
+    if($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 6){
         Json::die([
             'result'=>false,
             'reason'=>"도시 목록은 10초에 한번 갱신 가능합니다.\n다음 시간 : ".$availableNextCall

hwe/j_get_select_npc_token.php

@@ -16,12 +16,10 @@ $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){
@@ -44,15 +42,14 @@ if($npcmode!=1){
     ]);
 }
 
-$token = $db->queryFirstRow('SELECT * FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%s', $userID, $now);
+$token = $db->queryFirstRow('SELECT * FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%i', $userID, $now);
 $pickResult = [];
 
 
 if($token && $refresh){
-    $pickMoreFrom = (new \DateTime($token['pick_more_from']))->getTimestamp();
-    $nowT = $oNow->getTimestamp();
+    $pickMoreFrom = Util::toInt($token['pick_more_from']);
 
-    if($nowT >= $pickMoreFrom){
+    if($now >= $pickMoreFrom){
         $oldPickResult = Json::decode($token['pick_result']);
 
         foreach($keepResult as $keepId){
@@ -75,15 +72,14 @@ if($token && $refresh){
 }
 
 if($token && !$refresh){
-    $pickMoreFrom = (new \DateTime($token['pick_more_from']))->getTimestamp();
-    $nowT = $oNow->getTimestamp();
+    $pickMoreFrom = Util::toInt($token['pick_more_from']);
 
     Json::die([
         'result'=>true,
         'pick'=>Json::decode($token['pick_result']),
-        'pickMoreFrom'=>$token['pick_more_from'],
-        'pickMoreSeconds'=>$pickMoreFrom-$nowT,
-        'validUntil'=>$token['valid_until']
+        'pickMoreFrom'=>$clock->formatTick($pickMoreFrom),
+        'pickMoreSeconds'=>intdiv($pickMoreFrom - $now, $clock->ticksPerSecond()),
+        'validUntil'=>$clock->formatTick(Util::toInt($token['valid_until']))
     ]);
 }
 
@@ -100,7 +96,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 >=%s', $userID, $now) as $reserved){
+foreach($db->queryFirstColumn('SELECT pick_result FROM select_npc_token WHERE `owner`!=%i AND valid_until >=%i', $userID, $now) as $reserved){
     $reserved = Json::decode($reserved);
     foreach(array_keys($reserved) as $reservedNPC){
         if(key_exists($reservedNPC, $weight)){
@@ -131,8 +127,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 = $oNow->add(new \DateInterval(sprintf('PT%dS', $validSecond)));
-$pickMoreFrom = $oNow->add(new \DateInterval(sprintf('PT%dS', $pickMoreSecond)));
+$validUntil = $now + $clock->ticksFromSeconds($validSecond);
+$pickMoreFrom = $now + $clock->ticksFromSeconds($pickMoreSecond);
 
 $db->delete('select_npc_token', 'valid_until < %s', $now);
 
@@ -140,8 +136,8 @@ $inserted = 0;
 
 if($token){
     $db->update('select_npc_token', [
-        'valid_until'=>$validUntil->format('Y-m-d H:i:s'),
-        'pick_more_from'=>$pickMoreFrom->format('Y-m-d H:i:s'),
+        'valid_until'=>$validUntil,
+        'pick_more_from'=>$pickMoreFrom,
         'pick_result'=>Json::encode($pickResult),
         'nonce'=>$newNonce
     ], 'owner = %i AND nonce = %i', $userID, $token['nonce']);
@@ -152,8 +148,8 @@ if($token){
 else{
     $db->insertIgnore('select_npc_token', [
         'owner'=>$userID,
-        'valid_until'=>$validUntil->format('Y-m-d H:i:s'),
-        'pick_more_from'=>'2000-01-01 01:00:00',
+        'valid_until'=>$validUntil,
+        'pick_more_from'=>$now,
         'pick_result'=>Json::encode($pickResult),
         'nonce'=>$newNonce
     ]);
@@ -173,7 +169,7 @@ if($inserted === 0){
 Json::die([
     'result'=>true,
     'pick'=>$pickResult,
-    'pickMoreFrom'=>($inserted===-1)?$pickMoreFrom->format('Y-m-d H:i:s'):'2000-01-01 01:00:00',
+    'pickMoreFrom'=>$clock->formatTick(($inserted===-1)?$pickMoreFrom:$now),
     'pickMoreSeconds'=>($inserted===-1)?$pickMoreSecond:0,
-    'validUntil'=>$validUntil->format('Y-m-d H:i:s')
-]);
+    'validUntil'=>$clock->formatTick($validUntil)
+]);

hwe/j_get_select_pool.php

@@ -10,7 +10,23 @@ function sortTokens(&$tokens){
     });
 }
 
-function putInfoText(&$info){
+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'];
+    }
+
     if(key_exists('specialDomestic', $info)){
         $class = buildGeneralSpecialDomesticClass($info['specialDomestic']);
         $info['specialDomesticName'] = $class->getName();
@@ -27,14 +43,13 @@ function putInfoText(&$info){
 $session = Session::requireLogin([])->setReadOnly();
 $userID = Session::getUserID();
 
-$oNow = new \DateTimeImmutable();
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+$clock = GameClock::fromStorage($gameStor);
+$now = $clock->nowTick();
 
-$now = $oNow->format('Y-m-d H:i:s');
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-$npcmode = $gameStor->getValue('npcmode');
+$eventEnv = $gameStor->getValues(['npcmode', 'startyear', 'year', 'month']);
+$npcmode = $eventEnv['npcmode'];
 if($npcmode!=2){
     Json::die([
         'result'=>false,
@@ -42,7 +57,8 @@ if($npcmode!=2){
     ]);
 }
 
-$rawGeneral = $db->queryFirstRow('SELECT no, aux FROM general WHERE `owner` = %i', $userID);
+$rawGeneral = $db->queryFirstRow('SELECT no, aux FROM general WHERE `owner` = %i', $userID);
+$currentTargetEnv = $rawGeneral ? $eventEnv : null;
 if($rawGeneral){
     $generalAux = Json::decode($rawGeneral['aux']);
     if(key_exists('next_change', $generalAux)&& $generalAux['next_change'] > $now){
@@ -62,7 +78,7 @@ if($tokens){
     foreach($tokens as $token){
         $valid_until = $token['reserved_until'];
         $info = Json::decode($token['info']);
-        putInfoText($info);
+        putInfoText($info, $currentTargetEnv);
         $info['uniqueName'] = $token['unique_name'];
         $pick[] = $info;
     }
@@ -70,7 +86,7 @@ if($tokens){
     Json::die([
         'result'=>true,
         'pick'=>$pick,
-        'validUntil'=>$valid_until
+        'validUntil'=>$clock->formatTick(Util::toInt($valid_until))
     ]);
 }
 
@@ -83,12 +99,12 @@ $valid_until = null;
 foreach(pickGeneralFromPool($db, $rng, $userID, 14) as $pickObj){
     $valid_until = $pickObj->getValidUntil();
     $info = $pickObj->getInfo();
-    putInfoText($info);
+    putInfoText($info, $currentTargetEnv);
     $pick[] = $info;
 }
 sortTokens($pick);//좀 무식하지만..
 Json::die([
     'result'=>true,
     'pick'=>$pick,
-    'validUntil'=>$valid_until
-]);
+    'validUntil'=>$valid_until === null ? null : $clock->formatTick(Util::toInt($valid_until))
+]);

hwe/j_install.php

@@ -211,7 +211,7 @@ try{
         $show_img_level,
         !!$tournament_trig,
         $join_mode,
-        TimeUtil::now(),
+        TimeUtil::format(GameClock::readWallTime(), false),
         $autorun_user
     ));
 }
@@ -220,4 +220,4 @@ catch(\Exception $e){
         'result'=>false,
         'reason'=>$e->getMessage()
     ]);
-}
+}

hwe/j_myBossInfo.php

@@ -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 '수뇌인 장수를 변경할 수 없는 상태입니다.';
     }
 

hwe/j_raise_event.php

@@ -8,7 +8,7 @@ include('func.php');
 
 $session = Session::requireLogin([])->setReadOnly();
 
-if(Session::getInstance()->userGrade < 5){
+if(Session::getInstance()->userGrade < 6){
     Json::die([
         'reason'=>'권한이 부족합니다.'
     ]);

hwe/j_select_npc.php

@@ -24,8 +24,8 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $rootDB = RootDB::db();
 
-$oNow = new \DateTimeImmutable();
-$now = $oNow->format('Y-m-d H:i:s');
+$clock = GameClock::fromStorage($gameStor);
+$now = $clock->nowTick();
 
 $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'
-]);
+]);

hwe/j_select_picked_general.php

@@ -8,10 +8,20 @@ WebUtil::requireAJAX();
 
 $pick = Util::getPost('pick');
 $leadership = Util::getPost('leadership', 'int', GameConst::$defaultStatMin);
-$strength = Util::getPost('leadership', 'int', GameConst::$defaultStatMin);
-$intel = 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
+);
 $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){
@@ -27,8 +37,8 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 
 $rootDB = RootDB::db();
-$oNow = new \DateTimeImmutable();
-$now = $oNow->format('Y-m-d H:i:s');
+$clock = GameClock::fromStorage($gameStor);
+$now = $clock->nowTick();
 
 $hasGeneralID = $db->queryFirstField('SELECT no FROM general WHERE owner = %i', $userID);
 if($hasGeneralID){
@@ -60,16 +70,39 @@ if(!$selectInfo){
 }
 $selectInfo = Json::decode($selectInfo);
 
-$ownerInfo = RootDB::db()->queryFirstRow('SELECT `name`,`picture`,`imgsvr` FROM member WHERE `NO`=%i',$userID);
-if(!$ownerInfo){
+$ownerInfo = RootDB::db()->queryFirstRow(
+    'SELECT `name`,`picture`,`imgsvr`,`grade` FROM member WHERE `NO`=%i',
+    $userID
+);
+if(!$ownerInfo){
     Json::die([
         'result'=>false,
         'reason'=>'멤버 정보를 가져오지 못했습니다.'
-    ]);
-}
-
-
-$gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
+    ]);
+}
+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');
 
 if ($gencount >= $maxgeneral) {
     Json::die([
@@ -80,12 +113,25 @@ if ($gencount >= $maxgeneral) {
 
 $poolClass = getGeneralPoolClass(GameConst::$targetGeneralPool);
 /** @var AbsGeneralPool */
-$pickedGeneral = new $poolClass($db, $selectInfo, $now);
+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);
+}
 
 $builder = $pickedGeneral->getGeneralBuilder();
+if ($isCentennialAllStar) {
+    CentennialAllStarGrowthService::prepareInitialUser($builder, $selectInfo);
+}
 
 foreach(GameConst::$generalPoolAllowOption as $allowOption){
-    if($allowOption == 'stat'){
+    if($allowOption == 'stat' && !$isCentennialAllStar){
         $leadership = Util::valueFit($leadership, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
         $strength = Util::valueFit($strength, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
         $intel = Util::valueFit($intel, GameConst::$defaultStatMin, GameConst::$defaultStatMax);
@@ -98,14 +144,23 @@ foreach(GameConst::$generalPoolAllowOption as $allowOption){
         }
         $builder->setStat($leadership, $strength, $intel);
     }
-    else if($allowOption == 'picture' && $use_own_picture){
-        $builder->setPicture($ownerInfo['imgsvr'], $ownerInfo['picture']);
+    else if(
+        $allowOption == 'picture'
+        && (
+            (!$isCentennialAllStar && $use_own_picture)
+            || ($isCentennialAllStar && $pictureSource === 'own')
+        )
+    ){
+        $builder->setPicture($ownerInfo['imgsvr'], $ownerInfo['picture']);
     }
     else if($allowOption == 'ego'){
         if(!$personal || $personal == 'Random'){
             $personal =  Util::choiceRandom(GameConst::$availablePersonality);
         }
-        if(!array_search($personal, GameConst::$availablePersonality)){
+        $invalidPersonal = $isCentennialAllStar
+            ? !in_array($personal, GameConst::$availablePersonality, true)
+            : !array_search($personal, GameConst::$availablePersonality);
+        if($invalidPersonal){
             Json::die([
                 'result'=>false,
                 'reason'=>'올바르지 않은 성격입니다.'
@@ -113,7 +168,7 @@ foreach(GameConst::$generalPoolAllowOption as $allowOption){
         }
         $builder->setEgo($personal);
     }
-}
+}
 
 $userNick = $ownerInfo['name'];
 
@@ -121,8 +176,29 @@ $builder->setOwner($userID);
 $builder->setOwnerName($userNick);
 $builder->setKillturn(5);
 $builder->setNPCType(0);
-$builder->setAuxVar('next_change', TimeUtil::nowAddMinutes(12 * $env['turnterm']));
+$builder->setAuxVar('next_change', $now + GameClock::TICKS_PER_TURN * 12);
+$builder->setAuxVar(
+    'prestart_delete_after',
+    addTurn($now, $env['turnterm'], GameConst::$minTurnDieOnPrestart)
+);
 $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){
@@ -167,4 +243,4 @@ $rootDB->insert('member_log', [
 Json::die([
     'result'=>true,
     'reason'=>'success'
-]);
+]);

hwe/j_server_basic_info.php

@@ -19,6 +19,7 @@ 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(
@@ -75,8 +76,8 @@ $admin['maxUserCnt'] = $admin['maxgeneral'];
 $admin['npcMode'] = $admin['npcmode'];
 $admin['turnTerm'] = $admin['turnterm'];
 $admin['isUnited'] = $admin['isunited'];
-$admin['starttime'] = substr($admin['opentime'], 5, 11);
-$admin['turntime'] = substr($admin['turntime'], 5, 11);
+$admin['starttime'] = substr($clock->formatTick(Util::toInt($admin['opentime'])), 5, 11);
+$admin['turntime'] = substr($clock->formatTick(Util::toInt($admin['turntime'])), 5, 11);
 unset($admin['npcmode']);
 unset($admin['maxgeneral']);
 unset($admin['turnterm']);
@@ -131,4 +132,4 @@ if($general){
 Json::die([
     'game'=>$admin,
     'me'=>$me?:null
-]);
+]);

hwe/j_set_my_setting.php

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

hwe/j_simulate_battle.php

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

hwe/j_update_picked_general.php

@@ -7,6 +7,7 @@ include "func.php";
 WebUtil::requireAJAX();
 
 $pick = Util::getPost('pick');
+$pictureSource = Util::getPost('picture_source', 'string', 'selected');
 
 if(!$pick){
     Json::die([
@@ -21,8 +22,8 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 
 $rootDB = RootDB::db();
-$oNow = new \DateTimeImmutable();
-$now = $oNow->format('Y-m-d H:i:s');
+$clock = GameClock::fromStorage($gameStor);
+$now = $clock->nowTick();
 
 $generalID = $db->queryFirstField('SELECT no FROM general WHERE owner = %i', $userID);
 if(!$generalID){
@@ -35,10 +36,20 @@ if(!$generalID){
 list(
     $year,
     $month,
+    $startYear,
     $maxgeneral,
     $npcmode,
-    $turnterm
-) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode', 'turnterm']);
+    $turnterm,
+    $showImgLevel
+) = $gameStor->getValuesAsArray([
+    'year',
+    'month',
+    'startyear',
+    'maxgeneral',
+    'npcmode',
+    'turnterm',
+    'show_img_level',
+]);
 
 if($npcmode!=2){
     Json::die([
@@ -55,7 +66,10 @@ if(!$info){
     ]);
 }
 
-$ownerInfo = RootDB::db()->queryFirstRow('SELECT `name`,`picture`,`imgsvr` FROM member WHERE `NO`=%i',$userID);
+$ownerInfo = RootDB::db()->queryFirstRow(
+    'SELECT `name`,`picture`,`imgsvr`,`grade` FROM member WHERE `NO`=%i',
+    $userID
+);
 if(!$ownerInfo){
     Json::die([
         'result'=>false,
@@ -64,6 +78,27 @@ 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);
@@ -101,35 +136,52 @@ $db->update('select_pool',[
     'reserved_until'=>null,
 ], '(owner=%i or reserved_until < %s) AND general_id is NULL', $userID, $now);
 
-if(key_exists('leadership', $info)){
-    $generalObj->updateVar('leadership', $info['leadership']);
-    $generalObj->updateVar('strength', $info['strength']);
-    $generalObj->updateVar('intel', $info['intel']);
+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('picture', $info)){
+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)){
     $generalObj->updateVar('imgsvr', $info['imgsvr']);
     $generalObj->updateVar('picture', $info['picture']);
 }
 if(key_exists('generalName', $info)){
     $generalObj->updateVar('name', $info['generalName']);
 }
-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));
+$generalObj->setAuxVar('next_change', $now + GameClock::TICKS_PER_TURN * 12);
 
 $userNick = $ownerInfo['name'];
 $generalObj->setVar('owner_name', $userNick);
@@ -148,4 +200,4 @@ $generalObj->applyDB($db);
 Json::die([
     'result'=>true,
     'reason'=>'success'
-]);
+]);

hwe/lib.php

@@ -51,8 +51,9 @@ function MessageBox($str)
 
 function LogText($prefix, $variable)
 {
-    $text = sprintf('%s : %s'."\r\n", $prefix, TVarDumper::dump($variable));
-    file_put_contents(ROOT.'/d_log/'.UniqueConst::$serverName.'_dbg_logs.txt', $text, FILE_APPEND);
+    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);
 }
 
 function prepareDir(string $dirPath, bool $forceCreate=true):bool{

hwe/old_index.php

@@ -1,430 +0,0 @@
-<?php
-
-namespace sammo;
-
-use sammo\DTO\VoteInfo;
-use sammo\Enums\GeneralQueryMode;
-
-include "lib.php";
-include "func.php";
-
-$session = Session::requireLogin()->loginGame()->setReadOnly();
-$userID = Session::getUserID();
-
-increaseRefresh("메인", 1);
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-
-if (!$userID) {
-    header('Location:..');
-    die();
-}
-
-//턴 실행.
-TurnExecutionHelper::executeAllCommand();
-
-if (!$session->isGameLoggedIn()) {
-    header('Location:..');
-    die();
-}
-
-$me = $db->queryFirstRow(
-    'SELECT no,refresh_score,turntime,newmsg,newvote,`officer_level` FROM `general`
-    LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner = %i',
-    $userID
-);
-
-//그새 사망이면
-if ($me === null) {
-    $session->logoutGame();
-    header('Location: ../');
-    die();
-}
-
-$gameStor->cacheAll(true);
-
-if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
-    $db->update('general', [
-        'newmsg' => 0,
-        'newvote' => 0
-    ], 'owner=%i', $userID);
-}
-
-$plock = boolval($db->queryFirstField('SELECT plock FROM plock WHERE `type`="GAME" LIMIT 1'));
-
-$limitState = checkLimit($me['refresh_score']);
-if ($limitState >= 2) {
-    printLimitMsg($me['turntime']);
-    exit();
-}
-
-$generalObj = General::createObjFromDB($me['no'], null, GeneralQueryMode::FullWithAccessLog);
-$generalObj->setRawCity($db->queryFirstRow('SELECT * FROM city WHERE city = %i', $generalObj->getCityID()));
-$scenario = $gameStor->scenario_text;
-
-$nationID = $generalObj->getNationID();
-if ($nationID) {
-    $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
-    $nationStor->cacheAll();
-}
-
-if ($gameStor->extended_general == 0) {
-    $extend = "표준";
-} else {
-    $extend = "확장";
-}
-if ($gameStor->fiction == 0) {
-    $fiction = "사실";
-} else {
-    $fiction = "가상";
-}
-if ($gameStor->npcmode == 0) {
-    $npcmode = "불가능";
-} else if ($gameStor->npcmode == 1) {
-    $npcmode = "가능";
-} else {
-    $npcmode = "선택 생성";
-}
-$color = "cyan";
-$serverName = UniqueConst::$serverName;
-$serverCnt = $gameStor->server_cnt;
-
-$auctionCount = $db->queryFirstField('SELECT count(*) FROM ng_auction WHERE finished = 0');
-$isTournamentActive = $gameStor->tournament > 0;
-$isTournamentApplicationOpen = $gameStor->tournament == 1;
-$isBettingActive = $gameStor->tournament == 6;
-
-$myNationStatic = getNationStaticInfo($generalObj->getNationID());
-$nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
-
-$autorunUser = ($gameStor->autorun_user) ?? [];
-$otherTextInfo = [];
-
-if ($gameStor->join_mode == 'onlyRandom') {
-    $otherTextInfo[] = '랜덤 임관 전용';
-}
-if ($autorunUser['limit_minutes'] ?? false) {
-    $otherTextInfo[] = getAutorunInfo($autorunUser);
-}
-
-if (!$otherTextInfo) {
-    $otherTextInfo = '표준';
-} else {
-    $otherTextInfo = join(', ', $otherTextInfo);
-}
-
-$lastVoteID = $gameStor->lastVote;
-$lastVote = null;
-if ($lastVoteID) {
-    $voteStor = KVStorage::getStorage($db, 'vote');
-    $lastVote = VoteInfo::fromArray($voteStor->getValue("vote_{$lastVoteID}"));
-    if ($lastVote->endDate && $lastVote->endDate < TimeUtil::now()) {
-        $lastVote = null;
-    }
-}
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title><?= $serverName ?>: 메인</title>
-    <meta charset="UTF-8">
-    <meta name="color-scheme" content="dark">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=500" />
-    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('d_shared/base_map.js') ?>
-    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <?= WebUtil::printDist('vue', 'v_main', true) ?>
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printCSS('css/map.css') ?>
-    <?= WebUtil::printStaticValues([
-        //deprecated, staticValues를 이용할 것
-        'serverName' => $serverName,
-        'serverCnt' => $serverCnt,
-        'serverNick' => DB::prefix(),
-        'serverID' => UniqueConst::$serverID,
-        'maxTurn' => GameConst::$maxTurn,
-        'maxPushTurn' => 12,
-        'serverNow' => TimeUtil::now(false),
-        'lastExecuted' => $gameStor->turntime,
-        'isLocked' => $plock,
-        'isTournamentActive' => $isTournamentActive,
-        'isBettingActive' => $isBettingActive,
-        'staticValues' => [
-            'serverName' => $serverName,
-            'serverCnt' => $serverCnt,
-            'serverNick' => DB::prefix(),
-            'serverID' => UniqueConst::$serverID,
-            'maxTurn' => GameConst::$maxTurn,
-            'maxPushTurn' => 12,
-            'serverNow' => TimeUtil::now(false),
-            'lastExecuted' => $gameStor->turntime,
-            'isLocked' => $plock,
-            'isTournamentActive' => $isTournamentActive,
-            'isBettingActive' => $isBettingActive,
-            'mapName' => GameConst::$mapName,
-            'unitSet' => GameConst::$unitSet,
-        ]
-    ]) ?>
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
-</head>
-
-<body class="img_back sam-color-<?= $nationColorType ?>">
-    <div id="container" class="bg0">
-        <div class="row toolbars gx-0">
-            <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></button></div>
-        </div>
-        <div class="tb_layout row gx-0">
-            <div id="server_title" class="row py-2 center">
-                <h3>삼국지 모의전투 HiDCHe <?= $serverName . $serverCnt ?>기 <span class="avoid-wrap">(<font color=cyan><?= $scenario ?></font>)</span></h3>
-            </div>
-
-            <div class="row center gx-0">
-                <div class="s-border-t col py-2 col-8 col-lg-4" style="color:<?= $color ?>;">
-                    <?= $scenario ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
-                    NPC 수, 상성 : <?= $extend ?>,<?= $fiction ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
-                    NPC선택 : <?= $npcmode ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
-                    토너먼트 : <?= getTournamentTermText($gameStor->turnterm) ?>
-                </div>
-                <div class="s-border-t col py-2 col-4 col-lg-2" style="color:<?= $color ?>;">
-                    기타 설정: <?= $otherTextInfo ?>
-                </div>
-
-                <div class="s-border-t col py-2 col-8 col-lg-4"><?= info(2) ?></div>
-                <div class="s-border-t col py-2 col-4 col-lg-2">전체 접속자 수 : <?= $gameStor->online_user_cnt ?> 명</div>
-                <div class="s-border-t col py-2 col-4 col-lg-2">턴당 갱신횟수 : <?= $gameStor->refreshLimit ?>회</div>
-                <div class="s-border-t col py-2 col-8 col-lg-4"><?= info(3) ?></div>
-                <div class="s-border-t py-2 col col-6 col-lg-4">
-                    <?php if ($isTournamentActive) : ?>
-                        ↑<span style='color:cyan'><?= (['전력전', '통솔전', '일기토', '설전',])[$gameStor->tnmt_type] ?? '' ?> <?= getTournament($gameStor->tournament) ?> <?= getTournamentTime() ?></span>↑
-                    <?php else : ?>
-                        <span style='color:magenta'>현재 토너먼트 경기 없음</span>
-                    <?php endif; ?>
-                </div>
-                <div class="s-border-t py-2 col col-6 col-lg-2">
-                    <div style="display:inline-block;"><?= $plock ? ("<span style='color:magenta;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") : ("<span style='color:cyan;'>동작 시각: " . substr($gameStor->turntime, 5, 14) . "</span>") ?></div>
-                </div>
-                <div class="s-border-t py-2 col col-6 col-lg-2">
-                    <?php if ($auctionCount > 0) : ?>
-                        <span style='color:cyan'><?= $auctionCount ?>건</span> 거래 진행중
-                    <?php else : ?>
-                        <span style='color:magenta'>진행중 거래 없음</span>
-                    <?php endif; ?>
-                </div>
-                <div class="s-border-t py-2 col col-6 col-lg-4 vote-cell">
-                    <?php
-                    ?>
-                    <?php if ($lastVote === null) : ?>
-                        <span style='color:magenta'>진행중 설문 없음</span>
-                    <?php else : ?>
-                        <span style='color:cyan'>설문 진행중</span> : <span><?= $lastVote->title ?></span>
-                    <?php endif; ?>
-                </div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t px-2 py-2">접속중인 국가: <?= $gameStor->online_nation ?></div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t px-2 py-2">운영자 메세지 : <span style='color:yellow;'><?= $gameStor->msg ?></span></div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t py-2" id="nation-msg-position">
-                    <div class="px-2">【 국가방침 】</div>
-                    <div id='nation-msg-box'>
-                        <div id='nation-msg'><?= nationMsg($generalObj) ?></div>
-                    </div>
-                </div>
-            </div>
-            <div class="row gx-0">
-                <div class="col s-border-t px-2 py-2">
-                    【 접속자 】<?= onlinegen($generalObj) ?>
-                </div>
-            </div>
-            <?php if ($session->userGrade >= 5) : ?>
-                <div class="row">
-                    <div class="col">
-                        <a href='_admin1.php' target='_blank'><button type='button'>게임관리</button></a>
-                        <a href='_admin2.php' target='_blank'><button type='button'>회원관리</button></a>
-                        <a href='_admin4.php' target='_blank'><button type='button'>멀티관리</button></a>
-                        <a href='_admin5.php' target='_blank'><button type='button'>일제정보</button></a>
-                        <a href='_admin7.php' target='_blank'><button type='button'>로그정보</button></a>
-                        <a href='_admin8.php' target='_blank'><button type='button'>외교정보</button></a>
-                        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
-                    </div>
-                </div>
-            <?php elseif ($session->userGrade == 4) : ?>
-                <div class="row">
-                    <div class="col">
-                        <a href='_119.php' target='_blank'><button type='button'>119</button></a>
-                    </div>
-                </div>
-            <?php endif; ?>
-            <div id="map_view" class="gx-0">
-                <div id="mapZone" class="view-item"><?= getMapHtml() ?></div>
-                <div class="view-item" id="reservedCommandZone">
-                    <div id="reservedCommandList"></div>
-                    <div id="actionMiniPlate" class="gx-0 row">
-                        <div class="col">
-                            <div class="gx-1 row">
-                                <div class="col-8 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
-                                <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div id="cityInfo" class="view-item" style="border:none;text-align:center;"><?= cityInfo($generalObj) ?></div>
-                <div id="nation-position"><?php myNationInfo($generalObj); ?></div>
-                <div id="general-position"><?php generalInfo($generalObj); ?></div>
-                <div id="generalCommandButton" class="row gx-0">
-                    <div class="buttonPlate bg2">
-                        ?></div>
-                </div>
-            </div>
-        </div>
-        <div id="actionMiniPlateSub" class="gx-0 row">
-            <div class="col">
-                <div class="gx-1 row">
-                    <div class="col-3 d-grid"><button type='button' class="btn btn-dark" onclick="scrollHardTo('reservedCommandList')">명령으로</button></div>
-                    <div class="col-5 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
-                    <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
-                </div>
-            </div>
-        </div>
-        <div class="row gx-0">
-            <div class="col-lg-6" id="general_public_record-position">
-                <div class="bg1 center s-border-tb"><b>장수 동향</b></div>
-                <div id="general_public_record" style="text-align:left;"><?= formatHistoryToHTML(getGlobalActionLogRecent(15)) ?></div>
-            </div>
-            <div class="col-lg-6" id="general_log-position">
-                <div class="bg1 center s-border-tb"><b>개인 기록</b></div>
-                <div id="general_log" style="text-align:left;"><?= formatHistoryToHTML(getGeneralActionLogRecent($me['no'], 15)) ?></div>
-            </div>
-            <div class="col-12" id="world_history-position">
-                <div class="bg1 center s-border-tb"><b>중원 정세</b></div>
-                <div id="world_history" colspan=2 style="text-align:left;"><?= formatHistoryToHTML(getGlobalHistoryLogRecent(15)) ?></div>
-            </div>
-        </div>
-        <div class="row toolbars gx-0">
-            <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></div>
-
-            <div id="message_board" class="row gx-0">
-                <div class="message_input_form bg0 gx-0 row">
-                    <div id="mailbox_list-col" class="col-6 col-lg-2 d-grid">
-                        <select id="mailbox_list" size="1" class="form-control bg-dark text-white">
-                        </select>
-                    </div>
-                    <div id="msg_input-col" class="col-12 col-lg-8 d-grid">
-                        <input type="text" id="msg_input" maxlength="99" class="form-control">
-                    </div>
-                    <div id="msg_submit-col" class="col-6 col-lg-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
-                </div>
-                <div class="col-lg-6 board_side bg0"><a id="public_talk_position"></a>
-                    <div class="board_header bg0">전체 메시지(최고99자)</div>
-                    <section class="public_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="public">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-                <div class="col-lg-6 board_side bg0"><a id="national_talk_position"></a>
-                    <div class="board_header bg0">국가 메시지(최고99자)</div>
-                    <section class="national_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="national">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-                <div class="col-lg-6 board_side bg0"><a id="private_talk_position"></a>
-                    <div class="board_header bg0">개인 메시지(최고99자)</div>
-                    <section class="private_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="private">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-                <div class="col-lg-6 board_side bg0"><a id="diplomacy_talk_position"></a>
-                    <div class="board_header bg0">외교 메시지(최고99자)</div>
-                    <section class="diplomacy_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="diplomacy">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-            </div>
-            <div class="row toolbars gx-0">
-                <div class="buttonPlate"><?= allButton($gameStor->npcmode == 1) ?></div><?= banner() ?>
-            </div>
-        </div>
-        <?php
-        if ($limitState == 1) {
-            MessageBox("접속제한이 얼마 남지 않았습니다!");
-        }
-        if ($me['newmsg'] == 1) {
-            MessageBox("새로운 서신이 도착했습니다!");
-        }
-        if ($me['newvote'] == 1) {
-            $develcost = $gameStor->develcost * 5;
-            MessageBox("설문조사에 참여하시면 금{$develcost}과 유니크템을 드립니다! (우측 상단 설문조사 메뉴)");
-        }
-        ?>
-    </div>
-    <nav class="navbar navbar-expand fixed-bottom navbar-dark bg-dark d-sm-block d-lg-none p-0" id="navbar500">
-        <div class="container-fluid px-0">
-            <div class="collapse navbar-collapse">
-                <ul class="navbar-nav me-auto mx-auto">
-                    <li class="nav-item dropup">
-                        <div class="dropdown-toggle text-white btn btn-sammo-base2" id="navbarGlobal" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            외부 메뉴
-                        </div>
-                        <ul class="dropdown-menu dropdown-menu-start" aria-labelledby="navbarGlobal" id="navbarGlobalItems">
-                            <?= allButton($gameStor->npcmode == 1, ['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item']) ?>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropup">
-                        <div class="dropdown-toggle btn btn-sammo-nation" id="navbarNation" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            국가 메뉴
-                        </div>
-                        <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
-                        </ul>
-                    </li>
-                    <li class="nav-item dropup">
-                        <div class="dropdown-toggle text-white btn btn-dark" id="navbarQuick" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            빠른 이동
-                        </div>
-                        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown" id="navbarQuickItems">
-                            <li><a class="dropdown-item disabled">국가 정보</a></button></li>
-                            <hr class="dropdown-divider">
-                            </hr>
-                            <li><button type="button" onclick="scrollHardTo('nation-msg-position')" class="dropdown-item">방침</button></li>
-                            <li><button type="button" onclick="scrollHardTo('reservedCommandList')" class="dropdown-item">명령</button></li>
-                            <li><button type="button" onclick="scrollHardTo('nation-position')" class="dropdown-item">국가</button></li>
-                            <li><button type="button" onclick="scrollHardTo('general-position')" class="dropdown-item">장수</button></li>
-                            <li><button type="button" onclick="scrollHardTo('cityInfo')" class="dropdown-item">도시</button></li>
-                            <li><a class="dropdown-item disabled">동향 정보</a></button></li>
-                            <hr class="dropdown-divider">
-                            </hr>
-                            <li><button type="button" onclick="scrollHardTo('mapZone')" class="dropdown-item">지도</button></li>
-                            <li><button type="button" onclick="scrollHardTo('general_public_record-position')" class="dropdown-item">동향</button></li>
-                            <li><button type="button" onclick="scrollHardTo('general_log-position')" class="dropdown-item">개인</button></li>
-                            <li><button type="button" onclick="scrollHardTo('world_history-position')" class="dropdown-item">정세</button></li>
-                            <li><span>&nbsp;</span></li>
-                            <li><a class="dropdown-item disabled">메시지</a></button></li>
-                            <hr class="dropdown-divider">
-                            </hr>
-                            <li><button type="button" onclick="scrollHardTo('public_talk_position')" class="dropdown-item">전체</button></li>
-                            <li><button type="button" onclick="scrollHardTo('national_talk_position')" class="dropdown-item">국가</button></li>
-                            <li><button type="button" onclick="scrollHardTo('private_talk_position')" class="dropdown-item">개인</button></li>
-                            <li><button type="button" onclick="scrollHardTo('diplomacy_talk_position')" class="dropdown-item">외교</button></li>
-                            <li><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></li>
-                        </ul>
-                    </li>
-                    <li class="nav-item">
-                        <a class="refreshPage btn btn-sammo-base2 text-white" role="button">갱신</a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </nav>
-</body>
-
-</html>

hwe/proc.php

@@ -8,4 +8,14 @@ $session = Session::getInstance()->setReadOnly();
 
 $db = DB::db();
 
-TurnExecutionHelper::executeAllCommand();
+$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),
+]);

hwe/process_war.php

@@ -526,7 +526,7 @@ function DeleteConflict($nation)
 function getConquerNation($city): int
 {
     $conflict = Json::decode($city['conflict']);
-    return Util::array_first_key($conflict);
+    return array_key_first($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'] = 1000;
-        $query['wall'] = 1000;
+        $query['def'] = GameConst::$defaultCityWall;
+        $query['wall'] = GameConst::$defaultCityWall;
     } else {
         $query['def'] = $db->sqleval('def_max/2');
         $query['wall'] = $db->sqleval('wall_max/2');

hwe/sammo/API/Auction/BidUniqueAuction.php

@@ -21,7 +21,7 @@ class BidUniqueAuction extends \sammo\BaseAPI
     ])
       ->rule('int', 'amount')
       ->rule('int', 'auctionID')
-      ->rule('boolean', 'extendCloseDate');
+      ->rule('boolean', 'extendCloseTick');
 
     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['extendCloseDate'] ?? false;
+    $tryExtendCloseDate = $this->args['extendCloseTick'] ?? false;
 
     $generalID = $session->generalID;
     $general = General::createObjFromDB($generalID);

hwe/sammo/API/Auction/GetActiveResourceAuctionList.php

@@ -15,6 +15,8 @@ use sammo\General;
 use sammo\Json;
 use sammo\TimeUtil;
 use sammo\Util;
+use sammo\GameClock;
+use sammo\KVStorage;
 
 use function sammo\getAuctionLogRecent;
 
@@ -33,12 +35,13 @@ 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_date` ASC',
+      'SELECT * FROM `ng_auction` WHERE `type` IN %ls AND `finished` = 0 ORDER BY `close_tick` ASC',
       [
         AuctionType::BuyRice->value,
         AuctionType::SellRice->value,
@@ -87,8 +90,8 @@ class GetActiveResourceAuctionList extends \sammo\BaseAPI
         'type' => $auction->type->value,
         'hostGeneralID' => $auction->hostGeneralID,
         'hostName' => $auction->detail->hostName,
-        'openDate' => TimeUtil::format($auction->openDate, false),
-        'closeDate' => TimeUtil::format($auction->closeDate, false),
+        'openDate' => $clock->formatTick($auction->openTick),
+        'closeDate' => $clock->formatTick($auction->closeTick),
         'amount' => $auction->detail->amount,
         'startBidAmount' => $auction->detail->startBidAmount,
         'finishBidAmount' => $auction->detail->finishBidAmount,

hwe/sammo/API/Auction/GetUniqueItemAuctionDetail.php

@@ -14,6 +14,8 @@ 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;
 
@@ -42,6 +44,7 @@ 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'];
@@ -92,9 +95,11 @@ class GetUniqueItemAuctionDetail extends \sammo\BaseAPI
         'target' => $auction->target,
         'isCallerHost' => $auction->hostGeneralID === $generalID,
         'hostName' => $auction->detail->hostName,
-        'closeDate' => TimeUtil::format($auction->closeDate, false),
+        'closeDate' => $clock->formatTick($auction->closeTick),
         'remainCloseDateExtensionCnt' => $auction->detail->remainCloseDateExtensionCnt,
-        'availableLatestBidCloseDate' => TimeUtil::format($auction->detail->availableLatestBidCloseDate, false),
+        'availableLatestBidCloseDate' => $auction->detail->availableLatestBidCloseTick === null
+          ? null
+          : $clock->formatTick($auction->detail->availableLatestBidCloseTick),
       ],
       'bidList' => $responseBid,
       'obfuscatedName' => $obfuscatedName,

hwe/sammo/API/Auction/GetUniqueItemAuctionList.php

@@ -12,6 +12,8 @@ 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
 {
@@ -28,12 +30,13 @@ 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_date` ASC',
+      'SELECT * FROM `ng_auction` WHERE `type` = %s ORDER BY `close_tick` ASC',
       AuctionType::UniqueItem->value
     ) ?? []);
 
@@ -85,9 +88,11 @@ class GetUniqueItemAuctionList extends \sammo\BaseAPI
         'target' => $auction->target,
         'isCallerHost' => $auction->hostGeneralID === $generalID,
         'hostName' => $auction->detail->hostName,
-        'closeDate' => TimeUtil::format($auction->closeDate, false),
+        'closeDate' => $clock->formatTick($auction->closeTick),
         'remainCloseDateExtensionCnt' => $auction->detail->remainCloseDateExtensionCnt,
-        'availableLatestBidCloseDate' => TimeUtil::format($auction->detail->availableLatestBidCloseDate, false),
+        'availableLatestBidCloseDate' => $auction->detail->availableLatestBidCloseTick === null
+          ? null
+          : $clock->formatTick($auction->detail->availableLatestBidCloseTick),
         'highestBid' => [
           'generalName' => $highestBid->aux->generalName,
           'amount' => $highestBid->amount,

hwe/sammo/API/Command/GetReservedCommand.php

@@ -7,9 +7,11 @@ 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;
 
@@ -82,11 +84,12 @@ class GetReservedCommand extends \sammo\BaseAPI
 
         return [
             'result' => true,
-            'turnTime' => $turnTime,
+            'turnTimeTick' => Util::toInt($turnTime),
+            'turnTime' => GameClock::fromStorage($gameStor)->formatTick(Util::toInt($turnTime)),
             'turnTerm' => $turnTerm,
             'year' => $year,
             'month' => $month,
-            'date' => TimeUtil::now(true),
+            'date' => GameClock::fromStorage($gameStor)->formatTick(GameClock::fromStorage($gameStor)->nowTick(), true),
             'turn' => $commandList,
             'autorun_limit' => $generalAux['autorun_limit'] ?? null,
         ];

hwe/sammo/API/General/DieOnPrestart.php

@@ -11,7 +11,8 @@ use sammo\Session;
 use sammo\General;
 use sammo\JosaUtil;
 use sammo\KVStorage;
-use sammo\TimeUtil;
+use sammo\GameClock;
+use sammo\Util;
 
 use function sammo\addTurn;
 use function sammo\increaseRefresh;
@@ -37,8 +38,14 @@ 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,
@@ -46,8 +53,9 @@ class DieOnPrestart extends \sammo\BaseAPI
       $general['no']
     );
 
-    if (!$general) {
-      return '장수가 없습니다';
+    $generalObj = General::createObjFromDB($general['no']);
+    if ($generalObj instanceof DummyGeneral) {
+      trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
     }
 
     increaseRefresh("장수 삭제", 1);
@@ -61,16 +69,21 @@ class DieOnPrestart extends \sammo\BaseAPI
       return '이미 국가에 소속되어있습니다.';
     }
 
-    //서버 가오픈시 할 수 있는 행동
-    $targetTime = addTurn($lastRefresh, $gameStor->turnterm, GameConst::$minTurnDieOnPrestart);
-    if ($targetTime > TimeUtil::now()) {
-      $targetTimeShort = substr($targetTime, 0, 19);
-      return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
+    $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);
     }
 
-    $generalObj = General::createObjFromDB($general['no']);
-    if ($generalObj instanceof DummyGeneral) {
-      trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
+    //서버 가오픈시 할 수 있는 행동
+    if ($targetTime > $nowTick) {
+      $targetTimeShort = $clock->formatTick($targetTime);
+      return "아직 삭제할 수 없습니다. {$targetTimeShort} 부터 가능합니다.";
     }
 
     $generalName = $generalObj->getName();

hwe/sammo/API/General/GetFrontInfo.php

@@ -14,6 +14,7 @@ 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;
@@ -105,6 +106,7 @@ 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'];
@@ -158,6 +160,7 @@ 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,
@@ -210,7 +213,8 @@ class GetFrontInfo extends \sammo\BaseAPI
       'month' => $month,
       'autorunUser' => $autorunUser,
       'turnterm' => $turnterm,
-      'lastExecuted' => $lastExecuted,
+      'lastExecutedTick' => $lastExecuted,
+      'lastExecuted' => $clock->formatTick(Util::toInt($lastExecuted), true),
       'lastVoteID' => $lastVoteID,
       'develCost' => $develCost,
       'noticeMsg' => $noticeMsg,
@@ -224,7 +228,8 @@ class GetFrontInfo extends \sammo\BaseAPI
       'isLocked' => $isLocked,
       'tournamentType' => $tournamentType,
       'tournamentState' => $tournamentState,
-      'tournamentTime' => $tournamentTime,
+      'tournamentTimeTick' => $tournamentTime,
+      'tournamentTime' => $tournamentTime === null ? null : $clock->formatTick(Util::toInt($tournamentTime)),
       'genCount' => $globalGenCount,
       'generalCntLimit' => $generalCntLimit,
       'serverCnt' => $serverCnt,
@@ -361,6 +366,7 @@ 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());
 
@@ -425,8 +431,12 @@ class GetFrontInfo extends \sammo\BaseAPI
       'crew' => $general->getVar(GeneralColumn::crew), // number;
       'train' => $general->getVar(GeneralColumn::train), // number;
       'atmos' => $general->getVar(GeneralColumn::atmos), // number;
-      'turntime' => $general->getVar(GeneralColumn::turntime), // string;
-      'recent_war' => $general->getVar(GeneralColumn::recent_war), // string;
+      '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;
       'horse' => $general->getVar(GeneralColumn::horse), // GameObjClassKey;
       'weapon' => $general->getVar(GeneralColumn::weapon), // GameObjClassKey;
       'book' => $general->getVar(GeneralColumn::book), // GameObjClassKey;
@@ -544,7 +554,7 @@ class GetFrontInfo extends \sammo\BaseAPI
         'result' => false,
         'reason' => '접속 제한중입니다.',
         'recovery' => APIRecoveryType::GameQuota,
-        'recovery_arg' => $general->getVar('turntime'),
+        'recovery_arg' => $general->getTurnTime(),
       ];
     }
 

hwe/sammo/API/General/Join.php

@@ -11,6 +11,7 @@ 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;
@@ -99,7 +100,7 @@ class Join extends \sammo\BaseAPI
         }
 
         $gameID = UniqueConst::$serverID;
-        $alreadyJoined = $db->queryFirstField('SELECT count(*) FROM `storage` WHERE `namespace` = %s AND `key` LIKE %s', 'inheritance_result', "{$gameID}_{$userID}_%");
+        $alreadyJoined = $db->queryFirstField('SELECT COUNT(*) FROM `inheritance_result` WHERE `server_id` = %s AND `owner` = %i', $gameID, $userID);
         if ($alreadyJoined) {
             //이미 받았음
             return 0;
@@ -157,7 +158,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'];
             }
         }
@@ -165,6 +166,7 @@ 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');
@@ -222,7 +224,7 @@ class Join extends \sammo\BaseAPI
 
         $userLogger = new UserLogger($userID, $admin['year'], $admin['month'], false);
 
-        $now = TimeUtil::now(false);
+        $now = $clock->nowTick();
         $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
             UniqueConst::$hiddenSeed,
             'MakeGeneral',
@@ -360,17 +362,14 @@ class Join extends \sammo\BaseAPI
 
             $userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime % 60), "inheritPoint");
 
-            $inheritTurntime += $rng->nextRangeInt(0, 999999) / 1000000;
-
-            $turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $admin['turnterm']));
-            $turntime = $turntime->add(TimeUtil::secondsToDateInterval($inheritTurntime));
-            $turntime = TimeUtil::format($turntime, true);
+            $inheritTurnMicrosecond = $rng->nextRangeInt(0, 999999);
+            $turntime = cutTurn(Util::toInt($admin['turntime']), $admin['turnterm'])
+                + $clock->ticksFromSeconds($inheritTurntime)
+                + intdiv($inheritTurnMicrosecond * $clock->ticksPerSecond(), 1_000_000);
         } else {
-            $turntime = getRandTurn($rng, $admin['turnterm'], new \DateTimeImmutable($admin['turntime']));
+            $turntime = getRandTurn($rng, $admin['turnterm'], Util::toInt($admin['turntime']));
         }
 
-
-        $now = TimeUtil::now(true);
         if ($now >= $turntime) {
             $turntime = addTurn($turntime, $admin['turnterm']);
         }
@@ -435,6 +434,13 @@ 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', [

hwe/sammo/API/Global/ExecuteEngine.php

@@ -8,6 +8,8 @@ use DateTimeInterface;
 use sammo\Enums\APIRecoveryType;
 use sammo\TurnExecutionHelper;
 use sammo\UniqueConst;
+use sammo\GameClock;
+use sammo\KVStorage;
 
 class ExecuteEngine extends \sammo\BaseAPI
 {
@@ -35,11 +37,13 @@ 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,
-        'lastExecuted' => $lastExecuted,
+        'lastExecutedTick' => $lastExecuted,
+        'lastExecuted' => $clock->formatTick($lastExecuted, true),
       ];
     }
 }

hwe/sammo/API/Global/GeneralList.php

@@ -3,6 +3,7 @@
 namespace sammo\API\Global;
 
 use sammo\DB;
+use sammo\GameClock;
 use sammo\Enums\APIRecoveryType;
 use sammo\Json;
 use sammo\KVStorage;
@@ -54,7 +55,7 @@ class GeneralList extends \sammo\BaseAPI
             $availableNextCall = $session->availableNextCallGetGeneralList ?? '2000-01-01 00:00:00';
             $now = new \DateTimeImmutable();
 
-            if ($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 5) {
+            if ($now <= new \DateTimeImmutable($availableNextCall) && $session->userGrade < 6) {
                 return "장수 리스트는 10초에 한번 갱신 가능합니다.\n다음 시간 : " . $availableNextCall;
             }
 
@@ -145,7 +146,8 @@ class GeneralList extends \sammo\BaseAPI
 
 
         if (static::$withToken) {
-            $now = (new \DateTimeImmutable())->format('Y-m-d H:i:s');
+            $gameStor = KVStorage::getStorage($db, 'game_env');
+            $now = GameClock::fromStorage($gameStor)->nowTick();
             $tokens = [];
             foreach ($db->query('SELECT * FROM select_npc_token WHERE `valid_until`>=%s', $now) as $token) {
                 $validUntil = $token['valid_until'];

hwe/sammo/API/InheritAction/ResetStat.php

@@ -4,6 +4,7 @@ namespace sammo\API\InheritAction;
 
 use sammo\Session;
 use DateTimeInterface;
+use sammo\CentennialAllStarGrowthService;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\RankColumn;
@@ -94,6 +95,14 @@ class ResetStat extends \sammo\BaseAPI
         }
         $userLogger = new UserLogger($userID);
 
+        if($general->getNPCType() != 0){
+            return 'NPC는 능력치 초기화를 할 수 없습니다.';
+        }
+
+        if (!CentennialAllStarGrowthService::isStatResetAllowed()) {
+            return '100기 올스타 장수는 능력치 초기화를 사용할 수 없습니다.';
+        }
+
 
         $db = DB::db();
         $gameStor = KVStorage::getStorage($db, 'game_env');

hwe/sammo/API/InheritAction/ResetTurnTime.php

@@ -64,13 +64,11 @@ 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->getTurnTime()
+            $general->getAuxVar('nextTurnTimeBase') ?? $general->getTurnTick()
         )));
 
         $afterTurn = $rng->nextFloat1() * $turnTerm * 60;

hwe/sammo/API/Misc/UploadImage.php

@@ -50,7 +50,7 @@ class UploadImage extends \sammo\BaseAPI
         }
 
         $extension = ltrim($contentType, 'image/');
-        $validExtensions = ['png', 'jpeg', 'jpg', 'gif', 'webp'];
+        $validExtensions = ['png', 'jpeg', 'jpg', 'gif', 'webp', 'avif'];
         if (!in_array(strtolower($extension), $validExtensions)) {
             return '지원하지 않는 이미지 파일입니다: ' . $contentType;
         }

hwe/sammo/API/Nation/GeneralList.php

@@ -8,6 +8,7 @@ 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;
@@ -264,8 +265,11 @@ 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) => substr($rawGeneral['turntime'], 0, 19),
-            'recent_war' => fn ($rawGeneral) => substr($rawGeneral['recent_war'], 0, 19),
+            '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'])),
             'bill' => fn ($rawGeneral) => getBillByLevel($rawGeneral['dedlevel']),
             'reservedCommand' => fn ($rawGeneral) => $reservedCommand[$rawGeneral['no']] ?? null,
             'autorun_limit' => fn ($rawGeneral) => ($rawGeneral['aux'] ?? [])['autorun_limit'] ?? 0,

hwe/sammo/API/NationCommand/GetReservedCommand.php

@@ -8,6 +8,7 @@ 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;
@@ -51,7 +52,8 @@ class GetReservedCommand extends \sammo\BaseAPI
         $nationID = $me['nation'];
         $limitState = checkLimit($me['refresh_score']);
         if ($limitState >= 2) {
-            return "접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 갱신 가능 시각 : {$me['turntime']})";
+            $limitTime = GameClock::fromStorage($gameStor)->formatTick(Util::toInt($me['turntime']), true);
+            return "접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 갱신 가능 시각 : {$limitTime})";
         }
 
         $permission = checkSecretPermission($me);

hwe/sammo/API/Troop/ExitTroop.php

@@ -6,6 +6,9 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\GeneralLite;
+use sammo\StaticEventHandler;
 
 class ExitTroop extends \sammo\BaseAPI
 {
@@ -24,23 +27,35 @@ class ExitTroop extends \sammo\BaseAPI
     $generalID = $session->generalID;
     $db = DB::db();
 
-    $troopID = $db->queryFirstField('SELECT troop FROM general WHERE no = %i', $generalID);
+    $me = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
+    if (!$me) {
+      return '장수 정보를 불러올 수 없습니다.';
+    }
+
+    $troopID = $me->getVar('troop');
     if($troopID == 0){
       return '부대에 소속되어 있지 않습니다.';
     }
 
-    if($generalID != $troopID){
-      $db->update('general', [
-        'troop' => 0,
-      ], '`no` = %i', $generalID);
+    if($troopID != $generalID){
+      StaticEventHandler::handleEvent($me, null, $this::class, [
+        "isTroopLeader" => false,
+      ], $this->args);
+      $me->setVar('troop', 0);
+      $me->applyDB($db);
       return null;
     }
 
     //부대장이다.
+    StaticEventHandler::handleEvent($me, null, $this::class, [
+      "isTroopLeader" => true,
+    ], $this->args);
     $db->update('general', [
       'troop' => 0,
     ], '`troop` = %i', $troopID);
     $db->delete('troop', 'troop_leader = %i', $troopID);
+    $me->setVar('troop', 0);
+    $me->applyDB($db);
 
     return null;
   }

hwe/sammo/API/Troop/JoinTroop.php

@@ -6,6 +6,9 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\GeneralLite;
+use sammo\StaticEventHandler;
 use sammo\StringUtil;
 use sammo\Validator;
 
@@ -32,16 +35,22 @@ class JoinTroop extends \sammo\BaseAPI
 
   public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
   {
-    $userID = $session->userID;
+    $generalID = $session->generalID;
     $troopID = $this->args['troopID'];
 
     $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,nation,`troop`,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
-    if ($me['troop'] != 0) {
+
+    $me = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
+    if(!$me){
+      return '장수 정보를 불러올 수 없습니다.';
+    }
+
+    if($me->getVar('troop') != 0){
       return '이미 부대에 소속되어 있습니다.';
     }
-    $nationID = $me['nation'];
-    if ($nationID == 0) {
+
+    $nationID = $me->getNationID();
+    if($nationID == 0){
       return '국가에 소속되어 있지 않습니다.';
     }
 
@@ -49,11 +58,10 @@ class JoinTroop extends \sammo\BaseAPI
     if (!$troopExists) {
       return '부대가 올바르지 않습니다.';
     }
-    $generalID = $me['no'];
 
-    $db->update('general', [
-      'troop' => $troopID,
-    ], '`no` = %i AND `troop` = %i', $generalID, 0);
+    $me->setVar('troop', $troopID);
+    StaticEventHandler::handleEvent($me, null, $this::class, [], $this->args);
+    $me->applyDB($db);
 
     return null;
   }

hwe/sammo/API/Troop/KickFromTroop.php

@@ -6,6 +6,9 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\GeneralLite;
+use sammo\StaticEventHandler;
 use sammo\Validator;
 
 class KickFromTroop extends \sammo\BaseAPI
@@ -37,7 +40,8 @@ class KickFromTroop extends \sammo\BaseAPI
     $generalID = $this->args['generalID'];
     $db = DB::db();
 
-    $troopID = $db->queryFirstField('SELECT troop FROM general WHERE no = %i', $generalID);
+    $destGeneral = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
+    $troopID = $destGeneral->getVar('troop');
     if($troopID == 0){
       return '부대에 소속되어 있지 않습니다.';
     }
@@ -50,9 +54,10 @@ class KickFromTroop extends \sammo\BaseAPI
       return '부대장을 추방할 수 없습니다.';
     }
 
-    $db->update('general', [
-      'troop' => 0,
-    ], '`no` = %i AND `troop` = %i', $generalID, $troopID);
+    StaticEventHandler::handleEvent($destGeneral, null, $this::class, [], $this->args);
+    $destGeneral->setVar('troop', 0);
+    $destGeneral->applyDB($db);
+    
     return null;
   }
 }

hwe/sammo/API/Troop/NewTroop.php

@@ -6,6 +6,9 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\GeneralLite;
+use sammo\StaticEventHandler;
 use sammo\StringUtil;
 use sammo\Validator;
 
@@ -32,24 +35,23 @@ class NewTroop extends \sammo\BaseAPI
 
   public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
   {
-    $userID = $session->userID;
+    $generalID = $session->generalID;
     $troopName = StringUtil::neutralize($this->args['troopName']);
     if(!$troopName){
       return '부대 이름이 없습니다.';
     }
 
     $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,nation,`troop`,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
-    if($me['troop'] != 0){
+    $me = GeneralLite::createObjFromDB($generalID, ['troop'], GeneralLiteQueryMode::Lite);
+    $troopID = $me->getVar('troop');
+    if($troopID != 0){
       return '이미 부대에 소속되어 있습니다.';
     }
-    $nationID = $me['nation'];
+    $nationID = $me->getNationID();
     if($nationID == 0){
       return '국가에 소속되어 있지 않습니다.';
     }
 
-    $generalID = $me['no'];
-
     $db->insert('troop', [
       'name'=>$troopName,
       'troop_leader'=>$generalID,
@@ -60,9 +62,9 @@ class NewTroop extends \sammo\BaseAPI
       return '부대가 생성되지 않았습니다. 버그일 수 있습니다.';
     }
 
-    $db->update('general', [
-      'troop'=>$generalID
-    ], '`no` = %i', $generalID);
+    $me->setVar('troop', $generalID);
+    StaticEventHandler::handleEvent($me, null, $this::class, [], $this->args);
+    $me->applyDB($db);
 
     return null;
   }

hwe/sammo/API/Troop/SetTroopName.php

@@ -6,6 +6,9 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\Enums\GeneralLiteQueryMode;
+use sammo\GeneralLite;
+use sammo\StaticEventHandler;
 use sammo\StringUtil;
 use sammo\Validator;
 
@@ -36,13 +39,12 @@ class SetTroopName extends \sammo\BaseAPI
 
   public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
   {
-    $userID = $session->userID;
+    $generalID = $session->generalID;
     $db = DB::db();
-    $me = $db->queryFirstRow('SELECT `no`,nation,`officer_level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
-    $permission = checkSecretPermission($me, false);
+    $me = GeneralLite::createObjFromDB($generalID, ['troop', 'permission', 'penalty'], GeneralLiteQueryMode::Lite);
+    $permission = checkSecretPermission($me->getRaw(), false);
     $troopID = $this->args['troopID'];
 
-    $generalID = $me['no'];
     if($generalID != $troopID && $permission < 4){
       return "권한이 부족합니다.";
     }
@@ -52,7 +54,7 @@ class SetTroopName extends \sammo\BaseAPI
       return '부대 이름이 없습니다.';
     }
 
-    $nationID = $me['nation'];
+    $nationID = $me->getNationID();
     $db->update('troop', [
       'name'=>$troopName
     ], 'troop_leader=%i AND `nation`=%i',$troopID, $nationID);
@@ -60,6 +62,7 @@ class SetTroopName extends \sammo\BaseAPI
     if($db->affectedRows() == 0){
       return '부대가 없습니다.';
     }
+    StaticEventHandler::handleEvent($me, null, $this::class, [], $this->args);
 
     return null;
   }

hwe/sammo/API/Vote/NewVote.php

@@ -7,6 +7,7 @@ use sammo\DB;
 use sammo\DTO\VoteInfo;
 use sammo\Enums\APIRecoveryType;
 use sammo\KVStorage;
+use sammo\RootDB;
 use sammo\Session;
 use sammo\TimeUtil;
 use sammo\Util;
@@ -93,6 +94,8 @@ class NewVote extends \sammo\BaseAPI
             }
         }
 
+        $userName = $session->userName;
+
         $db = DB::db();
         $gameStor = KVStorage::getStorage($db, 'game_env');
 
@@ -108,9 +111,11 @@ class NewVote extends \sammo\BaseAPI
 
         $multipleOptions = Util::valueFit($multipleOptions, 0, count($options));
 
+
         $voteInfo = new VoteInfo(
             id: $voteID,
             title: $title,
+            opener: $userName ?? '[SYSTEM]',
             multipleOptions: $multipleOptions,
             startDate: $now,
             endDate: $endDate,

hwe/sammo/AbsFromUserPool.php

@@ -8,6 +8,11 @@ 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();
@@ -25,8 +30,9 @@ abstract class AbsFromUserPool extends AbsGeneralPool{
     }
 
     static public function pickGeneralFromPool(\MeekroDB $db, RandUtil $rng, int $owner, int $pickCnt, ?string $prefix=null):array{
-        $oNow = new \DateTimeImmutable();
-        $now = $oNow->format('Y-m-d H:i:s');
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $clock = GameClock::fromStorage($gameStor);
+        $now = $clock->nowTick();
 
         $db->update('select_pool', [
             'reserved_until'=>null,
@@ -36,17 +42,15 @@ 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']);
-            $dexTotal = array_sum($cand['info']['dex']);
-            $pool[] = [$cand, $dexTotal];
+            $pool[] = [$cand, static::getCandidateWeight($cand['info'], $owner)];
         }
 
         if(count($pool) < $pickCnt){
             throw new \RuntimeException('pool 부족');
         }
 
-        $gameStor = KVStorage::getStorage($db, 'game_env');
-        $result = [];
-        $validUntil = TimeUtil::nowAddMinutes(2 * $gameStor->turnterm);
+        $result = [];
+        $validUntil = $now + GameClock::TICKS_PER_TURN * 2;
         while(count($result) < $pickCnt){
             $cand = $rng->choiceUsingWeightPair($pool);
             $poolID = $cand['id'];
@@ -69,4 +73,4 @@ abstract class AbsFromUserPool extends AbsGeneralPool{
 
         return array_values($result);
     }
-}
+}

hwe/sammo/AbsGeneralPool.php

@@ -34,7 +34,7 @@ abstract class AbsGeneralPool{
      * specialWar
      */
 
-    public function __construct(\MeekroDB $db, RandUtil $rng, array $info, string $validUntil)
+    public function __construct(\MeekroDB $db, RandUtil $rng, array $info, int $validUntil)
     {
         $this->db = $db;
         $this->info = $info;
@@ -92,7 +92,7 @@ abstract class AbsGeneralPool{
         return $this->builder;
     }
 
-    public function getValidUntil():string{
+    public function getValidUntil():int{
         return $this->validUntil;
     }
 
@@ -109,4 +109,4 @@ abstract class AbsGeneralPool{
 
     abstract public static function getPoolName():string;
     abstract public static function initPool(\MeekroDB $db);
-}
+}

hwe/sammo/ActionItem/che_척사_오악진형도.php

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

hwe/sammo/ActionItem/event_전투특기_공성.php

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

hwe/sammo/ActionItem/event_전투특기_궁병.php

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

hwe/sammo/ActionItem/event_전투특기_귀병.php

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

hwe/sammo/ActionItem/event_전투특기_기병.php

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

hwe/sammo/ActionItem/event_전투특기_보병.php

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

hwe/sammo/ActionItem/event_전투특기_척사.php

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

hwe/sammo/ActionItem/event_충차.php

@@ -0,0 +1,52 @@
+<?php
+namespace sammo\ActionItem;
+use \sammo\iAction;
+use \sammo\General;
+use \sammo\SpecialityHelper;
+use \sammo\GameUnitConst;
+use \sammo\WarUnit;
+use \sammo\WarUnitCity;
+use sammo\RandUtil;
+use \sammo\WarUnitTriggerCaller;
+use \sammo\BaseWarUnitTrigger;
+use sammo\WarUnitTrigger\event_충차아이템소모;
+
+class event_충차 extends \sammo\BaseItem{
+
+    protected $rawName = '충차';
+    protected $name = '충차';
+    protected $info = '[전투] 성벽 공격 시 대미지 +50%, 2회용';
+    protected $cost = 2000;
+    protected $consumable = true;
+    protected $buyable = true;
+    protected $reqSecu = 3000;
+
+
+    const REMAIN_KEY = 'remain충차';
+
+    function onArbitraryAction(General $general, RandUtil $rng, string $actionType, ?string $phase = null, $aux = null): ?array
+    {
+        if($actionType != '장비매매'){
+            return $aux;
+        }
+        if($phase != '구매'){
+            return $aux;
+        }
+
+        $general->setAuxVar(static::REMAIN_KEY, 2);
+        return $aux;
+    }
+
+    public function getWarPowerMultiplier(WarUnit $unit):array{
+        if($unit->getOppose() instanceof WarUnitCity){
+            return [1.5, 1];
+        }
+        return [1, 1];
+    }
+
+    public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
+        return new WarUnitTriggerCaller(
+            new event_충차아이템소모($unit, BaseWarUnitTrigger::TYPE_CONSUMABLE_ITEM)
+        );
+    }
+}

hwe/sammo/ActionScenarioEffect/event_MoreEffect.php

@@ -0,0 +1,68 @@
+<?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),
+        );
+    }
+}

hwe/sammo/ActionScenarioEffect/event_UnlimitedDefenceThresholdChange.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace sammo\ActionScenarioEffect;
+
+use \sammo\iAction;
+
+class event_UnlimitedDefenceThresholdChange implements iAction
+{
+    use \sammo\DefaultAction;
+
+    public function onCalcDomestic(string $turnType, string $varType, float $value, $aux = null): float
+    {
+        if ($turnType == 'changeDefenceTrain') {
+            return 0;
+        }
+        return $value;
+    }
+}

hwe/sammo/ActionSpecialDomestic/che_event_공성.php

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

hwe/sammo/ActionSpecialDomestic/che_event_궁병.php

@@ -31,7 +31,7 @@ class che_event_궁병 extends \sammo\BaseSpecial{
         if($statName === 'warAvoidRatio'){
             return $value + 0.2;
         }
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_ARCHER;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialDomestic/che_event_귀병.php

@@ -30,7 +30,7 @@ class che_event_귀병 extends \sammo\BaseSpecial{
         if($statName === 'warMagicSuccessProb'){
             return $value + 0.2;
         }
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_WIZARD;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialDomestic/che_event_기병.php

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

hwe/sammo/ActionSpecialDomestic/che_event_보병.php

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

hwe/sammo/ActionSpecialDomestic/che_event_척사.php

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

hwe/sammo/ActionSpecialWar/che_공성.php

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

hwe/sammo/ActionSpecialWar/che_궁병.php

@@ -31,7 +31,7 @@ class che_궁병 extends \sammo\BaseSpecial{
         if($statName === 'warAvoidRatio'){
             return $value + 0.2;
         }
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_ARCHER;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialWar/che_귀병.php

@@ -30,7 +30,7 @@ class che_귀병 extends \sammo\BaseSpecial{
         if($statName === 'warMagicSuccessProb'){
             return $value + 0.2;
         }
-        if(\sammo\Util::starts_with($statName, 'dex')){
+        if(str_starts_with($statName, 'dex')){
             $myArmType = 'dex'.GameUnitConst::T_WIZARD;
             $opposeArmType = 'dex'.$aux['opposeType']->armType;;
             if($aux['isAttacker'] && $opposeArmType === $statName){

hwe/sammo/ActionSpecialWar/che_기병.php

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

hwe/sammo/ActionSpecialWar/che_보병.php

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

hwe/sammo/ActionSpecialWar/che_척사.php

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

hwe/sammo/Auction.php

@@ -146,40 +146,35 @@ abstract class Auction
     return $this->info;
   }
 
-  public function shrinkCloseDate(?DateTimeInterface $date): ?string
+  public function shrinkCloseTick(?int $tick): ?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 extendLatestBidCloseDate(?DateTimeInterface $date): ?string
+  public function extendLatestBidCloseTick(?int $tick): ?string
   {
-    if ($date === null) {
+    if ($tick === null) {
       $db = DB::db();
       $gameStor = KVStorage::getStorage($db, 'game_env');
+      $clock = GameClock::fromStorage($gameStor);
       $turnTerm = $gameStor->getValue('turnterm');
-      $date = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
-        max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID) * 60
-      ));
+      $tick = $this->info->closeTick + $clock->ticksFromMinutes(
+        max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID)
+      );
     }
-    else{
-      $date = DateTimeImmutable::createFromInterface($date);
-    }
-    if ($this->info->detail->availableLatestBidCloseDate !== null && $date < $this->info->detail->availableLatestBidCloseDate) {
+    if ($this->info->detail->availableLatestBidCloseTick !== null && $tick < $this->info->detail->availableLatestBidCloseTick) {
       return '기간보다 짧습니다.';
     }
-    $this->info->detail->availableLatestBidCloseDate = $date;
+    $this->info->detail->availableLatestBidCloseTick = $tick;
     return null;
   }
 
-  public function extendCloseDate(DateTimeInterface $date, bool $force = false): ?string
+  public function extendCloseTick(int $tick, bool $force = false): ?string
   {
     if (!$force) {
       if ($this->info->detail->remainCloseDateExtensionCnt === null) {
@@ -193,12 +188,11 @@ abstract class Auction
       }
     }
 
-    if ($date < $this->info->closeDate) {
+    if ($tick < $this->info->closeTick) {
       return '종료 기간보다 짧습니다.';
     }
 
-    $closeDate = DateTimeImmutable::createFromInterface($date);
-    $this->info->closeDate = $closeDate;
+    $this->info->closeTick = $tick;
     return null;
   }
 
@@ -245,12 +239,13 @@ abstract class Auction
 
     //TODO: 전역 알림이 나타나야한다. 일반 메시지보다는 중요하고, 메시지보단 약하게..
     //TODO: 바로가기를 제공하는 편이 좋을 것 같다.
+    $clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
     $msg = new Message(
       MessageType::private,
       $src,
       $dest,
       $reason,
-      new DateTime(),
+      DateTime::createFromImmutable($clock->tickToDateTime($clock->nowTick())),
       new DateTime('9999-12-31'),
       []
     );
@@ -275,7 +270,12 @@ abstract class Auction
     $db->update('ng_auction', $this->info->toArray('id'), 'id = %i', $this->info->id);
   }
 
-  private function bidInheritPoint(int $amount, \DateTimeImmutable $now, bool $tryExtendCloseDate): ?string
+  private function bidInheritPoint(
+    int $amount,
+    int $nowTick,
+    \DateTimeImmutable $nowDate,
+    bool $tryExtendCloseDate,
+  ): ?string
   {
     $db = DB::db();
 
@@ -311,7 +311,7 @@ abstract class Auction
       $general->getVar('owner'),
       $general->getID(),
       $amount,
-      $now,
+      $nowDate,
       new AuctionBidItemData(
         $general->getVar('owner_name'),
         $obfuscatedName,
@@ -324,15 +324,16 @@ abstract class Auction
     }
 
     $gameStor = KVStorage::getStorage($db, 'game_env');
+    $clock = GameClock::fromStorage($gameStor);
     $turnTerm = $gameStor->getValue('turnterm');
 
-    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 ($this->info->detail->availableLatestBidCloseTick !== null) {
+      $extendedCloseTick = $nowTick + $clock->ticksFromMinutes(
+        max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID)
+      );
 
-      if ($extendedCloseDate > $this->info->closeDate && $this->info->closeDate < $this->info->detail->availableLatestBidCloseDate) {
-        $this->extendCloseDate(min($extendedCloseDate, $this->info->detail->availableLatestBidCloseDate), true);
+      if ($extendedCloseTick > $this->info->closeTick && $this->info->closeTick < $this->info->detail->availableLatestBidCloseTick) {
+        $this->extendCloseTick(min($extendedCloseTick, $this->info->detail->availableLatestBidCloseTick), true);
         $this->applyDB();
       }
     }
@@ -356,12 +357,16 @@ abstract class Auction
       return '경매가 이미 끝났습니다.';
     }
 
-    $now = new \DateTimeImmutable();
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $clock = GameClock::fromStorage($gameStor);
+    $nowTick = $clock->nowTick();
+    $nowDate = $clock->tickToDateTime($nowTick);
 
-    if ($auctionInfo->closeDate < $now) {
+    if ($auctionInfo->closeTick < $nowTick) {
       return '경매가 이미 끝났습니다.';
     }
-    if ($auctionInfo->openDate > $now) {
+    if ($auctionInfo->openTick > $nowTick) {
       return '경매가 아직 시작되지 않았습니다.';
     }
 
@@ -377,13 +382,11 @@ abstract class Auction
 
 
     if ($auctionInfo->reqResource === ResourceType::inheritancePoint) {
-      return $this->bidInheritPoint($amount, $now, $tryExtendCloseDate);
+      return $this->bidInheritPoint($amount, $nowTick, $nowDate, $tryExtendCloseDate);
     }
 
     //reqResource는 말 그대로 '구매자가 내야하는 자원'이다.
 
-    $db = DB::db();
-
     $highestBid = $this->getHighestBid();
     if (!$auctionInfo->detail->isReverse) {
       if ($highestBid !== null && $amount <= $highestBid->amount) {
@@ -421,7 +424,7 @@ abstract class Auction
       $general->getVar('owner'),
       $general->getID(),
       $amount,
-      $now,
+      $nowDate,
       new AuctionBidItemData(
         $general->getVar('owner_name'),
         $general->getName(),
@@ -436,14 +439,13 @@ abstract class Auction
 
     $general->increaseVar($resType->value, -$morePoint);
 
-    $gameStor = KVStorage::getStorage($db, 'game_env');
     $turnTerm = $gameStor->getValue('turnterm');
-    $extendedCloseDate = $now->add(TimeUtil::secondsToDateInterval(
-      max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID) * 60
-    ));
+    $extendedCloseTick = $nowTick + $clock->ticksFromMinutes(
+      max(static::MIN_EXTENSION_MINUTES_PER_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_PER_BID)
+    );
 
-    if ($extendedCloseDate > $this->info->closeDate) {
-      $this->extendCloseDate($extendedCloseDate, true);
+    if ($extendedCloseTick > $this->info->closeTick) {
+      $this->extendCloseTick($extendedCloseTick, true);
       $this->applyDB();
     }
 
@@ -456,10 +458,10 @@ abstract class Auction
 
   public function tryFinish(): ?bool
   {
-    $now = new DateTimeImmutable();
-    if ($now < $this->info->closeDate) {
-      return null;
-    }
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $clock = GameClock::fromStorage($gameStor);
+    if ($clock->nowTick() < $this->info->closeTick) return null;
 
     //경매를 닫아야한다.
     $highestBid = $this->getHighestBid();
@@ -469,17 +471,15 @@ abstract class Auction
     }
 
     if ($highestBid->aux->tryExtendCloseDate) {
-      $db = DB::db();
-      $gameStor = KVStorage::getStorage($db, 'game_env');
       $turnTerm = $gameStor->getValue('turnterm');
 
       //연장 요청이 있었다.
-      $extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
-        max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_BY_EXTENSION_QUERY) * 60
-      ));
+      $extendedCloseTick = $this->info->closeTick + $clock->ticksFromMinutes(
+        max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_BY_EXTENSION_QUERY)
+      );
 
-      if ($this->extendCloseDate($extendedCloseDate) === null) {
-        $this->extendLatestBidCloseDate(null);
+      if ($this->extendCloseTick($extendedCloseTick) === null) {
+        $this->extendLatestBidCloseTick(null);
         $this->applyDB();
         return false;
       }
@@ -509,12 +509,13 @@ abstract class Auction
 
     //TODO: 전역 알림이 나타나야한다. 일반 메시지보다는 중요하고, 메시지보단 약하게..
     //TODO: 바로가기를 제공하는 편이 좋을 것 같다.
+    $clock = GameClock::fromStorage(KVStorage::getStorage($db, 'game_env'));
     $msg = new Message(
       MessageType::private,
       $src,
       $dest,
       $failReason,
-      new \DateTime(),
+      DateTime::createFromImmutable($clock->tickToDateTime($clock->nowTick())),
       new \DateTime('9999-12-31'),
       []
     );

hwe/sammo/AuctionBasicResource.php

@@ -56,10 +56,11 @@ 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');
-    $closeDate = $now->add(TimeUtil::secondsToDateInterval($closeTurnCnt * $turnTerm * 60));
+    $closeTick = $nowTick + GameClock::TICKS_PER_TURN * $closeTurnCnt;
 
     $openResult = static::openAuction(new AuctionInfo(
       null,
@@ -68,8 +69,8 @@ abstract class AuctionBasicResource extends Auction
       "$amount",
       $general->getId(),
       $bidderRes,
-      $now,
-      $closeDate,
+      $nowTick,
+      $closeTick,
       new AuctionInfoDetail(
         "{$hostResName} {$amount} 경매",
         $general->getName(),
@@ -145,12 +146,13 @@ 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} 경매에 입찰이 없어 취소되었습니다.",
-      new \DateTime(),
+      \DateTime::createFromImmutable($clock->tickToDateTime($clock->nowTick())),
       new \DateTime('9999-12-31'),
       []
     );
@@ -246,8 +248,8 @@ abstract class AuctionBasicResource extends Auction
       $db = DB::db();
       $gameStor = KVStorage::getStorage($db, 'game_env');
       $turnTerm = $gameStor->getValue('turnterm');
-      $date = (new DateTimeImmutable())->add(TimeUtil::secondsToDateInterval($turnTerm * 60));
-      $this->shrinkCloseDate($date);
+      $clock = GameClock::fromStorage($gameStor);
+      $this->shrinkCloseTick($clock->nowTick() + GameClock::TICKS_PER_TURN);
     }
 
     return null;

hwe/sammo/AuctionUniqueItem.php

@@ -72,16 +72,15 @@ class AuctionUniqueItem extends Auction
 
     $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    $now = new DateTimeImmutable();
-
     [$turnTerm, $year, $month] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month']);
-
-    $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
-    ));
+    $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)
+    );
 
     $info = new AuctionInfo(
       null,
@@ -90,8 +89,8 @@ class AuctionUniqueItem extends Auction
       $itemKey,
       $general->getID(),
       ResourceType::inheritancePoint,
-      $now,
-      $closeDate,
+      $nowTick,
+      $closeTick,
       new AuctionInfoDetail(
         "{$item->getName()} 경매",
         static::genObfuscatedName($general->getID()),
@@ -100,7 +99,7 @@ class AuctionUniqueItem extends Auction
         $startAmount,
         null,
         1,
-        $availableLatestBidCloseDate,
+        $availableLatestBidCloseTick,
       )
     );
 
@@ -267,21 +266,22 @@ class AuctionUniqueItem extends Auction
 
     if ($availableEquipUniqueCnt <= 0) {
       $turnTerm = $gameStor->getValue('turnterm');
+      $clock = GameClock::fromStorage($gameStor);
       //제한에 걸렸다면 자동 연장
-      $extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
-        max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_UNIQUE_CNT) * 60
-      ));
+      $extendedCloseTick = $this->info->closeTick + $clock->ticksFromMinutes(
+        max(static::MIN_EXTENSION_MINUTES_BY_EXTENSION_QUERY, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_UNIQUE_CNT)
+      );
 
       if($bidder->getID() != $this->info->hostGeneralID){
         $this->setHostAsNeutral();
       }
-      $this->extendCloseDate($extendedCloseDate, true);
-      $this->extendLatestBidCloseDate(null);
+      $this->extendCloseTick($extendedCloseTick, true);
+      $this->extendLatestBidCloseTick(null);
       $this->applyDB();
       return '유니크 아이템 소유 제한 상태입니다. 종료 시간이 연장됩니다.';
     }
 
-    $isExtendCloseDateRequired = false;
+    $isExtendCloseTickRequired = 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: 이 경우에는 환불이 되던가 해야함.
-        $isExtendCloseDateRequired = true;
+        $isExtendCloseTickRequired = true;
         $reasons[] = '이미 그 유니크를 가지고 있습니다.';
         continue;
       }
 
       if (!$ownItem->isBuyable()) {
-        $isExtendCloseDateRequired = true;
+        $isExtendCloseTickRequired = true;
         $reasons[] = '이미 다른 유니크를 가지고 있습니다.';
         continue;
       }
@@ -313,18 +313,19 @@ class AuctionUniqueItem extends Auction
     }
 
     if (!$availableItemTypes) {
-      if ($isExtendCloseDateRequired) {
+      if ($isExtendCloseTickRequired) {
         $turnTerm = $gameStor->getValue('turnterm');
+        $clock = GameClock::fromStorage($gameStor);
         //동일 부위 제한에 걸렸다면 자동 연장
-        $extendedCloseDate = $this->info->closeDate->add(TimeUtil::secondsToDateInterval(
-          max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID) * 60
-        ));
+        $extendedCloseTick = $this->info->closeTick + $clock->ticksFromMinutes(
+          max(static::MIN_EXTENSION_MINUTES_LIMIT_BY_BID, $turnTerm * static::COEFF_EXTENSION_MINUTES_LIMIT_BY_BID)
+        );
 
         if($bidder->getID() != $this->info->hostGeneralID){
           $this->setHostAsNeutral();
         }
-        $this->extendCloseDate($extendedCloseDate, true);
-        $this->extendLatestBidCloseDate(null);
+        $this->extendCloseTick($extendedCloseTick, true);
+        $this->extendLatestBidCloseTick(null);
         $this->applyDB();
       }
       return join(' ', $reasons);

hwe/sammo/BaseStaticEvent.php

@@ -0,0 +1,11 @@
+<?php
+namespace sammo;
+
+abstract class BaseStaticEvent {
+    
+    function __construct(){
+
+    }
+
+    abstract function run(GeneralLite|General $general, null|GeneralLite|General $destGeneral, array $env, array $params): bool | string;
+}

hwe/sammo/CentennialAllStarGrowthService.php

@@ -0,0 +1,640 @@
+<?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);
+    }
+}

hwe/sammo/Command/BaseCommand.php

@@ -5,6 +5,7 @@ use \sammo\{
     Util, JosaUtil, DB,
     General, GameConst,
     ActionLogger,
+    Json,
     LastTurn,
     NotInheritedMethodException,
     RandUtil
@@ -118,6 +119,7 @@ abstract class BaseCommand{
         $nationID = $this->generalObj->getNationID();
         if($nationID == 0){
             $this->nation = $this->generalObj->getStaticNation();
+            $this->nation['aux'] = [];
             return;
         }
 
@@ -138,7 +140,8 @@ abstract class BaseCommand{
             'gold'=>0,
             'rice'=>2000,
             'tech'=>0,
-            'gennum'=>1
+            'gennum'=>1,
+            'aux'=>'{}',
         ];
 
         if($this->nation && $this->nation['nation'] === $nationID){
@@ -170,6 +173,10 @@ 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){
@@ -312,12 +319,12 @@ abstract class BaseCommand{
 
         $this->generalObj->unpackAux();
         $constraintInput = [
-            'general'=>$this->generalObj->getRaw(),
+            'general'=>$this->generalObj,
             'city'=>$this->city,
             'nation'=>$this->nation,
             'cmd_arg'=>$this->arg,
 
-            'destGeneral'=>$this->destGeneralObj?$this->destGeneralObj->getRaw():null,
+            'destGeneral'=>$this->destGeneralObj??null,
             'destCity'=>$this->destCity,
             'destNation'=>$this->destNation,
         ];
@@ -346,12 +353,12 @@ abstract class BaseCommand{
 
         $this->generalObj->unpackAux();
         $constraintInput = [
-            'general'=>$this->generalObj->getRaw(),
+            'general'=>$this->generalObj,
             'city'=>$this->city,
             'nation'=>$this->nation,
             'cmd_arg'=>$this->arg,
 
-            'destGeneral'=>$this->destGeneralObj?$this->destGeneralObj->getRaw():null,
+            'destGeneral'=>$this->destGeneralObj??null,
             'destCity'=>$this->destCity,
             'destNation'=>$this->destNation,
         ];
@@ -384,12 +391,12 @@ abstract class BaseCommand{
 
         $this->generalObj->unpackAux();
         $constraintInput = [
-            'general'=>$this->generalObj->getRaw(),
+            'general'=>$this->generalObj,
             'city'=>$this->city,
             'nation'=>$this->nation,
             'cmd_arg'=>$this->arg,
 
-            'destGeneral'=>$this->destGeneralObj?$this->destGeneralObj->getRaw():null,
+            'destGeneral'=>$this->destGeneralObj??null,
             'destCity'=>$this->destCity,
             'destNation'=>$this->destNation,
         ];