diff --git a/.phan/config.php b/.phan/config.php
index 09faeca8..ea554725 100644
--- a/.phan/config.php
+++ b/.phan/config.php
@@ -7,7 +7,7 @@
  */
 return [
     // Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`,
-    // `'7.4'`, `null`.
+    // `'7.4'`, `'8.0'`, `'8.1'`, `null`.
     // If this is set to `null`,
     // then Phan assumes the PHP version which is closest to the minor version
     // of the php executable used to execute Phan.
@@ -15,9 +15,9 @@ return [
     // Note that the **only** effect of choosing `'5.6'` is to infer
     // that functions removed in php 7.0 exist.
     // (See `backward_compatibility_checks` for additional options)
-    "target_php_version" => '7.3',
-    'backward_compatibility_checks ' => false,
-    'minimum_severity'=>\Phan\Issue::SEVERITY_NORMAL,
+    "target_php_version" => '7.4',
+    'backward_compatibility_checks ' => true,
+    'minimum_severity'=>\Phan\Issue::SEVERITY_CRITICAL,
 
     'file_list' => [
         'f_config/config.php',
@@ -41,11 +41,13 @@ return [
         'hwe/b_dipcenter.php',
         'hwe/b_diplomacy.php',
         'hwe/b_genList.php',
+        'hwe/b_inheritPoint.php',
         'hwe/b_myBossInfo.php',
         'hwe/b_myCityInfo.php',
         'hwe/b_myGenInfo.php',
         'hwe/b_myKingdomInfo.php',
         'hwe/b_myPage.php',
+        'hwe/b_npc_control.php',
         'hwe/b_processing.php',
         'hwe/b_tournament.php',
         'hwe/b_troop.php',
@@ -86,14 +88,18 @@ return [
         'hwe/j_diplomacy_respond_letter.php',
         'hwe/j_diplomacy_rollback_letter.php',
         'hwe/j_diplomacy_send_letter.php',
+        'hwe/j_export_simulator_object.php',
+        'hwe/j_general_log_old.php',
         'hwe/j_general_set_permission.php',
         'hwe/j_general_turn.php',
         'hwe/j_getChiefTurn.php',
+        'hwe/j_get_basic_general_list.php',
         'hwe/j_get_city_list.php',
         'hwe/j_get_general_list.php',
         'hwe/j_get_nation_general_list.php',
         'hwe/j_get_reserved_command.php',
         'hwe/j_get_select_npc_token.php',
+        'hwe/j_get_select_pool.php',
         'hwe/j_image_upload.php',
         'hwe/j_install.php',
         'hwe/j_install_db.php',
@@ -107,15 +113,20 @@ return [
         'hwe/j_msg_get_recent.php',
         'hwe/j_msg_submit.php',
         'hwe/j_myBossInfo.php',
+        'hwe/j_raise_event.php',
         'hwe/j_select_npc.php',
+        'hwe/j_select_picked_general.php',
         'hwe/j_server_basic_info.php',
         'hwe/j_set_chief_command.php',
         'hwe/j_set_general_command.php',
+        'hwe/j_set_my_setting.php',
+        'hwe/j_set_npc_control.php',
         'hwe/j_simulate_battle.php',
         'hwe/j_troop.php',
         'hwe/j_vacation.php',
         'hwe/lib.php',
         'hwe/process_war.php',
+        'hwe/select_general_from_pool.php',
         'hwe/select_npc.php',
         'hwe/t_board.php',
         'hwe/t_diplomacy.php',
diff --git a/composer.json b/composer.json
index e2caa177..df34590d 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     ],
     "config": {
         "platform": {
-            "php": "7.3"
+            "php": "7.4"
         }
     },
     "require": {
diff --git a/f_install/templates/KakaoKey.orig.php b/f_install/templates/KakaoKey.orig.php
index d50c281a..31b9ca24 100644
--- a/f_install/templates/KakaoKey.orig.php
+++ b/f_install/templates/KakaoKey.orig.php
@@ -1,6 +1,7 @@
 <?php
 namespace kakao;
 
+// @suppress PhanRedefineClass
 class KakaoKey{
     const REST_KEY = '_tK_REST_API_KEY_';
     const ADMIN_KEY = '_tK_ADMIN_KEY_';
diff --git a/hwe/a_hallOfFame.php b/hwe/a_hallOfFame.php
index d9cdb043..9138f3d2 100644
--- a/hwe/a_hallOfFame.php
+++ b/hwe/a_hallOfFame.php
@@ -28,7 +28,7 @@ $scenarioList = (function(){
 
 
 
-if($scenarioIdx !== null || key_exists($scenarioIdx, $scenarioList)){
+if($scenarioIdx !== null && key_exists($scenarioIdx, $scenarioList)){
     $searchScenarioName = $scenarioList[$seasonIdx][$scenarioIdx]['name'];
     $searchFilter = $db->sqleval('season = %i AND scenario = %i', $seasonIdx, $scenarioIdx);
 }
diff --git a/hwe/a_vote.php b/hwe/a_vote.php
index d2cc36c3..1d791b56 100644
--- a/hwe/a_vote.php
+++ b/hwe/a_vote.php
@@ -12,7 +12,7 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 increaseRefresh("설문조사", 1);
 
 $isVoteAdmin = in_array('vote', $session->acl[DB::prefix()]??[]);
-$isVoteAdmin |= $session->userGrade >= 5;
+$isVoteAdmin = $isVoteAdmin || $session->userGrade >= 5;
 
 $me = $db->queryFirstRow('SELECT no,vote from general where owner=%i', $userID);
 
diff --git a/hwe/c_vote.php b/hwe/c_vote.php
index 0937a10a..748064f3 100644
--- a/hwe/c_vote.php
+++ b/hwe/c_vote.php
@@ -15,7 +15,7 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $isVoteAdmin = in_array('vote', $session->acl[DB::prefix()]??[]);
-$isVoteAdmin |= $session->userGrade >= 5;
+$isVoteAdmin = $isVoteAdmin || $session->userGrade >= 5;
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
diff --git a/hwe/func.php b/hwe/func.php
index dc758aa5..434bafe2 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1006,7 +1006,7 @@ function increaseRefresh($type = "", $cnt = 1)
     $isunited = $gameStor->isunited;
     $opentime = $gameStor->opentime;
 
-    if ($isunited != 2 && $generalID && $userGrade < 6 && $opentime <= TimeUtil::DatetimeNow()) {
+    if ($isunited != 2 && $generalID && $userGrade < 6 && $opentime <= TimeUtil::now()) {
         $db->update('general', [
             'lastrefresh' => $date,
             'con' => $db->sqleval('con + %i', $cnt),
diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php
index 07d52f11..3cf32b26 100644
--- a/hwe/func_gamerule.php
+++ b/hwe/func_gamerule.php
@@ -694,7 +694,7 @@ function updateNationState()
                 $lastAssemblerID += 1;
                 $npcObj = new Scenario\GeneralBuilder(
                     sprintf('부대장%4d', $lastAssemblerID),
-                    0,
+                    false,
                     null,
                     $nation['nation']
                 );
@@ -1052,7 +1052,7 @@ function checkEmperior()
         $generalLogger->flush();
     }
 
-    $gen = join(', ', array_column($rawGeneral, 'name'));
+    $gen = join(', ', array_column($rawGeneralList, 'name'));
 
     $stat = $db->queryFirstRow('SELECT max(nation_count) as nc, max(gen_count) as gc FROM statistic');
     $genCnt = $db->queryFirstField('SELECT count(*) FROM general');
diff --git a/hwe/install.php b/hwe/install.php
index 309822f3..e60e91ed 100644
--- a/hwe/install.php
+++ b/hwe/install.php
@@ -14,7 +14,7 @@ $serverName = DB::prefix();
 $serverAcl = $session->acl[$serverName]??[];
 $allowReset = in_array('reset', $serverAcl);
 $allowFullReset = in_array('fullReset',$serverAcl);
-$allowReset |= $allowFullReset;
+$allowReset = $allowReset || $allowFullReset;
 
 if($session->userGrade < 5 && !$allowReset){
     die('관리자 아님');
diff --git a/hwe/j_get_nation_general_list.php b/hwe/j_get_nation_general_list.php
index ce9ac225..f5ad6fde 100644
--- a/hwe/j_get_nation_general_list.php
+++ b/hwe/j_get_nation_general_list.php
@@ -157,6 +157,7 @@ foreach ($customViewColumns as $column => $reqPermission) {
     $resultColumns[] = $column;
 }
 
+$generalList = [];
 foreach ($rawGeneralList as $rawGeneral) {
     //General 생성?
 
diff --git a/hwe/j_install.php b/hwe/j_install.php
index 4a7c1317..c5f3547d 100644
--- a/hwe/j_install.php
+++ b/hwe/j_install.php
@@ -19,7 +19,7 @@ $serverName = DB::prefix();
 $serverAcl = $session->acl[$serverName]??[];
 $allowReset = in_array('reset', $serverAcl);
 $allowFullReset = in_array('fullReset',$serverAcl);
-$allowReset |= $allowFullReset;
+$allowReset = $allowReset || $allowFullReset;
 
 $reserve_open = Util::getPost('reserve_open');
 if($reserve_open && $reserve_open < date('Y-m-d H:i')){
diff --git a/hwe/j_load_scenarios.php b/hwe/j_load_scenarios.php
index d5eaa7af..c023277f 100644
--- a/hwe/j_load_scenarios.php
+++ b/hwe/j_load_scenarios.php
@@ -9,7 +9,7 @@ $serverName = DB::prefix();
 $serverAcl = $session->acl[$serverName]??[];
 $allowReset = in_array('reset', $serverAcl);
 $allowFullReset = in_array('fullReset',$serverAcl);
-$allowReset |= $allowFullReset;
+$allowReset = $allowReset || $allowFullReset;
 
 if($session->userGrade < 5 && !$allowReset){
     Json::die([
diff --git a/hwe/j_msg_get_recent.php b/hwe/j_msg_get_recent.php
index d7e5e17e..e71e9b65 100644
--- a/hwe/j_msg_get_recent.php
+++ b/hwe/j_msg_get_recent.php
@@ -32,7 +32,7 @@ $lastMsgGet[] = TimeUtil::now();
 $session->lastMsgGet = Json::encode($lastMsgGet);
 
 if($delayTime){
-    sleep(0.2);
+    usleep(200);
 }
 $session->setReadOnly();
 
diff --git a/hwe/sammo/ActionNationType/che_병가.php b/hwe/sammo/ActionNationType/che_병가.php
index 401dc1fc..47094298 100644
--- a/hwe/sammo/ActionNationType/che_병가.php
+++ b/hwe/sammo/ActionNationType/che_병가.php
@@ -31,7 +31,7 @@ class che_병가 extends \sammo\BaseNation{
 
     public function onCalcNationalIncome(string $type, $amount):int{
         if($type == 'pop' && $amount > 0){
-            return $amount * 0.8;
+            return Util::toInt($amount * 0.8);
         }
         
         return $amount;
diff --git a/hwe/sammo/AutorunGeneralPolicy.php b/hwe/sammo/AutorunGeneralPolicy.php
index 272993e2..ac3b8cfc 100644
--- a/hwe/sammo/AutorunGeneralPolicy.php
+++ b/hwe/sammo/AutorunGeneralPolicy.php
@@ -39,7 +39,7 @@ class AutorunGeneralPolicy{
     
 
 
-    static public $default_priority = [
+    static public array $default_priority = [
         'NPC사망대비',
         '귀환',
         '금쌀구매',
@@ -89,6 +89,8 @@ class AutorunGeneralPolicy{
     public $can건국 = true;
     public $can선양 = false;
 
+    public array $priority;
+
     function doNPCState(General $general){
         $npc = $general->getNPCType();
         $nationID = $general->getNationID();
diff --git a/hwe/sammo/Command/BaseCommand.php b/hwe/sammo/Command/BaseCommand.php
index fbde7f17..65ead2ee 100644
--- a/hwe/sammo/Command/BaseCommand.php
+++ b/hwe/sammo/Command/BaseCommand.php
@@ -18,6 +18,7 @@ abstract class BaseCommand{
     static protected $actionName = 'CommandName';
     static public $reqArg = false;
     static protected $isLazyCalcReqTurn = false;
+    public ?string $reason;
 
     public function getCommandDetailTitle():string{
         return $this->getName();
@@ -32,8 +33,8 @@ abstract class BaseCommand{
 
     /** @var \sammo\General */
     protected $destGeneralObj = null; 
-    protected $destCity = null;
-    protected $destNation = null;
+    protected ?array $destCity = null;
+    protected ?array $destNation = null;
 
     protected $cachedPermissionToReserve = false;
     protected $cachedMinConditionMet = false;
@@ -48,6 +49,7 @@ abstract class BaseCommand{
     protected $fullConditionConstraints = null;
     protected $minConditionConstraints = null;
     protected $permissionConstraints = null;
+    protected $reasonConstraint = null;
 
     protected $logger;
 
diff --git a/hwe/sammo/Command/General/che_강행.php b/hwe/sammo/Command/General/che_강행.php
index d55a9e8e..41f978b8 100644
--- a/hwe/sammo/Command/General/che_강행.php
+++ b/hwe/sammo/Command/General/che_강행.php
@@ -2,23 +2,17 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    ActionLogger,
-    GameConst,
-    GameUnitConst,
-    LastTurn,
-    Command
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\GameUnitConst;
+use \sammo\LastTurn;
+use \sammo\Command;
 
-
-use function\sammo\{
-    tryUniqueItemLottery,
-    printCitiesBasedOnDistance
-};
+use function \sammo\printCitiesBasedOnDistance;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_거병.php b/hwe/sammo/Command/General/che_거병.php
index ff0400bd..02c3262d 100644
--- a/hwe/sammo/Command/General/che_거병.php
+++ b/hwe/sammo/Command/General/che_거병.php
@@ -14,9 +14,7 @@ use \sammo\{
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
-use function sammo\buildNationTypeClass;
 use function sammo\refreshNationStaticInfo;
-use function sammo\GetNationColors;
 use function sammo\getAllNationStaticInfo;
 
 
diff --git a/hwe/sammo/Command/General/che_건국.php b/hwe/sammo/Command/General/che_건국.php
index 0650fff4..16c98b94 100644
--- a/hwe/sammo/Command/General/che_건국.php
+++ b/hwe/sammo/Command/General/che_건국.php
@@ -2,24 +2,19 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    ActionLogger,
-    GameConst,
-    GameUnitConst,
-    LastTurn,
-    Command,
-    Json
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\GameUnitConst;
+use \sammo\LastTurn;
+use \sammo\Command;
+use \sammo\Json;
 
-
-use function\sammo\{
-    tryUniqueItemLottery,
-    getAllNationStaticInfo
-};
+use function \sammo\tryUniqueItemLottery;
+use function \sammo\getAllNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_견문.php b/hwe/sammo/Command/General/che_견문.php
index b390d885..480f955f 100644
--- a/hwe/sammo/Command/General/che_견문.php
+++ b/hwe/sammo/Command/General/che_견문.php
@@ -10,11 +10,6 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use \sammo\TextDecoration\SightseeingMessage;
diff --git a/hwe/sammo/Command/General/che_군량매매.php b/hwe/sammo/Command/General/che_군량매매.php
index 58929c8d..91e723cc 100644
--- a/hwe/sammo/Command/General/che_군량매매.php
+++ b/hwe/sammo/Command/General/che_군량매매.php
@@ -12,11 +12,6 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery,
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\MustNotBeReachedException;
diff --git a/hwe/sammo/Command/General/che_귀환.php b/hwe/sammo/Command/General/che_귀환.php
index 32267c6b..b8c97942 100644
--- a/hwe/sammo/Command/General/che_귀환.php
+++ b/hwe/sammo/Command/General/che_귀환.php
@@ -10,12 +10,6 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    getNationStaticInfo,
-    tryUniqueItemLottery
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
diff --git a/hwe/sammo/Command/General/che_기술연구.php b/hwe/sammo/Command/General/che_기술연구.php
index 9c8cb1db..2ed2c351 100644
--- a/hwe/sammo/Command/General/che_기술연구.php
+++ b/hwe/sammo/Command/General/che_기술연구.php
@@ -11,7 +11,6 @@ use \sammo\{
 
 use function sammo\{
     TechLimit,
-    getDomesticExpLevelBonus,
     CriticalRatioDomestic, 
     CriticalScoreEx,
     tryUniqueItemLottery,
diff --git a/hwe/sammo/Command/General/che_내정특기초기화.php b/hwe/sammo/Command/General/che_내정특기초기화.php
index 8dc6d00f..8236c846 100644
--- a/hwe/sammo/Command/General/che_내정특기초기화.php
+++ b/hwe/sammo/Command/General/che_내정특기초기화.php
@@ -10,11 +10,6 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 
diff --git a/hwe/sammo/Command/General/che_단련.php b/hwe/sammo/Command/General/che_단련.php
index 69dd65fb..c5fa2d63 100644
--- a/hwe/sammo/Command/General/che_단련.php
+++ b/hwe/sammo/Command/General/che_단련.php
@@ -11,9 +11,7 @@ use \sammo\{
 };
 
 
-use function \sammo\{
-    tryUniqueItemLottery
-};
+use function \sammo\tryUniqueItemLottery;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_등용.php b/hwe/sammo/Command/General/che_등용.php
index c7e3b13c..ec6b9949 100644
--- a/hwe/sammo/Command/General/che_등용.php
+++ b/hwe/sammo/Command/General/che_등용.php
@@ -12,15 +12,9 @@ use \sammo\{
     ScoutMessage
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    tryUniqueItemLottery,
-    getAllNationStaticInfo,
-    getNationStaticInfo,
-    newColor
-};
+use function \sammo\getAllNationStaticInfo;
+use function \sammo\getNationStaticInfo;
+use function \sammo\newColor;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_등용수락.php b/hwe/sammo/Command/General/che_등용수락.php
index e63c662b..4189bf19 100644
--- a/hwe/sammo/Command/General/che_등용수락.php
+++ b/hwe/sammo/Command/General/che_등용수락.php
@@ -13,14 +13,8 @@ use \sammo\{
     ScoutMessage
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    tryUniqueItemLottery,
-    getAllNationStaticInfo,
-    getNationStaticInfo
-};
+use function \sammo\getAllNationStaticInfo;
+use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_랜덤임관.php b/hwe/sammo/Command/General/che_랜덤임관.php
index eac97fac..c6863663 100644
--- a/hwe/sammo/Command/General/che_랜덤임관.php
+++ b/hwe/sammo/Command/General/che_랜덤임관.php
@@ -15,8 +15,6 @@ use \sammo\LastTurn;
 use \sammo\Command;
 
 use function \sammo\tryUniqueItemLottery;
-use function \sammo\getInvitationList;
-use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_모반시도.php b/hwe/sammo/Command/General/che_모반시도.php
index 4665a189..daf8d0d6 100644
--- a/hwe/sammo/Command/General/che_모반시도.php
+++ b/hwe/sammo/Command/General/che_모반시도.php
@@ -11,13 +11,6 @@ use \sammo\{
     Command
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    tryUniqueItemLottery
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 
diff --git a/hwe/sammo/Command/General/che_모병.php b/hwe/sammo/Command/General/che_모병.php
index ddc0e414..21d4ebd9 100644
--- a/hwe/sammo/Command/General/che_모병.php
+++ b/hwe/sammo/Command/General/che_모병.php
@@ -1,17 +1,19 @@
 <?php
+
 namespace sammo\Command\General;
 
-use \sammo\{
-    DB, Util, JosaUtil,
-    General, 
-    ActionLogger,
-    GameConst, GameUnitConst,
-    LastTurn,
-    Command
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\GameUnitConst;
+use \sammo\LastTurn;
+use \sammo\Command;
 
-
-class che_모병 extends che_징병{
+class che_모병 extends che_징병
+{
     static protected $actionName = '모병';
     static protected $costOffset = 2;
 
@@ -25,8 +27,8 @@ class che_모병 extends che_징병{
         static::$defaultAtmos = GameConst::$defaultAtmosHigh;
     }
 
-    public function getCommandDetailTitle():string{
+    public function getCommandDetailTitle(): string
+    {
         return "{$this->getName()}(통솔경험, 자금×2)";
     }
-
-}
\ No newline at end of file
+}
diff --git a/hwe/sammo/Command/General/che_물자조달.php b/hwe/sammo/Command/General/che_물자조달.php
index 4defba5a..6123c5a1 100644
--- a/hwe/sammo/Command/General/che_물자조달.php
+++ b/hwe/sammo/Command/General/che_물자조달.php
@@ -11,12 +11,8 @@ use \sammo\{
     Command
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    tryUniqueItemLottery
-};
+use function \sammo\getDomesticExpLevelBonus;
+use function \sammo\CriticalScoreEx;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_방랑.php b/hwe/sammo/Command/General/che_방랑.php
index bbfa33a9..3132c294 100644
--- a/hwe/sammo/Command/General/che_방랑.php
+++ b/hwe/sammo/Command/General/che_방랑.php
@@ -10,11 +10,6 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
diff --git a/hwe/sammo/Command/General/che_사기진작.php b/hwe/sammo/Command/General/che_사기진작.php
index e7efc0b1..f44a58de 100644
--- a/hwe/sammo/Command/General/che_사기진작.php
+++ b/hwe/sammo/Command/General/che_사기진작.php
@@ -10,10 +10,7 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery
-};
+use function \sammo\tryUniqueItemLottery;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_상업투자.php b/hwe/sammo/Command/General/che_상업투자.php
index 6d6fe8d2..0a986e07 100644
--- a/hwe/sammo/Command/General/che_상업투자.php
+++ b/hwe/sammo/Command/General/che_상업투자.php
@@ -11,13 +11,11 @@ use \sammo\{
     Command
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    tryUniqueItemLottery,
-    updateMaxDomesticCritical
-};
+use function \sammo\getDomesticExpLevelBonus;
+use function \sammo\CriticalRatioDomestic;
+use function \sammo\CriticalScoreEx;
+use function \sammo\tryUniqueItemLottery;
+use function \sammo\updateMaxDomesticCritical;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_선동.php b/hwe/sammo/Command/General/che_선동.php
index 72c55315..de193a7b 100644
--- a/hwe/sammo/Command/General/che_선동.php
+++ b/hwe/sammo/Command/General/che_선동.php
@@ -1,13 +1,14 @@
 <?php
 namespace sammo\Command\General;
 
-use \sammo\{
-    DB, Util, JosaUtil,
-    General, 
-    ActionLogger,
-    GameConst, GameUnitConst,
-    Command
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\GameUnitConst;
+use \sammo\Command;
 
 class che_선동 extends che_화계{
     static protected $actionName = '선동';
diff --git a/hwe/sammo/Command/General/che_선양.php b/hwe/sammo/Command/General/che_선양.php
index dad19afc..4cc911b2 100644
--- a/hwe/sammo/Command/General/che_선양.php
+++ b/hwe/sammo/Command/General/che_선양.php
@@ -2,25 +2,20 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\GameUnitConst;
+use \sammo\LastTurn;
+use \sammo\Command;
 
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    tryUniqueItemLottery
-};
+use function\sammo\getDomesticExpLevelBonus;
+use function\sammo\CriticalRatioDomestic;
+use function\sammo\CriticalScoreEx;
+use function\sammo\tryUniqueItemLottery;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_소집해제.php b/hwe/sammo/Command/General/che_소집해제.php
index c3d86e82..2ed7a92e 100644
--- a/hwe/sammo/Command/General/che_소집해제.php
+++ b/hwe/sammo/Command/General/che_소집해제.php
@@ -10,11 +10,6 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 
diff --git a/hwe/sammo/Command/General/che_숙련전환.php b/hwe/sammo/Command/General/che_숙련전환.php
index 76a0aa34..84e6bc46 100644
--- a/hwe/sammo/Command/General/che_숙련전환.php
+++ b/hwe/sammo/Command/General/che_숙련전환.php
@@ -2,28 +2,21 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    Session,
-    KVStorage,
-    General,
-    ActionLogger,
-    GameConst,
-    GameUnitConst,
-    LastTurn,
-    Command,
-    ServConfig
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\Session;
+use \sammo\KVStorage;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\GameUnitConst;
+use \sammo\LastTurn;
+use \sammo\Command;
+use \sammo\ServConfig;
 
-
-use function\sammo\{
-    getDexCall,
-    getTechCall,
-    tryUniqueItemLottery,
-    getTechAbil
-};
+use function \sammo\getDexCall;
+use function \sammo\tryUniqueItemLottery;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
@@ -107,7 +100,7 @@ class che_숙련전환 extends Command\GeneralCommand
         $this->srcArmTypeName = GameUnitConst::allType()[$this->srcArmType];
         $this->destArmType = $this->arg['destArmType'];
         $this->destArmTypeName = GameUnitConst::allType()[$this->destArmType];
-        
+
         [$reqGold, $reqRice] = $this->getCost();
 
         $this->fullConditionConstraints = [
diff --git a/hwe/sammo/Command/General/che_요양.php b/hwe/sammo/Command/General/che_요양.php
index e5ccb7f5..98ee0535 100644
--- a/hwe/sammo/Command/General/che_요양.php
+++ b/hwe/sammo/Command/General/che_요양.php
@@ -10,11 +10,6 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 
diff --git a/hwe/sammo/Command/General/che_이동.php b/hwe/sammo/Command/General/che_이동.php
index 338c1b6c..218b444e 100644
--- a/hwe/sammo/Command/General/che_이동.php
+++ b/hwe/sammo/Command/General/che_이동.php
@@ -2,23 +2,17 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    ActionLogger,
-    GameConst,
-    GameUnitConst,
-    LastTurn,
-    Command
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\GameUnitConst;
+use \sammo\LastTurn;
+use \sammo\Command;
 
-
-use function\sammo\{
-    tryUniqueItemLottery,
-    printCitiesBasedOnDistance
-};
+use function \sammo\printCitiesBasedOnDistance;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_인재탐색.php b/hwe/sammo/Command/General/che_인재탐색.php
index 7548455c..cf66951b 100644
--- a/hwe/sammo/Command/General/che_인재탐색.php
+++ b/hwe/sammo/Command/General/che_인재탐색.php
@@ -2,26 +2,18 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
 
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    tryUniqueItemLottery,
-    getAllNationStaticInfo,
-    pickGeneralFromPool,
-};
+use function \sammo\tryUniqueItemLottery;
+use function \sammo\pickGeneralFromPool;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_임관.php b/hwe/sammo/Command/General/che_임관.php
index d0c0041d..3ccf43c0 100644
--- a/hwe/sammo/Command/General/che_임관.php
+++ b/hwe/sammo/Command/General/che_임관.php
@@ -12,12 +12,9 @@ use \sammo\{
     KVStorage
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery,
-    getInvitationList,
-    getNationStaticInfo,
-};
+use function \sammo\tryUniqueItemLottery;
+use function \sammo\getInvitationList;
+use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_장비매매.php b/hwe/sammo/Command/General/che_장비매매.php
index fd0100db..29879470 100644
--- a/hwe/sammo/Command/General/che_장비매매.php
+++ b/hwe/sammo/Command/General/che_장비매매.php
@@ -12,11 +12,7 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery,
-    buildItemClass
-};
+use function \sammo\buildItemClass;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_장수대상임관.php b/hwe/sammo/Command/General/che_장수대상임관.php
index 32997977..d6d3cbf7 100644
--- a/hwe/sammo/Command/General/che_장수대상임관.php
+++ b/hwe/sammo/Command/General/che_장수대상임관.php
@@ -12,13 +12,10 @@ use \sammo\{
     KVStorage
 };
 
-
-use function \sammo\{
-    getColoredName,
-    tryUniqueItemLottery,
-    getInvitationList,
-    getNationStaticInfo,
-};
+use function \sammo\getColoredName;
+use function \sammo\tryUniqueItemLottery;
+use function \sammo\getInvitationList;
+use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_전투태세.php b/hwe/sammo/Command/General/che_전투태세.php
index 5a3ed2f8..331e35a0 100644
--- a/hwe/sammo/Command/General/che_전투태세.php
+++ b/hwe/sammo/Command/General/che_전투태세.php
@@ -11,10 +11,8 @@ use \sammo\{
     MustNotBeReachedException
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery, getTechCost
-};
+use function \sammo\tryUniqueItemLottery;
+use function \sammo\getTechCost;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_전투특기초기화.php b/hwe/sammo/Command/General/che_전투특기초기화.php
index 64e58cfc..72a431d3 100644
--- a/hwe/sammo/Command/General/che_전투특기초기화.php
+++ b/hwe/sammo/Command/General/che_전투특기초기화.php
@@ -10,10 +10,7 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery
-};
+use function \sammo\tryUniqueItemLottery;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_정착장려.php b/hwe/sammo/Command/General/che_정착장려.php
index 97d0b837..dc9c6009 100644
--- a/hwe/sammo/Command/General/che_정착장려.php
+++ b/hwe/sammo/Command/General/che_정착장려.php
@@ -11,13 +11,11 @@ use \sammo\{
     Command
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    tryUniqueItemLottery,
-    updateMaxDomesticCritical
-};
+use function \sammo\getDomesticExpLevelBonus;
+use function \sammo\CriticalRatioDomestic;
+use function \sammo\CriticalScoreEx;
+use function \sammo\tryUniqueItemLottery;
+use function \sammo\updateMaxDomesticCritical;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_주민선정.php b/hwe/sammo/Command/General/che_주민선정.php
index eefc3440..1b70b6ea 100644
--- a/hwe/sammo/Command/General/che_주민선정.php
+++ b/hwe/sammo/Command/General/che_주민선정.php
@@ -11,13 +11,11 @@ use \sammo\{
     Command
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    tryUniqueItemLottery,
-    updateMaxDomesticCritical
-};
+use function \sammo\getDomesticExpLevelBonus;
+use function \sammo\CriticalRatioDomestic;
+use function \sammo\CriticalScoreEx;
+use function \sammo\tryUniqueItemLottery;
+use function \sammo\updateMaxDomesticCritical;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_증여.php b/hwe/sammo/Command/General/che_증여.php
index a451e23e..0b6595b2 100644
--- a/hwe/sammo/Command/General/che_증여.php
+++ b/hwe/sammo/Command/General/che_증여.php
@@ -2,25 +2,16 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command
-};
-
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    tryUniqueItemLottery
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_집합.php b/hwe/sammo/Command/General/che_집합.php
index de3684a1..3afccf61 100644
--- a/hwe/sammo/Command/General/che_집합.php
+++ b/hwe/sammo/Command/General/che_집합.php
@@ -10,10 +10,7 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery
-};
+use function \sammo\tryUniqueItemLottery;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_징병.php b/hwe/sammo/Command/General/che_징병.php
index 6c26fee7..1e536802 100644
--- a/hwe/sammo/Command/General/che_징병.php
+++ b/hwe/sammo/Command/General/che_징병.php
@@ -2,27 +2,22 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    Session,
-    KVStorage,
-    General,
-    ActionLogger,
-    GameConst,
-    GameUnitConst,
-    LastTurn,
-    Command,
-    ServConfig
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\Session;
+use \sammo\KVStorage;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\GameUnitConst;
+use \sammo\LastTurn;
+use \sammo\Command;
+use \sammo\ServConfig;
 
-
-use function\sammo\{
-    getTechCall,
-    tryUniqueItemLottery,
-    getTechAbil
-};
+use function \sammo\getTechCall;
+use function \sammo\tryUniqueItemLottery;
+use function \sammo\getTechAbil;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_첩보.php b/hwe/sammo/Command/General/che_첩보.php
index bd701b61..8b709a29 100644
--- a/hwe/sammo/Command/General/che_첩보.php
+++ b/hwe/sammo/Command/General/che_첩보.php
@@ -2,25 +2,19 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    ActionLogger,
-    GameConst,
-    GameUnitConst,
-    LastTurn,
-    Command,
-    Json
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\GameUnitConst;
+use \sammo\LastTurn;
+use \sammo\Command;
+use \sammo\Json;
 
-
-use function\sammo\{
-    tryUniqueItemLottery,
-    searchDistance,
-    printCitiesBasedOnDistance
-};
+use function \sammo\searchDistance;
+use function \sammo\printCitiesBasedOnDistance;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_출병.php b/hwe/sammo/Command/General/che_출병.php
index 804610e0..573f8f3e 100644
--- a/hwe/sammo/Command/General/che_출병.php
+++ b/hwe/sammo/Command/General/che_출병.php
@@ -2,30 +2,23 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    ActionLogger,
-    GameConst,
-    GameUnitConst,
-    LastTurn,
-    Command
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\GameUnitConst;
+use \sammo\LastTurn;
+use \sammo\Command;
 
-
-use function\sammo\{
-    tryUniqueItemLottery,
-    processWar
-};
+use function \sammo\tryUniqueItemLottery;
+use function \sammo\processWar;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
 
-
-
 class che_출병 extends Command\GeneralCommand
 {
     static protected $actionName = '출병';
diff --git a/hwe/sammo/Command/General/che_하야.php b/hwe/sammo/Command/General/che_하야.php
index 382e9e4a..5a0f5082 100644
--- a/hwe/sammo/Command/General/che_하야.php
+++ b/hwe/sammo/Command/General/che_하야.php
@@ -10,11 +10,6 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
diff --git a/hwe/sammo/Command/General/che_해산.php b/hwe/sammo/Command/General/che_해산.php
index b606cfec..87a7fb80 100644
--- a/hwe/sammo/Command/General/che_해산.php
+++ b/hwe/sammo/Command/General/che_해산.php
@@ -14,10 +14,7 @@ use \sammo\{
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\CityConst;
-use function sammo\buildNationTypeClass;
 use function sammo\refreshNationStaticInfo;
-use function sammo\GetNationColors;
-use function sammo\getAllNationStaticInfo;
 use function sammo\deleteNation;
 
 
diff --git a/hwe/sammo/Command/General/che_헌납.php b/hwe/sammo/Command/General/che_헌납.php
index 92b97515..07da81ed 100644
--- a/hwe/sammo/Command/General/che_헌납.php
+++ b/hwe/sammo/Command/General/che_헌납.php
@@ -2,24 +2,15 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command
-};
-
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    tryUniqueItemLottery
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_화계.php b/hwe/sammo/Command/General/che_화계.php
index a7314675..27050671 100644
--- a/hwe/sammo/Command/General/che_화계.php
+++ b/hwe/sammo/Command/General/che_화계.php
@@ -2,23 +2,18 @@
 
 namespace sammo\Command\General;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    ActionLogger,
-    GameConst,
-    GameUnitConst,
-    LastTurn,
-    Command
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\GameUnitConst;
+use \sammo\LastTurn;
+use \sammo\Command;
 
-
-use function\sammo\{
-    searchDistance,
-    printCitiesBasedOnDistance
-};
+use function \sammo\searchDistance;
+use function \sammo\printCitiesBasedOnDistance;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/General/che_훈련.php b/hwe/sammo/Command/General/che_훈련.php
index c1f42260..52292f88 100644
--- a/hwe/sammo/Command/General/che_훈련.php
+++ b/hwe/sammo/Command/General/che_훈련.php
@@ -10,10 +10,7 @@ use \sammo\{
     Command
 };
 
-
-use function \sammo\{
-    tryUniqueItemLottery
-};
+use function \sammo\tryUniqueItemLottery;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_감축.php b/hwe/sammo/Command/Nation/che_감축.php
index 252a7c3a..ce6e7c82 100644
--- a/hwe/sammo/Command/Nation/che_감축.php
+++ b/hwe/sammo/Command/Nation/che_감축.php
@@ -15,14 +15,6 @@ use \sammo\{
     CityHelper
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    GetImageURL,
-    getNationStaticInfo 
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Event\Action;
diff --git a/hwe/sammo/Command/Nation/che_국기변경.php b/hwe/sammo/Command/Nation/che_국기변경.php
index 04ca130e..c3e66939 100644
--- a/hwe/sammo/Command/Nation/che_국기변경.php
+++ b/hwe/sammo/Command/Nation/che_국기변경.php
@@ -2,32 +2,23 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command,
-    MessageTarget,
-    Message,
-    CityConst,
-    Json,
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+use \sammo\MessageTarget;
+use \sammo\Message;
+use \sammo\CityConst;
+use \sammo\Json;
 
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    GetImageURL,
-    getNationStaticInfo,
-    GetNationColors,
-    newColor,
-};
+use function \sammo\GetNationColors;
+use function \sammo\newColor;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_국호변경.php b/hwe/sammo/Command/Nation/che_국호변경.php
index 2ec976d1..b82906f7 100644
--- a/hwe/sammo/Command/Nation/che_국호변경.php
+++ b/hwe/sammo/Command/Nation/che_국호변경.php
@@ -2,30 +2,20 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    Json,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command,
-    MessageTarget,
-    Message,
-    CityConst
-};
-
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    GetImageURL,
-    getNationStaticInfo,
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\Json;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+use \sammo\MessageTarget;
+use \sammo\Message;
+use \sammo\CityConst;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_급습.php b/hwe/sammo/Command/Nation/che_급습.php
index 78d56693..f15f6161 100644
--- a/hwe/sammo/Command/Nation/che_급습.php
+++ b/hwe/sammo/Command/Nation/che_급습.php
@@ -2,29 +2,21 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command,
-    Message,
-    MessageTarget
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+use \sammo\Message;
+use \sammo\MessageTarget;
 
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    getAllNationStaticInfo,
-    getNationStaticInfo,
-    GetImageURL
-};
+use function \sammo\getAllNationStaticInfo;
+use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_몰수.php b/hwe/sammo/Command/Nation/che_몰수.php
index f0357235..286edcea 100644
--- a/hwe/sammo/Command/Nation/che_몰수.php
+++ b/hwe/sammo/Command/Nation/che_몰수.php
@@ -2,27 +2,20 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command,
-    MessageTarget,
-    Message
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+use \sammo\MessageTarget;
+use \sammo\Message;
 
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    GetImageURL
-};
+use function \sammo\GetImageURL;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_물자원조.php b/hwe/sammo/Command/Nation/che_물자원조.php
index 8e7cbef4..c6d1990f 100644
--- a/hwe/sammo/Command/Nation/che_물자원조.php
+++ b/hwe/sammo/Command/Nation/che_물자원조.php
@@ -14,9 +14,6 @@ use \sammo\{
     StringUtil
 };
 
-use function \sammo\getDomesticExpLevelBonus;
-use function \sammo\CriticalRatioDomestic;
-use function \sammo\CriticalScoreEx;
 use function \sammo\getAllNationStaticInfo;
 use function \sammo\getNationStaticInfo;
 
diff --git a/hwe/sammo/Command/Nation/che_발령.php b/hwe/sammo/Command/Nation/che_발령.php
index 7b3db4de..121ca6f5 100644
--- a/hwe/sammo/Command/Nation/che_발령.php
+++ b/hwe/sammo/Command/Nation/che_발령.php
@@ -13,12 +13,7 @@ use \sammo\{
     TimeUtil
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    cutTurn
-};
+use function \sammo\cutTurn;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_백성동원.php b/hwe/sammo/Command/Nation/che_백성동원.php
index 5e5a1ed7..c2ea51b9 100644
--- a/hwe/sammo/Command/Nation/che_백성동원.php
+++ b/hwe/sammo/Command/Nation/che_백성동원.php
@@ -14,14 +14,6 @@ use \sammo\{
     CityConst
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    GetImageURL,
-    getNationStaticInfo 
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Event\Action;
diff --git a/hwe/sammo/Command/Nation/che_불가침수락.php b/hwe/sammo/Command/Nation/che_불가침수락.php
index 74972570..89ee1965 100644
--- a/hwe/sammo/Command/Nation/che_불가침수락.php
+++ b/hwe/sammo/Command/Nation/che_불가침수락.php
@@ -16,12 +16,7 @@ use \sammo\MessageTarget;
 use \sammo\DiplomaticMessage;
 use \sammo\Message;
 
-use function \sammo\getDomesticExpLevelBonus;
-use function \sammo\CriticalRatioDomestic;
-use function \sammo\CriticalScoreEx;
-use function \sammo\getAllNationStaticInfo;
 use function \sammo\getNationStaticInfo;
-use function \sammo\GetImageUR;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_불가침제의.php b/hwe/sammo/Command/Nation/che_불가침제의.php
index 4391351b..cfd7688c 100644
--- a/hwe/sammo/Command/Nation/che_불가침제의.php
+++ b/hwe/sammo/Command/Nation/che_불가침제의.php
@@ -2,30 +2,23 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command,
-    MessageTarget,
-    DiplomaticMessage,
-    Message,
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+use \sammo\MessageTarget;
+use \sammo\DiplomaticMessage;
+use \sammo\Message;
 
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    getAllNationStaticInfo,
-    getNationStaticInfo,
-    GetImageURL
-};
+use function \sammo\getAllNationStaticInfo;
+use function \sammo\GetImageURL;
+use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_불가침파기수락.php b/hwe/sammo/Command/Nation/che_불가침파기수락.php
index 87d7e5de..0e4ecc56 100644
--- a/hwe/sammo/Command/Nation/che_불가침파기수락.php
+++ b/hwe/sammo/Command/Nation/che_불가침파기수락.php
@@ -2,30 +2,21 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command,
-    MessageTarget,
-    DiplomaticMessage,
-    Message,
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+use \sammo\MessageTarget;
+use \sammo\DiplomaticMessage;
+use \sammo\Message;
 
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    getAllNationStaticInfo,
-    getNationStaticInfo,
-    GetImageURL
-};
+use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_불가침파기제의.php b/hwe/sammo/Command/Nation/che_불가침파기제의.php
index 7cf511d1..fddd0109 100644
--- a/hwe/sammo/Command/Nation/che_불가침파기제의.php
+++ b/hwe/sammo/Command/Nation/che_불가침파기제의.php
@@ -14,14 +14,9 @@ use \sammo\{
     Message,
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    getAllNationStaticInfo,
-    getNationStaticInfo,
-    GetImageURL
-};
+use function \sammo\getAllNationStaticInfo;
+use function \sammo\getNationStaticInfo;
+use function \sammo\GetImageURL;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_선전포고.php b/hwe/sammo/Command/Nation/che_선전포고.php
index 0531d1f5..5ee6c14b 100644
--- a/hwe/sammo/Command/Nation/che_선전포고.php
+++ b/hwe/sammo/Command/Nation/che_선전포고.php
@@ -2,29 +2,22 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command,
-    Message,
-    MessageTarget
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+use \sammo\Message;
+use \sammo\MessageTarget;
 
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    getAllNationStaticInfo,
-    getNationStaticInfo,
-    GetImageURL
-};
+use function \sammo\getAllNationStaticInfo;
+use function \sammo\getNationStaticInfo;
+use function \sammo\GetImageURL;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_수몰.php b/hwe/sammo/Command/Nation/che_수몰.php
index 5101bde4..e19e3568 100644
--- a/hwe/sammo/Command/Nation/che_수몰.php
+++ b/hwe/sammo/Command/Nation/che_수몰.php
@@ -14,13 +14,7 @@ use \sammo\{
     CityConst
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    GetImageURL,
-    getNationStaticInfo 
-};
+use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_의병모집.php b/hwe/sammo/Command/Nation/che_의병모집.php
index 7395aabb..5bfc12c6 100644
--- a/hwe/sammo/Command/Nation/che_의병모집.php
+++ b/hwe/sammo/Command/Nation/che_의병모집.php
@@ -2,25 +2,16 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command,
-    KVStorage
-};
-
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    tryUniqueItemLottery
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+use \sammo\KVStorage;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_이호경식.php b/hwe/sammo/Command/Nation/che_이호경식.php
index 12ed97a9..d7b31bcb 100644
--- a/hwe/sammo/Command/Nation/che_이호경식.php
+++ b/hwe/sammo/Command/Nation/che_이호경식.php
@@ -2,29 +2,21 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command,
-    Message,
-    MessageTarget
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+use \sammo\Message;
+use \sammo\MessageTarget;
 
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    getAllNationStaticInfo,
-    getNationStaticInfo,
-    GetImageURL
-};
+use function \sammo\getAllNationStaticInfo;
+use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_종전수락.php b/hwe/sammo/Command/Nation/che_종전수락.php
index 18bf5b4c..017a0f2d 100644
--- a/hwe/sammo/Command/Nation/che_종전수락.php
+++ b/hwe/sammo/Command/Nation/che_종전수락.php
@@ -2,7 +2,7 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
+use \sammo\{
     DB,
     Util,
     JosaUtil,
@@ -18,14 +18,7 @@ use\sammo\{
     Message,
 };
 
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    getAllNationStaticInfo,
-    getNationStaticInfo,
-    GetImageURL
-};
+use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_종전제의.php b/hwe/sammo/Command/Nation/che_종전제의.php
index 244822ac..23d2eb61 100644
--- a/hwe/sammo/Command/Nation/che_종전제의.php
+++ b/hwe/sammo/Command/Nation/che_종전제의.php
@@ -14,14 +14,9 @@ use \sammo\{
     Message,
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    getAllNationStaticInfo,
-    getNationStaticInfo,
-    GetImageURL
-};
+use function \sammo\getAllNationStaticInfo;
+use function \sammo\getNationStaticInfo;
+use function \sammo\GetImageURL;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_증축.php b/hwe/sammo/Command/Nation/che_증축.php
index 5e983ed4..3b1560c9 100644
--- a/hwe/sammo/Command/Nation/che_증축.php
+++ b/hwe/sammo/Command/Nation/che_증축.php
@@ -14,14 +14,6 @@ use \sammo\{
     CityConst
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    GetImageURL,
-    getNationStaticInfo 
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Event\Action;
diff --git a/hwe/sammo/Command/Nation/che_천도.php b/hwe/sammo/Command/Nation/che_천도.php
index 3acef6ac..1b3db6f9 100644
--- a/hwe/sammo/Command/Nation/che_천도.php
+++ b/hwe/sammo/Command/Nation/che_천도.php
@@ -2,30 +2,19 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command,
-    MessageTarget,
-    Message,
-    CityConst
-};
-
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    GetImageURL,
-    getNationStaticInfo
-};
-
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+use \sammo\MessageTarget;
+use \sammo\Message;
+use \sammo\CityConst;
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Event\Action;
diff --git a/hwe/sammo/Command/Nation/che_초토화.php b/hwe/sammo/Command/Nation/che_초토화.php
index cb94a282..c456f35e 100644
--- a/hwe/sammo/Command/Nation/che_초토화.php
+++ b/hwe/sammo/Command/Nation/che_초토화.php
@@ -15,14 +15,6 @@ use \sammo\{
     CityInitialDetail
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    GetImageURL,
-    getNationStaticInfo 
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Event\Action;
diff --git a/hwe/sammo/Command/Nation/che_포상.php b/hwe/sammo/Command/Nation/che_포상.php
index 45090f5c..ab09019f 100644
--- a/hwe/sammo/Command/Nation/che_포상.php
+++ b/hwe/sammo/Command/Nation/che_포상.php
@@ -2,24 +2,16 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command
-};
-
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_피장파장.php b/hwe/sammo/Command/Nation/che_피장파장.php
index 0672876e..45c9961f 100644
--- a/hwe/sammo/Command/Nation/che_피장파장.php
+++ b/hwe/sammo/Command/Nation/che_피장파장.php
@@ -13,15 +13,9 @@ use \sammo\{
     Message, MessageTarget
 };
 
-use function \sammo\{
-    buildNationCommandClass,
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    getAllNationStaticInfo,
-    getNationStaticInfo,
-    GetImageURL
-};
+use function \sammo\buildNationCommandClass;
+use function \sammo\getAllNationStaticInfo;
+use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Command/Nation/che_필사즉생.php b/hwe/sammo/Command/Nation/che_필사즉생.php
index b6fae39b..61b93fb6 100644
--- a/hwe/sammo/Command/Nation/che_필사즉생.php
+++ b/hwe/sammo/Command/Nation/che_필사즉생.php
@@ -13,13 +13,6 @@ use \sammo\{
     Message
 };
 
-use function \sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic, 
-    CriticalScoreEx,
-    GetImageURL
-};
-
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
 use sammo\Event\Action;
diff --git a/hwe/sammo/Command/Nation/che_허보.php b/hwe/sammo/Command/Nation/che_허보.php
index 11fecc64..fb007f28 100644
--- a/hwe/sammo/Command/Nation/che_허보.php
+++ b/hwe/sammo/Command/Nation/che_허보.php
@@ -2,29 +2,21 @@
 
 namespace sammo\Command\Nation;
 
-use\sammo\{
-    DB,
-    Util,
-    JosaUtil,
-    General,
-    DummyGeneral,
-    ActionLogger,
-    GameConst,
-    LastTurn,
-    GameUnitConst,
-    Command,
-    MessageTarget,
-    Message,
-    CityConst
-};
+use \sammo\DB;
+use \sammo\Util;
+use \sammo\JosaUtil;
+use \sammo\General;
+use \sammo\DummyGeneral;
+use \sammo\ActionLogger;
+use \sammo\GameConst;
+use \sammo\LastTurn;
+use \sammo\GameUnitConst;
+use \sammo\Command;
+use \sammo\MessageTarget;
+use \sammo\Message;
+use \sammo\CityConst;
 
-use function\sammo\{
-    getDomesticExpLevelBonus,
-    CriticalRatioDomestic,
-    CriticalScoreEx,
-    GetImageURL,
-    getNationStaticInfo
-};
+use function \sammo\getNationStaticInfo;
 
 use \sammo\Constraint\Constraint;
 use \sammo\Constraint\ConstraintHelper;
diff --git a/hwe/sammo/Constraint/AllowDiplomacyStatus.php b/hwe/sammo/Constraint/AllowDiplomacyStatus.php
index df94774e..6068772d 100644
--- a/hwe/sammo/Constraint/AllowDiplomacyStatus.php
+++ b/hwe/sammo/Constraint/AllowDiplomacyStatus.php
@@ -9,6 +9,7 @@ class AllowDiplomacyStatus extends Constraint{
 
     protected $nationID;
     protected $allowStatus = [];
+    protected $errMsg = null;
 
     public function checkInputValues(bool $throwExeception=true):bool{
         if(!parent::checkInputValues($throwExeception) && !$throwExeception){
diff --git a/hwe/sammo/Constraint/Constraint.php b/hwe/sammo/Constraint/Constraint.php
index cae4c57f..8783ad69 100644
--- a/hwe/sammo/Constraint/Constraint.php
+++ b/hwe/sammo/Constraint/Constraint.php
@@ -154,27 +154,27 @@ abstract class Constraint{
             throw new \InvalidArgumentException('require arg');
         }
 
-        if(($valueType&static::REQ_STRING_ARG===static::REQ_STRING_ARG) && !is_string($this->arg)){
+        if((($valueType&static::REQ_STRING_ARG)===static::REQ_STRING_ARG) && !is_string($this->arg)){
             if(!$throwExeception){return false; }
             throw new \InvalidArgumentException('require string arg');
         }
 
-        if(($valueType&static::REQ_BOOLEAN_ARG===static::REQ_BOOLEAN_ARG) && !is_bool($this->arg)){
+        if((($valueType&static::REQ_BOOLEAN_ARG)===static::REQ_BOOLEAN_ARG) && !is_bool($this->arg)){
             if(!$throwExeception){return false; }
             throw new \InvalidArgumentException('require bool arg');
         }
 
-        if(($valueType&static::REQ_INT_ARG===static::REQ_INT_ARG) && !is_int($this->arg)){
+        if((($valueType&static::REQ_INT_ARG)===static::REQ_INT_ARG) && !is_int($this->arg)){
             if(!$throwExeception){return false; }
             throw new \InvalidArgumentException('require int arg');
         }
 
-        if(($valueType&static::REQ_NUMERIC_ARG===static::REQ_NUMERIC_ARG) && !is_numeric($this->arg)){
+        if((($valueType&static::REQ_NUMERIC_ARG)===static::REQ_NUMERIC_ARG) && !is_numeric($this->arg)){
             if(!$throwExeception){return false; }
             throw new \InvalidArgumentException('require numeric arg');
         }
 
-        if(($valueType&static::REQ_ARRAY_ARG===static::REQ_ARRAY_ARG) && !is_array($this->arg)){
+        if((($valueType&static::REQ_ARRAY_ARG)===static::REQ_ARRAY_ARG) && !is_array($this->arg)){
             if(!$throwExeception){return false; }
             throw new \InvalidArgumentException('require array arg');
         }
diff --git a/hwe/sammo/Constraint/RemainCityTrust.php b/hwe/sammo/Constraint/RemainCityTrust.php
index 4d6658ff..45b55c6a 100644
--- a/hwe/sammo/Constraint/RemainCityTrust.php
+++ b/hwe/sammo/Constraint/RemainCityTrust.php
@@ -9,6 +9,7 @@ class RemainCityTrust extends Constraint{
 
     protected $key;
     protected $maxKey;
+    protected $maxVal;
     protected $keyNick;
 
     public function checkInputValues(bool $throwExeception=true):bool{
diff --git a/hwe/sammo/Constraint/ReqCityCapacity.php b/hwe/sammo/Constraint/ReqCityCapacity.php
index 9f0dede6..82e78583 100644
--- a/hwe/sammo/Constraint/ReqCityCapacity.php
+++ b/hwe/sammo/Constraint/ReqCityCapacity.php
@@ -12,6 +12,7 @@ class ReqCityCapacity extends Constraint{
     protected $maxKey;
     protected $keyNick;
     protected $reqVal;
+    protected $isPercent;
 
     public function checkInputValues(bool $throwExeception=true):bool{
         if(!parent::checkInputValues($throwExeception) && !$throwExeception){
diff --git a/hwe/sammo/Constraint/ReqCityTrust.php b/hwe/sammo/Constraint/ReqCityTrust.php
index 67f5a0b3..b8d917c1 100644
--- a/hwe/sammo/Constraint/ReqCityTrust.php
+++ b/hwe/sammo/Constraint/ReqCityTrust.php
@@ -10,6 +10,7 @@ class ReqCityTrust extends Constraint{
     protected $key;
     protected $maxKey;
     protected $keyNick;
+    protected $reqVal;
 
     public function checkInputValues(bool $throwExeception=true):bool{
         if(!parent::checkInputValues($throwExeception) && !$throwExeception){
diff --git a/hwe/sammo/Constraint/ReqCityValue.php b/hwe/sammo/Constraint/ReqCityValue.php
index 25f2f8a6..fde479df 100644
--- a/hwe/sammo/Constraint/ReqCityValue.php
+++ b/hwe/sammo/Constraint/ReqCityValue.php
@@ -17,6 +17,7 @@ class ReqCityValue extends Constraint{
     protected $reqVal;
     protected $comp;
     protected $errMsg;
+    protected $isPercent;
 
     public function checkInputValues(bool $throwExeception=true):bool{
         if(!parent::checkInputValues($throwExeception) && !$throwExeception){
diff --git a/hwe/sammo/Constraint/ReqDestCityValue.php b/hwe/sammo/Constraint/ReqDestCityValue.php
index 76fddb2f..59cde6cd 100644
--- a/hwe/sammo/Constraint/ReqDestCityValue.php
+++ b/hwe/sammo/Constraint/ReqDestCityValue.php
@@ -17,6 +17,7 @@ class ReqDestCityValue extends Constraint{
     protected $reqVal;
     protected $comp;
     protected $errMsg;
+    protected $isPercent;
 
     public function checkInputValues(bool $throwExeception=true):bool{
         if(!parent::checkInputValues($throwExeception) && !$throwExeception){
diff --git a/hwe/sammo/Constraint/ReqDestNationValue.php b/hwe/sammo/Constraint/ReqDestNationValue.php
index 8369157d..2d5b4a82 100644
--- a/hwe/sammo/Constraint/ReqDestNationValue.php
+++ b/hwe/sammo/Constraint/ReqDestNationValue.php
@@ -17,6 +17,7 @@ class ReqDestNationValue extends Constraint{
     protected $reqVal;
     protected $comp;
     protected $errMsg;
+    protected $isPercent;
 
     public function checkInputValues(bool $throwExeception=true):bool{
         if(!parent::checkInputValues($throwExeception) && !$throwExeception){
diff --git a/hwe/sammo/Constraint/ReqGeneralCrewMargin.php b/hwe/sammo/Constraint/ReqGeneralCrewMargin.php
index 541c81b3..1381ffa6 100644
--- a/hwe/sammo/Constraint/ReqGeneralCrewMargin.php
+++ b/hwe/sammo/Constraint/ReqGeneralCrewMargin.php
@@ -38,7 +38,7 @@ class ReqGeneralCrewMargin extends Constraint{
         $reqCrewType = GameUnitConst::byID($this->arg);
 
         //XXX: 왜 General -> obj -> General 변환을 하고 있나?
-        $generalObj = new General($this->general, null, null, null, null, false);
+        $generalObj = new General($this->general, null, null, null, null, null, false);
 
         if($reqCrewType->id != $generalObj->getCrewTypeObj()->id){
             return true;
diff --git a/hwe/sammo/Constraint/ReqNationAuxValue.php b/hwe/sammo/Constraint/ReqNationAuxValue.php
index a2f3e4a8..cca1e8ae 100644
--- a/hwe/sammo/Constraint/ReqNationAuxValue.php
+++ b/hwe/sammo/Constraint/ReqNationAuxValue.php
@@ -14,6 +14,7 @@ class ReqNationAuxValue extends Constraint
     const REQ_VALUES = Constraint::REQ_NATION | Constraint::REQ_ARRAY_ARG;
 
     protected $key;
+    protected $maxKey;
     protected $defaultValue;
     protected $reqVal;
     protected $comp;
diff --git a/hwe/sammo/Constraint/ReqNationValue.php b/hwe/sammo/Constraint/ReqNationValue.php
index dedb35f4..5aa6e543 100644
--- a/hwe/sammo/Constraint/ReqNationValue.php
+++ b/hwe/sammo/Constraint/ReqNationValue.php
@@ -17,6 +17,7 @@ class ReqNationValue extends Constraint{
     protected $reqVal;
     protected $comp;
     protected $errMsg;
+    protected $isPercent;
 
     public function checkInputValues(bool $throwExeception=true):bool{
         if(!parent::checkInputValues($throwExeception) && !$throwExeception){
diff --git a/hwe/sammo/Event/Action/InvaderEnding.php b/hwe/sammo/Event/Action/InvaderEnding.php
index d39bd9c5..ebe66833 100644
--- a/hwe/sammo/Event/Action/InvaderEnding.php
+++ b/hwe/sammo/Event/Action/InvaderEnding.php
@@ -1,8 +1,6 @@
 <?php
 namespace sammo\Event\Action;
 
-use function sammo\getNationStaticInfo;
-
 use sammo\ActionLogger;
 use sammo\CityConst;
 use sammo\DB;
diff --git a/hwe/sammo/Event/Action/RaiseInvader.php b/hwe/sammo/Event/Action/RaiseInvader.php
index 538560d2..818a1530 100644
--- a/hwe/sammo/Event/Action/RaiseInvader.php
+++ b/hwe/sammo/Event/Action/RaiseInvader.php
@@ -12,7 +12,6 @@ use sammo\Scenario\Nation;
 use sammo\UniqueConst;
 use sammo\Util;
 
-use function sammo\getNationStaticInfo;
 use function sammo\refreshNationStaticInfo;
 
 /**
diff --git a/hwe/sammo/Event/Action/RaiseNPCNation.php b/hwe/sammo/Event/Action/RaiseNPCNation.php
index d1de4ac6..ecbc461e 100644
--- a/hwe/sammo/Event/Action/RaiseNPCNation.php
+++ b/hwe/sammo/Event/Action/RaiseNPCNation.php
@@ -15,7 +15,6 @@ use sammo\UniqueConst;
 use sammo\Util;
 
 use function sammo\GetNationColors;
-use function sammo\getNationStaticInfo;
 use function sammo\pickGeneralFromPool;
 use function sammo\refreshNationStaticInfo;
 
diff --git a/hwe/sammo/Event/Action/RegNPC.php b/hwe/sammo/Event/Action/RegNPC.php
index bc32fbba..10ef70c7 100644
--- a/hwe/sammo/Event/Action/RegNPC.php
+++ b/hwe/sammo/Event/Action/RegNPC.php
@@ -25,7 +25,7 @@ class RegNPC extends \sammo\Event\Action{
 
         $this->npc=(new \sammo\Scenario\GeneralBuilder(
             $name, 
-            0,
+            false,
             $picturePath, 
             $nationID 
         ))
diff --git a/hwe/sammo/Event/Action/RegNeutralNPC.php b/hwe/sammo/Event/Action/RegNeutralNPC.php
index d0b7b086..46e857dc 100644
--- a/hwe/sammo/Event/Action/RegNeutralNPC.php
+++ b/hwe/sammo/Event/Action/RegNeutralNPC.php
@@ -23,7 +23,7 @@ class RegNeutralNPC extends \sammo\Event\Action{
     ){
         $this->npc=(new \sammo\Scenario\GeneralBuilder(
             $name, 
-            0,
+            false,
             $picturePath, 
             $nationID 
         ))
diff --git a/hwe/sammo/Event/Condition/Logic.php b/hwe/sammo/Event/Condition/Logic.php
index 9e042606..b7f5c6f5 100644
--- a/hwe/sammo/Event/Condition/Logic.php
+++ b/hwe/sammo/Event/Condition/Logic.php
@@ -98,7 +98,7 @@ class Logic extends \sammo\Event\Condition{
         foreach($this->conditions as $cond){
             $sub = self::_eval($cond, $env);
             $chain[] = $sub['chain'];
-            $value ^= $sub['value'];
+            $value = ($value != $sub['value']);
         }
 
         return [
diff --git a/hwe/sammo/GameConstBase.php b/hwe/sammo/GameConstBase.php
index b4dd458d..b02df648 100644
--- a/hwe/sammo/GameConstBase.php
+++ b/hwe/sammo/GameConstBase.php
@@ -148,7 +148,7 @@ class GameConstBase
         'che_도적', 'che_명가', 'che_음양가', 'che_종횡가', 'che_불가', 'che_오두미도', 'che_태평도', 'che_도가',
         'che_묵가', 'che_덕가', 'che_병가', 'che_유가', 'che_법가'
     ];
-    /** @var array 기본 국가 성향 */
+    /** @var string 기본 국가 성향 */
     public static $neutralNationType = 'che_중립';
 
     /** @var string 기본 내정 특기 */
diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php
index a957a811..0adfb822 100644
--- a/hwe/sammo/General.php
+++ b/hwe/sammo/General.php
@@ -708,7 +708,7 @@ class General implements iAction{
 
         if($updateVals){
             $db->update('general', $updateVals, 'no=%i', $generalID);
-            $result |= $db->affectedRows() > 0;
+            $result = $result || $db->affectedRows() > 0;
             if(key_exists('nation', $updateVals)){
                 $db->update('rank_data', [
                     'nation_id'=>$updateVals['nation']
diff --git a/hwe/sammo/GeneralPool/RandomNameGeneral.php b/hwe/sammo/GeneralPool/RandomNameGeneral.php
index 45ba4086..fcd15979 100644
--- a/hwe/sammo/GeneralPool/RandomNameGeneral.php
+++ b/hwe/sammo/GeneralPool/RandomNameGeneral.php
@@ -74,7 +74,7 @@ class RandomNameGeneral extends AbsGeneralPool{
         $builder = $this->getGeneralBuilder();
         $builder->setStat($leadership, $strength, $intel);
         $builder->setDex($dexVal[0], $dexVal[1], $dexVal[2], $dexVal[3], $avgGen['dex5']);
-        $builder->Util::choiceRandom(array_keys(\sammo\CityConst::all()));
+        $builder->setCityID(Util::choiceRandom(array_keys(\sammo\CityConst::all())));
 
         $builder->setExpDed($avgGen['exp'], $avgGen['ded']);
     }
diff --git a/hwe/sammo/Scenario.php b/hwe/sammo/Scenario.php
index cc56538b..18872702 100644
--- a/hwe/sammo/Scenario.php
+++ b/hwe/sammo/Scenario.php
@@ -44,6 +44,8 @@ class Scenario{
 
     private $gameConf = null;
 
+    private $tmpEnv;
+
     public function generateGeneral($rawGeneral, $initFull, $npcType=2): GeneralBuilder{
         while(count($rawGeneral) < 14){
             $rawGeneral[] = null;
diff --git a/hwe/sammo/Scenario/GeneralBuilder.php b/hwe/sammo/Scenario/GeneralBuilder.php
index e2da863e..59d26349 100644
--- a/hwe/sammo/Scenario/GeneralBuilder.php
+++ b/hwe/sammo/Scenario/GeneralBuilder.php
@@ -9,9 +9,6 @@ use \sammo\CityConst;
 use \sammo\GameConst;
 use \sammo\SpecialityHelper;
 use sammo\TimeUtil;
-
-use function sammo\buildGeneralSpecialClass;
-
 class GeneralBuilder{
 
     protected $generalID = null;
diff --git a/src/kakao/Kakao_REST_API_Helper.php b/src/kakao/Kakao_REST_API_Helper.php
index 339b396e..bd32a89f 100644
--- a/src/kakao/Kakao_REST_API_Helper.php
+++ b/src/kakao/Kakao_REST_API_Helper.php
@@ -2,7 +2,7 @@
 namespace kakao;
 
 if (class_exists('\\kakao\\KakaoKey') === false) {
-    /** @suppress PhanRedefineClass */
+    // @suppress PhanRedefineClass
     class KakaoKey
     {
         const REST_KEY = '';