diff --git a/hwe/func_npc.php b/hwe/func_npc.php index f8911098..52874dec 100644 --- a/hwe/func_npc.php +++ b/hwe/func_npc.php @@ -56,8 +56,11 @@ class AIAllowedAction{ case 'recruit': $this->recruit = true; $this->changeWarCondition = true; + break; + case 'train': $this->train = true; $this->atmos = true; + $this->changeWarCondition = true; break; case 'battle': $this->battle = true; diff --git a/hwe/j_server_basic_info.php b/hwe/j_server_basic_info.php index ce39ee90..a3fc9c9d 100644 --- a/hwe/j_server_basic_info.php +++ b/hwe/j_server_basic_info.php @@ -47,8 +47,9 @@ if(file_exists(__dir__.'/.htaccess')){ switch($auto_option){ case 'develop': $auto_info['내정'] = '내정'; break; case 'warp': $auto_info['순간이동'] = '순간이동'; break; - case 'recruit': $auto_info['징훈사'] = $auto_info['징훈사']??'징훈사'; break; - case 'recruit_high': $auto_info['징훈사'] = '모훈사'; break; + case 'recruit': $auto_info['징병'] = $auto_info['징병']??'징병'; break; + case 'recruit_high': $auto_info['징병'] = '모병'; break; + case 'train': $auto_info['훈사'] = '훈련/사기진작'; break; case 'battle': $auto_info['출병'] = '출병'; break; } } @@ -125,8 +126,9 @@ if($admin['autorun_user']['limit_minutes']??false){ switch($auto_option){ case 'develop': $auto_info['내정'] = '내정'; break; case 'warp': $auto_info['순간이동'] = '순간이동'; break; - case 'recruit': $auto_info['징훈사'] = $auto_info['징훈사']??'징훈사'; break; - case 'recruit_high': $auto_info['징훈사'] = '모훈사'; break; + case 'recruit': $auto_info['징병'] = $auto_info['징병']??'징병'; break; + case 'recruit_high': $auto_info['징병'] = '모병'; break; + case 'train': $auto_info['훈사'] = '훈련/사기진작'; break; case 'battle': $auto_info['출병'] = '출병'; break; } }