neutralize 일부 롤백

과거의 나는 다 계획이 있었구나.

hwe/j_board_article_add.php

@@ -34,8 +34,8 @@ if($title === null || $text === null){
     ]);
 }
 
-$title = StringUtil::neutralize($title);
+$title = trim($title);
-$text = StringUtil::neutralize($text);
+$text = trim($text);
 
 if(!$title && !$text){
     Json::die([

hwe/j_board_comment_add.php

@@ -33,7 +33,7 @@ if($articleNo === null || $text === null){
     ]);
 }
 
-$text = StringUtil::neutralize($text);
+$text = trim($text);
 
 if(!$text){
     Json::die([

hwe/j_diplomacy_respond_letter.php

@@ -45,7 +45,7 @@ if ($permission < 4) {
     ]);
 }
 
-$reason = StringUtil::neutralize($reason);
+$reason = trim($reason);
 
 $letter = $db->queryFirstRow('SELECT * FROM ng_diplomacy WHERE no=%i AND dest_nation_id = %i AND state = \'proposed\'', $letterNo, $me['nation']);
 if(!$letter){

hwe/j_diplomacy_send_letter.php

@@ -46,8 +46,8 @@ if($textBrief === null || $textDetail === null){
     ]);
 }
 
-$textBrief = StringUtil::neutralize($textBrief);
+$textBrief = trim($textBrief);
-$textDetail = StringUtil::neutralize($textDetail);
+$textDetail = trim($textDetail);
 
 if(!$textBrief){
     Json::die([

hwe/j_msg_submit.php

@@ -23,7 +23,7 @@ if(!$v->validate()){
 }
 
 $mailbox = (int)$post['mailbox'];
-$text = StringUtil::neutralize(StringUtil::cutStringForWidth($post['text'], 199, ''));
+$text = trim(StringUtil::cutStringForWidth($post['text'], 199, ''));
 
 $session = Session::requireGameLogin([
     'msgID'=>null

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

@@ -89,6 +89,9 @@ class che_거병 extends Command\GeneralCommand{
         }
 
         $secretlimit = 3;
+        if($env['scenario']>=1000){
+            $secretlimit = 1;
+        }
 
         DB::db()->insert('nation', [
             'name'=>$nationName,

hwe/sammo/GeneralAI.php

@@ -3424,6 +3424,7 @@ class GeneralAI
             $chief = $this->chiefGenerals[$chiefLevel];
             if($chief->getVar('npc') < 2 && $chief->getVar('killturn') >= $minUserKillturn){
                 $userChiefCnt+=1;
+                $chief->setVar('permission', 'ambassador');
             }
         }
 
@@ -3453,6 +3454,7 @@ class GeneralAI
                 $nextChiefs[11] = $general;
                 $general->setVar('officer_level', 11);
                 $general->setVar('officer_city', 0);
+                $general->setVar('permission', 'ambassador');
                 $nation['l11set'] = true;
                 $updatedNationVar['l11set'] = 1;
                 $userChiefCnt += 1;
@@ -3536,6 +3538,7 @@ class GeneralAI
 
             if($newChief->getVar('npc') < 2){
                 $userChiefCnt += 1;
+                $newChief->setVar('permission', 'ambassador');
             }
 
             $nextChiefs[$chiefLevel] = $newChief;