diff --git a/hwe/sammo/Command/General/che_거병.php b/hwe/sammo/Command/General/che_거병.php index 93bbee21..3239915d 100644 --- a/hwe/sammo/Command/General/che_거병.php +++ b/hwe/sammo/Command/General/che_거병.php @@ -105,6 +105,11 @@ class che_거병 extends Command\GeneralCommand{ $diplomacyInit = []; foreach(getAllNationStaticInfo() as $destNation){ $destNationID = $destNation['nation']; + + if($nationID == $destNationID){ + continue; + } + $diplomacyInit[] = [ 'me'=>$destNationID, 'you'=>$nationID, diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php index 3c4f3075..43009ecd 100644 --- a/hwe/sammo/GeneralAI.php +++ b/hwe/sammo/GeneralAI.php @@ -1239,10 +1239,10 @@ class GeneralAI{ if($nation['rice'] < 2000){ if(($genType & self::t통솔장) && $general->getVar('rice') > $baseArmRice){ - return ['che_헌납', ['isGold'=>false, 'amount'=>($general->getVar('rice') - $baseArmRice) / 2]]; + return ['che_헌납', ['isGold'=>false, 'amount'=>Util::toInt(($general->getVar('rice') - $baseArmRice) / 2)]]; } else if(!($genType & self::t통솔장)){ - return ['che_헌납', ['isGold'=>false, 'amount'=>$general->getVar('rice') / 2]]; + return ['che_헌납', ['isGold'=>false, 'amount'=>Util::toInt($general->getVar('rice') / 2)]]; } }