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

merge(compare): preserve nullable monthly snapshots

Browse Source
This commit is contained in:
Hide_D
2026-08-15 09:45:24 +00:00
parent 4eca886d61 04caf67851
commit 41a42e4413
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/compare/monthly_state_snapshot.php
+3 -1
View File
@@ -64,6 +64,7 @@ foreach ($db->query('SELECT * FROM general ORDER BY no') as $row) {
'recentWarTime' => 'recent_war', 'lastTurn' => 'last_turn', 'meta' => 'aux', 'recentWarTime' => 'recent_war', 'lastTurn' => 'last_turn', 'meta' => 'aux',
'affinity' => 'affinity', 'birthYear' => 'bornyear', 'deathYear' => 'deadyear', 'affinity' => 'affinity', 'birthYear' => 'bornyear', 'deathYear' => 'deadyear',
'personality' => 'personal', 'specialDomestic' => 'special', 'specialWar' => 'special2', 'personality' => 'personal', 'specialDomestic' => 'special', 'specialWar' => 'special2',
'horse' => 'horse', 'weapon' => 'weapon', 'book' => 'book', 'item' => 'item',
'specAge' => 'specage', 'specAge2' => 'specage2', 'specAge' => 'specage', 'specAge2' => 'specage2',
'dex1' => 'dex1', 'dex2' => 'dex2', 'dex3' => 'dex3', 'dex4' => 'dex4', 'dex5' => 'dex5', 'dex1' => 'dex1', 'dex2' => 'dex2', 'dex3' => 'dex3', 'dex4' => 'dex4', 'dex5' => 'dex5',
'killTurn' => 'killturn', 'killTurn' => 'killturn',
@@ -98,10 +99,11 @@ foreach ($db->query('SELECT * FROM city ORDER BY city') as $row) {
'trust' => 'trust', 'trade' => 'trade', 'conflict' => 'conflict', 'trust' => 'trust', 'trade' => 'trade', 'conflict' => 'conflict',
], ['conflict']); ], ['conflict']);
foreach (array_keys($city) as $key) { foreach (array_keys($city) as $key) {
if ($key !== 'name' && $key !== 'conflict' && $key !== 'trust') { if ($key !== 'name' && $key !== 'conflict' && $key !== 'trust' && $key !== 'trade') {
$city[$key] = (int)$city[$key]; $city[$key] = (int)$city[$key];
} }
} }
$city['trade'] = $city['trade'] === null ? null : (int)$city['trade'];
$cities[] = $city; $cities[] = $city;
} }