game: 재야 의술장은 국가 장수를 치료하지 않음

hwe/sammo/GeneralTrigger/che_도시치료.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace sammo\GeneralTrigger;
+
 use sammo\BaseGeneralTrigger;
 use sammo\General;
 use sammo\ActionLogger;
@@ -7,10 +9,12 @@ use sammo\DB;
 use sammo\Util;
 use sammo\JosaUtil;
 
-class che_도시치료 extends BaseGeneralTrigger{
+class che_도시치료 extends BaseGeneralTrigger
+{
     protected $priority = 10010;
 
-    public function action(\sammo\RandUtil $rng, ?array $env=null, $arg=null):?array{
+    public function action(\sammo\RandUtil $rng, ?array $env = null, $arg = null): ?array
+    {
 
         /** @var \sammo\General $general */
         $general = $this->object;
@@ -24,12 +28,25 @@ class che_도시치료 extends BaseGeneralTrigger{
 
         $db = DB::db();
 
+        if ($general->getNationID() == 0) {
+            /** @var array{int,string,string}[] $patients */
+            $patients = $db->queryAllLists(
+                'SELECT no,name,nation FROM general WHERE city=%i AND nation=%i AND injury > 10 AND no != %i',
+                $general->getCityID(),
+                0,
+                $general->getID()
+            );
+        }
+        else {
             /** @var array{int,string,string}[] $patients */
             $patients = $db->queryAllLists(
                 'SELECT no,name,nation FROM general WHERE city=%i AND injury > 10 AND no != %i',
                 $general->getCityID(),
                 $general->getID()
             );
+        }
+
+
 
         if (!$patients) {
             return $env;
@@ -66,8 +83,7 @@ class che_도시치료 extends BaseGeneralTrigger{
         if (count($cureList) == 1) {
             $josaUl = JosaUtil::pick($curedPatientName, "을");
             $logger->pushGeneralActionLog("<C>의술</>을 펼쳐 도시의 장수 <Y>{$curedPatientName}</>{$josaUl} 치료합니다!", ActionLogger::PLAIN);
-        }
+        } else {
-        else{
             $otherCount = count($cureList) - 1;
             $logger->pushGeneralActionLog("<C>의술</>을 펼쳐 도시의 장수들 <Y>{$curedPatientName}</> 외 <C>{$otherCount}</>명을 치료합니다!", ActionLogger::PLAIN);
         }