From c0190959e3bbdfa8b923d001a7d0275a65736a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=A5=98=ED=99=94=EC=98=81=28=ED=8F=AC=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=EB=AA=A8=EB=8D=94=EB=8B=88=EC=A6=98=29?= <>
Date: Thu, 29 Feb 2024 08:01:02 +0900
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EC=9D=B4=EB=AF=BC=EC=A1=B1=20?=
 =?UTF-8?q?=EB=B0=9C=EB=8F=99=20=EC=8B=9C=20=EC=88=98=EB=8F=84=EA=B0=80=20?=
 =?UTF-8?q?=EC=9D=B4=EC=84=B1=EC=9D=B4=EB=9D=BC=20=EC=88=98=EB=8F=84?=
 =?UTF-8?q?=EB=A5=BC=20=EC=98=AE=EA=B2=BC=EB=8A=94=EB=8D=B0=20=EB=8B=A4?=
 =?UTF-8?q?=EC=8B=9C=20=EC=9D=B4=EC=84=B1=EC=9D=B4=20=EB=90=98=EB=8A=94=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Event/Action/RaiseInvader.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/Event/Action/RaiseInvader.php b/hwe/sammo/Event/Action/RaiseInvader.php
index b93075ec..32b0d87f 100644
--- a/hwe/sammo/Event/Action/RaiseInvader.php
+++ b/hwe/sammo/Event/Action/RaiseInvader.php
@@ -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 from city 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);
         }
-- 
2.54.0


From 6cebc903c9f8e741bce8d501a3ddf9d021f99cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=A5=98=ED=99=94=EC=98=81=28=ED=8F=AC=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=EB=AA=A8=EB=8D=94=EB=8B=88=EC=A6=98=29?= <>
Date: Thu, 29 Feb 2024 08:02:11 +0900
Subject: [PATCH 2/2] fix: typo

---
 hwe/sammo/Event/Action/RaiseInvader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sammo/Event/Action/RaiseInvader.php b/hwe/sammo/Event/Action/RaiseInvader.php
index 32b0d87f..00572fa6 100644
--- a/hwe/sammo/Event/Action/RaiseInvader.php
+++ b/hwe/sammo/Event/Action/RaiseInvader.php
@@ -67,7 +67,7 @@ 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 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;
-- 
2.54.0