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

fix: 이민족 발동 시 수도가 이성이라 수도를 옮겼는데 다시 이성이 되는 경우 해결 #250

Merged
Hide_D merged 2 commits from jyp9/core:invader_capital_refix into devel 2024-02-29 10:17:53 +09:00
Conversation 0 Commits 2 Files Changed 1
+6 -2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Event/Action/RaiseInvader.php
+6 -2
View File
@@ -67,12 +67,16 @@ 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 from city WHERE nation = %i AND city != %i', $nation, $oldCapital);
$capitalCandidates = $db->queryFirstColumn('SELECT city from city WHERE nation = %i AND city != %i', $nation, $oldCapital);
if (!$capitalCandidates) {
$disabledInvaderCity->add($oldCapital);
continue;
}
$newCapital = $rng->choice($capitalCandidates);
do {
$newCapital = $rng->choice($capitalCandidates);
} while(in_array($newCapital, $cities);
$db->update('nation', ['capital' => $newCapital], 'nation=%i', $nation);
$db->update('general', ['city' => $newCapital], 'nation=%i and city=%i', $nation, $oldCapital);
}