devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

merge: refresh ng_compare for logical game clock

Browse Source
This commit is contained in:
Hide_D
2026-08-04 12:09:58 +00:00
parent bee18f20d0 a38a8867ee
commit 5432590591
124 changed files with 2713 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/compare/monthly_state_snapshot.php
+7
View File
@@ -42,10 +42,13 @@ function monthlySnapshotPick(array $row, array $mapping, array $jsonColumns = []
$db = DB::db();
$game = KVStorage::getStorage($db, 'game_env');
$game->resetCache();
$clock = GameClock::fromStorage($game);
$world = $game->getValues([
'scenario', 'year', 'month', 'turnterm', 'turntime', 'starttime',
'init_year', 'init_month', 'develcost', 'killturn', 'isunited',
]);
$world['turntime'] = $clock->formatTick(Util::toInt($world['turntime']), true);
$world['starttime'] = $clock->formatTick(Util::toInt($world['starttime']), true);
$generals = [];
foreach ($db->query('SELECT * FROM general ORDER BY no') as $row) {
@@ -69,6 +72,10 @@ foreach ($db->query('SELECT * FROM general ORDER BY no') as $row) {
'dex4', 'dex5', 'killTurn', 'affinity', 'birthYear', 'deathYear', 'specAge', 'specAge2'] as $key) {
$general[$key] = (int)$general[$key];
}
$general['turnTime'] = $clock->formatTick(Util::toInt($general['turnTime']), true);
$general['recentWarTime'] = $general['recentWarTime'] === null
? null
: $clock->formatTick(Util::toInt($general['recentWarTime']), true);
$generals[] = $general;
}