fix: 이민족 수도 이동

This commit is contained in:
2024-03-05 16:44:27 +00:00
parent f1e6ac7b89
commit eea34dadad
+7 -3
View File
@@ -67,14 +67,14 @@ class RaiseInvader extends \sammo\Event\Action
foreach ($db->queryAllLists('SELECT capital, nation from nation WHERE capital in %li', $cities) as $row) {
[$oldCapital, $nation] = $row;
$capitalCandidates = $db->queryFirstColumn('SELECT city from city WHERE nation = %i AND city != %i NOT IN %li', $nation, $oldCapital, $cities);
$capitalCandidates = $db->queryFirstColumn('SELECT city from city WHERE nation = %i AND city != %i AND city NOT IN %li', $nation, $oldCapital, $cities);
if (!$capitalCandidates) {
$disabledInvaderCity->add($oldCapital);
continue;
}
$newCapital = $rng->choice($capitalCandidates);
$db->update('nation', ['capital' => $newCapital], 'nation=%i', $nation);
$db->update('general', ['city' => $newCapital], 'nation=%i and city=%i', $nation, $oldCapital);
}
@@ -91,6 +91,10 @@ class RaiseInvader extends \sammo\Event\Action
'supply' => 1,
], 'city in %li', $cities);
if(!$disabledInvaderCity->isEmpty()){
refreshNationStaticInfo();
}
return $disabledInvaderCity;
}