diff --git a/hwe/sammo/API/General/BuildNationCandidate.php b/hwe/sammo/API/General/BuildNationCandidate.php
index 8d32e5ae..1dc54bf8 100644
--- a/hwe/sammo/API/General/BuildNationCandidate.php
+++ b/hwe/sammo/API/General/BuildNationCandidate.php
@@ -90,9 +90,8 @@ class BuildNationCandidate extends \sammo\BaseAPI
       return '거병을 실패했습니다.';
     }
 
-    if ($general->getNPCType() < 2){
-        $general->setVar('killturn', $env['killturn']);
-    }
+    $general->setVar('killturn', $env['killturn']);
+    $general->applyDB($db);
 
     return null;
   }
diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php
index 6bff6e6a..90d830a9 100644
--- a/hwe/sammo/GeneralAI.php
+++ b/hwe/sammo/GeneralAI.php
@@ -3438,12 +3438,14 @@ class GeneralAI
 
 
         $cmd = buildGeneralCommandClass($this->rng->choice($candidate), $this->general, $this->env);
-        if ($cmd->hasFullConditionMet()) return $cmd;
+        if (!$cmd->hasFullConditionMet()) {
+            $cmd = buildGeneralCommandClass('che_물자조달', $this->general, $this->env);
+        }
+        if (!$cmd->hasFullConditionMet()) {
+            $cmd = buildGeneralCommandClass('che_견문', $this->general, $this->env);
+        }
 
-        $cmd = buildGeneralCommandClass('che_물자조달', $this->general, $this->env);
-        if ($cmd->hasFullConditionMet()) return $cmd;
-
-        return buildGeneralCommandClass('che_견문', $this->general, $this->env);
+        return $cmd;
     }
 
     protected function categorizeNationCities(): void