버그 수정

hwe/sammo/Command/General/che_랜덤임관.php

@@ -29,9 +29,14 @@ class che_랜덤임관 extends Command\GeneralCommand{
     static public $reqArg = false;
 
     protected function argTest():bool{
-        if($this->arg === null){
+        $this->arg = null;
+        return true;
+
+        //TODO: 구현
+        /*if($this->arg === null){
             return true;
         }
+        
         $destNationIDList = $this->arg['destNationIDList']??null;
         //null은 에러, []는 정상
 
@@ -53,7 +58,7 @@ class che_랜덤임관 extends Command\GeneralCommand{
             'destNationIDList' => $destNationIDList
         ];    
         
-        return true;
+        return true;*/
     }
 
     protected function init(){
@@ -71,9 +76,11 @@ class che_랜덤임관 extends Command\GeneralCommand{
             ConstraintHelper::AllowJoinAction(),
         ];
 
+        /*
         if($this->arg['destNationIDList']??false){
             $this->runnableConstraints[] = ConstraintHelper::ExistsAllowJoinNation($relYear, $this->arg['destNationIDList']);
         }
+        */
     }
 
     public function getCost():array{
@@ -103,7 +110,10 @@ class che_랜덤임관 extends Command\GeneralCommand{
 
         $relYear = $env['year'] - $env['startyear'];
 
+        /*
         $notIn = array_merge($general->getAuxVar('joinedNations')??[], $this->arg['destNationIDList']);
+        */
+        $notIn = null;
 
         $destNation = null;
 

hwe/sammo/Command/General/che_증여.php

@@ -145,8 +145,8 @@ class che_증여 extends Command\GeneralCommand{
         $destGeneral->increaseVarWithLimit($resKey, $amount);
         $general->increaseVarWithLimit($resKey, -$amount, 0);
 
-        $destGeneral->getLogger()->pushGeneralActionLog("{$general->getName()}</>에게서 {$resName} <C>{$amountText}</>을 증여 받았습니다.", ActionLogger::PLAIN);
-        $logger->pushGeneralActionLog("{$destGeneral->getName()}에게 {$resName} <C>$amountText</>을 증여했습니다. <1>$date</>");
+        $destGeneral->getLogger()->pushGeneralActionLog("<Y>{$general->getName()}</>에게서 {$resName} <C>{$amountText}</>을 증여 받았습니다.", ActionLogger::PLAIN);
+        $logger->pushGeneralActionLog("<Y>{$destGeneral->getName()}</>에게 {$resName} <C>$amountText</>을 증여했습니다. <1>$date</>");
 
         $exp = 70;
         $ded = 100;

hwe/sammo/Command/General/che_출병.php

@@ -84,6 +84,13 @@ class che_출병 extends Command\GeneralCommand{
         return 0;
     }
 
+    public function getBrief():string{
+        $commandName = $this->getName();
+        $destCityName = CityConst::byID($this->arg['destCityID'])->name;
+        $josaRo = JosaUtil::pick($destCityName, '로');
+        return "【{$destCityName}】{$josaRo} {$commandName}";
+    }
+
     public function getFailString():string{
         $commandName = $this->getName();
         $failReason = $this->testRunnable();

hwe/sammo/Command/Nation/che_몰수.php

@@ -182,7 +182,7 @@ class che_몰수 extends Command\NationCommand{
         ], 'nation=%i', $nationID);
 
         $destGeneral->getLogger()->pushGeneralActionLog("{$resName} {$amountText}을 몰수 당했습니다.", ActionLogger::PLAIN);
-        $logger->pushGeneralActionLog("{$destGeneral->getName()}에게서 {$resName} <C>$amountText</>을 몰수했습니다. <1>$date</>");
+        $logger->pushGeneralActionLog("<Y>{$destGeneral->getName()}</>에게서 {$resName} <C>$amountText</>을 몰수했습니다. <1>$date</>");
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->applyDB($db);